From 05f602d45775571141c508806da82ddd9b263760 Mon Sep 17 00:00:00 2001 From: kionez Date: Tue, 8 Oct 2019 17:44:41 +0200 Subject: [PATCH] Fix for null expiration date and coding style --- lib/Froxlor/Api/Commands/Certificates.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Froxlor/Api/Commands/Certificates.php b/lib/Froxlor/Api/Commands/Certificates.php index 7a9adac0..0b9b9505 100644 --- a/lib/Froxlor/Api/Commands/Certificates.php +++ b/lib/Froxlor/Api/Commands/Certificates.php @@ -293,7 +293,7 @@ class Certificates extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resou } $do_verify = true; - $expirationdate = NULL; + $expirationdate = null; // no cert-file given -> forget everything if ($ssl_cert_file == '') { $ssl_key_file = ''; @@ -334,7 +334,7 @@ class Certificates extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resou } else { \Froxlor\UI\Response::standard_error('sslcertificateinvalidcert', '', true); } - $expirationdate = $cert_content['validTo_time_t']; + $expirationdate = empty($cert_content['validTo_time_t']) ? null : $date("Y-m-d H:i:s", $cert_content['validTo_time_t']); } // Add/Update database entry @@ -357,7 +357,7 @@ class Certificates extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resou "ssl_key_file" => $ssl_key_file, "ssl_ca_file" => $ssl_ca_file, "ssl_cert_chainfile" => $ssl_cert_chainfile, - "expirationdate" => date("Y-m-d H:i:s", $expirationdate), + "expirationdate" => $expirationdate, "domainid" => $domainid ); Database::pexecute($stmt, $params, true, true);