From d9438955e850de3f0fe86ed44d9b80bf0efbd7b6 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 21 Sep 2007 12:18:38 +0000
Subject: [PATCH] Fixed connectivity errors search_config was called, instead
 of config->search

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7371 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../connectivity/class_opengwAccount.inc       | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/plugins/personal/connectivity/class_opengwAccount.inc b/plugins/personal/connectivity/class_opengwAccount.inc
index 3646256f0..ee27afe83 100644
--- a/plugins/personal/connectivity/class_opengwAccount.inc
+++ b/plugins/personal/connectivity/class_opengwAccount.inc
@@ -53,10 +53,10 @@ class opengwAccount extends plugin
 		/* Get configurations */
     if($this->config->search("opengwAccount", 'USERNAME',array('data'))){
       $atr = array();
-      $atr['LOGIN']	=	  $this->config->search("opengwAccount", 'USERNAME',array('data'));
-      $atr['PASSWORD']=	$this->config->search("opengwAccount", 'PASSWORD',array('data'));
-      $atr['SERVER']	=	$this->config->search("opengwAccount", 'DATAHOST',array('data'));
-      $atr['DB']		=	  $this->config->search("opengwAccount", 'DATABASE',array('data'));
+      $atr['LOGIN']	=	  $this->config->search("opengwAccount", 'USERNAME',array('tabs'));
+      $atr['PASSWORD']=	$this->config->search("opengwAccount", 'PASSWORD',array('tabs'));
+      $atr['SERVER']	=	$this->config->search("opengwAccount", 'DATAHOST',array('tabs'));
+      $atr['DB']		=	  $this->config->search("opengwAccount", 'DATABASE',array('tabs'));
       $this->serverCon = $atr;
     }elseif(isset($this->config->data['SERVERS']['OPENGROUPWARE'])){
       $this->serverCon  = $this->config->data['SERVERS']['OPENGROUPWARE'];
@@ -135,6 +135,7 @@ class opengwAccount extends plugin
 		$display= "";
 		$smarty= get_smarty();
 
+    $smarty->assign("serverCon",count($this->serverCon));
     $smarty->assign("validTeams","");
     $smarty->assign("is_account", " ");
     $smarty->assign("OGWstate"," disabled ");
@@ -159,13 +160,15 @@ class opengwAccount extends plugin
       $smarty->assign('opengwAccountACL', " disabled ");
     }
 
+    if(count($this->serverCon))
+
 		/* Check database extension */    
-		if(!is_callable("pg_connect")){
+		if(!is_callable("pg_connect") && count($this->serverCon)){
 			print_red(_("OpenGroupware: Your configuration is missing a postgresql extension. Can't perform any database queries."));
-		}else
+		}elseif(count($this->serverCon)){
 
 			/* Check if config exists */
-			if(search_config($this->config->data,"opengwAccount","DATABASE")==""){
+			if($this->config->search("opengwAccount", 'DATABASE',array('tabs'))){
 				print_red(_("OpenGroupware: Missing database configuration for opengroupware. Can't get or set any informations."));
 			}else{
 
@@ -235,6 +238,7 @@ class opengwAccount extends plugin
 
 				} 
 			}
+    }
 		$display.= $smarty->fetch (get_template_path('opengw.tpl', TRUE, dirname(__FILE__)));
 		return ($display);
 	}
-- 
2.30.2