WordPress Social Tools, Related Posts, Monetization – Shareaholic - Version 6.1.3.3

Version Description

  • Upgraded PHP short tags
  • Much faster Related Content processing for new users!
  • A host of bug fixes and performance improvements
  • Deprecated Yandex
Download this release

Release Info

Developer shareaholic
Plugin Icon 128x128 WordPress Social Tools, Related Posts, Monetization – Shareaholic
Version 6.1.3.3
Comparing to
See all releases

Code changes from version 6.1.3.2 to 6.1.3.3

Files changed (17) hide show
  1. includes/bookmarks-data.php +0 -5
  2. includes/shrsb_activation_page.php +2 -4
  3. includes/shrsb_analytics_settings_page.php +7 -2
  4. includes/shrsb_classicbookmarks_settings_page.php +8 -3
  5. includes/shrsb_landing_page.php +1 -2
  6. includes/shrsb_recommendations_settings_page.php +8 -3
  7. includes/shrsb_sexybookmarks_page.php +7 -5
  8. includes/shrsb_sexybookmarks_settings_page.php +15 -6
  9. includes/shrsb_topbar_settings_page.php +1 -1
  10. readme.txt +17 -16
  11. screenshot-1.png +0 -0
  12. screenshot-2.png +0 -0
  13. screenshot-3.png +0 -0
  14. screenshot-4.png +0 -0
  15. screenshot-5.png +0 -0
  16. screenshot-6.png +0 -0
  17. sexy-bookmarks.php +33 -22
includes/bookmarks-data.php CHANGED
@@ -137,11 +137,6 @@ $shrsb_bookmarks_data=array(
137
  'check'=>sprintf($checkthis_text,'BobrDobr').__(' (Russian)', 'shrsb'),
138
  'share'=>__('Share this on ', 'shrsb').'BobrDobr'
139
  ),
140
- 'shr-yandex'=>array(
141
- 'id'=>267,
142
- 'check'=>sprintf($checkthis_text,'Yandex.Bookmarks').__(' (Russian)', 'shrsb'),
143
- 'share'=>__('Add this to ', 'shrsb').'Yandex.Bookmarks'
144
- ),
145
  'shr-memoryru'=>array(
146
  'id'=>269,
147
  'check'=>sprintf($checkthis_text,'Memory.ru').__(' (Russian)', 'shrsb'),
137
  'check'=>sprintf($checkthis_text,'BobrDobr').__(' (Russian)', 'shrsb'),
138
  'share'=>__('Share this on ', 'shrsb').'BobrDobr'
139
  ),
 
 
 
 
 
