From 9adf496ff474804295e91a94db6f2fabf30e1474 Mon Sep 17 00:00:00 2001 From: Falko Timme <ft@falkotimme.com> Date: Mon, 01 Sep 2014 05:13:44 -0400 Subject: [PATCH] Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5 --- interface/web/client/domain_edit.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/interface/web/client/domain_edit.php b/interface/web/client/domain_edit.php index cca5c2d..1ed17e5 100644 --- a/interface/web/client/domain_edit.php +++ b/interface/web/client/domain_edit.php @@ -193,7 +193,7 @@ // make sure that the record belongs to the client group and not the admin group when admin inserts it // also make sure that the user can not delete domain created by a admin - if($_SESSION["s"]["user"]["typ"] == 'admin' && isset($this->dataRecord["client_group_id"])) { + if(($_SESSION["s"]["user"]["typ"] == 'admin' && isset($this->dataRecord["client_group_id"])) || ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSION['s']['user']['userid']))) { $client_group_id = $app->functions->intval($this->dataRecord["client_group_id"]); $app->db->query("UPDATE domain SET sys_groupid = $client_group_id, sys_perm_group = 'ru' WHERE domain_id = ".$this->id); } -- Gitblit v1.9.1