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

Author: Pascal Dreissen

interface/lib/classes/tools_sites.inc.php

@@ -157,7 +157,7 @@ function getDomainModuleDomains($not_used_in_table = null, $selected_domain = nu
 				$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";

interface/web/sites/web_childdomain_edit.php

@@ -105,7 +105,7 @@ function onShowEnd() {
 			/*
 			 * 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) {

server/plugins-available/apache2_plugin.inc.php

@@ -878,6 +878,7 @@ function update($event_name, $data) {
 			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;