Fixed generic/connectivity kolabAccount

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

diff --git a/plugins/personal/connectivity/class_pureftpdAccount.inc b/plugins/personal/connectivity/class_pureftpdAccount.inc
index 1e5f7457f9658038f591a2d4aa352a78a3bedd55..1b189109b701482e074b92755341b53a96a730e6 100644 (file)
--- a/plugins/personal/connectivity/class_pureftpdAccount.inc
+++ b/plugins/personal/connectivity/class_pureftpdAccount.inc
@@ -48,12 +48,14 @@ class pureftpdAccount extends plugin
       $smarty->assign("$val", $this->$val);
       $smarty->assign($val."ACL", chkacl($this->acl, "$val"));
     }
+    $smarty->assign("fstate", "");
     if ($this->is_account){
       $smarty->assign("pureftpdState", "checked");
       $smarty->assign("fstate", "");
     } else {
       $smarty->assign("pureftpdState", "");
       if($_SESSION['js']==1){
+        if($this->acl!="#none#")
         $smarty->assign("fstate", "disabled");
       }else{
         $smarty->assign("fstate", "");
@@ -88,8 +90,10 @@ class pureftpdAccount extends plugin
     $ldap->cd($this->dn);
     @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
         $this->attributes, "Save");
-    $ldap->modify($this->attrs);
-    show_ldap_error($ldap->get_error());
+    $this->cleanup();
+    $ldap->modify ($this->attrs); 
+
+    show_ldap_error($ldap->get_error(), sprintf(_("Removing of user/pureftpd account with dn '%s' failed."),$this->dn));
 
     /* Optionally execute a command after we're done */
     $this->handle_post_events('remove');
@@ -125,7 +129,8 @@ class pureftpdAccount extends plugin
   /* Check values */
   function check()
   {
-    $message= array();
+    /* Call common method to give check the hook */
+    $message= plugin::check();
 
     /* Check for positive integer values */
     if ($this->is_account){
@@ -164,8 +169,10 @@ class pureftpdAccount extends plugin
     /* 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/pureftpd account with dn '%s' failed."),$this->dn));
 
     /* Optionally execute a command after we're done */
     if ($this->initially_was_account == $this->is_account){