diff --git a/plugins/personal/connectivity/class_phpgwAccount.inc b/plugins/personal/connectivity/class_phpgwAccount.inc
index fd58160e4bc1bc732e055e5802c8e83ef30c9a0e..b70991a9610f9b68270a9f888dec6958ac0fc178 100644 (file)
function execute()
{
/* Call parent execute */
- plugin::execute();
-
+// plugin::execute();
+
/* Show tab dialog headers */
$display= "";
$smarty->assign("phpgwState", "checked");
} else {
$smarty->assign("phpgwState", "");
- $smarty->assign("fstate", "disabled");
- }
-
- if ($this->parent != NULL){
- $smarty->assign("tabbed", 1);
}
$smarty->assign('phpgwAccountACL', chkacl($this->acl, 'phpgwAccount'));
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(), _("Removing PHPgw account failed"));
+
+ /* 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');
}
/* Save to LDAP */
function save()
{
- 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());
-
- /* Optionally execute a command after we're done */
- if ($this->initially_was_account == $this->is_account){
- if ($this->is_modified){
- $this->handle_post_events("mofify");
+ if(chkacl($this->acl,"phpgwAccount") == ""){
+ plugin::save();
+
+ /* Write back to ldap */
+ $ldap= $this->config->get_ldap_link();
+ $ldap->cd($this->dn);
+ $this->cleanup();
+ $ldap->modify ($this->attrs);
+
+ show_ldap_error($ldap->get_error(), _("Saving PHPgw account failed"));
+
+ /* Optionally execute a command after we're done */
+ if ($this->initially_was_account == $this->is_account){
+ if ($this->is_modified){
+ $this->handle_post_events("mofify");
+ }
+ } else {
+ $this->handle_post_events("add");
}
- } else {
- $this->handle_post_events("add");
}
}
-
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: