Changeset 2127344 for shariff

Timestamp:

07/23/2019 04:47:30 PM (7 years ago)

Author:

starguide

Message:

Release 4.6.3

Location:

shariff/trunk

Files:

• admin/admin-menu.php (modified) (5 diffs)
• admin/admin-notices.php (modified) (1 diff)
• changelog.txt (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• services/shariff-buffer.php (modified) (1 diff)
• services/shariff-facebook.php (modified) (2 diffs)
• services/shariff-flattr.php (modified) (2 diffs)
• services/shariff-mix.php (modified) (1 diff)
• services/shariff-whatsapp.php (modified) (1 diff)
• shariff.php (modified) (6 diffs)
• updates.php (modified) (9 diffs)

shariff/trunk/admin/admin-menu.php

@@ -13 +13 @@
 
 // Set services that have a share count API / backend.
-$shariff3uu_services_backend = array( 'facebook', 'twitter', 'pinterest', 'xing', 'reddit', 'tumblr', 'vk', 'addthis', 'flattr', 'odnoklassniki', 'buffer' );
+$shariff3uu_services_backend = array( 'facebook', 'twitter', 'pinterest', 'xing', 'reddit', 'tumblr', 'vk', 'addthis', 'odnoklassniki', 'buffer' );
 
 // Adds the actions for the admin page.
@@ -308 +308 @@
         __( 'Twitter username for the via tag:', 'shariff' ),
         'shariff3uu_text_twittervia_render',
-        'shariff3uu_advanced',
-        'shariff3uu_advanced_section'
-    );
-
-    // Flattr username.
-    add_settings_field(
-        'shariff3uu_text_flattruser',
-        __( 'Flattr username:', 'shariff' ),
-        'shariff3uu_text_flattruser_render',
         'shariff3uu_advanced',
         'shariff3uu_advanced_section'
@@ -1322 +1313 @@
     }
     echo '<input type="text" name="shariff3uu_advanced[twitter_via]" value="' . esc_html( $twitter_via ) . '" size="50" placeholder="' . esc_html__( 'username', 'shariff' ) . '">';
-}
-
-/**
- * Flattr username.
- */
-function shariff3uu_text_flattruser_render() {
-    if ( isset( $GLOBALS['shariff3uu_advanced']['flattruser'] ) ) {
-        $flattruser = $GLOBALS['shariff3uu_advanced']['flattruser'];
-    } else {
-        $flattruser = '';
-    }
-    echo '<input type="text" name="shariff3uu_advanced[flattruser]" value="' . esc_html( $flattruser ) . '" size="50" placeholder="' . esc_html__( 'username', 'shariff' ) . '">';
 }
 
@@ -1850 +1829 @@
             echo '<div style="display:table-cell;border:1px solid;padding:10px">' . esc_html__( 'Sets the Twitter via tag.', 'shariff' ) . '</div>';
         echo '</div>';
-        // Flattruser.
-        echo '<div style="display:table-row">';
-            echo '<div style="display:table-cell;border:1px solid;padding:10px">flattruser</div>';
-            echo '<div style="display:table-cell;border:1px solid;padding:10px"></div>';
-            echo '<div style="display:table-cell;border:1px solid;padding:10px"></div>';
-            echo '<div style="display:table-cell;border:1px solid;padding:10px">[shariff flattruser="your_username"]</div>';
-            echo '<div style="display:table-cell;border:1px solid;padding:10px">' . esc_html__( 'Sets the Flattr username.', 'shariff' ) . '</div>';
-        echo '</div>';
         // Patreonid.
         echo '<div style="display:table-row">';
