X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=gosa-plugins%2Fgoto%2Fadmin%2Fsystems%2Fgoto%2Fclass_printGeneric.inc;h=39746e916a0c643fb1a7a57da9a91d2ce7a065f1;hb=f09bbee3265916598df06229de8ba974d062f39a;hp=e296759f613fdfc2f33251d92ef93fdd7dc5f5b0;hpb=0b63285a25b8f230d5914bc341e8bae55e9ff09e;p=gosa.git

diff --git a/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc
index e296759f6..39746e916 100644
--- a/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc
@@ -41,6 +41,7 @@ class printgeneric extends plugin
   var $gotoGroupAdminPrinter ;
   var $gotoGroupPrinter;
   var $gotoUserPrinter ;
+  var $baseSelector;
 
   /* attribute list for save action */
   var $attributes     = array("cn", "description", "l", "labeledURI", "gotoPrinterPPD","gotoUserPrinter", "macAddress", 
@@ -49,6 +50,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 +71,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'), '/')."/i",get_ou('printerRDN'),$this->dn);
+      $this->dn= preg_replace("/".preg_quote(get_ou("workgeneric", "workstationRDN") , '/')."/i",get_ou("workgeneric", "workstationRDN") ,$this->dn);
     }
 
     if(preg_match("/Workstation/i",$this->BelongsTo) || preg_match("/WorkstationTemplate/i",$this->BelongsTo)){
-      $this->dn= preg_replace("/".preg_quote(get_ou('workstationRDN'), '/')."/i",get_ou('printerRDN'),$this->dn);
+      $this->dn= preg_replace("/".preg_quote(get_ou("workgeneric", "workstationRDN") , '/')."/i",get_ou("workgeneric", "workstationRDN") ,$this->dn);
     }
 
     $this->orig_dn = $this->dn;
@@ -93,15 +99,15 @@ class printgeneric extends plugin
     /* Set base */
     if ($this->dn == "new"){
       $ui= get_userinfo();
-      $this->base= dn2base($ui->dn);
+      $this->base= dn2base(session::global_is_set("CurrentMainBase")?"cn=dummy,".session::global_get("CurrentMainBase"):$ui->dn);
       $this->cn= "";
     } else {
     
       /* Set base and check if the extracted base exists */
-      if(preg_match("/".preg_quote(get_ou('systemIncomingRDN'), '/')."/i",$this->dn)){
-        $this->base= preg_replace("/".preg_quote(get_ou('systemIncomingRDN'), '/')."/i","",dn2base($this->dn));
+      if(preg_match("/".preg_quote(get_ou("workgeneric", "workstationRDN") , '/')."/i",$this->dn)){
+        $this->base= preg_replace("/".preg_quote(get_ou("workgeneric", "workstationRDN") , '/')."/i","",dn2base($this->dn));
       }else{
-        $this->base= preg_replace("/".preg_quote(get_ou('printerRDN'), '/')."/i","",dn2base($this->dn));
+        $this->base= preg_replace("/".preg_quote(get_ou("workgeneric", "workstationRDN") , '/')."/i","",dn2base($this->dn));
       }
 
       if(!isset($this->config->idepartments[$this->base])){
@@ -171,6 +177,12 @@ class printgeneric extends plugin
     }
     $this->orig_cn    = $this->cn;
     $this->orig_base  = $this->base;
+
+    /* Instanciate base selector */
+    $this->baseSelector= new baseSelector($this->get_allowed_bases(), $this->base);
+    $this->baseSelector->setSubmitButton(false);
+    $this->baseSelector->setHeight(300);
+    $this->baseSelector->update(true);
   }
 
   function set_acl_base($base)
@@ -244,11 +256,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'), '/')."/i",get_ou('printerRDN'),$this->dn);
+        $this->dn= preg_replace("/".preg_quote(get_ou("workgeneric", "workstationRDN") , '/')."/i",get_ou("workgeneric", "workstationRDN") ,$this->dn);
       }
 
       if(preg_match("/workstation/i",$this->BelongsTo)){
-        $this->dn= preg_replace("/".preg_quote(get_ou('workstationRDN'), '/')."/i",get_ou('printerRDN'),$this->dn);
+        $this->dn= preg_replace("/".preg_quote(get_ou("workgeneric", "workstationRDN") , '/')."/i",get_ou("workgeneric", "workstationRDN") ,$this->dn);
       }
 
       /* Detect if this is a valid printer account;
@@ -310,6 +322,7 @@ class printgeneric extends plugin
 
     $smarty= get_smarty();
 
+
     /* Assign acls */
     $tmp = $this->plInfo();
     foreach($tmp['plProvidedAcls'] as $name => $translation){
@@ -370,51 +383,13 @@ class printgeneric extends plugin
       }
     }
 
-    /* Base select dialog */
-    $once = true;
-    foreach($_POST as $name => $value){
-      if(preg_match("/^chooseBase/",$name) && $once && $this->acl_is_moveable()){
-        $once = false;
-        $this->dialog = new baseSelectDialog($this->config,$this,$this->get_allowed_bases());
-        $this->dialog->setCurrentBase($this->base);
-        $this->baseSelection = true;
-      }
-    }
-
-    /* Dialog handling for base select dialog
-     * Check if base was selected, dialog aborted etc */
-    if(is_object($this->dialog)){
-
-      $this->dialog->save_object();
-      if($this->baseSelection){
-        if($this->dialog->isClosed()){
-          $this->dialog = false;
-          $this->baseSelection = false;
-        }elseif($this->dialog->isSelected()){
-
-          /* A new base was selected, check if it is a valid one */
-          $tmp = $this->get_allowed_bases();
-          if(isset($tmp[$this->dialog->isSelected()])){
-            $this->base = $this->dialog->isSelected();
-          }
-
-          $this->dialog= false;
-          $this->baseSelection = false;
-        }else{
-          return($this->dialog->execute());
-        }
-      }
-    }
-
-    /* Fill templating stuff */
-    $smarty->assign("bases", $this->get_allowed_bases());
-    $smarty->assign("base_select", $this->base);
-
     /* Assign attributes */
     foreach ($this->attributes as $attr){
       $smarty->assign("$attr", $this->$attr);
     }
 
+    $smarty->assign("base", $this->baseSelector->render());
+
     // Act on add user/grouo requests 
     if(isset($_POST['AddUser'])){
       $this->userSelect = new userGroupSelect($this->config, get_userinfo());
@@ -530,24 +505,40 @@ class printgeneric extends plugin
       $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){
-        print_a($user);
-#       foreach($data as $mem){
-#         $this->AddMember($new['type'], $mem['dn']);
-#       }
+        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;
     }
 
-    if($this->userSelect instanceOf userGroupSelect){
-      return($this->userSelect->execute());
-    }elseif($this->adminUserSelect instanceOf userGroupSelect){
-      return($this->adminUserSelect->execute());
+    // 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'];
+        }
+      }
+      session::set('filterBlacklist', $used);
+      if($this->userSelect instanceOf userGroupSelect){
+        return($this->userSelect->execute());
+      }elseif($this->adminUserSelect instanceOf userGroupSelect){
+        return($this->adminUserSelect->execute());
+      }
     }
 
 
@@ -560,8 +551,8 @@ class printgeneric extends plugin
 
     /* Parse selected ppd file */
     $config = session::get('config');
-    if ($config->get_cfg_value("ppdPath") != ""){
-      $path = $config->get_cfg_value("ppdPath");
+    if ($config->get_cfg_value("core","ppdPath") != ""){
+      $path = $config->get_cfg_value("core","ppdPath");
       if(!preg_match("/\/$/",$path)){
         $path = $path."/";
       }
@@ -634,11 +625,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'), '/').",/i",get_ou('printerRDN'),$this->dn);
+        $this->dn= preg_replace("/".preg_quote(get_ou("workgeneric", "workstationRDN") , '/').",/i",get_ou("workgeneric", "workstationRDN") ,$this->dn);
       }
 
       if(preg_match("/workstation/i",$this->BelongsTo)){
-        $this->dn= preg_replace("/".preg_quote(get_ou('workstationRDN'), '/')."/i",get_ou('printerRDN'),$this->dn);
+        $this->dn= preg_replace("/".preg_quote(get_ou("workgeneric", "workstationRDN") , '/')."/i",get_ou("workgeneric", "workstationRDN") ,$this->dn);
       }
 
       /* Check if this dn points to a printer, to avoid deleting something else */
@@ -703,13 +694,17 @@ class printgeneric extends plugin
       $this->netConfigDNS->save_object();
     }
     
-    /* Set new base if allowed */
-    $tmp = $this->get_allowed_bases();
-    if(isset($_POST['base'])){
-      if(isset($tmp[$_POST['base']])){
-        $this->base= $_POST['base'];
+    /* Refresh base */
+    if ($this->acl_is_moveable($this->base)){
+      if (!$this->baseSelector->update()) {
+        msg_dialog::display(_("Error"), msgPool::permMove(), ERROR_DIALOG);
+      }
+      if ($this->base != $this->baseSelector->getBase()) {
+        $this->base= $this->baseSelector->getBase();
+        $this->is_modified= TRUE;
       }
     }
+
   }
 
   /* Check supplied data */
@@ -732,13 +727,18 @@ class printgeneric extends plugin
       }
     }
 
