Updated member selection for printer

[gosa.git] / gosa-plugins / goto / admin / systems / goto / class_printGeneric.inc

diff --git a/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc
index 56a01d94c81ad58ecc6202f6ba29d237c035eb9f..f584a00693c71a60307469f0975c243d69565922 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc
@@ -49,6 +49,11 @@ class printgeneric extends plugin
   var $view_logged    = FALSE;
   var $parent;
 
+
+  // Memeber dialog object
+  var $userSelect;
+  var $adminUserSelect;
+
   function printgeneric (&$config, $dn,$parent_init,$parent)
   {
     $this->config = &$config;
@@ -415,17 +420,14 @@ class printgeneric extends plugin
       $smarty->assign("$attr", $this->$attr);
     }
 
+    // Act on add user/grouo requests 
     if(isset($_POST['AddUser'])){
-      $this->dialog = new selectUserToPrinterDialog($this->config, NULL,"AddUser",$this->member);
-    }
-    if(isset($_POST['AddGroup'])){
-      $this->dialog = new selectUserToPrinterDialog($this->config, NULL,"AddGroup",$this->member);
+      $this->userSelect = new userGroupSelect($this->config, get_userinfo());
+      $this->dialog = TRUE;
     }
     if(isset($_POST['AddAdminUser'])){
-      $this->dialog = new selectUserToPrinterDialog($this->config, NULL,"AddAdminUser",$this->member);
-    }
-    if(isset($_POST['AddAdminGroup'])){
-      $this->dialog = new selectUserToPrinterDialog($this->config, NULL,"AddAdminGroup",$this->member);
+      $this->adminUserSelect = new userGroupSelect($this->config, get_userinfo());
+      $this->dialog = TRUE;
     }
 
     /* Display ppd configure/select dialog      */
@@ -521,30 +523,55 @@ class printgeneric extends plugin
       }
     }
 
-    /* Abort user / group adding dialog */
-    if(isset($_POST['PrinterCancel'])){
-      unset($this->dialog);
-      $this->dialog= FALSE;
+    // Abort user / group adding dialog 
+    if(isset($_POST['userGroupSelect_cancel'])){
+      $this->dialog=FALSE;
+      $this->userSelect = NULL;
+      $this->adminUserSelect = NULL;
+    }
+
+    // Save selected users / groups 
+    if(isset($_POST['userGroupSelect_save'])){
+      $users = array();
+      if($this->userSelect instanceOf userGroupSelect){
+        $users = $this->userSelect->save();
+        $add = '';
+      }elseif($this->adminUserSelect instanceOf userGroupSelect){
+        $users = $this->adminUserSelect->save();
+        $add = 'Admin';
+      }
+      foreach($users as $user){
+        if(in_array('gosaAccount', $user['objectClass'])){
+          $type = 'Add'.$add.'User';  
+        }else{
+          $type = 'Add'.$add.'Group';  
+        }
+        $this->AddMember($type, $user['dn']);
+      }
+      $this->dialog=FALSE;
+      $this->userSelect = NULL;
+      $this->adminUserSelect = NULL;
     }
 
-    /* Save selected users / groups */
-    if(isset($_POST['PrinterSave'])){
-      $this->dialog->save_object();
-      if(count($this->dialog->check())){
-        foreach($this->dialog->check() as $msg){
-          msg_dialog::display(_("Error"), $msg, ERROR_DIALOG);
-        }
-      }else{
-        $data= $new = $this->dialog->save();
-        unset($data['type']);
-        foreach($data as $mem){
-          $this->AddMember($new['type'], $mem['dn']);
+    // Display add user/group dialogs 
+    if($this->userSelect instanceOf userGroupSelect || $this->adminUserSelect instanceOf userGroupSelect){
+
+      // Build up blocklist
+      $used = array();
+      foreach($this->member as $type => $members){
+        foreach($members as $member){
+          $used['dn'][] = $member['dn'];
         }
-        unset($this->dialog);
-        $this->dialog=FALSE;
+      }
+      session::set('filterBlacklist', $used);
+      if($this->userSelect instanceOf userGroupSelect){
+        return($this->userSelect->execute());
+      }elseif($this->adminUserSelect instanceOf userGroupSelect){
+        return($this->adminUserSelect->execute());
       }
     }
 
+
     /* Display dialog, if there is currently one open*/
     if(is_object($this->dialog)){
       $this->dialog->save_object();