[Fusionforge-commits] r11822 - branches/Branch_5_1/src/common/include

Roland Mas lolando at libremir.placard.fr.eu.org
Thu Dec 16 13:07:08 CET 2010


Author: lolando
Date: 2010-12-16 13:07:07 +0100 (Thu, 16 Dec 2010)
New Revision: 11822

Modified:
   branches/Branch_5_1/src/common/include/config-vars.php
   branches/Branch_5_1/src/common/include/utils.php
Log:
Allow non-standard ports for HTTP/HTTPS

Modified: branches/Branch_5_1/src/common/include/config-vars.php
===================================================================
--- branches/Branch_5_1/src/common/include/config-vars.php	2010-12-16 10:46:29 UTC (rev 11821)
+++ branches/Branch_5_1/src/common/include/config-vars.php	2010-12-16 12:07:07 UTC (rev 11822)
@@ -33,6 +33,8 @@
 forge_set_config_item_bool ('project_auto_approval', 'core') ;
 forge_define_config_item ('project_auto_approval_user', 'core', 'admin') ;
 forge_define_config_item ('web_host', 'core', $GLOBALS['sys_default_domain']) ;
+forge_define_config_item ('http_port', 'core', 80) ;
+forge_define_config_item ('https_port', 'core', 443) ;
 forge_define_config_item ('apache_user', 'core', $GLOBALS['sys_apache_user']) ;
 forge_define_config_item ('apache_group', 'core', $GLOBALS['sys_apache_group']) ;
 forge_define_config_item ('scm_tarballs_path', 'core', '$core/data_path/scmtarballs') ;

Modified: branches/Branch_5_1/src/common/include/utils.php
===================================================================
--- branches/Branch_5_1/src/common/include/utils.php	2010-12-16 10:46:29 UTC (rev 11821)
+++ branches/Branch_5_1/src/common/include/utils.php	2010-12-16 12:07:07 UTC (rev 11822)
@@ -1074,12 +1074,19 @@
  * @return string URL
  */
 function util_make_url ($path) {
-	if (forge_get_config('use_ssl')) 
-		$url = "https://" ;
-	else
-		$url = "http://" ;
-	
-	$url .= forge_get_config('web_host') ;
+        if (forge_get_config('use_ssl')) {
+                $url = "https://" ;
+                $url .= forge_get_config('web_host') ;
+                if (forge_get_config('https_port') != 443) {
+                        $url .= ":".forge_get_config('https_port') ;
+                }
+        } else {
+                $url = "http://" ;
+                $url .= forge_get_config('web_host') ;
+                if (forge_get_config('http_port') != 80) {
+                        $url .= ":".forge_get_config('http_port') ;
+                }
+        }
 	$url .= util_make_uri ($path) ;
 	return $url ;
 }




More information about the Fusionforge-commits mailing list