oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-01 17:38:38 +00:00
Code Wiki Activity

Merge pull request #1226 from wallabag/MoriTanosuke-dev

Browse source 
Enable base_url for proxies
This commit is contained in:
Thomas Citharel 2015-07-29 11:43:22 +02:00
commit ef16095d62
3 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
inc/poche/Tools.class.php
View file

@ -40,6 +40,8 @@ final class Tools
*/
public static function getPocheUrl()
{
$baseUrl = "";
$https = (!empty($_SERVER['HTTPS'])
&& (strtolower($_SERVER['HTTPS']) == 'on'))
|| (isset($_SERVER["SERVER_PORT"])
@ -72,8 +74,15 @@ final class Tools
$serverport = '';
}
return 'http' . ($https ? 's' : '') . '://'
. $host . $serverport . $scriptname;
// check if BASE_URL is configured
if(BASE_URL) {
$baseUrl = BASE_URL;
} else {
$baseUrl = 'http' . ($https ? 's' : '') . '://' . $host . $serverport;
}
return $baseUrl . $scriptname;
}
/**

3
inc/poche/config.inc.default.php
View file

@ -31,6 +31,9 @@
// Change this if not using the standart port for SSL - i.e you server is behind sslh
@define ('SSL_PORT', 443);
// Define this only if you use wallabag behind a proxy and if you encounter problems
@define ('BASE_URL', '');
@define ('MODE_DEMO', FALSE);
@define ('DEBUG_POCHE', FALSE);