tbrehm
2011-11-14 662d4cc6df8f365fe6f59b48ab4a41fa812c5938
Fixed: FS#1831 - SSL Certificate setup fails unless you've visited the SSL tab in that session
1 files modified
5 ■■■■■ changed files
server/plugins-available/apache2_plugin.inc.php 5 ●●●●● patch | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php
@@ -190,7 +190,7 @@
        //* Save a SSL certificate to disk
        if($data["new"]["ssl_action"] == 'save') {
            $ssl_dir = $data["new"]["document_root"]."/ssl";
            $domain = $data["new"]["ssl_domain"];
            $domain = ($data["new"]["ssl_domain"] != '')?$data["new"]["ssl_domain"]:$data["new"]["domain"];
            $csr_file = $ssl_dir.'/'.$domain.".csr";
            $crt_file = $ssl_dir.'/'.$domain.".crt";
            $bundle_file = $ssl_dir.'/'.$domain.".bundle";
@@ -207,7 +207,7 @@
        //* Delete a SSL certificate
        if($data['new']['ssl_action'] == 'del') {
            $ssl_dir = $data['new']['document_root'].'/ssl';
            $domain = $data['new']['ssl_domain'];
            $domain = ($data["new"]["ssl_domain"] != '')?$data["new"]["ssl_domain"]:$data["new"]["domain"];
            $csr_file = $ssl_dir.'/'.$domain.'.csr';
            $crt_file = $ssl_dir.'/'.$domain.'.crt';
            $bundle_file = $ssl_dir.'/'.$domain.'.bundle';
@@ -227,7 +227,6 @@
            $app->dbmaster->query("UPDATE web_domain SET ssl_action = '' WHERE domain = '".$data['new']['domain']."'");
            $app->log('Deleting SSL Cert for: '.$domain,LOGLEVEL_DEBUG);
        }
    }