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

diff --git a/include/functions.inc b/include/functions.inc
index 376d19d86..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. */
@@ -916,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)
@@ -1148,42 +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']);
-  $ldap->search('(objectClass=gotoPrinter)', array('cn'));
-
   return $res;
 }
 
@@ -2105,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){
@@ -2136,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)){
@@ -2143,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);
 }