webinterface.git

@@ -232,6 +232,9 @@ $extended = '';

     {

       $certselect[$c['id']] = $c['subject'];

     }

+    if ($vhost['certid'] == 0 && strstr($vhost['options'], 'letsencrypt')) {

+      $vhost['certid'] = -1;

+    }

     $extended .= "

       <h5>verwendetes SSL-Zertifikat</h5>

       <div style=\"margin-left: 2em;\">

@@ -174,7 +174,11 @@ validTo_time_t => 1267190790

   */

   DEBUG($certdata);

   //return array('subject' => $certdata['name'], 'cn' => $certdata['subject']['CN'], 'valid_from' => date('Y-m-d', $certdata['validFrom_time_t']), 'valid_until' => date('Y-m-d', $certdata['validTo_time_t']));

-  return array('subject' => $certdata['subject']['CN'].' / '.$certdata['issuer']['O'], 'cn' => $certdata['subject']['CN'], 'valid_from' => date('Y-m-d', $certdata['validFrom_time_t']), 'valid_until' => date('Y-m-d', $certdata['validTo_time_t']), 'issuer' => $certdata['issuer']['CN']);

+  $issuer = $certdata['issuer']['CN'];

+  if (isset($certdata['issuer']['O'])) {

+    $issuer = $certdata['issuer']['O'];

+  }

+  return array('subject' => $certdata['subject']['CN'].' / '.$issuer, 'cn' => $certdata['subject']['CN'], 'valid_from' => date('Y-m-d', $certdata['validFrom_time_t']), 'valid_until' => date('Y-m-d', $certdata['validTo_time_t']), 'issuer' => $certdata['issuer']['CN']);

 }

@@ -36,7 +36,7 @@ Einstellungen stehen Ihnen die OpenSSL-Programme in Ihrem Benutzeraccount zur Ve

 $bitselect = array(2048 => 2048, 4096 => 4096);

 $form = '<p><label for="commonname">Domain-/Hostname:</label> <input type="text" name="commonname" id="commonname" /> (Mehrere Hostnames ggf. mit Komma trennen.)</p>

-<p><label for="bitlength">Bitlänge:</label> '.html_select('bitlength', $bitselect, 4096).'</p>

+<p><label for="bitlength">Bitlänge:</label> '.html_select('bitlength', $bitselect, 2048).'</p>

 <p><input type="submit" value="Erzeugen" /></p>';

 output(html_form('vhosts_csr', 'savecert', 'action=newcsr', $form));

@@ -218,6 +218,11 @@ if ($_GET['action'] == 'edit')

   }

   if ($cert == -1) {

     array_push($new_options, 'letsencrypt');

+    if ($vhost['cert'] != 0) {

+      # FIXME: Wenn der User manuell von einem gültigen Cert auf "letsencrypt" umgestellt hat, 

+      # dann sollte das alte Cert noch so lange eingetragen bleiben bis das neue da ist.

+      $cert = $vhost['cert']

+    }

   }

   DEBUG($old_options);