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

Version Description

  • Enforce Internet Explorer compatibility mode to latest version available; fixes a lot of general issues with Internet Explorer. Recommended update.
Download this release

Release Info

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

Code changes from version 7.0.4.3 to 7.0.4.4

Files changed (5) hide show
  1. admin.php +18 -32
  2. public.php +12 -3
  3. readme.txt +7 -1
  4. shareaholic.php +9 -7
  5. utilities.php +23 -1
admin.php CHANGED
@@ -11,6 +11,22 @@
11
  * @package shareaholic
12
  */
13
  class ShareaholicAdmin {
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
14
  /**
15
  * Load the terms of service notice that shows up
16
  * at the top of the admin pages.
@@ -139,9 +155,10 @@ class ShareaholicAdmin {
139
  }
140
  }
141
  }
 
142
 
143
  /**
144
- * Enqueing styles and scripts for the admin the correct way.
145
  *
146
  * @since 7.0.2.0
147
  */
@@ -161,37 +178,6 @@ class ShareaholicAdmin {
161
  }
162
  }
163
 
164
- /**
165
- * Inserts admin css and js
166
- *
167
- * @deprecated in 7.0.2.0 and higher
168
- */
169
- public static function admin_head() {
170
- if (isset($_GET['page']) && preg_match('/shareaholic/', $_GET['page'])) {
171
- $csss = array();
172
- array_push($csss, ShareaholicUtilities::asset_url('application.css'));
173
- array_push($csss, plugins_url('assets/css/bootstrap.min.css', __FILE__));
174
- array_push($csss, plugins_url('assets/css/main.css', __FILE__));
175
- array_push($csss, '//fonts.googleapis.com/css?family=Open+Sans:400,300,700');
176
-
177
- $javascripts = array();
178
- array_push($javascripts, ShareaholicUtilities::asset_url('pub/shareaholic.js'));
179
- array_push($javascripts, plugins_url('assets/js/bootstrap.min.js', __FILE__));
180
- array_push($javascripts, plugins_url('assets/js/jquery_custom.js', __FILE__));
181
- array_push($javascripts, plugins_url('assets/js/jquery_ui_custom.js', __FILE__));
182
- array_push($javascripts, plugins_url('assets/js/jquery.reveal.modified.js', __FILE__));
183
- array_push($javascripts, plugins_url('assets/js/main.js', __FILE__));
184
-
185
- foreach ($csss as $css) {
186
- echo '<link rel="stylesheet" type="text/css" href="' . $css . '">';
187
- }
188
-
189
- foreach ($javascripts as $js) {
190
- echo '<script type="text/javascript" src="' . $js . '"></script>';
191
- }
192
- }
193
- }
194
-
195
  /**
196
  * Puts a new menu item under Settings.
197
  */
11
  * @package shareaholic
12
  */
13
  class ShareaholicAdmin {
14
+
15
+ /**
16
+ * Loads before all else
17
+ */
18
+ public static function admin_init() {
19
+ ShareaholicUtilities::check_for_other_plugin();
20
+ }
21
+
22
+ /**
23
+ * The function called during the admin_head action.
24
+ *
25
+ */
26
+ public static function admin_header() {
27
+ ShareaholicUtilities::draw_meta_xua();
28
+ }
29
+
30
  /**
31
  * Load the terms of service notice that shows up
32
  * at the top of the admin pages.
155
  }
156
  }
157
  }
158
+
159
 
160
  /**
161
+ * Enqueing styles and scripts for the admin panel
162
  *
163
  * @since 7.0.2.0
164
  */
178
  }
179
  }
180
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
181
  /**
182
  * Puts a new menu item under Settings.
183
  */
public.php CHANGED
@@ -12,10 +12,18 @@
12
  * @package shareaholic
13
  */
14
  class ShareaholicPublic {
 
 
 
 
 
 
 
 
15
  /**
16
  * The function called during the wp_head action. The
17
  * rest of the plugin doesn't need to know exactly what happens.
18
- */
19
  public static function wp_head() {
20
  // this will only run on pages that would actually call
21
  // the deprecated functions. For some reason I could not
@@ -26,7 +34,7 @@ class ShareaholicPublic {
26
  self::tracking_meta_tag();
27
  self::shareaholic_tags();
28
  self::draw_og_tags();
29
- }
30
 
31
  /**
32
  * Inserts the script code snippet into the head of the page
@@ -73,7 +81,8 @@ class ShareaholicPublic {
73
  echo '<meta name="shareaholic:analytics" content="disabled" />';
74
  }
75
  }
76
-
 
77
  /**
78
  * Draws the shareaholic meta tags.
79
  */
12
  * @package shareaholic
13
  */
14
  class ShareaholicPublic {
15
+
16
+ /**
17
+ * Loads before all else
18
+ */
19
+ public static function init() {
20
+ add_filter('wp_headers', 'ShareaholicUtilities::add_header_xua');
21
+ }
22
+
23
  /**
24
  * The function called during the wp_head action. The
25
  * rest of the plugin doesn't need to know exactly what happens.
26
+ */
27
  public static function wp_head() {
28
  // this will only run on pages that would actually call
29
  // the deprecated functions. For some reason I could not
34
  self::tracking_meta_tag();
35
  self::shareaholic_tags();
36
  self::draw_og_tags();
37
+ }
38
 
39
  /**
40
  * Inserts the script code snippet into the head of the page
81
  echo '<meta name="shareaholic:analytics" content="disabled" />';
82
  }
83
  }
84
+
85
+
86
  /**
87
  * Draws the shareaholic meta tags.
88
  */
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: shareaholic
3
  Tags: sexybookmarks, shareaholic, shareholic, facebook, twitter, linkedin, URL Shortener, bitly, tinyurl, Goo.gl, Google+1, Google Analytics, Google Plus, Google, Instapaper, Wish List, Digg, Gmail, Google Bookmarks, Translate, Tumblr, AIM, Yahoo Messenger, Delicious, StumbleUpon, mister wong, evernote, add this, addtoany, share this, sharethis, share and follow, share and enjoy, sharing is sexy, sharing is caring, yahoo, reddit, hackernews, tweet button, twitter button, fark, buffer, myspace, orkut, netlog, hubspot, weheartit, printfriendly, yammer, wanelo, pinterest, google translate, bookmarks, social, email button, social share, socialize, sociable, sharebar, bookmark button, share button, social bookmarking, bookmarks menu, bookmarking, share, seo, analytics, stats, sharing, facebook like, facebook recommend, WPMU, mutisite, shortcode, yaarp, yarpp, nrelate, outbrain, linkwithin, related content, related posts, related, popular posts, popular, thumbnails, recommendations
4
  Requires at least: 2.7
5
  Tested up to: 3.6.1
6
- Stable tag: 7.0.4.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
 
@@ -148,6 +148,9 @@ Please see here: [Usage & Installation Instructions](https://shareaholic.com/too
148
 
149
  == Changelog ==
150
 
 
 
 
151
  = 7.0.4.3 =
152
  * Added support for shareaholic:keywords meta tag for better Recommendations and Related Content matches
153
 
@@ -945,6 +948,9 @@ Please see here: [Usage & Installation Instructions](https://shareaholic.com/too
945
 
946
  == Upgrade Notice ==
947
 
 
 
 
948
  = 7.0.4.3 =
949
  Added support for shareaholic:keywords meta tag for better Recommendations and Related Content matches
950
 
3
  Tags: sexybookmarks, shareaholic, shareholic, facebook, twitter, linkedin, URL Shortener, bitly, tinyurl, Goo.gl, Google+1, Google Analytics, Google Plus, Google, Instapaper, Wish List, Digg, Gmail, Google Bookmarks, Translate, Tumblr, AIM, Yahoo Messenger, Delicious, StumbleUpon, mister wong, evernote, add this, addtoany, share this, sharethis, share and follow, share and enjoy, sharing is sexy, sharing is caring, yahoo, reddit, hackernews, tweet button, twitter button, fark, buffer, myspace, orkut, netlog, hubspot, weheartit, printfriendly, yammer, wanelo, pinterest, google translate, bookmarks, social, email button, social share, socialize, sociable, sharebar, bookmark button, share button, social bookmarking, bookmarks menu, bookmarking, share, seo, analytics, stats, sharing, facebook like, facebook recommend, WPMU, mutisite, shortcode, yaarp, yarpp, nrelate, outbrain, linkwithin, related content, related posts, related, popular posts, popular, thumbnails, recommendations
4
  Requires at least: 2.7
5
  Tested up to: 3.6.1
6
+ Stable tag: 7.0.4.4
7
 
8
  Adds an attractive social bookmarking menu and related content widget to your posts, pages, index, or any combination of the three.
9
 
148
 
149
  == Changelog ==
150
 
151
+ = 7.0.4.4 =
152
+ * Enforce Internet Explorer compatibility mode to latest version available; fixes a lot of general issues with Internet Explorer. Recommended update.
153
+
154
  = 7.0.4.3 =
155
  * Added support for shareaholic:keywords meta tag for better Recommendations and Related Content matches
156
 
948
 
949
  == Upgrade Notice ==
950
 
951
+ = 7.0.4.4 =
952
+ * Enforce Internet Explorer compatibility mode to latest version available; fixes a lot of general issues with Internet Explorer. Recommended update.
953
+
954
  = 7.0.4.3 =
955
  Added support for shareaholic:keywords meta tag for better Recommendations and Related Content matches
956
 
shareaholic.php CHANGED
@@ -3,14 +3,14 @@
3
  * The main file!
4
  *
5
  * @package shareaholic
6
- * @version 7.0.4.3
7
  */
8
 
9
  /*
10
  Plugin Name: Shareaholic | share buttons, analytics, related content
11
  Plugin URI: https://shareaholic.com/publishers/
12
  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=shareaholic-settings">configuration panel</a> for more settings.
13
- Version: 7.0.4.3
14
  Author: Shareaholic
15
  Author URI: https://shareaholic.com
16
  Text Domain: shareaholic
@@ -53,26 +53,28 @@ require_once(SHAREAHOLIC_DIR . '/deprecation.php');
53
  */
54
  class Shareaholic {
55
  const URL = 'https://shareaholic.com';
56
- const VERSION = '7.0.4.3';
57
  /**
58
  * Starts off as false so that ::get_instance() returns
59
  * a new instance.
60
  */
61
  private static $instance = false;
62
-
63
  /**
64
  * The constructor registers all the wordpress actions.
65
  */
66
  private function __construct() {
67
  add_action('wp_ajax_shareaholic_accept_terms_of_service', array('ShareaholicUtilities', 'accept_terms_of_service'));
68
 
 
69
  add_action('the_content', array('ShareaholicPublic', 'draw_canvases'));
70
  add_action('wp_head', array('ShareaholicPublic', 'wp_head'));
71
  add_shortcode('shareaholic', array('ShareaholicPublic', 'shortcode'));
72
-
73
- add_action('admin_init', 'ShareaholicUtilities::check_for_other_plugin');
74
  add_action('plugins_loaded', array($this, 'shareaholic_init'));
75
 
 
 
76
  add_action('wp_ajax_shareaholic_add_location', array('ShareaholicAdmin', 'add_location'));
77
  add_action('add_meta_boxes', array('ShareaholicAdmin', 'add_meta_boxes'));
78
  add_action('save_post', array('ShareaholicAdmin', 'save_post'));
@@ -177,7 +179,7 @@ class Shareaholic {
177
  public function deactivate() {
178
  ShareaholicUtilities::log_event("Deactivate");
179
  }
180
-
181
  /**
182
  * This function fires when the plugin is uninstalled.
183
  */
3
  * The main file!
4
  *
5
  * @package shareaholic
6
+ * @version 7.0.4.4
7
  */
8
 
9
  /*
10
  Plugin Name: Shareaholic | share buttons, analytics, related content
11
  Plugin URI: https://shareaholic.com/publishers/
12
  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=shareaholic-settings">configuration panel</a> for more settings.
13
+ Version: 7.0.4.4
14
  Author: Shareaholic
15
  Author URI: https://shareaholic.com
16
  Text Domain: shareaholic
53
  */
54
  class Shareaholic {
55
  const URL = 'https://shareaholic.com';
56
+ const VERSION = '7.0.4.4';
57
  /**
58
  * Starts off as false so that ::get_instance() returns
59
  * a new instance.
60
  */
61
  private static $instance = false;
62
+
63
  /**
64
  * The constructor registers all the wordpress actions.
65
  */
66
  private function __construct() {
67
  add_action('wp_ajax_shareaholic_accept_terms_of_service', array('ShareaholicUtilities', 'accept_terms_of_service'));
68
 
69
+ add_action('init', array('ShareaholicPublic', 'init'));
70
  add_action('the_content', array('ShareaholicPublic', 'draw_canvases'));
71
  add_action('wp_head', array('ShareaholicPublic', 'wp_head'));
72
  add_shortcode('shareaholic', array('ShareaholicPublic', 'shortcode'));
73
+
 
74
  add_action('plugins_loaded', array($this, 'shareaholic_init'));
75
 
76
+ add_action('admin_init', array('ShareaholicAdmin', 'admin_init'));
77
+ add_action('admin_enqueue_scripts', array('ShareaholicAdmin', 'admin_header'));
78
  add_action('wp_ajax_shareaholic_add_location', array('ShareaholicAdmin', 'add_location'));
79
  add_action('add_meta_boxes', array('ShareaholicAdmin', 'add_meta_boxes'));
80
  add_action('save_post', array('ShareaholicAdmin', 'save_post'));
179
  public function deactivate() {
180
  ShareaholicUtilities::log_event("Deactivate");
181
  }
182
+
183
  /**
184
  * This function fires when the plugin is uninstalled.
185
  */
utilities.php CHANGED
@@ -720,6 +720,28 @@ class ShareaholicUtilities {
720
  load_plugin_textdomain('shareaholic', false, basename(dirname(__FILE__)) . '/languages/');
721
  }
722
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
723
  /**
724
  * Server Connectivity check
725
  *
@@ -761,4 +783,4 @@ class ShareaholicUtilities {
761
  }
762
 
763
  }
764
- ?>
720
  load_plugin_textdomain('shareaholic', false, basename(dirname(__FILE__)) . '/languages/');
721
  }
722
 
723
+ /*
724
+ * Adds a xua response header
725
+ *
726
+ * @return array Where header => header value
727
+ */
728
+ public function add_header_xua($headers)
729
+ {
730
+ if(!isset($headers['X-UA-Compatible'])) {
731
+ $headers['X-UA-Compatible'] = 'IE=edge,chrome=1';
732
+ }
733
+ return $headers;
734
+ }
735
+
736
+ /*
737
+ * Draws xua meta tag
738
+ *
739
+ */
740
+ public function draw_meta_xua()
741
+ {
742
+ echo '<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">';
743
+ }
744
+
745
  /**
746
  * Server Connectivity check
747
  *
783
  }
784
 
785
  }
786
+ ?>