webinterface.git

@@ -214,6 +214,7 @@ $form .= "

 $ipaddrs = user_ipaddrs();

 $certs = user_certs();

+$available_users = available_suexec_users();

 $form .= "

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

@@ -245,6 +246,19 @@ $form .= "

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

       </div>";

   } 

+  if (count($available_users))

+  {

+    $userselect = array(0 => 'Eigener Benutzeraccount');

+    foreach ($available_users AS $u)

+    {

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

+    }

+    $form .= "

+      <h5>SuExec-Benutzeraccount</h5>

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

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

+      </div>";

+  }

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

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

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

@@ -32,6 +32,7 @@ function empty_vhost()

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

   $vhost['cgi'] = 1;

   $vhost['ssl'] = NULL;

+  $vhost['suexec_user'] = NULL;

   $vhost['logtype'] = NULL;

   $vhost['errorlog'] = 0;

   $vhost['is_dav'] = 0;

@@ -212,6 +213,13 @@ function save_vhost($vhost)

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

   $cgi = ($vhost['cgi'] == 1 ? 1 : 0);

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

+  $suexec_user = 'NULL';

+

+  $available_suexec = available_suexec_users();

+  foreach ($available_suexec AS $u)

+    if ($u['uid'] == $vhost['suexec_user'])

+      $suexec_user = $u['uid'];

+

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

   $errorlog = (int) $vhost['errorlog'];

   if ($vhost['is_svn']) {

@@ -241,11 +249,11 @@ function save_vhost($vhost)

   if ($id != 0) {

     logger(LOG_INFO, 'modules/vhosts/include/vhosts', 'vhosts', 'Updating vhost #'.$id.' ('.$vhost['hostname'].'.'.$vhost['domain'].')');

-    db_query("UPDATE vhosts.vhost SET hostname={$hostname}, domain={$domain}, docroot={$docroot}, php={$php}, cgi={$cgi}, `ssl`={$ssl}, logtype={$logtype}, errorlog={$errorlog}, certid={$cert}, ipv4={$ipv4}, autoipv6={$autoipv6}, options='{$options}', stats={$stats} WHERE id={$id} LIMIT 1");

+    db_query("UPDATE vhosts.vhost SET hostname={$hostname}, domain={$domain}, docroot={$docroot}, php={$php}, cgi={$cgi}, `ssl`={$ssl}, `suexec_user`={$suexec_user}, logtype={$logtype}, errorlog={$errorlog}, certid={$cert}, ipv4={$ipv4}, autoipv6={$autoipv6}, options='{$options}', stats={$stats} WHERE id={$id} LIMIT 1");

   }

   else {

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

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

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

     $id = mysql_insert_id();

   }

   $oldvhost = get_vhost_details($id);

@@ -319,6 +327,18 @@ function save_alias($alias)

 }

+function available_suexec_users()

+{

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

+  $result = db_query("SELECT uid, username FROM vhosts.available_users LEFT JOIN vhosts.v_useraccounts ON (uid = suexec_user) WHERE mainuser={$uid}");

+  $ret = array();

+  while ($i = mysql_fetch_assoc($result))

+    $ret[] = $i;

+  DEBUG('available suexec-users:');

+  DEBUG($ret);

+  return $ret;

+

+}

 function user_ipaddrs()

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

     $cgi = 1;

   }

+  if (isset($_POST['suexec_user']))

+    $vhost['suexec_user'] = $_POST['suexec_user'];

+

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

     $vhost['is_dav'] = 0;

     $vhost['is_svn'] = 0;