From f601d97deceb2e33b00f19ba26b52a837e9eb269 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Wed, 12 Sep 2012 15:55:28 +0000
Subject: [PATCH] Bugfix: Domain module check can only be applied if tab is
 "domain"

---
 interface/web/sites/web_domain_edit.php | 32 +++++++++++++------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php
index 92a5c08ce..e16d81e87 100644
--- a/interface/web/sites/web_domain_edit.php
+++ b/interface/web/sites/web_domain_edit.php
@@ -459,21 +459,23 @@ class page_action extends tform_actions {
 		global $app, $conf;
 
         /* check if the domain module is used - and check if the selected domain can be used! */
-		$app->uses('ini_parser,getconf');
-		$settings = $app->getconf->get_global_config('domains');
-		if ($settings['use_domain_module'] == 'y') {
-			$client_group_id = intval($_SESSION["s"]["user"]["default_group"]);
-			
-            $sql = "SELECT domain_id, domain FROM domain WHERE domain_id = " . intval($this->dataRecord['domain']);
-			if ($_SESSION["s"]["user"]["typ"] != 'admin') {
-				$sql .= "AND sys_groupid =" . $client_group_id;
-			}
-			$domain_check = $app->db->queryOneRecord($sql);
-            if(!$domain_check) {
-                // invalid domain selected
-                $app->tform->errorMessage .= $app->tform->lng("domain_error_empty")."<br />";
-            } else {
-                $this->dataRecord['domain'] = $domain_check['domain'];
+		if($app->tform->getCurrentTab() == 'domain') {
+            $app->uses('ini_parser,getconf');
+            $settings = $app->getconf->get_global_config('domains');
+            if ($settings['use_domain_module'] == 'y') {
+                $client_group_id = intval($_SESSION["s"]["user"]["default_group"]);
+                
+                $sql = "SELECT domain_id, domain FROM domain WHERE domain_id = " . intval($this->dataRecord['domain']);
+                if ($_SESSION["s"]["user"]["typ"] != 'admin') {
+                    $sql .= "AND sys_groupid =" . $client_group_id;
+                }
+                $domain_check = $app->db->queryOneRecord($sql);
+                if(!$domain_check) {
+                    // invalid domain selected
+                    $app->tform->errorMessage .= $app->tform->lng("domain_error_empty")."<br />";
+                } else {
+                    $this->dataRecord['domain'] = $domain_check['domain'];
+                }
             }
         }
 
-- 
GitLab