webinterface.git

@@ -54,6 +54,8 @@ output("<script type=\"text/javascript\">

   </script>");

 $defaultdocroot = $vhost['domain'];

+if (! $vhost['domain'])

+  $defaultdocroot = $_SESSION['userinfo']['username'].'.schokokeks.org';

 if ($vhost['hostname'])

   $defaultdocroot = $vhost['hostname'].'.'.$defaultdocroot;

@@ -22,12 +22,8 @@ function empty_vhost()

 {

   $vhost['hostname'] = '';

-  $domainlist = get_domain_list($_SESSION['customerinfo']['customerno'],

-                                $_SESSION['userinfo']['uid']);

-  $dom = $domainlist[0];

-

-  $vhost['domain_id'] = $dom->id;

-  $vhost['domain'] = $dom->fqdn;

+  $vhost['domain_id'] = -1;

+  $vhost['domain'] = $_SESSION['userinfo']['username'].'.schokokeks.org';

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

   $vhost['docroot'] = NULL;

@@ -43,12 +39,8 @@ function empty_alias()

 {

   $alias['hostname'] = '';

-  $domainlist = get_domain_list($_SESSION['customerinfo']['customerno'],

-                                $_SESSION['userinfo']['uid']);

-  $dom = $domainlist[0];

-

-  $alias['domain_id'] = $dom->id;

-  $alias['domain'] = $dom->fqdn;

+  $alias['domain_id'] = -1;

+  $alias['domain'] = $_SESSION['userinfo']['username'].'.schokokeks.org';

   $alias['options'] = '';

   return $alias;

@@ -64,6 +56,8 @@ function domainselect($selected = NULL, $selectattribute = '')

   $selected = (int) $selected;

   $ret = '<select id="domain" name="domain" size="1" '.$selectattribute.' >';

+  $ret .= ' <option value="-1">'.$_SESSION['userinfo']['username'].'.schokokeks.org</option>';

+  $ret .= ' <option value="" disabled="disabled">--------------------------------</option>';

   foreach ($domainlist as $dom)

   {

     $s = ($selected == $dom->id) ? ' selected="selected" ': '';

@@ -137,6 +131,8 @@ function save_vhost($vhost)

   $domain = (int) $vhost['domainid'];

   if ($domain == 0)

     system_failure('$domain == 0');

+  if ($vhost['domainid'] == -1)

+    $domain = 'NULL';

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

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

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

@@ -164,6 +160,9 @@ function get_alias_details($id)

   $alias = mysql_fetch_assoc($result);

+  if ($alias['domain_id'] == NULL)

+    $alias['domain_id'] = -1;

+

   /* Das bewirkt, dass nur die eigenen Aliase gesehen werden können */

   get_vhost_details( (int) $alias['vhost'] );

@@ -189,6 +188,8 @@ function save_alias($alias)

   $domain = (int) $alias['domainid'];

   if ($domain == 0)

     system_failure('$domain == 0');

+  if ($alias['domainid'] == -1)

+    $domain = 'NULL';

   $vhost = get_vhost_details( (int) $alias['vhost']);

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

   if ($id == 0) {

@@ -23,10 +23,14 @@ if ($_GET['action'] == 'edit')

   DEBUG($vhost);

   $hostname = filter_input_hostname($_POST['hostname']);

+

+  $domainid = (int) $_POST['domain'];

+  if ($domainid != -1) {

     $domain = new Domain( (int) $_POST['domain'] );

     if ($domain->useraccount != $_SESSION['userinfo']['uid'])

       system_failure('Ungültige Domain');

-

+    $domainid = $domain->id;

+  }

   if (! is_array($_POST['options']))

     $_POST['options'] = array();

@@ -84,7 +88,7 @@ if ($_GET['action'] == 'edit')

   DEBUG('New options: '.$options);

   $vhost['hostname'] = $hostname;

-  $vhost['domainid'] = $domain->id;

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

   $vhost['docroot'] = $docroot;

   $vhost['php'] = $php;

   $vhost['logtype'] = $logtype;

@@ -145,11 +149,11 @@ elseif ($_GET['action'] == 'deletealias')

   $alias = get_alias_details( (int) $_GET['alias'] );

   DEBUG($alias);

-  $alias_string = ((strlen($alias['hostname']) > 0) ? $alias['hostname'].'.' : '').$alias['domain'];

+  $alias_string = $alias['fqdn'];

   $vhost = get_vhost_details( $alias['vhost'] );

   DEBUG($vhost);

-  $vhost_string = ((strlen($vhost['hostname']) > 0) ? $vhost['hostname'].'.' : '').$vhost['domain'];

+  $vhost_string = $vhost['fqdn'];

   $sure = user_is_sure();

   if ($sure === NULL)

@@ -174,7 +178,7 @@ elseif ($_GET['action'] == 'delete')

   $section = 'vhosts_vhosts';

   $vhost = get_vhost_details( (int) $_GET['vhost'] );

-  $vhost_string = ((strlen($vhost['hostname']) > 0) ? $vhost['hostname'].'.' : '').$vhost['domain'];

+  $vhost_string = $vhost['fqdn'];

   $sure = user_is_sure();

   if ($sure === NULL)