From ae47f0c0c91614a98d14dbe334e0eab0a57ff8f8 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 14 Nov 2011 15:44:25 +0000
Subject: [PATCH] Fixed: FS#1832 - Folder protection
---
interface/web/sites/form/web_folder_user.tform.php | 4 +++-
interface/web/sites/list/web_folder_user.list.php | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/interface/web/sites/form/web_folder_user.tform.php b/interface/web/sites/form/web_folder_user.tform.php
index de22b3d46..6f94c6267 100644
--- a/interface/web/sites/form/web_folder_user.tform.php
+++ b/interface/web/sites/form/web_folder_user.tform.php
@@ -50,6 +50,8 @@ $form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update,
$form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete
$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
+$auth_sql = $app->tform->getAuthSQL('r', 'web_domain');
+
$form["tabs"]['user'] = array (
'title' => "Folder",
'width' => 100,
@@ -74,7 +76,7 @@ $form["tabs"]['user'] = array (
'formtype' => 'SELECT',
'default' => '',
'datasource' => array ( 'type' => 'SQL',
- 'querystring' => "Select concat(web_domain.domain,' ',web_folder.path) as name, web_folder.web_folder_id from web_domain, web_folder WHERE web_domain.domain_id = web_folder.parent_domain_id AND {AUTHSQL} ORDER BY web_domain.domain",
+ 'querystring' => "Select concat(web_domain.domain,' ',web_folder.path) as name, web_folder.web_folder_id from web_domain, web_folder WHERE web_domain.domain_id = web_folder.parent_domain_id AND ".$auth_sql." ORDER BY web_domain.domain",
'keyfield'=> 'web_folder_id',
'valuefield'=> 'name'
),
diff --git a/interface/web/sites/list/web_folder_user.list.php b/interface/web/sites/list/web_folder_user.list.php
index 2ee448105..5b8324ace 100644
--- a/interface/web/sites/list/web_folder_user.list.php
+++ b/interface/web/sites/list/web_folder_user.list.php
@@ -42,6 +42,8 @@ $liste["paging_tpl"] = "templates/paging.tpl.htm";
// Enable auth
$liste["auth"] = "yes";
+$auth_sql = $app->tform->getAuthSQL('r', 'web_domain');
+
/*****************************************************
* Suchfelder
@@ -65,7 +67,7 @@ $liste["item"][] = array( 'field' => "web_folder_id",
'prefix' => "",
'suffix' => "",
'datasource' => array ( 'type' => 'SQL',
- 'querystring' => "Select concat(web_domain.domain,' ',web_folder.path) as name, web_folder.web_folder_id from web_domain, web_folder WHERE web_domain.domain_id = web_folder.parent_domain_id AND {AUTHSQL} ORDER BY web_domain.domain",
+ 'querystring' => "Select concat(web_domain.domain,' ',web_folder.path) as name, web_folder.web_folder_id from web_domain, web_folder WHERE web_domain.domain_id = web_folder.parent_domain_id AND ".$auth_sql." ORDER BY web_domain.domain",
'keyfield'=> 'web_folder_id',
'valuefield'=> 'name'
),
--
GitLab