From cce9d63279d9078dd0292dd015be497600ac5f32 Mon Sep 17 00:00:00 2001 From: florian030 <florian@schaal-24.de> Date: Tue, 25 Feb 2014 09:16:36 -0500 Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3 --- interface/web/sites/web_folder_edit.php | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/interface/web/sites/web_folder_edit.php b/interface/web/sites/web_folder_edit.php index d3235df..009b039 100644 --- a/interface/web/sites/web_folder_edit.php +++ b/interface/web/sites/web_folder_edit.php @@ -60,9 +60,45 @@ // Set a few fixed values $this->dataRecord["server_id"] = $parent_domain["server_id"]; + + // make sure this folder isn't protected already + if($this->id > 0){ + $folder = $app->db->queryOneRecord("SELECT * FROM web_folder WHERE parent_domain_id = ".$this->dataRecord['parent_domain_id']." AND path = '".$this->dataRecord['path']."' AND web_folder_id != ".$this->id); + } else { + $folder = $app->db->queryOneRecord("SELECT * FROM web_folder WHERE parent_domain_id = ".$this->dataRecord['parent_domain_id']." AND path = '".$this->dataRecord['path']."'"); + } + if(is_array($folder) && !empty($folder)) $app->tform->errorMessage .= $app->tform->lng('error_folder_already_protected_txt'); parent::onSubmit(); } + + function onAfterInsert() { + global $app, $conf; + + $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval($this->dataRecord["parent_domain_id"])); + + // The web folder entry shall be owned by the same group as the website + $sys_groupid = $app->functions->intval($web['sys_groupid']); + + $sql = "UPDATE web_folder SET sys_groupid = '$sys_groupid' WHERE web_folder_id = ".$this->id; + $app->db->query($sql); + } + + function onAfterUpdate() { + global $app, $conf; + + //* When the site of the web folder has been changed + if(isset($this->dataRecord['parent_domain_id']) && $this->oldDataRecord['parent_domain_id'] != $this->dataRecord['parent_domain_id']) { + $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval($this->dataRecord["parent_domain_id"])); + + // The web folder entry shall be owned by the same group as the website + $sys_groupid = $app->functions->intval($web['sys_groupid']); + + $sql = "UPDATE web_folder SET sys_groupid = '$sys_groupid' WHERE web_folder_id = ".$this->id; + $app->db->query($sql); + } + + } } -- Gitblit v1.9.1