Plugin Directory

Changeset 3469539


Ignore:
Timestamp:
02/25/2026 02:35:54 PM (12 days ago)
Author:
acyba
Message:

1.8.0 - Major release

Location:
acychecker
Files:
2 added
26 edited
1 copied

Legend:

Unmodified
Added
Removed
  • acychecker/tags/1.8.0/acychecker.php

    r3406754 r3469539  
    66Author URI: https://www.acychecker.com
    77License: GPLv3
    8 Version: 1.7.0
     8Version: 1.8.0
    99Text Domain: acychecker
    1010*/
  • acychecker/tags/1.8.0/cms/cmsServices/Security.php

    r2628688 r3469539  
    8686                $var = (float)$var;
    8787                break;
    88             case 'boolean':
    89                 $var = (boolean)$var;
     88            case 'bool':
     89                $var = (bool)$var;
    9090                break;
    9191            case 'word':
  • acychecker/tags/1.8.0/cms/cmsServices/WordPressActivation.php

    r3014300 r3469539  
    7272    public function update()
    7373    {
    74         $configurationClass = new ConfigurationClass();
     74        $configurationClass = ConfigurationClass::getConfiguration();
    7575        if (!file_exists(ACYC_FOLDER.'update.php') && $configurationClass->get('installcomplete', 0) != 0) {
    7676            return;
  • acychecker/tags/1.8.0/cms/cmsServices/WordPressRegistration.php

    r3268911 r3469539  
    2323        $user = new \stdClass();
    2424        $user->user_email = $email;
     25        $user->user_login = $login;
    2526        $this->blockNewUsers($errors, email_exists($email), $user);
    2627
     
    3233        if ($update) return;
    3334
    34         $config = new ConfigurationClass();
     35        $config = ConfigurationClass::getConfiguration();
    3536        $integrations = explode(',', $config->get('registration_integrations'));
    3637
     
    4344        $testUser = new \stdClass();
    4445        $testUser->email = $user->user_email;
    45         $testUser->name = $user->first_name.' '.$user->last_name;
    4646        $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        }
    4755
    4856        $apiService = new ApiService();
  • acychecker/tags/1.8.0/readme.txt

    r3406754 r3469539  
    33Tags: spam, block, email, check
    44Requires at least: 5.0
    5 Tested up to: 6.8.3
    6 Stable tag: 1.7.0
     5Tested up to: 6.9.1
     6Stable tag: 1.8.0
    77Requires PHP: 7.4.0
    88License: GPLv3
     
    8484== Changelog ==
    8585
    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.
    8991
    9092[See the whole changelog here.](https://www.acychecker.com/changelog)
  • acychecker/tags/1.8.0/src/Classes/AcymailingUserClass.php

    r3406754 r3469539  
    2727    public function getUsers($offset = 0, $limit = 5000, $fromCron = false, $onlyNew = false, $lists = [])
    2828    {
    29         $query = 'SELECT `user`.email, `user`.name from #__acym_user AS `user` ';
     29        $query = 'SELECT `user`.email, `user`.name FROM #__acym_user AS `user` ';
    3030
    3131        // We filter the users if we need to
  • acychecker/tags/1.8.0/src/Classes/ConfigurationClass.php

    r2628688 r3469539  
    99class ConfigurationClass extends AcycClass
    1010{
    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    }
    1431
    1532    public function load()
  • acychecker/tags/1.8.0/src/Libraries/AcycObject.php

    r2628688 r3469539  
    1414    {
    1515        $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();
    2817    }
    2918}
  • acychecker/tags/1.8.0/src/Services/ApiService.php

    r3406754 r3469539  
    8585    }
    8686
    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;
    105113    }
    106114
     
    112120            'API-KEY' => $this->apiKey,
    113121            'Source' => 'plugin',
    114             'Source-Version' => '1.7.0',
     122            'Source-Version' => '1.8.0',
    115123        ];
    116124    }
     
    120128        $url = $this->apiBaseUrl.'licenses/credits';
    121129
    122         $request = $this->processRequest($url, $this->getDefaultHeaders());
     130        $request = $this->processRequest($url);
    123131        if (!empty($this->errors)) {
    124132            Message::enqueueMessage(implode(', ', $this->errors), 'error');
    125133        }
    126134
    127         if (!$request) {
     135        if (empty($request['success'])) {
    128136            return $this->returnResponse(__('Could not call the api', 'acychecker'), [], false);
    129137        }
    130138
    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);
    134142            } else {
    135143                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']),
    137145                    [],
    138146                    false
     
    141149        }
    142150
    143 
    144         return $this->returnResponse('', $request->body);
     151        return $this->returnResponse('', $request);
    145152    }
    146153
     
    159166        ];
    160167
    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'])) {
    164171            return $this->returnResponse(__('Could not call the api', 'acychecker'), [], false);
    165172        }
    166173
    167174        //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) {
    169176            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'] ?? '';
    172179            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']);
    174181            }
    175182
     
    177184        }
    178185
    179         return $this->returnResponse('', $request->body);
     186        return $this->returnResponse('', $request);
    180187    }
    181188
     
    291298        $url = $this->apiBaseUrl.'email_verify/'.$email;
    292299
    293         $request = $this->processRequest($url, $this->getDefaultHeaders());
    294 
    295         if (!$request) {
     300        $request = $this->processRequest($url);
     301
     302        if (empty($request['success'])) {
    296303            $message = __('Could not call the api', 'acychecker');
    297304            if (!empty($this->errors)) {
     
    306313        }
    307314
    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']);
    310317            DebugService::logMessage('individual_tests.log', $email.' - '.$message);
    311318
     
    318325        return [
    319326            'success' => true,
    320             'data' => $request->body['data'],
     327            'data' => $request['data'],
    321328        ];
    322329    }
     
    404411        $url = $this->apiBaseUrl.'bulk_result/'.$batchId;
    405412
    406         $request = $this->processRequest($url, $this->getDefaultHeaders());
    407 
    408         if (!$request) {
     413        $request = $this->processRequest($url);
     414
     415        if (empty($request['success'])) {
    409416            DebugService::logMessage('batch_tests.log', 'Error getting '.$batchId.' results');
    410417
     
    412419        }
    413420
    414         if ($request->status_code !== 200) {
     421        if ($request['status_code'] !== 200) {
    415422            $codes = [
    416423                403 => 'The API key is incorrect',
     
    418425                429 => 'Too many requests',
    419426            ];
    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']]);
    422429            } 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']);
    424431            }
    425432
     
    427434        }
    428435
    429         if (empty($request->body['data'])) {
     436        if (empty($request['data'])) {
    430437            DebugService::logMessage('batch_tests.log', 'Error getting '.$batchId.' results: No data returned');
    431438
     
    435442        DebugService::logMessage('batch_tests.log', 'Getting batch '.$batchId.' results was successful.');
    436443
    437         return $request->body['data'];
     444        return $request['data'];
    438445    }
    439446
  • acychecker/tags/1.8.0/src/Services/CronService.php

    r3268911 r3469539  
    5959        // If we are on the callback url we don't trigger the cron
    6060        $controller = Security::getVar('string', 'ctrl', '');
    61         if ($controller == 'callbackController') return;
     61        if ($controller === 'callbackController') return;
    6262
    6363        // 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  
    1717    public function __construct($page, $total, $perPage, $pageName)
    1818    {
    19         $configClass = new ConfigurationClass();
    20         $configClass->load();
     19        $configClass = ConfigurationClass::getConfiguration(true);
    2120        $this->page = $page;
    2221        $this->total = $total;
  • acychecker/tags/1.8.0/src/Services/UpdateService.php

    r3406754 r3469539  
    1212{
    1313    private $cms = 'wordpress';
    14     private $version = '1.7.0';
     14    private $version = '1.8.0';
    1515    private $update = false;
    1616    private $fromVersion = '';
     
    9999        if (!$this->update) return;
    100100
    101         $config = new ConfigurationClass();
     101        $config = ConfigurationClass::getConfiguration(true);
    102102        if (version_compare($this->fromVersion, '1.1.0', '<')) {
    103103            $this->updateQuery('ALTER TABLE #__acyc_test ADD `batch_id` INT NULL');
  • acychecker/tags/1.8.0/vendor/composer/installed.php

    r3406754 r3469539  
    44        'pretty_version' => 'dev-develop',
    55        'version' => 'dev-develop',
    6         'reference' => '4babb0906be96a6545941e47d4d580bdfea37eef',
     6        'reference' => '04652bb1cd4a56458589d797f3a0ba1e7229b98e',
    77        'type' => 'project',
    88        'install_path' => __DIR__ . '/../../',
     
    1414            'pretty_version' => 'dev-develop',
    1515            'version' => 'dev-develop',
    16             'reference' => '4babb0906be96a6545941e47d4d580bdfea37eef',
     16            'reference' => '04652bb1cd4a56458589d797f3a0ba1e7229b98e',
    1717            'type' => 'project',
    1818            'install_path' => __DIR__ . '/../../',
  • acychecker/trunk/acychecker.php

    r3406754 r3469539  
    66Author URI: https://www.acychecker.com
    77License: GPLv3
    8 Version: 1.7.0
     8Version: 1.8.0
    99Text Domain: acychecker
    1010*/
  • acychecker/trunk/cms/cmsServices/Security.php

    r2628688 r3469539  
    8686                $var = (float)$var;
    8787                break;
    88             case 'boolean':
    89                 $var = (boolean)$var;
     88            case 'bool':
     89                $var = (bool)$var;
    9090                break;
    9191            case 'word':
  • acychecker/trunk/cms/cmsServices/WordPressActivation.php

    r3014300 r3469539  
    7272    public function update()
    7373    {
    74         $configurationClass = new ConfigurationClass();
     74        $configurationClass = ConfigurationClass::getConfiguration();
    7575        if (!file_exists(ACYC_FOLDER.'update.php') && $configurationClass->get('installcomplete', 0) != 0) {
    7676            return;
  • acychecker/trunk/cms/cmsServices/WordPressRegistration.php

    r3268911 r3469539  
    2323        $user = new \stdClass();
    2424        $user->user_email = $email;
     25        $user->user_login = $login;
    2526        $this->blockNewUsers($errors, email_exists($email), $user);
    2627
     
    3233        if ($update) return;
    3334
    34         $config = new ConfigurationClass();
     35        $config = ConfigurationClass::getConfiguration();
    3536        $integrations = explode(',', $config->get('registration_integrations'));
    3637
     
    4344        $testUser = new \stdClass();
    4445        $testUser->email = $user->user_email;
    45         $testUser->name = $user->first_name.' '.$user->last_name;
    4646        $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        }
    4755
    4856        $apiService = new ApiService();
  • acychecker/trunk/readme.txt

    r3406754 r3469539  
    33Tags: spam, block, email, check
    44Requires at least: 5.0
    5 Tested up to: 6.8.3
    6 Stable tag: 1.7.0
     5Tested up to: 6.9.1
     6Stable tag: 1.8.0
    77Requires PHP: 7.4.0
    88License: GPLv3
     
    8484== Changelog ==
    8585
    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.
    8991
    9092[See the whole changelog here.](https://www.acychecker.com/changelog)
  • acychecker/trunk/src/Classes/AcymailingUserClass.php

    r3406754 r3469539  
    2727    public function getUsers($offset = 0, $limit = 5000, $fromCron = false, $onlyNew = false, $lists = [])
    2828    {
    29         $query = 'SELECT `user`.email, `user`.name from #__acym_user AS `user` ';
     29        $query = 'SELECT `user`.email, `user`.name FROM #__acym_user AS `user` ';
    3030
    3131        // We filter the users if we need to
  • acychecker/trunk/src/Classes/ConfigurationClass.php

    r2628688 r3469539  
    99class ConfigurationClass extends AcycClass
    1010{
    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    }
    1431
    1532    public function load()
  • acychecker/trunk/src/Libraries/AcycObject.php

    r2628688 r3469539  
    1414    {
    1515        $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();
    2817    }
    2918}
  • acychecker/trunk/src/Services/ApiService.php

    r3406754 r3469539  
    8585    }
    8686
    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;
    105113    }
    106114
     
    112120            'API-KEY' => $this->apiKey,
    113121            'Source' => 'plugin',
    114             'Source-Version' => '1.7.0',
     122            'Source-Version' => '1.8.0',
    115123        ];
    116124    }
     
    120128        $url = $this->apiBaseUrl.'licenses/credits';
    121129
    122         $request = $this->processRequest($url, $this->getDefaultHeaders());
     130        $request = $this->processRequest($url);
    123131        if (!empty($this->errors)) {
    124132            Message::enqueueMessage(implode(', ', $this->errors), 'error');
    125133        }
    126134
    127         if (!$request) {
     135        if (empty($request['success'])) {
    128136            return $this->returnResponse(__('Could not call the api', 'acychecker'), [], false);
    129137        }
    130138
    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);
    134142            } else {
    135143                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']),
    137145                    [],
    138146                    false
     
    141149        }
    142150
    143 
    144         return $this->returnResponse('', $request->body);
     151        return $this->returnResponse('', $request);
    145152    }
    146153
     
    159166        ];
    160167
    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'])) {
    164171            return $this->returnResponse(__('Could not call the api', 'acychecker'), [], false);
    165172        }
    166173
    167174        //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) {
    169176            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'] ?? '';
    172179            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']);
    174181            }
    175182
     
    177184        }
    178185
    179         return $this->returnResponse('', $request->body);
     186        return $this->returnResponse('', $request);
    180187    }
    181188
     
    291298        $url = $this->apiBaseUrl.'email_verify/'.$email;
    292299
    293         $request = $this->processRequest($url, $this->getDefaultHeaders());
    294 
    295         if (!$request) {
     300        $request = $this->processRequest($url);
     301
     302        if (empty($request['success'])) {
    296303            $message = __('Could not call the api', 'acychecker');
    297304            if (!empty($this->errors)) {
     
    306313        }
    307314
    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']);
    310317            DebugService::logMessage('individual_tests.log', $email.' - '.$message);
    311318
     
    318325        return [
    319326            'success' => true,
    320             'data' => $request->body['data'],
     327            'data' => $request['data'],
    321328        ];
    322329    }
     
    404411        $url = $this->apiBaseUrl.'bulk_result/'.$batchId;
    405412
    406         $request = $this->processRequest($url, $this->getDefaultHeaders());
    407 
    408         if (!$request) {
     413        $request = $this->processRequest($url);
     414
     415        if (empty($request['success'])) {
    409416            DebugService::logMessage('batch_tests.log', 'Error getting '.$batchId.' results');
    410417
     
    412419        }
    413420
    414         if ($request->status_code !== 200) {
     421        if ($request['status_code'] !== 200) {
    415422            $codes = [
    416423                403 => 'The API key is incorrect',
     
    418425                429 => 'Too many requests',
    419426            ];
    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']]);
    422429            } 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']);
    424431            }
    425432
     
    427434        }
    428435
    429         if (empty($request->body['data'])) {
     436        if (empty($request['data'])) {
    430437            DebugService::logMessage('batch_tests.log', 'Error getting '.$batchId.' results: No data returned');
    431438
     
    435442        DebugService::logMessage('batch_tests.log', 'Getting batch '.$batchId.' results was successful.');
    436443
    437         return $request->body['data'];
     444        return $request['data'];
    438445    }
    439446
  • acychecker/trunk/src/Services/CronService.php

    r3268911 r3469539  
    5959        // If we are on the callback url we don't trigger the cron
    6060        $controller = Security::getVar('string', 'ctrl', '');
    61         if ($controller == 'callbackController') return;
     61        if ($controller === 'callbackController') return;
    6262
    6363        // If the user didn't set any conditions we do not trigger any batch
  • acychecker/trunk/src/Services/PaginationService.php

    r2842759 r3469539  
    1717    public function __construct($page, $total, $perPage, $pageName)
    1818    {
    19         $configClass = new ConfigurationClass();
    20         $configClass->load();
     19        $configClass = ConfigurationClass::getConfiguration(true);
    2120        $this->page = $page;
    2221        $this->total = $total;
  • acychecker/trunk/src/Services/UpdateService.php

    r3406754 r3469539  
    1212{
    1313    private $cms = 'wordpress';
    14     private $version = '1.7.0';
     14    private $version = '1.8.0';
    1515    private $update = false;
    1616    private $fromVersion = '';
     
    9999        if (!$this->update) return;
    100100
    101         $config = new ConfigurationClass();
     101        $config = ConfigurationClass::getConfiguration(true);
    102102        if (version_compare($this->fromVersion, '1.1.0', '<')) {
    103103            $this->updateQuery('ALTER TABLE #__acyc_test ADD `batch_id` INT NULL');
  • acychecker/trunk/vendor/composer/installed.php

    r3406754 r3469539  
    44        'pretty_version' => 'dev-develop',
    55        'version' => 'dev-develop',
    6         'reference' => '4babb0906be96a6545941e47d4d580bdfea37eef',
     6        'reference' => '04652bb1cd4a56458589d797f3a0ba1e7229b98e',
    77        'type' => 'project',
    88        'install_path' => __DIR__ . '/../../',
     
    1414            'pretty_version' => 'dev-develop',
    1515            'version' => 'dev-develop',
    16             'reference' => '4babb0906be96a6545941e47d4d580bdfea37eef',
     16            'reference' => '04652bb1cd4a56458589d797f3a0ba1e7229b98e',
    1717            'type' => 'project',
    1818            'install_path' => __DIR__ . '/../../',
Note: See TracChangeset for help on using the changeset viewer.