Next bunch of renamings

[gosa.git] / gosa-plugins / goto / personal / environment / class_selectPrinterDialog.inc

diff --git a/gosa-plugins/goto/personal/environment/class_selectPrinterDialog.inc b/gosa-plugins/goto/personal/environment/class_selectPrinterDialog.inc
index b804ce2fb06b6070cc3d63dd1ecbd401e1158ea9..b4da61ca1b797729710c4fd83c15404ceb802e87 100644 (file)
--- a/gosa-plugins/goto/personal/environment/class_selectPrinterDialog.inc
+++ b/gosa-plugins/goto/personal/environment/class_selectPrinterDialog.inc
@@ -37,7 +37,7 @@ class selectPrinterDialog extends plugin
     /* Load possible departments */
     $ui= get_userinfo();
     $this->ui = $ui;
-    $tdeps= $ui->get_module_departments("users");
+    $tdeps= $ui->get_module_departments("printer");
     $ids = $this->config->idepartments;
     $first = "";
     $found = FALSE;
@@ -89,10 +89,10 @@ class selectPrinterDialog extends plugin
     $smarty->assign("apply", apply_filter());
     $smarty->assign("alphabet", generate_alphabet());
     $smarty->assign("subtrees", $this->subtreesearch?"checked":"");
-    $smarty->assign("search_image", get_template_path('images/search.png'));
-    $smarty->assign("tree_image", get_template_path('images/tree.png'));
+    $smarty->assign("search_image", get_template_path('images/lists/search.png'));
+    $smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png'));
     $smarty->assign("infoimage", get_template_path('images/info.png'));
-    $smarty->assign("launchimage", get_template_path('images/small_filter.png'));
+    $smarty->assign("launchimage", get_template_path('images/lists/action.png'));
     $smarty->assign("deplist", $this->config->idepartments);
 
     $display.= $smarty->fetch(get_template_path('selectPrinterDialog.tpl', TRUE,dirname(__FILE__)));
@@ -131,20 +131,16 @@ class selectPrinterDialog extends plugin
     if ($this->subtreesearch){
       $res    = get_list($filter,$module,$base,$attrs, GL_SIZELIMIT | GL_SUBSEARCH);
     } else {
-      $base= get_ou('printerou').$base;
+      $base= get_ou('printerRDN').$base;
       $res    = get_list($filter,$module,$base,$attrs, GL_SIZELIMIT );
     }
 
     foreach($res as $printer)  {
-
-      $acl = $this->ui->get_permissions($printer['dn'],"printer/printgeneric","gotoUserPrinter");
-
+      $acl = $this->ui->get_permissions($printer['dn'],"printer/printgeneric","gotoUserPrinter");;
       if(!preg_match("/w/",$acl)){
         continue;
       }
-
       if(isset($this->AlreadyAssigned[$printer['cn'][0]])) continue;
-
       if($detailed ==true){
         $a_return[$printer['cn'][0]] = $printer;
       }else{
@@ -159,9 +155,5 @@ class selectPrinterDialog extends plugin
   }
 }
 
-
-
-
-
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>