From: soranzo <soranzo>
Date: Mon, 1 Aug 2005 22:16:15 +0000 (+0000)
Subject: Spacing fixes. Don't do setServerInfo() in getServerInfo() cause we already reload... 
X-Git-Tag: REL_4-0-1~69
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=610558e5c01f27f18e719fbb06e34701ec12e8cd;p=phppgadmin.git

Spacing fixes. Don't do setServerInfo() in getServerInfo() cause we already reload, and also credentials may be wrong.
---

diff --git a/classes/Misc.php b/classes/Misc.php
index 1abb3235..b191ffbd 100644
--- a/classes/Misc.php
+++ b/classes/Misc.php
@@ -2,7 +2,7 @@
 	/**
 	 * Class to hold various commonly used functions
 	 *
-	 * $Id: Misc.php,v 1.109 2005/07/31 09:15:06 chriskl Exp $
+	 * $Id: Misc.php,v 1.110 2005/08/01 22:16:15 soranzo Exp $
 	 */
 	 
 	class Misc {
@@ -1532,10 +1532,9 @@
 				if ($server_id == $info['host'].':'.$info['port']) {
 					// Automatically use shared credentials if available
 					if (!isset($info['username']) && isset($_SESSION['sharedUsername'])) {
-						$info['username'] = 	$_SESSION['sharedUsername'];
-						$info['password'] = 	$_SESSION['sharedPassword'];
+						$info['username'] = $_SESSION['sharedUsername'];
+						$info['password'] = $_SESSION['sharedPassword'];
 						$_reload_browser = true;
-						$this->setServerInfo(null, $info, $server_id);
 					}
 					
 					return $info;
diff --git a/servers.php b/servers.php
index ee1b65f8..8b731444 100644
--- a/servers.php
+++ b/servers.php
@@ -3,7 +3,7 @@
 	/**
 	 * Manage servers
 	 *
-	 * $Id: servers.php,v 1.2 2005/05/02 15:47:24 chriskl Exp $
+	 * $Id: servers.php,v 1.3 2005/08/01 22:16:15 soranzo Exp $
 	 */
 
 	// Include application functions
@@ -18,7 +18,7 @@
 		global $misc, $lang, $_reload_browser;
 		
 		$server_info = $misc->getServerInfo($_REQUEST['logoutServer']);
-		$misc->setServerInfo(null,null,$_REQUEST['logoutServer']);
+		$misc->setServerInfo(null, null, $_REQUEST['logoutServer']);
 		doDefault(sprintf($lang['strlogoutmsg'], $server_info['desc']));
 		
 		$_reload_browser = true;