diff --git a/bureau/class/m_apache.php b/bureau/class/m_apache.php index 87767e65..98f4f17f 100644 --- a/bureau/class/m_apache.php +++ b/bureau/class/m_apache.php @@ -106,6 +106,7 @@ class m_apache { * launched for each FQDN for which we want to delete a vhost template */ function hook_updatedomains_web_del($subdomid) { + global $db; $db->query("SELECT sd.*, dt.only_dns, dt.has_https_option, m.login FROM domaines_type dt, sub_domaines sd LEFT JOIN membres m ON m.uid=sd.compte WHERE dt.name=sd.type AND sd.web_action!='OK' AND id=?;",array($subdomid)); $db->next_record(); $subdom=$db->Record; diff --git a/bureau/class/m_ssl.php b/bureau/class/m_ssl.php index d51de2c3..73229021 100644 --- a/bureau/class/m_ssl.php +++ b/bureau/class/m_ssl.php @@ -394,7 +394,7 @@ INSTR(CONCAT(sd.sub,IF(sd.sub!='','.',''),sd.domaine),'.')+1))=? $chain=false; return array( - "cert" => self::KEY_REPOSITORY."/".floor($id/1000)."/".$id.".cert", + "cert" => self::KEY_REPOSITORY."/".floor($id/1000)."/".$id.".pem", "key" => self::KEY_REPOSITORY."/".floor($id/1000)."/".$id.".key", "chain" => $chain );