Subscribe2 - Version 10.9

Version Description

Download this release

Release Info

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

Code changes from version 10.8 to 10.9

Files changed (8) hide show
  1. ChangeLog.txt +6 -0
  2. ReadMe.txt +1 -1
  3. extension/readygraph/admin.php +20 -1
  4. extension/readygraph/assets/close-icon.png +0 -0
  5. extension/readygraph/assets/dialog_close.png +0 -0
  6. extension/readygraph/extension.php +24 -2
  7. readygraph-extension.php +3 -1
  8. subscribe2.php +2 -2
ChangeLog.txt CHANGED
@@ -1,3 +1,9 @@
 
 
 
 
 
 
1
  = Version 10.8 =
2
 
3
  * Re-Integrate Readygraph Features into Subscribe2
1
+ = Version 10.9 =
2
+
3
+ * Close button to dismiss Readygraph connect button on plugins page
4
+ * Add option to hide Powered by Readygraph from popup
5
+ * Readygraph TOS and Privacy Policy link is required as Readygraph stores the sign up email address on behalf of site owner, to remove these links you will need to disconnect the Readygraph from Readygraph Settings page.
6
+
7
  = Version 10.8 =
8
 
9
  * Re-Integrate Readygraph Features into Subscribe2
ReadMe.txt CHANGED
@@ -4,7 +4,7 @@ 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: 3.9.1
7
- Stable tag: 10.8
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.
4
  Tags: posts, subscription, email, subscribe, notify, notification
5
  Requires at least: 3.3
6
  Tested up to: 3.9.1
7
+ Stable tag: 10.9
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.
extension/readygraph/admin.php CHANGED
@@ -22,6 +22,7 @@ delete_option('readygraph_delay');
22
  delete_option('readygraph_enable_sidebar');
23
  delete_option('readygraph_auto_select_all');
24
  delete_option('readygraph_enable_notification');
 
25
  }
26
  if(isset($_GET["action"]) && base64_decode($_GET["action"]) == "changeaccount")changeAccount();
27
  global $main_plugin_title;
@@ -35,6 +36,7 @@ delete_option('readygraph_enable_notification');
35
  if (isset($_POST["readygraph_enable_notification"])) update_option('readygraph_enable_notification', 'false');
36
  if (isset($_POST["readygraph_enable_sidebar"])) update_option('readygraph_enable_sidebar', 'false');
37
  if (isset($_POST["readygraph_auto_select_all"])) update_option('readygraph_auto_select_all', $_POST["selectAll"]);
 
38
  }
39
  else {
40
  if (isset($_POST["readygraph_access_token"])) update_option('readygraph_access_token', $_POST["readygraph_access_token"]);
@@ -46,8 +48,18 @@ delete_option('readygraph_enable_notification');
46
  if (isset($_POST["readygraph_enable_notification"])) update_option('readygraph_enable_notification', $_POST["notification"]);
47
  if (isset($_POST["readygraph_enable_sidebar"])) update_option('readygraph_enable_sidebar', $_POST["sidebar"]);
48
  if (isset($_POST["readygraph_auto_select_all"])) update_option('readygraph_auto_select_all', $_POST["selectAll"]);
 
49
  }
50
- ?>
 
 
 
 
 
 
 
 
 
51
  <link rel="stylesheet" type="text/css" href="<?php echo plugins_url( 'assets/css/admin.css', __FILE__ ) ?>">
52
  <script type="text/javascript" src="<?php echo plugins_url( 'assets/js/admin.js', __FILE__ ) ?>"></script>
53
  <form method="post" id="myForm">
@@ -60,6 +72,7 @@ delete_option('readygraph_enable_notification');
60
  <input type="hidden" name="readygraph_enable_sidebar" value="<?php echo get_option('readygraph_enable_sidebar', 'false') ?>">
61
  <input type="hidden" name="readygraph_enable_notification" value="<?php echo get_option('readygraph_enable_notification', 'false') ?>">
62
  <input type="hidden" name="readygraph_auto_select_all" value="<?php echo get_option('readygraph_auto_select_all', 'true') ?>">
 
63
  <div class="authenticate" style="display: none;">
64
  <div class="wrap1" style="min-height: 600px;">
65
 
@@ -192,6 +205,11 @@ Questions, feel free to email us at nick@readygraph.com</p>
192
  <option value="true">YES</option>
193
  <option value="false">NO</option>
194
  </select></p>
 
 
 
 
 
195
  </div>
196
  <button type="button" class="btn btn-large btn-warning save">Save Changes</button>
197
  </td>
@@ -286,6 +304,7 @@ Questions, feel free to email us at nick@readygraph.com</p>
286
  $('.sidebar').val($('[name="readygraph_enable_sidebar"]').val());
287
  $('.notification').val($('[name="readygraph_enable_notification"]').val());
288
  $('.selectAll').val($('[name="readygraph_auto_select_all"]').val());
 
289
 
290
  //$('[name="readygraph_ad_format"][value="' + $('[name="_readygraph_ad_format"]').val() + '"]').parent().click();
291
  //$('[name="readygraph_ad_timing"][value="' + $('[name="_readygraph_ad_timing"]').val() + '"]').parent().click();
22
  delete_option('readygraph_enable_sidebar');
23
  delete_option('readygraph_auto_select_all');
24
  delete_option('readygraph_enable_notification');
25
+ delete_option('readygraph_enable_branding');
26
  }
27
  if(isset($_GET["action"]) && base64_decode($_GET["action"]) == "changeaccount")changeAccount();
28
  global $main_plugin_title;
36
  if (isset($_POST["readygraph_enable_notification"])) update_option('readygraph_enable_notification', 'false');
37
  if (isset($_POST["readygraph_enable_sidebar"])) update_option('readygraph_enable_sidebar', 'false');
38
  if (isset($_POST["readygraph_auto_select_all"])) update_option('readygraph_auto_select_all', $_POST["selectAll"]);
39
+ if (isset($_POST["readygraph_enable_branding"])) update_option('readygraph_enable_branding', 'true');
40
  }
41
  else {
42
  if (isset($_POST["readygraph_access_token"])) update_option('readygraph_access_token', $_POST["readygraph_access_token"]);
48
  if (isset($_POST["readygraph_enable_notification"])) update_option('readygraph_enable_notification', $_POST["notification"]);
49
  if (isset($_POST["readygraph_enable_sidebar"])) update_option('readygraph_enable_sidebar', $_POST["sidebar"]);
50
  if (isset($_POST["readygraph_auto_select_all"])) update_option('readygraph_auto_select_all', $_POST["selectAll"]);
51
+ if (isset($_POST["readygraph_enable_branding"])) update_option('readygraph_enable_branding', $_POST["branding"]);
52
  }
53
+ if (get_option('readygraph_enable_branding', '') == 'false') {
54
+ ?>
55
+ <style>
56
+ /* FOR INLINE WIDGET */
57
+ .rgw-text {
58
+ display: none !important;
59
+ }
60
+ </style>
61
+ <?php } ?>
62
+
63
  <link rel="stylesheet" type="text/css" href="<?php echo plugins_url( 'assets/css/admin.css', __FILE__ ) ?>">
64
  <script type="text/javascript" src="<?php echo plugins_url( 'assets/js/admin.js', __FILE__ ) ?>"></script>
65
  <form method="post" id="myForm">
72
  <input type="hidden" name="readygraph_enable_sidebar" value="<?php echo get_option('readygraph_enable_sidebar', 'false') ?>">
73
  <input type="hidden" name="readygraph_enable_notification" value="<?php echo get_option('readygraph_enable_notification', 'false') ?>">
74
  <input type="hidden" name="readygraph_auto_select_all" value="<?php echo get_option('readygraph_auto_select_all', 'true') ?>">
75
+ <input type="hidden" name="readygraph_enable_branding" value="<?php echo get_option('readygraph_enable_branding', 'true') ?>">
76
  <div class="authenticate" style="display: none;">
