| @@ -4,9 +4,9 @@ | ||
| 4 | 4 | Plugin URI: https://wpremote.com |
| 5 | 5 | Description: Manage your WordPress site with <a href="https://wpremote.com/">WP Remote</a>. |
| 6 | 6 | Author: WP Remote |
| 7 | 7 | Author URI: https://wpremote.com |
| 8 | -Version: 5.38 | |
| 8 | +Version: 4.84 | |
| 9 | 9 | Network: True |
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | 12 | /* Copyright 2017 WP Remote (email : support@wpremote.com) |
| @@ -36,9 +36,8 @@ | ||
| 36 | 36 | require_once dirname( __FILE__ ) . '/wp_api.php'; |
| 37 | 37 | require_once dirname( __FILE__ ) . '/wp_actions.php'; |
| 38 | 38 | require_once dirname( __FILE__ ) . '/info.php'; |
| 39 | 39 | require_once dirname( __FILE__ ) . '/account.php'; |
| 40 | -require_once dirname( __FILE__ ) . '/helper.php'; | |
| 41 | 40 | ##WPCACHEMODULE## |
| 42 | 41 | |
| 43 | 42 | |
| 44 | 43 | $bvsettings = new WPRWPSettings(); |
| @@ -57,10 +56,8 @@ | ||
| 57 | 56 | add_action('wp_footer', array($wp_action, 'footerHandler'), 100); |
| 58 | 57 | add_action('clear_bv_services_config', array($wp_action, 'clear_bv_services_config')); |
| 59 | 58 | ##SOADDUNINSTALLACTION## |
| 60 | 59 | |
| 61 | -##DISABLE_OTHER_OPTIMIZATION_PLUGINS## | |
| 62 | - | |
| 63 | 60 | ##WPCLIMODULE## |
| 64 | 61 | if (is_admin()) { |
| 65 | 62 | require_once dirname( __FILE__ ) . '/wp_admin.php'; |
| 66 | 63 | $wpadmin = new WPRWPAdmin($bvsettings, $bvsiteinfo); |
| @@ -66,9 +63,8 @@ | ||
| 66 | 63 | $wpadmin = new WPRWPAdmin($bvsettings, $bvsiteinfo); |
| 67 | 64 | add_action('admin_init', array($wpadmin, 'initHandler')); |
| 68 | 65 | add_filter('all_plugins', array($wpadmin, 'initBranding')); |
| 69 | 66 | add_filter('plugin_row_meta', array($wpadmin, 'hidePluginDetails'), 10, 2); |
| 70 | - add_filter('debug_information', array($wpadmin, 'handlePluginHealthInfo'), 10, 1); | |
| 71 | 67 | if ($bvsiteinfo->isMultisite()) { |
| 72 | 68 | add_action('network_admin_menu', array($wpadmin, 'menu')); |
| 73 | 69 | } else { |
| 74 | 70 | add_action('admin_menu', array($wpadmin, 'menu')); |
| @@ -108,12 +104,12 @@ | ||
| 108 | 104 | } else { |
| 109 | 105 | $account = WPRAccount::find($bvsettings, $pubkey); |
| 110 | 106 | } |
| 111 | 107 | |
| 112 | - $request = new BVCallbackRequest($account, $_REQUEST, $bvsettings); | |
| 108 | + $request = new BVCallbackRequest($account, $_REQUEST); | |
| 113 | 109 | $response = new BVCallbackResponse($request->bvb64cksize); |
| 114 | 110 | |
| 115 | - if ($request->authenticate() === 1) { | |
| 111 | + if ($account && (1 === $account->authenticate($request))) { | |
| 116 | 112 | define('WPRBASEPATH', plugin_dir_path(__FILE__)); |
| 117 | 113 | |
| 118 | 114 | |
| 119 | 115 | require_once dirname( __FILE__ ) . '/callback/handler.php'; |
| @@ -119,9 +115,15 @@ | ||
| 119 | 115 | require_once dirname( __FILE__ ) . '/callback/handler.php'; |
| 120 | 116 | |
| 121 | 117 | $params = $request->processParams($_REQUEST); |
| 122 | 118 | if ($params === false) { |
| 123 | - $response->terminate($request->corruptedParamsResp()); | |
| 119 | + $resp = array( | |
| 120 | + "account_info" => $account->info(), | |
| 121 | + "request_info" => $request->info(), | |
| 122 | + "bvinfo" => $bvinfo->info(), | |
| 123 | + "statusmsg" => "BVPRMS_CORRUPTED" | |
| 124 | + ); | |
| 125 | + $response->terminate($resp); | |
| 124 | 126 | } |
| 125 | 127 | $request->params = $params; |
| 126 | 128 | $callback_handler = new BVCallbackHandler($bvdb, $bvsettings, $bvsiteinfo, $request, $account, $response); |
| 127 | 129 | if ($request->is_afterload) { |
| @@ -132,19 +134,28 @@ | ||
| 132 | 134 | } else { |
| 133 | 135 | $callback_handler->execute(); |
| 134 | 136 | } |
| 135 | 137 | } else { |
| 136 | - $response->terminate($request->authFailedResp()); | |
| 138 | + $resp = array( | |
| 139 | + "account_info" => $account ? $account->info() : array("error" => "ACCOUNT_NOT_FOUND"), | |
| 140 | + "request_info" => $request->info(), | |
| 141 | + "bvinfo" => $bvinfo->info(), | |
| 142 | + "statusmsg" => "FAILED_AUTH", | |
| 143 | + "api_pubkey" => substr(WPRAccount::getApiPublicKey($bvsettings), 0, 8), | |
| 144 | + "def_sigmatch" => substr(WPRAccount::getSigMatch($request, WPRRecover::getDefaultSecret($bvsettings)), 0, 8) | |
| 145 | + ); | |
| 146 | + $response->terminate($resp); | |
| 137 | 147 | } |
| 138 | 148 | } else { |
| 139 | 149 | if ($bvinfo->hasValidDBVersion()) { |
| 140 | 150 | if ($bvinfo->isProtectModuleEnabled()) { |
| 141 | - require_once dirname( __FILE__ ) . '/protect/protect.php'; | |
| 142 | - add_action('clear_pt_config', array('MCProtect', 'uninstall')); | |
| 143 | - if ($bvinfo->isActivePlugin() && !(defined( 'WP_CLI' ) && WP_CLI)) { | |
| 144 | - MCProtect::init(MCProtect::MODE_WP); | |
| 145 | - } | |
| 151 | + require_once dirname( __FILE__ ) . '/protect/wp/protect.php'; | |
| 152 | + $bvprotect = new BVProtect($bvdb, $bvsettings); | |
| 153 | + $bvprotect->init(); | |
| 154 | + if ($bvinfo->isActivePlugin() && !(defined( 'WP_CLI' ) && WP_CLI)) { | |
| 155 | + $bvprotect->run(); | |
| 146 | 156 | } |
| 157 | + } | |
| 147 | 158 | |
| 148 | 159 | if ($bvinfo->isDynSyncModuleEnabled()) { |
| 149 | 160 | require_once dirname( __FILE__ ) . '/wp_dynsync.php'; |
| 150 | 161 | $bvconfig = $bvinfo->config; |
| @@ -173,10 +184,5 @@ | ||
| 173 | 184 | } |
| 174 | 185 | } |
| 175 | 186 | } |
| 176 | 187 | |
| 177 | - if (is_admin()) { | |
| 178 | - add_filter('site_transient_update_plugins', array($wpadmin, 'hidePluginUpdate')); | |
| 179 | - } | |
| 180 | - | |
| 181 | - ##THIRDPARTYCACHINGMODULE## | |
| 182 | -} | |
| 188 | +} | |