webinterface.git

@@ -209,8 +209,6 @@ $form .= "

 $ipaddrs = user_ipaddrs();

 $certs = user_certs();

-if (count($ipaddrs) || count($certs))

-{

 $form .= "

 <h4 style=\"margin-top: 3em;\">Erweiterte Optionen</h4>

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

@@ -241,8 +239,14 @@ if (count($ipaddrs) || count($certs))

       ".html_select('ipv4', $ipselect, $vhost['ipv4'])."

       </div>";

   } 

+$checked = ($vhost['autoipv6'] == 1) ? ' checked="checked"' : '';

+$form .= '<h5>IPv6</h5>

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

+<input type="checkbox" name="ipv6" id="ipv6" value="yes" '.$checked.'/>&#160;<label for="ipv6">Auch über IPv6 erreichbar machen</label>

+</div>';

+

 $form .= "</div>";

-}

+

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

   $vhost['cert'] = NULL;

   $vhost['certid'] = NULL;

   $vhost['ipv4'] = NULL;

+  $vhost['autoipv6'] = 0;

   $vhost['options'] = '';

   $vhost['stats'] = NULL;

@@ -231,15 +232,18 @@ function save_vhost($vhost)

   {

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

   }

+

+  $autoipv6 = ( $vhost['autoipv6'] == 1) ? '1' : '0';

+

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

   if ($id != 0) {

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

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

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

   }

   else {

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

-    $result = db_query("INSERT INTO vhosts.vhost (user, hostname, domain, docroot, php, `ssl`, logtype, errorlog, certid, ipv4, options, stats) VALUES ({$_SESSION['userinfo']['uid']}, {$hostname}, {$domain}, {$docroot}, {$php}, {$ssl}, {$logtype}, {$errorlog}, {$cert}, {$ipv4}, '{$options}', {$stats})");

+    $result = db_query("INSERT INTO vhosts.vhost (user, hostname, domain, docroot, php, `ssl`, logtype, errorlog, certid, ipv4, autoipv6, options, stats) VALUES ({$_SESSION['userinfo']['uid']}, {$hostname}, {$domain}, {$docroot}, {$php}, {$ssl}, {$logtype}, {$errorlog}, {$cert}, {$ipv4}, {$autoipv6}, '{$options}', {$stats})");

     $id = mysql_insert_id();

   }

   $oldvhost = get_vhost_details($id);

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

   $ipv4 = (isset($_POST['ipv4']) ? $_POST['ipv4'] : NULL);

+  if (isset($_POST['ipv6']) && $_POST['ipv6'] == 'yes')

+  {

+    $vhost['autoipv6'] = 1;

+  } else {

+    $vhost['autoipv6'] = 0;

+  }

+  

   $logtype = '';

   switch ($_POST['logtype']) {