Subscribe2 - Version 10.18.4

Version Description

Download this release

Release Info

Developer tanaylakhani
Plugin Icon 128x128 Subscribe2
Version 10.18.4
Comparing to
See all releases

Code changes from version 10.18.3 to 10.18.4

ChangeLog.txt CHANGED
@@ -1,3 +1,8 @@
 
 
 
 
 
1
  = 10.18.3 =
2
 
3
  * Readygraph premium plan selections
1
+ = 10.18.4 =
2
+
3
+ * Readygraph premium plan default change
4
+ * Bug fix
5
+
6
  = 10.18.3 =
7
 
8
  * Readygraph premium plan selections
ReadMe.txt CHANGED
@@ -4,13 +4,22 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_butt
4
  Tags: posts, subscription, email, subscribe, notify, notification
5
  Requires at least: 3.3
6
  Tested up to: 4.1
7
- Stable tag: 10.18.3
8
  License: GPL3
9
 
10
  Sends a list of subscribers an email notification when new posts are published to your blog. Automate user growth through ReadyGraph integration.
11
 
12
  == Description ==
13
 
 
 
 
 
 
 
 
 
 
14
  = Summary =
15
  Subscribe2 provides a comprehensive subscription management and email notification system for WordPress blogs that sends email notifications to a list of subscribers when you publish new content to your blog.
16
 
