From e2d8e2efbb2cb161e3102c246a2c7b22d33da117 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 2 Nov 2006 05:14:08 +0000 Subject: [PATCH] Removed old get_permissions git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4980 594d385d-05f5-0310-b6e9-bd551577e9d8 --- html/getFAIscript.php | 7 ++++--- html/getkiosk.php | 7 ++++--- include/functions.inc | 3 ++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/html/getFAIscript.php b/html/getFAIscript.php index ddd120fc4..60e53d56a 100644 --- a/html/getFAIscript.php +++ b/html/getFAIscript.php @@ -75,9 +75,10 @@ $ui= $_SESSION["ui"]; $config= $_SESSION['config']; /* Check ACL's */ -$acl= get_permissions ($config->current['BASE'], $ui->subtreeACL); -$acl= get_module_permission($acl, "all", $config->current['BASE']); -if (chkacl($acl, "all") != ""){ +#FIXME Use more specific acl categories instead of all/all +$ui = get_userinfo(); +$acl = $ui->get_permissions(base64_decode($_GET['id']),"all/all"); +if(!preg_match("/r/",$acl)){ header ("Location: index.php"); exit; } diff --git a/html/getkiosk.php b/html/getkiosk.php index d3a25ad3f..1f8d59923 100644 --- a/html/getkiosk.php +++ b/html/getkiosk.php @@ -62,9 +62,10 @@ $ui= $_SESSION["ui"]; $config= $_SESSION['config']; /* Check ACL's */ -$acl= get_permissions ($config->current['BASE'], $ui->subtreeACL); -$acl= get_module_permission($acl, "all", $config->current['BASE']); -if (chkacl($acl, "all") != ""){ +#FIXME Use more specific acl categories instead of all/all +$ui = get_userinfo(); +$acl = $ui->get_permissions(base64_decode($_GET['id']),"all/all"); +if(!preg_match("/r/",$acl)){ header ("Location: index.php"); exit; } diff --git a/include/functions.inc b/include/functions.inc index 84aa6eb68..21e35a822 100644 --- a/include/functions.inc +++ b/include/functions.inc @@ -738,7 +738,8 @@ function getMenuCache() function get_permissions ($dn, $subtreeACL) { global $config; -echo "get_permissions() - to be removed
"; +echo "get_permissions() - is deprecated
"; + return array("none"); $base= $config->current['BASE']; $tmp= "d,".$dn; -- 2.30.2