[tokkee]

tokkee.org

Code

projects / gosa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 117f5ee612e8b00c3ff6d3f87c956c5c0414a635..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;
@@ -65,11 +70,11 @@ class printgeneric extends plugin
 
     /* Update dn, to ensure storing as printer instead of WS / terminal */
     if(preg_match("/Terminal/i",$this->BelongsTo) || preg_match("/TerminalTemplate/i",$this->BelongsTo)){
-      $this->dn= preg_replace("/".preg_quote(get_ou('terminalRDN'), '/')."/",get_ou('printerRDN'),$this->dn);
+      $this->dn= preg_replace("/".preg_quote(get_ou('terminalRDN'), '/')."/i",get_ou('printerRDN'),$this->dn);
     }
 
     if(preg_match("/Workstation/i",$this->BelongsTo) || preg_match("/WorkstationTemplate/i",$this->BelongsTo)){
-      $this->dn= preg_replace("/".preg_quote(get_ou('workstationRDN'), '/')."/",get_ou('printerRDN'),$this->dn);
+      $this->dn= preg_replace("/".preg_quote(get_ou('workstationRDN'), '/')."/i",get_ou('printerRDN'),$this->dn);
     }
 
     $this->orig_dn = $this->dn;
@@ -98,10 +103,10 @@ class printgeneric extends plugin
     } else {
     
       /* Set base and check if the extracted base exists */
-      if(preg_match("/".preg_quote(get_ou('systemIncomingRDN'), '/')."/",$this->dn)){
-        $this->base= preg_replace("/".preg_quote(get_ou('systemIncomingRDN'), '/')."/","",dn2base($this->dn));
+      if(preg_match("/".preg_quote(get_ou('systemIncomingRDN'), '/')."/i",$this->dn)){
+        $this->base= preg_replace("/".preg_quote(get_ou('systemIncomingRDN'), '/')."/i","",dn2base($this->dn));
       }else{
-        $this->base= preg_replace("/".preg_quote(get_ou('printerRDN'), '/')."/","",dn2base($this->dn));
+        $this->base= preg_replace("/".preg_quote(get_ou('printerRDN'), '/')."/i","",dn2base($this->dn));
       }
 
       if(!isset($this->config->idepartments[$this->base])){
@@ -244,11 +249,11 @@ class printgeneric extends plugin
       /* Update dn, to ensure storing as printer instead of WS / terminal
        */
       if(preg_match("/terminal/i",$this->BelongsTo)){
-        $this->dn= preg_replace("/".preg_quote(get_ou('terminalRDN'), '/')."/",get_ou('printerRDN'),$this->dn);
+        $this->dn= preg_replace("/".preg_quote(get_ou('terminalRDN'), '/')."/i",get_ou('printerRDN'),$this->dn);
       }
 
       if(preg_match("/workstation/i",$this->BelongsTo)){
-        $this->dn= preg_replace("/".preg_quote(get_ou('workstationRDN'), '/')."/",get_ou('printerRDN'),$this->dn);
+        $this->dn= preg_replace("/".preg_quote(get_ou('workstationRDN'), '/')."/i",get_ou('printerRDN'),$this->dn);
       }
 
       /* Detect if this is a valid printer account;
@@ -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      */
@@ -433,7 +435,7 @@ class printgeneric extends plugin
       if($this->PPDdialogToSave && is_object($this->PPDdialogToSave)){
         $this->dialog = $this->PPDdialogToSave;
       }else{
-  
+ 
         if(is_array($this->gotoPrinterPPD)){
           $this->dialog = new printerPPDDialog($this->config, $this->dn,"");
         }else{
@@ -441,6 +443,16 @@ class printgeneric extends plugin
         }
         $this->dialog->cn= $this->cn;
       }
+
+      // Detect edit acl base
+      $ldap = $this->config->get_ldap_link();
+      if($ldap->dn_exists($this->dn)){
+        $acl_base = $this->dn;
+      }else{
+        $acl_base = $this->base;
+      }
+
+      $this->dialog->set_acl_base($acl_base);
     }
 
     /* remove ppd */
@@ -511,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();
@@ -618,11 +655,11 @@ class printgeneric extends plugin
       /* Update dn, to ensure storing as printer instead of WS / terminal
        */
       if(preg_match("/terminal/i",$this->BelongsTo)){
-        $this->dn= preg_replace("/".preg_quote(get_ou('terminalRDN'), '/').",/",get_ou('printerRDN'),$this->dn);
+        $this->dn= preg_replace("/".preg_quote(get_ou('terminalRDN'), '/').",/i",get_ou('printerRDN'),$this->dn);
       }
 
       if(preg_match("/workstation/i",$this->BelongsTo)){
-        $this->dn= preg_replace("/".preg_quote(get_ou('workstationRDN'), '/')."/",get_ou('printerRDN'),$this->dn);
+        $this->dn= preg_replace("/".preg_quote(get_ou('workstationRDN'), '/')."/i",get_ou('printerRDN'),$this->dn);
       }
 
       /* Check if this dn points to a printer, to avoid deleting something else */
@@ -769,11 +806,11 @@ class printgeneric extends plugin
     /* Update dn, to ensure storing as printer instead of WS / terminal
      */
     if(preg_match("/terminal/i",$this->BelongsTo)){
-      $this->dn= preg_replace("/".preg_quote(get_ou('terminalRDN'), '/')."/",get_ou('printerRDN'),$this->dn);
+      $this->dn= preg_replace("/".preg_quote(get_ou('terminalRDN'), '/')."/i",get_ou('printerRDN'),$this->dn);
     }
 
     if(preg_match("/workstation/i",$this->BelongsTo)){
-      $this->dn= preg_replace("/".preg_quote(get_ou('workstationRDN'), '/')."/",get_ou('printerRDN'),$this->dn);
+      $this->dn= preg_replace("/".preg_quote(get_ou('workstationRDN'), '/')."/i",get_ou('printerRDN'),$this->dn);
     }
     
     if(!$this->is_account) return;
@@ -803,6 +840,7 @@ class printgeneric extends plugin
 
     /* save ppd configuration */
     if($this->PPDdialogToSave && is_object($this->PPDdialogToSave)){
+    
       $this->PPDdialogToSave->save_ppd();
 
       /* Rename the generated ppd to match the gzip ending '.gz', if necessary.
@@ -823,7 +861,7 @@ class printgeneric extends plugin
         }
       }
     }
-    if($this->orig_dn != $this->dn){
+    if($this->orig_dn != $this->dn && $this->orig_dn != "new"){
       if(!empty($this->gotoPrinterPPD)) {
         $this->PPDdialogToSave = new printerPPDDialog($this->config, $this->dn,$this->gotoPrinterPPD);
         $this->PPDdialogToSave->cn = $this->cn;
@@ -841,7 +879,7 @@ class printgeneric extends plugin
     }
 
     /* If no ppd is selected, remove this attribute */
-    if(!empty($this->gotoPrinterPPD) && $this->initially_was_account) {
+    if(!empty($this->gotoPrinterPPD)) {
       $this->gotoPrinterPPD = $this->ppdServerPart.'/'.$this->gotoPrinterPPD;
     }else{
       $this->gotoPrinterPPD = array();
@@ -904,7 +942,7 @@ class printgeneric extends plugin
     }
 
     /* Ensure to create a new object */
-    if(preg_match("/".preg_quote(get_ou('systemIncomingRDN'), '/')."/",$this->orig_dn)){
+    if(preg_match("/".preg_quote(get_ou('systemIncomingRDN'), '/')."/i",$this->orig_dn)){
       $this->orig_dn = "new";
     }
 
@@ -1120,6 +1158,13 @@ class printgeneric extends plugin
 
     $this->gotoPrinterPPD = "";
   }
+
+
+  function is_modal_dialog()
+  {
+    return((isset($this->dialog) && $this->dialog) || (isset($this->netConfigDNS->dialog) && $this->netConfigDNS->dialog));
+  }
+
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
GONICUS system administrator (SVN clone)