From 649b2c55d6c9558a4c5f532ee7197dd8fc2d0499 Mon Sep 17 00:00:00 2001 From: Benjamin Sonntag Date: Sun, 24 Jun 2018 18:38:47 +0200 Subject: [PATCH] [fix] removing the concept of shared cert in m_ssl --- bureau/class/m_ssl.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bureau/class/m_ssl.php b/bureau/class/m_ssl.php index c3c9fa45..0bfa62a3 100644 --- a/bureau/class/m_ssl.php +++ b/bureau/class/m_ssl.php @@ -254,7 +254,7 @@ INSTR(CONCAT(sd.sub,IF(sd.sub!='','.',''),sd.domaine),'.')+1))=? // ----------------------------------------------------------------- /** Return all the SSL certificates for an account (or the searched one) * @param $filter an integer telling which certificate we want to see (see FILTER_* constants above) - * the default is showing all certificate, but only Pending and OK certificates, not expired or shared one + * the default is showing all certificate, but only Pending and OK certificates, not expired * when there is more than 10. * @return array all the ssl certificate this user can use * (each array is the content of the certificates table) @@ -479,7 +479,7 @@ INSTR(CONCAT(sd.sub,IF(sd.sub!='','.',''),sd.domaine),'.')+1))=? // Everything is PERFECT and has been thoroughly checked, let's insert those in the DB ! $db->query( - "INSERT INTO certificates SET uid=?, status=?, shared=0, fqdn=?, altnames=?, validstart=FROM_UNIXTIME(?), validend=FROM_UNIXTIME(?), sslkey=?, sslcrt=?, sslchain=?, provider=?;", + "INSERT INTO certificates SET uid=?, status=?, fqdn=?, altnames=?, validstart=FROM_UNIXTIME(?), validend=FROM_UNIXTIME(?), sslkey=?, sslcrt=?, sslchain=?, provider=?;", array($cuid, self::STATUS_OK, $fqdn, $altnames, intval($validstart), intval($validend), $key, $crt, $chain, $provider) ); if (!($id = $db->lastid())) { @@ -550,7 +550,7 @@ SELECT ?,?,?, FROM_UNIXTIME(?), FROM_UNIXTIME(?), ?, ?, sslcsr FROM certificate * Action may be create/postinst/delete/enable/disable * Change the template for this domain name to have the proper CERTIFICATE * An algorithm determine the best possible certificate, which may be a BAD one - * (like a generic admin-shared or self-signed for localhost as a last chance) + * (like a generic self-signed for localhost as a last chance) */ public function updateDomain($action, $type, $fqdn, $mail = 0, $value = "") { global $db, $msg, $dom;