jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fetching the hostname from the .htpreconfig.php if present

Browse source
This commit is contained in:
Michael Vogel 2014-05-29 11:40:54 +02:00
parent 235eae66bb
commit b6c1d7dc2b
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
boot.php
View file

@ -428,6 +428,8 @@ if(! class_exists('App')) {
global $default_timezone, $argv, $argc; global $default_timezone, $argv, $argc;
$hostname = "";
if (file_exists(".htpreconfig.php")) if (file_exists(".htpreconfig.php"))
@include(".htpreconfig.php"); @include(".htpreconfig.php");
@ -622,11 +624,16 @@ if(! class_exists('App')) {
if($parsed) { if($parsed) {
$this->scheme = $parsed['scheme']; $this->scheme = $parsed['scheme'];
$this->hostname = $parsed['host']; $hostname = $parsed['host'];
if(x($parsed,'port')) if(x($parsed,'port'))
$this->hostname .= ':' . $parsed['port']; $hostname .= ':' . $parsed['port'];
if(x($parsed,'path')) if(x($parsed,'path'))
$this->path = trim($parsed['path'],'\\/'); $this->path = trim($parsed['path'],'\\/');
if (file_exists(".htpreconfig.php"))
@include(".htpreconfig.php");
$this->hostname = $hostname;
} }
} }