Merge lp:~leeturner/quam-plures/server_port_fix into lp:quam-plures

[Lee Turner]

See this thread for details:

http://forums.quamplures.net/viewtopic.php?f=16&t=826

My dev machine is set up to use port 8888 and the installer gets it wrong when it is trying to guess the base url. It basically doesn't take into account that the HTTP_HOST variable can also include the port so it adds it twice.

This branch adds a check for the port before trying to add it again.

[EdB (edb)]

I have no idea if this solution can cause a problem down the road for some other reasonable and realistic situation, and I don't care :) Solves a problem now + doesn't cause any now = approved!

Will merge after an appropriate delay to allow others to do code review and testing.

review: Approve

[Tilman Blumenbach (tblue)]

Looks fine!

review: Approve

=== modified file 'qp_install/index.php'
--- qp_install/index.php	2011-02-07 05:27:47 +0000
+++ qp_install/index.php	2011-08-25 12:54:36 +0000
@@ -387,7 +387,7 @@
 			param( 'conf_db_tableprefix', 'string', $app_db_tableprefix );
 			// Guess baseurl:
 			$app_baseurl = 'http://'.( isset( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : 'yourserver.com' );
-			if( isset( $_SERVER['SERVER_PORT'] ) && ( $_SERVER['SERVER_PORT'] != '80' ) )
+			if( isset( $_SERVER['SERVER_PORT'] ) && ( $_SERVER['SERVER_PORT'] != '80' ) && (strpos($app_baseurl,':') === false) )
 				$app_baseurl .= ':'.$_SERVER['SERVER_PORT'];
 			$app_baseurl .= preg_replace( '#/qp_install(/(index.php)?)?$#', '', $ReqPath ).'/';
 			param( 'conf_baseurl', 'string', $app_baseurl );