Sidekick - Version 1.6.16

Version Description

  • Changed deactivation flow so user gets to keep their activation id
Download this release

Release Info

Developer raptor235
Plugin Icon 128x128 Sidekick
Version 1.6.16
Comparing to
See all releases

Code changes from version 1.6.15 to 1.6.16

Files changed (3) hide show
  1. libs/sk_config_data.php +4 -1
  2. readme.txt +5 -2
  3. sidekick.php +6 -16
libs/sk_config_data.php CHANGED
@@ -121,6 +121,7 @@ class sk_config_data{
121
  $printed = false;
122
 
123
  $output = '[';
 
124
 
125
  if (is_array($active_plugins)) {
126
  foreach ($active_plugins as $plugins_key => $plugin) {
@@ -131,6 +132,7 @@ class sk_config_data{
131
  $data['Name'] = addslashes($data['Name']);
132
  $output .= "{'{$data['Name']}' : '{$data['Version']}'}";
133
  $printed = true;
 
134
  }
135
  }
136
 
@@ -141,10 +143,11 @@ class sk_config_data{
141
  $plugin['Name'] = addslashes($plugin['Name']);
142
  $output .= "{'{$plugin['Name']}' : '{$plugin['Version']}'}";
143
  $printed = true;
 
144
  }
145
  }
146
  $output .= ']';
147
- return $output;
148
  }
149
 
150
  function get_user_role(){
121
  $printed = false;
122
 
123
  $output = '[';
124
+ $count = 0;
125
 
126
  if (is_array($active_plugins)) {
127
  foreach ($active_plugins as $plugins_key => $plugin) {
132
  $data['Name'] = addslashes($data['Name']);
133
  $output .= "{'{$data['Name']}' : '{$data['Version']}'}";
134
  $printed = true;
135
+ $count++;
136
  }
137
  }
138
 
143
  $plugin['Name'] = addslashes($plugin['Name']);
144
  $output .= "{'{$plugin['Name']}' : '{$plugin['Version']}'}";
145
  $printed = true;
146
+ $count++;
147
  }
148
  }
149
  $output .= ']';
150
+ return array('plugins' => $output, 'count' => $count);
151
  }
152
 