@@ -84,6 +93,8 @@ If you have questions or concerns contact us anytime at [info@readygraph.com](ma
84
 
85
  == Installation ==
86
 
 
 
87
  = AUTOMATIC INSTALLATION =
88
 
89
  1. Log in to your WordPress blog and visit Plugins->Add New.
@@ -110,7 +121,7 @@ This token will automatically be replaced by dynamic subscription information an
110
 
111
  == Frequently Asked Questions ==
112
 
113
- [Visit FAQ site](http://subscribe2.wordpress.com/support/faqs/)
114
 
115
  = ReadyGraph FAQ =
116
 
@@ -210,10 +221,10 @@ If you have questions or concerns, contact us anytime at [info@readygraph.com](m
210
 
211
 
212
  == Screenshots ==
213
- 1. The Subscribe2->Mail Subscribers admin page generated by the plugin.
214
- 2. The Subscribe2->Subscribers admin page generated by the plugin.
215
- 3. The Subscribe2->Subscriptions admin page generated by the plugin.
216
- 4. The Subscribe2->Subscribe2 admin page generated by the plugin.
217
 
218
  == Changelog ==
219
 
4
  Tags: posts, subscription, email, subscribe, notify, notification
5
  Requires at least: 3.3
6
  Tested up to: 4.1
7
+ Stable tag: 10.18.4
8
  License: GPL3
9
 
10
  Sends a list of subscribers an email notification when new posts are published to your blog. Automate user growth through ReadyGraph integration.
11
 
12
  == Description ==
13
 
14
+ Check official website for live demo http://plugins.readygraph.com/subscribe2/
15
+
16
+ * [Live demo](http://plugins.readygraph.com/subscribe2/)
17
+
18
+ * [More Description](http://plugins.readygraph.com/subscribe2/)
19
+
20
+ * [Suggestion/comments](http://plugins.readygraph.com/subscribe2/)
21
+
22
+
23
  = Summary =
24
  Subscribe2 provides a comprehensive subscription management and email notification system for WordPress blogs that sends email notifications to a list of subscribers when you publish new content to your blog.
25
 
93
 
94
  == Installation ==
95
 
96
+ Installation Instruction and Configuration can also be found at [Installation Instruction and Configuration](http://plugins.readygraph.com/subscribe2/installation/)
97
+
98
  = AUTOMATIC INSTALLATION =
99
 
100
  1. Log in to your WordPress blog and visit Plugins->Add New.
121
 
122
  == Frequently Asked Questions ==
123
 
124
+ For detailed FAQ and other support visit [http://plugins.readygraph.com/subscribe2/faq/](http://plugins.readygraph.com/subscribe2/faq/)
125
 
126
  = ReadyGraph FAQ =
127
 
221
 
222
 
223
  == Screenshots ==
224
+ 1. The Subscribe2->Mail Subscribers admin page generated by the plugin. http://plugins.readygraph.com/subscribe2/screenshots/
225
+ 2. The Subscribe2->Subscribers admin page generated by the plugin. http://plugins.readygraph.com/subscribe2/screenshots/
226
+ 3. The Subscribe2->Subscriptions admin page generated by the plugin. http://plugins.readygraph.com/subscribe2/screenshots/
227
+ 4. The Subscribe2->Subscribe2 admin page generated by the plugin. http://plugins.readygraph.com/subscribe2/screenshots/
228
 
229
  == Changelog ==
230
 
extension/readygraph/admin.php CHANGED
@@ -58,6 +58,9 @@ s2_rrmdir($dir);
58
  }
59
  else {
60
  }
 
 
 
61
  ?>
62
 
63
  <link rel="stylesheet" type="text/css" href="<?php echo plugins_url( 'assets/css/admin.css', __FILE__ ) ?>">
@@ -207,8 +210,8 @@ If you have questions or concerns contact us anytime at <a href="mailto:info@rea
207
  <strong>Or take <a href="<?php $current_url = explode("&", $_SERVER['REQUEST_URI']); echo $current_url[0];?>&ac=signup-popup&source=basic-settings">the tutorial</a> to customize your ReadyGraph settings</strong>
208
  </div><?php */ ?> </div>
209
  <div style="width: 25%; margin: 1% 5% 0 0; float: left; background: #F0F0F0; border-radius: 15px;padding: 1% 2% 1% 1%"><h4 class="rg-h4">Select your plan</h4>
210
- <div style="margin: 10px;"><div class="rg-icon-thumb"><input type="radio" name="select-plan" value="promote_free" style="font-weight: bold; margin: 12px 0" checked></div><p class="rg-icon-content"><strong>Free - Stick with the Basic Plan</strong> </input><br><span style="margin-top: -12px">Basic tools, Promotion if content ranks highly</span></p></div>
211
- <div style="margin: 10px;"><div class="rg-icon-thumb"><input type="radio" name="select-plan" value="promote_19" style="font-weight: bold; margin: 12px 0"></div><p class="rg-icon-content"><strong>Get promoted to 2000 users monthly</strong></input><br><span style="margin-top: -12px">$19/month</span></p></div>
212
  <div style="margin: 10px;"><div class="rg-icon-thumb"><input type="radio" name="select-plan" value="promote_59" style="font-weight: bold; margin: 12px 0"></div><p class="rg-icon-content"><strong>Get promoted to 20,000 users monthly</strong></input><br><span style="margin-top: -12px">$59/month</span></p></div>
213
  <div style="margin: 10px;"><div class="rg-icon-thumb"><input type="radio" name="select-plan" value="promote_149" style="font-weight: bold; margin: 12px 0"></div><p class="rg-icon-content"><strong>Get promoted to 100,000 users monthly</strong></input><br><span style="margin-top: -12px">$149/month</span></p></div>
214
  <div style="margin: 10px;"><div class="rg-icon-thumb"><input type="radio" name="select-plan" value="promote_no" style="font-weight: bold; margin: 12px 0"></div><p class="rg-icon-content"><strong>Don't promote my site</strong></input><br><span style="margin-top: -12px">Opt out of cross promotion network</span></p></div>
@@ -312,15 +315,18 @@ function subscribe_readygraph() {
312
  for (var i = 0; i < radios.length; i++) {
313
  if (radios[i].checked) {
314
  plan = radios[i].value;
315
- //alert(radios[i].value);
316
  break;
317
  }
318
  }
319
 
320
  var current_url = document.URL;
 
321
  var new_url = current_url.slice(0, -28);
 
 
 
322
  url = 'https://readygraph.com/accounts/payment/?email=<?php echo get_option('readygraph_email', '') ?>&payment_plan='+plan+'&is_annual='+annual+'&redirect_uri='+encodeURIComponent(new_url+'site-profile');
323
- current_url = new_url+'site-profile';
324
  if (plan === "promote_free"){
325
  window.location.href = current_url;
326
  }
58
  }
59
  else {
60
  }
61
+ if (!get_option('readygraph_plan') || strlen(get_option('readygraph_plan')) <= 0) {
62
+ update_option('readygraph_tutorial',"true");
63
+ }
64
  ?>
65
 
66
  <link rel="stylesheet" type="text/css" href="<?php echo plugins_url( 'assets/css/admin.css', __FILE__ ) ?>">
210
  <strong>Or take <a href="<?php $current_url = explode("&", $_SERVER['REQUEST_URI']); echo $current_url[0];?>&ac=signup-popup&source=basic-settings">the tutorial</a> to customize your ReadyGraph settings</strong>
211
  </div><?php */ ?> </div>
212
  <div style="width: 25%; margin: 1% 5% 0 0; float: left; background: #F0F0F0; border-radius: 15px;padding: 1% 2% 1% 1%"><h4 class="rg-h4">Select your plan</h4>
213
+ <div style="margin: 10px;"><div class="rg-icon-thumb"><input type="radio" name="select-plan" value="promote_free" style="font-weight: bold; margin: 12px 0"></div><p class="rg-icon-content"><strong>Free - Stick with the Basic Plan</strong> </input><br><span style="margin-top: -12px">Basic tools, Promotion if content ranks highly</span></p></div>
214
+ <div style="margin: 10px;"><div class="rg-icon-thumb"><input type="radio" name="select-plan" value="promote_19" style="font-weight: bold; margin: 12px 0" checked></div><p class="rg-icon-content"><strong>Get promoted to 2000 users monthly</strong></input><br><span style="margin-top: -12px">$19/month</span></p></div>
215
  <div style="margin: 10px;"><div class="rg-icon-thumb"><input type="radio" name="select-plan" value="promote_59" style="font-weight: bold; margin: 12px 0"></div><p class="rg-icon-content"><strong>Get promoted to 20,000 users monthly</strong></input><br><span style="margin-top: -12px">$59/month</span></p></div>
216
  <div style="margin: 10px;"><div class="rg-icon-thumb"><input type="radio" name="select-plan" value="promote_149" style="font-weight: bold; margin: 12px 0"></div><p class="rg-icon-content"><strong>Get promoted to 100,000 users monthly</strong></input><br><span style="margin-top: -12px">$149/month</span></p></div>
217
  <div style="margin: 10px;"><div class="rg-icon-thumb"><input type="radio" name="select-plan" value="promote_no" style="font-weight: bold; margin: 12px 0"></div><p class="rg-icon-content"><strong>Don't promote my site</strong></input><br><span style="margin-top: -12px">Opt out of cross promotion network</span></p></div>
315
  for (var i = 0; i < radios.length; i++) {
316
  if (radios[i].checked) {
317
  plan = radios[i].value;
 
318
  break;
319
  }
320
  }
321
 
322
  var current_url = document.URL;
323
+ <?php if(isset($_GET["tutorial"]) && $_GET["tutorial"] == "true"){ ?>
324
  var new_url = current_url.slice(0, -28);
325
+ <?php } else { ?>
326
+ var new_url = current_url.slice(0, -16);
327
+ <?php } ?>
328
  url = 'https://readygraph.com/accounts/payment/?email=<?php echo get_option('readygraph_email', '') ?>&payment_plan='+plan+'&is_annual='+annual+'&redirect_uri='+encodeURIComponent(new_url+'site-profile');
329
+ current_url = new_url+'site-profile&readygraph_plan='+plan;
330
  if (plan === "promote_free"){
331
  window.location.href = current_url;
332
  }
extension/readygraph/site-profile.php CHANGED
@@ -58,6 +58,7 @@ function siteprofile_sync(){
58
  siteprofile_sync();
59
  }
60
  }
 
61
 
62
  ?>
63
 
@@ -78,8 +79,8 @@ $(function(){
78
  <input type="hidden" name="readygraph_refresh_token" value="<?php echo get_option('readygraph_refresh_token', '') ?>">
79
  <input type="hidden" name="readygraph_email" value="<?php echo get_option('readygraph_email', '') ?>">
80
  <input type="hidden" name="readygraph_application_id" value="<?php echo get_option('readygraph_application_id', '') ?>">
81
-
82
-
83
 
84
  <style>a.help-tooltip {outline:none; }a.help-tooltip strong {line-height:30px;}a.help-tooltip:hover {text-decoration:none;} a.help-tooltip span { z-index:10;display:none; padding:14px 20px; margin-top:40px; margin-left:-150px; width:300px; line-height:16px;}a.help-tooltip:hover span{ display:inline; position:absolute; border:2px solid #FFF; background:#fff; text-align: justify; z-index:1000000000;}.callout {z-index:1000000000;position:absolute;border:0;top:-14px;left:120px;} /*CSS3 extras*/a.help-tooltip span{ border-radius:2px; -moz-border-radius: 2px; -webkit-border-radius: 2px; -moz-box-shadow: 0px 0px 8px 4px #666; -webkit-box-shadow: 0px 0px 8px 4px #666; box-shadow: 0px 0px 8px 4px #666;}</style>
85
  <div class="authenticated" style="display: none;">
@@ -436,6 +437,17 @@ wp_editor( $content, $editor_id, $settings );
436
  </form>
437
  <script type="text/javascript" src="https://readygraph.com/scripts/readygraph.js"></script>
438
 
 
 
 
 
 
 
 
 
 
 
 
439
  <script type="text/javascript" charset="utf-8">
440
  var $ = jQuery;
441
  $(function () {
58
  siteprofile_sync();
59
  }
60
  }
61
+ if(isset($_GET["readygraph_plan"]) && $_GET["readygraph_plan"] != ""){update_option('readygraph_plan',$_GET["readygraph_plan"]);}
62
 
63
  ?>
64
 
79
  <input type="hidden" name="readygraph_refresh_token" value="<?php echo get_option('readygraph_refresh_token', '') ?>">
80
  <input type="hidden" name="readygraph_email" value="<?php echo get_option('readygraph_email', '') ?>">
81
  <input type="hidden" name="readygraph_application_id" value="<?php echo get_option('readygraph_application_id', '') ?>">
82
+ <input type="hidden" name="readygraph_site_category" value="<?php echo get_option('readygraph_site_category', '') ?>">
83
+ <input type="hidden" name="readygraph_site_language" value="<?php echo get_option('readygraph_site_language', '') ?>">
84
 
85
  <style>a.help-tooltip {outline:none; }a.help-tooltip strong {line-height:30px;}a.help-tooltip:hover {text-decoration:none;} a.help-tooltip span { z-index:10;display:none; padding:14px 20px; margin-top:40px; margin-left:-150px; width:300px; line-height:16px;}a.help-tooltip:hover span{ display:inline; position:absolute; border:2px solid #FFF; background:#fff; text-align: justify; z-index:1000000000;}.callout {z-index:1000000000;position:absolute;border:0;top:-14px;left:120px;} /*CSS3 extras*/a.help-tooltip span{ border-radius:2px; -moz-border-radius: 2px; -webkit-border-radius: 2px; -moz-box-shadow: 0px 0px 8px 4px #666; -webkit-box-shadow: 0px 0px 8px 4px #666; box-shadow: 0px 0px 8px 4px #666;}</style>
86
  <div class="authenticated" style="display: none;">
437
  </form>
438
  <script type="text/javascript" src="https://readygraph.com/scripts/readygraph.js"></script>
439
 
440
+ <script type="text/javascript" charset="utf-8">
441
+ var $ = jQuery;
442
+ var category = $('[name="readygraph_site_category"]').val();
443
+ if (category != ""){
444
+ $('.site_category').val(category);
445
+ }
446
+ var language = $('[name="readygraph_site_language"]').val();
447
+ if (language != ""){
448
+ $('.site_language').val(language);
449
+ }
450
+ </script>
451
  <script type="text/javascript" charset="utf-8">
452
  var $ = jQuery;
453
  $(function () {
subscribe2.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: Subscribe2
4
  Plugin URI: http://subscribe2.wordpress.com
5
  Description: Notifies an email list when new entries are posted.
6
- Version: 10.18.3
7
  Author: Matthew Robinson, Tanay Lakhani
8
  Author URI: http://subscribe2.wordpress.com
9
  Licence: GPL3
@@ -55,7 +55,7 @@ if ( is_plugin_active_for_network(plugin_basename(__FILE__)) ) {
55
 
56
  // our version number. Don't touch this or any line below
57
  // unless you know exactly what you are doing
58
- define( 'S2VERSION', '10.18.3' );
59
  define( 'S2PATH', trailingslashit(dirname(__FILE__)) );
60
  define( 'S2DIR', trailingslashit(dirname(plugin_basename(__FILE__))) );
61
  define( 'S2URL', plugin_dir_url(dirname(__FILE__)) . S2DIR );
3
  Plugin Name: Subscribe2
4
  Plugin URI: http://subscribe2.wordpress.com
5
  Description: Notifies an email list when new entries are posted.
6
+ Version: 10.18.4
7
  Author: Matthew Robinson, Tanay Lakhani
8
  Author URI: http://subscribe2.wordpress.com
9
  Licence: GPL3
55
 
56
  // our version number. Don't touch this or any line below
57
  // unless you know exactly what you are doing
58
+ define( 'S2VERSION', '10.18.4' );
59
  define( 'S2PATH', trailingslashit(dirname(__FILE__)) );
60
  define( 'S2DIR', trailingslashit(dirname(plugin_basename(__FILE__))) );
61
  define( 'S2URL', plugin_dir_url(dirname(__FILE__)) . S2DIR );