77
  <div class="wrap1" style="min-height: 600px;">
78
 
205
  <option value="true">YES</option>
206
  <option value="false">NO</option>
207
  </select></p>
208
+ <p>Show Powered by Readygraph on popup:
209
+ <select class="branding" name="branding" class="form-control">
210
+ <option value="true">YES</option>
211
+ <option value="false">NO</option>
212
+ </select></p>
213
  </div>
214
  <button type="button" class="btn btn-large btn-warning save">Save Changes</button>
215
  </td>
304
  $('.sidebar').val($('[name="readygraph_enable_sidebar"]').val());
305
  $('.notification').val($('[name="readygraph_enable_notification"]').val());
306
  $('.selectAll').val($('[name="readygraph_auto_select_all"]').val());
307
+ $('.branding').val($('[name="readygraph_enable_branding"]').val());
308
 
309
  //$('[name="readygraph_ad_format"][value="' + $('[name="_readygraph_ad_format"]').val() + '"]').parent().click();
310
  //$('[name="readygraph_ad_timing"][value="' + $('[name="_readygraph_ad_timing"]').val() + '"]').parent().click();
extension/readygraph/assets/close-icon.png ADDED
Binary file
extension/readygraph/assets/dialog_close.png ADDED
Binary file
extension/readygraph/extension.php CHANGED
@@ -55,7 +55,8 @@ function add_readygraph_plugin_warning() {
55
  if (get_option('readygraph_access_token', '') != '') return;
56
 
57
  global $hook_suffix, $current_user, $menu_slug;
58
- if ( $hook_suffix == 'plugins.php' ) {
 
59
  echo '<div class="updated" style="padding: 0; margin: 0; border: none; background: none;">
60
  <style type="text/css">
61
  .readygraph_activate {
@@ -129,6 +130,11 @@ function add_readygraph_plugin_warning() {
129
  color:#FFF;
130
  font-weight:normal
131
  }
 
 
 
 
 
132
  </style>
133
  <form name="readygraph_activate" action="'.admin_url( 'admin.php?page=' . $menu_slug).'" method="POST">
134
  <input type="hidden" name="return" value="1"/>
@@ -138,7 +144,8 @@ function add_readygraph_plugin_warning() {
138
  <div class="aa_button" onclick="document.readygraph_activate.submit();">
139
  '.__('Connect Your ReadyGraph Account').'
140
  </div>
141
- <div class="aa_description">'.__('<strong>Almost done</strong> - connect your account to start getting users.').'</div>
 
142
  </div>
143
  </form>
144
  </div>';
@@ -148,7 +155,15 @@ function add_readygraph_plugin_warning() {
148
  function readygraph_client_script_head() {
149
  global $readygraph_email_subscribe;
150
  if (get_option('readygraph_access_token', '') != '') {
 
151
  ?>
 
 
 
 
 
 
 
152
  <script type='text/javascript'>
153
  var d = top.document;
154
  var h = d.getElementsByTagName('head')[0], script = d.createElement('script');
@@ -170,6 +185,13 @@ script.onload = function(e) {
170
  function process(userInfo) {
171
  //<?php echo $readygraph_email_subscribe ?>
172
  //subscribe(userInfo.get('email'), userInfo.get('first_name'), userInfo.get('last_name'));
 
 
 
 
 
 
 
173
  }
174
  readygraph.framework.authentication.getUserInfo(function(userInfo) {
175
  if (userInfo.get('uid') != null) {
55
  if (get_option('readygraph_access_token', '') != '') return;
56
 
57
  global $hook_suffix, $current_user, $menu_slug;
58
+ if(isset($_GET["readygraph_notice"]) && $_GET["readygraph_notice"] == "dismiss") update_option('readygraph_connect_notice','false');
59
+ if ( $hook_suffix == 'plugins.php' && get_option('readygraph_connect_notice') == 'true' ) {
60
  echo '<div class="updated" style="padding: 0; margin: 0; border: none; background: none;">
61
  <style type="text/css">
62
  .readygraph_activate {
130
  color:#FFF;
131
  font-weight:normal
132
  }
133
+ .aa_close {
134
+ position: absolute;
135
+ right: 18px;
136
+ top: 18px;
137
+ }
138
  </style>
139
  <form name="readygraph_activate" action="'.admin_url( 'admin.php?page=' . $menu_slug).'" method="POST">
140
  <input type="hidden" name="return" value="1"/>
144
  <div class="aa_button" onclick="document.readygraph_activate.submit();">
145
  '.__('Connect Your ReadyGraph Account').'
146
  </div>
147
+ <div class="aa_description">'.__('<strong>Almost done</strong> - connect your account to start getting users.').'</div>
148
+ <div class="aa_close"><a href="' . $_SERVER["PHP_SELF"] . '?readygraph_notice=dismiss"><img src="'.plugin_dir_url( __FILE__ ).'assets/dialog_close.png"></a></div>
149
  </div>
150
  </form>
151
  </div>';
155
  function readygraph_client_script_head() {
156
  global $readygraph_email_subscribe;
157
  if (get_option('readygraph_access_token', '') != '') {
158
+ if (get_option('readygraph_enable_branding', '') == 'false') {
159
  ?>
160
+ <style>
161
+ /* FOR INLINE WIDGET */
162
+ .rgw-text {
163
+ display: none !important;
164
+ }
165
+ </style>
166
+ <?php } ?>
167
  <script type='text/javascript'>
168
  var d = top.document;
169
  var h = d.getElementsByTagName('head')[0], script = d.createElement('script');
185
  function process(userInfo) {
186
  //<?php echo $readygraph_email_subscribe ?>
187
  //subscribe(userInfo.get('email'), userInfo.get('first_name'), userInfo.get('last_name'));
188
+ var email = userInfo.get('email');
189
+ var first_name = userInfo.get('first_name');
190
+ var last_name = userInfo.get('last_name');
191
+
192
+ //alert(email);
193
+ //alert(first_name);
194
+ //alert(last_name);
195
  }
196
  readygraph.framework.authentication.getUserInfo(function(userInfo) {
197
  if (userInfo.get('uid') != null) {
readygraph-extension.php CHANGED
@@ -58,7 +58,8 @@ EOF;
58
  }
59
  */
60
  function on_plugin_activated_readygraph_s2_redirect(){
61
- global $menu_slug;
 
62
  $setting_url="admin.php?page=$menu_slug";
63
  if (get_option('rg_s2_plugin_do_activation_redirect', false)) {
64
  delete_option('rg_s2_plugin_do_activation_redirect');
@@ -72,4 +73,5 @@ EOF;
72
  add_action('admin_notices', 'add_readygraph_plugin_warning');
73
  add_action('wp_head', 'readygraph_client_script_head');
74
  add_action('admin_init', 'on_plugin_activated_readygraph_s2_redirect');
 
75
  ?>
58
  }
59
  */
60
  function on_plugin_activated_readygraph_s2_redirect(){
61
+ update_option('readygraph_connect_notice','true');
62
+ global $menu_slug;
63
  $setting_url="admin.php?page=$menu_slug";
64
  if (get_option('rg_s2_plugin_do_activation_redirect', false)) {
65
  delete_option('rg_s2_plugin_do_activation_redirect');
73
  add_action('admin_notices', 'add_readygraph_plugin_warning');
74
  add_action('wp_head', 'readygraph_client_script_head');
75
  add_action('admin_init', 'on_plugin_activated_readygraph_s2_redirect');
76
+
77
  ?>
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.8
7
  Author: Matthew Robinson, tanaylakhani
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.8' );
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.9
7
  Author: Matthew Robinson, tanaylakhani
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.9' );
59
  define( 'S2PATH', trailingslashit(dirname(__FILE__)) );
60
  define( 'S2DIR', trailingslashit(dirname(plugin_basename(__FILE__))) );
61
  define( 'S2URL', plugin_dir_url(dirname(__FILE__)) . S2DIR );