153
  function get_user_role(){
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: http://www.sidekick.pro
4
  Tags: help, tutorial, training, learn, learning, sidekick, guide, teach, video, manual, videos, wphelp, support, instructions, question, questions, answers, answer, clippy, q&a, wpuniversity, helper, walkthrough
5
  Requires at least: 3.7
6
  Tested up to: 4.0
7
- Stable tag: 1.6.15
8
  License: GNU Version 2 or Any Later Version
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -52,7 +52,7 @@ With the user’s permission, Sidekick will collect anonymous data to track walk
52
 
53
  1. In /wp-admin/, go to Plugins > Add New.
54
  2. Search for "Sidekick".
55
- 3. Look for "Sidekick” (should be the only result) .
56
  4. Click Install Now.
57
  5. After installation has completed, click Activate Plugin.
58
 
@@ -131,6 +131,9 @@ Absolutely. In fact, we rely on users like you to tell us about things that nee
131
  == Changelog ==
132
 
133
  = 1.6.16 =
 
 
 
134
  * Fixes hotspots not showing up in certain cases
135
  * Fixes harcoded issue with db table prefix
136
  * Style fixes on audio only mode
4
  Tags: help, tutorial, training, learn, learning, sidekick, guide, teach, video, manual, videos, wphelp, support, instructions, question, questions, answers, answer, clippy, q&a, wpuniversity, helper, walkthrough
5
  Requires at least: 3.7
6
  Tested up to: 4.0
7
+ Stable tag: 1.6.16
8
  License: GNU Version 2 or Any Later Version
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
52
 
53
  1. In /wp-admin/, go to Plugins > Add New.
54
  2. Search for "Sidekick".
55
+ 3. Look for "Sidekick” (should be the only result).
56
  4. Click Install Now.
57
  5. After installation has completed, click Activate Plugin.
58
 
131
  == Changelog ==
132
 
133
  = 1.6.16 =
134
+ * Changed deactivation flow so user gets to keep their activation id
135
+
136
+ = 1.6.15 =
137
  * Fixes hotspots not showing up in certain cases
138
  * Fixes harcoded issue with db table prefix
139
  * Style fixes on audio only mode
sidekick.php CHANGED
@@ -6,7 +6,7 @@ Plugin URL: http://wordpress.org/plugins/sidekick/
6
  Description: Adds a real-time WordPress training walkthroughs right in your Dashboard
7
  Requires at least: 3.8
8
  Tested up to: 4.0
9
- Version: 1.6.15
10
  Author: Sidekick.pro
11
  Author URI: http://www.sidekick.pro
12
  */
@@ -111,12 +111,6 @@ class Sidekick{
111
 
112
  if (isset($_POST['option_page']) && $_POST['option_page'] == 'sk_license') {
113
 
114
- if (isset($_POST['first_name']) && $_POST['first_name'])
115
- update_option('sk_first_name',$_POST['first_name']);
116
-
117
- if (isset($_POST['email']) && $_POST['email'])
118
- update_option('sk_email',$_POST['email']);
119
-
120
  if (isset($_POST['activation_id']) && $_POST['activation_id']){
121
  $result = $this->activate(true);
122
  } else {
@@ -145,8 +139,6 @@ class Sidekick{
145
  }
146
 
147
  $activation_id = get_option( 'sk_activation_id' );
148
- $email = get_option( 'sk_email' );
149
- $first_name = get_option( 'sk_first_name' );
150
  $sk_track_data = get_option( 'sk_track_data' );
151
  $current_user = wp_get_current_user();
152
  $status = 'Free';
@@ -158,9 +150,6 @@ class Sidekick{
158
  $status = 'Checking...';
159
  }
160
 
161
- if (!$first_name) $first_name = $current_user->user_firstname;
162
- if (!$email) $email = $current_user->user_email;
163
-
164
  global $wp_version;
165
  if (version_compare($wp_version, '3.7', '<=')) {
166
  $error = "Sorry, Sidekick requires WordPress 3.7 or higher to function.";
@@ -217,7 +206,7 @@ class Sidekick{
217
 
218
  $user_role = $sk_config_data->get_user_role();
219
  $site_url = $sk_config_data->get_domain();
220
- $installed_plugins = $sk_config_data->get_plugins();
221
  $disabled_wts = $sk_config_data->get_disabled_wts();
222
  $current_url = $sk_config_data->get_current_url();
223
  $post_types = $sk_config_data->get_post_types();
@@ -228,6 +217,9 @@ class Sidekick{
228
  $post_types_and_statuses = $sk_config_data->get_post_types_and_statuses();
229
  $number_of_themes = $sk_config_data->get_themes();
230
 
 
 
 
231
  // $sk_composer_button = true; // BETA
232
 
233
  delete_option( 'sk_just_activated' );
@@ -247,6 +239,7 @@ class Sidekick{
247
  <?php echo $comments ?>
248
  <?php echo $post_statuses ?>
249
  <?php echo $post_types_and_statuses ?>
 
250
  disable_wts: <?php echo $disabled_wts ?>,
251
  installed_plugins: <?php echo $installed_plugins ?>,
252
  is_multisite: <?php echo (is_multisite()) ? "true" : "false" ?>,
@@ -412,9 +405,6 @@ class Sidekick{
412
  window._gaq.push(['sk._trackEvent', 'Plugin - Deactivate', '', <?php echo plugin_version ?>, 0,true]);
413
  </script>
414
  <?php
415
- delete_option( 'sk_activation_id' );
416
- delete_option( 'sk_first_name' );
417
- delete_option( 'sk_email' );
418
  delete_option( 'sk_activated' );
419
  }
420
  }
6
  Description: Adds a real-time WordPress training walkthroughs right in your Dashboard
7
  Requires at least: 3.8
8
  Tested up to: 4.0
9
+ Version: 1.6.16
10
  Author: Sidekick.pro
11
  Author URI: http://www.sidekick.pro
12
  */
111
 
112
  if (isset($_POST['option_page']) && $_POST['option_page'] == 'sk_license') {
113
 
 
 
 
 
 
 
114
  if (isset($_POST['activation_id']) && $_POST['activation_id']){
115
  $result = $this->activate(true);
116
  } else {
139
  }
140
 
141
  $activation_id = get_option( 'sk_activation_id' );
 
 
142
  $sk_track_data = get_option( 'sk_track_data' );
143
  $current_user = wp_get_current_user();
144
  $status = 'Free';
150
  $status = 'Checking...';
151
  }
152
 
 
 
 
153
  global $wp_version;
154
  if (version_compare($wp_version, '3.7', '<=')) {
155
  $error = "Sorry, Sidekick requires WordPress 3.7 or higher to function.";
206
 
207
  $user_role = $sk_config_data->get_user_role();
208
  $site_url = $sk_config_data->get_domain();
209
+ $plugin_data = $sk_config_data->get_plugins();
210
  $disabled_wts = $sk_config_data->get_disabled_wts();
211
  $current_url = $sk_config_data->get_current_url();
212
  $post_types = $sk_config_data->get_post_types();
217
  $post_types_and_statuses = $sk_config_data->get_post_types_and_statuses();
218
  $number_of_themes = $sk_config_data->get_themes();
219
 
220
+ $installed_plugins = $plugin_data['plugins'];
221
+ $plugin_count = $plugin_data['count'];
222
+
223
  // $sk_composer_button = true; // BETA
224
 
225
  delete_option( 'sk_just_activated' );
239
  <?php echo $comments ?>
240
  <?php echo $post_statuses ?>
241
  <?php echo $post_types_and_statuses ?>
242
+ plugin_count: <?php echo $plugin_count ?>,
243
  disable_wts: <?php echo $disabled_wts ?>,
244
  installed_plugins: <?php echo $installed_plugins ?>,
245
  is_multisite: <?php echo (is_multisite()) ? "true" : "false" ?>,
405
  window._gaq.push(['sk._trackEvent', 'Plugin - Deactivate', '', <?php echo plugin_version ?>, 0,true]);
406
  </script>
407
  <?php
 
 
 
408
  delete_option( 'sk_activated' );
409
  }
410
  }