From: Roland Haeder <roland@mxchange.org>
Date: Sat, 25 Mar 2017 12:33:15 +0000 (+0100)
Subject: fixed indending + closed own internal todo: better usage of x()
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=83dec2f8151138acfc6c1ae166c232a2ecd612f6;p=friendica.git

fixed indending + closed own internal todo: better usage of x()

removed todo

Signed-off-by: Roland Haeder <roland@mxchange.org>
---

diff --git a/boot.php b/boot.php
index 2a6e9b4ca5..474cb82057 100644
--- a/boot.php
+++ b/boot.php
@@ -655,14 +655,14 @@ class App {
 
 
 		$this->scheme = 'http';
-		/// @TODO x() should be better used here ...
+
 		if ((x($_SERVER, 'HTTPS') && $_SERVER['HTTPS']) ||
-		   (x($_SERVER['HTTP_FORWARDED']) && preg_match("/proto=https/", $_SERVER['HTTP_FORWARDED'])) ||
-		   (x($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') ||
-		   (x($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') ||
-		   (x($_SERVER['FRONT_END_HTTPS']) && $_SERVER['FRONT_END_HTTPS'] == 'on') ||
-		   (x($_SERVER, 'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443)) // XXX: reasonable assumption, but isn't this hardcoding too much?
-		   ) {
+				(x($_SERVER, 'HTTP_FORWARDED') && preg_match("/proto=https/", $_SERVER['HTTP_FORWARDED'])) ||
+				(x($_SERVER, 'HTTP_X_FORWARDED_PROTO') && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') ||
+				(x($_SERVER, 'HTTP_X_FORWARDED_SSL') && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') ||
+				(x($_SERVER, 'FRONT_END_HTTPS') && $_SERVER['FRONT_END_HTTPS'] == 'on') ||
+				(x($_SERVER, 'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443)) // XXX: reasonable assumption, but isn't this hardcoding too much?
+				) {
 			$this->scheme = 'https';
 		}
 
@@ -1367,7 +1367,6 @@ class App {
 		// add baseurl to args. cli scripts can't construct it
 		$args[] = $this->get_baseurl();
 
-		/// @TODO let's replace these with a foreach($key => $value) loop
 		for ($x = 0; $x < count($args); $x ++) {
 			$args[$x] = escapeshellarg($args[$x]);
 		}