X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Ffunctions.inc;h=9f0aef9e4e863c58b4d8d3877fba539620ceed52;hb=f1714ac56cc41319519c97c1ab7749d4d8a637c3;hp=21e35a8220c6fdba8bed1db0f95b298333d67127;hpb=e2d8e2efbb2cb161e3102c246a2c7b22d33da117;p=gosa.git

diff --git a/include/functions.inc b/include/functions.inc
index 21e35a822..9f0aef9e4 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -291,7 +291,8 @@ function ldap_init ($server, $base, $binddn='', $pass='')
 {
   global $config;
 
-  $ldap = new LDAP ($binddn, $pass, $server, isset($config->current['RECURSIVE'])                                                && $config->current['RECURSIVE'] == "true",
+  $ldap = new LDAP ($binddn, $pass, $server,
+      isset($config->current['RECURSIVE']) && $config->current['RECURSIVE'] == "true",
       isset($config->current['TLS']) && $config->current['TLS'] == "true");
 
   /* Sadly we've no proper return values here. Use the error message instead. */
@@ -735,94 +736,17 @@ function getMenuCache()
 }
 
 
-function get_permissions ($dn, $subtreeACL)
+function get_permissions ()
 {
-  global $config;
-echo "get_permissions() - is deprecated <br>";
-  return array("none");
-
-  $base= $config->current['BASE'];
-  $tmp= "d,".$dn;
-  $sacl= array();
-
-  /* Sort subacl's for lenght to simplify matching
-     for subtrees */
-  foreach ($subtreeACL as $key => $value){
-    $sacl[$key]= strlen($key);
-  }
-  arsort ($sacl);
-  reset ($sacl);
-
-  /* Successively remove leading parts of the dn's until
-     it doesn't contain commas anymore */
-  $tmp_dn= preg_replace('/\\\\,/', '<GOSA#REPLACED#KOMMA>', $tmp);
-  while (preg_match('/,/', $tmp_dn)){
-    $tmp_dn= ltrim(strstr($tmp_dn, ","), ",");
-    $tmp= preg_replace('/\<GOSA#REPLACED#KOMMA\>/', '\\,', $tmp);
-
-    /* Check for acl that may apply */
-    foreach ($sacl as $key => $value){
-      if (preg_match("/$key$/", $tmp)){
-        return ($subtreeACL[$key]);
-      }
-    }
-  }
-
+  /* Look for attribute in ACL */
+  trigger_error("Don't use get_permissions() its obsolete. Use userinfo::get_permissions() instead.");
   return array("");
 }
 
 
-function get_module_permission($acl_array, $module, $dn)
+function get_module_permission()
 {
-  global $ui;
-echo "get_module_permissions() - to be removed<br>";
-
-  $final= "";
-  foreach($acl_array as $acl){
-
-    /* Check for selfflag (!) in ACL to determine if
-       the user is allowed to change parts of his/her
-       own account */
-    if (preg_match("/^!/", $acl)){
-      if ($dn != "" && $dn != $ui->dn){
-
-        /* No match for own DN, give up on this ACL */
-        continue;
-
-      } else {
-
-        /* Matches own DN, remove the selfflag */
-        $acl= preg_replace("/^!/", "", $acl);
-
-      }
-    }
-
-    /* Remove leading garbage */
-    $acl= preg_replace("/^:/", "", $acl);
-
-    /* Discover if we've access to the submodule by comparing
-       all allowed submodules specified in the ACL */
-    $tmp= split(",", $acl);
-    foreach ($tmp as $mod){
-      if (preg_match("/^$module#/", $mod)){
-        $final= strstr($mod, "#")."#";
-        continue;
-      }
-      if (preg_match("/[^#]$module$/", $mod)){
-        return ("#all#");
-      }
-      if (preg_match("/^all$/", $mod)){
-        return ("#all#");
-      }
-    }
-  }
-
-  /* Return assembled ACL, or none */
-  if ($final != ""){
-    return (preg_replace('/##/', '#', $final));
-  }
-
-  /* Nothing matches - disable access for this object */
+  trigger_error("Don't use get_module_permission() its obsolete.");
   return ("#none#");
 }
 
@@ -932,10 +856,11 @@ function get_base_from_people($dn)
 }
 
 
-function chkacl($acl, $name)
+function chkacl()
 {
   /* Look for attribute in ACL */
-  return ("'\"> CHKACL is deprecated use this::getacl() instead <\"'");
+  trigger_error("Don't use chkacl() its obsolete. Use userinfo::getacl() instead.");
+  return("-deprecated-");
 }
 
 
@@ -992,6 +917,13 @@ 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);
 }
 
+
+function is_mac($mac)
+{
+  return preg_match("/^[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]$/i", $mac);
+}
+
+
 /* 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)
@@ -1224,47 +1156,11 @@ function to_string ($value)
 function get_printer_list($cups_server)
 {
   global $config;
-
-  $res= array();
-
-  /* Use CUPS, if we've access to it */
-  if (function_exists('cups_get_dest_list')){
-    $dest_list= cups_get_dest_list ($cups_server);
-
-    foreach ($dest_list as $prt){
-      $attr= cups_get_printer_attributes ($cups_server, $prt->name);
-
-      foreach ($attr as $prt_info){
-        if ($prt_info->name == "printer-info"){
-          $info= $prt_info->value;
-          break;
-        }
-      }
-      $res[$prt->name]= "$info [$prt->name]";
-    }
-
-    /* CUPS is not available, try lpstat as a replacement */
-  } else {
-    $ar = false;
-    exec("lpstat -p", $ar);
-    foreach($ar as $val){
-      @list($dummy, $printer, $rest)= split(' ', $val, 3);
-      if (preg_match('/^[^@]+$/', $printer)){
-        $res[$printer]= "$printer";
-      }
-    }
+  $res = array();
+  $data = get_list('(objectClass=gotoPrinter)',"printer",$config->current['BASE'], array('cn'));
+  foreach($data as $attrs ){
+    $res[$attrs['cn'][0]] = $attrs['cn'][0];
   }
-
-  /* Merge in printers from LDAP */
-  $ldap= $config->get_ldap_link();
-  $ldap->cd ($config->current['BASE']);
-  $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;
 }
 
@@ -2186,8 +2082,6 @@ function gosa_ldap_explode_dn($dn,$config = NULL,$verify_in_ldap=false)
     $ldap = $config->get_ldap_link();
   }
 
-  $Diff = ldap_explode_dn($dn,0);
-
   /* Lets start */
   $called = false;
   while(preg_match("/,/",$dn) && $next &&  $cnt < $max){
@@ -2217,6 +2111,11 @@ function gosa_ldap_explode_dn($dn,$config = NULL,$verify_in_ldap=false)
     }
   }
 
+  /* No dn was posted */
+  if($cnt == 0 && !empty($dn)){
+    $ret[] = $dn;
+  }
+
   /* Append the rest */
   $test = $keep.$dn;
   if($called && !empty($test)){
@@ -2224,10 +2123,6 @@ function gosa_ldap_explode_dn($dn,$config = NULL,$verify_in_ldap=false)
   }
   $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);
 }