adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-08 09:43:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixes #1527 ability to disable auto-detection of url port

Browse Source
This commit is contained in:
plegall
2022-12-29 22:08:27 +01:00
parent 796f726ed1
commit 00480ce0a7
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/config_default.inc.php
+6
View File
@@ -638,6 +638,12 @@ $conf['picture_url_style'] = 'id';
// tags is not unique, all tags with the same url representation will be shown
$conf['tag_url_style'] = 'id-tag';
// force an explicit port in the url (like ":80" or ":443")
// * 'none' : do not add any port, whatever protocol is detected
// * 'auto' : tries to smartly add a port based on $_SERVER variables
// * 123 : adds ":123" next to url host
$conf['url_port'] = 'none';
// +-----------------------------------------------------------------------+
// | tags |
// +-----------------------------------------------------------------------+
include/functions_url.inc.php
+21 -5
View File
@@ -32,6 +32,7 @@ function get_root_url()
*/
function get_absolute_root_url($with_scheme=true)
{
global $conf;
// TODO - add HERE the possibility to call PWG functions from external scripts
// Support X-Forwarded-Proto header for HTTPS detection in PHP
@@ -61,15 +62,30 @@ function get_absolute_root_url($with_scheme=true)
else
{
$url .= $_SERVER['HTTP_HOST'];
if ( (!$is_https && $_SERVER['SERVER_PORT'] != 80)
||($is_https && $_SERVER['SERVER_PORT'] != 443))
$url_port = null;
if ('none' == $conf['url_port'])
{
$url_port = ':'.$_SERVER['SERVER_PORT'];
if (strrchr($url, ':') != $url_port)
// do nothing
}
elseif ('auto' == $conf['url_port'])
{
if ((!$is_https && $_SERVER['SERVER_PORT'] != 80) || ($is_https && $_SERVER['SERVER_PORT'] != 443))
{
$url .= $url_port;
$url_port = ':'.$_SERVER['SERVER_PORT'];
}
}
else
{
// we have a custom port
$url_port = ':'.$conf['url_port'];
}
if (!empty($url_port) and strrchr($url, ':') != $url_port)
{
$url .= $url_port;
}
}
}
$url .= cookie_path();