webinterface.git

@@ -89,6 +89,15 @@ $form .= "<br /><input type=\"checkbox\" name=\"options[]\" id=\"aliaswww\" valu

     </select>

     </td>

     <td id=\"defaultphp\">als Apache-Modul</td></tr>

+    <tr><td>SSL-Verschlüsselung</td>

+    <td><select name=\"ssl\" id=\"ssl\">

+      <option value=\"none\" ".($vhost['ssl'] == NULL ? 'selected="selected"' : '')." >SSL optional anbieten</option>

+      <option value=\"http\" ".($vhost['ssl'] == 'http' ? 'selected="selected"' : '')." >kein SSL</option>

+      <option value=\"https\" ".($vhost['ssl'] == 'https' ? 'selected="selected"' : '')." >nur SSL</option>

+      <option value=\"forward\" ".($vhost['ssl'] == 'forward' ? 'selected="selected"' : '')." >Immer auf SSL umleiten</option>

+    </select>

+    </td>

+    <td id=\"defaultssl\">SSL optional anbieten</td></tr>

     <tr>

       <td>Logfiles</td>

       <td><select name=\"logtype\" id=\"logtype\">

@@ -28,6 +28,7 @@ function empty_vhost()

   $vhost['homedir'] = $_SESSION['userinfo']['homedir'];

   $vhost['docroot'] = NULL;

   $vhost['php'] = 'mod_php';

+  $vhost['ssl'] = NULL;

   $vhost['logtype'] = NULL;

   $vhost['options'] = '';

@@ -135,16 +136,17 @@ function save_vhost($vhost)

     $domain = 'NULL';

   $docroot = maybe_null($vhost['docroot']);

   $php = maybe_null($vhost['php']);

+  $ssl = maybe_null($vhost['ssl']);

   $logtype = maybe_null($vhost['logtype']);

   $options = mysql_real_escape_string( $vhost['options'] );

   if ($id != 0) {

     logger('modules/vhosts/include/vhosts.php', 'vhosts', 'Updating vhost #'.$id.' ('.$vhost['hostname'].'.'.$vhost['domain'].')');

-    db_query("UPDATE vhosts.vhost SET hostname={$hostname}, domain={$domain}, docroot={$docroot}, php={$php}, logtype={$logtype}, options='{$options}' WHERE id={$id} LIMIT 1");

+    db_query("UPDATE vhosts.vhost SET hostname={$hostname}, domain={$domain}, docroot={$docroot}, php={$php}, `ssl`={$ssl}, logtype={$logtype}, options='{$options}' WHERE id={$id} LIMIT 1");

   }

   else {

     logger('modules/vhosts/include/vhosts.php', 'vhosts', 'Creating vhost '.$vhost['hostname'].'.'.$vhost['domain'].'');

-    db_query("INSERT INTO vhosts.vhost (user, hostname, domain, docroot, php, logtype, options) VALUES ({$_SESSION['userinfo']['uid']}, {$hostname}, {$domain}, {$docroot}, {$php}, {$logtype}, '{$options}')");

+    db_query("INSERT INTO vhosts.vhost (user, hostname, domain, docroot, php, ssl, logtype, options) VALUES ({$_SESSION['userinfo']['uid']}, {$hostname}, {$domain}, {$docroot}, {$php}, {$ssl}, {$logtype}, '{$options}')");

   }

 }

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

     /* Wenn etwas anderes kommt, ist das "kein PHP". So einfach ist das. */

   }

+  $ssl = '';

+  switch ($_POST['ssl']) {

+    case 'http':

+      $ssl = 'http';

+      break;

+    case 'https':

+      $ssl = 'https';

+      break;

+    case 'forward':

+      $ssl = 'forward';

+      break;

+    /* Wenn etwas anderes kommt, ist das "beides". So einfach ist das. */

+  }

+

   $logtype = '';

   switch ($_POST['logtype']) {

     case 'anonymous':

@@ -91,6 +105,7 @@ if ($_GET['action'] == 'edit')

   $vhost['domainid'] = $domainid;

   $vhost['docroot'] = $docroot;

   $vhost['php'] = $php;

+  $vhost['ssl'] = $ssl;

   $vhost['logtype'] = $logtype;

   $vhost['options'] = $options;