X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_printGeneric.inc;h=021c75f9d0f5b6864dbd6fbe27e31abb6d306aac;hb=269b6da4461630896e0af284cca9742b9f819f2b;hp=4f33ca2cd3e1d62ed2eacd4c62d9faf44ec0ea7c;hpb=2580ea11e212988069352983267493241a2ede21;p=gosa.git

diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc
index 4f33ca2cd..021c75f9d 100644
--- a/plugins/admin/systems/class_printGeneric.inc
+++ b/plugins/admin/systems/class_printGeneric.inc
@@ -66,18 +66,18 @@ class printgeneric extends plugin
     }
 
     /* Update dn, to ensure storing as printer instead of WS / terminal */
-    if($this->BelongsTo == "Terminal"){
+    if(preg_match("/Terminal/i",$this->BelongsTo) || preg_match("/TerminalTemplate/i",$this->BelongsTo)){
       $this->dn= preg_replace("/ou=terminals,/","ou=printers,",$this->dn);
     }
 
-    if($this->BelongsTo == "Workstation"){
+    if(preg_match("/Workstation/i",$this->BelongsTo) || preg_match("/WorkstationTemplate/i",$this->BelongsTo)){
       $this->dn= preg_replace("/ou=workstations,/","ou=printers,",$this->dn);
     }
 
     $this->orig_dn = $this->dn;
 
     /* Get printer settings, possibly dn has changed */
-    plugin::plugin ($config, $this->dn,$parent_init);
+    plugin::plugin ($config, $this->dn);
 
     /* Get is_account initially_was_account status */
     $this->getTypeOfPrinter(true);
@@ -214,17 +214,17 @@ class printgeneric extends plugin
 
       /* If is printer it must be a true account.
        */
-      if($this->BelongsTo == "Printer"){
+      if(preg_match("/printer/i",$this->BelongsTo)){
         $this->is_account = true;
       }
 
       /* Update dn, to ensure storing as printer instead of WS / terminal
        */
-      if($this->BelongsTo == "Terminal"){
+      if(preg_match("/terminal/i",$this->BelongsTo)){
         $this->dn= preg_replace("/ou=terminals,/","ou=printers,",$this->dn);
       }
 
-      if($this->BelongsTo == "Workstation"){
+      if(preg_match("/workstation/i",$this->BelongsTo)){
         $this->dn= preg_replace("/ou=workstations,/","ou=printers,",$this->dn);
       }
 
@@ -253,7 +253,7 @@ class printgeneric extends plugin
     /* If type of printer couldn't be detected (because of missing parent object in construction) 
      * hide this tab.
      */
-    if($this->BelongsTo == "unknown"){
+    if(preg_match("/unknown/i",$this->BelongsTo)){
       $display= $this->show_enable_header(_("Add printer extension"),
           _("Could not intialize printer tab, parameter parent was missing while construction."),TRUE,TRUE);
       return($display);
@@ -261,22 +261,22 @@ class printgeneric extends plugin
 
     /* Templates can't have printer extensions 
      */
-    if($this->BelongsTo == "WorkstationTemplate"){
+    if(preg_match("/WorkstationTemplate/i",$this->BelongsTo)){
       $display= $this->show_enable_header(_("Add printer extension"),
           _("This is a workstation template, printer tab is disabled."),TRUE,TRUE);
       return($display);
     }
-    if($this->BelongsTo == "TerminalTemplate"){
+    if(preg_match("/TerminalTemplate/i",$this->BelongsTo)){
       $display= $this->show_enable_header(_("Add printer extension"),
           _("This is a terminal template, printer tab is disabled."),TRUE,TRUE);
       return($display);
     }
 
     /* Get cn from base object */
-    if($this->BelongsTo == "Workstation"){
+    if(preg_match("/^Workstation$/i",$this->BelongsTo)){
       $this->cn = $this->parent->by_object['workgeneric']->cn;
     }
-    if($this->BelongsTo == "Terminal"){
+    if(preg_match("/^Terminal$/i",$this->BelongsTo)){
       $this->cn = $this->parent->by_object['termgeneric']->cn;
     }
 
@@ -288,18 +288,10 @@ class printgeneric extends plugin
       $smarty->assign($name."ACL", $this->getacl($name));
     }
 
-    /* Create base acls */
-    $baseACL = $this->getacl("base");
-    if(!$this->acl_is_moveable()) {
-      $baseACL = preg_replace("/w/","",$baseACL);
-    }
-    $smarty->assign("baseACL",          $baseACL);
-
-
     $display="";
 
     /* Tell smarty if this is a standalone object or a terminal / WS depending printer */
-    if($this->BelongsTo == "Printer"){    
+    if(preg_match("/^Printer$/i",$this->BelongsTo)){    
       $smarty->assign("StandAlone",true);
     }else{
       $smarty->assign("StandAlone",false);
@@ -322,7 +314,7 @@ class printgeneric extends plugin
     }
 
     /* If this is a WS / Terminal depending printer, display account state button */
-    if($this->BelongsTo != "Printer"){
+    if(!preg_match("/^Printer$/i",$this->BelongsTo)){
       if((empty($this->cn)) && ($this->dn != "new")){
         $display= $this->show_enable_header(_("Add printer extension"),
             _("This object has printer extension disabled. You can't enable it while 'cn' is not present in entry. Possibly you are currently creating a new terminal template"),TRUE,TRUE);
@@ -331,18 +323,18 @@ class printgeneric extends plugin
       }
 
       if (($this->is_account)){
-        if($this->BelongsTo=="Workstation"){
+        if(preg_match("/^Workstation$/i",$this->BelongsTo)){
           $display= $this->show_disable_header(_("Remove printer extension"),
               _("This workstation has printer extension enabled.You can disable it by clicking below."));
-        }elseif($this->BelongsTo=="Terminal"){
+        }elseif(preg_match("/^Terminal$/i",$this->BelongsTo)){
           $display= $this->show_disable_header(_("Remove printer extension"),
               _("This terminal has printer extension enabled. You can disable it by clicking below."));
         }
       }else{
-        if($this->BelongsTo=="Workstation"){
+        if(preg_match("/^Workstation$/i",$this->BelongsTo)){
           $display= $this->show_disable_header(_("Add printer extension"),
               _("This workstation has printer extension disabled. You can enable it by clicking below."));
-        }elseif($this->BelongsTo=="Terminal"){
+        }elseif(preg_match("/^Terminal$/i",$this->BelongsTo)){
           $display= $this->show_enable_header(_("Add printer extension"),
               _("This terminal has printer extension disabled. You can enable it by clicking below."));
         }  
@@ -371,7 +363,13 @@ class printgeneric extends plugin
           $this->dialog = false;
           $this->baseSelection = false;
         }elseif($this->dialog->isSelected()){
-          $this->base = $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{
@@ -507,7 +505,7 @@ class printgeneric extends plugin
       $ppdManager= new ppdManager($path);
       if(!empty($this->gotoPrinterPPD)){
         if((!file_exists($path.$this->gotoPrinterPPD))){
-          $smarty->assign("driverInfo", "<b>".sprintf(_("Your currently selected PPD file '%s' doesn't exist."),$path.$this->gotoPrinterPPD))."</b>";
+          $smarty->assign("driverInfo", "<b>".sprintf(_("Your currently selected PPD file '%s' doesn't exist."),$path.$this->gotoPrinterPPD)."</b>");
         }else{
           $smarty->assign("driverInfo", $ppdManager->loadDescription($path.$this->gotoPrinterPPD));
         }
@@ -526,8 +524,8 @@ class printgeneric extends plugin
     asort($userlist);
     asort($adminlist);
 
-    if($this->BelongsTo != "Printer"){
-      if($this->BelongsTo == "Terminal"){
+    if(!preg_match("/Printer/i",$this->BelongsTo)){
+      if(preg_match("/Terminal/i",$this->BelongsTo)){
         $smarty->assign("desc"    ,sprintf(_("This printer belongs to terminal %s. You can't rename this printer."),"<b>".$this->cn."</b>"));
       }else{
         $smarty->assign("desc"    ,sprintf(_("This printer belongs to workstation %s. You can't rename this printer."),"<b>".$this->cn."</b>"));
@@ -543,7 +541,7 @@ class printgeneric extends plugin
     $smarty->assign("AdminMember"    ,$this->AdminMember);
     $smarty->assign("AdminMembers"   ,$adminlist);
     $smarty->assign("AdminMemberKeys",array_flip($adminlist));
-    if($this->BelongsTo == "Printer"){
+    if(preg_match("/Printer/i",$this->BelongsTo)){
       $smarty->assign("netconfig", $this->netConfigDNS->execute());
     } else {
       $smarty->assign("netconfig", "");
@@ -559,11 +557,11 @@ class printgeneric extends plugin
 
       /* Update dn, to ensure storing as printer instead of WS / terminal
        */
-      if($this->BelongsTo == "Terminal"){
+      if(preg_match("/terminal/i",$this->BelongsTo)){
         $this->dn= preg_replace("/ou=terminals,/","ou=printers,",$this->dn);
       }
 
-      if($this->BelongsTo == "Workstation"){
+      if(preg_match("/workstation/i",$this->BelongsTo)){
         $this->dn= preg_replace("/ou=workstations,/","ou=printers,",$this->dn);
       }
 
@@ -603,27 +601,22 @@ class printgeneric extends plugin
   /* Save data to object */
   function save_object()
   {
+    /* Create a base backup and reset the
+       base directly after calling plugin::save_object();
+       Base will be set seperatly a few lines below */
+    $base_tmp = $this->base;
     plugin::save_object();
-    
+    $this->base = $base_tmp;
+
     if(is_object($this->netConfigDNS)){
       $this->netConfigDNS->save_object();
     }
-
-    /* Save base, since this is no LDAP attribute */
-    if((isset($_POST['base'])) && ($this->acl_is_moveable()) ) {
-      $this->set_acl_base('dummy,'.$_POST['base']);
-      if($this->acl_is_moveable()){
-
-        if(isset($this->config->idepartments[$_POST['base']])){
-          $this->base = $_POST['base'];
-          if ($_POST['base'] != $this->base){
-            $this->is_modified= TRUE;
-          }
-        }
-      }else{
-
-        print_red(sprintf(_("You are not allowed to move this object to '%s'."),LDAP::fix($_POST['base'])));
-        $this->set_acl_base('dummy,'.$this->base);
+    
+    /* Set new base if allowed */
+    $tmp = $this->get_allowed_bases();
+    if(isset($_POST['base'])){
+      if(isset($tmp[$_POST['base']])){
+        $this->base= $_POST['base'];
       }
     }
   }
@@ -633,7 +626,7 @@ class printgeneric extends plugin
   {
     /* Call common method to give check the hook */
     $message= plugin::check();
-    if ($this->BelongsTo == 'printer'){
+    if (preg_match("/printer/i",$this->BelongsTo)){
       $message= array_merge($message, $this->netConfigDNS->check());
     }
 
@@ -651,11 +644,16 @@ class printgeneric extends plugin
     $dn= "cn=".$this->cn.",ou=printers,ou=systems,".$this->base;
 
     /* must: cn */
-    if(($this->BelongsTo == "Printer") && (empty($this->cn))){
+    if(preg_match("/printer/i",$this->BelongsTo) && (empty($this->cn))){
       $message[]= "The required field 'Printer name' is not set.";
     }
 
-    if($this->BelongsTo == "Printer"){
+    /* Set new acl base */
+    if($this->dn == "new") {
+      $this->set_acl_base($this->base);
+    }
+
+    if(preg_match("/printer/i",$this->BelongsTo)){
       if ($this->orig_dn == "new" && !$this->acl_is_createable()){
         $message[]= _("You have no permissions to create a group on this 'Base'.");
       }
@@ -667,7 +665,7 @@ class printgeneric extends plugin
     }
     
     /* Check if there is already an entry with this cn*/
-    if (($this->orig_dn != $dn)&&($this->BelongsTo == "Printer")){
+    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.")","ou=printers,ou=systems,".$this->base, array("cn"));
@@ -690,11 +688,11 @@ class printgeneric extends plugin
   {
     /* Update dn, to ensure storing as printer instead of WS / terminal
      */
-    if($this->BelongsTo == "Terminal"){
+    if(preg_match("/terminal/i",$this->BelongsTo)){
       $this->dn= preg_replace("/ou=terminals,/","ou=printers,",$this->dn);
     }
 
-    if($this->BelongsTo == "Workstation"){
+    if(preg_match("/workstation/i",$this->BelongsTo)){
       $this->dn= preg_replace("/ou=workstations,/","ou=printers,",$this->dn);
     }
     
@@ -710,7 +708,7 @@ class printgeneric extends plugin
     }
 
     /* If type is still unknown, the initialisation of this printer failed, abort. */
-    if($this->BelongsTo == "unknown"){
+    if(preg_match("/unknown/i",$this->BelongsTo)){
       return;
     }
 
@@ -779,16 +777,16 @@ class printgeneric extends plugin
       $this->attrs['gotoGroupAdminPrinter'][]=$mem['cn'][0];
     }
 
-    if(($this->gosaUnitTag) && (!in_array_ics("gosaAdministrativeUnitTag",$this->attrs['objectClass']))){
-      $this->attrs['objectClass'][] = "gosaAdministrativeUnitTag";
-    }
-
     if($this->orig_dn == 'new'){
       foreach(array("gotoGroupPrinter","gotoUserAdminPrinter","gotoGroupAdminPrinter","gotoUserPrinter") as $checkVar){
         if(count($this->attrs[$checkVar])  == 0 || empty($this->attrs[$checkVar])){
           unset($this->attrs[$checkVar]);
         }
       }
+    }else{
+      if(($this->gosaUnitTag) && (!in_array_ics("gosaAdministrativeUnitTag",$this->attrs['objectClass']))){
+        $this->attrs['objectClass'][] = "gosaAdministrativeUnitTag";
+      }
     }
 
     /* Move object in necessary*/
@@ -813,7 +811,7 @@ class printgeneric extends plugin
     }
     show_ldap_error($ldap->get_error(), sprintf(_("Saving of system print/generic with dn '%s' failed."),$this->dn));
 
-    if($this->BelongsTo == "Printer"){
+    if(preg_match("/printer/i",$this->BelongsTo)){
       $this->netConfigDNS->cn = $this->cn;
       $this->netConfigDNS->dn = $this->dn;
       $this->netConfigDNS->save($this->dn);
@@ -855,10 +853,10 @@ class printgeneric extends plugin
           "plDescription" => _("Print generic"),
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 11,
+          "plPriority"    => 4,
           "plSection"     => array("administration"),
           "plCategory"    => array("printer" => array("description"  => _("Printer"),
-                                                    "objectClass"  => "gotoPrinter"),"workstation"),
+                                                    "objectClass"  => "gotoPrinter"),"workstation","terminal"),
           "plProvidedAcls"=> array(
             "cn"                => _("Name"),
             "base"                => _("Base") ,