Changeset 2274521

Timestamp:

04/02/2020 10:45:09 PM (6 years ago)

Author:

micropat

Message:

• Require PHP 5.3 as a bare minimum for compatibility features

Location:

add-to-any/trunk

Files:

• README.txt (modified) (2 diffs)
• add-to-any.php (modified) (62 diffs)
• addtoany.compat.php (modified) (8 diffs)
• addtoany.update.php (modified) (2 diffs)
• addtoany.widgets.php (modified) (6 diffs)

add-to-any/trunk/README.txt

@@ -3 +3 @@
 Tags: buttons, share, icons, social media, share buttons, sharing, share button, media, social, marketing, links, email, seo, woocommerce, google, linkedin, reddit, facebook, twitter, pinterest, whatsapp, instagram, youtube, share this, sharethis, feed
 Requires at least: 3.7
-Tested up to: 5.3
+Tested up to: 5.
 Requires PHP: 5.6
-Stable tag: 1.7.39
+Stable tag: 1.7.
 
 Share buttons for WordPress including the AddToAny sharing button, Facebook, Twitter, WhatsApp, Pinterest, Reddit, many more, and follow icons too.
@@ -346 +346 @@
 
 == Changelog ==
+
+
+
 
 = 1.7.39 =

add-to-any/trunk/add-to-any.php

@@ -1 +1 @@
 <?php
-/*
-Plugin Name: AddToAny Share Buttons
-Plugin URI: https://www.addtoany.com/
-Description: Share buttons for your pages including AddToAny's universal sharing button, Facebook, Twitter, Google+, Pinterest, WhatsApp and many more.
-Version: 1.7.39
-Author: AddToAny
-Author URI: https://www.addtoany.com/
-Text Domain: add-to-any
-Domain Path: /languages
-*/
-
-// Explicitly globalize to support bootstrapped WordPress
+/*
+Plugin Name: AddToAny Share Buttons
+Plugin URI: https://www.addtoany.com/
+Description: Share buttons for your pages including AddToAny's universal sharing button, Facebook, Twitter, Google+, Pinterest, WhatsApp and many more.
+ * Version: 1.7.40
+Author: AddToAny
+Author URI: https://www.addtoany.com/
+Text Domain: add-to-any
+Domain Path: /languages
+*/
+
+// Explicitly globalize to support bootstrapped WordPress
 global $A2A_locale, $A2A_FOLLOW_services,
     $A2A_SHARE_SAVE_options, $A2A_SHARE_SAVE_plugin_dir, $A2A_SHARE_SAVE_plugin_url, 
@@ -19 +19 @@
 $A2A_SHARE_SAVE_plugin_url = untrailingslashit( plugin_dir_url( __FILE__ ) );
 
-// Set AddToAny locale (JavaScript)
+// Set AddToAny locale (JavaScript)
 $A2A_locale = ! isset ( $A2A_locale ) ? '' : $A2A_locale;
-// Set plugin options
+// Set plugin options
 $A2A_SHARE_SAVE_options = get_option( 'addtoany_options', array() );
 
-include_once $A2A_SHARE_SAVE_plugin_dir . '/addtoany.compat.php';
+// Require PHP 5.3 as a bare minimum for compatibility features that use anonymous functions (PHP 5.3+).
+if ( version_compare( phpversion(), '5.3.0', '>=' ) ) {
+    include_once $A2A_SHARE_SAVE_plugin_dir . '/addtoany.compat.php';
+}
+
 include_once $A2A_SHARE_SAVE_plugin_dir . '/addtoany.services.php';
 
@@ -31 +35 @@
         $A2A_SHARE_SAVE_options;
     
-    // Load the textdomain for translations
+    // Load the textdomain for translations
     load_plugin_textdomain( 'add-to-any', false, plugin_basename( dirname( __FILE__ ) ) . '/languages/' );
     
-    // Update plugin options    
+    // Update plugin options
     $options = $A2A_SHARE_SAVE_options;
     $old_buttons = array( 
@@ -42 +46 @@
     );
     
