diff --git a/plugins/personal/connectivity/class_phpgwAccount.inc b/plugins/personal/connectivity/class_phpgwAccount.inc
index aa38d18780fe450c18b1be3d5261e3922aa3011c..b70991a9610f9b68270a9f888dec6958ac0fc178 100644 (file)
{
/* Call parent 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);
- }else{
- $smarty->assign("tabbed", 0);
}
$smarty->assign('phpgwAccountACL', chkacl($this->acl, 'phpgwAccount'));
function remove_from_parent()
{
- if ($this->parent != NULL){
+ if(chkacl($this->acl,"phpgwAccount") == ""){
/* Cancel if there's nothing to do here */
if (!$this->initially_was_account){
return;
$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(), _("Removing PHPgw account failed"));
/* Optionally execute a command after we're done */
$this->handle_post_events('remove');
/* 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(), _("Saving PHPgw account failed"));
/* Optionally execute a command after we're done */
if ($this->initially_was_account == $this->is_account){
} else {
$this->handle_post_events("add");
}
- }
+ }
}
-
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: