Commit 1ee36574 authored by Pascal Dreissen's avatar Pascal Dreissen

Merge remote-tracking branch 'upstream/stable-3.1' into stable-3.1

parents 6f582efe f7e9ef76
......@@ -157,7 +157,7 @@ class tools_sites {
$field = "domain";
$select = $field;
}
$sql .= " domain NOT IN (SELECT $select FROM ?? WHERE $field = ?) AND";
$sql .= " domain NOT IN (SELECT $select FROM ?? WHERE $field != ?) AND";
}
if ($_SESSION["s"]["user"]["typ"] == 'admin') {
$sql .= " 1";
......
......@@ -105,7 +105,7 @@ class page_action extends tform_actions {
/*
* The domain-module is in use.
*/
$domains = $app->tools_sites->getDomainModuleDomains($this->_vhostdomain_type == 'subdomain' ? null : "web_domain", $this->dataRecord["domain"]);
$domains = $app->tools_sites->getDomainModuleDomains($this->_vhostdomain_type == 'subdomain' ? null : "web_domain");
$domain_select = '';
$selected_domain = '';
if(is_array($domains) && sizeof($domains) > 0) {
......
......@@ -878,6 +878,7 @@ class apache2_plugin {
if($data['new']['hd_quota'] > 0) {
$blocks_soft = $data['new']['hd_quota'] * 1024;
$blocks_hard = $blocks_soft + 1024;
$mb_soft = $data['new']['hd_quota'];
$mb_hard = $mb_soft + 1;
} else {
$mb_soft = $mb_hard = $blocks_soft = $blocks_hard = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment