From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 20 Sep 2010 08:38:53 +0000 (+0000)
Subject: Updated ppManager
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=36307f321fc102e2e1ab571afc1b978cf05b0e08;p=gosa.git

Updated ppManager
-Added nickname to list of collected attributes per ppd file.


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

diff --git a/gosa-plugins/goto/admin/systems/ppd/class_ppdManager.inc b/gosa-plugins/goto/admin/systems/ppd/class_ppdManager.inc
index 10bea7f05..d75fa472b 100644
--- a/gosa-plugins/goto/admin/systems/ppd/class_ppdManager.inc
+++ b/gosa-plugins/goto/admin/systems/ppd/class_ppdManager.inc
@@ -358,9 +358,12 @@ class ppdManager
             if (preg_match('/^\*ModelName:/i', $line)){
                 $ppdDesc['model'] = trim(preg_replace('/^\*ModelName:\s+"?([^"]+)"?.*$/i', '\1', $line));
             }
+            if (preg_match('/^\*ShortNickName:/i', $line)) { 
+                $ppdDesc['nickname'] = trim(preg_replace('/^\*ShortNickName:\s+"?([^"]+)"?.*$/i', '\1', $line)); 
+            } 
 
             /* Got everything we need? Skip rest for speed reasons... */
-            if (isset($ppdDesc['manufacturer'])  && isset($ppdDesc['model'])){
+            if (isset($ppdDesc['manufacturer'])  && isset($ppdDesc['model']) && isset($ppdDesc['nickname'])){
                 break;
             }
         }