Changeset 1821951

Timestamp:

02/14/2018 11:47:25 AM (8 years ago)

Author:

freediver

Message:

version 4.4.0

Location:

worker/trunk

Files:

• functions.php (modified) (10 diffs)
• init.php (modified) (4 diffs)
• readme.txt (modified) (2 diffs)
• src/MMB/Core.php (modified) (2 diffs)
• src/MWP/Action/ConnectWebsite.php (modified) (1 diff)
• src/MWP/Configuration/Conf.php (modified) (2 diffs)
• src/MWP/EventListener/MasterRequest/VerifyConnectionInfo.php (modified) (1 diff)
• src/MWP/EventListener/PublicRequest/AddConnectionKeyInfo.php (modified) (5 diffs)
• src/MWP/WordPress/Context.php (modified) (1 diff)
• src/MWP/Worker/Kernel.php (modified) (1 diff)
• version (modified) (1 diff)

worker/trunk/functions.php

@@ -1267 +1267 @@
 {
     global $pagenow, $current_user, $mmode;
-    if (!is_admin() && !in_array($pagenow, array('wp-login.php'))) {
+    if (!is_admin() && !(defined('WP_CLI') && WP_CLI) && !in_array($pagenow, array('wp-login.php'))) {
         $mmode = get_option('mwp_maintenace_mode');
         if (!empty($mmode)) {
@@ -1426 +1426 @@
 function mwp_get_service_key()
 {
-    $serviceKey = get_option('mwp_service_key');
+    $serviceKey = mwp_context()->optionGet('mwp_service_key');
     if (empty($serviceKey)) {
         $serviceKey = mwp_generate_uuid4();
-        update_option('mwp_service_key', $serviceKey, true);
+        mwp_context()->optionSet('mwp_service_key', $serviceKey, true);
     }
 
@@ -1437 +1437 @@
 function mwp_get_communication_key()
 {
-    return get_option('mwp_communication_key');
-}
-
-function mwp_accept_potential_key()
-{
-    $potentialKey = mwp_get_potential_key();
-
-    update_option('mwp_communication_key', $potentialKey, true);
-    delete_option('mwp_potential_key');
-    delete_option('mwp_potential_key_time');
+    return mwp_context()->optionGet('mwp_communication_key');
+}
+
+function mwp_accept_potential_key($keyToAccept = '')
+{
+    $potentialKey = !empty($keyToAccept) ? $keyToAccept : mwp_get_potential_key();
+
+    mwp_context()->optionSet('mwp_communication_key', $potentialKey, true);
+    mwp_context()->optionDelete('mwp_potential_key', true);
+    mwp_context()->optionDelete('mwp_potential_key_time', true);
 
     return $potentialKey;
@@ -1453 +1453 @@
 function mwp_get_potential_key()
 {
-    $potentialKey     = get_option('mwp_potential_key');
-    $potentialKeyTime = get_option('mwp_potential_key_time');
+    $potentialKey     = mwp_context()->optionGet('mwp_potential_key');
+    $potentialKeyTime = mwp_context()->optionGet('mwp_potential_key_time');
     $now              = time();
 
@@ -1460 +1460 @@
         $potentialKey     = mwp_generate_uuid4();
         $potentialKeyTime = $now;
-        update_option('mwp_potential_key', $potentialKey, true);
-        update_option('mwp_potential_key_time', $potentialKeyTime, true);
+        mwp_context()->optionSet('mwp_potential_key', $potentialKey, true);
+        mwp_context()->optionSet('mwp_potential_key_time', $potentialKeyTime, true);
     }
 
@@ -1477 +1477 @@
     $data = null;
     if (function_exists('openssl_random_pseudo_bytes')) {
-        $data = openssl_random_pseudo_bytes(16);
+        $data = @openssl_random_pseudo_bytes(16);
     }
 
@@ -1501 +1501 @@
     }
 
-    update_option('mwp_public_keys', $liveKeys, true);
+    mwp_context()->optionSet('mwp_public_keys', $liveKeys, true);
 }
 
 function mwp_get_public_keys_from_live()
 {
-    $result = file_get_contents('https://cdn.managewp.com/public-keys', false, stream_context_create(array(
+    $result = @file_get_contents('https://cdn.managewp.com/public-keys', false, @stream_context_create(array(
         'ssl' => array(
             'verify_peer'       => true,
@@ -1542 +1542 @@
     }
 
-    $socket = stream_socket_client("$transportToUse://cdn.managewp.com:443", $errno, $errstr, 30, STREAM_CLIENT_CONNECT, stream_context_create(array(
+    $socket = @stream_socket_client("$transportToUse://cdn.managewp.com:443", $errno, $errstr, 30, STREAM_CLIENT_CONNECT, @stream_context_create(array(
         'ssl' => array(
             'verify_peer'       => true,
@@ -1570 +1570 @@
 
 
-    if (fwrite($socket, $requestContent) === false) {
+    if (@fwrite($socket, $requestContent) === false) {
         return null;
     }
 
     do {
-        $line = fgets($socket);
+        $line = @fgets($socket);
     } while ($line !== false && $line !== "\n" && $line !== "\r\n");
 
@@ -1582 +1582 @@
     }
 
-    $content = stream_get_contents($socket);
-
-    fclose($socket);
+    $content = @stream_get_contents($socket);
+
+    @fclose($socket);
 
     if ($content === false || !is_string($content)) {

worker/trunk/init.php

@@ -4 +4 @@
 Plugin URI: https://managewp.com
 Description: We help you efficiently manage all your WordPress websites. <strong>Updates, backups, 1-click login, migrations, security</strong> and more, on one dashboard. This service comes in two versions: standalone <a href="https://managewp.com">ManageWP</a> service that focuses on website management, and <a href="https://godaddy.com/pro">GoDaddy Pro</a> that includes additional tools for hosting, client management, lead generation, and more.
-Version: 4.3.3
+Version: 4.4.0
 Author: ManageWP
 Author URI: https://managewp.com
 License: GPL2
 Text Domain: worker
+Network: true
 */
 
@@ -559 +560 @@
 endif;
 
-if (!function_exists('hide_worker_update')):
-    function hide_worker_update($value)
+if (!function_exists('add_worker_update_info')):
+    function add_worker_update_info()
     {
-        if (isset($value->response['worker/init.php'])) {
-            unset($value->response['worker/init.php']);
-        }
-        return $value;
+        echo ' The plugin is going to update itself automatically in the next few days.';
     }
 endif;
@@ -578 +576 @@
         register_activation_hook(__FILE__, 'mwp_activation_hook');
 
-        $GLOBALS['MMB_WORKER_VERSION']  = '4.3.3';
-        $GLOBALS['MMB_WORKER_REVISION'] = '2018-01-05 00:00:00';
+        $GLOBALS['MMB_WORKER_VERSION']  = '4.4.0';
+        $GLOBALS['MMB_WORKER_REVISION'] = '2018-02-06 00:00:00';
 
         // Ensure PHP version compatibility.
@@ -716 +714 @@
         add_filter('comment_edit_redirect', 'mwb_edit_redirect_override');
         add_action('mwp_auto_update', 'MwpRecoveryKit::selfUpdate');
-        if (!get_option('mwp_show_plugin_update')) {
-            add_filter('site_transient_update_plugins', 'hide_worker_update');
-        }
+        add_action('in_plugin_update_message-'.plugin_basename(__FILE__), 'add_worker_update_info');
 
         // Datasend cron.

worker/trunk/readme.txt

@@ -1 +1 @@
 === ManageWP Worker ===
 Contributors: managewp,freediver
-Donate link: https://www.networkforgood.org/donation/MakeDonation.aspx?ORGID2=520781390
 Tags: manage multiple sites, backup, security, migrate, performance, analytics, Manage WordPress, Managed WordPress, WordPress management, WordPress manager, WordPress management, site management, control multiple sites, WordPress management dashboard, administration, automate, automatic, comments, clone, dashboard, duplicate, google analytics, login, manage, managewp, multiple, multisite, remote, seo, spam
 Requires at least: 3.1
@@ -58 +57 @@
 == Changelog ==
 
+= 4.4.0 =
+
+- Fix: Communication failing with a website behind CloudFlare, that has warnings turned on, and currently has warnings.
+
+= 4.3.4 =
+
+- Improvement: The Worker plugin can now only be activated network wide on multisite installs.
+- Fix: Edge cases where the connection key was not visible.
+- Fix: Edge cases with Multisite communication failure.
+
 = 4.3.3 =
 
-- Improvement: Always use charset for database backup
-- Change: The Worker plugin is fully compatible with WordPress 4.9
+- Improvement: Always force the correct charset for database backups.
+- Improvement: The Worker plugin is now fully compatible with WordPress 4.9.
 
 = 4.3.2 =
 
-- Fix: The Worker plugin throw exception while recovering from failed update
+- Fix: The Worker plugin threw an exception while recovering from failed update.
 
 = 4.3.1 =

worker/trunk/src/MMB/Core.php

@@ -114 +114 @@
         $configurationService = new MWP_Configuration_Service();
         $configuration        = $configurationService->getConfiguration();
-        $notice               = $configuration->getNotice();
+        $notice               = is_multisite() ? $configuration->getNetworkNotice() : $configuration->getNotice();
 
         echo $notice;
@@ -227 +227 @@
 Author URI: https://managewp.com
 License: GPL2
+Network: true
 */
 

worker/trunk/src/MWP/Action/ConnectWebsite.php

@@ -38 +38 @@
 
         $configuration->setPublicKey($publicKey);
-        mwp_accept_potential_key();
+        mwp_accept_potential_key($request->getCommunicationKey());
 
         $this->setBrand($params);

worker/trunk/src/MWP/Configuration/Conf.php

@@ -143 +143 @@
     public function getNetworkNotice()
     {
-        return $this->getNoticeHtml('Use your network administrator username to add this multisite network to your <a href="https://managewp.com" target="_blank">ManageWP</a> account.');
+        return $this->getNoticeHtml('Add this website to <a href="https://managewp.com" target="_blank">ManageWP</a> or <a href="https://godaddy.com/pro" target="_blank">GoDaddy Pro</a> dashboard to enable backups, uptime monitoring, website cleanup and a lot more! Use a <strong>network administrator</strong> account when adding the website.<br>If prompted, provide the <strong>connection key</strong> (found on the plugin page, in the Worker description) to verify that you are the website administrator.');
     }
 
@@ -274 +274 @@
     }
 
-    public function getNotice() {
-        return $this->getNoticeHtml('Add this website to <a href="https://managewp.com" target="_blank">ManageWP</a> or <a href="https://godaddy.com/pro" target="_blank">GoDaddy Pro</a> dashboard to enable backups, uptime monitoring, website cleanup and a lot more!<br>If prompted, provide the <strong>connection key</strong> (found on the plugin page, in the Worker description) to verify that you are the website administrator.');
+    public function getNotice()
+    {
+        return $this->getNoticeHtml($this->getDefaultNoticeText());
+    }
+
+    private function getDefaultNoticeText()
+    {
+        return 'Add this website to <a href="https://managewp.com" target="_blank">ManageWP</a> or <a href="https://godaddy.com/pro" target="_blank">GoDaddy Pro</a> dashboard to enable backups, uptime monitoring, website cleanup and a lot more!<br>If prompted, provide the <strong>connection key</strong> (found on the plugin page, in the Worker description) to verify that you are the website administrator.';
     }
 

worker/trunk/src/MWP/EventListener/MasterRequest/VerifyConnectionInfo.php

@@ -69 +69 @@
         }
 
-        if (strtolower($request->getCommunicationKey()) !== strtolower(mwp_get_potential_key())) {
+        $requestKey = strtolower($request->getCommunicationKey());
+
+        if (empty($requestKey) || ($requestKey !== strtolower(mwp_get_potential_key()) && $requestKey !== strtolower(mwp_get_communication_key()))) {
             throw new MWP_Worker_Exception(MWP_Worker_Exception::CONNECTION_INVALID_KEY, "Invalid communication key provided. Please make sure to provide the latest communication key from your Worker plugin.");
         }

worker/trunk/src/MWP/EventListener/PublicRequest/AddConnectionKeyInfo.php

@@ -84 +84 @@
     public function printConnectionModalDialog()
     {
+        if ($this->context->isMultisite() && !$this->context->isNetworkAdmin()) {
+            return;
+        }
+
         if (!$this->userCanViewConnectionKey()) {
             return;
@@ -91 +95 @@
         ?>
         <div id="mwp_connection_key_dialog" style="display: none;">
+            <?php if (!mwp_get_communication_key()) { ?>
             <p>There are two ways to connect your website to the management dashboard:</p>
 
@@ -108 +113 @@
                 <li>Enter this website's URL. When prompted, paste the connection key</li>
             </ol>
+            <?php } ?>
 
             <div style="text-align: center;font-weight: bold;"><p style="margin-bottom: 4px;margin-top: 20px;">Connection Key</p></div>
@@ -123 +129 @@
     public function addConnectionKeyLink($meta, $slug)
     {
+        if ($this->context->isMultisite() && !$this->context->isNetworkAdmin()) {
+            return $meta;
+        }
+
         if ($slug !== $this->slug) {
             return $meta;
@@ -138 +148 @@
     private function userCanViewConnectionKey()
     {
-        return $this->context->isGranted('activate_plugins') &&
-            $this->context->isGranted('update_plugins') &&
-            $this->context->isGranted('install_plugins');
+        return $this->context->isGranted('activate_plugins');
     }
 }

worker/trunk/src/MWP/WordPress/Context.php

@@ -659 +659 @@
     }
 
+    public function isMainSite()
+    {
+        return is_main_site();
+    }
+
+    public function isNetworkAdmin()
+    {
+        return is_network_admin();
+    }
+
     public function getSiteId()
     {

worker/trunk/src/MWP/Worker/Kernel.php

@@ -71 +71 @@
         }
 
+        @ini_set('display_errors', false);
+
         try {
             // Get action info.

worker/trunk/version

@@ -1 @@
-4.3.3
-2018-01-05 00:00:00
+4.4.0
+2018-02-06 00:00:00