Fixed connectivity acls

[gosa.git] / plugins / personal / connectivity / class_phpgwAccount.inc

diff --git a/plugins/personal/connectivity/class_phpgwAccount.inc b/plugins/personal/connectivity/class_phpgwAccount.inc
index b4d8df5fa28c567bd006d06777ba3bad8c9807f7..9728376707cd8fd5773ef2ce907805a696d4b4ae 100644 (file)
--- a/plugins/personal/connectivity/class_phpgwAccount.inc
+++ b/plugins/personal/connectivity/class_phpgwAccount.inc
@@ -5,11 +5,6 @@ class phpgwAccount extends plugin
   var $plHeadline= "PHPGroupware";
   var $plDescription= "This does something";
 
-  /* CLI vars */
-  var $cli_summary= "Manage users PHPGroupware account";
-  var $cli_description= "Some longer text\nfor help";
-  var $cli_parameters= array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
-
   /* GW attributes */
   var $phpgwAccountExpires= "-1";
   var $phpgwAccountStatus= "A";
@@ -28,7 +23,7 @@ class phpgwAccount extends plugin
   {
        /* Call parent execute */
 //     plugin::execute();
-
+  
     /* Show tab dialog headers */
     $display= "";
 
@@ -44,13 +39,6 @@ class phpgwAccount extends plugin
       $smarty->assign("phpgwState", "checked");
     } else {
       $smarty->assign("phpgwState", "");
-      $smarty->assign("fstate", "disabled");
-    }
-
-    if ($this->parent != NULL){
-      $smarty->assign("tabbed", 1);
-    }else{
-      $smarty->assign("tabbed", 0);
     }
 
     $smarty->assign('phpgwAccountACL', chkacl($this->acl, 'phpgwAccount'));
@@ -61,22 +49,26 @@ class phpgwAccount extends plugin
 
   function remove_from_parent()
   {
-    /* Cancel if there's nothing to do here */
-    if (!$this->initially_was_account){
-      return;
+    if(chkacl($this->acl,"phpgwAccount") == ""){
+      /* Cancel if there's nothing to do here */
+      if (!$this->initially_was_account){
+        return;
+      }
+
+      plugin::remove_from_parent();
+      $ldap= $this->config->get_ldap_link();
+
+      $ldap->cd($this->dn);
+      @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
+          $this->attributes, "Save");
+      $this->cleanup();
+      $ldap->modify ($this->attrs); 
+
+      show_ldap_error($ldap->get_error(), sprintf(_("Removing of user/PHPgw account with dn '%s' failed."),$this->dn));
+
+      /* Optionally execute a command after we're done */
+      $this->handle_post_events('remove');
     }
-    
-    plugin::remove_from_parent();
-    $ldap= $this->config->get_ldap_link();
-
-    $ldap->cd($this->dn);
-    @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
-        $this->attributes, "Save");
-    $ldap->modify($this->attrs);
-    show_ldap_error($ldap->get_error());
-
-    /* Optionally execute a command after we're done */
-    $this->handle_post_events('remove');
   }
 
 
@@ -106,13 +98,16 @@ class phpgwAccount extends plugin
   /* Save to LDAP */
   function save()
   {
-    plugin::save();
-    if ($this->parent != NULL){
+    if(chkacl($this->acl,"phpgwAccount") == ""){
+      plugin::save();
+      
       /* Write back to ldap */
       $ldap= $this->config->get_ldap_link();
       $ldap->cd($this->dn);
-      $ldap->modify($this->attrs);
-      show_ldap_error($ldap->get_error());
+      $this->cleanup();
+      $ldap->modify ($this->attrs); 
+
+      show_ldap_error($ldap->get_error(), sprintf(_("Saving of user/PHPgw account with dn '%s' failed."),$this->dn));
 
       /* Optionally execute a command after we're done */
       if ($this->initially_was_account == $this->is_account){
@@ -122,9 +117,30 @@ class phpgwAccount extends plugin
       } else {
         $this->handle_post_events("add");
       }
-      }
+    }
   }
 
+
+  /* Return plugin informations for acl handling 
+    #FIME ACL attributes arn't translated yet */
+  function plInfo()
+  {
+    return (array(
+          "plShortName"     => _("PHP GW"),
+          "plDescription"   => _("PHP GW account settings"),
+          "plSelfModify"    => TRUE,
+          "plDepends"       => array("connectivity"),
+          "plPriority"      => 5,                                 // Position in tabs
+          "plSection"       => "personal",                        // This belongs to personal
+          "plCategory"      => array("gosaAccount"),
+          "plOptions"       => array(),
+
+          "plProvidedAcls"  => array(
+          "phpgwAccountExpires" =>"!!! FIXME "._("phpgwAccountExpires"),
+          "phpgwAccountStatus"  =>_("phpgwAccountStatus"),
+          "phpgwAccountType"    =>_("phpgwAccountType"))
+          ));
+  }
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: