diff --git a/plugins/personal/connectivity/class_oxchangeAccount.inc b/plugins/personal/connectivity/class_oxchangeAccount.inc
index 40119ac487f4284e5bb51987f3b9a0913145e0dd..36db420f9e3004dedc631ea62fb78fed4638b019 100644 (file)
//plugin::execute();
- /* Show tab dialog headers */
+ $display="";
+ /* Show tab dialog headers * /
$display="";
if ($this->parent != NULL){
if ($this->is_account){
}
}
}
-
+*/
/* Show main page */
$smarty= get_smarty();
$smarty->assign("tabbed", 0);
}
+ /* Trying to open a Postgresql Database Server */
+ if (function_exists("pg_connect")){
+ 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){
+ $smarty->assign("pg", false);
+ }
+ }else{
+ $smarty->assign("pg", false);
+ }
+ }else{
+ $smarty->assign("pg", false);
+ }
+
$display.= $smarty->fetch (get_template_path('oxchange.tpl', TRUE, dirname(__FILE__)));
return ($display);
}
/* Trying to open a Postgresql Database Server */
if (function_exists("pg_connect")){
- 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(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!"));
return;
if($ldap->dn_exists("ou=addr,".$this->dn)){
$ldap->rmdir_recursive("ou=addr,".$this->dn);
- show_ldap_error($ldap->get_error(), _("Removing of oxchange addressbook failed"));
+ show_ldap_error($ldap->get_error(), sprintf(_("Removing of user/oxchange addressbook account with dn '%s' failed."),$this->dn));
}
$ldap->cd($this->dn);
$this->attributes, "Save");
$this->cleanup();
$ldap->modify ($this->attrs);
- show_ldap_error($ldap->get_error(), _("Removing oxchange account failed"));
+ show_ldap_error($ldap->get_error(), sprintf(_("Removing of user/oxchange addressbook account with dn '%s' failed."),$this->dn));
/* Optionally execute a command after we're done */
$this->postremove();
/* Trying to open a Postgresql Database Server */
if (function_exists("pg_connect")){
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"]);
+ $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!"));
return;
$this->cleanup();
$ldap->modify ($this->attrs);
- show_ldap_error($ldap->get_error(), _("Saving of oxchange account failed"));
+ show_ldap_error($ldap->get_error(), sprintf(_("Saving of user/oxchange account with dn '%s' failed."),$this->dn));
/* Optionally execute a command after we're done */
$this->postcreate();
if($needupdate){
$ldap->create_missing_trees("ou=addr,".$this->dn);
- show_ldap_error($ldap->get_error(), _("Creating oxchange addressbook tree failed"));
+ show_ldap_error($ldap->get_error(), sprintf(_("Creating of user/oxchange account with dn '%s' failed."),$this->dn));
/* Finally save data to postgresql server */
pg_set_client_encoding ("UNICODE");
$nv = "SELECT nextval ('serial_id')";