maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Fix for null expiration date and coding style

Browse Source
This commit is contained in:
kionez
2019-10-08 17:44:41 +02:00
parent 9ec03bade7
commit 05f602d457
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Froxlor/Api/Commands/Certificates.php
View File

@@ -293,7 +293,7 @@ class Certificates extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resou
} }
$do_verify = true; $do_verify = true;
$expirationdate = NULL; $expirationdate = null;
// no cert-file given -> forget everything // no cert-file given -> forget everything
if ($ssl_cert_file == '') { if ($ssl_cert_file == '') {
$ssl_key_file = ''; $ssl_key_file = '';
@@ -334,7 +334,7 @@ class Certificates extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resou
} else { } else {
\Froxlor\UI\Response::standard_error('sslcertificateinvalidcert', '', true); \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 // 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_key_file" => $ssl_key_file,
"ssl_ca_file" => $ssl_ca_file, "ssl_ca_file" => $ssl_ca_file,
"ssl_cert_chainfile" => $ssl_cert_chainfile, "ssl_cert_chainfile" => $ssl_cert_chainfile,
"expirationdate" => date("Y-m-d H:i:s", $expirationdate), "expirationdate" => $expirationdate,
"domainid" => $domainid "domainid" => $domainid
); );
Database::pexecute($stmt, $params, true, true); Database::pexecute($stmt, $params, true, true);