140
  'shr-memoryru'=>array(
141
  'id'=>269,
142
  'check'=>sprintf($checkthis_text,'Memory.ru').__(' (Russian)', 'shrsb'),
includes/shrsb_activation_page.php CHANGED
@@ -23,7 +23,7 @@
23
 
24
  <input type="hidden" name="activate" value="1" />
25
  <div class="shrsbsubmit" style="margin: 38px 8px 10px!important;">
26
- <input type="submit" id="activate" value="<?php _e('Enable Shareaholic »', 'shrsb'); ?>" />
27
  </div>
28
  </form>
29
 
@@ -31,9 +31,7 @@
31
 
32
  <div style="display:block; font-size: 11px; color: #777777; width: 960px;">
33
 
34
- <?php echo sprintf(__('<p>By enabling Shareaholic, you are accepting our %sTerms of Service%s. At times, to function our plugin sends data to trusted 3rd party services like Facebook, Twitter, Google Analytics, Quantcast, AppNexus and DataXu. Your privacy is critically important to us. Please see our %sPrivacy Promise%s for more information.</p>', 'shrsb'), '<a href="https://shareaholic.com/terms/" target="_new">', '</a>', '<a href="https://shareaholic.com/privacy/" target="_new">', '</a>'); ?>
35
-
36
- <?php _e("<p>Shareaholic is trusted by over 200 thousand publishers and touches almost 300 million people each month. Designed and built with all the love in the world in Cambridge, Massachusetts.</p>"); ?>
37
 
38
  </div>
39
 
23
 
24
  <input type="hidden" name="activate" value="1" />
25
  <div class="shrsbsubmit" style="margin: 38px 8px 10px!important;">
26
+ <input type="submit" id="activate" value="<?php _e('Click here to enable Shareaholic now »', 'shrsb'); ?>" />
27
  </div>
28
  </form>
29
 
31
 
32
  <div style="display:block; font-size: 11px; color: #777777; width: 960px;">
33
 
34
+ <?php echo sprintf(__('<p>By enabling Shareaholic, you are accepting our %sTerms of Service%s and %sPrivacy Policy%s. Shareaholic is trusted by over 200,000 websites like yours and touches almost 300 million people each month. Designed and built with all the love in the world in Boston, Massachusetts.</p>', 'shrsb'), '<a href="https://shareaholic.com/terms/" target="_new">', '</a>', '<a href="https://shareaholic.com/privacy/" target="_new">', '</a>'); ?>
 
 
35
 
36
  </div>
37
 
includes/shrsb_analytics_settings_page.php CHANGED
@@ -46,6 +46,8 @@ function shrsb_analytics_settings_page() {
46
  // processing form submission
47
  $status_message = "";
48
  $error_message = "";
 
 
49
  if(isset($_POST['save_changes_sa'])) {
50
 
51
  // Set success message
@@ -57,7 +59,7 @@ function shrsb_analytics_settings_page() {
57
  if(isset($_POST[$field])) { // this is to prevent warning if $_POST[$field] is not defined
58
  $fieldval = $_POST[$field];
59
  if($field == 'pubGaSocial' && $fieldval != $shrsb_analytics[$field]) {
60
- shr_sendTrackingEvent('FeatureToggle', array('f_updated' => 'f_analytics', 'enabled' => ($fieldval == '0' ? 'true' : 'false')));
61
  }
62
  $shrsb_analytics[$field] = $fieldval;
63
  } else {
@@ -66,7 +68,10 @@ function shrsb_analytics_settings_page() {
66
  }
67
 
68
  update_option('ShareaholicAnalytics',$shrsb_analytics);
69
-
 
 
 
70
 
71
  }//Closed Save
72
 
46
  // processing form submission
47
  $status_message = "";
48
  $error_message = "";
49
+ $setting_changed = false;
50
+
51
  if(isset($_POST['save_changes_sa'])) {
52
 
53
  // Set success message
59
  if(isset($_POST[$field])) { // this is to prevent warning if $_POST[$field] is not defined
60
  $fieldval = $_POST[$field];
61
  if($field == 'pubGaSocial' && $fieldval != $shrsb_analytics[$field]) {
62
+ $setting_changed = true;
63
  }
64
  $shrsb_analytics[$field] = $fieldval;
65
  } else {
68
  }
69
 
70
  update_option('ShareaholicAnalytics',$shrsb_analytics);
71
+
72
+ if ($setting_changed == true){
73
+ shr_sendTrackingEvent('FeatureToggle', array('f_updated' => 'f_analytics', 'enabled' => ($shrsb_analytics['pubGaSocial'] == '1' ? 'true' : 'false')));
74
+ }
75
 
76
  }//Closed Save
77
 
includes/shrsb_classicbookmarks_settings_page.php CHANGED
@@ -8,7 +8,7 @@ function shrsb_cb_settings_page() {
8
  global $shrsb_cb;
9
 
10
  // Add all the global varaible declarations for the $shrsb_cb_plugopts
11
- echo '<div class="wrap""><div class="icon32" id="icon-options-general"><br></div><h2>'.__('ClassicBookmarks Settings', 'shrsb').'</h2></div>';
12
  //Defaults - set if not present
13
  if (!isset($_POST['reset_all_options_cb'])){$_POST['reset_all_options_cb'] = '1';}
14
  if (!isset($_POST['shrsbresetallwarn-choice'])){$_POST['shrsbresetallwarn-choice'] = 'no';}
@@ -47,6 +47,8 @@ function shrsb_cb_settings_page() {
47
  // processing form submission
48
  $status_message = "";
49
  $error_message = "";
 
 
50
  if(isset($_POST['save_changes_cb'])) {
51
 
52
  // Set success message
@@ -58,7 +60,7 @@ function shrsb_cb_settings_page() {
58
  if(isset($_POST[$field])) { // this is to prevent warning if $_POST[$field] is not defined
59
  $fieldval = $_POST[$field];
60
  if($field == 'cb' && $fieldval != $shrsb_cb[$field]) {
61
- shr_sendTrackingEvent('FeatureToggle', array('f_updated' => 'f_classic', 'enabled' => ($fieldval == '0' ? 'true' : 'false')));
62
  }
63
  $shrsb_cb[$field] = $fieldval;
64
  } else {
@@ -67,7 +69,10 @@ function shrsb_cb_settings_page() {
67
  }
68
 
69
  update_option('ShareaholicClassicBookmarks',$shrsb_cb);
70
-
 
 
 
71
 
72
  }//Closed Save
73
 
8
  global $shrsb_cb;
9
 
10
  // Add all the global varaible declarations for the $shrsb_cb_plugopts
11
+ echo '<div class="wrap""><div class="icon32" id="icon-options-general"><br></div><h2>'.__('Share Buttons: ClassicBookmarks Settings', 'shrsb').'</h2></div>';
12
  //Defaults - set if not present
13
  if (!isset($_POST['reset_all_options_cb'])){$_POST['reset_all_options_cb'] = '1';}
14
  if (!isset($_POST['shrsbresetallwarn-choice'])){$_POST['shrsbresetallwarn-choice'] = 'no';}
47
  // processing form submission
48
  $status_message = "";
49
  $error_message = "";
50
+ $setting_changed = false;
51
+
52
  if(isset($_POST['save_changes_cb'])) {
53
 
54
  // Set success message
60
  if(isset($_POST[$field])) { // this is to prevent warning if $_POST[$field] is not defined
61
  $fieldval = $_POST[$field];
62
  if($field == 'cb' && $fieldval != $shrsb_cb[$field]) {
63
+ $setting_changed = true;
64
  }
65
  $shrsb_cb[$field] = $fieldval;
66
  } else {
69
  }
70
 
71
  update_option('ShareaholicClassicBookmarks',$shrsb_cb);
72
+
73
+ if ($setting_changed == true){
74
+ shr_sendTrackingEvent('FeatureToggle', array('f_updated' => 'f_classic', 'enabled' => ($shrsb_cb['cb'] == '1' ? 'true' : 'false')));
75
+ }
76
 
77
  }//Closed Save
78
 
includes/shrsb_landing_page.php CHANGED
@@ -28,7 +28,6 @@
28
  </div>
29
 
30
  <div id="sb_box" class="select_product">
31
- <img style="float:left; margin-left:-25px;margin-top:-19px;" src="<?php echo SHRSB_PLUGPATH."images/new_badge.png" ?>">
32
  <div class="shr-landing-product-icon"><img src="<?php echo SHRSB_PLUGPATH."images/cbm.png" ?>"></div>
33
  <div class="shr-landing-product-name"><h2>ClassicBookmarks</h2><span class="shr-landing-product-desc">Beautiful, elegant, classic styled sharing buttons.</span></div>
34
  <div class="shr-landing-product-configure"><a href="admin.php?page=shareaholic_classicbookmarks.php" class="btn btn-large <?php global $shrsb_cb; echo ((@$shrsb_cb['cb'] == "1")? '' : "btn-primary");?>"><?php echo ((@$shrsb_cb['cb'] == "1")? '<i class="icon-cog" style="margin-top:2px;"></i> Settings' : "Enable");?></a></div>
@@ -41,7 +40,7 @@
41
  <div id="rec_box" class="select_product">
42
  <img style="float:left; margin-left:-25px;margin-top:-19px;" src="<?php echo SHRSB_PLUGPATH."images/new_badge.png" ?>">
43
  <div class="shr-landing-product-icon"><img src="<?php echo SHRSB_PLUGPATH."images/thumbs.png" ?>"></div>
44
- <div class="shr-landing-product-name"><h2>Recommendations</h2><span class="shr-landing-product-desc">Proven to drive more pageviews by helping your readers discover more of your amazing content.</span></div>
45
  <div class="shr-landing-product-configure"><a href="admin.php?page=shareaholic_recommendations.php" class="btn btn-large <?php global $shrsb_recommendations; echo ((@$shrsb_recommendations['recommendations'] == "1")? '' : "btn-primary");?>"><?php echo ((@$shrsb_recommendations['recommendations'] == "1")? '<i class="icon-cog" style="margin-top:2px;"></i> Settings' : "Enable");?></a></div>
46
  </div>
47
 
28
  </div>
29
 
30
  <div id="sb_box" class="select_product">
 
31
  <div class="shr-landing-product-icon"><img src="<?php echo SHRSB_PLUGPATH."images/cbm.png" ?>"></div>
32
  <div class="shr-landing-product-name"><h2>ClassicBookmarks</h2><span class="shr-landing-product-desc">Beautiful, elegant, classic styled sharing buttons.</span></div>
33
  <div class="shr-landing-product-configure"><a href="admin.php?page=shareaholic_classicbookmarks.php" class="btn btn-large <?php global $shrsb_cb; echo ((@$shrsb_cb['cb'] == "1")? '' : "btn-primary");?>"><?php echo ((@$shrsb_cb['cb'] == "1")? '<i class="icon-cog" style="margin-top:2px;"></i> Settings' : "Enable");?></a></div>
40
  <div id="rec_box" class="select_product">
41
  <img style="float:left; margin-left:-25px;margin-top:-19px;" src="<?php echo SHRSB_PLUGPATH."images/new_badge.png" ?>">
42
  <div class="shr-landing-product-icon"><img src="<?php echo SHRSB_PLUGPATH."images/thumbs.png" ?>"></div>
43
+ <div class="shr-landing-product-name"><h2>Recommendations / Related Content</h2><span class="shr-landing-product-desc">Proven to drive more pageviews by helping your readers discover more of your amazing content.</span></div>
44
  <div class="shr-landing-product-configure"><a href="admin.php?page=shareaholic_recommendations.php" class="btn btn-large <?php global $shrsb_recommendations; echo ((@$shrsb_recommendations['recommendations'] == "1")? '' : "btn-primary");?>"><?php echo ((@$shrsb_recommendations['recommendations'] == "1")? '<i class="icon-cog" style="margin-top:2px;"></i> Settings' : "Enable");?></a></div>
45
  </div>
46
 
includes/shrsb_recommendations_settings_page.php CHANGED
@@ -8,7 +8,7 @@ function shrsb_recommendations_settings_page() {
8
  global $shrsb_recommendations;
9
 
10
  // Add all the global varaible declarations for the $shrsb_recommendations_plugopts
11
- echo '<div class="wrap""><div class="icon32" id="icon-options-general"><br></div><h2>'.__('Recommendations Settings', 'shrsb').'</h2></div>';
12
  //Defaults - set if not present
13
  if (!isset($_POST['reset_all_options_recommendations'])){$_POST['reset_all_options_recommendations'] = '1';}
14
  if (!isset($_POST['shrsbresetallwarn-choice'])){$_POST['shrsbresetallwarn-choice'] = 'no';}
@@ -47,6 +47,8 @@ function shrsb_recommendations_settings_page() {
47
  // processing form submission
48
  $status_message = "";
49
  $error_message = "";
 
 
50
  if(isset($_POST['save_changes_rd'])) {
51
 
52
  // Set success message
@@ -58,7 +60,7 @@ function shrsb_recommendations_settings_page() {
58
  if(isset($_POST[$field])) { // this is to prevent warning if $_POST[$field] is not defined
59
  $fieldval = $_POST[$field];
60
  if($field == 'recommendations' && $fieldval != $shrsb_recommendations[$field]) {
61
- shr_sendTrackingEvent('FeatureToggle', array('f_updated' => 'f_rec', 'enabled' => ($fieldval == '0' ? 'true' : 'false')));
62
  }
63
  $shrsb_recommendations[$field] = $fieldval;
64
  } else {
@@ -70,7 +72,10 @@ function shrsb_recommendations_settings_page() {
70
  $shrsb_recommendations['num']=5;
71
 
72
  update_option('ShareaholicRecommendations',$shrsb_recommendations);
73
-
 
 
 
74
 
75
  }//Closed Save
76
 
8
  global $shrsb_recommendations;
9
 
10
  // Add all the global varaible declarations for the $shrsb_recommendations_plugopts
11
+ echo '<div class="wrap""><div class="icon32" id="icon-options-general"><br></div><h2>'.__('Recommendations: Related Content Settings', 'shrsb').'</h2></div>';
12
  //Defaults - set if not present
13
  if (!isset($_POST['reset_all_options_recommendations'])){$_POST['reset_all_options_recommendations'] = '1';}
14
  if (!isset($_POST['shrsbresetallwarn-choice'])){$_POST['shrsbresetallwarn-choice'] = 'no';}
47
  // processing form submission
48
  $status_message = "";
49
  $error_message = "";
50
+ $setting_changed = false;
51
+
52
  if(isset($_POST['save_changes_rd'])) {
53
 
54
  // Set success message
60
  if(isset($_POST[$field])) { // this is to prevent warning if $_POST[$field] is not defined
61
  $fieldval = $_POST[$field];
62
  if($field == 'recommendations' && $fieldval != $shrsb_recommendations[$field]) {
63
+ $setting_changed = true;
64
  }
65
  $shrsb_recommendations[$field] = $fieldval;
66
  } else {
72
  $shrsb_recommendations['num']=5;
73
 
74
  update_option('ShareaholicRecommendations',$shrsb_recommendations);
75
+
76
+ if ($setting_changed == true){
77
+ shr_sendTrackingEvent('FeatureToggle', array('f_updated' => 'f_rec', 'enabled' => ($shrsb_recommendations['recommendations'] == '1' ? 'true' : 'false')));
78
+ }
79
 
80
  }//Closed Save
81
 
includes/shrsb_sexybookmarks_page.php CHANGED
@@ -100,7 +100,6 @@ function shrsb_sb_set_options($action = NULL){
100
  //Get the settings from the database
101
  $database_Settings = get_option('SexyBookmarks');
102
 
103
-
104
  if($database_Settings){//got the settings in the database
105
 
106
  // Check only when upgrading
@@ -112,8 +111,9 @@ function shrsb_sb_set_options($action = NULL){
112
  $database_Settings['firstrun'] = '0';
113
  $need_to_update = true;
114
  }
 
115
  //For first time activation
116
- update_option("SHR_activate",1);
117
 
118
  //Check whether all the settings are present or not
119
  foreach($shrsb_sb_plugopts_default as $k => $v){
@@ -122,8 +122,10 @@ function shrsb_sb_set_options($action = NULL){
122
  $need_to_update = true;
123
  }
124
  }
 
125
  //Check for the tweetbutton in likebutton set
126
  if(!in_array("shr-tw-button", $database_Settings["likeButtonOrderTop"]) ) array_push($database_Settings["likeButtonOrderTop"],"shr-tw-button");
 
127
  if(!in_array("shr-tw-button", $database_Settings["likeButtonOrderBottom"]) ) array_push($database_Settings["likeButtonOrderBottom"],"shr-tw-button");
128
 
129
  if($need_to_update) update_option("SexyBookmarks",$database_Settings);
@@ -149,14 +151,14 @@ add_option('SHRSB_DefaultSprite',true);
149
 
150
  // If plugin is upgrading
151
  if(SHRSB_UPGRADING == TRUE) {
152
-
153
  //Remove the Disabled Services
154
  if(isset ($shrsb_plugopts) && isset($shrsb_plugopts['service'])){
155
  $services = explode(',', $shrsb_plugopts['service']);
156
 
157
  if(!empty($services)){
158
  // Removing blocked services from sb services list
159
- $disable_services = array( '4', '12', '68', '77', '159', '185', '186', '195', '207', '237', '257', '264', '190', '10', '287', '188', '100', '277', '48', '210' );
160
  $services = array_diff($services, $disable_services);
161
  $shrsb_plugopts['service'] = implode(',', $services );
162
  }
@@ -165,7 +167,7 @@ if(SHRSB_UPGRADING == TRUE) {
165
  if(isset ($shrsb_plugopts) && isset($shrsb_plugopts['bookmark'])){
166
  // Removing blocked services from bookmarks list
167
 
168
- $shrsb_plugopts['bookmark'] = array_diff($shrsb_plugopts['bookmark'], array( 'shr-twittley', 'shr-comfeed', 'shr-ning', 'shr-strands', 'shr-sphinn', 'shr-tipd', 'shr-faqpal', 'shr-technorati', 'shr-yahoobuzz', 'shr-posterous', 'shr-squidoo' ));
169
  }
170
 
171
  if(isset ($shrsb_plugopts) && isset($shrsb_plugopts['reloption']) && $shrsb_plugopts['reloption'] === "" ){
100
  //Get the settings from the database
101
  $database_Settings = get_option('SexyBookmarks');
102
 
 
103
  if($database_Settings){//got the settings in the database
104
 
105
  // Check only when upgrading
111
  $database_Settings['firstrun'] = '0';
112
  $need_to_update = true;
113
  }
114
+
115
  //For first time activation
116
+ update_option("SHR_activate", 1);
117
 
118
  //Check whether all the settings are present or not
119
  foreach($shrsb_sb_plugopts_default as $k => $v){
122
  $need_to_update = true;
123
  }
124
  }
125
+
126
  //Check for the tweetbutton in likebutton set
127
  if(!in_array("shr-tw-button", $database_Settings["likeButtonOrderTop"]) ) array_push($database_Settings["likeButtonOrderTop"],"shr-tw-button");
128
+
129
  if(!in_array("shr-tw-button", $database_Settings["likeButtonOrderBottom"]) ) array_push($database_Settings["likeButtonOrderBottom"],"shr-tw-button");
130
 
131
  if($need_to_update) update_option("SexyBookmarks",$database_Settings);
151
 
152
  // If plugin is upgrading
153
  if(SHRSB_UPGRADING == TRUE) {
154
+
155
  //Remove the Disabled Services
156
  if(isset ($shrsb_plugopts) && isset($shrsb_plugopts['service'])){
157
  $services = explode(',', $shrsb_plugopts['service']);
158
 
159
  if(!empty($services)){
160
  // Removing blocked services from sb services list
161
+ $disable_services = array( '4', '12', '68', '77', '159', '185', '186', '195', '207', '237', '257', '264', '190', '10', '287', '188', '100', '277', '48', '210', '267' );
162
  $services = array_diff($services, $disable_services);
163
  $shrsb_plugopts['service'] = implode(',', $services );
164
  }
167
  if(isset ($shrsb_plugopts) && isset($shrsb_plugopts['bookmark'])){
168
  // Removing blocked services from bookmarks list
169
 
170
+ $shrsb_plugopts['bookmark'] = array_diff($shrsb_plugopts['bookmark'], array( 'shr-twittley', 'shr-comfeed', 'shr-ning', 'shr-strands', 'shr-sphinn', 'shr-tipd', 'shr-faqpal', 'shr-technorati', 'shr-yahoobuzz', 'shr-posterous', 'shr-squidoo', 'shr-yandex' ));
171
  }
172
 
173
  if(isset ($shrsb_plugopts) && isset($shrsb_plugopts['reloption']) && $shrsb_plugopts['reloption'] === "" ){
includes/shrsb_sexybookmarks_settings_page.php CHANGED
@@ -5,7 +5,7 @@ function shrsb_sb_settings_page() {
5
  global $shrsb_plugopts, $shrsb_bookmarks_data, $wpdb, $shrsb_custom_sprite,$shrsb_analytics;
6
  // Add all the global varaible declarations for the $shrsb_plugopts default options e.g.,
7
 
8
- echo '<div class="wrap""><div class="icon32" id="icon-options-general"><br></div><h2>SexyBookmarks Settings</h2></div>';
9
 
10
  //Defaults - set if not present
11
  if (!isset($_POST['reset_all_options_sb'])){$_POST['reset_all_options_sb'] = '1';}
@@ -93,6 +93,8 @@ function shrsb_sb_settings_page() {
93
  // processing form submission
94
  $status_message = "";
95
  $error_message = "";
 
 
96
  if(isset($_POST['save_changes_sb'])) {
97
 
98
  if(isset($_POST['bookmark']['shr-fleck'])) {
@@ -131,7 +133,6 @@ function shrsb_sb_settings_page() {
131
  shrsb_refresh_cache();
132
  _shrsb_copy_file(SHRSB_UPLOADDIR.'index.html', SHRSB_PLUGDIR.'spritegen_default/index.html');
133
  _shrsb_copy_file(SHRSB_UPLOADDIR.'spritegen/index.html', SHRSB_PLUGDIR.'spritegen_default/index.html');
134
-
135
  }
136
 
137
  if (!$error_message) {
@@ -191,7 +192,7 @@ function shrsb_sb_settings_page() {
191
  foreach (array(
192
 
193
  'sexybookmark',
194
-
195
  'position', 'reloption', 'targetopt', 'bookmark',
196
  'shorty', 'pageorpost', 'tweetconfig', 'bgimg-yes', 'mobile-hide', 'bgimg',
197
  'feed', 'expand', 'doNotIncludeJQuery', 'autocenter', 'custom-mods',
@@ -205,9 +206,11 @@ function shrsb_sb_settings_page() {
205
  'tip_text_color' , 'preventminify', 'shrlink', 'perfoption','spritegen_path', 'apikey','ogtags' , 'promo'
206
  )as $field) {
207
  if(isset($_POST[$field])) { // this is to prevent warning if $_POST[$field] is not defined
 
208
  $fieldval = $_POST[$field];
209
- if($field == 'sexybookmark' && $fieldval != $shrsb_plugopts[$field]) {
210
- shr_sendTrackingEvent('FeatureToggle', array('f_updated' => 'f_sexy', 'enabled' => ($fieldval == '0' ? 'true' : 'false')));
 
211
  }
212
  $shrsb_plugopts[$field] = $fieldval;
213
  } else {
@@ -237,8 +240,14 @@ function shrsb_sb_settings_page() {
237
  if($shrsb_plugopts['preventminify'] == '1') {
238
  exclude_from_minify_list();
239
  }
 
240
  $shrsb_plugopts['firstrun'] = '0';
241
  update_option('SexyBookmarks', $shrsb_plugopts);
 
 
 
 
 
242
  $shrsb_plugopts['tweetconfig'] = urldecode($shrsb_plugopts['tweetconfig']);
243
 
244
  update_option('SHRSB_CustomSprite', $shrsb_custom_sprite);
@@ -322,7 +331,7 @@ function shrsb_sb_settings_page() {
322
  ></td>
323
  <td><span class=""><?php _e('Load Time Optimized', 'shrsb'); ?></span></td>
324
  <td><?php
325
- echo $resave_required ? "To Fix: Simply re-save your SB settings." : "";
326
  ?>
327
  </td>
328
  </tr>
5
  global $shrsb_plugopts, $shrsb_bookmarks_data, $wpdb, $shrsb_custom_sprite,$shrsb_analytics;
6
  // Add all the global varaible declarations for the $shrsb_plugopts default options e.g.,
7
 
8
+ echo '<div class="wrap""><div class="icon32" id="icon-options-general"><br></div><h2>Share Buttons: SexyBookmarks Settings</h2></div>';
9
 
10
  //Defaults - set if not present
11
  if (!isset($_POST['reset_all_options_sb'])){$_POST['reset_all_options_sb'] = '1';}
93
  // processing form submission
94
  $status_message = "";
95
  $error_message = "";
96
+ $setting_changed = false;
97
+
98
  if(isset($_POST['save_changes_sb'])) {
99
 
100
  if(isset($_POST['bookmark']['shr-fleck'])) {
133
  shrsb_refresh_cache();
134
  _shrsb_copy_file(SHRSB_UPLOADDIR.'index.html', SHRSB_PLUGDIR.'spritegen_default/index.html');
135
  _shrsb_copy_file(SHRSB_UPLOADDIR.'spritegen/index.html', SHRSB_PLUGDIR.'spritegen_default/index.html');
 
136
  }
137
 
138
  if (!$error_message) {
192
  foreach (array(
193
 
194
  'sexybookmark',
195
+
196
  'position', 'reloption', 'targetopt', 'bookmark',
197
  'shorty', 'pageorpost', 'tweetconfig', 'bgimg-yes', 'mobile-hide', 'bgimg',
198
  'feed', 'expand', 'doNotIncludeJQuery', 'autocenter', 'custom-mods',
206
  'tip_text_color' , 'preventminify', 'shrlink', 'perfoption','spritegen_path', 'apikey','ogtags' , 'promo'
207
  )as $field) {
208
  if(isset($_POST[$field])) { // this is to prevent warning if $_POST[$field] is not defined
209
+
210
  $fieldval = $_POST[$field];
211
+
212
+ if ($field == 'sexybookmark' && $fieldval != $shrsb_plugopts[$field]) {
213
+ $setting_changed = true;
214
  }
215
  $shrsb_plugopts[$field] = $fieldval;
216
  } else {
240
  if($shrsb_plugopts['preventminify'] == '1') {
241
  exclude_from_minify_list();
242
  }
243
+
244
  $shrsb_plugopts['firstrun'] = '0';
245
  update_option('SexyBookmarks', $shrsb_plugopts);
246
+
247
+ if ($setting_changed == true){
248
+ shr_sendTrackingEvent('FeatureToggle', array('f_updated' => 'f_sexy', 'enabled' => ($shrsb_plugopts['sexybookmark'] == '1' ? 'true' : 'false')));
249
+ }
250
+
251
  $shrsb_plugopts['tweetconfig'] = urldecode($shrsb_plugopts['tweetconfig']);
252
 
253
  update_option('SHRSB_CustomSprite', $shrsb_custom_sprite);
331
  ></td>
332
  <td><span class=""><?php _e('Load Time Optimized', 'shrsb'); ?></span></td>
333
  <td><?php
334
+ echo $resave_required ? "To Do: click the \"Save Changes\" button at the bottom of this page." : "";
335
  ?>
336
  </td>
337
  </tr>
includes/shrsb_topbar_settings_page.php CHANGED
@@ -7,7 +7,7 @@
7
  function shrsb_tb_settings_page() {
8
  global $shrsb_tb_plugopts;
9
  // Add all the global varaible declarations for the $shrsb_tb_plugopts
10
- echo '<div class="wrap""><div class="icon32" id="icon-options-general"><br></div><h2>Top Bar Settings</h2></div>';
11
  //Defaults - set if not present
12
  if (!isset($_POST['reset_all_options_tb'])){$_POST['reset_all_options_tb'] = '1';}
13
  if (!isset($_POST['shrsbresetallwarn-choice'])){$_POST['shrsbresetallwarn-choice'] = 'no';}
7
  function shrsb_tb_settings_page() {
8
  global $shrsb_tb_plugopts;
9
  // Add all the global varaible declarations for the $shrsb_tb_plugopts
10
+ echo '<div class="wrap""><div class="icon32" id="icon-options-general"><br></div><h2>Share Buttons: Top Bar Settings</h2></div>';
11
  //Defaults - set if not present
12
  if (!isset($_POST['reset_all_options_tb'])){$_POST['reset_all_options_tb'] = '1';}
13
  if (!isset($_POST['shrsbresetallwarn-choice'])){$_POST['shrsbresetallwarn-choice'] = 'no';}
readme.txt CHANGED
@@ -1,9 +1,9 @@
1
- === Shareaholic | share buttons, related content ===
2
  Contributors: shareaholic
3
- Tags: SexyBookmarks, SexyBookmark, Facebook, Twitter, LinkedIn, URL Shortener, Bitly, TinyURL, Supr, Goo.gl, Google +1, Google Analytics, Google Plus, Google, Instapaper, Wish List, Digg, Google Gmail, Google Notebook, Google Bookmarks, Translate, Tumblr, AIM, Yahoo Messenger, Delicious, StumbleUpon, Bebo, Mister Wong, Evernote, Twine, Diigo, add this, addtoany, share this, share and follow, share and enjoy, sharing is sexy, sharing is caring, Mail, Yahoo, Reddit, Techmeme, Hacker News, Tweet Button, Twitter Button, Fark, Buffer, MySpace, Orkut, Plurk, Identi.ca, Hyves, Netlog, HubSpot, WeHeartIt, Yandex, PrintFriendly, Print, ReadItLater, Yammer, Pinterest, Google Translate, Pinboard, Shareaholic, Shareholic, Bookmarks, Social, Email Button, Social Share, Bookmark Button, Share Button, Social Bookmarking, Bookmarks Menu, Bookmarking, Share, Share Count, Sharebar, Social Media, SEO, Analytics, Stats, Sharing, Saving, Posting, Facebook Like, Facebook Recommend, Facebook Send, WPMU, yaarp, nrelate, outbrain, linkwithin, Related Content, Related Posts, Thumbnails, Recommendations
4
  Requires at least: 2.7
5
  Tested up to: 3.5.1
6
- Stable tag: 6.1.3.2
7
 
8
  Adds an attractive social bookmarking menu and related content widget to your posts, pages, index, or any combination of the three.
9
 
@@ -13,6 +13,7 @@ Shareaholic has proven time and time again to be an extremely useful and success
13
  Our sole aim was to stray away from the "in the box" thinking behind most social bookmarking plugins, and add a little flair that would entice your readers, rather than deterring them with microscopic icons that get lost in pages heavy laden with content.
14
 
15
  = Recent Updates =
 
16
  * Recommendations & Related Content - Increase reader engagement and pageviews by highlighting related content from across your site
17
  * Social Analytics - Actionable and easy to understand
18
  * Classic Bookmarks - Classic Bookmarks offer a clean-cut and professional look for your blog
@@ -22,10 +23,9 @@ Our sole aim was to stray away from the "in the box" thinking behind most social
22
  * Utilizes the [Share API](https://shareaholic.com/api/)
23
  * Localized in 15+ languages
24
 
25
- = Recently Added Services =
26
- * Pinterest
27
- * Google Plus
28
- * Shareaholic Email This
29
 
30
  = Social Analytics =
31
 
@@ -35,7 +35,7 @@ Shareaholic reports all of your important actionable social media metrics includ
35
 
36
  We use industry best practices to make our code as fast and unobtrusive as possible, meaning - for example - that the performance impact is comparable to adding Google Analytics to your site. Because all of the processing and collection runs on our servers and not yours, it doesn't cause any additional load on your hosting account. In addition, our JavaScript is hosted on Amazon's CDN to make fetching it as blazing fast and reliable as possible. In fact, it's one of the fastest proven analytics system, hosted or not hosted, that you can use.
37
 
38
- Shareaholic is used and trusted by hundreds of thousands of publishers and touches almost 300 million people each month. Designed and built with all the love in the world in Cambridge, Massachusetts.
39
 
40
  Note: The analytics portion of Shareaholic may use trusted 3rd party services like Google Analytics and AppNexus to enhance its data.
41
 
@@ -80,12 +80,12 @@ Listed here are credits and special thanks to some of you who have helped us out
80
 
81
  == Screenshots ==
82
 
83
- 1. Sexy Share Buttons - A quick preview of the final outcome (excess hidden)
84
- 2. Sexy Share Buttons - Another preview of the final outcome with excess networks displayed upon hover
85
- 3. Classic Share Buttons - Classic Bookmarks offer a clean-cut and professional look for your blog
86
- 4. Recommendations - Drive pageviews and increase time on site with this related content widget
87
- 5. Top Bar - Drive more shares to your content with this additional call-to-action
88
- 6. An 100% integrated and customizable approach - It all comes together nicely in one place!
89
 
90
 
91
  == Installation ==
@@ -125,10 +125,11 @@ Please see here: [Usage & Installation Instructions](https://shareaholic.com/too
125
 
126
  == Changelog ==
127
 
128
- = 6.1.3.2 =
129
  * Upgraded PHP short tags
130
  * Much faster Related Content processing for new users!
131
  * A host of bug fixes and performance improvements
 
132
 
133
  = 6.1.3.1 =
134
  * Bug fixes & event reporting
@@ -831,7 +832,7 @@ Please see here: [Usage & Installation Instructions](https://shareaholic.com/too
831
 
832
  == Upgrade Notice ==
833
 
834
- = 6.1.3.2 =
835
  Several bug fixes and performance improvements. This is a highly recommended upgrade!
836
 
837
  = 3.2.3.1 =
1
+ === Shareaholic | share buttons & related content ===
2
  Contributors: shareaholic
3
+ Tags: SexyBookmarks, SexyBookmark, Shareaholic, Shareholic, Facebook, Twitter, LinkedIn, URL Shortener, Bitly, TinyURL, Supr, Goo.gl, Google +1, Google Analytics, Google Plus, Google, Instapaper, Wish List, Digg, Google Gmail, Google Notebook, Google Bookmarks, Translate, Tumblr, AIM, Yahoo Messenger, Delicious, StumbleUpon, Mister Wong, Evernote, Twine, Diigo, add this, addtoany, share this, share and follow, share and enjoy, sharing is sexy, sharing is caring, Mail, Yahoo, Reddit, Techmeme, Hacker News, Tweet Button, Twitter Button, Fark, Buffer, MySpace, Orkut, Plurk, Identi.ca, Hyves, Netlog, HubSpot, WeHeartIt, PrintFriendly, Print, ReadItLater, Yammer, Pinterest, Google Translate, Pinboard, Bookmarks, Social, Email Button, Social Share, Bookmark Button, Share Button, Social Bookmarking, Bookmarks Menu, Bookmarking, Share, Share Count, Sharebar, Social Media, SEO, Analytics, Stats, Sharing, Saving, Posting, Facebook Like, Facebook Recommend, Facebook Send, WPMU, yaarp, yarpp, nrelate, outbrain, linkwithin, Related Content, Related Posts, Thumbnails, Recommendations
4
  Requires at least: 2.7
5
  Tested up to: 3.5.1
6
+ Stable tag: 6.1.3.3
7
 
8
  Adds an attractive social bookmarking menu and related content widget to your posts, pages, index, or any combination of the three.
9
 
13
  Our sole aim was to stray away from the "in the box" thinking behind most social bookmarking plugins, and add a little flair that would entice your readers, rather than deterring them with microscopic icons that get lost in pages heavy laden with content.
14
 
15
  = Recent Updates =
16
+
17
  * Recommendations & Related Content - Increase reader engagement and pageviews by highlighting related content from across your site
18
  * Social Analytics - Actionable and easy to understand
19
  * Classic Bookmarks - Classic Bookmarks offer a clean-cut and professional look for your blog
23
  * Utilizes the [Share API](https://shareaholic.com/api/)
24
  * Localized in 15+ languages
25
 
26
+ = Recommendations / Related Content =
27
+
28
+ Increase pageviews and engagement by highlighting relevant content from across your site to your readers who would not otherwise encounter them. Shareaholic is not just yet another related content plugin. It involves a simple installation that's easy to update and tweak. You'll be using well-engineered and optimized code that won't slow or block your pages from loading. You can choose between several themes to match your site's design and customize every pixel if you'd like. Optimized for mobile devices like the iPhone, iPod touch, iPad, Android mobile phones, and more!
 
29
 
30
  = Social Analytics =
31
 
35
 
36
  We use industry best practices to make our code as fast and unobtrusive as possible, meaning - for example - that the performance impact is comparable to adding Google Analytics to your site. Because all of the processing and collection runs on our servers and not yours, it doesn't cause any additional load on your hosting account. In addition, our JavaScript is hosted on Amazon's CDN to make fetching it as blazing fast and reliable as possible. In fact, it's one of the fastest proven analytics system, hosted or not hosted, that you can use.
37
 
38
+ Shareaholic is used and trusted by hundreds of thousands of websites like yours and touches almost 300 million people each month. Designed and built with all the love in the world in Boston, Massachusetts.
39
 
40
  Note: The analytics portion of Shareaholic may use trusted 3rd party services like Google Analytics and AppNexus to enhance its data.
41
 
80
 
81
  == Screenshots ==
82
 
83
+ 1. All the tools and apps you need in one place! Whether you want to get people sharing, grow your fans, make money, or know who's reading your content, we'll help you get it done.
84
+ 2. An 100% integrated and customizable approach - It all comes together nicely in one place!
85
+ 3. Share Buttons (SexyBookmarks Theme) - A quick preview of the final outcome (excess hidden)
86
+ 4. Share Buttons (Classic Theme) - Classic Bookmarks offer a clean-cut and professional look for your blog
87
+ 5. Related Content - Drive pageviews and increase time on site with this tool
88
+ 6. Top Bar - Drive more shares to your content with this additional call-to-action
89
 
90
 
91
  == Installation ==
125
 
126
  == Changelog ==
127
 
128
+ = 6.1.3.3 =
129
  * Upgraded PHP short tags
130
  * Much faster Related Content processing for new users!
131
  * A host of bug fixes and performance improvements
132
+ * Deprecated Yandex
133
 
134
  = 6.1.3.1 =
135
  * Bug fixes & event reporting
832
 
833
  == Upgrade Notice ==
834
 
835
+ = 6.1.3.3 =
836
  Several bug fixes and performance improvements. This is a highly recommended upgrade!
837
 
838
  = 3.2.3.1 =
screenshot-1.png CHANGED
Binary file
screenshot-2.png CHANGED
Binary file
screenshot-3.png CHANGED
Binary file
screenshot-4.png CHANGED
Binary file
screenshot-5.png CHANGED
Binary file
screenshot-6.png CHANGED
Binary file
sexy-bookmarks.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: Shareaholic | share buttons, analytics, related content
4
  Plugin URI: https://shareaholic.com/publishers/
5
  Description: Whether you want to get people sharing, grow your fans, make money, or know who's reading your content, Shareaholic will help you get it done. See <a href="admin.php?page=sexy-bookmarks.php">configuration panel</a> for more settings.
6
- Version: 6.1.3.2
7
  Author: Shareaholic
8
  Author URI: https://shareaholic.com
9
  Credits & Thanks: https://shareaholic.com/tools/wordpress/credits
@@ -14,7 +14,7 @@ Credits & Thanks: https://shareaholic.com/tools/wordpress/credits
14
  * @desc Define Plugin version
15
  */
16
 
17
- define('SHRSB_vNum','6.1.3.2');
18
 
19
 
20
  /*
@@ -36,7 +36,8 @@ if(false !== $shrsb_version && $shrsb_version !== SHRSB_vNum ) {
36
  update_option('SHRSB_DefaultSprite',true);
37
  add_action('admin_notices', 'shrsb_Upgrade', 12);
38
 
39
- // shr_sendTrackingEvent('Upgrade', array('prev_plugin_ver' => get_option('SHRSBvNum')) );
 
40
 
41
  // Added global variable to track the updating state
42
  define('SHRSB_UPGRADING', TRUE);
@@ -143,22 +144,30 @@ require_once 'includes/shrsb_analytics_page.php'; // Analytics global Settings
143
  require_once 'includes/shrsb_recommendations_page.php'; // Recommendations global Settings
144
  require_once 'includes/shrsb_classicbookmarks_page.php'; // Classic Bookmarks global Settings
145
 
 
 
 
 
146
  //populate default analytics values to pass with major events - (un)install, upgrade, (de)activate, etc
147
  //TD: GET THE USER ID IF AVAILABLE
148
 
149
  function shr_getTrackingData() {
150
- global $tracking_metadata, $shrsb_plugopts, $shrsb_cb, $shrsb_tb_plugopts, $shrsb_recommendations;
151
-
 
 
 
 
152
  $tracking_metadata = array(
153
- 'plugin_ver' => SHRSB_vNum,
154
- 'apikey' => isset($shrsb_plugopts['apikey']) ? $shrsb_plugopts['apikey'] : '',
155
- 'domain' => home_url(),
156
- 'theme' => get_option('template'),
157
- 'wp_ver' => get_bloginfo('version'),
158
- 'f_sexy' => (isset($shrsb_plugopts['sexybookmark']) && $shrsb_plugopts['sexybookmark'] == '1') ? 'true' : 'false',
159
- 'f_topbar' => (isset($shrsb_tb_plugopts['topbar']) && $shrsb_tb_plugopts['topbar'] == '1') ? 'true' : 'false',
160
- 'f_classic' => (isset($shrsb_cb['cb']) && $shrsb_cb['cb'] == '1') ? 'true' : 'false',
161
- 'f_rec' => (isset($shrsb_recommendations['recommendations']) && $shrsb_recommendations['recommendations'] == '1') ? 'true' : 'false'
162
  );
163
  return $tracking_metadata;
164
  }
@@ -173,6 +182,7 @@ function shr_sendTrackingEvent($event_name = 'Default', $extra_params = NULL) {
173
  $trackingURL = "http://www.shareaholic.com/api/events";
174
  $trackingParams = array('name' => "WordPress:".$event_name, 'data' => json_encode($event_data) );
175
  // Send Ping
 
176
  $response = wp_remote_post($trackingURL, array('body' => $trackingParams) );
177
  }
178
 
@@ -282,12 +292,12 @@ function showUpdateNotice() {
282
 
283
  if(!shrsb_check_activation()){
284
  // Don't show the connect notice on the shareaholic settings page.
285
- if ( (false !== strpos( $_SERVER['QUERY_STRING'], 'page=sexy-bookmark' )) || (false !== strpos( $_SERVER['QUERY_STRING'], 'page=shareaholic_analytics' )) || (false !== strpos( $_SERVER['QUERY_STRING'], 'page=shareaholic_topbar' )) || (false !== strpos( $_SERVER['QUERY_STRING'], 'page=shareaholic_recommendations' )) || (false !== strpos( $_SERVER['QUERY_STRING'], 'page=shareaholic_classicbookmarks' )))
286
  return;
287
  echo '
288
- <div id="activate_shr" style="border-radius:4px;-moz-border-radius:4px;-webkit-border-radius:4px;background:#6aafcf;border:1px solid #2A8CBA;color:white;font-size:14px;font-weight:bold;height:auto;margin:30px 15px 15px 0px;overflow:hidden;padding:4px 10px 6px;line-height:30px;text-shadow: 0px 1px 1px
289
  rgba(0, 0, 0, 0.4);">
290
- '.sprintf(__('NOTICE: Shareaholic Plugin is almost ready – %sPlease visit the Plugin Options Page to activate%s', 'shrsb'), '<a href="admin.php?page=sexy-bookmarks.php" style="
291
  -moz-box-shadow:inset 0px 1px 0px 0px #fce2c1;
292
  -webkit-box-shadow:inset 0px 1px 0px 0px #fce2c1;
293
  box-shadow:inset 0px 1px 0px 0px #fce2c1;
@@ -499,18 +509,19 @@ add_action('admin_menu', 'shrsb_menu_link');
499
  function shrsb_menu_link() {
500
  if (function_exists('add_menu_page')) {
501
 
502
- $shrsb_landing_page = add_menu_page( __( 'Shareaholic for Publishers', 'shrsb' ), __( 'Shareaholic', 'shrsb' ), 'administrator', basename(__FILE__), 'shrsb_landing', SHRSB_PLUGPATH.'images/shareaholic_16x16.png');
503
- $shrsb_landing_page = add_submenu_page( basename(__FILE__), __( 'Dashboard' ), __( 'Dashboard', 'shrsb' ), 'administrator', basename(__FILE__), 'shrsb_landing' );
504
  $shrsb_sexybookmarks_page = add_submenu_page( basename(__FILE__), __( 'SexyBookmarks' ), __( 'SexyBookmarks', 'shrsb' ), 'administrator', 'shareaholic_sexybookmarks.php', 'shrsb_sexybookmarks_settings' );
505
 
506
  /*
507
  $shrsb_account_page = add_submenu_page( basename(__FILE__), __( 'My Account' ), __( 'My Account', 'shrsb' ),
508
  'administrator', 'shareaholic_account.php', 'shrsb_account_page' );
509
  */
510
-
511
- $shrsb_topbar_page = add_submenu_page( basename(__FILE__), __( 'Top Bar' ), __( 'Top Bar', 'shrsb' ), 'administrator', 'shareaholic_topbar.php', 'shrsb_topbar_settings' );
512
  $shrsb_cb_page = add_submenu_page( basename(__FILE__), __( 'ClassicBookmarks' ), __( 'ClassicBookmarks', 'shrsb' ), 'administrator', 'shareaholic_classicbookmarks.php', 'shrsb_cb_settings' );
513
- $shrsb_recommendations_page = add_submenu_page( basename(__FILE__), __( 'Recommendations' ), __( 'Recommendations', 'shrsb' ), 'administrator', 'shareaholic_recommendations.php', 'shrsb_recommendations_settings' );
 
 
514
  $shrsb_analytics_page = add_submenu_page( basename(__FILE__), __( 'Social Analytics' ), __( 'Social Analytics', 'shrsb' ), 'edit_posts', 'shareaholic_analytics.php', 'shrsb_analytics_settings' );
515
 
516
 
3
  Plugin Name: Shareaholic | share buttons, analytics, related content
4
  Plugin URI: https://shareaholic.com/publishers/
5
  Description: Whether you want to get people sharing, grow your fans, make money, or know who's reading your content, Shareaholic will help you get it done. See <a href="admin.php?page=sexy-bookmarks.php">configuration panel</a> for more settings.
6
+ Version: 6.1.3.3
7
  Author: Shareaholic
8
  Author URI: https://shareaholic.com
9
  Credits & Thanks: https://shareaholic.com/tools/wordpress/credits
14
  * @desc Define Plugin version
15
  */
16
 
17
+ define('SHRSB_vNum','6.1.3.3');
18
 
19
 
20
  /*
36
  update_option('SHRSB_DefaultSprite',true);
37
  add_action('admin_notices', 'shrsb_Upgrade', 12);
38
 
39
+ shr_sendTrackingEvent('Upgrade', array('prev_plugin_ver' => get_option('SHRSBvNum')) );
40
+ shr_recommendationsStatus();
41
 
42
  // Added global variable to track the updating state
43
  define('SHRSB_UPGRADING', TRUE);
144
  require_once 'includes/shrsb_recommendations_page.php'; // Recommendations global Settings
145
  require_once 'includes/shrsb_classicbookmarks_page.php'; // Classic Bookmarks global Settings
146
 
147
+ //Update version (note: location of this update is important)
148
+ update_option('SHRSBvNum', SHRSB_vNum);
149
+
150
+
151
  //populate default analytics values to pass with major events - (un)install, upgrade, (de)activate, etc
152
  //TD: GET THE USER ID IF AVAILABLE
153
 
154
  function shr_getTrackingData() {
155
+
156
+ $sbtmp = get_option('SexyBookmarks');
157
+ $cbtmp = get_option('ShareaholicClassicBookmarks');
158
+ $rdtmp = get_option('ShareaholicRecommendations');
159
+ $tbtmp = get_option('ShareaholicTopbar');
160
+
161
  $tracking_metadata = array(
162
+ 'plugin_ver' => SHRSB_vNum,
163
+ 'apikey' => isset($shrsb_plugopts['apikey']) ? $shrsb_plugopts['apikey'] : '',
164
+ 'domain' => home_url(),
165
+ 'theme' => get_option('template'),
166
+ 'wp_ver' => get_bloginfo('version'),
167
+ 'f_sexy' => ($sbtmp['sexybookmark'] == '1') ? 'true' : 'false',
168
+ 'f_topbar' => ($tbtmp['topbar'] == '1') ? 'true' : 'false',
169
+ 'f_classic' => ($cbtmp['cb'] == '1') ? 'true' : 'false',
170
+ 'f_rec' => ($rdtmp['recommendations'] == '1') ? 'true' : 'false'
171
  );
172
  return $tracking_metadata;
173
  }
182
  $trackingURL = "http://www.shareaholic.com/api/events";
183
  $trackingParams = array('name' => "WordPress:".$event_name, 'data' => json_encode($event_data) );
184
  // Send Ping
185
+ // var_dump($trackingParams);
186
  $response = wp_remote_post($trackingURL, array('body' => $trackingParams) );
187
  }
188
 
292
 
293
  if(!shrsb_check_activation()){
294
  // Don't show the connect notice on the shareaholic settings page.
295
+ if ( (false !== strpos( $_SERVER['QUERY_STRING'], 'page=sexy-bookmark' )) || (false !== strpos( $_SERVER['QUERY_STRING'], 'page=shareaholic_sexybookmarks' )) || (false !== strpos( $_SERVER['QUERY_STRING'], 'page=shareaholic_analytics' )) || (false !== strpos( $_SERVER['QUERY_STRING'], 'page=shareaholic_topbar' )) || (false !== strpos( $_SERVER['QUERY_STRING'], 'page=shareaholic_recommendations' )) || (false !== strpos( $_SERVER['QUERY_STRING'], 'page=shareaholic_classicbookmarks' )))
296
  return;
297
  echo '
298
+ <div id="activate_shr" onclick="location.href=\'admin.php?page=sexy-bookmarks.php\';" style="cursor: pointer;border-radius:4px;-moz-border-radius:4px;-webkit-border-radius:4px;background:#6aafcf;border:1px solid #2A8CBA;color:white;font-size:14px;font-weight:bold;height:auto;margin:30px 15px 15px 0px;overflow:hidden;padding:4px 10px 6px;line-height:30px;text-shadow: 0px 1px 1px
299
  rgba(0, 0, 0, 0.4);">
300
+ '.sprintf(__('ACTION REQUIRED: Shareaholic for WordPress is almost ready – %sVisit the Plugin Options Page to activate Shareaholic now &rarr;%s', 'shrsb'), '<a href="admin.php?page=sexy-bookmarks.php" style="
301
  -moz-box-shadow:inset 0px 1px 0px 0px #fce2c1;
302
  -webkit-box-shadow:inset 0px 1px 0px 0px #fce2c1;
303
  box-shadow:inset 0px 1px 0px 0px #fce2c1;
509
  function shrsb_menu_link() {
510
  if (function_exists('add_menu_page')) {
511
 
512
+ $shrsb_landing_page = add_menu_page( __( 'Shareaholic for Publishers', 'shrsb' ), __( 'Shareaholic', 'shrsb' ), 'edit_posts', basename(__FILE__), 'shrsb_landing', SHRSB_PLUGPATH.'images/shareaholic_16x16.png');
513
+ $shrsb_landing_page = add_submenu_page( basename(__FILE__), __( 'Dashboard' ), __( 'Dashboard', 'shrsb' ), 'edit_posts', basename(__FILE__), 'shrsb_landing' );
514
  $shrsb_sexybookmarks_page = add_submenu_page( basename(__FILE__), __( 'SexyBookmarks' ), __( 'SexyBookmarks', 'shrsb' ), 'administrator', 'shareaholic_sexybookmarks.php', 'shrsb_sexybookmarks_settings' );
515
 
516
  /*
517
  $shrsb_account_page = add_submenu_page( basename(__FILE__), __( 'My Account' ), __( 'My Account', 'shrsb' ),
518
  'administrator', 'shareaholic_account.php', 'shrsb_account_page' );
519
  */
520
+
 
521
  $shrsb_cb_page = add_submenu_page( basename(__FILE__), __( 'ClassicBookmarks' ), __( 'ClassicBookmarks', 'shrsb' ), 'administrator', 'shareaholic_classicbookmarks.php', 'shrsb_cb_settings' );
522
+ $shrsb_topbar_page = add_submenu_page( basename(__FILE__), __( 'Top Bar' ), __( 'Top Bar', 'shrsb' ), 'administrator', 'shareaholic_topbar.php', 'shrsb_topbar_settings' );
523
+
524
+ $shrsb_recommendations_page = add_submenu_page( basename(__FILE__), __( 'Related Content' ), __( 'Related Content', 'shrsb' ), 'administrator', 'shareaholic_recommendations.php', 'shrsb_recommendations_settings' );
525
  $shrsb_analytics_page = add_submenu_page( basename(__FILE__), __( 'Social Analytics' ), __( 'Social Analytics', 'shrsb' ), 'edit_posts', 'shareaholic_analytics.php', 'shrsb_analytics_settings' );
526
 
527