From 6edcec8dcdde298a3845231cdf1074efeed836d4 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 19 Feb 2024 07:58:15 +1100 Subject: [PATCH 1/2] Updates for type for smtp port --- app/Http/Requests/Company/StoreCompanyRequest.php | 6 +++++- app/Http/Requests/Company/UpdateCompanyRequest.php | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/Http/Requests/Company/StoreCompanyRequest.php b/app/Http/Requests/Company/StoreCompanyRequest.php index 29dac543e06d..af9b2fc5902d 100644 --- a/app/Http/Requests/Company/StoreCompanyRequest.php +++ b/app/Http/Requests/Company/StoreCompanyRequest.php @@ -57,7 +57,7 @@ class StoreCompanyRequest extends Request } $rules['smtp_host'] = 'sometimes|string|nullable'; - $rules['smtp_port'] = 'sometimes|string|nullable'; + $rules['smtp_port'] = 'sometimes|integer|nullable'; $rules['smtp_encryption'] = 'sometimes|string'; $rules['smtp_local_domain'] = 'sometimes|string|nullable'; $rules['smtp_encryption'] = 'sometimes|string|nullable'; @@ -96,6 +96,10 @@ class StoreCompanyRequest extends Request unset($input['smtp_password']); } + if(isset($input['smtp_port'])) { + $input['smtp_port'] = (int) $input['smtp_port']; + } + if(isset($input['smtp_verify_peer']) && is_string($input['smtp_verify_peer'])) $input['smtp_verify_peer'] == 'true' ? true : false; diff --git a/app/Http/Requests/Company/UpdateCompanyRequest.php b/app/Http/Requests/Company/UpdateCompanyRequest.php index 949400997c6e..818cc8ecdd0b 100644 --- a/app/Http/Requests/Company/UpdateCompanyRequest.php +++ b/app/Http/Requests/Company/UpdateCompanyRequest.php @@ -59,7 +59,7 @@ class UpdateCompanyRequest extends Request $rules['e_invoice_certificate'] = 'sometimes|nullable|file|mimes:p12,pfx,pem,cer,crt,der,txt,p7b,spc,bin'; $rules['smtp_host'] = 'sometimes|string|nullable'; - $rules['smtp_port'] = 'sometimes|string|nullable'; + $rules['smtp_port'] = 'sometimes|integer|nullable'; $rules['smtp_encryption'] = 'sometimes|string|nullable'; $rules['smtp_local_domain'] = 'sometimes|string|nullable'; // $rules['smtp_verify_peer'] = 'sometimes|string'; @@ -105,6 +105,10 @@ class UpdateCompanyRequest extends Request unset($input['smtp_password']); } + if(isset($input['smtp_port'])) { + $input['smtp_port'] = (int)$input['smtp_port']; + } + if(isset($input['smtp_verify_peer']) && is_string($input['smtp_verify_peer'])) { $input['smtp_verify_peer'] == 'true' ? true : false; } From 8edebaef85f0ee0f0f5c2a3ee3e56554181c241f Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 19 Feb 2024 08:47:32 +1100 Subject: [PATCH 2/2] V5.8.27 --- VERSION.txt | 2 +- app/Jobs/Util/Import.php | 2 +- config/ninja.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 96c215198db3..df3286a2ff46 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.8.26 \ No newline at end of file +5.8.27 \ No newline at end of file diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index 99da853cc753..ae9b9bea1244 100644 --- a/app/Jobs/Util/Import.php +++ b/app/Jobs/Util/Import.php @@ -420,7 +420,7 @@ class Import implements ShouldQueue if (Ninja::isHosted()) { - $data['subdomain'] = str_replace("_", "", $data['subdomain']); + $data['subdomain'] = str_replace("_", "", ($data['subdomain'] ?? '')); if (!MultiDB::checkDomainAvailable($data['subdomain'])) { $data['subdomain'] = MultiDB::randomSubdomainGenerator(); diff --git a/config/ninja.php b/config/ninja.php index 860ad8ef153e..e1ab63d1bd4d 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -17,8 +17,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => env('APP_VERSION', '5.8.26'), - 'app_tag' => env('APP_TAG', '5.8.26'), + 'app_version' => env('APP_VERSION', '5.8.27'), + 'app_tag' => env('APP_TAG', '5.8.27'), 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', false),