X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-plugins%2Fgoto%2Fpersonal%2Fenvironment%2Fclass_selectPrinterDialog.inc;h=71023aa93325192df62398aab5936b4b5e6982ea;hb=2fad372fadd10bf7636516af03bcac2e3db0c81f;hp=a3bac86f052b53c981f10c07881e8c9e30f00197;hpb=38fa986fac140f784bcc40447888a40d56321786;p=gosa.git

diff --git a/gosa-plugins/goto/personal/environment/class_selectPrinterDialog.inc b/gosa-plugins/goto/personal/environment/class_selectPrinterDialog.inc
index a3bac86f0..71023aa93 100644
--- 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;
@@ -80,19 +80,19 @@ class selectPrinterDialog extends plugin
     }
 
     $printer_list = $this->getPrinter(); 
+		asort($printer_list);
 
     $smarty->assign("regexPrinter"    ,$this->regex);
     $smarty->assign("deplistPrinter"  ,$this->deplist);
     $smarty->assign("depselectPrinter",$this->depselect);
     $smarty->assign("gotoPrinters",$printer_list);
-    $smarty->assign("gotoPrinterKeys",array_flip($printer_list));
     $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__)));
@@ -104,7 +104,7 @@ class selectPrinterDialog extends plugin
     $message= plugin::check();
 
     if(empty($_POST['gotoPrinter'])){
-      $message[] = _("Please select a printer or press cancel.");
+      $message[] = _("Please select a printer!");
     }
     return $message;
   }
@@ -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:
 ?>