| @@ -6,10 +6,8 @@ | ||
| 6 | 6 | public $params; |
| 7 | 7 | public $method; |
| 8 | 8 | public $wing; |
| 9 | 9 | public $is_afterload; |
| 10 | - public $is_aftershutdown; | |
| 11 | - public $keep_page_output; | |
| 12 | 10 | public $is_admin_ajax; |
| 13 | 11 | public $is_debug; |
| 14 | 12 | public $account; |
| 15 | 13 | public $settings; |
| @@ -37,11 +35,8 @@ | ||
| 37 | 35 | $this->settings = $settings; |
| 38 | 36 | $this->wing = $in_params['wing']; |
| 39 | 37 | $this->method = $in_params['bvMethod']; |
| 40 | 38 | $this->is_afterload = array_key_exists('afterload', $in_params); |
| 41 | - $this->is_aftershutdown = array_key_exists('aftershutdown', $in_params); | |
| 42 | - $this->keep_page_output = $this->is_aftershutdown && | |
| 43 | - array_key_exists('keeppageoutput', $in_params); | |
| 44 | 39 | $this->is_admin_ajax = array_key_exists('adajx', $in_params); |
| 45 | 40 | $this->is_debug = array_key_exists('bvdbg', $in_params); |
| 46 | 41 | $this->sig = $in_params['sig']; |
| 47 | 42 | $this->sighshalgo = !empty($in_params['sighshalgo']) ? $in_params['sighshalgo'] : '1'; |
| @@ -103,14 +98,8 @@ | ||
| 103 | 98 | } |
| 104 | 99 | if ($this->is_afterload) { |
| 105 | 100 | $info["afterload"] = true; |
| 106 | 101 | } |
| 107 | - if ($this->is_aftershutdown) { | |
| 108 | - $info["aftershutdown"] = true; | |
| 109 | - } | |
| 110 | - if ($this->keep_page_output) { | |
| 111 | - $info["keeppageoutput"] = true; | |
| 112 | - } | |
| 113 | 102 | return $info; |
| 114 | 103 | } |
| 115 | 104 | |
| 116 | 105 | public function processParams($in_params) { |
| @@ -295,8 +284,9 @@ | ||
| 295 | 284 | } |
| 296 | 285 | |
| 297 | 286 | public function authFailedResp() { |
| 298 | 287 | $api_public_key = WPRAccount::getApiPublicKey($this->settings); |
| 288 | + $default_secret = WPRRecover::getDefaultSecret($this->settings); | |
| 299 | 289 | $default_account_pubkey = WPRAccount::getDefaultPublicKey(); |
| 300 | 290 | $bvinfo = new WPRInfo($this->settings); |
| 301 | 291 | $resp = array( |
| 302 | 292 | "request_info" => $this->info(), |
| @@ -301,9 +291,11 @@ | ||
| 301 | 291 | $resp = array( |
| 302 | 292 | "request_info" => $this->info(), |
| 303 | 293 | "bvinfo" => $bvinfo->info(), |
| 304 | 294 | "statusmsg" => "FAILED_AUTH", |
| 305 | - "api_pubkey" => substr($api_public_key, 0, 8) | |
| 295 | + "api_pubkey" => substr($api_public_key, 0, 8), | |
| 296 | + "def_key_status" => WPRRecover::getSecretStatus($this->settings), | |
| 297 | + "def_sigmatch" => substr(hash('sha1', $this->method.$default_secret.$this->time.$this->version), 0, 8) | |
| 306 | 298 | ); |
| 307 | 299 | |
| 308 | 300 | if (is_string($default_account_pubkey) && strlen($default_account_pubkey) >= 32) { |
| 309 | 301 | $resp["default_account_pubkey"] = substr($default_account_pubkey, 0, 8); |
| @@ -310,8 +302,9 @@ | ||
| 310 | 302 | } |
| 311 | 303 | |
| 312 | 304 | if ($this->account) { |
| 313 | 305 | $resp["account_info"] = $this->account->info(); |
| 306 | + $resp["sigmatch"] = substr(hash('sha1', $this->method.$this->account->secret.$this->time.$this->version), 0, 6); | |
| 314 | 307 | } else { |
| 315 | 308 | $resp["account_info"] = array("error" => "ACCOUNT_NOT_FOUND"); |
| 316 | 309 | } |
| 317 | 310 | |
| @@ -317,5 +310,5 @@ | ||
| 317 | 310 | |
| 318 | 311 | return $resp; |
| 319 | 312 | } |
| 320 | 313 | } |
| 321 | -endif; | |
| 314 | +endif; | |
