webinterface.git

@@ -238,7 +238,7 @@ if (count($ipaddrs) || count($certs))

       ".html_select('cert', $certselect, $vhost['certid'])."

       </div>";

   }

- /* if (count($ipaddrs))

+  if (count($ipaddrs))

   {

     $ipselect = array(0 => 'System-Standard');

     foreach ($ipaddrs AS $i)

@@ -248,9 +248,9 @@ if (count($ipaddrs) || count($certs))

     $form .= "

       <h5>IP-Adresse</h5>

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

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

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

       </div>";

-  } */

+  } 

   $form .= "</div>";

 }

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

   $vhost['webapp_id'] = NULL;

   $vhost['cert'] = NULL;

+  $vhost['ipv4'] = NULL;

   $vhost['options'] = '';

   return $vhost;

@@ -221,13 +221,20 @@ function save_vhost($vhost)

   if ($cert == 0)

     $cert = 'NULL';

+  $ipv4 = 'NULL';

+  $ipv4_avail = user_ipaddrs();

+  if (in_array($vhost['ipv4'], $ipv4_avail))

+  {

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

+  }

+

   if ($id != 0) {

     logger('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}, 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}, errorlog={$errorlog}, certid={$cert}, ipv4={$ipv4}, options='{$options}' WHERE id={$id} LIMIT 1");

   }

   else {

     logger('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, options) VALUES ({$_SESSION['userinfo']['uid']}, {$hostname}, {$domain}, {$docroot}, {$php}, {$ssl}, {$logtype}, {$errorlog}, {$cert}, '{$options}')");

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

     $id = mysql_insert_id();

   }

   $oldvhost = get_vhost_details($id);

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

   $cert = (int) $_POST['cert'];

+  $ipv4 = $_POST['ipv4'];

+

   $logtype = '';

   switch ($_POST['logtype']) {

     case 'anonymous':

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

   $vhost['php'] = $php;

   $vhost['ssl'] = $ssl;

   $vhost['cert'] = $cert;

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

   $vhost['logtype'] = $logtype;

   $vhost['errorlog'] = $errorlog; 

   $vhost['options'] = $options;