From 4c5b7643470a94cea89a5d7adfc113e08f4ae0a8 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 12 Oct 2012 15:11:42 +0000
Subject: [PATCH] allow to use HTTP_HOST (without optional port) or SERVER_NAME
 to find matching instance

---
 phpgwapi/inc/class.egw_session.inc.php | 38 +++++++++++++++-----------
 phpgwapi/inc/functions.inc.php         |  3 +-
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/phpgwapi/inc/class.egw_session.inc.php b/phpgwapi/inc/class.egw_session.inc.php
index 6d27f454ea..3918552849 100644
--- a/phpgwapi/inc/class.egw_session.inc.php
+++ b/phpgwapi/inc/class.egw_session.inc.php
@@ -1336,37 +1336,43 @@ class egw_session
 	 * @param string $login on login $_POST['login'], $_SERVER['PHP_AUTH_USER'] or $_SERVER['REMOTE_USER']
 	 * @param string $domain_requested usually self::get_request('domain')
 	 * @param string &$default_domain usually $default_domain get's set eg. by sitemgr
-	 * @param string $server_name usually $_SERVER['SERVER_NAME']
+	 * @param string|array $server_name usually array($_SERVER['HTTP_HOST'], $_SERVER['SERVER_NAME'])
 	 * @param array $domains=null defaults to $GLOBALS['egw_domain'] from the header
 	 * @return string $GLOBALS['egw_info']['user']['domain'] set with the domain/instance to use
 	 */
-	public static function search_instance($login,$domain_requested,&$default_domain,$server_name,array $domains=null)
+	public static function search_instance($login,$domain_requested,&$default_domain,$server_names,array $domains=null)
 	{
-		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."('$login','$domain_requested',".array2string($default_domain).".'$server_name'.".array2string($domains).")");
+		if (self::ERROR_LOG_DEBUG) error_log(__METHOD__."('$login','$domain_requested',".array2string($default_domain).".".array2string($server_names).".".array2string($domains).")");
 
 		if (is_null($domains)) $domains = $GLOBALS['egw_domain'];
 
 		if (!isset($default_domain) || !isset($domains[$default_domain]))	// allow to overwrite the default domain
 		{
-			if(isset($domains[$server_name]))
+			foreach((array)$server_names as $server_name)
 			{
-				$default_domain = $server_name;
-			}
-			else
-			{
-				$domain_part = explode('.',$server_name);
-				array_shift($domain_part);
-				$domain_part = implode('.',$domain_part);
-				if(isset($domains[$domain_part]))
+				list($server_name) = explode(':', $server_name);	// remove port from HTTP_HOST
+				if(isset($domains[$server_name]))
 				{
-					$default_domain = $domain_part;
+					$default_domain = $server_name;
+					break;
 				}
 				else
 				{
-					reset($domains);
-					list($default_domain) = each($domains);
+					$domain_part = explode('.',$server_name);
+					array_shift($domain_part);
+					$domain_part = implode('.',$domain_part);
+					if(isset($domains[$domain_part]))
+					{
+						$default_domain = $domain_part;
+						break;
+					}
+					else
+					{
+						reset($domains);
+						list($default_domain) = each($domains);
+					}
+					unset($domain_part);
 				}
-				unset($domain_part);
 			}
 		}
 		if (isset($login))	// on login
diff --git a/phpgwapi/inc/functions.inc.php b/phpgwapi/inc/functions.inc.php
index ff9efe9968..d0b2a16623 100644
--- a/phpgwapi/inc/functions.inc.php
+++ b/phpgwapi/inc/functions.inc.php
@@ -115,7 +115,8 @@ print_debug('sane environment','messageonly','api');
 
 $GLOBALS['egw_info']['user']['domain'] = egw_session::search_instance(
 	isset($_POST['login']) ? $_POST['login'] : (isset($_SERVER['PHP_AUTH_USER']) ? $_SERVER['PHP_AUTH_USER'] : $_SERVER['REMOTE_USER']),
-	egw_session::get_request('domain'),$GLOBALS['egw_info']['server']['default_domain'],$_SERVER['SERVER_NAME'],$GLOBALS['egw_domain']);
+	egw_session::get_request('domain'),$GLOBALS['egw_info']['server']['default_domain'],
+	array($_SERVER['HTTP_HOST'], $_SERVER['SERVER_NAME']),$GLOBALS['egw_domain']);
 
 $GLOBALS['egw_info']['server']['db_host'] = $GLOBALS['egw_domain'][$GLOBALS['egw_info']['user']['domain']]['db_host'];
 $GLOBALS['egw_info']['server']['db_port'] = $GLOBALS['egw_domain'][$GLOBALS['egw_info']['user']['domain']]['db_port'];