Custom Twitter Feeds - Version 1.2.11

Version Description

  • Fix: Quoted tweets would not display if saving settings on the "Customize tab". After updating, Enable "Quoted tweet box" in the "Show/Hide" section to display quoted tweets
  • Fix: Fixed PHP warning caused by trying to count a boolean in certain circumstances
Download this release

Release Info

Developer smashballoon
Plugin Icon 128x128 Custom Twitter Feeds
Version 1.2.11
Comparing to
See all releases

Code changes from version 1.2.10 to 1.2.11

Files changed (8) hide show
  1. README.txt +16 -12
  2. custom-twitter-feed.php +3 -3
  3. inc/CtfAdmin.php +9 -9
  4. inc/CtfFeed.php +7 -2
  5. inc/admin-hooks.php +10 -10
  6. js/ctf-admin-scripts.js +1 -1
  7. views/admin/main.php +2 -2
  8. views/admin/support.php +2 -2
README.txt CHANGED
@@ -4,8 +4,8 @@ Contributors: smashballoon, craig-at-smash-balloon
4
  Support Website: http://smashballoon/custom-twitter-feeds/
5
  Tags: Twitter, Twitter feed, Tweets, Twitter widget, Custom Twitter Feed
6
  Requires at least: 3.0
7
- Tested up to: 4.9
8
- Stable tag: 1.2.10
9
  License: GPLv2 or later
10
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
11
 
@@ -27,7 +27,7 @@ Display **completely customizable**, **responsive** and **search engine crawlabl
27
  * Display a beautiful header at the top of your Twitter feed
28
  * Enter your own custom CSS or JavaScript for even deeper customization
29
 
