webinterface.git

@@ -6,25 +6,96 @@ require_once('inc/security.php');

 require_once('vhosts.php');

 $title = "VHost bearbeiten";

+$section = 'vhosts_vhosts';

 require_role(ROLE_SYSTEMUSER);

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

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

+$vhost = empty_vhost();

+

+if ($id != 0)

+  $vhost = get_vhost_details($id);

 DEBUG($vhost);

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

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

+  

+  function selectedDomain() {

+    var selected;

+    selected=document.getElementById('domain').options.selectedIndex;

+    return document.getElementById('domain').options.item(selected).text;

+    }

+  

+  function defaultDocumentRoot() {

+    var hostname;

+    if (document.getElementById('hostname').value == '') 

+      hostname = selectedDomain();

+    else

+      hostname = document.getElementById('hostname').value + '.' + selectedDomain();

+    document.getElementById('defaultdocroot').firstChild.nodeValue = 'websites/' + hostname + '/htdocs';

+    useDefaultDocroot();

+  }

+  

+  function useDefaultDocroot() {

+    var do_it = (document.getElementById('use_default_docroot').checked == true);

+    var inputfield = document.getElementById('docroot');

+    inputfield.disabled = do_it;

+    if (do_it) {

+      document.getElementById('docroot').value = document.getElementById('defaultdocroot').firstChild.nodeValue;

+    }

+  }

+  </script>");

+

+$defaultdocroot = $vhost['domain'];

+if ($vhost['hostname'])

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

+

+$defaultdocroot = 'websites/'.$defaultdocroot.'/htdocs';

+

+$is_default_docroot = ($vhost['docroot'] == NULL) || ($vhost['homedir'].'/'.$defaultdocroot == $vhost['docroot']);

+

+$docroot = '';

+if ($vhost['docroot'] == '')

+  $docroot = $defaultdocroot;

+else

+  $docroot = substr($vhost['docroot'], strlen($vhost['homedir'])+1);

+

 $s = (strstr($vhost['options'], 'aliaswww') ? ' checked="checked" ' : '');

 $form = "

   <table>

     <tr><th>Einstellung</th><th>aktueller Wert</th><th>System-Standard</th></tr>

     <tr><td>Name</td>

-    <td><div id=\"wwwprefix\" style=\"font-weight: bold; display: inline; color: #000;\">www.</div><input type=\"text\" name=\"hostname\" size=\"10\" value=\"{$vhost['hostname']}\" />

-".domainselect($vhost['domain_id']);

-$form .= "<br /><input type=\"checkbox\" name=\"options[]\" value=\"aliaswww\" onclick=\"document.getElementById('wwwprefix').firstChild='';\" {$s}/> Ohne <strong>www</strong> davor.</td><td><em>keiner</em></td></tr>";

+    <td><input type=\"text\" name=\"hostname\" id=\"hostname\" size=\"10\" value=\"{$vhost['hostname']}\" onchange=\"defaultDocumentRoot()\" /><strong>.</strong>".domainselect($vhost['domain_id'], 'onchange="defaultDocumentRoot()"');

+$form .= "<br /><input type=\"checkbox\" name=\"options[]\" id=\"aliaswww\" value=\"aliaswww\" {$s}/> <label for=\"aliaswww\">Auch mit <strong>www</strong> davor.</label></td><td><em>keiner</em></td></tr>

+    <tr><td>Lokaler Pfad</td>

+    <td><input type=\"checkbox\" id=\"use_default_docroot\" name=\"use_default_docroot\" value=\"1\" onclick=\"useDefaultDocroot()\" ".($is_default_docroot ? 'checked="checked" ' : '')."/>&nbsp;<label for=\"use_default_docroot\">Standardeinstellung benutzen</label><br />

+    <strong>".$vhost['homedir']."/</strong>&nbsp;<input type=\"text\" id=\"docroot\" name=\"docroot\" size=\"30\" value=\"".$docroot."\" ".($is_default_docroot ? 'disabled="disabled" ' : '')."/>

+    </td>

+    <td id=\"defaultdocroot\">{$defaultdocroot}</td></tr>

+    <tr><td>PHP</td>

+    <td><select name=\"php\" id=\"php\">

+      <option value=\"none\" ".($vhost['php'] == NULL ? 'selected="selected"' : '')." >kein PHP</option>

+      <option value=\"mod_php\" ".($vhost['php'] == 'mod_php' ? 'selected="selected"' : '')." >als Apache-Modul</option>

+      <option value=\"fastcgi\" ".($vhost['php'] == 'fastcgi' ? 'selected="selected"' : '')." >FastCGI</option>

+    </select>

+    </td>

+    <td id=\"defaultphp\">als Apache-Modul</td></tr>

+    <tr>

+      <td>Logfiles</td>

+      <td><select name=\"logtype\" id=\"logtype\">

+      <option value=\"none\" ".($vhost['logtype'] == NULL ? 'selected="selected"' : '')." >keine Logfiles</option>

+      <option value=\"anonymous\" ".($vhost['logtype'] == 'anonymous' ? 'selected="selected"' : '')." >anonymisiert</option>

+      <option value=\"default\" ".($vhost['logtype'] == 'default' ? 'selected="selected"' : '')." >vollständige Logfile</option>

+    </select>

+    </td>

+    <td id=\"defaultlogtype\">keine Logfiles</td></tr>

+    ";

-$form .= '</table>';

-output(html_form('vhosts_edit_vhost', 'save.php', '', $form));

+$form .= '</table>

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

+';

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

 ?>

@@ -9,7 +9,7 @@ require_once('class/domain.php');

 function list_vhosts()

 {

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

-  $result = db_query("SELECT id,fqdn,docroot,docroot_is_default,php,options FROM vhosts.v_vhost WHERE uid={$uid}");

+  $result = db_query("SELECT id,fqdn,docroot,docroot_is_default,php,options FROM vhosts.v_vhost WHERE uid={$uid} ORDER BY domain,hostname");

   $ret = array();

   while ($item = mysql_fetch_assoc($result))

     array_push($ret, $item);

@@ -17,7 +17,28 @@ function list_vhosts()

 }

-function domainselect($selected = NULL)

+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['homedir'] = $_SESSION['userinfo']['homedir'];

+  $vhost['docroot'] = NULL;

+  $vhost['php'] = 'mod_php';

+  $vhost['logtype'] = NULL;

+    

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

+  return $vhost;

+}

+

+

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

 {

   global $domainlist;

   if ($domainlist == NULL)

@@ -25,7 +46,7 @@ function domainselect($selected = NULL)

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

   $selected = (int) $selected;

-  $ret = '<select name="domain" size="1">';

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

   foreach ($domainlist as $dom)

   {

     $s = '';

@@ -62,6 +83,37 @@ function get_aliases($vhost)

   return $ret;

 }

+function delete_vhost($id)

+{

+  $id = (int) $id;

+  if ($id == 0)

+    system_failure("id == 0");

+  $vhost = get_vhost_details($id);

+  db_query("DELETE FROM vhosts.vhost WHERE id={$vhost['id']} LIMIT 1");

+}

+

+function save_vhost($vhost)

+{

+  if (! is_array($vhost))

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

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

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

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

+  if ($domain == 0)

+    system_failure("Domain == 0");

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

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

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

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

+

+  if ($id != 0)

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

+  else

+    db_query("INSERT INTO vhosts.vhost (user, hostname, domain, docroot, php, logtype, options) VALUES ({$_SESSION['userinfo']['uid']}, {$hostname}, {$domain}, {$docroot}, {$php}, {$logtype}, '{$options}')");

+  

+}

+

+

 ?>

@@ -6,7 +6,7 @@ $role = $_SESSION['role'];

 if ($role & ROLE_SYSTEMUSER)

 {

-    $menu["vhosts_vhosts"] = array("label" => "Webserver (VHosts)", "file" => "vhosts.php", "weight" => 1);

+    $menu["vhosts_vhosts"] = array("label" => "Subdomains", "file" => "vhosts.php", "weight" => 1);

 }

 if (empty($menu))

@@ -0,0 +1,130 @@

+<?php

+

+require_once('session/start.php');

+

+require_once('vhosts.php');

+

+require_once('inc/security.php');

+require_once('class/domain.php');

+

+require_role(ROLE_SYSTEMUSER);

+

+require_once("inc/debug.php");

+global $debugmode;

+

+

+if ($_GET['action'] == 'edit')

+{

+  check_form_token('vhosts_edit_vhost');

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

+  $vhost = empty_vhost();

+  if ($id != 0)

+    $vhost = get_vhost_details( $id );

+  DEBUG($vhost);

+

+  $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']);

+

+  $defaultdocroot = $vhost['homedir'].'/websites/'.((strlen($hostname) > 0) ? $hostname.'.' : '').($domain->fqdn).'/htdocs';

+

+  if (! check_path( $_POST['docroot'] ))

+    system_failure("Eingegebener Pfad enthält ungültige Angaben");

+  $docroot = $vhost['homedir'].'/'.$_POST['docroot'];

+

+  if (($_POST['use_default_docroot'] == '1') || ($docroot == $defaultdocroot)) {

+    $docroot = '';

+  }

+

+  DEBUG("Document-Root: ".$docroot);

+

+  $php = '';

+  switch ($_POST['php']) {

+    case 'mod_php':

+      $php = 'mod_php';

+      break;

+    case 'fastcgi':

+      $php = 'fastcgi';

+      break;

+    /* Wenn etwas anderes kommt, ist das "kein PHP". So einfach ist das. */

+  }

+

+  $logtype = '';

+  switch ($_POST['logtype']) {

+    case 'anonymous':

+      $logtype = 'anonymous';

+      break;

+    case 'default':

+      $logtype = 'default';

+      break;

+    /* Wenn etwas anderes kommt, ist das "kein Logging". So einfach ist das. */

+  }

+

+  DEBUG("PHP: {$php} / Logging: {$logtype}");

+

+  $old_options = explode(',', $vhost['options']);

+  $new_options = array();

+  foreach ($old_options AS $op)

+  {

+    if ($op != 'aliaswww')

+      array_push($new_options, $op);

+  }

+  if ($aliaswww)

+    array_push($new_options, 'aliaswww');

+

+  DEBUG($old_options);

+  DEBUG($new_options);

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

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

+

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

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

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

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

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

+    

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

+    

+  save_vhost($vhost);

+

+  if (! $debugmode)

+    header('Location: vhosts.php');

+

+}

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

+{

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

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

+  

+  $sure = user_is_sure();

+  if ($sure === NULL)

+  {

+    are_you_sure("action=delete&vhost={$_GET['vhost']}", "Möchten Sie die Subdomain »{$vhost_string}« wirklich löschen?");

+  }

+  elseif ($sure === true)

+  {

+    delete_vhost($vhost['id']);

+    if (! $debugmode)

+      header("Location: vhosts.php");

+  }

+  elseif ($sure === false)

+  {

+    if (! $debugmode)

+      header("Location: vhosts.php");

+  }

+

+  /* TODO */

+}

+else

+  system_failure("Unimplemented action");

+

+output('');

+

+

+?>

@@ -22,12 +22,10 @@ if (count($vhosts) > 0)

   foreach ($vhosts as $vhost)

   {

     $fqdn = $vhost['fqdn'];

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

-      $fqdn = 'www.'.$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($vhost['fqdn'].'<br />');

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

     foreach ($aliases as $alias)

     {

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

@@ -36,7 +34,7 @@ if (count($vhosts) > 0)

     }

     output('</td>');

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

-      output("<td>{$vhost['docroot']}</td>");

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

     else

       output("<td><strong>{$vhost['docroot']}</strong></td>");

     $php = $vhost['php'];

@@ -52,9 +50,13 @@ if (count($vhosts) > 0)

         $php = 'FastCGI';

         break;

     }

-    output("<td>{$php}</td></tr>");

+    output("<td>{$php}</td>

+    <td>".internal_link('save.php', 'Subdomain löschen', 'action=delete&vhost='.$vhost['id'] )."</td>

+    </tr>");

   }

-  output('</table><br />');

+  output('</table>

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

+  <br />');

 }