aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorrub <rub@piwigo.org>2008-05-14 21:54:45 +0000
committerrub <rub@piwigo.org>2008-05-14 21:54:45 +0000
commit59262acebdb83fe29acc0c449eb338197ba97972 (patch)
tree1f4efb31384f08c7e45f79df90b0882401848343 /tools
parent428763fda6a256ef40bb3bef7f1e009d3c7d1b4a (diff)
Resolved issue 0000825: create_listing_file.php don't work with port server
Merge BSF 2336:2337 into branch-1_7 git-svn-id: http://piwigo.org/svn/branches/branch-1_7@2338 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'tools')
-rw-r--r--tools/create_listing_file.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/create_listing_file.php b/tools/create_listing_file.php
index ad9409fc3..fba2aeaa3 100644
--- a/tools/create_listing_file.php
+++ b/tools/create_listing_file.php
@@ -143,7 +143,11 @@ $pwg_conf['icon_dir'] = $conf['gallery'].'/template/yoga/icon/';
$pwg_conf['scan_action'] = array('clean', 'test', 'generate');
// url of this script
-$pwg_conf['this_url'] = 'http://'.$_SERVER['SERVER_NAME'].$_SERVER['PHP_SELF'];
+$pwg_conf['this_url'] =
+ (empty($_SERVER['HTTPS']) ? 'http://' : 'https://')
+ .str_replace(':'.$_SERVER['SERVER_PORT'], '', $_SERVER['HTTP_HOST'])
+ .($_SERVER['SERVER_PORT'] != 80 ? ':'.$_SERVER['SERVER_PORT'] : '')
+ .$_SERVER['PHP_SELF'];
// list of reserved directory names
$pwg_conf['reserved_directory_names'] = array($conf['thumbs'], $conf['high'], $conf['represent'], ".", "..", ".svn");