| @@ -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.09 | |
| 8 | +Version: 5.16 | |
| 9 | 9 | Network: True |
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | 12 | /* Copyright 2017 WP Remote (email : support@wpremote.com) |
| @@ -108,12 +108,12 @@ | ||
| 108 | 108 | } else { |
| 109 | 109 | $account = WPRAccount::find($bvsettings, $pubkey); |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | - $request = new BVCallbackRequest($account, $_REQUEST); | |
| 112 | + $request = new BVCallbackRequest($account, $_REQUEST, $bvsettings); | |
| 113 | 113 | $response = new BVCallbackResponse($request->bvb64cksize); |
| 114 | 114 | |
| 115 | - if ($account && (1 === $account->authenticate($request))) { | |
| 115 | + if ($request->authenticate() === 1) { | |
| 116 | 116 | define('WPRBASEPATH', plugin_dir_path(__FILE__)); |
| 117 | 117 | |
| 118 | 118 | |
| 119 | 119 | require_once dirname( __FILE__ ) . '/callback/handler.php'; |
| @@ -119,15 +119,9 @@ | ||
| 119 | 119 | require_once dirname( __FILE__ ) . '/callback/handler.php'; |
| 120 | 120 | |
| 121 | 121 | $params = $request->processParams($_REQUEST); |
| 122 | 122 | if ($params === false) { |
| 123 | - $resp = array( | |
| 124 | - "account_info" => $account->info(), | |
| 125 | - "request_info" => $request->info(), | |
| 126 | - "bvinfo" => $bvinfo->info(), | |
| 127 | - "statusmsg" => "BVPRMS_CORRUPTED" | |
| 128 | - ); | |
| 129 | - $response->terminate($resp); | |
| 123 | + $response->terminate($request->corruptedParamsResp()); | |
| 130 | 124 | } |
| 131 | 125 | $request->params = $params; |
| 132 | 126 | $callback_handler = new BVCallbackHandler($bvdb, $bvsettings, $bvsiteinfo, $request, $account, $response); |
| 133 | 127 | if ($request->is_afterload) { |
| @@ -138,17 +132,9 @@ | ||
| 138 | 132 | } else { |
| 139 | 133 | $callback_handler->execute(); |
| 140 | 134 | } |
| 141 | 135 | } else { |
| 142 | - $resp = array( | |
| 143 | - "account_info" => $account ? $account->info() : array("error" => "ACCOUNT_NOT_FOUND"), | |
| 144 | - "request_info" => $request->info(), | |
| 145 | - "bvinfo" => $bvinfo->info(), | |
| 146 | - "statusmsg" => "FAILED_AUTH", | |
| 147 | - "api_pubkey" => substr(WPRAccount::getApiPublicKey($bvsettings), 0, 8), | |
| 148 | - "def_sigmatch" => substr(WPRAccount::getSigMatch($request, WPRRecover::getDefaultSecret($bvsettings)), 0, 8) | |
| 149 | - ); | |
| 150 | - $response->terminate($resp); | |
| 136 | + $response->terminate($request->authFailedResp()); | |
| 151 | 137 | } |
| 152 | 138 | } else { |
| 153 | 139 | if ($bvinfo->hasValidDBVersion()) { |
| 154 | 140 | if ($bvinfo->isProtectModuleEnabled()) { |
