Removed old get_permissions

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4980 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/html/getFAIscript.php b/html/getFAIscript.php
index ddd120fc48b1afbaa292de513b6612c804063213..60e53d56a69f92c422b7fe4870d8636568fa345f 100644 (file)
--- 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 d3a25ad3f891a0109b2865dc2caf16a70c44c144..1f8d59923e3fa12c8191bce6fe7947eb2a103d7f 100644 (file)
--- 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 84aa6eb682f1647a50cfe6f40d6ff8ef229c73e9..21e35a8220c6fdba8bed1db0f95b298333d67127 100644 (file)
--- 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<br>";
+echo "get_permissions() - is deprecated <br>";
+  return array("none");
 
   $base= $config->current['BASE'];
   $tmp= "d,".$dn;