@@ -365,7 +365,7 @@ function make_webapp_vhost($id, $webapp)

 }

-function check_hostname_collision($hostname, $domain, $id=NULL)

+function check_hostname_collision($hostname, $domain, $id=null)

 {

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

     # Neuer vhost => Prüfe Duplikat

@@ -365,7 +365,7 @@ function make_webapp_vhost($id, $webapp)

 }

-function check_hostname_collision($hostname, $domain)

+function check_hostname_collision($hostname, $domain, $id=NULL)

 {

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

     # Neuer vhost => Prüfe Duplikat

@@ -387,7 +387,12 @@ function check_hostname_collision($hostname, $domain)

         $hostnamecheck = "hostname IS NULL";

         unset($args[":hostname"]);

     }

-    $result = db_query("SELECT id FROM vhosts.vhost WHERE {$hostnamecheck} AND {$domaincheck} AND user=:uid", $args);

+    $idcheck = '';

+    if ($id) {

+        $idcheck = ' AND id != :id';

+        $args[':id'] = (int) $id;

+    }

+    $result = db_query("SELECT id FROM vhosts.vhost WHERE {$hostnamecheck} AND {$domaincheck} AND user=:uid ".$idcheck, $args);

     if ($result->rowCount() > 0) {

         system_failure('Eine Konfiguration mit diesem Namen gibt es bereits.');

     }

@@ -395,6 +400,7 @@ function check_hostname_collision($hostname, $domain)

         return ;

     }

     unset($args[":uid"]);