30
- For simple step-by-step directions on how to set up the Custom Twitter Feeds plugin please refer to our [setup guide](http://smashballoon.com/custom-twitter-feeds/free/ 'Custom Twitter Feeds setup guide').
31
 
32
  = Benefits =
33
  * **Increase social engagement** between you and your users, customers, or fans
@@ -43,9 +43,9 @@ For simple step-by-step directions on how to set up the Custom Twitter Feeds plu
43
  [View the reviews](https://wordpress.org/support/plugin/custom-twitter-feeds/reviews/) to see what other users are saying about the Custom Twitter Feeds plugin.
44
 
45
  = Feedback or Support =
46
- We're dedicated to providing the most robust and well supported Twitter feed plugin in the world, so if you have an issue or any feedback on how to improve the plugin then please [let us know](https://smashballoon.com/custom-twitter-feeds/support/ 'Twitter Feed Support').
47
 
48
- If you like the plugin then please consider leaving a review, as it really helps to support the plugin. If you have an issue then please allow us to help you fix it before leaving a review. Just [let us know](https://smashballoon.com/custom-twitter-feeds/support/ 'Twitter Feed Support') what the problem is and we'll get back to you right away.
49
 
50
  = Featured Reviews =
51
  "***Great for Customization** - Great plugin! Superb customization options! Am changing all twitter feeds for all my websites to this! I have tried several plugins so far. This is the best I have come across :)*" - [@nehavivekpatil](https://wordpress.org/support/topic/great-for-customization-2/)
@@ -65,11 +65,11 @@ If you like the plugin then please consider leaving a review, as it really helps
65
  *Kudos to the SmashBalloon team on a well supported, tightly developed, feature-packed WordPress Plugin.* - [@laymanlab](https://wordpress.org/support/topic/everything-youll-need-in-a-twitter-feed-plugin/)
66
 
67
  = Pro Version =
68
- We recently released a [Pro version](http://smashballoon.com/custom-twitter-feeds/ 'Custom Twitter Feeds Pro') which includes some awesome additional features:
69
 
70
  * Display Tweets from **multiple users or hashtags in the same feed**
71
  * Display **photos**, **videos**, and **gifs** and view them in a **popup lightbox** directly on your site
72
- * Multi-column **Masonry layout** [demo](http://smashballoon.com/custom-twitter-feeds/demo/masonry 'Custom Twitter Feeds Pro Masonry Demo')
73
  * Allow **filtering** of user timelines include/exclude any/all keywords/hashtags
74
  * Customizable **Carousels** and **Slideshows**
75
  * Fully functional **search endpoint**
@@ -80,7 +80,7 @@ We recently released a [Pro version](http://smashballoon.com/custom-twitter-feed
80
  * **Combine multiple feeds** into one
81
  * **Autoload more Tweets** when scrolling
82
 
83
- Try the Pro version [demo here](http://smashballoon.com/custom-twitter-feeds/demo 'Custom Twitter Feeds Pro Demo')
84
 
85
  == Installation ==
86
  1. Install the Custom Twitter Feeds plugin either via the WordPress plugin directory, or by uploading the files to your web server (in the /wp-content/plugins/ directory).
@@ -89,7 +89,7 @@ Try the Pro version [demo here](http://smashballoon.com/custom-twitter-feeds/dem
89
  4. Use the shortcode [custom-twitter-feeds] in your page, post or widget to display your feed.
90
  5. You can display multiple Twitter feeds with different configurations by specifying the necessary parameters directly in the shortcode: [custom-twitter-feeds hashtag=#smashballoon].
91
 
92
- For simple step-by-step directions on how to set up the Custom Twitter Feeds plugin please refer to our [setup guide](http://smashballoon.com/custom-twitter-feeds/free/ 'Custom Twitter Feeds setup guide').
93
 
94
  = Setting up the Free Custom Twitter Feeds WordPress Plugin =
95
 
@@ -163,7 +163,7 @@ The main differences between the free version and Pro version of the Custom Twit
163
  - Autoload more tweets when scrolling to the bottom of the Twitter feed
164
  - Include Tweet replies ("in reply to")
165
 
166
- You can see the demo of the Custom Twitter Feeds Pro version [here](https://smashballoon.com/custom-twitter-feeds/demo/), and a video screencast [here](https://smashballoon.com/custom-twitter-feeds/#watch-video).
167
 
168
  = I'm receiving an error message when trying to display my Twitter feed =
169
 
@@ -220,7 +220,7 @@ All four fields, consumer token, consumer secret, access token, and access token
220
 
221
  Navigate to the type of Twitter feed you are trying to display on twitter.com. For example, if you are displaying a Twitter feed from the screenname "smashballoon", go to https://twitter.com/smashballoon. Make sure there are tweets visible. Then click on the link "Tweets & replies". If there are a more recent replies than original tweets, there may be too many tweets being filtered out to display any. Twitter replies are removed by default. You can raise the number of tweets to retrieve initially by going to the Custom Twitter Feed Settings page, "Customize" tab, and navigating to the "Advanced" area. Then raise the "Tweet Multiplier" and test to see if your Twitter feed now displays tweets.
222
 
223
- If you're still having trouble displaying your Tweets after trying the common issues above then please [contact support](https://smashballoon.com/custom-twitter-feeds/support/) for assistance.
224
 
225
  = Why do you guys love providing support so much? =
226
 
@@ -237,6 +237,10 @@ Not many developers love providing support, but we're a rare breed here at Smash
237
  7. To display a feed just copy and paste the shortcode into a widget or page
238
 
239
  == Changelog ==
 
 
 
 
240
  = 1.2.10 =
241
  * Tweak: Updated the Twitter login button URL
242
  * Fix: Avatar would appear to the right of Tweets or not at all in some versions of Firefox
@@ -311,7 +315,7 @@ Not many developers love providing support, but we're a rare breed here at Smash
311
  * Fix: Fixed a rare issue where a couple of settings weren't being saved successfully
312
 
313
  = 1.1.2 =
314
- * New: Launched a [Pro version](http://smashballoon.com/custom-twitter-feeds/ 'Custom Twitter Feeds Pro') which includes some awesome additional features!
315
  * Fix: Minor bug fixes
316
 
317
  = 1.1.1 =
4
  Support Website: http://smashballoon/custom-twitter-feeds/
5
  Tags: Twitter, Twitter feed, Tweets, Twitter widget, Custom Twitter Feed
6
  Requires at least: 3.0
7
+ Tested up to: 5.1
8
+ Stable tag: 1.2.11
9
  License: GPLv2 or later
10
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
11
 
27
  * Display a beautiful header at the top of your Twitter feed
28
  * Enter your own custom CSS or JavaScript for even deeper customization
29
 
30
+ For simple step-by-step directions on how to set up the Custom Twitter Feeds plugin please refer to our [setup guide](http://smashballoon.com/custom-twitter-feeds/free/?utm_source=wordpress&utm_campaign=ctf 'Custom Twitter Feeds setup guide').
31
 
32
  = Benefits =
33
  * **Increase social engagement** between you and your users, customers, or fans
43
  [View the reviews](https://wordpress.org/support/plugin/custom-twitter-feeds/reviews/) to see what other users are saying about the Custom Twitter Feeds plugin.
44
 
45
  = Feedback or Support =
46
+ We're dedicated to providing the most robust and well supported Twitter feed plugin in the world, so if you have an issue or any feedback on how to improve the plugin then please [let us know](https://smashballoon.com/custom-twitter-feeds/support/?utm_source=wordpress&utm_campaign=ctf 'Twitter Feed Support').
47
 
48
+ If you like the plugin then please consider leaving a review, as it really helps to support the plugin. If you have an issue then please allow us to help you fix it before leaving a review. Just [let us know](https://smashballoon.com/custom-twitter-feeds/support/?utm_source=wordpress&utm_campaign=ctf 'Twitter Feed Support') what the problem is and we'll get back to you right away.
49
 
50
  = Featured Reviews =
51
  "***Great for Customization** - Great plugin! Superb customization options! Am changing all twitter feeds for all my websites to this! I have tried several plugins so far. This is the best I have come across :)*" - [@nehavivekpatil](https://wordpress.org/support/topic/great-for-customization-2/)
65
  *Kudos to the SmashBalloon team on a well supported, tightly developed, feature-packed WordPress Plugin.* - [@laymanlab](https://wordpress.org/support/topic/everything-youll-need-in-a-twitter-feed-plugin/)
66
 
67
  = Pro Version =
68
+ We recently released a [Pro version](http://smashballoon.com/custom-twitter-feeds/?utm_source=wordpress&utm_campaign=ctf 'Custom Twitter Feeds Pro') which includes some awesome additional features:
69
 
70
  * Display Tweets from **multiple users or hashtags in the same feed**
71
  * Display **photos**, **videos**, and **gifs** and view them in a **popup lightbox** directly on your site
72
+ * Multi-column **Masonry layout** [demo](http://smashballoon.com/custom-twitter-feeds/demo/masonry?utm_source=wordpress&utm_campaign=ctf 'Custom Twitter Feeds Pro Masonry Demo')
73
  * Allow **filtering** of user timelines include/exclude any/all keywords/hashtags
74
  * Customizable **Carousels** and **Slideshows**
75
  * Fully functional **search endpoint**
80
  * **Combine multiple feeds** into one
81
  * **Autoload more Tweets** when scrolling
82
 
83
+ Try the Pro version [demo here](http://smashballoon.com/custom-twitter-feeds/demo?utm_source=wordpress&utm_campaign=ctf 'Custom Twitter Feeds Pro Demo')
84
 
85
  == Installation ==
86
  1. Install the Custom Twitter Feeds plugin either via the WordPress plugin directory, or by uploading the files to your web server (in the /wp-content/plugins/ directory).
89
  4. Use the shortcode [custom-twitter-feeds] in your page, post or widget to display your feed.
90
  5. You can display multiple Twitter feeds with different configurations by specifying the necessary parameters directly in the shortcode: [custom-twitter-feeds hashtag=#smashballoon].
91
 
92
+ For simple step-by-step directions on how to set up the Custom Twitter Feeds plugin please refer to our [setup guide](http://smashballoon.com/custom-twitter-feeds/free/?utm_source=wordpress&utm_campaign=ctf 'Custom Twitter Feeds setup guide').
93
 
94
  = Setting up the Free Custom Twitter Feeds WordPress Plugin =
95
 
163
  - Autoload more tweets when scrolling to the bottom of the Twitter feed
164
  - Include Tweet replies ("in reply to")
165
 
166
+ You can see the demo of the Custom Twitter Feeds Pro version [here](https://smashballoon.com/custom-twitter-feeds/demo/?utm_source=wordpress&utm_campaign=ctf), and a video screencast [here](https://smashballoon.com/custom-twitter-feeds/#watch-video?utm_source=wordpress&utm_campaign=ctf).
167
 
168
  = I'm receiving an error message when trying to display my Twitter feed =
169
 
220
 
221
  Navigate to the type of Twitter feed you are trying to display on twitter.com. For example, if you are displaying a Twitter feed from the screenname "smashballoon", go to https://twitter.com/smashballoon. Make sure there are tweets visible. Then click on the link "Tweets & replies". If there are a more recent replies than original tweets, there may be too many tweets being filtered out to display any. Twitter replies are removed by default. You can raise the number of tweets to retrieve initially by going to the Custom Twitter Feed Settings page, "Customize" tab, and navigating to the "Advanced" area. Then raise the "Tweet Multiplier" and test to see if your Twitter feed now displays tweets.
222
 
223
+ If you're still having trouble displaying your Tweets after trying the common issues above then please [contact support](https://smashballoon.com/custom-twitter-feeds/support/?utm_source=wordpress&utm_campaign=ctf) for assistance.
224
 
225
  = Why do you guys love providing support so much? =
226
 
237
  7. To display a feed just copy and paste the shortcode into a widget or page
238
 
239
  == Changelog ==
240
+ = 1.2.11 =
241
+ * Fix: Quoted tweets would not display if saving settings on the "Customize tab". After updating, Enable "Quoted tweet box" in the "Show/Hide" section to display quoted tweets
242
+ * Fix: Fixed PHP warning caused by trying to count a boolean in certain circumstances
243
+
244
  = 1.2.10 =
245
  * Tweak: Updated the Twitter login button URL
246
  * Fix: Avatar would appear to the right of Tweets or not at all in some versions of Firefox
315
  * Fix: Fixed a rare issue where a couple of settings weren't being saved successfully
316
 
317
  = 1.1.2 =
318
+ * New: Launched a [Pro version](http://smashballoon.com/custom-twitter-feeds/?utm_source=wordpress&utm_campaign=ctf 'Custom Twitter Feeds Pro') which includes some awesome additional features!
319
  * Fix: Minor bug fixes
320
 
321
  = 1.1.1 =
custom-twitter-feed.php CHANGED
@@ -3,13 +3,13 @@
3
  Plugin Name: Custom Twitter Feeds
4
  Plugin URI: http://smashballoon.com/custom-twitter-feeds
5
  Description: Customizable Twitter feeds for your website
6
- Version: 1.2.10
7
  Author: Smash Balloon
8
  Author URI: http://smashballoon.com/
9
  Text Domain: custom-twitter-feeds
10
  */
11
  /*
12
- Copyright 2018 Smash Balloon LLC (email : hey@smashballoon.com)
13
  This program is free software; you can redistribute it and/or modify
14
  it under the terms of the GNU General Public License as published by
15
  the Free Software Foundation; either version 2 of the License, or
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
24
  */
25
 
26
  define( 'CTF_URL', plugin_dir_path( __FILE__ ) );
27
- define( 'CTF_VERSION', '1.2.10' );
28
  define( 'CTF_TITLE', 'Custom Twitter Feeds' );
29
  define( 'CTF_JS_URL', plugins_url( '/js/ctf-scripts.js?ver=' . CTF_VERSION , __FILE__ ) );
30
  define( 'OAUTH_PROCESSOR_URL', 'https://api.smashballoon.com/twitter-login.php?return_uri=' );
3
  Plugin Name: Custom Twitter Feeds
4
  Plugin URI: http://smashballoon.com/custom-twitter-feeds
5
  Description: Customizable Twitter feeds for your website
6
+ Version: 1.2.11
7
  Author: Smash Balloon
8
  Author URI: http://smashballoon.com/
9
  Text Domain: custom-twitter-feeds
10
  */
11
  /*
12
+ Copyright 2019 Smash Balloon LLC (email : hey@smashballoon.com)
13
  This program is free software; you can redistribute it and/or modify
14
  it under the terms of the GNU General Public License as published by
15
  the Free Software Foundation; either version 2 of the License, or
24
  */
25
 
26
  define( 'CTF_URL', plugin_dir_path( __FILE__ ) );
27
+ define( 'CTF_VERSION', '1.2.11' );
28
  define( 'CTF_TITLE', 'Custom Twitter Feeds' );
29
  define( 'CTF_JS_URL', plugins_url( '/js/ctf-scripts.js?ver=' . CTF_VERSION , __FILE__ ) );
30
  define( 'OAUTH_PROCESSOR_URL', 'https://api.smashballoon.com/twitter-login.php?return_uri=' );
inc/CtfAdmin.php CHANGED
@@ -394,15 +394,15 @@ class CtfAdmin
394
 
395
  // show/hide
396
  $show_hide_list = array(
397
- 0 => array( 'include_retweeter', 'Retweeted text' ),
398
- 1 => array( 'include_avatar', 'Avatar image' ),
399
- 2 => array( 'include_author', 'Author name' ),
400
- 3 => array( 'include_text', 'Tweet text' ),
401
- 4 => array( 'include_media_placeholder', 'Media placeholder' ),
402
- 5 => array( 'include_date', 'Date' ),
403
- 6 => array( 'include_actions', 'Tweet actions (reply, retweet, like)' ),
404
- 7 => array( 'include_twitterlink', '"Twitter" link' ),
405
- 8 => array( 'include_linkbox', 'Quoted tweet box' )
406
  );
407
  $show_hide_list = apply_filters( 'ctf_admin_show_hide_list', $show_hide_list );
408
 
394
 
395
  // show/hide
396
  $show_hide_list = array(
397
+ array( 'include_retweeter', 'Retweeted text' ),
398
+ array( 'include_avatar', 'Avatar image' ),
399
+ array( 'include_author', 'Author name' ),
400
+ array( 'include_text', 'Tweet text' ),
401
+ array( 'include_media_placeholder', 'Media placeholder' ),
402
+ array( 'include_date', 'Date' ),
403
+ array( 'include_actions', 'Tweet actions (reply, retweet, like)' ),
404
+ array( 'include_twitterlink', '"Twitter" link' ),
405
+ array( 'include_linkbox', 'Quoted tweet box' )
406
  );
407
  $show_hide_list = apply_filters( 'ctf_admin_show_hide_list', $show_hide_list );
408
 
inc/CtfFeed.php CHANGED
@@ -614,7 +614,7 @@ class CtfFeed
614
  $api_obj = $this->apiConnectionResponse( 'search', $this->feed_options['feed_term'] );
615
  // cache them in a regular option
616
  $this->tweet_set = json_decode( $api_obj->json , $assoc = true );
617
- //var_dump($this->tweet_set);
618
  // check for errors/tweets present
619
  if ( isset( $this->tweet_set['errors'][0] ) ) {
620
  if ( empty( $this->api_obj ) ) {
@@ -758,7 +758,12 @@ class CtfFeed
758
  * @return int number of tweets needed
759
  */
760
  protected function numTweetsNeeded() {
761
- $tweet_count = isset( $this->tweet_set['statuses'] ) ? count( $this->tweet_set['statuses'] ) : count( $this->tweet_set );
 
 
 
 
 
762
 
763
  return $this->feed_options['num'] - $tweet_count;
764
  }
614
  $api_obj = $this->apiConnectionResponse( 'search', $this->feed_options['feed_term'] );
615
  // cache them in a regular option
616
  $this->tweet_set = json_decode( $api_obj->json , $assoc = true );
617
+
618
  // check for errors/tweets present
619
  if ( isset( $this->tweet_set['errors'][0] ) ) {
620
  if ( empty( $this->api_obj ) ) {
758
  * @return int number of tweets needed
759
  */
760
  protected function numTweetsNeeded() {
761
+ $tweet_count = 0;
762
+ if ( isset( $this->tweet_set['statuses'] ) && is_array( $this->tweet_set['statuses'] ) ) {
763
+ $tweet_count = count( $this->tweet_set['statuses'] );
764
+ } elseif ( isset( $this->tweet_set ) && is_array( $this->tweet_set ) ) {
765
+ $tweet_count = count( $this->tweet_set );
766
+ }
767
 
768
  return $this->feed_options['num'] - $tweet_count;
769
  }
inc/admin-hooks.php CHANGED
@@ -51,7 +51,7 @@ function ctf_return_feed_types( $val ) {
51
  add_action( 'ctf_admin_upgrade_note', 'ctf_update_note' );
52
  function ctf_update_note() {
53
  ?>
54
- <span class="ctf_note"> - <a href="https://smashballoon.com/custom-twitter-feeds/" target="_blank">Available in Pro version</a></span>
55
  <?php
56
  }
57
 
@@ -60,7 +60,7 @@ function ctf_usertimeline_error_message( $args )
60
  { //sbi_notice sbi_user_id_error
61
  if ( $args['name'] == 'usertimeline') : ?>
62
  <div class="ctf_notice ctf_usertimeline_error">
63
- <?php _e( "<p>Please use a single screenname or Twitter handle of numbers and letters. If you would like to use more than one screen name for your feed, please upgrade to our <a href='https://smashballoon.com/custom-twitter-feeds/' target='_blank'>Pro version</a>.</p>" ); ?>
64
  </div>
65
  <?php endif;
66
  }
@@ -69,7 +69,7 @@ add_action( 'ctf_admin_feed_settings_search_extra', 'ctf_hashtag_error_message'
69
  function ctf_hashtag_error_message() {
70
  ?>
71
  <div class="ctf_notice ctf_search_error">
72
- <?php _e( "<p>Please use a single hashtag of numbers and letters. If you would like to use more than one hashtag or use search terms for your feed, please upgrade to our <a href='https://smashballoon.com/custom-twitter-feeds/' target='_blank'>Pro version</a>.</p>" ); ?>
73
  </div>
74
  <?php
75
  }
@@ -148,15 +148,15 @@ function ctf_add_mentionstimeline_options( $admin ) {
148
 
149
  add_filter( 'ctf_admin_show_hide_list', 'ctf_show_hide_list', 10, 1 );
150
  function ctf_show_hide_list( $show_hide_list ) {
151
- $show_hide_list[8] = array( 'include_replied_to', 'In reply to text' );
152
- $show_hide_list[9] = array( 'include_media', 'Media (images, videos, gifs)' );
153
- $show_hide_list[10] = array( 'include_twittercards', 'Twitter Cards' );
154
  return $show_hide_list;
155
  }
156
 
157
  function ctf_pro_masonry_section() {
158
  ?>
159
- <p class="ctf_pro_section_note"><a href="https://smashballoon.com/custom-twitter-feeds/" target="_blank">Upgrade to Pro to enable Masonry layouts</a></p>
160
  <span><a href="javascript:void(0);" class="button button-secondary ctf-show-pro"><b>+</b> Show Pro Options</a></span>
161
 
162
  <div class="ctf-pro-options">
@@ -189,7 +189,7 @@ function ctf_pro_masonry_section() {
189
 
190
  function ctf_pro_carousel_section() {
191
  ?>
192
- <p class="ctf_pro_section_note"><a href="https://smashballoon.com/custom-twitter-feeds/" target="_blank">Upgrade to Pro to enable Carousel</a></p>
193
  <span><a href="javascript:void(0);" class="button button-secondary ctf-show-pro"><b>+</b> Show Pro Options</a></span>
194
 
195
  <div class="ctf-pro-options">
@@ -251,7 +251,7 @@ function ctf_pro_carousel_section() {
251
 
252
  function ctf_pro_autoscroll_section() {
253
  ?>
254
- <p class="ctf_pro_section_note"><a href="https://smashballoon.com/custom-twitter-feeds/" target="_blank">Upgrade to Pro to enable Autoscroll loading</a></p>
255
  <span><a href="javascript:void(0);" class="button button-secondary ctf-show-pro"><b>+</b> Show Pro Options</a></span>
256
 
257
  <div class="ctf-pro-options">
@@ -271,7 +271,7 @@ function ctf_pro_autoscroll_section() {
271
 
272
  function ctf_pro_moderation_section() {
273
  ?>
274
- <p class="ctf_pro_section_note"><a href="https://smashballoon.com/custom-twitter-feeds/" target="_blank">Upgrade to Pro to enable Tweet moderation</a></p>
275
  <span><a href="javascript:void(0);" class="button button-secondary ctf-show-pro"><b>+</b> Show Pro Options</a></span>
276
 
277
  <div class="ctf-pro-options">
51
  add_action( 'ctf_admin_upgrade_note', 'ctf_update_note' );
52
  function ctf_update_note() {
53
  ?>
54
+ <span class="ctf_note"> - <a href="https://smashballoon.com/custom-twitter-feeds/?utm_source=plugin-free&utm_campaign=ctf" target="_blank">Available in Pro version</a></span>
55
  <?php
56
  }
57
 
60
  { //sbi_notice sbi_user_id_error
61
  if ( $args['name'] == 'usertimeline') : ?>
62
  <div class="ctf_notice ctf_usertimeline_error">
63
+ <?php _e( "<p>Please use a single screenname or Twitter handle of numbers and letters. If you would like to use more than one screen name for your feed, please upgrade to our <a href='https://smashballoon.com/custom-twitter-feeds/?utm_source=plugin-free&utm_campaign=ctf' target='_blank'>Pro version</a>.</p>" ); ?>
64
  </div>
65
  <?php endif;
66
  }
69
  function ctf_hashtag_error_message() {
70
  ?>
71
  <div class="ctf_notice ctf_search_error">
72
+ <?php _e( "<p>Please use a single hashtag of numbers and letters. If you would like to use more than one hashtag or use search terms for your feed, please upgrade to our <a href='https://smashballoon.com/custom-twitter-feeds/?utm_source=plugin-free&utm_campaign=ctf' target='_blank'>Pro version</a>.</p>" ); ?>
73
  </div>
74
  <?php
75
  }
148
 
149
  add_filter( 'ctf_admin_show_hide_list', 'ctf_show_hide_list', 10, 1 );
150
  function ctf_show_hide_list( $show_hide_list ) {
151
+ $show_hide_list[] = array( 'include_replied_to', 'In reply to text' );
152
+ $show_hide_list[] = array( 'include_media', 'Media (images, videos, gifs)' );
153
+ $show_hide_list[] = array( 'include_twittercards', 'Twitter Cards' );
154
  return $show_hide_list;
155
  }
156
 
157
  function ctf_pro_masonry_section() {
158
  ?>
159
+ <p class="ctf_pro_section_note"><a href="https://smashballoon.com/custom-twitter-feeds/?utm_source=plugin-free&utm_campaign=ctf" target="_blank">Upgrade to Pro to enable Masonry layouts</a></p>
160
  <span><a href="javascript:void(0);" class="button button-secondary ctf-show-pro"><b>+</b> Show Pro Options</a></span>
161
 
162
  <div class="ctf-pro-options">
189
 
190
  function ctf_pro_carousel_section() {
191
  ?>
192
+ <p class="ctf_pro_section_note"><a href="https://smashballoon.com/custom-twitter-feeds/?utm_source=plugin-free&utm_campaign=ctf" target="_blank">Upgrade to Pro to enable Carousel</a></p>
193
  <span><a href="javascript:void(0);" class="button button-secondary ctf-show-pro"><b>+</b> Show Pro Options</a></span>
194
 
195
  <div class="ctf-pro-options">
251
 
252
  function ctf_pro_autoscroll_section() {
253
  ?>
254
+ <p class="ctf_pro_section_note"><a href="https://smashballoon.com/custom-twitter-feeds/?utm_source=plugin-free&utm_campaign=ctf" target="_blank">Upgrade to Pro to enable Autoscroll loading</a></p>
255
  <span><a href="javascript:void(0);" class="button button-secondary ctf-show-pro"><b>+</b> Show Pro Options</a></span>
256
 
257
  <div class="ctf-pro-options">
271
 
272
  function ctf_pro_moderation_section() {
273
  ?>
274
+ <p class="ctf_pro_section_note"><a href="https://smashballoon.com/custom-twitter-feeds/?utm_source=plugin-free&utm_campaign=ctf" target="_blank">Upgrade to Pro to enable Tweet moderation</a></p>
275
  <span><a href="javascript:void(0);" class="button button-secondary ctf-show-pro"><b>+</b> Show Pro Options</a></span>
276
 
277
  <div class="ctf-pro-options">
js/ctf-admin-scripts.js CHANGED
@@ -264,7 +264,7 @@ jQuery(document).ready(function($){
264
  }); // clear-persistent-cache click
265
 
266
  //Pro version notices
267
- var ctfUpgradeNote = '<span class="ctf_note"> - <a href="https://smashballoon.com/custom-twitter-feeds/" target="_blank">Available in Pro version</a></span>';
268
  $('.ctf_pro').each(function(){
269
  var $pro = $(this);
270
  $pro.find('td').last().append(ctfUpgradeNote);
264
  }); // clear-persistent-cache click
265
 
266
  //Pro version notices
267
+ var ctfUpgradeNote = '<span class="ctf_note"> - <a href="https://smashballoon.com/custom-twitter-feeds/?utm_source=plugin-free&utm_campaign=ctf" target="_blank">Available in Pro version</a></span>';
268
  $('.ctf_pro').each(function(){
269
  var $pro = $(this);
270
  $pro.find('td').last().append(ctfUpgradeNote);
views/admin/main.php CHANGED
@@ -33,7 +33,7 @@
33
  }
34
  ?>
35
 
36
- <p><span class="fa fa-life-ring" aria-hidden="true"></span>&nbsp; <?php _e('Need help setting up the plugin? Check out our <a href="https://smashballoon.com/custom-twitter-feeds/free/" target="_blank">setup directions</a>', 'custom-twitter-feeds'); ?></p>
37
 
38
  <div class="ctf-quick-start">
39
  <h3><span class="fa fa-rocket" aria-hidden="true"></span>&nbsp; <?php _e( 'Display your feed', 'custom-twitter-feeds'); ?></h3>
@@ -42,7 +42,7 @@
42
  <p><?php _e( "Find out how to display <a href='?page=custom-twitter-feeds&tab=display'>multiple feeds</a>.", "custom-twitter-feeds" ); ?></p>
43
  </div>
44
 
45
- <a href="https://smashballoon.com/custom-twitter-feeds/demo" target="_blank" class="ctf-pro-notice">
46
  <img src="<?php echo plugins_url( '../../img/pro-notice.png?1' , __FILE__ ) ?>" alt="Custom Twitter Feeds Pro" />
47
  </a>
48
 
33
  }
34
  ?>
35
 
36
+ <p><span class="fa fa-life-ring" aria-hidden="true"></span>&nbsp; <?php _e('Need help setting up the plugin? Check out our <a href="https://smashballoon.com/custom-twitter-feeds/free/?utm_source=plugin-free&utm_campaign=ctf" target="_blank">setup directions</a>', 'custom-twitter-feeds'); ?></p>
37
 
38
  <div class="ctf-quick-start">
39
  <h3><span class="fa fa-rocket" aria-hidden="true"></span>&nbsp; <?php _e( 'Display your feed', 'custom-twitter-feeds'); ?></h3>
42
  <p><?php _e( "Find out how to display <a href='?page=custom-twitter-feeds&tab=display'>multiple feeds</a>.", "custom-twitter-feeds" ); ?></p>
43
  </div>
44
 
45
+ <a href="https://smashballoon.com/custom-twitter-feeds/demo?utm_source=plugin-free&utm_campaign=ctf" target="_blank" class="ctf-pro-notice">
46
  <img src="<?php echo plugins_url( '../../img/pro-notice.png?1' , __FILE__ ) ?>" alt="Custom Twitter Feeds Pro" />
47
  </a>
48
 
views/admin/support.php CHANGED
@@ -1,8 +1,8 @@
1
  <h3><?php _e( 'Need help?', 'custom-twitter-feeds' ); ?></h3>
2
 
3
- <p><span class="fa fa-life-ring" aria-hidden="true"></span>&nbsp; <?php _e( 'Check out our ', 'custom-twitter-feeds'); ?><a href="https://smashballoon.com/custom-twitter-feeds/docs/" target="_blank"><?php _e( 'setup directions', 'custom-twitter-feeds' ); ?></a> <?php _e( 'for a step-by-step guide on how to setup and use the plugin', 'custom-twitter-feeds' ); ?>.</p>
4
 
5
- <p><span class="fa fa-envelope" aria-hidden="true"></span>&nbsp; <?php _e( 'Have a problem? Submit a ', 'custom-twitter-feeds' ); ?><a href="https://smashballoon.com/custom-twitter-feeds/support/" target="_blank"><?php _e( 'support ticket', 'custom-twitter-feeds' ); ?></a> <?php _e( 'on our website', 'custom-twitter-feeds' ); ?>. <?php _e( 'Please include your <b>System Info</b> below with all support requests.', 'custom-twitter-feeds' ); ?></p>
6
 
7
  <br />
8
  <h3><?php _e('System Info', 'custom-twitter-feeds' ); ?> &nbsp; <span style="color: #666; font-size: 11px; font-weight: normal;"><?php _e( 'Click the text below to select all', 'custom-twitter-feeds' ); ?></span></h3>
1
  <h3><?php _e( 'Need help?', 'custom-twitter-feeds' ); ?></h3>
2
 
3
+ <p><span class="fa fa-life-ring" aria-hidden="true"></span>&nbsp; <?php _e( 'Check out our ', 'custom-twitter-feeds'); ?><a href="https://smashballoon.com/custom-twitter-feeds/docs/?utm_source=plugin-free&utm_campaign=ctf" target="_blank"><?php _e( 'setup directions', 'custom-twitter-feeds' ); ?></a> <?php _e( 'for a step-by-step guide on how to setup and use the plugin', 'custom-twitter-feeds' ); ?>.</p>
4
 
5
+ <p><span class="fa fa-envelope" aria-hidden="true"></span>&nbsp; <?php _e( 'Have a problem? Submit a ', 'custom-twitter-feeds' ); ?><a href="https://smashballoon.com/custom-twitter-feeds/support/?utm_source=plugin-free&utm_campaign=ctf" target="_blank"><?php _e( 'support ticket', 'custom-twitter-feeds' ); ?></a> <?php _e( 'on our website', 'custom-twitter-feeds' ); ?>. <?php _e( 'Please include your <b>System Info</b> below with all support requests.', 'custom-twitter-feeds' ); ?></p>
6
 
7
  <br />
8
  <h3><?php _e('System Info', 'custom-twitter-feeds' ); ?> &nbsp; <span style="color: #666; font-size: 11px; font-weight: normal;"><?php _e( 'Click the text below to select all', 'custom-twitter-feeds' ); ?></span></h3>