X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fclass_plugin.inc;h=3d59015a24b6dc343e888fd3cb7877f827d5961b;hb=0a404520e61c50991850fecd39f8ec9bd09ec464;hp=419446592c24640539633e7b269c4e550da13e99;hpb=7da25a45fb3d621ea7257f9faefa10cd48c62e04;p=gosa.git

diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index 419446592..3d59015a2 100644
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -267,7 +267,7 @@ class plugin
   {
     /* Save values to object */
     foreach ($this->attributes as $val){
-      if (chkacl ($this->acl, "$val") == "" && isset ($_POST["$val"])){
+      if ($this->acl_is_writeable($val) && isset ($_POST["$val"])){
         /* Check for modifications */
         if (get_magic_quotes_gpc()) {
           $data= stripcslashes($_POST["$val"]);
@@ -289,6 +289,9 @@ class plugin
           $data = "";  
         }
         $this->$val= $data;
+        //echo "<font color='blue'>".$val."</font><br>";
+      }else{
+        //echo "<font color='red'>".$val."</font><br>";
       }
     }
   }
@@ -504,9 +507,45 @@ class plugin
     return FALSE;
   }
 
+
+  /* Show header message for tab dialogs */
+  function show_enable_header($button_text, $text, $disabled= FALSE)
+  {
+    if ($disabled == TRUE){
+      $state= "disabled";
+    } else {
+      $state= "";
+    }
+    $display= "<table summary=\"\" width=\"100%\"><tr>\n<td colspan=2><p><b>$text</b></p>\n";
+    $display.= "<input type=submit value=\"$button_text\" name=\"modify_state\" ".
+      ($this->acl_is_createable()?'':'disabled')." ".$state.
+      "><p class=\"seperator\">&nbsp;</p></td></tr></table>";
+
+    return($display);
+  }
+
+
+  /* Show header message for tab dialogs */
+  function show_disable_header($button_text, $text, $disabled= FALSE)
+  {
+    if ($disabled == TRUE){
+      $state= "disabled";
+    } else {
+      $state= "";
+    }
+    $display= "<table summary=\"\" width=\"100%\"><tr>\n<td colspan=2><p><b>$text</b></p>\n";
+    $display.= "<input type=submit value=\"$button_text\" name=\"modify_state\" ".
+      ($this->acl_is_removeable()?'':'disabled')." ".$state.
+      "><p class=\"seperator\">&nbsp;</p></td></tr></table>";
+
+    return($display);
+  }
+
+
   /* Show header message for tab dialogs */
   function show_header($button_text, $text, $disabled= FALSE)
   {
+    echo "FIXME: show_header should be replaced by show_disable_header and show_enable_header<br>";
     if ($disabled == TRUE){
       $state= "disabled";
     } else {
@@ -514,12 +553,13 @@ class plugin
     }
     $display= "<table summary=\"\" width=\"100%\"><tr>\n<td colspan=2><p><b>$text</b></p>\n";
     $display.= "<input type=submit value=\"$button_text\" name=\"modify_state\" ".
-      chkacl($this->acl, "all")." ".$state.
+      ($this->acl_is_createable()?'':'disabled')." ".$state.
       "><p class=\"seperator\">&nbsp;</p></td></tr></table>";
 
     return($display);
   }
 
+
   function postcreate($add_attrs= array())
   {
     /* Find postcreate entries for this class */
@@ -932,7 +972,7 @@ class plugin
           echo sprintf(_("Adding tag (%s) to object '%s'"), $tag, @LDAP::fix($dn))."<br>";
           flush();
         }
-        $nattrs= array("gosaUnitTag" => $this->gosaUnitTag);
+        $nattrs= array("gosaUnitTag" => $tag);
         $nattrs['objectClass']= array();
         for ($i= 0; $i<$attrs['objectClass']['count']; $i++){
           $oc= $attrs['objectClass'][$i];
@@ -1073,16 +1113,17 @@ class plugin
 
   function remove_snapshot($dn)
   {
+echo "FIXME: remove_snapshot uses old acl's<br>";
     $ui   = get_userinfo();
     $acl  = get_permissions ($dn, $ui->subtreeACL);
     $acl  = get_module_permission($acl, "snapshot", $dn);
 
     if (chkacl($this->acl, "delete") == ""){
-    $ldap = $this->config->get_ldap_link();
-    $ldap->cd($this->config->current['BASE']);
-    $ldap->rmdir_recursive($dn);
+      $ldap = $this->config->get_ldap_link();
+      $ldap->cd($this->config->current['BASE']);
+      $ldap->rmdir_recursive($dn);
     }else{
-      print_red (_("You are not allowed to delete this snap shot!"));
+      print_red (_("You are not allowed to delete this snapshot!"));
     }
   }
 
@@ -1354,18 +1395,50 @@ class plugin
 
   function plInfo()
   {
-    #var $plObject_name= "";
-    #var $plProvidedAcls= array();
-    #var $plSelfModify= FALSE;
-    #var $plOptions= array();
-    #var $plSection= "";
-    #var $plTask= array();
-    #var $plPriority= 0;
-    #var $plDepends= array();
-    #var $plConflicts= array();
     return array();
   }
 
+
+  function acl_is_writeable($attribute)
+  {
+    $ui= get_userinfo();
+    return preg_match('/w/', $ui->get_permissions($this->dn, get_class($this), $attribute));
+  }
+
+
+  function acl_is_readable($attribute)
+  {
+    $ui= get_userinfo();
+    return preg_match('/r/', $ui->get_permissions($this->dn, get_class($this), $attribute));
+  }
+
+
+  function acl_is_createable()
+  {
+    $ui= get_userinfo();
+    return preg_match('/c/', $ui->get_permissions($this->dn, get_class($this), '0'));
+  }
+
+
+  function acl_is_removeable()
+  {
+    $ui= get_userinfo();
+    return preg_match('/d/', $ui->get_permissions($this->dn, get_class($this), '0'));
+  }
+
+
+  function acl_is_moveable()
+  {
+    $ui= get_userinfo();
+    return preg_match('/m/', $ui->get_permissions($this->dn, get_class($this), '0'));
+  }
+
+
+  function getacl($attribute)
+  {
+    $ui= get_userinfo();
+    return  $ui->get_permissions($this->dn, get_class($this), $attribute);
+  }
 }
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>