webinterface.git

@@ -5,7 +5,7 @@ require_once('inc/security.php');

 require_once('vhosts.php');

-$title = "VHost bearbeiten";

+$title = "Subdomain bearbeiten";

 $section = 'vhosts_vhosts';

 require_role(ROLE_SYSTEMUSER);

@@ -17,7 +17,13 @@ if ($id != 0)

   $vhost = get_vhost_details($id);

 DEBUG($vhost);

-output("<h3>VHost bearbeiten</h3>");

+if ($id == 0) {

+  output("<h3>Neue Subdomain anlegen</h3>");

+  $title = "Subdomain anlegen";

+}

+else {

+  output("<h3>Subdomain bearbeiten</h3>");

+}

 output("<script type=\"text/javascript\">

@@ -93,7 +99,7 @@ $form .= "<br /><input type=\"checkbox\" name=\"options[]\" id=\"aliaswww\" valu

     ";

 $form .= '</table>

-  <p><input type="submit" value="Änderungen speichern" />&nbsp;&nbsp;&nbsp;&nbsp;'.internal_link('vhosts.php', 'Ohne Speichern zurück').'</p>

+  <p><input type="submit" value="Speichern" />&nbsp;&nbsp;&nbsp;&nbsp;'.internal_link('vhosts.php', 'Abbrechen').'</p>

 ';

 output(html_form('vhosts_edit_vhost', 'save.php', 'action=edit&vhost='.$vhost['id'], $form));

@@ -38,6 +39,22 @@ function empty_vhost()

 }

+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['options'] = '';

+  return $alias;

+}

+

+

 function domainselect($selected = NULL, $selectattribute = '')

 {

   global $domainlist;

@@ -49,9 +66,7 @@ function domainselect($selected = NULL, $selectattribute = '')

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

   foreach ($domainlist as $dom)

   {

-    $s = '';

-    if ($selected == $dom->id)

-      $s = ' selected="selected" ';

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

     $ret .= "<option value=\"{$dom->id}\"{$s}>{$dom->fqdn}</option>\n";

   }

   $ret .= '</select>';

@@ -72,14 +87,32 @@ function get_vhost_details($id)

 }

-

 function get_aliases($vhost)

 {

-  $vhost = (int) $vhost;

   $result = db_query("SELECT id,fqdn,options FROM vhosts.v_alias WHERE vhost={$vhost}");

   $ret = array();

-  while ($item = mysql_fetch_assoc($result))

+  while ($item = mysql_fetch_assoc($result)) {

     array_push($ret, $item);

+  }

+  return $ret;

+}

+

+

+

+function get_all_aliases($vhost)

+{

+  $vhost = get_vhost_details( (int) $vhost );

+  $aliases = get_aliases($vhost['id']);

+  $ret = array();

+  if (strstr($vhost['options'], 'aliaswww')) {

+    array_push($ret, array('id' => 'www', 'fqdn' => 'www.'.$vhost['fqdn'], 'options' => (strstr($vhost['options'], 'forwardwww') ? 'forward' : '')));

+  }

+  foreach ($aliases as $item) {

+    array_push($ret, $item);

+    if (strstr($item['options'], 'aliaswww')) {

+      array_push($ret, array('id' => 'www_'.$item['id'], 'fqdn' => 'www.'.$item['fqdn'], 'options' => (strstr($item['options'], 'forward') ? 'forward' : '')));

+    }

+  }

   return $ret;

 }

@@ -101,7 +136,7 @@ function save_vhost($vhost)

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

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

   if ($domain == 0)

-    system_failure("Domain == 0");

+    system_failure('$domain == 0');

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

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

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

@@ -118,6 +153,54 @@ function save_vhost($vhost)

 }

+function get_alias_details($id)

+{

+  $id = (int) $id;

+  $uid = (int) $_SESSION['userinfo']['uid'];

+  $result = db_query("SELECT * FROM vhosts.v_alias WHERE id={$id}");

+  

+  if (mysql_num_rows($result) != 1)

+    system_failure('Interner Fehler beim Auslesen der Alias-Daten');

+  

+  $alias = mysql_fetch_assoc($result);

+

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

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

+

+  return $alias;

+}

+

+

+function delete_alias($id)

+{

+  $id = (int) $id;

+  $alias = get_alias_details($id);

+

+  logger('modules/vhosts/include/vhosts.php', 'aliases', 'Removing alias #'.$id.' ('.$alias['hostname'].'.'.$alias['domain'].')');

+  db_query("DELETE FROM vhosts.alias WHERE id={$id}");

+}

+

+function save_alias($alias)

+{

+  if (! is_array($alias))

+    system_failure('$alias kein array!');

+  $id = (int) $alias['id'];

+  $hostname = maybe_null($alias['hostname']);

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

+  if ($domain == 0)

+    system_failure('$domain == 0');

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

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

+  if ($id == 0) {

+    logger('modules/vhosts/include/vhosts.php', 'aliases', 'Creating alias '.$alias['hostname'].'.'.$alias['domain'].' for VHost '.$vhost['id']);

+    db_query("INSERT INTO vhosts.alias (hostname, domain, vhost, options) VALUES ({$hostname}, {$domain}, {$vhost['id']}, '{$options}')");

+  }

+  else {

+    logger('modules/vhosts/include/vhosts.php', 'aliases', 'Updating alias #'.$id.' ('.$alias['hostname'].'.'.$alias['domain'].')');

+    db_query("UPDATE vhosts.alias SET hostname={$hostname}, domain={$domain}, options='{$options}' WHERE id={$id} LIMIT 1");

+  }

+}

+

 ?>

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

     header('Location: vhosts.php');

 }

+elseif ($_GET['action'] == 'addalias')

+{

+  check_form_token('vhosts_add_alias');

+  $id = (int) $_GET['vhost'];

+  $vhost = get_vhost_details( $id );

+  DEBUG($vhost);

+

+  $alias = empty_alias();

+  $alias['vhost'] = $vhost['id'];

+

+  

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

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

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

+    system_failure('Ungültige Domain');

+

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

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

+  $aliaswww = in_array('aliaswww', $_POST['options']);

+  $forward = in_array('forward', $_POST['options']);

+

+  $new_options = array();

+  if ($aliaswww)

+    array_push($new_options, 'aliaswww');

+  if ($forward)

+    array_push($new_options, 'forward');

+  DEBUG($new_options);

+  $options = implode(',', $new_options);

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

+

+  $alias['hostname'] = $hostname;

+  $alias['domainid'] = $domain->id;

+    

+  $alias ['options'] = $options;

+    

+  save_alias($alias);

+

+  if (! $debugmode)

+    header('Location: aliases.php?vhost='.$vhost['id']);

+

+}

+elseif ($_GET['action'] == 'deletealias')

+{

+  $title = "Subdomain löschen";

+  $section = 'vhosts_vhosts';

+  

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

+  DEBUG($alias);

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

+  

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

+  DEBUG($vhost);

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

+  

+  $sure = user_is_sure();

+  if ($sure === NULL)

+  {

+    are_you_sure("action=deletealias&alias={$_GET['alias']}", "Möchten Sie das Alias »{$alias_string}« für die Subdomain »{$vhost_string}« wirklich löschen?");

+  }

+  elseif ($sure === true)

+  {

+    delete_alias($alias['id']);

+    if (! $debugmode)

+      header('Location: aliases.php?vhost='.$vhost['id']);

+  }

+  elseif ($sure === false)

+  {

+    if (! $debugmode)

+      header('Location: aliases.php?vhost='.$vhost['id']);

+  }

+}

 elseif ($_GET['action'] == 'delete')

 {

+  $title = "Subdomain löschen";

+  $section = 'vhosts_vhosts';

+  

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

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

@@ -118,8 +192,6 @@ elseif ($_GET['action'] == 'delete')

     if (! $debugmode)

       header("Location: vhosts.php");

   }

-

-  /* TODO */

 }

 else

   system_failure("Unimplemented action");

@@ -4,34 +4,31 @@ require_once('inc/security.php');

 require_once('vhosts.php');

-$title = "Webserver VHosts";

+$title = "Subdomains";

 $error = '';

 require_role(ROLE_SYSTEMUSER);

-output("<h3>Webserver (VHosts)</h3>

-<p>Mit dieser Funtkion legen Sie fest, welche Domains und Subdomains verfügbar sein sollen und welches Verzeichnis die Dateien enthalten soll.</p>");

+output("<h3>Subdomains</h3>

+<p>Mit dieser Funtkion legen Sie fest, welche Domains und Subdomains als Webserver-Ressource verfügbar sein sollen und welches Verzeichnis die Dateien enthalten soll.</p>");

 $vhosts = list_vhosts();

 if (count($vhosts) > 0)

 {

-  output("<table><tr><th>(Sub-)Domain</th><th>Zusätzliche Alias-Namen</th><th>Lokaler Pfad</th><th>PHP</th></tr>");

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

   foreach ($vhosts as $vhost)

   {

     $fqdn = $vhost['fqdn'];

     output("<tr><td>".internal_link('edit.php', $fqdn, "vhost={$vhost['id']}")."</td><td>");

-    $aliases = get_aliases($vhost['id']);

-    if (strstr($vhost['options'], 'aliaswww'))

-      output('www.'.$vhost['fqdn'].'<br />');

+    $aliases = get_all_aliases($vhost['id']);

     foreach ($aliases as $alias)

     {

-      if (strstr($alias['options'], 'aliaswww'))

-        output('www.'.$alias['fqdn'].'<br />');

       output($alias['fqdn'].'<br />');

     }

+    output(internal_link('aliases.php', 'Aliase verwalten', 'vhost='.$vhost['id']));

     output('</td>');

     if ($vhost['docroot_is_default'] == 1)

       output("<td><span style=\"color:#777;\">{$vhost['docroot']}</span></td>");

@@ -56,6 +53,7 @@ if (count($vhosts) > 0)

   }

   output('</table>

 <p><a href="edit.php">Neue Subdomain anlegen</a></p>

+<p><sup>*</sup>)&nbsp;schwach geschriebene Pfadangaben bezeichnen die Standardeinstellung. Ist ein Pfad fett dargestellt, so haben Sie einen davon abweichenden Wert eingegeben.</p>

   <br />');

 }