Skip to content
Snippets Groups Projects
Commit f601d97d authored by mcramer's avatar mcramer
Browse files

Bugfix: Domain module check can only be applied if tab is "domain"

parent 180f2b99
No related branches found
No related tags found
No related merge requests found
...@@ -459,21 +459,23 @@ class page_action extends tform_actions { ...@@ -459,21 +459,23 @@ class page_action extends tform_actions {
global $app, $conf; global $app, $conf;
/* check if the domain module is used - and check if the selected domain can be used! */ /* check if the domain module is used - and check if the selected domain can be used! */
$app->uses('ini_parser,getconf'); if($app->tform->getCurrentTab() == 'domain') {
$settings = $app->getconf->get_global_config('domains'); $app->uses('ini_parser,getconf');
if ($settings['use_domain_module'] == 'y') { $settings = $app->getconf->get_global_config('domains');
$client_group_id = intval($_SESSION["s"]["user"]["default_group"]); 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 = "SELECT domain_id, domain FROM domain WHERE domain_id = " . intval($this->dataRecord['domain']);
$sql .= "AND sys_groupid =" . $client_group_id; if ($_SESSION["s"]["user"]["typ"] != 'admin') {
} $sql .= "AND sys_groupid =" . $client_group_id;
$domain_check = $app->db->queryOneRecord($sql); }
if(!$domain_check) { $domain_check = $app->db->queryOneRecord($sql);
// invalid domain selected if(!$domain_check) {
$app->tform->errorMessage .= $app->tform->lng("domain_error_empty")."<br />"; // invalid domain selected
} else { $app->tform->errorMessage .= $app->tform->lng("domain_error_empty")."<br />";
$this->dataRecord['domain'] = $domain_check['domain']; } else {
$this->dataRecord['domain'] = $domain_check['domain'];
}
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment