webinterface.git

@@ -99,6 +99,18 @@ input[type=text]:focus,input[type=password]:focus,textarea:focus {

         }

+div.vhostsidebyside {

+  max-width: 55em;

+}

+

+div.vhostoptions {

+  margin: 0;

+  padding: 0;

+  margin-left: 1em;

+  float: right;

+  width: 30em;

+  /*margin-left: 2em; position: absolute; left: 45em; */

+}

@@ -26,6 +26,7 @@ else {

 }

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

+  var default_docroot;

   function selectedDomain() {

     var selected;

@@ -39,7 +40,7 @@ output("<script type=\"text/javascript\">

       hostname = selectedDomain();

     else

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

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

+    default_docroot = 'websites/' + hostname + '/htdocs';

     useDefaultDocroot();

   }

@@ -48,7 +49,7 @@ output("<script type=\"text/javascript\">

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

     inputfield.disabled = do_it;

     if (do_it) {

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

+      document.getElementById('docroot').value = default_docroot;

     }

   }

@@ -101,7 +102,8 @@ $form = "

     <div style=\"margin-left: 2em;\"><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></div>

-<div id=\"options_regular\" style=\"margin-left: 2em; position: absolute; left: 45em; ".($vhost_type=='regular' ? '' : 'display: none;')."\">

+<div class=\"vhostsidebyside\">

+<div class=\"vhostoptions\" id=\"options_regular\" ".($vhost_type=='regular' ? '' : 'style="display: none;"').">

   <h4>Optionen</h4>

   <h5>Speicherort für Dateien (»Document Root«)</h5>

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

@@ -114,15 +116,17 @@ $form .= "<br /><input type=\"checkbox\" name=\"options[]\" id=\"aliaswww\" valu

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

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

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

-      <option value=\"rubyonrails\" ".($vhost['php'] == 'rubyonrails' ? 'selected="selected"' : '')." >Ruby-on-Rails</option>

+      <!--  <option value=\"rubyonrails\" ".($vhost['php'] == 'rubyonrails' ? 'selected="selected"' : '')." >Ruby-on-Rails</option> -->

     </select>

   </div>

 </div>

-<div id=\"options_webapp\" style=\"margin-left: 2em; position: absolute; left: 45em; ".($vhost_type=='webapp' ? '' : 'display: none;')."\">

+<div class=\"vhostoptions\" id=\"options_webapp\" ".($vhost_type=='webapp' ? '' : 'style="display: none;"').">

   <h4>Optionen</h4>

   <h5>Anwendung</h5>

-  <select name=\"webapp\" id=\"webapp\" size=\"1\"><option value=\"drupal-5\">Drupal 5.x</option></select>

+  <select name=\"webapp\" id=\"webapp\" size=\"1\">

+    <option value=\"1\">Drupal 5.x</option>

+  </select>

 </div>

 <h4>Verwendung</h4>

@@ -130,8 +134,12 @@ $form .= "<br /><input type=\"checkbox\" name=\"options[]\" id=\"aliaswww\" valu

 	  <input class=\"usageoption\" onclick=\"showAppropriateLines()\" type=\"radio\" name=\"vhost_type\" id=\"vhost_type_regular\" value=\"regular\" ".(($vhost_type=='regular') ? 'checked="checked" ' : '')."/><label for=\"vhost_type_regular\">&#160;Normal (selbst Dateien hinterlegen)</label><br />

 	  <input class=\"usageoption\" onclick=\"showAppropriateLines()\" type=\"radio\" name=\"vhost_type\" id=\"vhost_type_dav\" value=\"dav\" ".(($vhost_type=='dav') ? 'checked="checked" ' : '')."/><label for=\"vhost_type_dav\">&#160;WebDAV</label><br />

 	  <input class=\"usageoption\" onclick=\"showAppropriateLines()\" type=\"radio\" name=\"vhost_type\" id=\"vhost_type_svn\" value=\"svn\" ".(($vhost_type=='svn') ? 'checked="checked" ' : '')."/><label for=\"vhost_type_svn\">&#160;Subversion-Server</label><br />

+	  <div style=\"display: none\">

 	    <input class=\"usageoption\" onclick=\"showAppropriateLines()\" type=\"radio\" name=\"vhost_type\" id=\"vhost_type_webapp\" value=\"webapp\" ".(($vhost_type=='webapp') ? 'checked="checked" ' : '')."/><label for=\"vhost_type_webapp\">&#160;Eine vorgefertigte Applikation nutzen</label>

 	  </div>

+	</div>

+<br />

+</div>

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

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

@@ -30,6 +30,9 @@ function empty_vhost()

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

   $vhost['ssl'] = NULL;

   $vhost['logtype'] = NULL;

+  $vhost['is_dav'] = 0;

+  $vhost['is_svn'] = 0;

+  $vhost['is_webapp'] = 0;

   $vhost['options'] = '';

   return $vhost;

@@ -123,6 +126,49 @@ function delete_vhost($id)

 }

+

+function make_svn_vhost($id) 

+{

+  $id = (int) $id;

+  if ($id == 0)

+    system_failure("id == 0");

+  logger('modules/vhosts/include/vhosts.php', 'vhosts', 'Converting vhost #'.$id.' to SVN');

+  db_query("REPLACE INTO vhosts.dav (vhost, type) VALUES ({$id}, 'svn')");

+}

+

+function make_dav_vhost($id) 

+{

+  $id = (int) $id;

+  if ($id == 0)

+    system_failure("id == 0");

+  logger('modules/vhosts/include/vhosts.php', 'vhosts', 'Converting vhost #'.$id.' to WebDAV');

+  db_query("REPLACE INTO vhosts.dav (vhost, type) VALUES ({$id}, 'dav')");

+}

+

+function no_dav_or_svn($id)

+{

+  $id = (int) $id;

+  if ($id == 0)

+    system_failure("id == 0");

+  logger('modules/vhosts/include/vhosts.php', 'vhosts', 'Converting vhost #'.$id.' to regular');

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

+}

+

+

+/*

+function make_webapp_vhost($id, $webapp) 

+{

+  $id = (int) $id;

+  $webapp = (int) $webapp;

+  if ($id == 0)

+    system_failure("id == 0");

+  logger('modules/vhosts/include/vhosts.php', 'vhosts', 'Setting up webapp # '.$webapp.' on vhost #'.$id);

+  db_query("INSERT INTO vhosts.webapps (vhost, webapp) VALUES ({$id}, {$webapp})");

+

+}

+*/

+

+

 function save_vhost($vhost)

 {

   if (! is_array($vhost))

@@ -147,8 +193,15 @@ function save_vhost($vhost)

   }

   else {

     logger('modules/vhosts/include/vhosts.php', 'vhosts', 'Creating vhost '.$vhost['hostname'].'.'.$vhost['domain'].'');

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

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

+    $id = mysql_insert_id();

   }

+  if ($vhost['is_dav'] == 1)

+      make_dav_vhost($id);

+  elseif ($vhost['is_svn'] == 1)

+      make_svn_vhost($id);

+  else

+      no_dav_or_svn($id);

 }

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

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

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

+  $docroot = '';

+  $php = '';

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

+  {

+    $vhost['is_dav'] = 0;

+    $vhost['is_svn'] = 0;

+    $vhost['is_webapp'] = 0;

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

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

@@ -48,7 +55,6 @@ if ($_GET['action'] == 'edit')

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

-  $php = '';

     switch ($_POST['php']) {

       case 'mod_php':

         $php = 'mod_php';

@@ -58,6 +64,23 @@ if ($_GET['action'] == 'edit')

         break;

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

     }

+  }

+  elseif ($_POST['vhost_type'] == 'dav') {

+    $vhost['is_dav'] = 1;

+    $vhost['is_svn'] = 0;

+    $vhost['is_webapp'] = 0;

+  }

+  elseif ($_POST['vhost_type'] == 'svn') {

+    $vhost['is_dav'] = 0;

+    $vhost['is_svn'] = 1;

+    $vhost['is_webapp'] = 0;

+  }

+  elseif ($_POST['vhost_type'] == 'webapp') {

+    $vhost['is_dav'] = 0;

+    $vhost['is_svn'] = 0;

+    $vhost['is_webapp'] = 1;

+  }

+

   $ssl = '';

   switch ($_POST['ssl']) {

@@ -114,6 +137,7 @@ if ($_GET['action'] == 'edit')

   $vhost['errorlog'] = $errorlog; 

   $vhost['options'] = $options;

+  DEBUG($vhost);

   save_vhost($vhost);

   if (! $debugmode)