X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Ffunctions.inc;h=6eda98aa4bc95f3afb0029a6819c388369b4a30e;hb=41b3851a98576e3cd9b843a63353a9e669c4f501;hp=b321eb64c2b17cdd323362e98c5c9fe67cb973f4;hpb=6afa0bf7ffedaed667d642686a0acbb74128526e;p=gosa.git

diff --git a/include/functions.inc b/include/functions.inc
index b321eb64c..6eda98aa4 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -582,12 +582,10 @@ function get_lock ($object)
 }
 
 
-function get_list($filter, $subtreeACL, $base= "", $attributes= array(), $flags= GL_SUBSEARCH)
+function get_list($filter, $category, $base= "", $attributes= array(), $flags= GL_SUBSEARCH)
 {
   global $config, $ui;
 
-  echo "get_list called. Replace it, it doesn't support new acls"
-
   /* Get LDAP link */
   $ldap= $config->get_ldap_link($flags & GL_SIZELIMIT);
 
@@ -598,12 +596,6 @@ function get_list($filter, $subtreeACL, $base= "", $attributes= array(), $flags=
     $ldap->cd ($base);
   }
 
-  /* Strict filter for administrative units? */
-  if ($ui->gosaUnitTag != "" && isset($config->current['STRICT_UNITS']) &&
-      preg_match('/TRUE/i', $config->current['STRICT_UNITS'])){
-    $filter= "(&(gosaUnitTag=".$ui->gosaUnitTag.")$filter)";
-  }
-
   /* Perform ONE or SUB scope searches? */
   if ($flags & GL_SUBSEARCH) {
     $ldap->search ($filter, $attributes);
@@ -619,12 +611,26 @@ function get_list($filter, $subtreeACL, $base= "", $attributes= array(), $flags=
   /* Crawl through reslut entries and perform the migration to the
      result array */
   $result= array();
+
   while($attrs = $ldap->fetch()) {
     $dn= $ldap->getDN();
 
-    foreach ($subtreeACL as $key => $value){
-      if (preg_match("/$key/", $dn)){
+    /* Sort in every value that fits the permissions */
+    if (is_array($category)){
+      foreach ($category as $o){
+        if ($ui->get_category_permissions($dn, $o) != ""){
+          if ($flags & GL_CONVERT){
+            $attrs["dn"]= convert_department_dn($dn);
+          } else {
+            $attrs["dn"]= $dn;
+          }
 
+          /* We found what we were looking for, break speeds things up */
+          $result[]= $attrs;
+        }
+      }
+    } else {
+      if ($ui->get_category_permissions($dn, $category) != ""){
         if ($flags & GL_CONVERT){
           $attrs["dn"]= convert_department_dn($dn);
         } else {
@@ -633,7 +639,6 @@ function get_list($filter, $subtreeACL, $base= "", $attributes= array(), $flags=
 
         /* We found what we were looking for, break speeds things up */
         $result[]= $attrs;
-        break;
       }
     }
   }
@@ -979,7 +984,7 @@ function is_uid($uid)
 
   /* STRICT adds spaces and case insenstivity to the uid check.
      This is dangerous and should not be used. */
-  if (isset($config->current['STRICT']) && preg_match('/^no$/i', $config->current['STRICT'])){
+  if (isset($config->current['STRICT']) && preg_match('/^(no|false)$/i', $config->current['STRICT'])){
     return preg_match ("/^[a-z0-9 _.-]+$/i", $uid);
   } else {
     return preg_match ("/^[a-z0-9_-]+$/", $uid);
@@ -992,6 +997,53 @@ function is_ip($ip)
   return preg_match("/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/", $ip);
 }
 
+/* Checks if the given ip address dosen't match 
+    "is_ip" because there is also a sub net mask given */
+function is_ip_with_subnetmask($ip)
+{
+        /* Generate list of valid submasks */
+        $res = array();
+        for($e = 0 ; $e <= 32; $e++){
+                $res[$e] = $e;
+        }
+        $i[0] =255;
+        $i[1] =255;
+        $i[2] =255;
+        $i[3] =255;
+        for($a= 3 ; $a >= 0 ; $a --){
+                $c = 1;
+                while($i[$a] > 0 ){
+                        $str  = $i[0].".".$i[1].".".$i[2].".".$i[3];
+                        $res[$str] = $str;
+                        $i[$a] -=$c;
+                        $c = 2*$c;
+                }
+        }
+        $res["0.0.0.0"] = "0.0.0.0";
+        if(preg_match("/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.".
+                        "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.".
+                        "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.".
+                        "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)/", $ip)){
+                $mask = preg_replace("/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.".
+                        "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.".
+                        "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.".
+                        "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)/","",$ip);
+
+                $mask = preg_replace("/^\//","",$mask);
+                if((in_array("$mask",$res)) && preg_match("/^[0-9\.]/",$mask)){
+                        return(TRUE);
+                }
+        }
+        return(FALSE);
+}
+
+/* Simple is domain check, it checks if the given string looks like "string(...).string" */
+function is_domain($str)
+{
+  return(preg_match("/^([a-z0-9i\-]*)\.[a-z0-9]*$/i",$str));
+}
+
+
 
 function is_id($id)
 {
@@ -1211,9 +1263,11 @@ function get_printer_list($cups_server)
   /* Merge in printers from LDAP */
   $ldap= $config->get_ldap_link();
   $ldap->cd ($config->current['BASE']);
-  $ldap->search('(objectClass=gotoPrinter)', array('cn'));
-  while ($attrs= $ldap->fetch()){
-    $res[$attrs["cn"][0]]= $attrs["cn"][0];
+  $ui= get_userinfo();
+  if (preg_match('/TRUE/i', $config->current['STRICT_UNITS']) && $ui->gosaUnitTag != ""){   
+    $ldap->search('((objectClass=gotoPrinter)(gosaUnitTag='.$ui->gosaUnitTag.'))', array('cn'));
+  } else {
+    $ldap->search('(objectClass=gotoPrinter)', array('cn'));
   }
 
   return $res;
@@ -2122,6 +2176,65 @@ function obj_is_writable($dn, $object, $attribute)
 }
 
 
+function gosa_ldap_explode_dn($dn,$config = NULL,$verify_in_ldap=false)
+{
+  /* Initialize variables */
+  $ret  = array("count" => 0);  // Set count to 0
+  $next = true;                 // if false, then skip next loops and return
+  $cnt  = 0;                    // Current number of loops
+  $max  = 100;                  // Just for security, prevent looops
+  $ldap = NULL;                 // To check if created result a valid
+  $keep = "";                   // save last failed parse string
+
+  /* Check each parsed dn in ldap ? */
+  if($config!=NULL && $verify_in_ldap){
+    $ldap = $config->get_ldap_link();
+  }
+
+  $Diff = ldap_explode_dn($dn,0);
+
+  /* Lets start */
+  $called = false;
+  while(preg_match("/,/",$dn) && $next &&  $cnt < $max){
+
+    $cnt ++;
+    if(!preg_match("/,/",$dn)){
+      $next = false;
+    }
+    $object = preg_replace("/[,].*$/","",$dn);
+    $dn     = preg_replace("/^[^,]+,/","",$dn);
+
+    $called = true;
+
+    /* Check if current dn is valid */
+    if($ldap!=NULL){
+      $ldap->cd($dn);
+      $ldap->cat($dn,array("dn"));
+      if($ldap->count()){
+        $ret[]  = $keep.$object;
+        $keep   = "";
+      }else{
+        $keep  .= $object.",";
+      }
+    }else{
+      $ret[]  = $keep.$object;
+      $keep   = "";
+    }
+  }
+
+  /* Append the rest */
+  $test = $keep.$dn;
+  if($called && !empty($test)){
+    $ret[] = $keep.$dn;
+  }
+  $ret['count'] = count($ret) - 1;
+
+  $diff = array_diff($ret,$Diff);
+  if($diff){
+    print_a(array("Diff" => $diff,"OLD" => $Diff,"NEW"=> $ret,"DEBUG"=> debug_backtrace()));
+  }
+  return($ret);
+}
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>