Removed get_printer_list references

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

diff --git a/Changelog b/Changelog
index 88712e935a9a6c1e2789d51e59118fb05098719c..bd50c5fcf86ca4995c67443549d77967f49b0336 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -3,6 +3,7 @@ GOsa2 changelog
 
 * gosa 2.5.7
   - Include personal title in DN
 
 * gosa 2.5.7
   - Include personal title in DN

+  - Added function to remove PPD's from disc

 
 * gosa 2.5.6
   - Copy & paste implemented into FAI
 
 * gosa 2.5.6
   - Copy & paste implemented into FAI

diff --git a/plugins/personal/posix/class_posixAccount.inc b/plugins/personal/posix/class_posixAccount.inc
index 15e0e67968564b3e95d3022fcc1ccaee369a6fd4..7b67755454613eedb6a55751835f650469203aba 100644 (file)
--- a/plugins/personal/posix/class_posixAccount.inc
+++ b/plugins/personal/posix/class_posixAccount.inc
@@ -52,7 +52,6 @@ class posixAccount extends plugin
   var $use_shadowExpire= "0";
   var $must_change_password= "0";
   var $force_ids= 0;
   var $use_shadowExpire= "0";
   var $must_change_password= "0";
   var $force_ids= 0;

-  var $printerList= array();

   var $group_dialog= FALSE;
   var $show_ws_dialog= FALSE;
   var $secondaryGroups= array();
   var $group_dialog= FALSE;
   var $show_ws_dialog= FALSE;
   var $secondaryGroups= array();


@@ -67,7 +66,7 @@ class posixAccount extends plugin
   var $SubSearch        = false;
 
   /* attribute list for save action */
   var $SubSearch        = false;
 
   /* attribute list for save action */

-  var $CopyPasteVars  = array("grouplist","groupMembership","use_shadowMin","use_shadowMax","use_shadowWarning","use_shadowInactive","use_shadowExpire","must_change_password","printerList","grouplist","savedGidNumber","savedUidNumber");
+  var $CopyPasteVars  = array("grouplist","groupMembership","use_shadowMin","use_shadowMax","use_shadowWarning","use_shadowInactive","use_shadowExpire","must_change_password","grouplist","savedGidNumber","savedUidNumber");

   var $attributes     = array("homeDirectory", "loginShell", "uidNumber", "gidNumber", "gecos",
       "shadowMin", "shadowMax", "shadowWarning", "shadowInactive", "shadowLastChange",
       "shadowExpire", "gosaDefaultPrinter", "gosaDefaultLanguage", "uid","accessTo","trustModel");
   var $attributes     = array("homeDirectory", "loginShell", "uidNumber", "gidNumber", "gecos",
       "shadowMin", "shadowMax", "shadowWarning", "shadowInactive", "shadowLastChange",
       "shadowExpire", "gosaDefaultPrinter", "gosaDefaultLanguage", "uid","accessTo","trustModel");


@@ -192,12 +191,6 @@ class posixAccount extends plugin
       $this->loginShellList[]= $this->loginShell;
     }
 
       $this->loginShellList[]= $this->loginShell;
     }
 

-    /* Generate printer list */
-    if (isset($this->config->data['SERVERS']['CUPS'])){
-      $this->printerList= get_printer_list ($this->config->data['SERVERS']['CUPS']);
-      asort($this->printerList);
-    }
-

     /* Set tag attribute if we've tagging activated */
     $filter= "(objectClass=posixGroup)";
     $ui= get_userinfo();
     /* Set tag attribute if we've tagging activated */
     $filter= "(objectClass=posixGroup)";
     $ui= get_userinfo();


@@ -501,7 +494,6 @@ class posixAccount extends plugin
     } else {
       $smarty->assign("groups", "");
     }
     } else {
       $smarty->assign("groups", "");
     }

-    $smarty->assign("printerList", $this->printerList);

     $smarty->assign("languages", $this->config->data['MAIN']['LANGUAGES']);
 
        /* Avoid "Undefined index: forceMode" */
     $smarty->assign("languages", $this->config->data['MAIN']['LANGUAGES']);
 
        /* Avoid "Undefined index: forceMode" */