From d02a9b3cdf739230959a5c4b43a9bc1a43411670 Mon Sep 17 00:00:00 2001 From: hickert Date: Mon, 10 Mar 2008 09:11:17 +0000 Subject: [PATCH] msgPool git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9480 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../openxchange/class_oxchangeAccount.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gosa-plugins/openxchange/personal/connectivity/openxchange/class_oxchangeAccount.inc b/gosa-plugins/openxchange/personal/connectivity/openxchange/class_oxchangeAccount.inc index 5ff347c9b..1167e52f1 100644 --- a/gosa-plugins/openxchange/personal/connectivity/openxchange/class_oxchangeAccount.inc +++ b/gosa-plugins/openxchange/personal/connectivity/openxchange/class_oxchangeAccount.inc @@ -720,15 +720,15 @@ class oxchangeAccount extends plugin 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){ - msg_dialog::display(_("Error"), sprintf(_("Cannot connect to %s database!"), "Open-Xchange"), ERROR_DIALOG); + msg_dialog::display(_("Error"), msgPool::dbconnect("Open-Xchange",@pg_last_error($pgcon)), ERROR_DIALOG); return; } }else{ - msg_dialog::display(_("Configuration error"), sprintf(_("%s database configuration is missing!"), "Open-Xchange"), ERROR_DIALOG); + msg_dialog::display(_("Error"), msgPool::noserver("Open-Xchange database"), ERROR_DIALOG); return; } }else{ - msg_dialog::display(_("Configuration error"), sprintf(_("Missing %s PHP extension!"), "postgresql"), ERROR_DIALOG); + msg_dialog::display(_("Configuration error"),msgPool::missingext("postgresql"), ERROR_DIALOG); return; } @@ -829,15 +829,15 @@ class oxchangeAccount extends plugin 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){ - msg::display(_("Error"), sprintf(_("Cannot connect to %s database!"), "Open-Xchange"), ERROR_DIALOG); + msg_dialog::display(_("Error"), msgPool::dbconnect("Open-Xchange",@pg_last_error($pgcon)), ERROR_DIALOG); return; } }else{ - msg_dialog::display(_("Configuration error"), sprintf(_("%s database configuration is missing!"), "Open-Xchange"), ERROR_DIALOG); + msg_dialog::display(_("Error"), msgPool::noserver("Open-Xchange database"), ERROR_DIALOG); return; } }else{ - msg_dialog::display(_("Configuration error"), sprintf(_("Missing %s PHP extension!"), "postgresql"), ERROR_DIALOG); + msg_dialog::display(_("Configuration error"),msgPool::missingext("postgresql"), ERROR_DIALOG); return; } } -- 2.30.2