diff --git a/plugins/personal/connectivity/class_oxchangeAccount.inc b/plugins/personal/connectivity/class_oxchangeAccount.inc
index 0083e985d3bd67de8a9cc61cceff290596324dc0..9a6e5d24d20bca6b850696bb35d146a7cf06b83e 100644 (file)
function execute()
{
+ /* Call parent execute */
+ plugin::execute();
+
/* Show tab dialog headers */
$display="";
$obj= $this->parent->by_object['posixAccount'];
$obj2= $this->parent->by_object['mailAccount'];
if (! $obj->is_account){
- $display= "<BR><BR><CENTER>"._("This account has <b>OpenXchange</b> features disabled. Posix features are needed for openXchange accounts, enable them first.")."</CENTER><BR><BR>";
+ $display= "<BR><BR><CENTER>".sprintf(_("This account has %s features disabled. Posix features are needed for openXchange accounts, enable them first."), "<b>"._("OpenXchange")."</b>")."</CENTER><BR><BR>";
} else {
if (! $obj2->is_account){
- $display= "<BR><BR><CENTER>"._("This account has <b>OpenXchange</b> features disabled. Mail features are needed for openXchange accounts, enable them first.")."</CENTER><BR><BR>";
+ $display= "<BR><BR><CENTER>".sprintf(_("This account has %s features disabled. Mail features are needed for openXchange accounts, enable them first."), "<b>"._("OpenXchange")."</b>")."</CENTER><BR><BR>";
return ($display);
}
}
if(isset($this->oxconf["PGUSER"]) and isset($this->oxconf["PGHOST"]) and isset($this->oxconf["PGDBNAME"]) and isset($this->oxconf["PGPASSWD"])){
$pgcon = pg_connect("host=".$this->oxconf["PGHOST"]." user=".$this->oxconf["PGUSER"]." password=".$this->oxconf["PGPASSWD"]." dbname=".$this->oxconf["PGDBNAME"]);
if (! $pgcon){
- print_red(_("Couldn't Connect To Postgresql Database"));
+ print_red(_("Couldn't connect to postgresql database!"));
return;
}
}else{
- print_red(_("Needed Parameters to openexchange connectivity plugin failed!"));
+ print_red(_("Needed parameters for openexchange connectivity plugin are missing!"));
return;
}
}else{
- print_red(_("PHP4 module for Postgresql Database Failed!"));
+ print_red(_("PHP4 module for postgresql database is missing!"));
return;
}
$ldap= $this->config->get_ldap_link();
if($ldap->dn_exists("ou=addr,".$this->dn)){
- $ldap->rmdir("ou=addr,".$this->dn);
+ $ldap->rmdir_recursive("ou=addr,".$this->dn);
show_ldap_error($ldap->get_error());
}
if(isset($this->oxconf["PGUSER"]) and isset($this->oxconf["PGHOST"]) and isset($this->oxconf["PGDBNAME"]) and isset($this->oxconf["PGPASSWD"])){
$pgcon = pg_connect("host=".$this->oxconf["PGHOST"]." user=".$this->oxconf["PGUSER"]." password=".$this->oxconf["PGPASSWD"]." dbname=".$this->oxconf["PGDBNAME"]);
if (! $pgcon){
- print_red(_("Couldn't Connect To Postgresql Database"));
+ print_red(_("Couldn't connect to postgresql database!"));
return;
}
}else{
- print_red(_("Needed Parameters to openexchange connectivity plugin failed!"));
+ print_red(_("Needed parameters for openexchange connectivity plugin are missing!"));
return;
}
}else{
- print_red(_("PHP4 module for Postgresql Database Failed!"));
+ print_red(_("PHP4 module for postgresql database is missing!"));
return;
}
}