Changeset 3469539
- Timestamp:
- 02/25/2026 02:35:54 PM (12 days ago)
- Location:
- acychecker
- Files:
-
- 2 added
- 26 edited
- 1 copied
-
tags/1.8.0 (copied) (copied from acychecker/trunk)
-
tags/1.8.0/acychecker.php (modified) (1 diff)
-
tags/1.8.0/cms/cmsServices/Security.php (modified) (1 diff)
-
tags/1.8.0/cms/cmsServices/WordPressActivation.php (modified) (1 diff)
-
tags/1.8.0/cms/cmsServices/WordPressRegistration.php (modified) (3 diffs)
-
tags/1.8.0/readme.txt (modified) (2 diffs)
-
tags/1.8.0/src/Classes/AcymailingUserClass.php (modified) (1 diff)
-
tags/1.8.0/src/Classes/ConfigurationClass.php (modified) (1 diff)
-
tags/1.8.0/src/Libraries/AcycObject.php (modified) (1 diff)
-
tags/1.8.0/src/Services/ApiService.php (modified) (14 diffs)
-
tags/1.8.0/src/Services/CronService.php (modified) (1 diff)
-
tags/1.8.0/src/Services/PaginationService.php (modified) (1 diff)
-
tags/1.8.0/src/Services/RequestService.php (added)
-
tags/1.8.0/src/Services/UpdateService.php (modified) (2 diffs)
-
tags/1.8.0/vendor/composer/installed.php (modified) (2 diffs)
-
trunk/acychecker.php (modified) (1 diff)
-
trunk/cms/cmsServices/Security.php (modified) (1 diff)
-
trunk/cms/cmsServices/WordPressActivation.php (modified) (1 diff)
-
trunk/cms/cmsServices/WordPressRegistration.php (modified) (3 diffs)
-
trunk/readme.txt (modified) (2 diffs)
-
trunk/src/Classes/AcymailingUserClass.php (modified) (1 diff)
-
trunk/src/Classes/ConfigurationClass.php (modified) (1 diff)
-
trunk/src/Libraries/AcycObject.php (modified) (1 diff)
-
trunk/src/Services/ApiService.php (modified) (14 diffs)
-
trunk/src/Services/CronService.php (modified) (1 diff)
-
trunk/src/Services/PaginationService.php (modified) (1 diff)
-
trunk/src/Services/RequestService.php (added)
-
trunk/src/Services/UpdateService.php (modified) (2 diffs)
-
trunk/vendor/composer/installed.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
acychecker/tags/1.8.0/acychecker.php
r3406754 r3469539 6 6 Author URI: https://www.acychecker.com 7 7 License: GPLv3 8 Version: 1. 7.08 Version: 1.8.0 9 9 Text Domain: acychecker 10 10 */ -
acychecker/tags/1.8.0/cms/cmsServices/Security.php
r2628688 r3469539 86 86 $var = (float)$var; 87 87 break; 88 case 'bool ean':89 $var = (bool ean)$var;88 case 'bool': 89 $var = (bool)$var; 90 90 break; 91 91 case 'word': -
acychecker/tags/1.8.0/cms/cmsServices/WordPressActivation.php
r3014300 r3469539 72 72 public function update() 73 73 { 74 $configurationClass = new ConfigurationClass();74 $configurationClass = ConfigurationClass::getConfiguration(); 75 75 if (!file_exists(ACYC_FOLDER.'update.php') && $configurationClass->get('installcomplete', 0) != 0) { 76 76 return; -
acychecker/tags/1.8.0/cms/cmsServices/WordPressRegistration.php
r3268911 r3469539 23 23 $user = new \stdClass(); 24 24 $user->user_email = $email; 25 $user->user_login = $login; 25 26 $this->blockNewUsers($errors, email_exists($email), $user); 26 27 … … 32 33 if ($update) return; 33 34 34 $config = new ConfigurationClass();35 $config = ConfigurationClass::getConfiguration(); 35 36 $integrations = explode(',', $config->get('registration_integrations')); 36 37 … … 43 44 $testUser = new \stdClass(); 44 45 $testUser->email = $user->user_email; 45 $testUser->name = $user->first_name.' '.$user->last_name;46 46 $testUser->username = $user->user_login; 47 if (empty($user->first_name) && empty($user->last_name)) { 48 $testUser->name = $testUser->username; 49 } else { 50 $testUser->name = $user->first_name ?? ''; 51 if (!empty($user->last_name)) { 52 $testUser->name .= ' '.$user->last_name; 53 } 54 } 47 55 48 56 $apiService = new ApiService(); -
acychecker/tags/1.8.0/readme.txt
r3406754 r3469539 3 3 Tags: spam, block, email, check 4 4 Requires at least: 5.0 5 Tested up to: 6. 8.36 Stable tag: 1. 7.05 Tested up to: 6.9.1 6 Stable tag: 1.8.0 7 7 Requires PHP: 7.4.0 8 8 License: GPLv3 … … 84 84 == Changelog == 85 85 86 = 1.7.0 - December 1, 2025 = 87 * The compatibility with AcyMailing 10.6.6 has been added for user deletion. 88 * Pressing Enter in the search bar doesn't open the export options anymore. 86 = 1.8.0 - February 25, 2026 = 87 * Code has been improved in various places to optimize page load. 88 * The code has been updated to prepare for PHP 8.6. 89 90 * Some warning messages in server logs have been fixed when a new user account is created. 89 91 90 92 [See the whole changelog here.](https://www.acychecker.com/changelog) -
acychecker/tags/1.8.0/src/Classes/AcymailingUserClass.php
r3406754 r3469539 27 27 public function getUsers($offset = 0, $limit = 5000, $fromCron = false, $onlyNew = false, $lists = []) 28 28 { 29 $query = 'SELECT `user`.email, `user`.name from#__acym_user AS `user` ';29 $query = 'SELECT `user`.email, `user`.name FROM #__acym_user AS `user` '; 30 30 31 31 // We filter the users if we need to -
acychecker/tags/1.8.0/src/Classes/ConfigurationClass.php
r2628688 r3469539 9 9 class ConfigurationClass extends AcycClass 10 10 { 11 var $table = 'configuration'; 12 var $pkey = 'name'; 13 var $values = []; 11 private array $values = []; 12 13 public function __construct() 14 { 15 parent::__construct(); 16 17 $this->table = 'configuration'; 18 $this->pkey = 'name'; 19 } 20 21 public static function getConfiguration(bool $reload = false): ConfigurationClass 22 { 23 static $configClass = null; 24 if ($configClass === null || $reload) { 25 $configClass = new ConfigurationClass(); 26 $configClass->load(); 27 } 28 29 return $configClass; 30 } 14 31 15 32 public function load() -
acychecker/tags/1.8.0/src/Libraries/AcycObject.php
r2628688 r3469539 14 14 { 15 15 $this->cmsUserVars = User::getCmsUserDbStructure(); 16 $this->config = $this->getConfiguration(get_class($this)); 17 } 18 19 public function getConfiguration($currentClass) 20 { 21 static $configClass = null; 22 if ($configClass === null) { 23 $configClass = 'AcyChecker\\Classes\\ConfigurationClass' === $currentClass ? $this : new ConfigurationClass(); 24 $configClass->load(); 25 } 26 27 return $configClass; 16 $this->config = ConfigurationClass::class === get_class($this) ? $this : ConfigurationClass::getConfiguration(); 28 17 } 29 18 } -
acychecker/tags/1.8.0/src/Services/ApiService.php
r3406754 r3469539 85 85 } 86 86 87 private function processRequest($url, $header, $data = [], $type = 'GET', $options = []) 88 { 89 try { 90 $options['verify'] = false; 91 if (class_exists('\WpOrg\Requests\Requests')) { 92 $request = \WpOrg\Requests\Requests::request($url, $header, $type == 'GET' ? $data : json_encode($data), $type, $options); 93 } else { 94 $request = \Requests::request($url, $header, $type == 'GET' ? $data : json_encode($data), $type, $options); 95 } 96 } catch (\Exception $exception) { 97 $this->errors[] = $exception->getMessage(); 98 99 return false; 100 } 101 102 $request->body = json_decode($request->body, true); 103 104 return $request; 87 private function processRequest(string $url, array $data = [], string $method = 'GET', array $headers = []): array 88 { 89 $headers = $headers + $this->getDefaultHeaders(); 90 91 $options = [ 92 'verifySsl' => false, 93 'headers' => $headers, 94 'method' => $method, 95 'data' => $data, 96 ]; 97 $request = RequestService::curlCall($url, $options); 98 99 if (!empty($request['error'])) { 100 $this->errors[] = $request['error']; 101 102 return []; 103 } 104 105 $return = $request; 106 $return['success'] = true; 107 108 if ($request['status_code'] < 200 || $request['status_code'] > 299) { 109 $return['success'] = false; 110 } 111 112 return $return; 105 113 } 106 114 … … 112 120 'API-KEY' => $this->apiKey, 113 121 'Source' => 'plugin', 114 'Source-Version' => '1. 7.0',122 'Source-Version' => '1.8.0', 115 123 ]; 116 124 } … … 120 128 $url = $this->apiBaseUrl.'licenses/credits'; 121 129 122 $request = $this->processRequest($url , $this->getDefaultHeaders());130 $request = $this->processRequest($url); 123 131 if (!empty($this->errors)) { 124 132 Message::enqueueMessage(implode(', ', $this->errors), 'error'); 125 133 } 126 134 127 if ( !$request) {135 if (empty($request['success'])) { 128 136 return $this->returnResponse(__('Could not call the api', 'acychecker'), [], false); 129 137 } 130 138 131 if ($request ->status_code!== 200) {132 if (isset($request ->body['message'])) {133 return $this->returnResponse($request ->body['message'], [], false);139 if ($request['status_code'] !== 200) { 140 if (isset($request['message'])) { 141 return $this->returnResponse($request['message'], [], false); 134 142 } else { 135 143 return $this->returnResponse( 136 sprintf(__('Error while calling the API (code %s)', 'acychecker'), $request ->status_code),144 sprintf(__('Error while calling the API (code %s)', 'acychecker'), $request['status_code']), 137 145 [], 138 146 false … … 141 149 } 142 150 143 144 return $this->returnResponse('', $request->body); 151 return $this->returnResponse('', $request); 145 152 } 146 153 … … 159 166 ]; 160 167 161 $request = $this->processRequest($url, $ this->getDefaultHeaders(), $data, 'POST');162 163 if ( !$request) {168 $request = $this->processRequest($url, $data, 'POST'); 169 170 if (empty($request['success'])) { 164 171 return $this->returnResponse(__('Could not call the api', 'acychecker'), [], false); 165 172 } 166 173 167 174 //Not enough credits 168 if ($request ->status_code === 403 && strpos($request->body['message'], 'Not enough credits') !== false) {175 if ($request['status_code'] === 403 && strpos($request['message'], 'Not enough credits') !== false) { 169 176 return $this->returnResponse(__('Not enough credits to run this test', 'acychecker'), [], false); 170 } elseif ($request ->status_code!== 201) {171 $message = $request ->body['message'] ?? '';177 } elseif ($request['status_code'] !== 201) { 178 $message = $request['message'] ?? ''; 172 179 if (empty($message)) { 173 $message = sprintf(__('Error while calling the API (code %s)', 'acychecker'), $request ->status_code);180 $message = sprintf(__('Error while calling the API (code %s)', 'acychecker'), $request['status_code']); 174 181 } 175 182 … … 177 184 } 178 185 179 return $this->returnResponse('', $request ->body);186 return $this->returnResponse('', $request); 180 187 } 181 188 … … 291 298 $url = $this->apiBaseUrl.'email_verify/'.$email; 292 299 293 $request = $this->processRequest($url , $this->getDefaultHeaders());294 295 if ( !$request) {300 $request = $this->processRequest($url); 301 302 if (empty($request['success'])) { 296 303 $message = __('Could not call the api', 'acychecker'); 297 304 if (!empty($this->errors)) { … … 306 313 } 307 314 308 if ($request ->status_code!== 200) {309 $message = $request ->body['message'] ?? sprintf(__('Error while calling the API (code %s)', 'acychecker'), $request->status_code);315 if ($request['status_code'] !== 200) { 316 $message = $request['message'] ?? sprintf(__('Error while calling the API (code %s)', 'acychecker'), $request['status_code']); 310 317 DebugService::logMessage('individual_tests.log', $email.' - '.$message); 311 318 … … 318 325 return [ 319 326 'success' => true, 320 'data' => $request ->body['data'],327 'data' => $request['data'], 321 328 ]; 322 329 } … … 404 411 $url = $this->apiBaseUrl.'bulk_result/'.$batchId; 405 412 406 $request = $this->processRequest($url , $this->getDefaultHeaders());407 408 if ( !$request) {413 $request = $this->processRequest($url); 414 415 if (empty($request['success'])) { 409 416 DebugService::logMessage('batch_tests.log', 'Error getting '.$batchId.' results'); 410 417 … … 412 419 } 413 420 414 if ($request ->status_code!== 200) {421 if ($request['status_code'] !== 200) { 415 422 $codes = [ 416 423 403 => 'The API key is incorrect', … … 418 425 429 => 'Too many requests', 419 426 ]; 420 if (in_array($request ->status_code, array_keys($codes))) {421 DebugService::logMessage('batch_tests.log', 'Error getting '.$batchId.' results: '.$codes[$request ->status_code]);427 if (in_array($request['status_code'], array_keys($codes))) { 428 DebugService::logMessage('batch_tests.log', 'Error getting '.$batchId.' results: '.$codes[$request['status_code']]); 422 429 } else { 423 DebugService::logMessage('batch_tests.log', 'Error getting '.$batchId.' results: Unknown return code '.$request ->status_code);430 DebugService::logMessage('batch_tests.log', 'Error getting '.$batchId.' results: Unknown return code '.$request['status_code']); 424 431 } 425 432 … … 427 434 } 428 435 429 if (empty($request ->body['data'])) {436 if (empty($request['data'])) { 430 437 DebugService::logMessage('batch_tests.log', 'Error getting '.$batchId.' results: No data returned'); 431 438 … … 435 442 DebugService::logMessage('batch_tests.log', 'Getting batch '.$batchId.' results was successful.'); 436 443 437 return $request ->body['data'];444 return $request['data']; 438 445 } 439 446 -
acychecker/tags/1.8.0/src/Services/CronService.php
r3268911 r3469539 59 59 // If we are on the callback url we don't trigger the cron 60 60 $controller = Security::getVar('string', 'ctrl', ''); 61 if ($controller == 'callbackController') return;61 if ($controller === 'callbackController') return; 62 62 63 63 // If the user didn't set any conditions we do not trigger any batch -
acychecker/tags/1.8.0/src/Services/PaginationService.php
r2842759 r3469539 17 17 public function __construct($page, $total, $perPage, $pageName) 18 18 { 19 $configClass = new ConfigurationClass(); 20 $configClass->load(); 19 $configClass = ConfigurationClass::getConfiguration(true); 21 20 $this->page = $page; 22 21 $this->total = $total; -
acychecker/tags/1.8.0/src/Services/UpdateService.php
r3406754 r3469539 12 12 { 13 13 private $cms = 'wordpress'; 14 private $version = '1. 7.0';14 private $version = '1.8.0'; 15 15 private $update = false; 16 16 private $fromVersion = ''; … … 99 99 if (!$this->update) return; 100 100 101 $config = new ConfigurationClass();101 $config = ConfigurationClass::getConfiguration(true); 102 102 if (version_compare($this->fromVersion, '1.1.0', '<')) { 103 103 $this->updateQuery('ALTER TABLE #__acyc_test ADD `batch_id` INT NULL'); -
acychecker/tags/1.8.0/vendor/composer/installed.php
r3406754 r3469539 4 4 'pretty_version' => 'dev-develop', 5 5 'version' => 'dev-develop', 6 'reference' => ' 4babb0906be96a6545941e47d4d580bdfea37eef',6 'reference' => '04652bb1cd4a56458589d797f3a0ba1e7229b98e', 7 7 'type' => 'project', 8 8 'install_path' => __DIR__ . '/../../', … … 14 14 'pretty_version' => 'dev-develop', 15 15 'version' => 'dev-develop', 16 'reference' => ' 4babb0906be96a6545941e47d4d580bdfea37eef',16 'reference' => '04652bb1cd4a56458589d797f3a0ba1e7229b98e', 17 17 'type' => 'project', 18 18 'install_path' => __DIR__ . '/../../', -
acychecker/trunk/acychecker.php
r3406754 r3469539 6 6 Author URI: https://www.acychecker.com 7 7 License: GPLv3 8 Version: 1. 7.08 Version: 1.8.0 9 9 Text Domain: acychecker 10 10 */ -
acychecker/trunk/cms/cmsServices/Security.php
r2628688 r3469539 86 86 $var = (float)$var; 87 87 break; 88 case 'bool ean':89 $var = (bool ean)$var;88 case 'bool': 89 $var = (bool)$var; 90 90 break; 91 91 case 'word': -
acychecker/trunk/cms/cmsServices/WordPressActivation.php
r3014300 r3469539 72 72 public function update() 73 73 { 74 $configurationClass = new ConfigurationClass();74 $configurationClass = ConfigurationClass::getConfiguration(); 75 75 if (!file_exists(ACYC_FOLDER.'update.php') && $configurationClass->get('installcomplete', 0) != 0) { 76 76 return; -
acychecker/trunk/cms/cmsServices/WordPressRegistration.php
r3268911 r3469539 23 23 $user = new \stdClass(); 24 24 $user->user_email = $email; 25 $user->user_login = $login; 25 26 $this->blockNewUsers($errors, email_exists($email), $user); 26 27 … … 32 33 if ($update) return; 33 34 34 $config = new ConfigurationClass();35 $config = ConfigurationClass::getConfiguration(); 35 36 $integrations = explode(',', $config->get('registration_integrations')); 36 37 … … 43 44 $testUser = new \stdClass(); 44 45 $testUser->email = $user->user_email; 45 $testUser->name = $user->first_name.' '.$user->last_name;46 46 $testUser->username = $user->user_login; 47 if (empty($user->first_name) && empty($user->last_name)) { 48 $testUser->name = $testUser->username; 49 } else { 50 $testUser->name = $user->first_name ?? ''; 51 if (!empty($user->last_name)) { 52 $testUser->name .= ' '.$user->last_name; 53 } 54 } 47 55 48 56 $apiService = new ApiService(); -
acychecker/trunk/readme.txt
r3406754 r3469539 3 3 Tags: spam, block, email, check 4 4 Requires at least: 5.0 5 Tested up to: 6. 8.36 Stable tag: 1. 7.05 Tested up to: 6.9.1 6 Stable tag: 1.8.0 7 7 Requires PHP: 7.4.0 8 8 License: GPLv3 … … 84 84 == Changelog == 85 85 86 = 1.7.0 - December 1, 2025 = 87 * The compatibility with AcyMailing 10.6.6 has been added for user deletion. 88 * Pressing Enter in the search bar doesn't open the export options anymore. 86 = 1.8.0 - February 25, 2026 = 87 * Code has been improved in various places to optimize page load. 88 * The code has been updated to prepare for PHP 8.6. 89 90 * Some warning messages in server logs have been fixed when a new user account is created. 89 91 90 92 [See the whole changelog here.](https://www.acychecker.com/changelog) -
acychecker/trunk/src/Classes/AcymailingUserClass.php
r3406754 r3469539 27 27 public function getUsers($offset = 0, $limit = 5000, $fromCron = false, $onlyNew = false, $lists = []) 28 28 { 29 $query = 'SELECT `user`.email, `user`.name from#__acym_user AS `user` ';29 $query = 'SELECT `user`.email, `user`.name FROM #__acym_user AS `user` '; 30 30 31 31 // We filter the users if we need to -
acychecker/trunk/src/Classes/ConfigurationClass.php
r2628688 r3469539 9 9 class ConfigurationClass extends AcycClass 10 10 { 11 var $table = 'configuration'; 12 var $pkey = 'name'; 13 var $values = []; 11 private array $values = []; 12 13 public function __construct() 14 { 15 parent::__construct(); 16 17 $this->table = 'configuration'; 18 $this->pkey = 'name'; 19 } 20 21 public static function getConfiguration(bool $reload = false): ConfigurationClass 22 { 23 static $configClass = null; 24 if ($configClass === null || $reload) { 25 $configClass = new ConfigurationClass(); 26 $configClass->load(); 27 } 28 29 return $configClass; 30 } 14 31 15 32 public function load() -
acychecker/trunk/src/Libraries/AcycObject.php
r2628688 r3469539 14 14 { 15 15 $this->cmsUserVars = User::getCmsUserDbStructure(); 16 $this->config = $this->getConfiguration(get_class($this)); 17 } 18 19 public function getConfiguration($currentClass) 20 { 21 static $configClass = null; 22 if ($configClass === null) { 23 $configClass = 'AcyChecker\\Classes\\ConfigurationClass' === $currentClass ? $this : new ConfigurationClass(); 24 $configClass->load(); 25 } 26 27 return $configClass; 16 $this->config = ConfigurationClass::class === get_class($this) ? $this : ConfigurationClass::getConfiguration(); 28 17 } 29 18 } -
acychecker/trunk/src/Services/ApiService.php
r3406754 r3469539 85 85 } 86 86 87 private function processRequest($url, $header, $data = [], $type = 'GET', $options = []) 88 { 89 try { 90 $options['verify'] = false; 91 if (class_exists('\WpOrg\Requests\Requests')) { 92 $request = \WpOrg\Requests\Requests::request($url, $header, $type == 'GET' ? $data : json_encode($data), $type, $options); 93 } else { 94 $request = \Requests::request($url, $header, $type == 'GET' ? $data : json_encode($data), $type, $options); 95 } 96 } catch (\Exception $exception) { 97 $this->errors[] = $exception->getMessage(); 98 99 return false; 100 } 101 102 $request->body = json_decode($request->body, true); 103 104 return $request; 87 private function processRequest(string $url, array $data = [], string $method = 'GET', array $headers = []): array 88 { 89 $headers = $headers + $this->getDefaultHeaders(); 90 91 $options = [ 92 'verifySsl' => false, 93 'headers' => $headers, 94 'method' => $method, 95 'data' => $data, 96 ]; 97 $request = RequestService::curlCall($url, $options); 98 99 if (!empty($request['error'])) { 100 $this->errors[] = $request['error']; 101 102 return []; 103 } 104 105 $return = $request; 106 $return['success'] = true; 107 108 if ($request['status_code'] < 200 || $request['status_code'] > 299) { 109 $return['success'] = false; 110 } 111 112 return $return; 105 113 } 106 114 … … 112 120 'API-KEY' => $this->apiKey, 113 121 'Source' => 'plugin', 114 'Source-Version' => '1. 7.0',122 'Source-Version' => '1.8.0', 115 123 ]; 116 124 } … … 120 128 $url = $this->apiBaseUrl.'licenses/credits'; 121 129 122 $request = $this->processRequest($url , $this->getDefaultHeaders());130 $request = $this->processRequest($url); 123 131 if (!empty($this->errors)) { 124 132 Message::enqueueMessage(implode(', ', $this->errors), 'error'); 125 133 } 126 134 127 if ( !$request) {135 if (empty($request['success'])) { 128 136 return $this->returnResponse(__('Could not call the api', 'acychecker'), [], false); 129 137 } 130 138 131 if ($request ->status_code!== 200) {132 if (isset($request ->body['message'])) {133 return $this->returnResponse($request ->body['message'], [], false);139 if ($request['status_code'] !== 200) { 140 if (isset($request['message'])) { 141 return $this->returnResponse($request['message'], [], false); 134 142 } else { 135 143 return $this->returnResponse( 136 sprintf(__('Error while calling the API (code %s)', 'acychecker'), $request ->status_code),144 sprintf(__('Error while calling the API (code %s)', 'acychecker'), $request['status_code']), 137 145 [], 138 146 false … … 141 149 } 142 150 143 144 return $this->returnResponse('', $request->body); 151 return $this->returnResponse('', $request); 145 152 } 146 153 … … 159 166 ]; 160 167 161 $request = $this->processRequest($url, $ this->getDefaultHeaders(), $data, 'POST');162 163 if ( !$request) {168 $request = $this->processRequest($url, $data, 'POST'); 169 170 if (empty($request['success'])) { 164 171 return $this->returnResponse(__('Could not call the api', 'acychecker'), [], false); 165 172 } 166 173 167 174 //Not enough credits 168 if ($request ->status_code === 403 && strpos($request->body['message'], 'Not enough credits') !== false) {175 if ($request['status_code'] === 403 && strpos($request['message'], 'Not enough credits') !== false) { 169 176 return $this->returnResponse(__('Not enough credits to run this test', 'acychecker'), [], false); 170 } elseif ($request ->status_code!== 201) {171 $message = $request ->body['message'] ?? '';177 } elseif ($request['status_code'] !== 201) { 178 $message = $request['message'] ?? ''; 172 179 if (empty($message)) { 173 $message = sprintf(__('Error while calling the API (code %s)', 'acychecker'), $request ->status_code);180 $message = sprintf(__('Error while calling the API (code %s)', 'acychecker'), $request['status_code']); 174 181 } 175 182 … … 177 184 } 178 185 179 return $this->returnResponse('', $request ->body);186 return $this->returnResponse('', $request); 180 187 } 181 188 … … 291 298 $url = $this->apiBaseUrl.'email_verify/'.$email; 292 299 293 $request = $this->processRequest($url , $this->getDefaultHeaders());294 295 if ( !$request) {300 $request = $this->processRequest($url); 301 302 if (empty($request['success'])) { 296 303 $message = __('Could not call the api', 'acychecker'); 297 304 if (!empty($this->errors)) { … … 306 313 } 307 314 308 if ($request ->status_code!== 200) {309 $message = $request ->body['message'] ?? sprintf(__('Error while calling the API (code %s)', 'acychecker'), $request->status_code);315 if ($request['status_code'] !== 200) { 316 $message = $request['message'] ?? sprintf(__('Error while calling the API (code %s)', 'acychecker'), $request['status_code']); 310 317 DebugService::logMessage('individual_tests.log', $email.' - '.$message); 311 318 … … 318 325 return [ 319 326 'success' => true, 320 'data' => $request ->body['data'],327 'data' => $request['data'], 321 328 ]; 322 329 } … … 404 411 $url = $this->apiBaseUrl.'bulk_result/'.$batchId; 405 412 406 $request = $this->processRequest($url , $this->getDefaultHeaders());407 408 if ( !$request) {413 $request = $this->processRequest($url); 414 415 if (empty($request['success'])) { 409 416 DebugService::logMessage('batch_tests.log', 'Error getting '.$batchId.' results'); 410 417 … … 412 419 } 413 420 414 if ($request ->status_code!== 200) {421 if ($request['status_code'] !== 200) { 415 422 $codes = [ 416 423 403 => 'The API key is incorrect', … … 418 425 429 => 'Too many requests', 419 426 ]; 420 if (in_array($request ->status_code, array_keys($codes))) {421 DebugService::logMessage('batch_tests.log', 'Error getting '.$batchId.' results: '.$codes[$request ->status_code]);427 if (in_array($request['status_code'], array_keys($codes))) { 428 DebugService::logMessage('batch_tests.log', 'Error getting '.$batchId.' results: '.$codes[$request['status_code']]); 422 429 } else { 423 DebugService::logMessage('batch_tests.log', 'Error getting '.$batchId.' results: Unknown return code '.$request ->status_code);430 DebugService::logMessage('batch_tests.log', 'Error getting '.$batchId.' results: Unknown return code '.$request['status_code']); 424 431 } 425 432 … … 427 434 } 428 435 429 if (empty($request ->body['data'])) {436 if (empty($request['data'])) { 430 437 DebugService::logMessage('batch_tests.log', 'Error getting '.$batchId.' results: No data returned'); 431 438 … … 435 442 DebugService::logMessage('batch_tests.log', 'Getting batch '.$batchId.' results was successful.'); 436 443 437 return $request ->body['data'];444 return $request['data']; 438 445 } 439 446 -
acychecker/trunk/src/Services/CronService.php
r3268911 r3469539 59 59 // If we are on the callback url we don't trigger the cron 60 60 $controller = Security::getVar('string', 'ctrl', ''); 61 if ($controller == 'callbackController') return;61 if ($controller === 'callbackController') return; 62 62 63 63 // If the user didn't set any conditions we do not trigger any batch -
acychecker/trunk/src/Services/PaginationService.php
r2842759 r3469539 17 17 public function __construct($page, $total, $perPage, $pageName) 18 18 { 19 $configClass = new ConfigurationClass(); 20 $configClass->load(); 19 $configClass = ConfigurationClass::getConfiguration(true); 21 20 $this->page = $page; 22 21 $this->total = $total; -
acychecker/trunk/src/Services/UpdateService.php
r3406754 r3469539 12 12 { 13 13 private $cms = 'wordpress'; 14 private $version = '1. 7.0';14 private $version = '1.8.0'; 15 15 private $update = false; 16 16 private $fromVersion = ''; … … 99 99 if (!$this->update) return; 100 100 101 $config = new ConfigurationClass();101 $config = ConfigurationClass::getConfiguration(true); 102 102 if (version_compare($this->fromVersion, '1.1.0', '<')) { 103 103 $this->updateQuery('ALTER TABLE #__acyc_test ADD `batch_id` INT NULL'); -
acychecker/trunk/vendor/composer/installed.php
r3406754 r3469539 4 4 'pretty_version' => 'dev-develop', 5 5 'version' => 'dev-develop', 6 'reference' => ' 4babb0906be96a6545941e47d4d580bdfea37eef',6 'reference' => '04652bb1cd4a56458589d797f3a0ba1e7229b98e', 7 7 'type' => 'project', 8 8 'install_path' => __DIR__ . '/../../', … … 14 14 'pretty_version' => 'dev-develop', 15 15 'version' => 'dev-develop', 16 'reference' => ' 4babb0906be96a6545941e47d4d580bdfea37eef',16 'reference' => '04652bb1cd4a56458589d797f3a0ba1e7229b98e', 17 17 'type' => 'project', 18 18 'install_path' => __DIR__ . '/../../',
Note: See TracChangeset
for help on using the changeset viewer.