webinterface.git

@@ -247,6 +247,20 @@ $form .= "

 $ipaddrs = user_ipaddrs();

 $certs = user_certs();

 $available_users = available_suexec_users();

+$available_servers = additional_servers();

+$available_servers[] = my_server_id();

+$available_servers = array_unique($available_servers);

+

+$selectable_servers = array();

+$all_servers = server_names();

+foreach ($all_servers as $id => $fqdn) {

+  if (in_array($id, $available_servers)) {

+    $selectable_servers[$id] = $fqdn;

+  }

+}

+if (!$vhost['server']) {

+  $vhost['server'] = my_server_id();

+}

 $extended = '';

   if (count($certs))

@@ -288,6 +302,15 @@ $extended = '';

       ".html_select('suexec_user', $userselect, $vhost['suexec_user'])."

       </div>";

   }

+  if (count($available_servers))

+  {

+    $extended .= "

+      <h5>Einrichten auf Server</h5>

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

+      ".html_select('server', $selectable_servers, $vhost['server'])."

+      </div>";

+

+  }

 if ($have_v6) 

 {

   $ipv6_address = '';

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

   $vhost['cgi'] = 1;

   $vhost['ssl'] = NULL;

   $vhost['suexec_user'] = NULL;

+  $vhost['server'] = NULL;

   $vhost['logtype'] = NULL;

   $vhost['errorlog'] = 0;

   $vhost['is_dav'] = 0;

@@ -263,6 +264,15 @@ function save_vhost($vhost)

     if ($u['uid'] == $vhost['suexec_user'])

       $suexec_user = $u['uid'];

+  $server = 'NULL';

+  $available_servers = additional_servers();

+  if (in_array($vhost['server'], $available_servers)) {

+    $server = (int) $vhost['server'];

+  }

+  if ($server == my_server_id()) {

+    $server = 'NULL';

+  }

+

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

   $errorlog = (int) $vhost['errorlog'];

   if ($vhost['is_svn']) {

@@ -295,11 +305,11 @@ function save_vhost($vhost)

   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}, cgi={$cgi}, `ssl`={$ssl}, `suexec_user`={$suexec_user}, logtype={$logtype}, errorlog={$errorlog}, certid={$cert}, ipv4={$ipv4}, autoipv6={$autoipv6}, options='{$options}', stats={$stats} WHERE id={$id} LIMIT 1");

+    db_query("UPDATE vhosts.vhost SET hostname={$hostname}, domain={$domain}, docroot={$docroot}, php={$php}, cgi={$cgi}, `ssl`={$ssl}, `suexec_user`={$suexec_user}, `server`={$server}, 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, cgi, `ssl`, `suexec_user`, logtype, errorlog, certid, ipv4, autoipv6, options, stats) VALUES ({$_SESSION['userinfo']['uid']}, {$hostname}, {$domain}, {$docroot}, {$php}, {$cgi}, {$ssl}, {$suexec_user}, {$logtype}, {$errorlog}, {$cert}, {$ipv4}, {$autoipv6}, '{$options}', {$stats})");

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

     $id = mysql_insert_id();

   }

   $oldvhost = get_vhost_details($id);

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

   if (isset($_POST['suexec_user']))

     $vhost['suexec_user'] = $_POST['suexec_user'];

+  if (isset($_POST['server']))

+    $vhost['server'] = $_POST['server'];

+

   if ($_POST['vhost_type'] == 'regular') {

     $vhost['is_dav'] = 0;

     $vhost['is_svn'] = 0;

@@ -36,6 +36,10 @@ $vhosts = list_vhosts();

 if (count($vhosts) > 0)

 {

+  if (count($vhosts) > 10) {

+    addnew('edit', 'Neue Domain bzw. Subdomain einrichten');

+    addnew('../webapps/install', 'Neue Domain bzw. Subdomain mit vorinstallierter Web-Anwendung einrichten');

+  }

   output("<table><tr><th>(Sub-)Domain</th><th></th><th>Zusätzliche Alias-Namen</th><th>Protokoll</th><th>SSL</th><th>PHP</th><th>Lokaler Pfad<sup>*</sup></th></tr>\n");

   $even = True;