fixed parser error
Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
parent
d45e79dfe9
commit
ccd1e2cc6a
1 changed files with 6 additions and 4 deletions
10
boot.php
10
boot.php
|
@ -665,10 +665,10 @@ class App {
|
||||||
$this->scheme = 'https';
|
$this->scheme = 'https';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($_SERVER,'SERVER_NAME')) {
|
if (x($_SERVER, 'SERVER_NAME')) {
|
||||||
$this->hostname = $_SERVER['SERVER_NAME'];
|
$this->hostname = $_SERVER['SERVER_NAME'];
|
||||||
|
|
||||||
if (x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443)
|
if (x($_SERVER, 'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) {
|
||||||
$this->hostname .= ':' . $_SERVER['SERVER_PORT'];
|
$this->hostname .= ':' . $_SERVER['SERVER_PORT'];
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
|
@ -676,6 +676,7 @@ class App {
|
||||||
* or in a sub-directory and adjust accordingly
|
* or in a sub-directory and adjust accordingly
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/// @TODO This kind of escaping breaks syntax-highlightning on CoolEdit (Midnight Commander)
|
||||||
$path = trim(dirname($_SERVER['SCRIPT_NAME']), '/\\');
|
$path = trim(dirname($_SERVER['SCRIPT_NAME']), '/\\');
|
||||||
if (isset($path) && strlen($path) && ($path != $this->path)) {
|
if (isset($path) && strlen($path) && ($path != $this->path)) {
|
||||||
$this->path = $path;
|
$this->path = $path;
|
||||||
|
@ -686,11 +687,12 @@ class App {
|
||||||
$this->hostname = $hostname;
|
$this->hostname = $hostname;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (is_array($_SERVER["argv"]) && $_SERVER["argc"]>1 && substr(end($_SERVER["argv"]), 0, 4)=="http" ) {
|
if (is_array($_SERVER["argv"]) && $_SERVER["argc"] > 1 && substr(end($_SERVER["argv"]), 0, 4) == "http" ) {
|
||||||
$this->set_baseurl(array_pop($_SERVER["argv"]) );
|
$this->set_baseurl(array_pop($_SERVER["argv"]));
|
||||||
$_SERVER["argc"] --;
|
$_SERVER["argc"] --;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// @TODO no longer needed?
|
||||||
#set_include_path("include/$this->hostname" . PATH_SEPARATOR . get_include_path());
|
#set_include_path("include/$this->hostname" . PATH_SEPARATOR . get_include_path());
|
||||||
|
|
||||||
if ((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,9) === "pagename=") {
|
if ((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,9) === "pagename=") {
|
||||||
|
|
Loading…
Reference in a new issue