-    $dn= "cn=".$this->cn.get_ou('printerRDN').",".$this->base;
+    $dn= "cn=".$this->cn.get_ou("workgeneric", "workstationRDN") .",".$this->base;
 
     /* must: cn */
     if(($this->BelongsTo == "Printer") && $this->cn == ""){
       $message[]= msgPool::required(_("Name"));
     }
 
+    // Check if a wrong base was supplied
+    if(!$this->baseSelector->checkLastBaseUpdate()){
+      $message[]= msgPool::check_base();
+    }
+
     /* must: cn */
     if(($this->BelongsTo == "Printer") && !tests::is_dns_name($this->cn)){
       $message[]= msgPool::invalid(_("Name"));
@@ -753,7 +753,7 @@ class printgeneric extends plugin
     if (($this->orig_dn != $dn)&&( preg_match("/printer/i",$this->BelongsTo))){
       $ldap= $this->config->get_ldap_link();
       $ldap->cd ($this->base);
-      $ldap->ls("(cn=".$this->cn.")",get_ou('printerRDN').$this->base, array("cn"));
+      $ldap->ls("(cn=".$this->cn.")",get_ou("workgeneric", "workstationRDN") .$this->base, array("cn"));
       if ($ldap->count() != 0){
         while ($attrs= $ldap->fetch()){
           if(preg_match("/cn=dhcp,/",$attrs['dn'])){
@@ -785,11 +785,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'), '/')."/i",get_ou('printerRDN'),$this->dn);
+      $this->dn= preg_replace("/".preg_quote(get_ou("workgeneric", "workstationRDN") , '/')."/i",get_ou("workgeneric", "workstationRDN") ,$this->dn);
     }
 
     if(preg_match("/workstation/i",$this->BelongsTo)){
-      $this->dn= preg_replace("/".preg_quote(get_ou('workstationRDN'), '/')."/i",get_ou('printerRDN'),$this->dn);
+      $this->dn= preg_replace("/".preg_quote(get_ou("workgeneric", "workstationRDN") , '/')."/i",get_ou("workgeneric", "workstationRDN") ,$this->dn);
     }
     
     if(!$this->is_account) return;
@@ -824,7 +824,7 @@ class printgeneric extends plugin
 
       /* Rename the generated ppd to match the gzip ending '.gz', if necessary.
       */
-      $path = $this->config->get_cfg_value("ppdPath");
+      $path = $this->config->get_cfg_value("core","ppdPath");
       if(!preg_match("/\/$/",$path)){
         $path = $path."/";
       }
@@ -921,7 +921,7 @@ class printgeneric extends plugin
     }
 
     /* Ensure to create a new object */
-    if(preg_match("/".preg_quote(get_ou('systemIncomingRDN'), '/')."/i",$this->orig_dn)){
+    if(preg_match("/".preg_quote(get_ou("workgeneric", "workstationRDN") , '/')."/i",$this->orig_dn)){
       $this->orig_dn = "new";
     }
 
@@ -999,12 +999,27 @@ class printgeneric extends plugin
           "plSection"     => array("administration"),
           "plCategory"    => array("printer" => array("description"  => _("Printer"),
                                                     "objectClass"  => "gotoPrinter"),"workstation","terminal"),
+          "plProperties" =>
+          array(
+              array(
+                  "name"          => "printerRDN",
+                  "type"          => "rdn",
+                  "default"       => "ou=printers,ou=systems,",
+                  "description"   => "The 'printerRDN' statement defines the location where new printers will be created. The default is 'ou=printers,ou=systems,'.",
+                  "check"         => "gosaProperty::isRdn",
+                  "migrate"       => "",
+                  "group"         => "plugin",
+                  "mandatory"     => FALSE
+                  )
+              ),
+
           "plProvidedAcls"=> array(
             "cn"                => _("Name"),
             "base"                => _("Base") ,         
             "description"       => _("Description"), 
             "l"                 => _("Location"), 
             "labeledURI"        => _("LabeledURL"), 
+            "macAddress"        => _("Mac address"), 
             "gotoPrinterPPD"    => _("Printer PPD"),
             "gotoUserPrinter"   => _("Permissions")) 
           ));