+    unset($args[":id"]);

     $result = db_query("SELECT id, vhost FROM vhosts.v_alias WHERE {$hostnamecheck} AND {$domaincheck}", $args);

     if ($result->rowCount() > 0) {

         $data = $result->fetch();

@@ -419,6 +425,8 @@ function save_vhost($vhost)

     }

     if ($id == 0) {

         check_hostname_collision($vhost['hostname'], $vhost['domain_id']);

+    } else {

+        check_hostname_collision($vhost['hostname'], $vhost['domain_id'], $id);

     }

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

     if ($hsts < 0) {

@@ -32,10 +32,10 @@ function valid_php_versions()

             +: Beta-Version

     */

     $tags = explode(',', config('php_versions'));

-    $ret = array();

+    $ret = [];

     foreach ($tags as $t) {

         $key = $t;

-        $ver = array('major' => null, 'minor' => null, 'status' => 'regular', 'default' => false);

+        $ver = ['major' => null, 'minor' => null, 'status' => 'regular', 'default' => false];

         if (substr($t, -1, 1) == '+') {

             $ver['status'] = 'beta';

             $key = substr($t, 0, -1);

@@ -61,7 +61,7 @@ function valid_php_versions()

     foreach ($list as $vhost) {

         if ($vhost['php'] && $vhost['php'] != 'default' && !array_key_exists($vhost['php'], $ret)) {

             $key = $vhost['php'];

-            $ret = array($key => array('major' => null, 'minor' => null, 'status' => 'used', 'default' => false)) + $ret;

+            $ret = [$key => ['major' => null, 'minor' => null, 'status' => 'used', 'default' => false]] + $ret;

             /* Wir nehmen an, dass unsere Tags immer an zweitletzter Stelle die Major-Version und

             an letzter Stelle die Minor-Version enthalten */

             $ret[$key]['major'] = substr($key, -2, 1);

@@ -75,20 +75,20 @@ function valid_php_versions()

 function traffic_month($vhost_id)

 {

     $vhost_id = (int) $vhost_id;

-    $result = db_query("SELECT sum(mb_in+mb_out) as mb FROM vhosts.traffic where date > CURDATE() - INTERVAL 1 MONTH AND vhost_id = ?", array($vhost_id));

+    $result = db_query("SELECT sum(mb_in+mb_out) as mb FROM vhosts.traffic where date > CURDATE() - INTERVAL 1 MONTH AND vhost_id = ?", [$vhost_id]);

     $data = $result->fetch();

     return $data['mb'];

 }

 function autoipv6_address($vhost_id, $mode = 1)

 {

-    $result = db_query("SELECT uid, v6_prefix FROM vhosts.v_vhost LEFT JOIN system.servers ON (servers.hostname = server) WHERE v_vhost.id=?", array($vhost_id));

+    $result = db_query("SELECT uid, v6_prefix FROM vhosts.v_vhost LEFT JOIN system.servers ON (servers.hostname = server) WHERE v_vhost.id=?", [$vhost_id]);

     $data = $result->fetch();

     if (!$data['v6_prefix']) {

         warning("IPv6-Adresse nicht verfügbar, Server unterstützt kein IPv6");

         return "";

     }

-    list($prefix, $null) = explode('/', $data['v6_prefix']);

+    [$prefix, $null] = explode('/', $data['v6_prefix']);

     $vh = ':1';

     if ($mode == 2) {

         $vh = implode(':', str_split(sprintf("%08x", $vhost_id), 4));

@@ -102,13 +102,13 @@ function list_vhosts($filter=null)

 {

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

     $query = "SELECT vh.id,fqdn,domain,docroot,docroot_is_default,php,cgi,vh.certid AS cert, vh.ssl, vh.options,logtype,errorlog,IF(dav.id IS NULL OR dav.type='svn', 0, 1) AS is_dav,IF(dav.id IS NULL OR dav.type='dav', 0, 1) AS is_svn, IF(webapps.id IS NULL, 0, 1) AS is_webapp FROM vhosts.v_vhost AS vh LEFT JOIN vhosts.dav ON (dav.vhost=vh.id) LEFT JOIN vhosts.webapps ON (webapps.vhost = vh.id) WHERE uid=:uid ORDER BY domain,hostname";

-    $params = array(":uid" => $uid);

+    $params = [":uid" => $uid];

     if ($filter) {

         $query = "SELECT vh.id,fqdn,domain,docroot,docroot_is_default,php,cgi,vh.certid AS cert, vh.ssl, vh.options,logtype,errorlog,IF(dav.id IS NULL OR dav.type='svn', 0, 1) AS is_dav,IF(dav.id IS NULL OR dav.type='dav', 0, 1) AS is_svn, IF(webapps.id IS NULL, 0, 1) AS is_webapp FROM vhosts.v_vhost AS vh LEFT JOIN vhosts.dav ON (dav.vhost=vh.id) LEFT JOIN vhosts.webapps ON (webapps.vhost = vh.id) WHERE (vh.fqdn LIKE :filter OR vh.id IN (SELECT vhost FROM vhosts.v_alias WHERE fqdn LIKE :filter)) AND uid=:uid ORDER BY hostname";

         $params[":filter"] = "%$filter%";

     }

     $result = db_query($query, $params);

-    $ret = array();

+    $ret = [];

     while ($item = $result->fetch()) {

         array_push($ret, $item);

     }

@@ -117,7 +117,7 @@ function list_vhosts($filter=null)

 function ipv6_possible($server)

 {

-    $args = array(":server" => $server);

+    $args = [":server" => $server];

     $result = db_query("SELECT v6_prefix FROM system.servers WHERE id=:server OR hostname=:server", $args);

     $line = $result->fetch();

     DEBUG("Server {$server} is v6-capable: ". ($line['v6_prefix'] != null));

@@ -175,7 +175,7 @@ function userdomain()

     if (config('user_vhosts_domain') === null) {

         return null;

     }

-    $result = db_query("SELECT id,name FROM vhosts.v_domains WHERE name=:dom", array(":dom" => config('user_vhosts_domain')));

+    $result = db_query("SELECT id,name FROM vhosts.v_domains WHERE name=:dom", [":dom" => config('user_vhosts_domain')]);

     $res = $result->fetch();

     return $res;

 }

@@ -226,7 +226,7 @@ function get_vhost_details($id)

     DEBUG("Lese #{$id}...");

     $id = (int) $id;

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

-    $result = db_query("SELECT vh.*,IF(dav.id IS NULL OR dav.type='svn', 0, 1) AS is_dav,IF(dav.id IS NULL OR dav.type='dav', 0, 1) AS is_svn, IF(webapps.id IS NULL, 0, 1) AS is_webapp FROM vhosts.v_vhost AS vh LEFT JOIN vhosts.dav ON (dav.vhost=vh.id) LEFT JOIN vhosts.webapps ON (webapps.vhost = vh.id) WHERE uid=:uid AND vh.id=:id", array(":uid" => $uid, ":id" => $id));

+    $result = db_query("SELECT vh.*,IF(dav.id IS NULL OR dav.type='svn', 0, 1) AS is_dav,IF(dav.id IS NULL OR dav.type='dav', 0, 1) AS is_svn, IF(webapps.id IS NULL, 0, 1) AS is_webapp FROM vhosts.v_vhost AS vh LEFT JOIN vhosts.dav ON (dav.vhost=vh.id) LEFT JOIN vhosts.webapps ON (webapps.vhost = vh.id) WHERE uid=:uid AND vh.id=:id", [":uid" => $uid, ":id" => $id]);

     if ($result->rowCount() != 1) {

         system_failure('Interner Fehler beim Auslesen der Daten');

     }

@@ -261,8 +261,8 @@ function get_vhost_details($id)

 function get_aliases($vhost)

 {

-    $result = db_query("SELECT id,fqdn,options FROM vhosts.v_alias WHERE vhost=?", array($vhost));

-    $ret = array();

+    $result = db_query("SELECT id,fqdn,options FROM vhosts.v_alias WHERE vhost=?", [$vhost]);

+    $ret = [];

     while ($item = $result->fetch()) {

         array_push($ret, $item);

     }

@@ -275,14 +275,14 @@ function get_all_aliases($vhost)

 {

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

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

-    $ret = array();

+    $ret = [];

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

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

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

     }

     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' : null)));

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

         }

     }

     return $ret;

@@ -292,7 +292,7 @@ function get_all_aliases($vhost)

 function list_available_webapps()

 {

     $result = db_query("SELECT id,displayname FROM vhosts.global_webapps");

-    $ret = array();

+    $ret = [];

     while ($item = $result->fetch()) {

         array_push($ret, $item);

     }

@@ -308,7 +308,7 @@ function delete_vhost($id)

     }

     $vhost = get_vhost_details($id);

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

-    db_query("DELETE FROM vhosts.vhost WHERE id=?", array($vhost['id']));

+    db_query("DELETE FROM vhosts.vhost WHERE id=?", [$vhost['id']]);

 }

@@ -320,8 +320,8 @@ function make_svn_vhost($id)

         system_failure("id == 0");

     }

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

-    db_query("REPLACE INTO vhosts.dav (vhost, type) VALUES (?, 'svn')", array($id));

-    db_query("DELETE FROM vhosts.webapps WHERE vhost=?", array($id));

+    db_query("REPLACE INTO vhosts.dav (vhost, type) VALUES (?, 'svn')", [$id]);

+    db_query("DELETE FROM vhosts.webapps WHERE vhost=?", [$id]);

 }

 function make_dav_vhost($id)

@@ -331,8 +331,8 @@ function make_dav_vhost($id)

         system_failure("id == 0");

     }

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

-    db_query("REPLACE INTO vhosts.dav (vhost, type, options) VALUES (?, 'dav', 'nouserfile')", array($id));

-    db_query("DELETE FROM vhosts.webapps WHERE vhost=?", array($id));

+    db_query("REPLACE INTO vhosts.dav (vhost, type, options) VALUES (?, 'dav', 'nouserfile')", [$id]);

+    db_query("DELETE FROM vhosts.webapps WHERE vhost=?", [$id]);

 }

 function make_regular_vhost($id)

@@ -342,8 +342,8 @@ function make_regular_vhost($id)

         system_failure("id == 0");

     }

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

-    db_query("DELETE FROM vhosts.dav WHERE vhost=?", array($id));

-    db_query("DELETE FROM vhosts.webapps WHERE vhost=?", array($id));

+    db_query("DELETE FROM vhosts.dav WHERE vhost=?", [$id]);

+    db_query("DELETE FROM vhosts.webapps WHERE vhost=?", [$id]);

 }

@@ -354,13 +354,13 @@ function make_webapp_vhost($id, $webapp)

     if ($id == 0) {

         system_failure("id == 0");

     }

-    $result = db_query("SELECT displayname FROM vhosts.global_webapps WHERE id=?", array($webapp));

+    $result = db_query("SELECT displayname FROM vhosts.global_webapps WHERE id=?", [$webapp]);

     if ($result->rowCount() == 0) {

         system_failure("webapp-id invalid");

     }

     $webapp_name = $result->fetch(PDO::FETCH_OBJ)->displayname;

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

-    db_query("REPLACE INTO vhosts.webapps (vhost, webapp) VALUES (?, ?)", array($id, $webapp));

+    db_query("REPLACE INTO vhosts.webapps (vhost, webapp) VALUES (?, ?)", [$id, $webapp]);

     mail('webapps-setup@schokokeks.org', 'setup', 'setup');

 }

@@ -369,7 +369,7 @@ function check_hostname_collision($hostname, $domain)

 {

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

     # Neuer vhost => Prüfe Duplikat

-    $args = array(":hostname" => $hostname, ":domain" => $domain, ":uid" => $uid);

+    $args = [":hostname" => $hostname, ":domain" => $domain, ":uid" => $uid];

     $domaincheck = "domain=:domain";

     if ($domain == -1) {

         $userdomain = userdomain();

@@ -474,7 +474,7 @@ function save_vhost($vhost)

         $vhost['ssl'] = null;

     }

-    $args = array(":hostname" => ($hostname ? $hostname : null),

+    $args = [":hostname" => ($hostname ? $hostname : null),

                 ":domain" => $domain,

                 ":docroot" => ($vhost['docroot'] ? $vhost['docroot'] : null),

                 ":php" => $vhost['php'],

@@ -489,7 +489,7 @@ function save_vhost($vhost)

                 ":ipv4" => $ipv4,

                 ":autoipv6" => $autoipv6,

                 ":options" => $vhost['options'],

-                ":id" => $id);

+                ":id" => $id, ];

     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, hsts=:hsts, `suexec_user`=:suexec_user, `server`=:server, logtype=:logtype, errorlog=:errorlog, certid=:cert, ipv4=:ipv4, autoipv6=:autoipv6, options=:options WHERE id=:id", $args);

@@ -522,7 +522,7 @@ function get_alias_details($id)

 {

     $id = (int) $id;

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

-    $result = db_query("SELECT * FROM vhosts.v_alias WHERE id=?", array($id));

+    $result = db_query("SELECT * FROM vhosts.v_alias WHERE id=?", [$id]);

     if ($result->rowCount() != 1) {

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

@@ -547,7 +547,7 @@ function delete_alias($id)

     $alias = get_alias_details($id);

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

-    db_query("DELETE FROM vhosts.alias WHERE id=?", array($id));

+    db_query("DELETE FROM vhosts.alias WHERE id=?", [$id]);

 }

 function save_alias($alias)

@@ -567,11 +567,11 @@ function save_alias($alias)

     if (! $alias['hostname']) {

         $alias['hostname'] = null;

     }

-    $args = array(":hostname" => $alias['hostname'],

+    $args = [":hostname" => $alias['hostname'],

                 ":domain" => $domain,

                 ":vhost" => $vhost['id'],

                 ":options" => $alias['options'],

-                ":id" => $id);

+                ":id" => $id, ];

     if ($id == 0) {

         unset($args[":id"]);

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

@@ -587,8 +587,8 @@ 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=?", array($uid));

-    $ret = array();

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

+    $ret = [];

     while ($i = $result->fetch()) {

         $ret[] = $i;

     }

@@ -601,8 +601,8 @@ function available_suexec_users()

 function user_ipaddrs()

 {

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

-    $result = db_query("SELECT ipaddr FROM vhosts.ipaddr_available WHERE uid=?", array($uid));

-    $ret = array();

+    $result = db_query("SELECT ipaddr FROM vhosts.ipaddr_available WHERE uid=?", [$uid]);

+    $ret = [];

     while ($i = $result->fetch()) {

         $ret[] = $i['ipaddr'];

     }

@@ -54,11 +54,12 @@ function valid_php_versions()

         $ret[$key] = $ver;

     }

     /* Bis hier: aus der Datenbank ausgelesen */

+    krsort($ret);

     DEBUG($ret);

     /* Sonderfall: Wenn ein User noch Vhosts einer anderen Version hat, dann bleibt diese erlaubt */

     $list = list_vhosts();

     foreach ($list as $vhost) {

-        if ($vhost['php'] && !array_key_exists($vhost['php'], $ret)) {

+        if ($vhost['php'] && $vhost['php'] != 'default' && !array_key_exists($vhost['php'], $ret)) {

             $key = $vhost['php'];

             $ret = array($key => array('major' => null, 'minor' => null, 'status' => 'used', 'default' => false)) + $ret;

             /* Wir nehmen an, dass unsere Tags immer an zweitletzter Stelle die Major-Version und

@@ -134,13 +135,7 @@ function empty_vhost()

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

     $vhost['docroot'] = null;

-    $vhost['php'] = null;

-    $phpversions = valid_php_versions();

-    foreach ($phpversions as $tag => $info) {

-        if ($info['default']) {

-            $vhost['php'] = $tag;

-        }

-    }

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

     $vhost['cgi'] = 1;

     $vhost['ssl'] = null;

     $vhost['hsts'] = -1;

@@ -189,10 +189,11 @@ function domainselect($selected = null, $selectattribute = '')

 {

     global $domainlist, $config;

     if ($domainlist == null) {

-        $domainlist = get_domain_list(

-            $_SESSION['customerinfo']['customerno'],

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

-    );

+        $uid = null;

+        if (isset($_SESSION['userinfo']['uid'])) {

+            $uid = $_SESSION['userinfo']['uid'];

+        }

+        $domainlist = get_domain_list(null, $uid);

     }

     $selected = (int) $selected;

@@ -100,10 +100,10 @@ function autoipv6_address($vhost_id, $mode = 1)

 function list_vhosts($filter=null)

 {

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

-    $query = "SELECT vh.id,fqdn,domain,docroot,docroot_is_default,php,cgi,vh.certid AS cert, vh.ssl, vh.options,logtype,errorlog,IF(dav.id IS NULL OR dav.type='svn', 0, 1) AS is_dav,IF(dav.id IS NULL OR dav.type='dav', 0, 1) AS is_svn, IF(webapps.id IS NULL, 0, 1) AS is_webapp, stats FROM vhosts.v_vhost AS vh LEFT JOIN vhosts.dav ON (dav.vhost=vh.id) LEFT JOIN vhosts.webapps ON (webapps.vhost = vh.id) WHERE uid=:uid ORDER BY domain,hostname";

+    $query = "SELECT vh.id,fqdn,domain,docroot,docroot_is_default,php,cgi,vh.certid AS cert, vh.ssl, vh.options,logtype,errorlog,IF(dav.id IS NULL OR dav.type='svn', 0, 1) AS is_dav,IF(dav.id IS NULL OR dav.type='dav', 0, 1) AS is_svn, IF(webapps.id IS NULL, 0, 1) AS is_webapp FROM vhosts.v_vhost AS vh LEFT JOIN vhosts.dav ON (dav.vhost=vh.id) LEFT JOIN vhosts.webapps ON (webapps.vhost = vh.id) WHERE uid=:uid ORDER BY domain,hostname";

     $params = array(":uid" => $uid);

     if ($filter) {

-        $query = "SELECT vh.id,fqdn,domain,docroot,docroot_is_default,php,cgi,vh.certid AS cert, vh.ssl, vh.options,logtype,errorlog,IF(dav.id IS NULL OR dav.type='svn', 0, 1) AS is_dav,IF(dav.id IS NULL OR dav.type='dav', 0, 1) AS is_svn, IF(webapps.id IS NULL, 0, 1) AS is_webapp, stats FROM vhosts.v_vhost AS vh LEFT JOIN vhosts.dav ON (dav.vhost=vh.id) LEFT JOIN vhosts.webapps ON (webapps.vhost = vh.id) WHERE (vh.fqdn LIKE :filter OR vh.id IN (SELECT vhost FROM vhosts.v_alias WHERE fqdn LIKE :filter)) AND uid=:uid ORDER BY hostname";

+        $query = "SELECT vh.id,fqdn,domain,docroot,docroot_is_default,php,cgi,vh.certid AS cert, vh.ssl, vh.options,logtype,errorlog,IF(dav.id IS NULL OR dav.type='svn', 0, 1) AS is_dav,IF(dav.id IS NULL OR dav.type='dav', 0, 1) AS is_svn, IF(webapps.id IS NULL, 0, 1) AS is_webapp FROM vhosts.v_vhost AS vh LEFT JOIN vhosts.dav ON (dav.vhost=vh.id) LEFT JOIN vhosts.webapps ON (webapps.vhost = vh.id) WHERE (vh.fqdn LIKE :filter OR vh.id IN (SELECT vhost FROM vhosts.v_alias WHERE fqdn LIKE :filter)) AND uid=:uid ORDER BY hostname";

         $params[":filter"] = "%$filter%";

     }

     $result = db_query($query, $params);

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

     $vhost['autoipv6'] = 2; // 1 => Eine IP pro User, 2 => Eine IP pro VHost

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

-    $vhost['stats'] = null;

     return $vhost;

 }

@@ -494,17 +493,16 @@ function save_vhost($vhost)

                 ":ipv4" => $ipv4,

                 ":autoipv6" => $autoipv6,

                 ":options" => $vhost['options'],

-                ":stats" => ($vhost['stats'] ? $vhost['stats'] : null),

                 ":id" => $id);

     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, hsts=:hsts, `suexec_user`=:suexec_user, `server`=:server, logtype=:logtype, errorlog=:errorlog, certid=:cert, ipv4=:ipv4, autoipv6=:autoipv6, options=:options, stats=:stats WHERE id=:id", $args);

+        db_query("UPDATE vhosts.vhost SET hostname=:hostname, domain=:domain, docroot=:docroot, php=:php, cgi=:cgi, `ssl`=:ssl, hsts=:hsts, `suexec_user`=:suexec_user, `server`=:server, logtype=:logtype, errorlog=:errorlog, certid=:cert, ipv4=:ipv4, autoipv6=:autoipv6, options=:options WHERE id=:id", $args);

     } else {

         $args[":user"] = $_SESSION['userinfo']['uid'];

         unset($args[":id"]);

         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`, hsts, `suexec_user`, `server`, logtype, errorlog, certid, ipv4, autoipv6, options, stats) VALUES ".

-                       "(:user, :hostname, :domain, :docroot, :php, :cgi, :ssl, :hsts, :suexec_user, :server, :logtype, :errorlog, :cert, :ipv4, :autoipv6, :options, :stats)", $args, true);

+        $result = db_query("INSERT INTO vhosts.vhost (user, hostname, domain, docroot, php, cgi, `ssl`, hsts, `suexec_user`, `server`, logtype, errorlog, certid, ipv4, autoipv6, options) VALUES ".

+                       "(:user, :hostname, :domain, :docroot, :php, :cgi, :ssl, :hsts, :suexec_user, :server, :logtype, :errorlog, :cert, :ipv4, :autoipv6, :options)", $args, true);

         $id = db_insert_id();

     }

     $oldvhost = get_vhost_details($id);

@@ -191,8 +191,8 @@ function domainselect($selected = null, $selectattribute = '')

     global $domainlist, $config;

     if ($domainlist == null) {

         $domainlist = get_domain_list(

-        $_SESSION['customerinfo']['customerno'],

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

+            $_SESSION['customerinfo']['customerno'],

+            $_SESSION['userinfo']['uid']

     );

     }

     $selected = (int) $selected;

@@ -186,20 +186,6 @@ function userdomain()

     return $res;

 }

-function user_uses_userdomain()

-{

-    global $config;

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

-    $userdomain = userdomain();

-    $result = db_query("SELECT id FROM vhosts.vhost WHERE domain=:domid AND user=:uid", array(":uid" => $uid, ":domid" => $userdomain['id']));

-    if ($result->rowCount() > 0) {

-        DEBUG("User hat ".$result->rowCount()." Domains *.schokokeks.net");

-        return true;

-    }

-    DEBUG("User hat keine Domains *.schokokeks.net");

-    return false;

-}

-

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

 {

     global $domainlist, $config;

@@ -222,12 +208,8 @@ function domainselect($selected = null, $selectattribute = '')

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

     }

     $userdomain = userdomain();

-    $user_needs_userdomain = $userdomain && (count($domainlist) == 0 || user_uses_userdomain());

-    $user_needs_userdomain = $user_needs_userdomain || ($selected == -2);

-    if (count($domainlist) > 0 && $user_needs_userdomain) {

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

-    }

-    if ($userdomain && (count($domainlist) == 0 || user_uses_userdomain())) {

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

+    if ($userdomain) {

         $s = ($selected == -1 ? ' selected="selected"' : '');

         $ret .= ' <option value="-1"'.$s.'>'.$_SESSION['userinfo']['username'].'.'.$userdomain['name'].'</option>';

     }

@@ -522,7 +522,7 @@ function save_vhost($vhost)

         unset($args[":id"]);

         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`, hsts, `suexec_user`, `server`, logtype, errorlog, certid, ipv4, autoipv6, options, stats) VALUES ".

-                       "(:user, :hostname, :domain, :docroot, :php, :cgi, :ssl, :hsts, :suexec_user, :server, :logtype, :errorlog, :cert, :ipv4, :autoipv6, :options, :stats)", $args);

+                       "(:user, :hostname, :domain, :docroot, :php, :cgi, :ssl, :hsts, :suexec_user, :server, :logtype, :errorlog, :cert, :ipv4, :autoipv6, :options, :stats)", $args, true);

         $id = db_insert_id();

     }

     $oldvhost = get_vhost_details($id);

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

 require_once("certs.php");

-function valid_php_versions() {

+function valid_php_versions()

+{

     /* In der konfiguration ist die Variable "php_versions" eine kommaseparierte Liste der unterstützten Versionen.

         Dabei gelten folgende Suffixe (nicht kombinierbar!):

             *: Standardversion für neue Konfigurationen

@@ -46,7 +47,7 @@ function valid_php_versions() {

             $key = substr($t, 0, -1);

         }

-        /* Wir nehmen an, dass unsere Tags immer an zweitletzter Stelle die Major-Version und 

+        /* Wir nehmen an, dass unsere Tags immer an zweitletzter Stelle die Major-Version und

         an letzter Stelle die Minor-Version enthalten */

         $ver['major'] = substr($key, -2, 1);

         $ver['minor'] = substr($key, -1, 1);

@@ -60,7 +61,7 @@ function valid_php_versions() {

         if ($vhost['php'] && !array_key_exists($vhost['php'], $ret)) {

             $key = $vhost['php'];

             $ret = array($key => array('major' => null, 'minor' => null, 'status' => 'used', 'default' => false)) + $ret;

-            /* Wir nehmen an, dass unsere Tags immer an zweitletzter Stelle die Major-Version und 

+            /* Wir nehmen an, dass unsere Tags immer an zweitletzter Stelle die Major-Version und

             an letzter Stelle die Minor-Version enthalten */

             $ret[$key]['major'] = substr($key, -2, 1);

             $ret[$key]['minor'] = substr($key, -1, 1);

@@ -598,11 +598,11 @@ function save_alias($alias)

     if ($id == 0) {

         unset($args[":id"]);

         logger(LOG_INFO, 'modules/vhosts/include/vhosts', '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, :options)", $args);

+        db_query("INSERT INTO vhosts.alias (hostname, domain, vhost, options) VALUES (:hostname, :domain, :vhost, :options)", $args, true);

     } else {

         unset($args[":vhost"]);

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

-        db_query("UPDATE vhosts.alias SET hostname=:hostname, domain=:domain, options=:options WHERE id=:id", $args);

+        db_query("UPDATE vhosts.alias SET hostname=:hostname, domain=:domain, options=:options WHERE id=:id", $args, true);

     }

 }

@@ -24,18 +24,33 @@ require_once("certs.php");

 function valid_php_versions() {

+    /* In der konfiguration ist die Variable "php_versions" eine kommaseparierte Liste der unterstützten Versionen.

+        Dabei gelten folgende Suffixe (nicht kombinierbar!):

+            *: Standardversion für neue Konfigurationen

+            /: Deprecated

+            +: Beta-Version

+    */

     $tags = explode(',', config('php_versions'));

     $ret = array();

     foreach ($tags as $t) {

-        $key = str_replace('*', '', $t);

-        $ret[$key] = array('major' => null, 'minor' => null, 'status' => 'regular');

+        $key = $t;

+        $ver = array('major' => null, 'minor' => null, 'status' => 'regular', 'default' => false);

+        if (substr($t, -1, 1) == '+') {

+            $ver['status'] = 'beta';

+            $key = substr($t, 0, -1);

+        } elseif (substr($t, -1, 1) == '/') {

+            $ver['status'] = 'deprecated';

+            $key = substr($t, 0, -1);

+        } elseif (substr($t, -1, 1) == '*') {

+            $ver['default'] = true;

+            $key = substr($t, 0, -1);

+        }

+

         /* Wir nehmen an, dass unsere Tags immer an zweitletzter Stelle die Major-Version und 

         an letzter Stelle die Minor-Version enthalten */

-        $ret[$key]['major'] = substr(str_replace('*', '', $t), -2, 1);

-        $ret[$key]['minor'] = substr(str_replace('*', '', $t), -1, 1);

-        if (substr($t, -1) === '*') {

-            $ret[$key]['status'] = 'deprecated';

-        }

+        $ver['major'] = substr($key, -2, 1);

+        $ver['minor'] = substr($key, -1, 1);

+        $ret[$key] = $ver;

     }

     /* Bis hier: aus der Datenbank ausgelesen */

     DEBUG($ret);

@@ -44,12 +59,11 @@ function valid_php_versions() {

     foreach ($list as $vhost) {

         if ($vhost['php'] && !array_key_exists($vhost['php'], $ret)) {

             $key = $vhost['php'];

-            $ret = array($key => array('major' => null, 'minor' => null, 'status' => 'regular')) + $ret;

+            $ret = array($key => array('major' => null, 'minor' => null, 'status' => 'used', 'default' => false)) + $ret;

             /* Wir nehmen an, dass unsere Tags immer an zweitletzter Stelle die Major-Version und 

             an letzter Stelle die Minor-Version enthalten */

             $ret[$key]['major'] = substr($key, -2, 1);

             $ret[$key]['minor'] = substr($key, -1, 1);

-            $ret[$key]['status'] = 'used';

         }

     }

     return $ret;

@@ -118,8 +132,14 @@ function empty_vhost()

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

     $vhost['docroot'] = null;

-    $phpversions = explode(',', config('php_versions'));

-    $vhost['php'] = end($phpversions);

+

+    $vhost['php'] = null;

+    $phpversions = valid_php_versions();

+    foreach ($phpversions as $tag => $info) {

+        if ($info['default']) {

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

+        }

+    }

     $vhost['cgi'] = 1;

     $vhost['ssl'] = null;

     $vhost['hsts'] = -1;

@@ -37,7 +37,21 @@ function valid_php_versions() {

             $ret[$key]['status'] = 'deprecated';

         }

     }

+    /* Bis hier: aus der Datenbank ausgelesen */

     DEBUG($ret);

+    /* Sonderfall: Wenn ein User noch Vhosts einer anderen Version hat, dann bleibt diese erlaubt */

+    $list = list_vhosts();

+    foreach ($list as $vhost) {

+        if ($vhost['php'] && !array_key_exists($vhost['php'], $ret)) {

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

+            $ret = array($key => array('major' => null, 'minor' => null, 'status' => 'regular')) + $ret;

+            /* Wir nehmen an, dass unsere Tags immer an zweitletzter Stelle die Major-Version und 

+            an letzter Stelle die Minor-Version enthalten */

+            $ret[$key]['major'] = substr($key, -2, 1);

+            $ret[$key]['minor'] = substr($key, -1, 1);

+            $ret[$key]['status'] = 'used';

+        }

+    }

     return $ret;

 }

@@ -23,6 +23,25 @@ require_once('class/domain.php');

 require_once("certs.php");

+function valid_php_versions() {

+    $tags = explode(',', config('php_versions'));

+    $ret = array();

+    foreach ($tags as $t) {

+        $key = str_replace('*', '', $t);

+        $ret[$key] = array('major' => null, 'minor' => null, 'status' => 'regular');

+        /* Wir nehmen an, dass unsere Tags immer an zweitletzter Stelle die Major-Version und 

+        an letzter Stelle die Minor-Version enthalten */

+        $ret[$key]['major'] = substr(str_replace('*', '', $t), -2, 1);

+        $ret[$key]['minor'] = substr(str_replace('*', '', $t), -1, 1);

+        if (substr($t, -1) === '*') {

+            $ret[$key]['status'] = 'deprecated';

+        }

+    }

+    DEBUG($ret);

+    return $ret;

+}

+

+

 function traffic_month($vhost_id)

 {

     $vhost_id = (int) $vhost_id;

@@ -85,7 +104,8 @@ function empty_vhost()

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

     $vhost['docroot'] = null;

-    $vhost['php'] = 'fpm72';

+    $phpversions = explode(',', config('php_versions'));

+    $vhost['php'] = end($phpversions);

     $vhost['cgi'] = 1;

     $vhost['ssl'] = null;

     $vhost['hsts'] = -1;

@@ -79,10 +79,10 @@ function empty_vhost()

 {

     $vhost['id'] = null;

     $vhost['hostname'] = null;

-  

+

     $vhost['domain_id'] = null;

     $vhost['domain'] = null;

-  

+

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

     $vhost['docroot'] = null;

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

@@ -97,7 +97,7 @@ function empty_vhost()

     $vhost['is_svn'] = 0;

     $vhost['is_webapp'] = 0;

     $vhost['webapp_id'] = null;

-  

+

     $vhost['cert'] = null;

     $vhost['certid'] = null;

     $vhost['ipv4'] = null;

@@ -112,10 +112,10 @@ function empty_vhost()

 function empty_alias()

 {

     $alias['hostname'] = null;

-  

+

     $alias['domain_id'] = -1;

     $alias['domain'] = $_SESSION['userinfo']['username'].'.'.config('masterdomain');

-  

+

     $alias['options'] = null;

     return $alias;

 }

@@ -492,13 +492,13 @@ function get_alias_details($id)

     $id = (int) $id;

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

     $result = db_query("SELECT * FROM vhosts.v_alias WHERE id=?", array($id));

-  

+

     if ($result->rowCount() != 1) {

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

     }

-  

+

     $alias = $result->fetch();

-  

+

     if ($alias['domain_id'] == null) {

         $alias['domain_id'] = -1;

     }

@@ -8,7 +8,7 @@ Written 2008-2018 by schokokeks.org Hosting, namely

 To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any warranty.

-You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see 

+You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see

 http://creativecommons.org/publicdomain/zero/1.0/

 Nevertheless, in case you use a significant part of this code, we ask (but not require, see the license) that you keep the authors' names in place and return your changes to the public. We would be especially happy if you tell us what you're going to do with this code.

@@ -25,540 +25,556 @@ require_once("certs.php");

 function traffic_month($vhost_id)

 {

-  $vhost_id = (int) $vhost_id;

-  $result = db_query("SELECT sum(mb_in+mb_out) as mb FROM vhosts.traffic where date > CURDATE() - INTERVAL 1 MONTH AND vhost_id = ?", array($vhost_id));

-  $data = $result->fetch();

-  return $data['mb'];

+    $vhost_id = (int) $vhost_id;

+    $result = db_query("SELECT sum(mb_in+mb_out) as mb FROM vhosts.traffic where date > CURDATE() - INTERVAL 1 MONTH AND vhost_id = ?", array($vhost_id));

+    $data = $result->fetch();

+    return $data['mb'];

 }

 function autoipv6_address($vhost_id, $mode = 1)

 {

-  $result = db_query("SELECT uid, v6_prefix FROM vhosts.v_vhost LEFT JOIN system.servers ON (servers.hostname = server) WHERE v_vhost.id=?", array($vhost_id));

-  $data = $result->fetch();

-  if (!$data['v6_prefix'])

-  {

-    warning("IPv6-Adresse nicht verfügbar, Server unterstützt kein IPv6");

-    return "";

-  }

-  list($prefix, $null) = explode('/', $data['v6_prefix']);

-  $vh = ':1';

-  if ($mode == 2) {

-    $vh = implode(':', str_split(sprintf("%08x", $vhost_id), 4));

-  }

-  $ipv6 = $prefix . sprintf("%04s", $data['uid']) . ':' . $vh;

-  return $ipv6;

+    $result = db_query("SELECT uid, v6_prefix FROM vhosts.v_vhost LEFT JOIN system.servers ON (servers.hostname = server) WHERE v_vhost.id=?", array($vhost_id));

+    $data = $result->fetch();

+    if (!$data['v6_prefix']) {

+        warning("IPv6-Adresse nicht verfügbar, Server unterstützt kein IPv6");

+        return "";

+    }

+    list($prefix, $null) = explode('/', $data['v6_prefix']);

+    $vh = ':1';

+    if ($mode == 2) {

+        $vh = implode(':', str_split(sprintf("%08x", $vhost_id), 4));

+    }

+    $ipv6 = $prefix . sprintf("%04s", $data['uid']) . ':' . $vh;

+    return $ipv6;

 }

-function list_vhosts($filter=NULL)

+function list_vhosts($filter=null)

 {

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

-  $query = "SELECT vh.id,fqdn,domain,docroot,docroot_is_default,php,cgi,vh.certid AS cert, vh.ssl, vh.options,logtype,errorlog,IF(dav.id IS NULL OR dav.type='svn', 0, 1) AS is_dav,IF(dav.id IS NULL OR dav.type='dav', 0, 1) AS is_svn, IF(webapps.id IS NULL, 0, 1) AS is_webapp, stats FROM vhosts.v_vhost AS vh LEFT JOIN vhosts.dav ON (dav.vhost=vh.id) LEFT JOIN vhosts.webapps ON (webapps.vhost = vh.id) WHERE uid=:uid ORDER BY domain,hostname";

-  $params = array(":uid" => $uid);

-  if ($filter) {

-    $query = "SELECT vh.id,fqdn,domain,docroot,docroot_is_default,php,cgi,vh.certid AS cert, vh.ssl, vh.options,logtype,errorlog,IF(dav.id IS NULL OR dav.type='svn', 0, 1) AS is_dav,IF(dav.id IS NULL OR dav.type='dav', 0, 1) AS is_svn, IF(webapps.id IS NULL, 0, 1) AS is_webapp, stats FROM vhosts.v_vhost AS vh LEFT JOIN vhosts.dav ON (dav.vhost=vh.id) LEFT JOIN vhosts.webapps ON (webapps.vhost = vh.id) WHERE (vh.fqdn LIKE :filter OR vh.id IN (SELECT vhost FROM vhosts.v_alias WHERE fqdn LIKE :filter)) AND uid=:uid ORDER BY hostname";

-    $params[":filter"] = "%$filter%";

-  }

-  $result = db_query($query, $params);

-  $ret = array();

-  while ($item = $result->fetch())

-    array_push($ret, $item);

-  return $ret;

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

+    $query = "SELECT vh.id,fqdn,domain,docroot,docroot_is_default,php,cgi,vh.certid AS cert, vh.ssl, vh.options,logtype,errorlog,IF(dav.id IS NULL OR dav.type='svn', 0, 1) AS is_dav,IF(dav.id IS NULL OR dav.type='dav', 0, 1) AS is_svn, IF(webapps.id IS NULL, 0, 1) AS is_webapp, stats FROM vhosts.v_vhost AS vh LEFT JOIN vhosts.dav ON (dav.vhost=vh.id) LEFT JOIN vhosts.webapps ON (webapps.vhost = vh.id) WHERE uid=:uid ORDER BY domain,hostname";

+    $params = array(":uid" => $uid);

+    if ($filter) {

+        $query = "SELECT vh.id,fqdn,domain,docroot,docroot_is_default,php,cgi,vh.certid AS cert, vh.ssl, vh.options,logtype,errorlog,IF(dav.id IS NULL OR dav.type='svn', 0, 1) AS is_dav,IF(dav.id IS NULL OR dav.type='dav', 0, 1) AS is_svn, IF(webapps.id IS NULL, 0, 1) AS is_webapp, stats FROM vhosts.v_vhost AS vh LEFT JOIN vhosts.dav ON (dav.vhost=vh.id) LEFT JOIN vhosts.webapps ON (webapps.vhost = vh.id) WHERE (vh.fqdn LIKE :filter OR vh.id IN (SELECT vhost FROM vhosts.v_alias WHERE fqdn LIKE :filter)) AND uid=:uid ORDER BY hostname";

+        $params[":filter"] = "%$filter%";

+    }

+    $result = db_query($query, $params);

+    $ret = array();

+    while ($item = $result->fetch()) {

+        array_push($ret, $item);

+    }

+    return $ret;

 }

 function ipv6_possible($server)

 {

-  $args = array(":server" => $server);

-  $result = db_query("SELECT v6_prefix FROM system.servers WHERE id=:server OR hostname=:server", $args);

-  $line = $result->fetch();

-  DEBUG("Server {$server} is v6-capable: ". ($line['v6_prefix'] != NULL));

-  return ($line['v6_prefix'] != NULL);

+    $args = array(":server" => $server);

+    $result = db_query("SELECT v6_prefix FROM system.servers WHERE id=:server OR hostname=:server", $args);

+    $line = $result->fetch();

+    DEBUG("Server {$server} is v6-capable: ". ($line['v6_prefix'] != null));

+    return ($line['v6_prefix'] != null);

 }

 function empty_vhost()

 {

-  $vhost['id'] = NULL;

-  $vhost['hostname'] = NULL;

+    $vhost['id'] = null;

+    $vhost['hostname'] = null;

-  $vhost['domain_id'] = NULL;

-  $vhost['domain'] = NULL;

+    $vhost['domain_id'] = null;

+    $vhost['domain'] = null;

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

-  $vhost['docroot'] = NULL;

-  $vhost['php'] = 'fpm72';

-  $vhost['cgi'] = 1;

-  $vhost['ssl'] = NULL;

-  $vhost['hsts'] = -1;

-  $vhost['suexec_user'] = NULL;

-  $vhost['server'] = NULL;

-  $vhost['logtype'] = NULL;

-  $vhost['errorlog'] = 0;

-  $vhost['is_dav'] = 0;

-  $vhost['is_svn'] = 0;

-  $vhost['is_webapp'] = 0;

-  $vhost['webapp_id'] = NULL;

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

+    $vhost['docroot'] = null;

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

+    $vhost['cgi'] = 1;

+    $vhost['ssl'] = null;

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

+    $vhost['suexec_user'] = null;

+    $vhost['server'] = null;

+    $vhost['logtype'] = null;

+    $vhost['errorlog'] = 0;

+    $vhost['is_dav'] = 0;

+    $vhost['is_svn'] = 0;

+    $vhost['is_webapp'] = 0;

+    $vhost['webapp_id'] = null;

-  $vhost['cert'] = NULL;

-  $vhost['certid'] = NULL;

-  $vhost['ipv4'] = NULL;

-  $vhost['autoipv6'] = 2; // 1 => Eine IP pro User, 2 => Eine IP pro VHost

-

-  $vhost['options'] = 'forwardwww';

-  $vhost['stats'] = NULL;

-  return $vhost;

+    $vhost['cert'] = null;

+    $vhost['certid'] = null;

+    $vhost['ipv4'] = null;

+    $vhost['autoipv6'] = 2; // 1 => Eine IP pro User, 2 => Eine IP pro VHost

+

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

+    $vhost['stats'] = null;

+    return $vhost;

 }

 function empty_alias()

 {

-  $alias['hostname'] = NULL;

+    $alias['hostname'] = null;

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

-  $alias['domain'] = $_SESSION['userinfo']['username'].'.'.config('masterdomain');

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

+    $alias['domain'] = $_SESSION['userinfo']['username'].'.'.config('masterdomain');

-  $alias['options'] = NULL;

-  return $alias;

+    $alias['options'] = null;

+    return $alias;

 }

-function userdomain() {

-  if (config('user_vhosts_domain') === NULL) {

-    return NULL;

-  }

-  $result = db_query("SELECT id,name FROM vhosts.v_domains WHERE name=:dom", array(":dom" => config('user_vhosts_domain')));