webinterface.git

@@ -16,6 +16,11 @@ $vhost = empty_vhost();

 if ($id != 0)

   $vhost = get_vhost_details($id);

+$have_v6 = false;

+$server = (isset($vhost['server']) ? $vhost['server'] : $_SESSION['userinfo']['server']);

+if (ipv6_possible($server))

+  $have_v6 = true;

+

 DEBUG($vhost);

 if ($id == 0) {

   title("Neue Subdomain anlegen");

@@ -214,10 +219,7 @@ $ipaddrs = user_ipaddrs();

 $certs = user_certs();

 $available_users = available_suexec_users();

-$form .= "

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

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

-";

+$extended = '';

   if (count($certs))

   {

     $certselect = array(0 => 'kein Zertifikat / System-Standard benutzen');

@@ -225,7 +227,7 @@ $form .= "

     {

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

     }

-    $form .= "

+    $extended .= "

       <h5>verwendetes SSL-Zertifikat</h5>

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

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

@@ -238,7 +240,7 @@ $form .= "

     {

       $ipselect[$i] = $i;

     }

-    $form .= "

+    $extended .= "

       <h5>IP-Adresse</h5>

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

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

@@ -251,19 +253,25 @@ $form .= "

     {

       $userselect[$u['uid']] = $u['username'];

     }

-    $form .= "

+    $extended .= "

       <h5>SuExec-Benutzeraccount</h5>

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

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

       </div>";

   }

+if ($have_v6) 

+{

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

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

+  $extended .= '<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> (<strong>Achtung:</strong> Bitte beachten Sie die <a href="http://wiki.schokokeks.org/IPv6">Hinweise zu IPv6 im Wiki</a>.)

 </div>';

-

-$form .= "</div>";

+}

+if ($extended)

+  $form .= "

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

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

+".$extended."</div>";

@@ -19,6 +19,14 @@ function list_vhosts()

   return $ret;

 }

+function ipv6_possible($serverid)

+{

+  $serverid = (int) $serverid;

+  $result = db_query("SELECT v6_prefix FROM system.servers WHERE id={$serverid}");

+  $server = mysql_fetch_assoc($result);

+  return ($server['v6_prefix'] != NULL);

+}

+

 function empty_vhost()

 {

   $vhost['id'] = NULL;

@@ -164,7 +164,7 @@ function get_subuser_info($username)

 function get_user_info($username)

 {

   $username = mysql_real_escape_string($username);

-  $result = db_query("SELECT kunde AS customerno, username, uid, homedir, name

+  $result = db_query("SELECT kunde AS customerno, username, uid, homedir, name, server

                       FROM system.v_useraccounts WHERE username='{$username}' OR uid='{$username}' LIMIT 1");

   if (mysql_num_rows($result) < 1)

   {

@@ -177,6 +177,7 @@ function get_user_info($username)

           'customerno'    => $val->customerno,

           'uid'           => $val->uid,

           'homedir'       => $val->homedir,

+          'server'        => $val->server,

           'name'          => $val->name,

           );

 }