-    // If old button enabled
+    // If old button enabled
     if ( ! empty( $options['button'] ) && in_array( $options['button'], $old_buttons ) ) {
         include_once $A2A_SHARE_SAVE_plugin_dir . '/addtoany.update.php';
@@ -58 +62 @@
     $use_current_page = isset( $args['use_current_page'] ) ? $args['use_current_page'] : false;
 
-    // Set linkname if needed, and not a Follow kit
+    // Set linkname if needed, and not a Follow kit
     if ( ! $linkname && empty( $args['is_follow'] ) ) {
         if ( $use_current_page ) {
@@ -71 +75 @@
     $linkname_enc = rawurlencode( $linkname );
     
-    // Set linkurl if needed, and not a Follow kit
+    // Set linkurl if needed, and not a Follow kit
     if ( ! $linkurl && empty( $args['is_follow'] ) ) {
         if ( $use_current_page ) {
@@ -84 +88 @@
     $linkurl_enc = rawurlencode( $linkurl );
     
-    // Set linkmedia (only applies to services that explicitly accept media; Pinterest does, most do not)
+    // Set linkmedia (only applies to services that explicitly accept media; Pinterest does, most do not)
     $linkmedia_enc = ! empty( $args['linkmedia'] ) ? rawurlencode( $args['linkmedia'] ) : '';
     
@@ -90 +94 @@
 }
 
-// Combine ADDTOANY_SHARE_SAVE_ICONS and ADDTOANY_SHARE_SAVE_BUTTON
+// Combine ADDTOANY_SHARE_SAVE_ICONS and ADDTOANY_SHARE_SAVE_BUTTON
 function ADDTOANY_SHARE_SAVE_KIT( $args = array() ) {
     $options = get_option( 'addtoany_options', array() );
@@ -104 +108 @@
     $args = wp_parse_args( $args, $defaults );
     
-    // If universal button disabled, and not manually disabled through args
+    // If universal button disabled, and not manually disabled through args
     if ( isset( $options['button'] ) && $options['button'] == 'NONE' && ! isset( $args['no_universal_button'] ) ) {
-        // Pass this setting on to ADDTOANY_SHARE_SAVE_BUTTON
-        // (and only via this ADDTOANY_SHARE_SAVE_KIT function because it is used for automatic placement)
+        // Pass this setting on to ADDTOANY_SHARE_SAVE_BUTTON
+        // 
         $args['no_universal_button'] = true;
     }
@@ -121 +125 @@
     $kit_style = '';
     
-    // Add additional classNames to .a2a_kit
+    // Add additional classNames to .a2a_kit
     if ( ! empty( $args['kit_additional_classes'] ) ) {
-        // Append space and className(s)
+        // Append space and className(s)
         $kit_additional_classes .= ' ' . $args['kit_additional_classes'];
     }
     
-    // Set a2a_kit_size_## class name
+    // Set a2a_kit_size_## class name
     if ( $custom_icons ) {
         // If vertical style (.a2a_vertical_style)
         if ( strpos( $kit_additional_classes, 'a2a_vertical_style' ) !== false ) {
-            // Use width (if specified) for .a2a_kit_size_## class name to size default service counters
+            // Use width (if specified) for .a2a_kit_size_## class name to size default service counters
             $icon_size_classname = isset( $options['custom_icons_width'] ) ? ' a2a_kit_size_' . $options['custom_icons_width'] : '';
         } else {
-            // Use height (if specified) for .a2a_kit_size_## class name to size default service counters
+            // Use height (if specified) for .a2a_kit_size_## class name to size default service counters
             $icon_size_classname = isset( $options['custom_icons_height'] ) ? ' a2a_kit_size_' . $options['custom_icons_height'] : '';
         }
-    // a2a_kit_size_## icon size
+    // 
     } else {
         $icon_size_classname = ' a2a_kit_size_' . $args['icon_size'];
     }
     
-    // Add addtoany_list className unless disabled (for floating buttons)
+    // Add addtoany_list className unless disabled (for floating buttons)
     if ( ! isset( $args['no_addtoany_list_classname'] ) ) {
         $kit_additional_classes .= ' addtoany_list';
     }
     
-    // Add style attribute if set
+    // Add style attribute if set
     if ( ! empty( $args['kit_style'] ) ) {
         $kit_style = ' style="' . esc_attr( $args['kit_style'] ) . '"';
@@ -159 +163 @@
     if ( ! isset( $args['html_container_close'] ) )
         $args['html_container_close'] = "</div>";
-    // Close container element in ADDTOANY_SHARE_SAVE_BUTTON, not prematurely in ADDTOANY_SHARE_SAVE_ICONS
-    $html_container_close = $args['html_container_close']; // Cache for _BUTTON
-    unset($args['html_container_close']); // Avoid passing to ADDTOANY_SHARE_SAVE_ICONS since set in _BUTTON
+    // Close container element in ADDTOANY_SHARE_SAVE_BUTTON, not prematurely in ADDTOANY_SHARE_SAVE_ICONS.
+    // Cache for _BUTTON.
+    $html_container_close = $args['html_container_close'];
+    // Avoid passing to ADDTOANY_SHARE_SAVE_ICONS since set in _BUTTON.
+    unset($args['html_container_close']);
                 
     if ( ! isset( $args['html_wrap_open'] ) )
@@ -170 +176 @@
     $kit_html = ADDTOANY_SHARE_SAVE_ICONS( $args );
     
-    $args['html_container_close'] = $html_container_close; // Re-set because unset above for _ICONS
-    unset( $args['html_container_open'] ); // Avoid passing to ADDTOANY_SHARE_SAVE_BUTTON since set in _ICONS
+    // Set again because it was unset above for _ICONS.
+    $args['html_container_close'] = $html_container_close;
+    // Avoid passing to ADDTOANY_SHARE_SAVE_BUTTON since set in _ICONS.
+    unset( $args['html_container_open'] );
     
     $kit_html .= ADDTOANY_SHARE_SAVE_BUTTON( $args );
@@ -214 +222 @@
     $is_amp = function_exists( 'is_amp_endpoint' ) && is_amp_endpoint() ? true : false;
     
-    // Large icons except for AMP endpoint
+    // 
     $large_icons = $is_amp ? false : true;
     
@@ -226 +234 @@
         $custom_icons = true;
     } else {
-        // Default to local SVGs (not an option currently)
+        // Default to local SVGs
         $icons_dir = plugins_url('/icons/', __FILE__ );
         $icons_type = 'svg';
@@ -245 +253 @@
         $service_codes = ( is_array( $services ) ) ? array_keys( $services ) : array();
         
-        // Include Facebook Like and Twitter Tweet etc. unless no_special_services arg is true
+        // Include Facebook Like and Twitter Tweet etc. unless no_special_services arg is true
         if ( ! isset( $args['no_special_services'] ) || false == $args['no_special_services'] ) {
             array_unshift( $service_codes, 'facebook_like', 'twitter_tweet', 'pinterest_pin' );
         }
     
-        // Use default services if services have not been selected yet
+        // Use default services if services have not been selected yet
         $active_services = isset( $options['active_services'] ) ? $options['active_services'] : array( 'facebook', 'twitter', 'email' );
-        // Services set by "buttons" arg? Then use "buttons" arg instead
+        // Services set by "buttons" arg? Then use "buttons" arg instead
         $active_services = empty( $args['buttons'] ) ? $active_services : $args['buttons'];
     }
@@ -281 +289 @@
                 // If it's a URL instead of a service ID
                 if ( $is_url ) {
-                    // Just use the given URL instead of the URL template
+                    // Just use the given URL instead of the URL template
                     $href = $follow_id;
                 } else {
-                    // Replace the ID placeholder in the URL template
+                    // Replace the ID placeholder in the URL template
                     $href = str_replace( '${id}', $follow_id, $service['href'] );
                 }
                 $href = ( 'feed' == $code_name ) ? $follow_id : $href;
                 
-                // If icon_url is set, presume custom service
+                // If icon_url is set, presume custom service
                 if ( isset( $service['icon_url'] ) ) {
                     $custom_service = true;
                 }
-            // Else if Share Kit and HREF specified, presume custom service
+            // Else if Share Kit and HREF specified, presume custom service
             } elseif ( isset( $service['href'] ) ) {
                 $custom_service = true;
@@ -342 +350 @@
             }
             
-            // Use rel="noopener" for links that open in a new tab/window
+            // Use rel="noopener" for links that open in a new tab/window
             $rel_noopener = $custom_service || ! $target_attr ? '' : ' noopener';
             $rel_noopener_only = $rel_noopener || $target_attr ? ' rel="noopener"' : '';
@@ -348 +356 @@
             $rel_attr = $args['basic_html'] ? '' : $rel_attr;
 
-            // Set dimension attributes if using custom icons and dimension is specified
+            // Set dimension attributes if using custom icons and dimension is specified
             if ( isset( $custom_icons ) ) {
                 $width_attr = ! empty( $icons_width ) ? ' width="' . $icons_width . '"' : '';
@@ -413 +421 @@
         
         if ( isset( $options['button'] ) && 'CUSTOM' == $options['button'] ) {
-            // Custom button
+            // Custom button
             $button_src     = $options['button_custom'];
             $button_width   = '';
@@ -419 +427 @@
             $button_style   = '';
         } else if ( isset( $options['button'] ) && 'TEXT' == $options['button'] ) {
-            // Text-only button
+            // Text-only button
             $button_text    = stripslashes( $options[ 'button_text'] );
-            // Do not display universal icon
+            // Do not display universal icon
             $button_class  .= ' addtoany_no_icon';
         } else {
-            // Default AddToAny button
+            // Default AddToAny button
             if ( $is_amp ) {
-                // AMP (Accelerated Mobile Page)
+                // AMP (Accelerated Mobile Page)
                 $button_src    = 'https://static.addtoany.com/buttons/a2a.svg';
                 $button_width  = ! empty( $args['icon_size'] ) ? ' width="' . $args['icon_size'] .'"'  : ' width="32"';
@@ -444 +452 @@
         }
         
-        // Add additional classNames to .a2a_dd
+        // Add additional classNames to .a2a_dd
         $button_additional_classes = ! empty( $args['button_additional_classes'] ) ? ' ' . $args['button_additional_classes'] : '';
         
@@ -457 +465 @@
     
     } else {
-        // Universal button disabled
+        // Universal button disabled
         $button_html = '';
     }
     
-    // Closing tags come after <script> to validate in case the container is a list element
+    // Closing tags come after <script> to validate in case the container is a list element
     $button_html .= $args['html_wrap_close'] . $args['html_container_close'];
     
@@ -550 +558 @@
     $options = get_option( 'addtoany_options', array() );
     
-    // Args are passed on to ADDTOANY_SHARE_SAVE_KIT
+    // Args are passed on to ADDTOANY_SHARE_SAVE_KIT
     $defaults = array(
         'buttons' => array(),
@@ -571 +579 @@
     $args = wp_parse_args( $args, $defaults );
     
-    // Add a2a_follow className to Kit classes
+    // Add a2a_follow className to Kit classes
     $args['kit_additional_classes'] = trim( $args['kit_additional_classes'] . ' a2a_follow' );
     
-    // If $args['buttons']['feed']['id'] is set
+    // If $args['buttons']['feed']['id'] is set
     $buttons = $args['buttons'];
     if ( ! empty( $buttons['feed'] ) && ! empty( $buttons['feed']['id'] ) ) {
@@ -594 +602 @@
     $floating_html = '';
 
-    // Overridable by args below
+    // Overridable by args below
     $vertical_type = ( isset( $options['floating_vertical'] ) && 'none' != $options['floating_vertical']
         && ! in_array( $options['floating_vertical'], array( 'left_attached', 'right_attached' ) )
@@ -606 +614 @@
         
         if ( ! empty( $sharing_disabled ) ) {
-            // Overridable by args below
+            // Overridable by args below
             $vertical_type   = false;
             $horizontal_type = false;
@@ -612 +620 @@
     }
 
-    // Args are passed on to ADDTOANY_SHARE_SAVE_KIT
+    // Args are passed on to ADDTOANY_SHARE_SAVE_KIT
     $defaults = array(
         'linkname' => '',
@@ -630 +638 @@
     $args = wp_parse_args( $args, $defaults );
     
-    // Individual floating type args can override saved options
+    // Individual floating type args can override saved options
     if ( isset( $args['vertical_type'] ) && $args['vertical_type'] === true ) {
         $vertical_type = true;
@@ -638 +646 @@
     }
 
-    // If either floating type is enabled
-    // Expect either a string from options, or a boolean from args
+    // If either floating type is enabled
+    // 
     if ( $vertical_type || $horizontal_type ) {
         // Vertical type?
         if ( $vertical_type ) {
-            // Prevent overwriting of $args
+            // Prevent overwriting of $args
             $vertical_args = $args;
             
-            // Top position
+            // Top position
             $position = ( isset( $options['floating_vertical_position'] ) ) ? $options['floating_vertical_position'] . 'px' : '100px';
-            // Left or right offset
+            // Left or right offset
             $offset = ( isset( $options['floating_vertical_offset'] ) ) ? $options['floating_vertical_offset'] . 'px' : '0px';
-            // Icon size
+            // Icon size
             $vertical_args['icon_size'] = ( isset( $options['floating_vertical_icon_size'] ) ) ? $options['floating_vertical_icon_size'] : '32';
             
-            // Show on scroll value from the top
+            // Show on scroll value from the top
             $vertical_scroll_show_top = isset( $options['floating_vertical_scroll_top'] ) && '1' == $options['floating_vertical_scroll_top']
                 && isset( $options['floating_vertical_scroll_top_pixels'] ) 
                 && is_numeric( $options['floating_vertical_scroll_top_pixels'] ) ? $options['floating_vertical_scroll_top_pixels'] : '';
-            // Show on scroll value from the bottom
+            // Show on scroll value from the bottom
             $vertical_scroll_show_bottom = isset( $options['floating_vertical_scroll_bottom'] ) && '1' == $options['floating_vertical_scroll_bottom']
                 && isset( $options['floating_vertical_scroll_bottom_pixels'] ) 
                 && is_numeric( $options['floating_vertical_scroll_bottom_pixels'] ) ? $options['floating_vertical_scroll_bottom_pixels'] : '';
-            // Merge values as required
+            // Merge values as required
             if ( ! empty( $vertical_scroll_show_bottom ) ) {
                 $vertical_args['scroll_show'] = empty( $vertical_scroll_show_top ) ? '0,' . $vertical_scroll_show_bottom : $vertical_scroll_show_top . ',' . $vertical_scroll_show_bottom;
@@ -668 +676 @@
             }
         
-            // Add a2a_vertical_style className to Kit classes
+            // Add a2a_vertical_style className to Kit classes
             $vertical_args['kit_additional_classes'] = trim( $args['kit_additional_classes'] . ' a2a_floating_style a2a_vertical_style' );
             
-            // Add declarations to Kit style attribute
+            // Add declarations to Kit style attribute
             if ( 'left_docked' === $vertical_type ) {
                 $vertical_args['kit_style'] = 'left:' . $offset . ';top:' . $position . ';';
@@ -677 +685 @@
                 $vertical_args['kit_style'] = 'right:' . $offset . ';top:' . $position . ';';
             }
-            // Background color
+            // 
             if ( ! empty( $options['floating_vertical_bg'] ) && 'custom' === $options['floating_vertical_bg'] ) {
                 $vertical_args['kit_style'] .= ! empty( $options['floating_vertical_bg_color'] ) ? 'background-color:' . $options['floating_vertical_bg_color'] . ';' : '';
@@ -689 +697 @@
         // Horizontal type?
         if ( $horizontal_type ) {
-            // Prevent overwriting of $args values
+            // Prevent overwriting of $args values
             $horizontal_args = $args;
             
-            // Left or right position
+            // Left or right position
             $position = ( isset( $options['floating_horizontal_position'] ) ) ? $options['floating_horizontal_position'] . 'px' : '0px';
-            // Bottom offset
+            // Bottom offset
             $offset = ( isset( $options['floating_horizontal_offset'] ) ) ? $options['floating_horizontal_offset'] . 'px' : '0px';
-            // Icon size
+            // Icon size
             $horizontal_args['icon_size'] = ( isset( $options['floating_horizontal_icon_size'] ) ) ? $options['floating_horizontal_icon_size'] : '32';
-            // Show on scroll value from the top
+            // Show on scroll value from the top
             $horizontal_scroll_show_top = isset( $options['floating_horizontal_scroll_top'] ) && '1' == $options['floating_horizontal_scroll_top']
                 && isset( $options['floating_horizontal_scroll_top_pixels'] ) 
                 && is_numeric( $options['floating_horizontal_scroll_top_pixels'] ) ? $options['floating_horizontal_scroll_top_pixels'] : '';
-            // Show on scroll value from the bottom
+            // Show on scroll value from the bottom
             $horizontal_scroll_show_bottom = isset( $options['floating_horizontal_scroll_bottom'] ) && '1' == $options['floating_horizontal_scroll_bottom']
                 && isset( $options['floating_horizontal_scroll_bottom_pixels'] ) 
                 && is_numeric( $options['floating_horizontal_scroll_bottom_pixels'] ) ? $options['floating_horizontal_scroll_bottom_pixels'] : '';
-            // Merge values as required
+            // Merge values as required
             if ( ! empty( $horizontal_scroll_show_bottom ) ) {
                 $horizontal_args['scroll_show'] = empty( $horizontal_scroll_show_top ) ? '0,' . $horizontal_scroll_show_bottom : $horizontal_scroll_show_top . ',' . $horizontal_scroll_show_bottom;
@@ -713 +721 @@
             }
 
-            // Add a2a_default_style className to Kit classes
+            // Add a2a_default_style className to Kit classes
             $horizontal_args['kit_additional_classes'] = trim( $args['kit_additional_classes'] . ' a2a_floating_style a2a_default_style' );
             
-            // Add declarations to Kit style attribute
+            // Add declarations to Kit style attribute
             if ( 'left_docked' === $horizontal_type ) {
                 $horizontal_args['kit_style'] = 'bottom:' . $offset . ';left:' . $position . ';';
@@ -724 +732 @@
                 $horizontal_args['kit_style'] = 'bottom:' . $offset . ';left:50%;transform:translateX(-50%);';
             }
-            // Background color
+            // Background color
             if ( ! empty( $options['floating_horizontal_bg'] ) && 'custom' === $options['floating_horizontal_bg'] ) {
                 $horizontal_args['kit_style'] .= ! empty( $options['floating_horizontal_bg_color'] ) ? 'background-color:' . $options['floating_horizontal_bg_color'] . ';' : '';
@@ -743 +751 @@
 
 function A2A_SHARE_SAVE_head_script() {
-    // Hook to disable script output
+    // Hook to disable script output
     // Example: add_filter( 'addtoany_script_disabled', '__return_true' );
     $script_disabled = apply_filters( 'addtoany_script_disabled', false );
@@ -770 +778 @@
         // If cache is recent
         if ( $cache ) {
-            // Set a "ver" parameter's value to the file's modified time for cache management
+            // Set a "ver" parameter's value to the file's modified time for cache management
             $querystring = '?ver=' . $modified_time;
         } else {
-            // Revert the cache option
+            // Revert the cache option
             A2A_SHARE_SAVE_revert_cache();
         }
     }
     
-    // Set static server
+    // Set static server
     $static_server = $cache ? $upload_dir['baseurl'] . '/addtoany' : 'https://static.addtoany.com/menu';
     
-    // Icon colors
+    // Icon colors
     $icon_bg = ! empty( $options['icon_bg'] ) && in_array( $options['icon_bg'], array( 'custom', 'transparent' ) ) ? $options['icon_bg'] : false;
     $icon_bg_color = 'custom' === $icon_bg && ! empty( $options['icon_bg_color'] ) ? $options['icon_bg_color'] : '';
@@ -787 +795 @@
     $icon_fg = ! empty( $options['icon_fg'] ) && 'custom' === $options['icon_fg'] ? true : false;
     $icon_fg_color = $icon_fg && ! empty( $options['icon_fg_color'] ) ? ',' . $options['icon_fg_color'] : '';
-    // Use "unset" keyword for background if only the foreground is set
+    // Use "unset" keyword for background if only the foreground is set
     $icon_bg_color = empty( $icon_bg_color ) && ! empty( $icon_fg_color ) ? 'unset' : $icon_bg_color;
     $icon_color = $icon_bg_color . $icon_fg_color;
 
-    // Floating vertical relative to content
+    // Floating vertical relative to content
     $floating_js = '';
     if (
@@ -799 +807 @@
         && empty( $sharing_disabled )
     ) {
-        // Top position
+        // Top position
         $floating_js_position = ( isset( $options['floating_vertical_position'] ) ) ? $options['floating_vertical_position'] . 'px' : '100px';
-        // Left or right offset
+        // Left or right offset
         $floating_js_offset = ( isset( $options['floating_vertical_offset'] ) ) ? $options['floating_vertical_offset'] . 'px' : '0px';
         
-        // Style attribute (accepts "left" attached only)
+        // Style attribute (accepts "left" attached only)
         $floating_js_kit_style = 'left_attached' === $options['floating_vertical'] ? 'margin-left:' . $floating_js_offset . ';' : '';
         $floating_js_kit_style .= 'top:' . $floating_js_position . ';';
@@ -828 +836 @@
     }
     
-    // Enternal script call + initial JS + set-once variables
+    // Enternal script call + initial JS + set-once variables
     $additional_js = ( isset( $options['additional_js_variables'] ) ) ? $options['additional_js_variables'] : '' ;
     $script_configs = ( ( $cache ) ? "\n" . 'a2a_config.static_server="' . $static_server . '";' : '' )
@@ -873 +881 @@
     global $wp_current_filter;
     
-    // Don't add to get_the_excerpt because it's too early and strips tags (adding to the_excerpt is allowed)
+    // Don't add to get_the_excerpt because it's too early and strips tags (adding to the_excerpt is allowed)
     if ( in_array( 'get_the_excerpt', (array) $wp_current_filter ) ) {
-        // Return early
+        // Return early
         return $content;
     }
@@ -883 +891 @@
     
     if ( 
-        // Private post
+        // Private post
         get_post_status( get_the_ID() ) == 'private' ||
-        // Sharing disabled on post
+        // Sharing disabled on post
         ! empty( $sharing_disabled ) 
     ) {
@@ -898 +906 @@
     if ( 
         ( 
-            // Legacy tags
+            // Legacy tags
             // <!--sharesave--> tag
             strpos( $content, '<!--sharesave-->' ) === false || 
@@ -906 +914 @@
         (
             // Posts
-            // All posts
+            // All posts
             ( is_singular('post') && isset( $options['display_in_posts'] ) && $options['display_in_posts'] == '-1' ) ||
-            // Front page posts     
+            // Front page posts
             ( is_home() && isset( $options['display_in_posts_on_front_page'] ) && $options['display_in_posts_on_front_page'] == '-1' ) ||
-            // Archive page posts (Category, Tag, Author and Date pages)
+            // Archive page posts (Category, Tag, Author and Date pages)
             ( is_archive() && isset( $options['display_in_posts_on_archive_pages'] ) && $options['display_in_posts_on_archive_pages'] == '-1' ) ||
-            // Search results posts (same as Archive page posts option)
+            // Search results posts (same as Archive page posts option)
             ( is_search() && isset( $options['display_in_posts_on_archive_pages'] ) && $options['display_in_posts_on_archive_pages'] == '-1' ) || 
-            // Excerpt (the_excerpt is the current filter)
+            // Excerpt (the_excerpt is the current filter)
             ( 'the_excerpt' == current_filter() && isset( $options['display_in_excerpts'] ) && $options['display_in_excerpts'] == '-1' ) ||
-            // Posts in feed
+            // Posts in feed
             ( $is_feed && isset( $options['display_in_feed'] ) && $options['display_in_feed'] == '-1' ) ||
             
-            // Custom post types
+            // Custom post types
             ( $post_type && isset( $options['display_in_cpt_' . $post_type] ) && $options['display_in_cpt_' . $post_type] == '-1' ) ||
             
             // Pages
-            // Individual pages
+            // Individual pages
             ( is_singular('page') && isset( $options['display_in_pages'] ) && $options['display_in_pages'] == '-1' ) ||
-            // Attachment (media) pages
+            // Attachment (media) pages
             ( is_attachment() && isset( $options['display_in_attachments'] ) && $options['display_in_attachments'] == '-1' ) ||
-            // <!--nosharesave--> legacy tag
+            // <!--nosharesave--> legacy tag
             ( (strpos( $content, '<!--nosharesave-->') !== false ) )
         )
     ) {
-        // Return early
+        // Return early
         return $content;
     }
@@ -963 +971 @@
     
     if ($options['position'] == 'both' || $options['position'] == 'top') {
-        // Prepend to content
+        // Prepend to content
         $content = sprintf( $container_wrap_open, 'addtoany_content_top' ) . ADDTOANY_SHARE_SAVE_KIT($kit_args) . $container_wrap_close . $content;
     }
     if ( $options['position'] == 'bottom' || $options['position'] == 'both') {
-        // Append to content
+        // Append to content
         $content .= sprintf( $container_wrap_open, 'addtoany_content_bottom' ) . ADDTOANY_SHARE_SAVE_KIT($kit_args) . $container_wrap_close;
     }
@@ -977 +985 @@
 function A2A_SHARE_SAVE_pre_get_posts( $query ) {
     if ( $query->is_main_query() ) {
-        // Hook to change the standard buttons' priority number in content
+        // Hook to change the standard buttons' priority number in content
         // Example: add_filter( 'addtoany_content_priority', 20 );
         $priority = apply_filters( 'addtoany_content_priority', 98 );
@@ -1021 +1029 @@
         wp_enqueue_style( 'addtoany', plugins_url('/addtoany.min.css', __FILE__ ), false, '1.15' );
         
-        // Prepare inline CSS
+        // Prepare inline CSS
         $inline_css = '';
         
@@ -1032 +1040 @@
             ( ! isset( $options['floating_vertical_responsive'] ) || '-1' != $options['floating_vertical_responsive'] )
         ) {
-            // Get min-width for media query
+            // Get min-width for media query
             $vertical_max_width = ( 
                 isset( $options['floating_vertical_responsive_max_width'] ) && 
@@ -1038 +1046 @@
             ) ? $options['floating_vertical_responsive_max_width'] : '980';
             
-            // Set media query
+            // Set media query
             $inline_css .= '@media screen and (max-width:' . $vertical_max_width . 'px){' . "\n"
                 . '.a2a_floating_style.a2a_vertical_style{display:none;}' . "\n"
@@ -1049 +1057 @@
             ( ! isset( $options['floating_horizontal_responsive'] ) || '-1' != $options['floating_horizontal_responsive'] )
         ) {
-            // Get max-width for media query
+            // Get max-width for media query
             $horizontal_min_width = ( 
                 isset( $options['floating_horizontal_responsive_min_width'] ) && 
@@ -1055 +1063 @@
             ) ? $options['floating_horizontal_responsive_min_width'] : '981';
             
-            // Insert newline if there is inline CSS already
+            // Insert newline if there is inline CSS already
             $inline_css = 0 < strlen( $inline_css ) ? $inline_css . "\n" : $inline_css;
             
-            // Set media query
+            // Set media query
             $inline_css .= '@media screen and (min-width:' . $horizontal_min_width . 'px){' . "\n"
                 . '.a2a_floating_style.a2a_default_style{display:none;}' . "\n"
@@ -1068 +1076 @@
             $custom_css = stripslashes( $options['additional_css'] );
             
-            // Insert newline if there is inline CSS already
+            // Insert newline if there is inline CSS already
             $inline_css = 0 < strlen( $inline_css ) ? $inline_css . "\n" : $inline_css;
             
@@ -1076 +1084 @@
         // If there is inline CSS
         if ( 0 < strlen( $inline_css ) ) {
-            // Insert inline CSS
+            // Insert inline CSS
             wp_add_inline_style( 'addtoany', $inline_css ); 
         }
@@ -1093 +1101 @@
 
 /**
- * Cache AddToAny
+ * 
  */
 
@@ -1101 +1109 @@
     $upload_dir = wp_upload_dir();
     
-    // Try to create directory if it doesn't already exist
+    // Try to create directory if it doesn't already exist
     if ( ! wp_mkdir_p( dirname( $upload_dir['basedir'] . '/addtoany/foo' ) ) ) {
-        // Handle directory creation issue
-        // Revert cache option
+        // Handle directory creation issue
+        // Revert cache option
         A2A_SHARE_SAVE_revert_cache();
     }
@@ -1110 +1118 @@
     if ( count( $file_urls ) > 0 ) {
         for ( $i = 0; $i < count( $file_urls ); $i++ ) {
-            // Download files
+            // Download files
             $file_url = trim( $file_urls[ $i ] );
             $file_name = substr( strrchr( $file_url, '/' ), 1, 99 );
             
-            // Place files in uploads/addtoany directory
+            // Place files in uploads/addtoany directory
             $response = wp_remote_get( $file_url, array(
                 'filename' => $upload_dir['basedir'] . '/addtoany/' . $file_name,
-                'stream'   => true, // Required to use `filename` arg
+                'stream'   => true, // Required to use `filename` arg
             ) );
 
-            // Handle error
+            // Handle error
             if ( is_wp_error( $response ) ) {
-                // Revert cache option
+                // Revert cache option
                 A2A_SHARE_SAVE_revert_cache();
             }
@@ -1132 +1140 @@
 
 function A2A_SHARE_SAVE_schedule_cache() {
-    // Unschedule if already scheduled
+    // Unschedule if already scheduled
     A2A_SHARE_SAVE_unschedule_cache();
 
-    // Try to schedule daily cache refreshes, running once now
+    // Try to schedule daily cache refreshes, running once now
     $result = wp_schedule_event( time(), 'daily', 'addtoany_refresh_cache' );
 
-    // Revert cache option if the event didn't get scheduled
+    // Revert cache option if the event didn't get scheduled
     if ( false === $result ) {
         A2A_SHARE_SAVE_revert_cache();
@@ -1145 +1153 @@
 
 function A2A_SHARE_SAVE_unschedule_cache() {
-    // Unschedule if scheduled
+    // Unschedule if scheduled
     wp_clear_scheduled_hook( 'addtoany_refresh_cache' );
 }
 
 function A2A_SHARE_SAVE_revert_cache() {
-    // Unschedule
+    // Unschedule
     A2A_SHARE_SAVE_unschedule_cache();
 
-    // Get all existing AddToAny options
+    // Get all existing AddToAny options
     $options = get_option( 'addtoany_options', array() );
 
-    // Revert cache option
+    // Revert cache option
     $options['cache'] = '-1';   
     update_option( 'addtoany_options', $options );
@@ -1162 +1170 @@
 
 /**
- * Activation hook
+ * Activation hook
  */
 
@@ -1179 +1187 @@
 
 /**
- * Deactivation hook
+ * Deactivation hook
  */
 
@@ -1190 +1198 @@
 
 /**
- * Admin Options
+ * Admin Options
  */
 
@@ -1219 +1227 @@
 add_action( 'widgets_init', 'A2A_SHARE_SAVE_widgets_init' );
 
-// Place in Option List on Settings > Plugins page 
+// Place in Option List on Settings > Plugins page
 function A2A_SHARE_SAVE_actlinks( $links, $file ) {
     // Static so we don't call plugin_basename on every plugin row.
@@ -1230 +1238 @@
     if ( $file == $this_plugin ) {
         $settings_link = '<a href="options-general.php?page=addtoany">' . __( 'Settings' ) . '</a>';
-        array_unshift( $links, $settings_link ); // before other links
+        array_unshift( $links, $settings_link ); // 
     }
     

add-to-any/trunk/addtoany.compat.php

@@ -2 +2 @@
     
 /**
- * Load theme compatibility functions
+ * Load theme compatibility functions
  */
 function addtoany_load_theme_compat() {
@@ -11 +11 @@
 
 /**
- * Remove from excerpts where buttons could be redundant or awkward
+ * Remove from excerpts where buttons could be redundant or awkward
  */
 function addtoany_excerpt_remove() {
     // If Twenty Sixteen theme
     if ( 'twentysixteen' == get_stylesheet() || 'twentysixteen' == get_template() ) {
-        // If blog index, single, or archive page, where excerpts are used as "intros"
+        // If blog index, single, or archive page, where excerpts are used as "intros"
         if ( is_single() || is_archive() || is_home() ) {
             remove_filter( 'the_excerpt', 'A2A_SHARE_SAVE_add_to_content', 98 );
@@ -24 +24 @@
 
 /**
- * Load AMP (Accelerated Mobile Pages) compatibility functions
+ * Load AMP (Accelerated Mobile Pages) compatibility functions
  */
 
@@ -30 +30 @@
 
 function addtoany_amp_additional_css_styles( $amp_template ) {
-    // CSS only
+    // CSS only
     ?>
     .addtoany_list a {
@@ -50 +50 @@
 function addtoany_priority_for_amp_jetpack() {
     // If the AMP plugin is enabled, the Jetpack plugin is enabled,
-    // and Jetpack's Related Posts module is enabled
+    // and Jetpack's Related Posts module is enabled
     if ( class_exists( 'AMP_Autoloader' ) && class_exists( 'Jetpack' ) && Jetpack::is_module_active( 'related-posts' ) ) {
-        // Change priority to 20
+        // Change priority to 20
         add_filter( 'addtoany_content_priority', function() { return 20; } );
     }
@@ -58 +58 @@
 
 /**
- * Move buttons from WooCommerce product description to WooCommerce's sharing block
+ * Move buttons from WooCommerce product description to WooCommerce's sharing block
  */
 add_action( 'woocommerce_share', 'addtoany_woocommerce_share', 10 );
@@ -72 +72 @@
     
     if ( 
-        // Private post
+        // Private post
         get_post_status( get_the_ID() ) == 'private' ||
-        // Sharing disabled on post
+        // Sharing disabled on post
         ! empty( $sharing_disabled ) ||
-        // Custom post type (usually "product") disabled
+        // Custom post type (usually "product") disabled
         ( $post_type && isset( $options['display_in_cpt_' . $post_type] ) && $options['display_in_cpt_' . $post_type] == '-1' )
     ) {
         return;
     } else {
-        // If a Sharing Header is set
+        // If a Sharing Header is set
         if ( ! empty( $options['header'] ) ) {
             echo '<div class="addtoany_header">' . stripslashes( $options['header'] ) . '</div>';
@@ -88 +88 @@
         }
         
-        // Display share buttons
+        // Display share buttons
         ADDTOANY_SHARE_SAVE_KIT();
     }

add-to-any/trunk/addtoany.update.php

@@ -2 +2 @@
     
 /**
- * Migrate old AddToAny options
+ * Migrate old AddToAny options
  */
 function addtoany_update_options() {
@@ -17 +17 @@
     // If old button enabled
     if ( ! empty( $options_old['button'] ) && in_array( $options_old['button'], $old_buttons) ) {
-        // Switch to custom button URL
+        // Switch to custom button URL
         $options_new['button'] = 'CUSTOM';
         $options_new['button_custom'] = 'https://static.addtoany.com/buttons/' . current( explode( '|', $options_old['button'] ) );

add-to-any/trunk/addtoany.widgets.php

@@ -12 +12 @@
 class A2A_SHARE_SAVE_Widget extends WP_Widget {
     
-    /** constructor */
+    /** onstructor */
     function __construct() {
         $widget_ops = array( 
@@ -31 +31 @@
     }
     
-    /** Backwards compatibility for A2A_SHARE_SAVE_Widget::display(); usage */
+    /** Backwards compatibility for A2A_SHARE_SAVE_Widget::display(); usage */
     public function display( $args = false ) {
         self::widget( $args, NULL );
@@ -100 +100 @@
 class A2A_Follow_Widget extends WP_Widget {
     
-    /** constructor */
+    /** onstructor */
     function __construct() {
         $widget_ops = array( 
@@ -147 +147 @@
         $active_services = array();
         
-        // See which services have IDs set
+        // See which services have IDs set
         $services = $this->get_follow_services();
         foreach ( $services as $code => $service ) {
             $code_id = $code . '_id';
             if ( ! empty( $instance[ $code_id ] ) ) {
-                // Set ID value
+                // Set ID value
                 $active_services[ $code ] = array( 'id' => $instance[ $code_id ] );
             }
@@ -175 +175 @@
         $instance['icon_size'] = sanitize_text_field( $new_instance['icon_size'] );
         
-        // Accept service IDs
+        // Accept service IDs
         $services = $this->get_follow_services();
         foreach ( $services as $code => $service ) {
@@ -200 +200 @@
             $icon_size = $instance['icon_size'];
         } elseif ( ! empty( $options['icon_size'] ) ) {
-            // Fallback to standard icon size if saved
+            // Fallback to standard icon size if saved
             $icon_size = $options['icon_size'];
         } else {