From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 20 Sep 2010 08:49:41 +0000 (+0000)
Subject: Updated ppd list for print generic
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=47d2161eff8b7b5ddc021146e22fb7895094ac83;p=gosa.git

Updated ppd list for print generic
-Allow to have multiple ppd files for a single printer.


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

diff --git a/gosa-plugins/goto/admin/systems/ppd/class_printerPPDDialog.inc b/gosa-plugins/goto/admin/systems/ppd/class_printerPPDDialog.inc
index 5cb74be5a..fa72e7110 100644
--- a/gosa-plugins/goto/admin/systems/ppd/class_printerPPDDialog.inc
+++ b/gosa-plugins/goto/admin/systems/ppd/class_printerPPDDialog.inc
@@ -369,6 +369,12 @@ class printerPPDDialog extends plugin
             /* Sort all available files, and create header (Vendor index) */
             foreach($tmp as $file=>$ppd){
 
+                // Append the nickname to the ppds name, to be able to have multiple 
+                //  ppd files for a printer type
+                if(isset($ppd['nickname']) && !empty($ppd['nickname'])){
+                    $ppd['name'] .= " (".$ppd['nickname'].")";
+                }
+
                 if(preg_match("#".preg_quote($this->pathToModified,'#')."#",$file)) continue;
 
                 if(!isset($ppd['manufacturer'])) continue;