@@ -2023 +1994 @@
             if ( isset( $shariff3uu['disable'][ $service ] ) && 1 === $shariff3uu['disable'][ $service ] ) {
                 echo '<div style="display:table-row"><div style="display:table-cell;font-weight:bold">' . esc_html__( 'Disabled', 'shariff' ) . '</div></div>';
+            } elseif ( 'facebook' === $service && ( ! isset( $shariff3uu['fb_id'] ) || ! isset( $shariff3uu['fb_secret'] ) ) ) {
+                echo '<div style="display:table-row"><div style="display:table-cell;font-weight:bold;color:#ff0000">' . esc_html__( 'Facebook shut down the possibility to request share counts without an APP ID and Secret. Therefore, you need to create a Facebook APP ID and Secret and enter it in the settings on the Statistic tab. Google will provide you with many tutorials. Simple search for “facebook app id secret” and you will find one in your language.', 'shariff' ) . '</div></div>';
             } elseif ( ! array_key_exists( $service, $service_errors ) ) {
                 echo '<div style="display:table-row"><div style="display:table-cell;font-weight:bold;color:green">' . esc_html__( 'OK', 'shariff' ) . '</div></div>';

shariff/trunk/admin/admin-notices.php

@@ -20 +20 @@
     // Check if any services are set and if user can manage options.
     if ( isset( $GLOBALS['shariff3uu']['services'] ) && current_user_can( 'manage_options' ) ) {
-        // Flattr.
-        if ( strpos( $GLOBALS['shariff3uu']['services'], 'flattr' ) !== false && empty( $GLOBALS['shariff3uu']['flattruser'] ) ) {
-            $services[] = 'Flattr';
-        }
         // Patreon.
         if ( strpos( $GLOBALS['shariff3uu']['services'], 'patreon' ) !== false && empty( $GLOBALS['shariff3uu']['patreonid'] ) ) {

shariff/trunk/changelog.txt

@@ -2 +2 @@
 
 == Changelog ==
+
+= 4.6.3 =
+- updated the WhatsApp share link to work with all devices again (thanks to @hanshansenxxx)
+- updated to Facebook Graph API v3.3
+- updated the Flattr button to reflect the new Flattr (thanks to Chris, @camthor)
+- fixed an update issue with WP CLI
+- removed the Facebook share counts request without APP ID and Secret
+- Facebook now always requires an APP ID and Secret for share counts
+- removed Flattr counts due to Flattr removing the API
 
 = 4.6.2 =

shariff/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 4.9
 Requires PHP: 7.0
-Tested up to: 5.1
-Stable tag: 4.6.2
+Tested up to: 5.2
+Stable tag: 4.6.3
 License: MIT
 License URI: http://opensource.org/licenses/mit
@@ -152 +152 @@
 
 == Changelog ==
+
+= 4.6.3 =
+- updated the WhatsApp share link to work with all devices again (thanks to @hanshansenxxx)
+- updated to Facebook Graph API v3.3
+- updated the Flattr button to reflect the new Flattr (thanks to Chris, @camthor)
+- fixed an update issue with WP CLI
+- removed the Facebook share counts request without APP ID and Secret
+- Facebook now always requires an APP ID and Secret for share counts
+- removed Flattr counts due to Flattr removing the API
 
 = 4.6.2 =

shariff/trunk/services/shariff-buffer.php

@@ -25 +25 @@
 
     // SVG icon.
-    $svg_icon = '<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path fill="' . $main_color . '" d="M91-37.4V-52l1.8 1 24 11.2c1.7.8 3.3.7 4.9 0l24-11.2 1-.4c.9-.6 1-1.3 0-1.8l-3.5-1.7a6.2 6.2 0 0 0-6.2 0l-15.1 7.1c-1.7.8-3.4.9-5.1 0-4.7-2.3-9.5-4.3-14.2-6.7-2.7-1.4-5.3-1.7-8-.1-1.1.7-2.3 1.2-3.5 1.7v-14.3l25 11.6c2.2 1.1 4.2 1 6.3 0l23.5-11c.6-.3 1.5-.4 1.4-1.3 0-.8-.8-1-1.3-1.2l-24.5-11.5a5.2 5.2 0 0 0-4.4-.1L91-68.5v-16.2c0-1.1.2-1.3 1.3-1.3h88.9l-.1 2.3v59.6c-.1 1.1.5 1.5 1.6 1.5h9.4c1 0 1.5-.4 1.5-1.5v-4l1.3 1.2c7.9 7.7 21 6.9 27.8-1.8s7-24.2.5-33.3c-6.7-9.3-20.8-10.6-28.4-2.4-.3.3-.4.8-1.2.6V-86H422c1.2 0 1.5.3 1.5 1.5-.1 5.4 0 10.7 0 16.1-5.8-.3-10 2.7-14.2 6.6v-3.8c0-1.4-.4-2-1.8-1.9h-6.2c-4 0-4 0-4 4.1v39.1c0 1.3.4 1.8 1.6 1.8h8c2.3 0 2.3 0 2.3-2.3 0-7.8.3-15.6-.1-23.3-.2-4.1 1.6-6.1 4.9-7.5l2.6-.9c2.2-.7 4.5-.2 6.8-.4v34.6c0 1-.2 1.2-1.2 1.2h-330c-1 0-1.2-.2-1.2-1.2v-13.8l1.4.9 24.2 11.3c1.7.8 3.4.8 5-.1l13-6 11.4-5.4c.5-.2 1-.4 1-1.1 0-.7-.5-1-1-1.2l-3.4-1.6c-2-1-3.7-.9-5.6 0l-15.3 7.2c-2 .9-3.6.9-5.6 0L101-39.2c-2-.9-3.7-1.1-5.6-.1-1.2.4-2.7 1.2-4.3 1.9zm281.5-3.8h14.8c1.3 0 1.8-.5 1.8-1.8-.1-2-.1-4-.4-6A22.1 22.1 0 0 0 362-68.3a23 23 0 0 0-18.6 21.5c-.4 9.6 2.9 17.4 11.7 22.2a27.6 27.6 0 0 0 20.3 1.9c3.3-.8 6.5-2.1 9.2-4.3.6-.5 1.2-1 .5-1.9l-4.1-6c-.4-.7-1-.7-1.5-.2a17.4 17.4 0 0 1-9.7 3.7c-6.4.6-11-1.9-13.4-7.7-.7-1.8-.4-2.1 1.5-2.1zm-108 13.1c0 1.5.2 2.6 0 3.7 0 1.3.5 1.8 1.8 1.7h8.6c1.3 0 1.8-.5 1.8-1.8v-41.4c0-1.2-.5-1.7-1.7-1.7h-8c-2.3 0-2.3 0-2.3 2.4v26.1c0 .9 0 1.7-.6 2.4-2.4 2.3-5 4-8.5 4.1-6.4.2-8.8-2.1-8.8-8.5v-24.3c0-2.2 0-2.2-2.3-2.2h-7.8c-1.6-.1-2.1.6-2 2.1v10.2c0 7.2-.2 14.5.2 21.7.3 5.3 3.5 9.7 8.3 11.1s9.5 1.2 14.2-.6c2.5-1.1 4.8-2.8 7.2-5zm68-11.7v-15.1c0-2.2 0-2.2 2.4-2.2h5.4c1 0 1.5-.4 1.5-1.4v-7.6c0-1.2-.6-1.5-1.6-1.5h-6c-.6 0-1.2.1-1.4-.7a5.9 5.9 0 0 1 6.9-7.4c.7.2 1.5.4 2 .8 1.2.8 1.8.4 2.4-.6.9-1.4 1.7-2.9 2.7-4.2.9-1.2.5-1.9-.5-2.7a17.4 17.4 0 0 0-8.3-3 14.6 14.6 0 0 0-17 11.7c-.3 1.5-.4 3-.4 4.5 0 1.1-.4 1.6-1.5 1.5h-4.2c-1 0-1.5.3-1.5 1.4v7.8c0 1 .4 1.4 1.4 1.3h3.4c2.4 0 2.4 0 2.4 2.4v30c0 1.5.5 2 2 2h8.3c1.5 0 1.9-.5 1.9-2-.2-4.9-.2-10-.2-15zm-42-.3v15.4c0 1.5.6 2 2 2h7.4c2.9 0 2.9 0 2.9-2.8V-55c0-1.6.5-2.1 2-2h5.3c1 0 1.5-.4 1.5-1.5V-66c0-1.1-.4-1.6-1.5-1.5h-5.8c-.6 0-1.2.1-1.4-.7a5.7 5.7 0 0 1 5.4-7.6c1.3 0 2.5.4 3.5 1.1s1.5.4 2-.5l2.7-4.1c1-1.8 1-2-.7-3.2a17.7 17.7 0 0 0-8.1-2.7 15 15 0 0 0-15.2 7.2c-1.6 2.8-2 5.8-2 8.9.2 1.3-.3 1.8-1.6 1.7h-4.4c-1 0-1.4.4-1.4 1.3v7.8c0 1.1.5 1.4 1.5 1.4h4.2c1.4-.1 1.7.5 1.7 1.8v15z"/><path fill="' . $main_color . '" d="M.3 14.1L29.3.5c1.7-.7 3.2-.6 4.9.1C43.3 5 52.5 9.1 61.5 13.5c.7.3 1.4.5 1.4 1.3 0 1-.9 1.1-1.5 1.4-8.7 4.2-17.5 8.2-26.2 12.3a7.8 7.8 0 0 1-7 0L.3 15.5v-1.4zM.3 48.8l5.1-2.6c2.2-1 4.2-.9 6.3.1l16.8 8c2.1 1 4.1 1 6.2 0l17.1-8c2.1-1 4.1-1 6.2 0l3.8 1.7c.6.3 1.4.6 1.3 1.3 0 .7-.7 1-1.3 1.3l-12.7 6-14.4 6.7c-1.8.9-3.7 1-5.6 0L2 50.9c-.6-.2-1-.7-1.6-1-.2-.2-.2-.6-.2-1z"/><path fill="' . $main_color . '" d="M.3 31.5l4-1.9c3-1.8 5.7-1.4 8.8.1 5.3 2.7 10.6 5 15.9 7.5 2 .9 3.7.9 5.6 0 5.6-2.7 11.3-5.2 16.9-8a7.2 7.2 0 0 1 6.9 0c1.2.8 2.6 1.3 3.9 2 1 .6 1 1.3 0 2l-1 .4-26.9 12.5c-1.8.9-3.6.9-5.3 0L2.2 33.6c-.7-.3-1.2-.8-1.9-1v-1z"/></svg>';
+    $svg_icon = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><path fill="' . $main_color . '" d="M91-37.4V-52l1.8 1 24 11.2c1.7.8 3.3.7 4.9 0l24-11.2 1-.4c.9-.6 1-1.3 0-1.8l-3.5-1.7a6.2 6.2 0 0 0-6.2 0l-15.1 7.1c-1.7.8-3.4.9-5.1 0-4.7-2.3-9.5-4.3-14.2-6.7-2.7-1.4-5.3-1.7-8-.1-1.1.7-2.3 1.2-3.5 1.7v-14.3l25 11.6c2.2 1.1 4.2 1 6.3 0l23.5-11c.6-.3 1.5-.4 1.4-1.3 0-.8-.8-1-1.3-1.2l-24.5-11.5a5.2 5.2 0 0 0-4.4-.1L91-68.5v-16.2c0-1.1.2-1.3 1.3-1.3h88.9l-.1 2.3v59.6c-.1 1.1.5 1.5 1.6 1.5h9.4c1 0 1.5-.4 1.5-1.5v-4l1.3 1.2c7.9 7.7 21 6.9 27.8-1.8s7-24.2.5-33.3c-6.7-9.3-20.8-10.6-28.4-2.4-.3.3-.4.8-1.2.6V-86H422c1.2 0 1.5.3 1.5 1.5-.1 5.4 0 10.7 0 16.1-5.8-.3-10 2.7-14.2 6.6v-3.8c0-1.4-.4-2-1.8-1.9h-6.2c-4 0-4 0-4 4.1v39.1c0 1.3.4 1.8 1.6 1.8h8c2.3 0 2.3 0 2.3-2.3 0-7.8.3-15.6-.1-23.3-.2-4.1 1.6-6.1 4.9-7.5l2.6-.9c2.2-.7 4.5-.2 6.8-.4v34.6c0 1-.2 1.2-1.2 1.2h-330c-1 0-1.2-.2-1.2-1.2v-13.8l1.4.9 24.2 11.3c1.7.8 3.4.8 5-.1l13-6 11.4-5.4c.5-.2 1-.4 1-1.1 0-.7-.5-1-1-1.2l-3.4-1.6c-2-1-3.7-.9-5.6 0l-15.3 7.2c-2 .9-3.6.9-5.6 0L101-39.2c-2-.9-3.7-1.1-5.6-.1-1.2.4-2.7 1.2-4.3 1.9zm281.5-3.8h14.8c1.3 0 1.8-.5 1.8-1.8-.1-2-.1-4-.4-6A22.1 22.1 0 0 0 362-68.3a23 23 0 0 0-18.6 21.5c-.4 9.6 2.9 17.4 11.7 22.2a27.6 27.6 0 0 0 20.3 1.9c3.3-.8 6.5-2.1 9.2-4.3.6-.5 1.2-1 .5-1.9l-4.1-6c-.4-.7-1-.7-1.5-.2a17.4 17.4 0 0 1-9.7 3.7c-6.4.6-11-1.9-13.4-7.7-.7-1.8-.4-2.1 1.5-2.1zm-108 13.1c0 1.5.2 2.6 0 3.7 0 1.3.5 1.8 1.8 1.7h8.6c1.3 0 1.8-.5 1.8-1.8v-41.4c0-1.2-.5-1.7-1.7-1.7h-8c-2.3 0-2.3 0-2.3 2.4v26.1c0 .9 0 1.7-.6 2.4-2.4 2.3-5 4-8.5 4.1-6.4.2-8.8-2.1-8.8-8.5v-24.3c0-2.2 0-2.2-2.3-2.2h-7.8c-1.6-.1-2.1.6-2 2.1v10.2c0 7.2-.2 14.5.2 21.7.3 5.3 3.5 9.7 8.3 11.1s9.5 1.2 14.2-.6c2.5-1.1 4.8-2.8 7.2-5zm68-11.7v-15.1c0-2.2 0-2.2 2.4-2.2h5.4c1 0 1.5-.4 1.5-1.4v-7.6c0-1.2-.6-1.5-1.6-1.5h-6c-.6 0-1.2.1-1.4-.7a5.9 5.9 0 0 1 6.9-7.4c.7.2 1.5.4 2 .8 1.2.8 1.8.4 2.4-.6.9-1.4 1.7-2.9 2.7-4.2.9-1.2.5-1.9-.5-2.7a17.4 17.4 0 0 0-8.3-3 14.6 14.6 0 0 0-17 11.7c-.3 1.5-.4 3-.4 4.5 0 1.1-.4 1.6-1.5 1.5h-4.2c-1 0-1.5.3-1.5 1.4v7.8c0 1 .4 1.4 1.4 1.3h3.4c2.4 0 2.4 0 2.4 2.4v30c0 1.5.5 2 2 2h8.3c1.5 0 1.9-.5 1.9-2-.2-4.9-.2-10-.2-15zm-42-.3v15.4c0 1.5.6 2 2 2h7.4c2.9 0 2.9 0 2.9-2.8V-55c0-1.6.5-2.1 2-2h5.3c1 0 1.5-.4 1.5-1.5V-66c0-1.1-.4-1.6-1.5-1.5h-5.8c-.6 0-1.2.1-1.4-.7a5.7 5.7 0 0 1 5.4-7.6c1.3 0 2.5.4 3.5 1.1s1.5.4 2-.5l2.7-4.1c1-1.8 1-2-.7-3.2a17.7 17.7 0 0 0-8.1-2.7 15 15 0 0 0-15.2 7.2c-1.6 2.8-2 5.8-2 8.9.2 1.3-.3 1.8-1.6 1.7h-4.4c-1 0-1.4.4-1.4 1.3v7.8c0 1.1.5 1.4 1.5 1.4h4.2c1.4-.1 1.7.5 1.7 1.8v15zM.3 14.1L29.3.5a6 6 0 0 1 4.9.1C43.3 5 52.5 9.1 61.5 13.5c.7.3 1.4.5 1.4 1.3 0 1-.9 1.1-1.5 1.4-8.7 4.2-17.5 8.2-26.2 12.3a7.8 7.8 0 0 1-7 0L.3 15.5v-1.4zm0 34.7l5.1-2.6a7 7 0 0 1 6.3.1l16.8 8c2.1 1 4.1 1 6.2 0l17.1-8c2.1-1 4.1-1 6.2 0l3.8 1.7c.6.3 1.4.6 1.3 1.3 0 .7-.7 1-1.3 1.3l-12.7 6-14.4 6.7c-1.8.9-3.7 1-5.6 0L2 50.9c-.6-.2-1-.7-1.6-1-.2-.2-.2-.6-.2-1z"/><path fill="' . $main_color . '" d="M.3 31.5l4-1.9c3-1.8 5.7-1.4 8.8.1 5.3 2.7 10.6 5 15.9 7.5 2 .9 3.7.9 5.6 0 5.6-2.7 11.3-5.2 16.9-8a7.2 7.2 0 0 1 6.9 0c1.2.8 2.6 1.3 3.9 2 1 .6 1 1.3 0 2l-1 .4-26.9 12.5c-1.8.9-3.6.9-5.3 0L2.2 33.6c-.7-.3-1.2-.8-1.9-1v-1z"/></svg>';
 
     // Backend available?

shariff/trunk/services/shariff-facebook.php

@@ -59 +59 @@
     );
 } elseif ( isset( $backend ) && 1 === $backend ) {
-    // Use the FB ID and Secret, if available, else use the normal way.
+    // Use the FB ID and Secret, if available.
     if ( isset( $shariff3uu['fb_id'] ) && isset( $shariff3uu['fb_secret'] ) ) {
         // On 32-bit PHP installations the constant is 4 and we have to disable the check because the id is too long.
@@ -71 +71 @@
         $fb_token = $fb_app_id . '|' . $fb_app_secret;
         // Use the token to get the share counts.
-        $facebook = sanitize_text_field( wp_remote_retrieve_body( wp_remote_get( 'https://graph.facebook.com/v3.2/?access_token=' . $fb_token . '&fields=engagement&id=' . $post_url ) ) );
+        $facebook = sanitize_text_field( wp_remote_retrieve_body( wp_remote_get( 'https://graph.facebook.com/v3.3/?access_token=' . $fb_token . '&fields=engagement&id=' . $post_url ) ) );
         // Decode the json response.
         $facebook_json = json_decode( $facebook, true );
         // Set nofbid in case the page has not yet been crawled by Facebook and no ID is provided.
         $nofbid = '0';
-    } else {
-        $facebook = sanitize_text_field( wp_remote_retrieve_body( wp_remote_get( 'https://graph.facebook.com/?id=' . $post_url ) ) );
-        // Decode the json response.
-        $facebook_json = json_decode( $facebook, true );
-        // Set nofbid in case the page has not yet been crawled by Facebook and no ID is provided.
-        $nofbid = 1;
     }
 

shariff/trunk/services/shariff-flattr.php

@@ -14 +14 @@
 if ( isset( $frontend ) && 1 === $frontend ) {
     // Service URL.
-    $service_url = esc_url( 'https://flattr.com/submit/auto' );
+    $service_url = esc_url( 'https://flattr.com/domain/' );
 
-    // Lang tag.
-    if ( isset( $atts['lang'] ) ) {
-        $lang = $atts['lang'] . '_' . strtoupper( $atts['lang'] );
-    } else {
-        $lang = 'en_US';
-    }
-
-    // Flattr user.
-    if ( array_key_exists( 'flattruser', $atts ) ) {
-        $flattruser = esc_html( $atts['flattruser'] );
-    } else {
-        $flattruser = '';
-    }
+    // Get WP URL.
+    $wp_url = wp_parse_url( get_bloginfo( 'url' ) );
 
     // Build button URL.
-    $button_url = $service_url . '?url=' . $share_url . '&title=' . $share_title . '&language=' . $lang . '&fid=' . $flattruser;
+    $button_url = $service_url . preg_replace('#^www\.(.+\.)#i', '$1', $wp_url['host'] );
 
     // Colors.
@@ -57 +46 @@
         'es' => 'Flattr!',
     );
-} elseif ( isset( $backend ) && 1 === $backend ) {
-    // Fetch counts.
-    $flattr      = sanitize_text_field( wp_remote_retrieve_body( wp_remote_get( 'https://api.flattr.com/rest/v2/things/lookup/?url=' . $post_url ) ) );
-    $flattr_json = json_decode( $flattr, true );
-
-    // Store results, if we have some. If no thing was found, set it to 0. Record errors, if enabled (e.g. request from the status tab).
-    if ( isset( $flattr_json['flattrs'] ) ) {
-        $share_counts['flattr'] = intval( $flattr_json['flattrs'] );
-    } elseif ( isset( $flattr_json['description'] ) && 'No thing was found' === $flattr_json['description'] ) {
-        $share_counts['flattr'] = 0;
-    } elseif ( isset( $record_errors ) && 1 === $record_errors ) {
-        $service_errors['flattr'] = $flattr;
-    }
 }

shariff/trunk/services/shariff-mix.php

@@ -54 +54 @@
         'sv' => 'Dela på Mix',
     );
-} 
+}

shariff/trunk/services/shariff-whatsapp.php

@@ -14 +14 @@
 if ( isset( $frontend ) && 1 === $frontend ) {
     // Service URL.
-    $service_url = 'https://wa.me/';
+    $service_url = 'https://api.whatsapp.com/send';
 
     // Build button URL.

shariff/trunk/shariff.php

@@ -4 +4 @@
  * Plugin URI: https://wordpress.org/plugins-wp/shariff/
  * Description: Shariff provides share buttons that respect the privacy of your visitors and follow the General Data Protection Regulation (GDPR).
- * Version: 4.6.2
+ * Version: 4.6.3
  * Author: Jan-Peter Lambeck & 3UU
  * Author URI: https://wordpress.org/plugins/shariff/
@@ -34 +34 @@
 function shariff3uu_update() {
     // Adjust code version.
-    $code_version = '4.6.2';
-
-    // Get options.
-    $shariff3uu = $GLOBALS['shariff3uu'];
+    $code_version = '4.6.3';
+
+    // Get basic options.
+    $shariff3uu_basic = (array) get_option( 'shariff3uu_basic' );
 
     // Check if the installed version is older than the code version and include updates.php if necessary.
-    if ( empty( $shariff3uu['version'] ) || ( isset( $shariff3uu['version'] ) && version_compare( $shariff3uu['version'], $code_version ) === -1 ) ) {
+    if ( empty( $shariff3uu_basic['version'] ) || ( isset( $shariff3uu_basic['version'] ) && version_compare( $shariff3uu_basic['version'], $code_version ) === -1 ) ) {
+        // Get the other options.
+        $shariff3uu_design    = (array) get_option( 'shariff3uu_design' );
+        $shariff3uu_advanced  = (array) get_option( 'shariff3uu_advanced' );
+        $shariff3uu_statistic = (array) get_option( 'shariff3uu_statistic' );
+        $shariff3uu           = array_merge( $shariff3uu_basic, $shariff3uu_design, $shariff3uu_advanced, $shariff3uu_statistic );
         // Include updates.php.
         include dirname( __FILE__ ) . '/updates.php';
@@ -46 +51 @@
 }
 add_action( 'admin_init', 'shariff3uu_update' );
+// In case WP-CLI is used and the backend is never visited, we add it to cli_init as well.
+add_action( 'cli_init', 'shariff3uu_update' );
 
 /**
@@ -1194 +1201 @@
     foreach ( $service_array as $service ) {
         // Check if necessary usernames are set and display warning to admins, if needed.
-        if ( 'flattr' === $service && ! array_key_exists( 'flattruser', $atts ) ) {
-            $flattr_error = 1;
-        } elseif ( 'paypal' === $service && ! array_key_exists( 'paypalbuttonid', $atts ) ) {
+        if ( 'paypal' === $service && ! array_key_exists( 'paypalbuttonid', $atts ) ) {
             $paypal_error = 1;
         } elseif ( 'paypalme' === $service && ! array_key_exists( 'paypalmeid', $atts ) ) {
@@ -1519 +1524 @@
     }
 
-    // Displays a warning to admins if flattr is set, but no flattr username was provided.
-    if ( 1 === $flattr_error && current_user_can( 'manage_options' ) ) {
-        $output .= '<div class="shariff-warning">' . __( 'Username for Flattr is missing!', 'shariff' ) . '</div>';
-    }
     // Displays a warning to admins if patreon is set, but no patreon username was provided.
     if ( 1 === $patreon_error && current_user_can( 'manage_options' ) ) {
@@ -1573 +1574 @@
  */
 function shariff3uu_deactivate() {
-    global $wpdb;
     // Checks for multisite.
     if ( is_multisite() && function_exists( 'get_sites' ) && class_exists( 'WP_Site_Query' ) ) {

shariff/trunk/updates.php

@@ -1 +1 @@
 <?php
 /**
- * Will be included by shariff3UU_update() only if needed.
+ * Will be included by shariff3uu_update() only if needed.
  * Put all update task here. Make sure that all "older" updates are checked first.
- * At least you must set $GLOBALS["shariff3UU"]["version"] = [YOUR VERSION]; to avoid includes later on.
+ * At least you must set $shariff3uu['version'] = [YOUR VERSION]; to avoid includes later on.
  *
  * @package WordPress
@@ -18 +18 @@
  * Delete old cache directory.
  */
-if ( isset( $GLOBALS['shariff3UU']['version'] ) && -1 === version_compare( $GLOBALS['shariff3UU']['version'], '2.2.5' ) ) {
+if ( isset( $shariff3uu['version'] ) && -1 === version_compare( $shariff3uu['version'], '2.2.5' ) ) {
 
     // Basic options.
-    if ( isset( $GLOBALS['shariff3UU']['version'] ) ) {
-        $GLOBALS['shariff3UU_basic']['version'] = $GLOBALS['shariff3UU']['version'];
-    }
-    if ( isset( $GLOBALS['shariff3UU']['services'] ) ) {
-        $GLOBALS['shariff3UU_basic']['services'] = $GLOBALS['shariff3UU']['services'];
-    }
-    if ( isset( $GLOBALS['shariff3UU']['add_after_all_posts'] ) ) {
-        $GLOBALS['shariff3UU_basic']['add_after']['posts'] = $GLOBALS['shariff3UU']['add_after_all_posts'];
-    }
-    if ( isset( $GLOBALS['shariff3UU']['add_after_all_overview'] ) ) {
-        $GLOBALS['shariff3UU_basic']['add_after']['posts_blogpage'] = $GLOBALS['shariff3UU']['add_after_all_overview'];
-    }
-    if ( isset( $GLOBALS['shariff3UU']['add_after_all_pages'] ) ) {
-        $GLOBALS['shariff3UU_basic']['add_after']['pages'] = $GLOBALS['shariff3UU']['add_after_all_pages'];
-    }
-    if ( isset( $GLOBALS['shariff3UU']['add_after_all_custom_type'] ) ) {
-        $GLOBALS['shariff3UU_basic']['add_after']['custom_type'] = $GLOBALS['shariff3UU']['add_after_all_custom_type'];
-    }
-    if ( isset( $GLOBALS['shariff3UU']['add_before_all_posts'] ) ) {
-        $GLOBALS['shariff3UU_basic']['add_before']['posts'] = $GLOBALS['shariff3UU']['add_before_all_posts'];
-    }
-    if ( isset( $GLOBALS['shariff3UU']['add_before_all_overview'] ) ) {
-        $GLOBALS['shariff3UU_basic']['add_before']['posts_blogpage'] = $GLOBALS['shariff3UU']['add_before_all_overview'];
-    }
-    if ( isset( $GLOBALS['shariff3UU']['add_before_all_pages'] ) ) {
-        $GLOBALS['shariff3UU_basic']['add_before']['pages'] = $GLOBALS['shariff3UU']['add_before_all_pages'];
-    }
-    if ( isset( $GLOBALS['shariff3UU']['disable_on_protected'] ) ) {
-        $GLOBALS['shariff3UU_basic']['disable_on_protected'] = $GLOBALS['shariff3UU']['disable_on_protected'];
-    }
-    if ( isset( $GLOBALS['shariff3UU']['backend'] ) ) {
-        $GLOBALS['shariff3UU_basic']['backend'] = $GLOBALS['shariff3UU']['backend'];
+    if ( isset( $shariff3uu['version'] ) ) {
+        $shariff3uu_basic['version'] = $shariff3uu['version'];
+    }
+    if ( isset( $shariff3uu['services'] ) ) {
+        $shariff3uu_basic['services'] = $shariff3uu['services'];
+    }
+    if ( isset( $shariff3uu['add_after_all_posts'] ) ) {
+        $shariff3uu_basic['add_after']['posts'] = $shariff3uu['add_after_all_posts'];
+    }
+    if ( isset( $shariff3uu['add_after_all_overview'] ) ) {
+        $shariff3uu_basic['add_after']['posts_blogpage'] = $shariff3uu['add_after_all_overview'];
+    }
+    if ( isset( $shariff3uu['add_after_all_pages'] ) ) {
+        $shariff3uu_basic['add_after']['pages'] = $shariff3uu['add_after_all_pages'];
+    }
+    if ( isset( $shariff3uu['add_after_all_custom_type'] ) ) {
+        $shariff3uu_basic['add_after']['custom_type'] = $shariff3uu['add_after_all_custom_type'];
+    }
+    if ( isset( $shariff3uu['add_before_all_posts'] ) ) {
+        $shariff3uu_basic['add_before']['posts'] = $shariff3uu['add_before_all_posts'];
+    }
+    if ( isset( $shariff3uu['add_before_all_overview'] ) ) {
+        $shariff3uu_basic['add_before']['posts_blogpage'] = $shariff3uu['add_before_all_overview'];
+    }
+    if ( isset( $shariff3uu['add_before_all_pages'] ) ) {
+        $shariff3uu_basic['add_before']['pages'] = $shariff3uu['add_before_all_pages'];
+    }
+    if ( isset( $shariff3uu['disable_on_protected'] ) ) {
+        $shariff3uu_basic['disable_on_protected'] = $shariff3uu['disable_on_protected'];
+    }
+    if ( isset( $shariff3uu['backend'] ) ) {
+        $shariff3uu_basic['backend'] = $shariff3uu['backend'];
     }
 
     // Design options.
-    if ( isset( $GLOBALS['shariff3UU']['language'] ) ) {
-        $GLOBALS['shariff3UU_design']['language'] = $GLOBALS['shariff3UU']['language'];
-    }
-    if ( isset( $GLOBALS['shariff3UU']['theme'] ) ) {
-        $GLOBALS['shariff3UU_design']['theme'] = $GLOBALS['shariff3UU']['theme'];
-    }
-    if ( isset( $GLOBALS['shariff3UU']['buttonsize'] ) ) {
-        $GLOBALS['shariff3UU_design']['buttonsize'] = $GLOBALS['shariff3UU']['buttonsize'];
-    }
-    if ( isset( $GLOBALS['shariff3UU']['vertical'] ) ) {
-        $GLOBALS['shariff3UU_design']['vertical'] = $GLOBALS['shariff3UU']['vertical'];
-    }
-    if ( isset( $GLOBALS['shariff3UU']['align'] ) ) {
-        $GLOBALS['shariff3UU_design']['align'] = $GLOBALS['shariff3UU']['align'];
-    }
-    if ( isset( $GLOBALS['shariff3UU']['align_widget'] ) ) {
-        $GLOBALS['shariff3UU_design']['align_widget'] = $GLOBALS['shariff3UU']['align_widget'];
-    }
-    if ( isset( $GLOBALS['shariff3UU']['style'] ) ) {
-        $GLOBALS['shariff3UU_design']['style'] = $GLOBALS['shariff3UU']['style'];
+    if ( isset( $shariff3uu['language'] ) ) {
+        $shariff3uu_design['language'] = $shariff3uu['language'];
+    }
+    if ( isset( $shariff3uu['theme'] ) ) {
+        $shariff3uu_design['theme'] = $shariff3uu['theme'];
+    }
+    if ( isset( $shariff3uu['buttonsize'] ) ) {
+        $shariff3uu_design['buttonsize'] = $shariff3uu['buttonsize'];
+    }
+    if ( isset( $shariff3uu['vertical'] ) ) {
+        $shariff3uu_design['vertical'] = $shariff3uu['vertical'];
+    }
+    if ( isset( $shariff3uu['align'] ) ) {
+        $shariff3uu_design['align'] = $shariff3uu['align'];
+    }
+    if ( isset( $shariff3uu['align_widget'] ) ) {
+        $shariff3uu_design['align_widget'] = $shariff3uu['align_widget'];
+    }
+    if ( isset( $shariff3uu['style'] ) ) {
+        $shariff3uu_design['style'] = $shariff3uu['style'];
     }
 
     // Advanced options.
-    if ( isset( $GLOBALS['shariff3UU']['info_url'] ) ) {
-        $GLOBALS['shariff3UU_advanced']['info_url'] = $GLOBALS['shariff3UU']['info_url'];
-    }
-    if ( isset( $GLOBALS['shariff3UU']['twitter_via'] ) ) {
-        $GLOBALS['shariff3UU_advanced']['twitter_via'] = $GLOBALS['shariff3UU']['twitter_via'];
-    }
-    if ( isset( $GLOBALS['shariff3UU']['flattruser'] ) ) {
-        $GLOBALS['shariff3UU_advanced']['flattruser'] = $GLOBALS['shariff3UU']['flattruser'];
-    }
-    if ( isset( $GLOBALS['shariff3UU']['default_pinterest'] ) ) {
-        $GLOBALS['shariff3UU_advanced']['default_pinterest'] = $GLOBALS['shariff3UU']['default_pinterest'];
+    if ( isset( $shariff3uu['info_url'] ) ) {
+        $shariff3uu_advanced['info_url'] = $shariff3uu['info_url'];
+    }
+    if ( isset( $shariff3uu['twitter_via'] ) ) {
+        $shariff3uu_advanced['twitter_via'] = $shariff3uu['twitter_via'];
+    }
+    if ( isset( $shariff3uu['flattruser'] ) ) {
+        $shariff3uu_advanced['flattruser'] = $shariff3uu['flattruser'];
+    }
+    if ( isset( $shariff3uu['default_pinterest'] ) ) {
+        $shariff3uu_advanced['default_pinterest'] = $shariff3uu['default_pinterest'];
     }
 
     // Mailform options.
-    if ( isset( $GLOBALS['shariff3UU']['mail_add_post_content'] ) ) {
-        $GLOBALS['shariff3UU_mailform']['mail_add_post_content'] = $GLOBALS['shariff3UU']['mail_add_post_content'];
-    }
-    if ( isset( $GLOBALS['shariff3UU']['mail_sender_name'] ) ) {
-        $GLOBALS['shariff3UU_mailform']['mail_sender_name'] = $GLOBALS['shariff3UU']['mail_sender_name'];
-    }
-    if ( isset( $GLOBALS['shariff3UU']['mail_sender_from'] ) ) {
-        $GLOBALS['shariff3UU_mailform']['mail_sender_from'] = $GLOBALS['shariff3UU']['mail_sender_from'];
+    if ( isset( $shariff3uu['mail_add_post_content'] ) ) {
+        $GLOBALS['shariff3UU_mailform']['mail_add_post_content'] = $shariff3uu['mail_add_post_content'];
+    }
+    if ( isset( $shariff3uu['mail_sender_name'] ) ) {
+        $GLOBALS['shariff3UU_mailform']['mail_sender_name'] = $shariff3uu['mail_sender_name'];
+    }
+    if ( isset( $shariff3uu['mail_sender_from'] ) ) {
+        $GLOBALS['shariff3UU_mailform']['mail_sender_from'] = $shariff3uu['mail_sender_from'];
     }
     // Default options should be as save as possible, same reason the statistics are disabled by default.
@@ -106 +106 @@
 
     // Update global.
-    $GLOBALS['shariff3UU'] = array_merge( $GLOBALS['shariff3UU_basic'], $GLOBALS['shariff3UU_design'], $GLOBALS['shariff3UU_advanced'], $GLOBALS['shariff3UU_mailform'] );
+    $shariff3uu = array_merge( $shariff3uu_basic, $shariff3uu_design, $shariff3uu_advanced, $GLOBALS['shariff3UU_mailform'] );
 
     // Update version.
-    $GLOBALS['shariff3UU']['version'] = '2.3.0';
+    $shariff3uu['version'] = '2.3.0';
 }
 
@@ -117 +117 @@
  * Delete old cache directory and db entry.
  */
-if ( isset( $GLOBALS['shariff3UU']['version'] ) && -1 === version_compare( $GLOBALS['shariff3UU']['version'], '3.3.0' ) ) {
+if ( isset( $shariff3uu['version'] ) && -1 === version_compare( $shariff3uu['version'], '3.3.0' ) ) {
 
     // Update options that were moved.
-    if ( isset( $GLOBALS['shariff3UU']['backend'] ) ) {
-        $GLOBALS['shariff3UU_statistic']['backend'] = $GLOBALS['shariff3UU']['backend'];
-    }
-    if ( isset( $GLOBALS['shariff3UU']['fb_id'] ) ) {
-        $GLOBALS['shariff3UU_statistic']['fb_id'] = $GLOBALS['shariff3UU']['fb_id'];
-    }
-    if ( isset( $GLOBALS['shariff3UU']['fb_secret'] ) ) {
-        $GLOBALS['shariff3UU_statistic']['fb_secret'] = $GLOBALS['shariff3UU']['fb_secret'];
-    }
-    if ( isset( $GLOBALS['shariff3UU']['ttl'] ) ) {
-        $GLOBALS['shariff3UU_statistic']['ttl'] = $GLOBALS['shariff3UU']['ttl'];
-    }
-    if ( isset( $GLOBALS['shariff3UU']['disable'] ) ) {
-        $GLOBALS['shariff3UU_statistic']['disable'] = $GLOBALS['shariff3UU']['disable'];
+    if ( isset( $shariff3uu['backend'] ) ) {
+        $shariff3uu_statistic['backend'] = $shariff3uu['backend'];
+    }
+    if ( isset( $shariff3uu['fb_id'] ) ) {
+        $shariff3uu_statistic['fb_id'] = $shariff3uu['fb_id'];
+    }
+    if ( isset( $shariff3uu['fb_secret'] ) ) {
+        $shariff3uu_statistic['fb_secret'] = $shariff3uu['fb_secret'];
+    }
+    if ( isset( $shariff3uu['ttl'] ) ) {
+        $shariff3uu_statistic['ttl'] = $shariff3uu['ttl'];
+    }
+    if ( isset( $shariff3uu['disable'] ) ) {
+        $shariff3uu_statistic['disable'] = $shariff3uu['disable'];
     }
 
@@ -161 +161 @@
 
     // Disable Twitter backend due to new service OpenShareCount.com.
-    $GLOBALS['shariff3UU_statistic']['disable']['twitter'] = 1;
+    $shariff3uu_statistic['disable']['twitter'] = 1;
 
     // Update version.
-    $GLOBALS['shariff3UU']['version'] = '3.3.0';
+    $shariff3uu['version'] = '3.3.0';
 }
 
@@ -199 +199 @@
  * Migration < 4.0
  */
-if ( isset( $GLOBALS['shariff3UU']['version'] ) && -1 === version_compare( $GLOBALS['shariff3UU']['version'], '4.0.0' ) ) {
+if ( isset( $shariff3uu['version'] ) && -1 === version_compare( $shariff3uu['version'], '4.0.0' ) ) {
 
     // Set new option share counts, if statistic is enabled.
-    if ( isset( $GLOBALS['shariff3UU_statistic']['backend'] ) ) {
-        $GLOBALS['shariff3UU_statistic']['sharecounts'] = 1;
+    if ( isset( $shariff3uu_statistic['backend'] ) ) {
+        $shariff3uu_statistic['sharecounts'] = 1;
     }
 
     // Disable share counts if WP version < 4.4.
     if ( version_compare( get_bloginfo( 'version' ), '4.4.0' ) < 1 ) {
-        unset( $GLOBALS['shariff3UU_statistic']['backend'] );
+        unset( $shariff3uu_statistic['backend'] );
     }
 
     // Change button language to WordPress language, if it is set to auto and http_negotiate_language is not available (auto will not work without it).
-    if ( ! isset( $GLOBALS['shariff3UU_design']['lang'] ) && ! function_exists( 'http_negotiate_language' ) ) {
-        $GLOBALS['shariff3UU_design']['lang'] = substr( get_bloginfo( 'language' ), 0, 2 );
+    if ( ! isset( $shariff3uu_design['lang'] ) && ! function_exists( 'http_negotiate_language' ) ) {
+        $shariff3uu_design['lang'] = substr( get_bloginfo( 'language' ), 0, 2 );
     }
 
     // Update version.
-    $GLOBALS['shariff3UU']['version'] = '4.0.0';
+    $shariff3uu['version'] = '4.0.0';
 }
 
@@ -223 +223 @@
  * Migration < 4.2
  */
-if ( isset( $GLOBALS['shariff3UU']['version'] ) && -1 === version_compare( $GLOBALS['shariff3UU']['version'], '4.2.0' ) ) {
+if ( isset( $shariff3uu['version'] ) && -1 === version_compare( $shariff3uu['version'], '4.2.0' ) ) {
     // Make sure we have the $wpdb class ready.
     global $wpdb;
@@ -260 +260 @@
  * Migration < 4.5
  */
-if ( isset( $GLOBALS['shariff3UU']['version'] ) && -1 === version_compare( $GLOBALS['shariff3UU']['version'], '4.5.0' ) ) {
+if ( isset( $shariff3uu['version'] ) && -1 === version_compare( $shariff3uu['version'], '4.5.0' ) ) {
     // Update language settings.
-    if ( ! isset( $GLOBALS['shariff3UU_design']['lang'] ) ) {
-        $GLOBALS['shariff3UU_design']['autolang'] = 1;
-        $GLOBALS['shariff3UU_design']['lang']     = substr( get_locale(), 0, 2 );
+    if ( ! isset( $shariff3uu_design['lang'] ) ) {
+        $shariff3uu_design['autolang'] = 1;
+        $shariff3uu_design['lang']     = substr( get_locale(), 0, 2 );
     }
     // Update version.
-    $GLOBALS['shariff3UU']['version'] = '4.5.0';
+    $shariff3uu['version'] = '4.5.0';
 }
 
@@ -312 +312 @@
 
 // Set new version.
-$GLOBALS['shariff3uu']['version']       = $code_version;
-$GLOBALS['shariff3uu_basic']['version'] = $code_version;
-
-/**
- * Remove empty elements and save to options table.
+$shariff3uu['version']       = $code_version;
+$shariff3uu_basic['version'] = $code_version;
+
+/**
+ * Remove empty elements and save to options table. We had a mix up with shariff3uu and shariff3UU in the past and update_option is not case senitive. Therefore we actually need to delete and recreate it.
  */
 // Basic.
 delete_option( 'shariff3uu_basic' );
-$shariff3uu_basic = array_filter( $GLOBALS['shariff3uu_basic'] );
+$shariff3uu_basic = array_filter( $shariff3uu_basic );
 update_option( 'shariff3uu_basic', $shariff3uu_basic );
 // Design.
 delete_option( 'shariff3uu_design' );
-$shariff3uu_design = array_filter( $GLOBALS['shariff3uu_design'] );
+$shariff3uu_design = array_filter( $shariff3uu_design );
 update_option( 'shariff3uu_design', $shariff3uu_design );
 // Advanced.
 delete_option( 'shariff3uu_advanced' );
-$shariff3uu_advanced = array_filter( $GLOBALS['shariff3uu_advanced'] );
+$shariff3uu_advanced = array_filter( $shariff3uu_advanced );
 update_option( 'shariff3uu_advanced', $shariff3uu_advanced );
 // Statistic.
 delete_option( 'shariff3uu_statistic' );
-$shariff3uu_statistic = array_filter( $GLOBALS['shariff3uu_statistic'] );
+$shariff3uu_statistic = array_filter( $shariff3uu_statistic );
 update_option( 'shariff3uu_statistic', $shariff3uu_statistic );