Optimizations

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

diff --git a/include/functions.inc b/include/functions.inc
index c6e9943e7c0d6f6ed29af80565131db8e8c25a43..06b898405718ebaf18ea2124aa3094ede31a112b 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -1263,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;

diff --git a/plugins/personal/environment/class_kioskManagementDialog.inc b/plugins/personal/environment/class_kioskManagementDialog.inc
index 1a126d9b4e030e7f3f96c966f8996706634d8e83..3288c47921bb8279205500485bbdcf9da9e3e570 100644 (file)
--- a/plugins/personal/environment/class_kioskManagementDialog.inc
+++ b/plugins/personal/environment/class_kioskManagementDialog.inc
@@ -18,7 +18,9 @@ class kioskManagementDialog extends plugin
 
   function kioskManagementDialog ($config, $dn= NULL,$attach=false )
   {
-    plugin::plugin ($config, $dn);
+    $this->config= $config;
+    $this->dn= $dn;
+
     if($attach){
       $this->filesToAttach = $attach;
     }