Added setup patches from stable

[gosa.git] / include / functions.inc

diff --git a/include/functions.inc b/include/functions.inc
index 1e0bafeb17985454101ae9b14774b29e242a40a9..b1deb986ec57f75b944bff664fe34e9233818f49 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -1156,15 +1156,10 @@ function get_printer_list($cups_server)
 {
   global $config;
   $res = array();
-
-  /* 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()){
+  $data = get_list('(objectClass=gotoPrinter)',"printer",$config->current['BASE'], array('cn'));
+  foreach($data as $attrs ){
     $res[$attrs['cn'][0]] = $attrs['cn'][0];
   }
-
   return $res;
 }
 
@@ -2086,8 +2081,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){
@@ -2129,10 +2122,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);
 }