Merge pull request #87 from Codeinwp/development

Added support for custom messages
Fixes issue with multiple taxonomies having the same name
Fixed instructions for popups

css/style.css

@@ -255,7 +255,6 @@ float: left;}
     border-right: 1px solid #eee;
 }
 .top_left_instructions ol li{
-    text-align: justify;
     margin-bottom: 10px;
     border-bottom: 1px solid #eee;
     padding-bottom: 5px;

inc/core.php

@@ -919,6 +919,7 @@ public function generateTweetFromPost($postQuery, $network, $fromManageQueue=fal
             }
             // Added by Ash/Upwork
 
+            $finalTweet         = apply_filters("rop_override_tweet", $finalTweet, $postQuery);
 			$fTweet['message'] =  $finalTweet ;
 
 			return $fTweet;
@@ -2336,6 +2337,7 @@ public function resetAllOptions()
 				'top_fb_token'						=>'',
 				'top_opt_post_formats'				=>'',
                 // Added by Ash/Upwork
+                'cwp_rop_custom_messages'           => 'off',
                 'top_opt_posts_buffer_twitter'      => '',
                 'top_opt_posts_buffer_facebook'     => '',
                 'top_opt_posts_buffer_linkedin'     => '',
@@ -2546,11 +2548,11 @@ public static function generateFieldType($field)
 								) );
 								if(!empty($terms)){
                                     // Added by Ash/Upwork
-                                    $options                        = array();
+                                    $options                = array();
 									foreach ($terms as $t) {
-                                        $options[$t->name]          = $t->term_id;
+                                        $options[]          = array("label" => $t->name, "id" => $t->term_id);
                                     }
-                                    $taxonomies[$tx->labels->name]  = $options;
+                                    $taxonomies[]           = array("label" => $tx->labels->name, "values" => $options);
                                     // Added by Ash/Upwork
 								}
 							}

inc/view-categories-list.php

@@ -16,11 +16,15 @@
 <select name="<?php echo $field['option'];?>[]" data-placeholder="<?php _e("Categories", "tweet-old-post");?>" class="top-chosen-select" multiple>
     <option value=""></option>
 <?php
-    foreach ($taxonomies as $type=>$options) {
+    foreach ($taxonomies as $taxonomy) {
+        $type       = $taxonomy["label"];
+        $options    = $taxonomy["values"];
 ?>
     <optgroup label="<?php echo $type?>">
 <?php
-        foreach ($options as $label=>$id) {
+        foreach ($options as $option) {
+            $label      = $option["label"];
+            $id         = $option["id"];
             $extra      = in_array($id, $top_opt_omit_specific_cats) ? "selected" : "";
 ?>
       <option value="<?php echo $id;?>" <?php echo $extra;?>><?php echo $label;?></option>

inc/view-exclude.php

@@ -11,7 +11,7 @@
 		<span class="slogan"><?php _e("by", 'tweet-old-post'); ?> <a href="https://revive.social/?utm_source=topadmin&utm_medium=announce&utm_campaign=top">ReviveSocial</a></span>
 
 		<div class="cwp_top_actions">
-			<a href="https://twitter.com/intent/tweet?text=Check-out%20this%20awesome%20plugin%20-%20&url=http%3A%2F%2Frevive.social%2Fplugins%2Frevive-old-post%2F&via=ReviveSocial" class="tweet-about-it"><span></span> <?php _e("Show your love", 'tweet-old-post'); ?></a>
+			<a target="_blank" href="https://twitter.com/intent/tweet?text=Check-out%20this%20awesome%20plugin%20-%20&url=http%3A%2F%2Frevive.social%2Fplugins%2Frevive-old-post%2F&via=ReviveSocial" class="tweet-about-it"><span></span> <?php _e("Show your love", 'tweet-old-post'); ?></a>
 			<a target="_blank" href="http://wordpress.org/support/view/plugin-reviews/tweet-old-post#postform" class="leave-a-review"><span></span> <?php _e("Leave A Review", 'tweet-old-post'); ?></a>
 		</div><!-- end .cwp_top_actions -->
 	</header><!-- end .cwp_top_header -->

inc/view.php

@@ -23,7 +23,7 @@
 
 		<div class="cwp_top_actions">
 
-			<a href="https://twitter.com/intent/tweet?text=Check-out%20this%20awesome%20plugin%20-%20&url=http%3A%2F%2Frevive.social%2Fplugins%2Frevive-old-post%2F&via=ReviveSocial" class="tweet-about-it"><span></span> <?php _e("Show your love", 'tweet-old-post'); ?></a>
+			<a target="_blank" href="https://twitter.com/intent/tweet?text=Check-out%20this%20awesome%20plugin%20-%20&url=http%3A%2F%2Frevive.social%2Fplugins%2Frevive-old-post%2F&via=ReviveSocial" class="tweet-about-it"><span></span> <?php _e("Show your love", 'tweet-old-post'); ?></a>
 			<a target="_blank" href="http://wordpress.org/support/view/plugin-reviews/tweet-old-post#postform" class="leave-a-review"><span></span> <?php _e("Leave A Review", 'tweet-old-post'); ?></a>
 		</div><!-- end .cwp_top_actions -->
 	</header><!-- end .cwp_top_header -->
@@ -143,6 +143,7 @@
 				<?php endif; ?>
 				<li class="rop-beta-user"><div class="rop-left"><?php  _e("Beta user",'tweet-old-post');?> </div><a href="#" id="rop-beta-button" class="rop-right <?php echo $beta_user; ?>"></a><div class="rop-clear" ></div><span class="rop-beta-desc"><?php  _e("As a beta user you will have access to the latest stable releases before going to production",'tweet-old-post');?></span></li>
 				<li class="rop-beta-user"><div class="rop-left"><?php  _e("Remote check",'tweet-old-post');?></div><a href="#" id="cwp_remote_check" class="<?php echo $remote_check; ?> rop-right "></a><div class="rop-clear" ></div><span class="rop-beta-desc"><?php  _e("We will send you a ping each 15 minutes in order to assure that posts will be sent to social networks on time.   ",'tweet-old-post');?> </span> </li>
+                <?php echo apply_filters("rop_add_to_sidebar", "");?>
 				<li class="upgrade"><a target="_blank" href="https://revive.social/plugins/revive-old-post/?utm_source=bannerright&utm_medium=announce&utm_campaign=top&upgrade=true"> <?php _e("Upgrade Tweet Old Post for only $9.99 - Upgrade To Pro Now!", 'tweet-old-post'); ?></a></li>
 
 			</ul>

readme.txt

@@ -1,8 +1,8 @@
 === Revive Old Post (Former Tweet Old Post) ===
 Contributors: codeinwp,marius2012,marius_codeinwp,hardeepasrani,Madalin_Themeisle, rsocial
-Tags: admin, ajax, plugin, twitter, facebook, linkedin, automatic, tweet, share, wordpress, marketing, sharing, Tweet old post, Tweets,evergreen,  Promote old post by tweeting about them, Twitter, Auto Tweet, Hashtags, Twitter Hashtags, Tweet Posts, Tweet, Post Tweets, Wordpress Twitter Plugin, Twitter Plugin, Tweet Selected Posts, Twitter, Promote Posts, Tweet Random Post, Share Post, Promote Post, Post Tweets, Wordpress Twitter, Drive Traffic, Tweet Selected Posts
+Tags:twitter, facebook, linkedin, automatic, tweet, share, wordpress, marketing, sharing, Tweet old post, Tweets,evergreen
 Requires at least: 2.7
-Tested up to: 4.5.2
+Tested up to: 4.6.1
 Stable tag: trunk
 
 
@@ -29,7 +29,7 @@ This plugin helps you to keeps your old posts alive by sharing them and driving
 
 > ### Why to upgrade to PRO ?
 
-> Using the <a rel="friend" href="http://revive.social/plugins/revive-old-post/">PRO version</a> of the plugin you will unleash the most important functionality : images in tweets . Using those your RT/CTR will go crazy.
+> Using the <a rel="nofollow" href="http://revive.social/plugins/revive-old-post/">PRO version</a> of the plugin you will unleash the most important functionality : images in tweets . Using those your RT/CTR will go crazy.
 
 > Other notable features :
 
@@ -40,15 +40,15 @@ This plugin helps you to keeps your old posts alive by sharing them and driving
 > * Custom Schedule
 > * Post to Xing / Tumblr
 
-Some of you reported some scheduling issues, after investigation work looks like this is coming from some web hosts, make sure you check-out this post about <a rel="friend" href="http://www.codeinwp.com/blog/best-wordpress-shared-hosting-providers/">shared WordPress hosting</a>, which should help you pick a good one that works.
+Some of you reported some scheduling issues, after investigation work looks like this is coming from some web hosts, make sure you check-out this post about <a rel="nofollow" href="http://www.codeinwp.com/blog/best-wordpress-shared-hosting-providers/">shared WordPress hosting</a>, which should help you pick a good one that works.
 
 For updates follow https://twitter.com/ReviveSocial If you have anything you can let us know <a href="http://revive.social/support/?utm_source=readmetop&utm_medium=announce&utm_campaign=top">here</a>.
 
 ** Useful Resources **
 
-- Check-out our <a href="http://docs.revive.social" rel="friend" target="_blank">tutorials site</a>
-- Take a look at our other <a href="http://themeisle.com/wordpress-plugins/" rel="friend" target="_blank">plugins</a>.
-- Read more about WordPress on our <a href="http://www.codeinwp.com/blog/" rel="friend" target="_blank">blog</a>.
+- Check-out our <a href="http://docs.revive.social" rel="nofollow" target="_blank">tutorials site</a>
+- Take a look at our other <a href="http://themeisle.com/wordpress-plugins/" rel="nofollow" target="_blank">plugins</a>.
+- Read more about WordPress on our <a href="http://www.codeinwp.com/blog/" rel="nofollow" target="_blank">blog</a>.
 
 
 = Translations =
@@ -125,6 +125,12 @@ http://revive.social/plugins/revive-old-post
 
 == Changelog ==
 
+**New in v7.4.0**
+
+*   Added support for custom messages
+*   Fixes issue with multiple taxonomies having the same name
+*   Fixed instructions for popups
+
 **New in v7.3.8**
 
 *  Improved categories excluding UI in the General tab

tweet-old-post.php

@@ -4,7 +4,7 @@
 #     Plugin URI: https://revive.social/
 #     Description: Wordpress plugin that helps you to keeps your old posts alive by sharing them and driving more traffic to them from twitter/facebook or linkedin. It also helps you to promote your content. You can set time and no of posts to share to drive more traffic.For questions, comments, or feature requests, <a href="http://revive.social/support/?utm_source=plugindesc&utm_medium=announce&utm_campaign=top">contact </a> us!
 #     Author: reviev.social
-#     Version: 7.3.8
+#     Version: 7.4.0
 #     Author URI: https://revive.social/
 #	  Text Domain: tweet-old-post
 #	  Domain Path: /languages
@@ -19,7 +19,7 @@
 define("ROPJSCOUNTDOWN", plugins_url('js/countdown.js',__FILE__ ));
 define("ROPPLUGINBASENAME", plugin_basename(__FILE__));
 define('ROP_TOP_FB_API_VERSION','v2.0');
-define('ROP_VERSION','7.3.8');
+define('ROP_VERSION','7.4.0');
 // Added by Ash/Upwork
 define("ROP_ROOT", trailingslashit(plugins_url("", __FILE__)));
 // Added by Ash/Upwork