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

diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc
index 947c77820..021c75f9d 100644
--- a/plugins/admin/systems/class_printGeneric.inc
+++ b/plugins/admin/systems/class_printGeneric.inc
@@ -49,11 +49,13 @@ class printgeneric extends plugin
                               "gotoUserAdminPrinter","gotoGroupAdminPrinter","gotoUserPrinter","gotoGroupPrinter");
   var $objectclasses  = array("top", "gotoPrinter");
 
-  function printgeneric ($config, $dn,$parent)
+  var $parent;
+
+  function printgeneric ($config, $dn,$parent_init,$parent)
   {
     $this->config = $config;
     $this->dn = $dn; 
-    
+ 
     /* If parent was posted(the tabs object) we can detect the printer type. */
     if($parent){
       $this->parent = $parent;
@@ -64,11 +66,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) || 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);
     }
 
@@ -148,6 +150,21 @@ class printgeneric extends plugin
     }
   }
 
+  function set_acl_base($base)
+  {
+    plugin::set_acl_base($base);
+    if(is_object($this->netConfigDNS)){
+      $this->netConfigDNS->set_acl_base($base);
+    }
+  }
+
+  function set_acl_category($cat)
+  {
+    plugin::set_acl_category($cat);
+    if(is_object($this->netConfigDNS)){
+      $this->netConfigDNS->set_acl_category($cat);
+    }
+  }
 
   /* Detect type of printer.
    * Printer can be stand alone, belong to a workstation or belong to a terminal. 
@@ -161,6 +178,8 @@ class printgeneric extends plugin
 
     /* Detect type of printer via parent tabs.
      */
+
+    $class = get_class($this->parent);
     if(isset($this->parent->by_object['workgeneric'])){
 
       /* Exclude templates 
@@ -195,23 +214,22 @@ 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);
       }
 
       /* Detect if this is a valid printer account;
        */
-      //FIXME: do we need to do this? we've already everything we need in $this->attrs...
       $ldap = $this->config->get_ldap_link();
       $ldap->cat($this->dn, array('objectClass'));
 
@@ -235,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);
@@ -243,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;
     }
 
@@ -270,27 +288,22 @@ 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);
     }
 
     /* Do we need to flip is_account state? */
-    if (isset($_POST['modify_state'])){
-      $this->is_modified = true;
-      $this->is_account= !$this->is_account;
+    if(isset($_POST['modify_state'])){
+      if($this->is_account && $this->acl_is_removeable()){
+        $this->is_account= FALSE;
+      }elseif(!$this->is_account && $this->acl_is_createable()){
+        $this->is_account= TRUE;
+      }
     }
 
     /* Do we represent a valid printer? */
@@ -301,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);
@@ -310,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."));
         }  
@@ -332,9 +345,9 @@ class printgeneric extends plugin
     /* Base select dialog */
     $once = true;
     foreach($_POST as $name => $value){
-      if(preg_match("/^chooseBase/",$name) && $once){
+      if(preg_match("/^chooseBase/",$name) && $once && $this->acl_is_moveable()){
         $once = false;
-        $this->dialog = new baseSelectDialog($this->config,$this);
+        $this->dialog = new baseSelectDialog($this->config,$this,$this->get_allowed_bases());
         $this->dialog->setCurrentBase($this->base);
         $this->baseSelection = true;
       }
@@ -350,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{
@@ -360,7 +379,7 @@ class printgeneric extends plugin
     }
 
     /* Fill templating stuff */
-    $smarty->assign("bases", $this->config->idepartments);
+    $smarty->assign("bases", $this->get_allowed_bases());
     $smarty->assign("base_select", $this->base);
 
     /* Assign attributes */
@@ -486,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));
         }
@@ -505,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>"));
@@ -522,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", "");
@@ -538,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);
       }
 
@@ -582,24 +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->netConfigDNS->save_object();
+    $this->base = $base_tmp;
 
-    /* Save base, since this is no LDAP attribute */
+    if(is_object($this->netConfigDNS)){
+      $this->netConfigDNS->save_object();
+    }
+    
+    /* Set new base if allowed */
+    $tmp = $this->get_allowed_bases();
     if(isset($_POST['base'])){
-      $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);
+      if(isset($tmp[$_POST['base']])){
+        $this->base= $_POST['base'];
       }
     }
   }
@@ -609,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());
     }
 
@@ -627,16 +644,20 @@ 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"){
-      if($this->acl_is_createable()){
-        $message[]= _("You have no permissions to create a printer on this 'Base'.");
-      }
+    /* 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'.");
+      }
+    }
     
     /* must: labeledURI */
     if(empty($this->labeledURI)){
@@ -644,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"));
@@ -667,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);
     }
     
@@ -687,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;
     }
 
@@ -696,6 +717,19 @@ class printgeneric extends plugin
       $this->PPDdialogToSave->save_ppd();
     }
 
+    if(preg_match("/https/i",$_SERVER['HTTP_REFERER'])){
+      $method="https://";
+    }else{
+      $method="http://";
+    }
+
+    /* If no ppd is selected, remove this attribute */
+    if(!empty($this->gotoPrinterPPD)) {
+      $this->gotoPrinterPPD = $method.str_replace("//","/",$_SERVER['SERVER_NAME']."/ppd/".$this->gotoPrinterPPD);
+    }else{
+      $this->gotoPrinterPPD = array();
+    }
+
     $dn= $this->dn;
     plugin::save();
     $ldap= $this->config->get_ldap_link();
@@ -715,14 +749,6 @@ class printgeneric extends plugin
       $this->attrs= $attrs;
     }
 
-    if(preg_match("/https/i",$_SERVER['HTTP_REFERER'])){
-      $method="https://";
-    }else{
-      $method="http://";
-    }
- 
-    $this->attrs['gotoPrinterPPD'] = $method.str_replace("//","/",$_SERVER['SERVER_NAME']."/ppd/".$this->gotoPrinterPPD);
-
     /* Append printer user 
      */
     $this->attrs['gotoUserPrinter']=array();
@@ -751,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*/
@@ -785,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);
@@ -800,6 +826,7 @@ class printgeneric extends plugin
 
   function generateList(){
     $a_return=array();
+
     foreach($this->member as $type => $values){
       $a_return[$type]=array();
       foreach($values as $value){
@@ -826,13 +853,13 @@ class printgeneric extends plugin
           "plDescription" => _("Print generic"),
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 0,
+          "plPriority"    => 4,
           "plSection"     => array("administration"),
           "plCategory"    => array("printer" => array("description"  => _("Printer"),
-                                                    "objectClass"  => "gotoPrinter")),
+                                                    "objectClass"  => "gotoPrinter"),"workstation","terminal"),
           "plProvidedAcls"=> array(
             "cn"                => _("Name"),
-             
+            "base"                => _("Base") ,         
             "description"       => _("Description"), 
             "l"                 => _("Location"), 
             "labeledURI"        => _("LabeledURL"), 
@@ -888,7 +915,7 @@ class printgeneric extends plugin
 
     $ldap = $this->config->get_ldap_link();
     $ldap->cd($dn);
-    $ldap->cat($dn,array($var));
+    $ldap->cat($dn,array($var,"cn"));
     if($ldap->count()){
 
       $attrs = $ldap->fetch();