mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-03-28 11:53:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

CI4: Bugfix test sanity of config item

Browse Source 
Add a !empty test when dereferencing mailchimp_api_key and mailchimp_list_id from the config array.
This commit is contained in:
Doug Hutcheson
2023-10-19 08:12:52 +08:00
committed by jekkos
parent 8ea5fc5078
commit 044170b2b1
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Controllers/Config.php
View File

@@ -7,7 +7,6 @@ use App\Libraries\Mailchimp_lib;
use App\Libraries\Receiving_lib;
use App\Libraries\Sale_lib;
use App\Libraries\Tax_lib;
use App\Libraries\Ci3encrypt;
use App\Models\Appconfig;
use App\Models\Attribute;
@@ -75,7 +74,7 @@ class Config extends Secure_Controller
{
$this->encrypter = Services::encrypter();
}
else
else
{
log_message('alert', 'Error preparing encryption key');
}
@@ -304,12 +303,12 @@ class Config extends Secure_Controller
helper('security');
$this->encrypter = Services::encrypter();
}
$mailchimp_api_key = isset($this->config['mailchimp_api_key'])
$mailchimp_api_key = (isset($this->config['mailchimp_api_key']) && !empty($this->config['mailchimp_api_key']))
? $this->encrypter->decrypt($this->config['mailchimp_api_key'])
: '';
$mailchimp_list_id = isset($this->config['mailchimp_list_id'])
$mailchimp_list_id = (isset($this->config['mailchimp_list_id']) && !empty($this->config['mailchimp_list_id']))
? $this->encrypter->decrypt($this->config['mailchimp_list_id'])
: '';
@@ -386,7 +385,7 @@ class Config extends Secure_Controller
else
{
$file = $this->request->getFile('company_logo');
$file->move(WRITEPATH . 'uploads');
$file->move(BASEPATH . 'uploads');
$file_info = [
'orig_name' => $file->getClientName(),

2
app/Libraries/Mailchimp_lib.php
View File

@@ -41,7 +41,7 @@ class MailchimpConnector
$encrypter = Services::encrypter();
$mailchimp_api_key = isset($this->config['mailchimp_api_key'])
$mailchimp_api_key = (isset($this->config['mailchimp_api_key']) && !empty($this->config['mailchimp_api_key']))
? $this->config['mailchimp_api_key']
: '';