From ccd1e2cc6a894d93ff3f6e3d1bfcc591702cbdf6 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 24 Mar 2017 20:50:10 +0100
Subject: [PATCH] fixed parser error
Signed-off-by: Roland Haeder <roland@mxchange.org>
---
boot.php | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/boot.php b/boot.php
index 5df8c6c4d9..05e1172821 100644
--- a/boot.php
+++ b/boot.php
@@ -665,10 +665,10 @@ class App {
$this->scheme = 'https';
}
- if (x($_SERVER,'SERVER_NAME')) {
+ if (x($_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'];
}
/*
@@ -676,6 +676,7 @@ class App {
* 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']), '/\\');
if (isset($path) && strlen($path) && ($path != $this->path)) {
$this->path = $path;
@@ -686,11 +687,12 @@ class App {
$this->hostname = $hostname;
}
- if (is_array($_SERVER["argv"]) && $_SERVER["argc"]>1 && substr(end($_SERVER["argv"]), 0, 4)=="http" ) {
- $this->set_baseurl(array_pop($_SERVER["argv"]) );
+ if (is_array($_SERVER["argv"]) && $_SERVER["argc"] > 1 && substr(end($_SERVER["argv"]), 0, 4) == "http" ) {
+ $this->set_baseurl(array_pop($_SERVER["argv"]));
$_SERVER["argc"] --;
}
+ /// @TODO no longer needed?
#set_include_path("include/$this->hostname" . PATH_SEPARATOR . get_include_path());
if ((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,9) === "pagename=") {
--
2.39.5