evolution-cms / evolution

core/vendor/tracy/tracy/src/Tracy/Helpers.php

Doc Comments +7 added lines

@@ -60,6 +60,9 @@ 
 	}
 
 
+	/**
+	 * @param string $mask
+	 */
 	public static function formatHtml($mask)
 	{
 		$args = func_get_args();
@@ -75,6 +78,9 @@ 
 	}
 
 
+	/**
+	 * @param string $method
+	 */
 	public static function findTrace(array $trace, $method, &$index = null)
 	{
 		$m = explode('::', $method);
@@ -277,6 +283,7 @@ 
 
 	/**
 	 * Finds the best suggestion.
+	 * @param string $value
 	 * @return string|null
 	 * @internal
 	 */

Indentation +304 added lines, -304 removed lines

@@ -14,308 +14,308 @@
 class Helpers
 {
 
-	/**
-	 * Returns HTML link to editor.
-	 * @return string
-	 */
-	public static function editorLink($file, $line = null)
-	{
-		$file = strtr($origFile = $file, Debugger::$editorMapping);
-		if ($editor = self::editorUri($origFile, $line)) {
-			$file = strtr($file, '\\', '/');
-			if (preg_match('#(^[a-z]:)?/.{1,50}$#i', $file, $m) && strlen($file) > strlen($m[0])) {
-				$file = '...' . $m[0];
-			}
-			$file = strtr($file, '/', DIRECTORY_SEPARATOR);
-			return self::formatHtml('<a href="%" title="%">%<b>%</b>%</a>',
-				$editor,
-				$file . ($line ? ":$line" : ''),
-				rtrim(dirname($file), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR,
-				basename($file),
-				$line ? ":$line" : ''
-			);
-		} else {
-			return self::formatHtml('<span>%</span>', $file . ($line ? ":$line" : ''));
-		}
-	}
-
-
-	/**
-	 * Returns link to editor.
-	 * @return string|null
-	 */
-	public static function editorUri($file, $line = null, $action = 'open', $search = null, $replace = null)
-	{
-		if (Debugger::$editor && $file && ($action === 'create' || is_file($file))) {
-			$file = strtr($file, '/', DIRECTORY_SEPARATOR);
-			$file = strtr($file, Debugger::$editorMapping);
-			return strtr(Debugger::$editor, [
-				'%action' => $action,
-				'%file' => rawurlencode($file),
-				'%line' => $line ? (int) $line : 1,
-				'%search' => rawurlencode($search),
-				'%replace' => rawurlencode($replace),
-			]);
-		}
-	}
-
-
-	public static function formatHtml($mask)
-	{
-		$args = func_get_args();
-		return preg_replace_callback('#%#', function () use (&$args, &$count) {
-			return self::escapeHtml($args[++$count]);
-		}, $mask);
-	}
-
-
-	public static function escapeHtml($s)
-	{
-		return htmlspecialchars((string) $s, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
-	}
-
-
-	public static function findTrace(array $trace, $method, &$index = null)
-	{
-		$m = explode('::', $method);
-		foreach ($trace as $i => $item) {
-			if (
-				isset($item['function'])
-				&& $item['function'] === end($m)
-				&& isset($item['class']) === isset($m[1])
-				&& (!isset($item['class']) || $m[0] === '*' || is_a($item['class'], $m[0], true))
-			) {
-				$index = $i;
-				return $item;
-			}
-		}
-	}
-
-
-	/**
-	 * @return string
-	 */
-	public static function getClass($obj)
-	{
-		return explode("\x00", get_class($obj))[0];
-	}
-
-
-	/** @internal */
-	public static function fixStack($exception)
-	{
-		if (function_exists('xdebug_get_function_stack')) {
-			$stack = [];
-			foreach (array_slice(array_reverse(xdebug_get_function_stack()), 2, -1) as $row) {
-				$frame = [
-					'file' => $row['file'],
-					'line' => $row['line'],
-					'function' => isset($row['function']) ? $row['function'] : '*unknown*',
-					'args' => [],
-				];
-				if (!empty($row['class'])) {
-					$frame['type'] = isset($row['type']) && $row['type'] === 'dynamic' ? '->' : '::';
-					$frame['class'] = $row['class'];
-				}
-				$stack[] = $frame;
-			}
-			$ref = new \ReflectionProperty('Exception', 'trace');
-			$ref->setAccessible(true);
-			$ref->setValue($exception, $stack);
-		}
-		return $exception;
-	}
-
-
-	/** @internal */
-	public static function fixEncoding($s)
-	{
-		return htmlspecialchars_decode(htmlspecialchars($s, ENT_NOQUOTES | ENT_IGNORE, 'UTF-8'), ENT_NOQUOTES);
-	}
-
-
-	/** @internal */
-	public static function errorTypeToString($type)
-	{
-		$types = [
-			E_ERROR => 'Fatal Error',
-			E_USER_ERROR => 'User Error',
-			E_RECOVERABLE_ERROR => 'Recoverable Error',
-			E_CORE_ERROR => 'Core Error',
-			E_COMPILE_ERROR => 'Compile Error',
-			E_PARSE => 'Parse Error',
-			E_WARNING => 'Warning',
-			E_CORE_WARNING => 'Core Warning',
-			E_COMPILE_WARNING => 'Compile Warning',
-			E_USER_WARNING => 'User Warning',
-			E_NOTICE => 'Notice',
-			E_USER_NOTICE => 'User Notice',
-			E_STRICT => 'Strict standards',
-			E_DEPRECATED => 'Deprecated',
-			E_USER_DEPRECATED => 'User Deprecated',
-		];
-		return isset($types[$type]) ? $types[$type] : 'Unknown error';
-	}
-
-
-	/** @internal */
-	public static function getSource()
-	{
-		if (isset($_SERVER['REQUEST_URI'])) {
-			return (!empty($_SERVER['HTTPS']) && strcasecmp($_SERVER['HTTPS'], 'off') ? 'https://' : 'http://')
-				. (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : '')
-				. $_SERVER['REQUEST_URI'];
-		} else {
-			return 'CLI (PID: ' . getmypid() . ')'
-				. (empty($_SERVER['argv']) ? '' : ': ' . implode(' ', $_SERVER['argv']));
-		}
-	}
-
-
-	/** @internal */
-	public static function improveException($e)
-	{
-		$message = $e->getMessage();
-
-		if ($e instanceof \Nette\MemberAccessException && ($trace = $e->getTrace()) && isset($trace[1]['file'], $trace[1]['line'])) {
-			if (preg_match('# property ([\w\\\\]+)::\$(\w+), did you mean \$(\w+)#', $message, $m)) {
-				$replace = ["->$m[2]", "->$m[3]"];
-			} elseif (preg_match('# method ([\w\\\\]+)::(\w+)\(\), did you mean (\w+)\(#', $message, $m)) {
-				$replace = ["$m[2](", "$m[3]("];
-			} else {
-				return;
-			}
-			$e->tracyAction = [
-				'link' => self::editorUri($trace[1]['file'], $trace[1]['line'], 'fix', $replace[0], $replace[1]),
-				'label' => 'fix it',
-			];
-
-		} elseif (!$e instanceof \Error && !$e instanceof \ErrorException) {
-			// do nothing
-		} elseif (preg_match('#^Call to undefined function (\S+\\\\)?(\w+)\(#', $message, $m)) {
-			$funcs = array_merge(get_defined_functions()['internal'], get_defined_functions()['user']);
-			$hint = self::getSuggestion($funcs, $m[1] . $m[2]) ?: self::getSuggestion($funcs, $m[2]);
-			$message = "Call to undefined function $m[2](), did you mean $hint()?";
-			$replace = ["$m[2](", "$hint("];
-
-		} elseif (preg_match('#^Call to undefined method ([\w\\\\]+)::(\w+)#', $message, $m)) {
-			$hint = self::getSuggestion(get_class_methods($m[1]), $m[2]);
-			$message .= ", did you mean $hint()?";
-			$replace = ["$m[2](", "$hint("];
-
-		} elseif (preg_match('#^Undefined variable: (\w+)#', $message, $m) && !empty($e->context)) {
-			$hint = self::getSuggestion(array_keys($e->context), $m[1]);
-			$message = "Undefined variable $$m[1], did you mean $$hint?";
-			$replace = ["$$m[1]", "$$hint"];
-
-		} elseif (preg_match('#^Undefined property: ([\w\\\\]+)::\$(\w+)#', $message, $m)) {
-			$rc = new \ReflectionClass($m[1]);
-			$items = array_diff($rc->getProperties(\ReflectionProperty::IS_PUBLIC), $rc->getProperties(\ReflectionProperty::IS_STATIC));
-			$hint = self::getSuggestion($items, $m[2]);
-			$message .= ", did you mean $$hint?";
-			$replace = ["->$m[2]", "->$hint"];
-
-		} elseif (preg_match('#^Access to undeclared static property: ([\w\\\\]+)::\$(\w+)#', $message, $m)) {
-			$rc = new \ReflectionClass($m[1]);
-			$items = array_intersect($rc->getProperties(\ReflectionProperty::IS_PUBLIC), $rc->getProperties(\ReflectionProperty::IS_STATIC));
-			$hint = self::getSuggestion($items, $m[2]);
-			$message .= ", did you mean $$hint?";
-			$replace = ["::$$m[2]", "::$$hint"];
-		}
-
-		if (isset($hint)) {
-			$ref = new \ReflectionProperty($e, 'message');
-			$ref->setAccessible(true);
-			$ref->setValue($e, $message);
-			$e->tracyAction = [
-				'link' => self::editorUri($e->getFile(), $e->getLine(), 'fix', $replace[0], $replace[1]),
-				'label' => 'fix it',
-			];
-		}
-	}
-
-
-	/** @internal */
-	public static function improveError($message, array $context = [])
-	{
-		if (preg_match('#^Undefined variable: (\w+)#', $message, $m) && $context) {
-			$hint = self::getSuggestion(array_keys($context), $m[1]);
-			return $hint ? "Undefined variable $$m[1], did you mean $$hint?" : $message;
-
-		} elseif (preg_match('#^Undefined property: ([\w\\\\]+)::\$(\w+)#', $message, $m)) {
-			$rc = new \ReflectionClass($m[1]);
-			$items = array_diff($rc->getProperties(\ReflectionProperty::IS_PUBLIC), $rc->getProperties(\ReflectionProperty::IS_STATIC));
-			$hint = self::getSuggestion($items, $m[2]);
-			return $hint ? $message . ", did you mean $$hint?" : $message;
-		}
-		return $message;
-	}
-
-
-	/** @internal */
-	public static function guessClassFile($class)
-	{
-		$segments = explode(DIRECTORY_SEPARATOR, $class);
-		$res = null;
-		$max = 0;
-		foreach (get_declared_classes() as $class) {
-			$parts = explode(DIRECTORY_SEPARATOR, $class);
-			foreach ($parts as $i => $part) {
-				if (!isset($segments[$i]) || $part !== $segments[$i]) {
-					break;
-				}
-			}
-			if ($i > $max && ($file = (new \ReflectionClass($class))->getFileName())) {
-				$max = $i;
-				$res = array_merge(array_slice(explode(DIRECTORY_SEPARATOR, $file), 0, $i - count($parts)), array_slice($segments, $i));
-				$res = implode(DIRECTORY_SEPARATOR, $res) . '.php';
-			}
-		}
-		return $res;
-	}
-
-
-	/**
-	 * Finds the best suggestion.
-	 * @return string|null
-	 * @internal
-	 */
-	public static function getSuggestion(array $items, $value)
-	{
-		$best = null;
-		$min = (strlen($value) / 4 + 1) * 10 + .1;
-		foreach (array_unique($items, SORT_REGULAR) as $item) {
-			$item = is_object($item) ? $item->getName() : $item;
-			if (($len = levenshtein($item, $value, 10, 11, 10)) > 0 && $len < $min) {
-				$min = $len;
-				$best = $item;
-			}
-		}
-		return $best;
-	}
-
-
-	/** @internal */
-	public static function isHtmlMode()
-	{
-		return empty($_SERVER['HTTP_X_REQUESTED_WITH']) && empty($_SERVER['HTTP_X_TRACY_AJAX'])
-			&& PHP_SAPI !== 'cli'
-			&& !preg_match('#^Content-Type: (?!text/html)#im', implode("\n", headers_list()));
-	}
-
-
-	/** @internal */
-	public static function isAjax()
-	{
-		return isset($_SERVER['HTTP_X_TRACY_AJAX']) && preg_match('#^\w{10}\z#', $_SERVER['HTTP_X_TRACY_AJAX']);
-	}
-
-
-	/** @internal */
-	public static function getNonce()
-	{
-		return preg_match('#^Content-Security-Policy(?:-Report-Only)?:.*\sscript-src\s+(?:[^;]+\s)?\'nonce-([\w+/]+=*)\'#mi', implode("\n", headers_list()), $m)
-			? $m[1]
-			: null;
-	}
+    /**
+     * Returns HTML link to editor.
+     * @return string
+     */
+    public static function editorLink($file, $line = null)
+    {
+        $file = strtr($origFile = $file, Debugger::$editorMapping);
+        if ($editor = self::editorUri($origFile, $line)) {
+            $file = strtr($file, '\\', '/');
+            if (preg_match('#(^[a-z]:)?/.{1,50}$#i', $file, $m) && strlen($file) > strlen($m[0])) {
+                $file = '...' . $m[0];
+            }
+            $file = strtr($file, '/', DIRECTORY_SEPARATOR);
+            return self::formatHtml('<a href="%" title="%">%<b>%</b>%</a>',
+                $editor,
+                $file . ($line ? ":$line" : ''),
+                rtrim(dirname($file), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR,
+                basename($file),
+                $line ? ":$line" : ''
+            );
+        } else {
+            return self::formatHtml('<span>%</span>', $file . ($line ? ":$line" : ''));
+        }
+    }
+
+
+    /**
+     * Returns link to editor.
+     * @return string|null
+     */
+    public static function editorUri($file, $line = null, $action = 'open', $search = null, $replace = null)
+    {
+        if (Debugger::$editor && $file && ($action === 'create' || is_file($file))) {
+            $file = strtr($file, '/', DIRECTORY_SEPARATOR);
+            $file = strtr($file, Debugger::$editorMapping);
+            return strtr(Debugger::$editor, [
+                '%action' => $action,
+                '%file' => rawurlencode($file),
+                '%line' => $line ? (int) $line : 1,
+                '%search' => rawurlencode($search),
+                '%replace' => rawurlencode($replace),
+            ]);
+        }
+    }
+
+
+    public static function formatHtml($mask)
+    {
+        $args = func_get_args();
+        return preg_replace_callback('#%#', function () use (&$args, &$count) {
+            return self::escapeHtml($args[++$count]);
+        }, $mask);
+    }
+
+
+    public static function escapeHtml($s)
+    {
+        return htmlspecialchars((string) $s, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
+    }
+
+
+    public static function findTrace(array $trace, $method, &$index = null)
+    {
+        $m = explode('::', $method);
+        foreach ($trace as $i => $item) {
+            if (
+                isset($item['function'])
+                && $item['function'] === end($m)
+                && isset($item['class']) === isset($m[1])
+                && (!isset($item['class']) || $m[0] === '*' || is_a($item['class'], $m[0], true))
+            ) {
+                $index = $i;
+                return $item;
+            }
+        }
+    }
+
+
+    /**
+     * @return string
+     */
+    public static function getClass($obj)
+    {
+        return explode("\x00", get_class($obj))[0];
+    }
+
+
+    /** @internal */
+    public static function fixStack($exception)
+    {
+        if (function_exists('xdebug_get_function_stack')) {
+            $stack = [];
+            foreach (array_slice(array_reverse(xdebug_get_function_stack()), 2, -1) as $row) {
+                $frame = [
+                    'file' => $row['file'],
+                    'line' => $row['line'],
+                    'function' => isset($row['function']) ? $row['function'] : '*unknown*',
+                    'args' => [],
+                ];
+                if (!empty($row['class'])) {
+                    $frame['type'] = isset($row['type']) && $row['type'] === 'dynamic' ? '->' : '::';
+                    $frame['class'] = $row['class'];
+                }
+                $stack[] = $frame;
+            }
+            $ref = new \ReflectionProperty('Exception', 'trace');
+            $ref->setAccessible(true);
+            $ref->setValue($exception, $stack);
+        }
+        return $exception;
+    }
+
+
+    /** @internal */
+    public static function fixEncoding($s)
+    {
+        return htmlspecialchars_decode(htmlspecialchars($s, ENT_NOQUOTES | ENT_IGNORE, 'UTF-8'), ENT_NOQUOTES);
+    }
+
+
+    /** @internal */
+    public static function errorTypeToString($type)
+    {
+        $types = [
+            E_ERROR => 'Fatal Error',
+            E_USER_ERROR => 'User Error',
+            E_RECOVERABLE_ERROR => 'Recoverable Error',
+            E_CORE_ERROR => 'Core Error',
+            E_COMPILE_ERROR => 'Compile Error',
+            E_PARSE => 'Parse Error',
+            E_WARNING => 'Warning',
+            E_CORE_WARNING => 'Core Warning',
+            E_COMPILE_WARNING => 'Compile Warning',
+            E_USER_WARNING => 'User Warning',
+            E_NOTICE => 'Notice',
+            E_USER_NOTICE => 'User Notice',
+            E_STRICT => 'Strict standards',
+            E_DEPRECATED => 'Deprecated',
+            E_USER_DEPRECATED => 'User Deprecated',
+        ];
+        return isset($types[$type]) ? $types[$type] : 'Unknown error';
+    }
+
+
+    /** @internal */
+    public static function getSource()
+    {
+        if (isset($_SERVER['REQUEST_URI'])) {
+            return (!empty($_SERVER['HTTPS']) && strcasecmp($_SERVER['HTTPS'], 'off') ? 'https://' : 'http://')
+                . (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : '')
+                . $_SERVER['REQUEST_URI'];
+        } else {
+            return 'CLI (PID: ' . getmypid() . ')'
+                . (empty($_SERVER['argv']) ? '' : ': ' . implode(' ', $_SERVER['argv']));
+        }
+    }
+
+
+    /** @internal */
+    public static function improveException($e)
+    {
+        $message = $e->getMessage();
+
+        if ($e instanceof \Nette\MemberAccessException && ($trace = $e->getTrace()) && isset($trace[1]['file'], $trace[1]['line'])) {
+            if (preg_match('# property ([\w\\\\]+)::\$(\w+), did you mean \$(\w+)#', $message, $m)) {
+                $replace = ["->$m[2]", "->$m[3]"];
+            } elseif (preg_match('# method ([\w\\\\]+)::(\w+)\(\), did you mean (\w+)\(#', $message, $m)) {
+                $replace = ["$m[2](", "$m[3]("];
+            } else {
+                return;
+            }
+            $e->tracyAction = [
+                'link' => self::editorUri($trace[1]['file'], $trace[1]['line'], 'fix', $replace[0], $replace[1]),
+                'label' => 'fix it',
+            ];
+
+        } elseif (!$e instanceof \Error && !$e instanceof \ErrorException) {
+            // do nothing
+        } elseif (preg_match('#^Call to undefined function (\S+\\\\)?(\w+)\(#', $message, $m)) {
+            $funcs = array_merge(get_defined_functions()['internal'], get_defined_functions()['user']);
+            $hint = self::getSuggestion($funcs, $m[1] . $m[2]) ?: self::getSuggestion($funcs, $m[2]);
+            $message = "Call to undefined function $m[2](), did you mean $hint()?";
+            $replace = ["$m[2](", "$hint("];
+
+        } elseif (preg_match('#^Call to undefined method ([\w\\\\]+)::(\w+)#', $message, $m)) {
+            $hint = self::getSuggestion(get_class_methods($m[1]), $m[2]);
+            $message .= ", did you mean $hint()?";
+            $replace = ["$m[2](", "$hint("];
+
+        } elseif (preg_match('#^Undefined variable: (\w+)#', $message, $m) && !empty($e->context)) {
+            $hint = self::getSuggestion(array_keys($e->context), $m[1]);
+            $message = "Undefined variable $$m[1], did you mean $$hint?";
+            $replace = ["$$m[1]", "$$hint"];
+
+        } elseif (preg_match('#^Undefined property: ([\w\\\\]+)::\$(\w+)#', $message, $m)) {
+            $rc = new \ReflectionClass($m[1]);
+            $items = array_diff($rc->getProperties(\ReflectionProperty::IS_PUBLIC), $rc->getProperties(\ReflectionProperty::IS_STATIC));
+            $hint = self::getSuggestion($items, $m[2]);
+            $message .= ", did you mean $$hint?";
+            $replace = ["->$m[2]", "->$hint"];
+
+        } elseif (preg_match('#^Access to undeclared static property: ([\w\\\\]+)::\$(\w+)#', $message, $m)) {
+            $rc = new \ReflectionClass($m[1]);
+            $items = array_intersect($rc->getProperties(\ReflectionProperty::IS_PUBLIC), $rc->getProperties(\ReflectionProperty::IS_STATIC));
+            $hint = self::getSuggestion($items, $m[2]);
+            $message .= ", did you mean $$hint?";
+            $replace = ["::$$m[2]", "::$$hint"];
+        }
+
+        if (isset($hint)) {
+            $ref = new \ReflectionProperty($e, 'message');
+            $ref->setAccessible(true);
+            $ref->setValue($e, $message);
+            $e->tracyAction = [
+                'link' => self::editorUri($e->getFile(), $e->getLine(), 'fix', $replace[0], $replace[1]),
+                'label' => 'fix it',
+            ];
+        }
+    }
+
+
+    /** @internal */
+    public static function improveError($message, array $context = [])
+    {
+        if (preg_match('#^Undefined variable: (\w+)#', $message, $m) && $context) {
+            $hint = self::getSuggestion(array_keys($context), $m[1]);
+            return $hint ? "Undefined variable $$m[1], did you mean $$hint?" : $message;
+
+        } elseif (preg_match('#^Undefined property: ([\w\\\\]+)::\$(\w+)#', $message, $m)) {
+            $rc = new \ReflectionClass($m[1]);
+            $items = array_diff($rc->getProperties(\ReflectionProperty::IS_PUBLIC), $rc->getProperties(\ReflectionProperty::IS_STATIC));
+            $hint = self::getSuggestion($items, $m[2]);
+            return $hint ? $message . ", did you mean $$hint?" : $message;
+        }
+        return $message;
+    }
+
+
+    /** @internal */
+    public static function guessClassFile($class)
+    {
+        $segments = explode(DIRECTORY_SEPARATOR, $class);
+        $res = null;
+        $max = 0;
+        foreach (get_declared_classes() as $class) {
+            $parts = explode(DIRECTORY_SEPARATOR, $class);
+            foreach ($parts as $i => $part) {
+                if (!isset($segments[$i]) || $part !== $segments[$i]) {
+                    break;
+                }
+            }
+            if ($i > $max && ($file = (new \ReflectionClass($class))->getFileName())) {
+                $max = $i;
+                $res = array_merge(array_slice(explode(DIRECTORY_SEPARATOR, $file), 0, $i - count($parts)), array_slice($segments, $i));
+                $res = implode(DIRECTORY_SEPARATOR, $res) . '.php';
+            }
+        }
+        return $res;
+    }
+
+
+    /**
+     * Finds the best suggestion.
+     * @return string|null
+     * @internal
+     */
+    public static function getSuggestion(array $items, $value)
+    {
+        $best = null;
+        $min = (strlen($value) / 4 + 1) * 10 + .1;
+        foreach (array_unique($items, SORT_REGULAR) as $item) {
+            $item = is_object($item) ? $item->getName() : $item;
+            if (($len = levenshtein($item, $value, 10, 11, 10)) > 0 && $len < $min) {
+                $min = $len;
+                $best = $item;
+            }
+        }
+        return $best;
+    }
+
+
+    /** @internal */
+    public static function isHtmlMode()
+    {
+        return empty($_SERVER['HTTP_X_REQUESTED_WITH']) && empty($_SERVER['HTTP_X_TRACY_AJAX'])
+            && PHP_SAPI !== 'cli'
+            && !preg_match('#^Content-Type: (?!text/html)#im', implode("\n", headers_list()));
+    }
+
+
+    /** @internal */
+    public static function isAjax()
+    {
+        return isset($_SERVER['HTTP_X_TRACY_AJAX']) && preg_match('#^\w{10}\z#', $_SERVER['HTTP_X_TRACY_AJAX']);
+    }
+
+
+    /** @internal */
+    public static function getNonce()
+    {
+        return preg_match('#^Content-Security-Policy(?:-Report-Only)?:.*\sscript-src\s+(?:[^;]+\s)?\'nonce-([\w+/]+=*)\'#mi', implode("\n", headers_list()), $m)
+            ? $m[1]
+            : null;
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -24,18 +24,18 @@ 
 		if ($editor = self::editorUri($origFile, $line)) {
 			$file = strtr($file, '\\', '/');
 			if (preg_match('#(^[a-z]:)?/.{1,50}$#i', $file, $m) && strlen($file) > strlen($m[0])) {
-				$file = '...' . $m[0];
+				$file = '...'.$m[0];
 			}
 			$file = strtr($file, '/', DIRECTORY_SEPARATOR);
 			return self::formatHtml('<a href="%" title="%">%<b>%</b>%</a>',
 				$editor,
-				$file . ($line ? ":$line" : ''),
-				rtrim(dirname($file), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR,
+				$file.($line ? ":$line" : ''),
+				rtrim(dirname($file), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR,
 				basename($file),
 				$line ? ":$line" : ''
 			);
 		} else {
-			return self::formatHtml('<span>%</span>', $file . ($line ? ":$line" : ''));
+			return self::formatHtml('<span>%</span>', $file.($line ? ":$line" : ''));
 		}
 	}
 
@@ -63,7 +63,7 @@ 
 	public static function formatHtml($mask)
 	{
 		$args = func_get_args();
-		return preg_replace_callback('#%#', function () use (&$args, &$count) {
+		return preg_replace_callback('#%#', function() use (&$args, &$count) {
 			return self::escapeHtml($args[++$count]);
 		}, $mask);
 	}
@@ -166,8 +166,8 @@ 
 				. (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : '')
 				. $_SERVER['REQUEST_URI'];
 		} else {
-			return 'CLI (PID: ' . getmypid() . ')'
-				. (empty($_SERVER['argv']) ? '' : ': ' . implode(' ', $_SERVER['argv']));
+			return 'CLI (PID: '.getmypid().')'
+				. (empty($_SERVER['argv']) ? '' : ': '.implode(' ', $_SERVER['argv']));
 		}
 	}
 
@@ -194,7 +194,7 @@ 
 			// do nothing
 		} elseif (preg_match('#^Call to undefined function (\S+\\\\)?(\w+)\(#', $message, $m)) {
 			$funcs = array_merge(get_defined_functions()['internal'], get_defined_functions()['user']);
-			$hint = self::getSuggestion($funcs, $m[1] . $m[2]) ?: self::getSuggestion($funcs, $m[2]);
+			$hint = self::getSuggestion($funcs, $m[1].$m[2]) ?: self::getSuggestion($funcs, $m[2]);
 			$message = "Call to undefined function $m[2](), did you mean $hint()?";
 			$replace = ["$m[2](", "$hint("];
 
@@ -246,7 +246,7 @@ 
 			$rc = new \ReflectionClass($m[1]);
 			$items = array_diff($rc->getProperties(\ReflectionProperty::IS_PUBLIC), $rc->getProperties(\ReflectionProperty::IS_STATIC));
 			$hint = self::getSuggestion($items, $m[2]);
-			return $hint ? $message . ", did you mean $$hint?" : $message;
+			return $hint ? $message.", did you mean $$hint?" : $message;
 		}
 		return $message;
 	}
@@ -268,7 +268,7 @@ 
 			if ($i > $max && ($file = (new \ReflectionClass($class))->getFileName())) {
 				$max = $i;
 				$res = array_merge(array_slice(explode(DIRECTORY_SEPARATOR, $file), 0, $i - count($parts)), array_slice($segments, $i));
-				$res = implode(DIRECTORY_SEPARATOR, $res) . '.php';
+				$res = implode(DIRECTORY_SEPARATOR, $res).'.php';
 			}
 		}
 		return $res;

Braces +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 	public static function formatHtml($mask)
 	{
 		$args = func_get_args();
-		return preg_replace_callback('#%#', function () use (&$args, &$count) {
+		return preg_replace_callback('#%#', function () use (&$args, &$count){
 			return self::escapeHtml($args[++$count]);
 		}, $mask);
 	}

core/vendor/tracy/tracy/src/Tracy/Logger.php

Doc Comments +2 added lines

@@ -107,6 +107,7 @@ 
 
 	/**
 	 * @param  mixed  $message
+	 * @param string $exceptionFile
 	 * @return string
 	 */
 	public static function formatLogLine($message, $exceptionFile = null)
@@ -147,6 +148,7 @@ 
 	/**
 	 * Logs exception to the file if file doesn't exist.
 	 * @param  \Exception|\Throwable  $exception
+	 * @param string $file
 	 * @return string logged error filename
 	 */
 	protected function logException($exception, $file = null)

Indentation +193 added lines, -193 removed lines

@@ -13,197 +13,197 @@
  */
 class Logger implements ILogger
 {
-	/** @var string|null name of the directory where errors should be logged */
-	public $directory;
-
-	/** @var string|array|null email or emails to which send error notifications */
-	public $email;
-
-	/** @var string|null sender of email notifications */
-	public $fromEmail;
-
-	/** @var mixed interval for sending email is 2 days */
-	public $emailSnooze = '2 days';
-
-	/** @var callable handler for sending emails */
-	public $mailer;
-
-	/** @var BlueScreen|null */
-	private $blueScreen;
-
-
-	/**
-	 * @param  string|null  $directory
-	 * @param  string|array|null  $email
-	 */
-	public function __construct($directory, $email = null, BlueScreen $blueScreen = null)
-	{
-		$this->directory = $directory;
-		$this->email = $email;
-		$this->blueScreen = $blueScreen;
-		$this->mailer = [$this, 'defaultMailer'];
-	}
-
-
-	/**
-	 * Logs message or exception to file and sends email notification.
-	 * @param  mixed  $message
-	 * @param  string  $priority  one of constant ILogger::INFO, WARNING, ERROR (sends email), EXCEPTION (sends email), CRITICAL (sends email)
-	 * @return string|null logged error filename
-	 */
-	public function log($message, $priority = self::INFO)
-	{
-		if (!$this->directory) {
-			throw new \LogicException('Logging directory is not specified.');
-		} elseif (!is_dir($this->directory)) {
-			throw new \RuntimeException("Logging directory '$this->directory' is not found or is not directory.");
-		}
-
-		$exceptionFile = $message instanceof \Exception || $message instanceof \Throwable
-			? $this->getExceptionFile($message)
-			: null;
-		$line = static::formatLogLine($message, $exceptionFile);
-		$file = $this->directory . '/' . strtolower($priority ?: self::INFO) . '.log';
-
-		if (!@file_put_contents($file, $line . PHP_EOL, FILE_APPEND | LOCK_EX)) { // @ is escalated to exception
-			throw new \RuntimeException("Unable to write to log file '$file'. Is directory writable?");
-		}
-
-		if ($exceptionFile) {
-			$this->logException($message, $exceptionFile);
-		}
-
-		if (in_array($priority, [self::ERROR, self::EXCEPTION, self::CRITICAL], true)) {
-			$this->sendEmail($message);
-		}
-
-		return $exceptionFile;
-	}
-
-
-	/**
-	 * @param  mixed  $message
-	 * @return string
-	 */
-	public static function formatMessage($message)
-	{
-		if ($message instanceof \Exception || $message instanceof \Throwable) {
-			while ($message) {
-				$tmp[] = ($message instanceof \ErrorException
-					? Helpers::errorTypeToString($message->getSeverity()) . ': ' . $message->getMessage()
-					: Helpers::getClass($message) . ': ' . $message->getMessage() . ($message->getCode() ? ' #' . $message->getCode() : '')
-				) . ' in ' . $message->getFile() . ':' . $message->getLine();
-				$message = $message->getPrevious();
-			}
-			$message = implode("\ncaused by ", $tmp);
-
-		} elseif (!is_string($message)) {
-			$message = Dumper::toText($message);
-		}
-
-		return trim($message);
-	}
-
-
-	/**
-	 * @param  mixed  $message
-	 * @return string
-	 */
-	public static function formatLogLine($message, $exceptionFile = null)
-	{
-		return implode(' ', [
-			@date('[Y-m-d H-i-s]'), // @ timezone may not be set
-			preg_replace('#\s*\r?\n\s*#', ' ', static::formatMessage($message)),
-			' @  ' . Helpers::getSource(),
-			$exceptionFile ? ' @@  ' . basename($exceptionFile) : null,
-		]);
-	}
-
-
-	/**
-	 * @param  \Exception|\Throwable  $exception
-	 * @return string
-	 */
-	public function getExceptionFile($exception)
-	{
-		while ($exception) {
-			$data[] = [
-				get_class($exception), $exception->getMessage(), $exception->getCode(), $exception->getFile(), $exception->getLine(),
-				array_map(function ($item) { unset($item['args']); return $item; }, $exception->getTrace()),
-			];
-			$exception = $exception->getPrevious();
-		}
-		$hash = substr(md5(serialize($data)), 0, 10);
-		$dir = strtr($this->directory . '/', '\\/', DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR);
-		foreach (new \DirectoryIterator($this->directory) as $file) {
-			if (strpos($file->getBasename(), $hash)) {
-				return $dir . $file;
-			}
-		}
-		return $dir . 'exception--' . @date('Y-m-d--H-i') . "--$hash.html"; // @ timezone may not be set
-	}
-
-
-	/**
-	 * Logs exception to the file if file doesn't exist.
-	 * @param  \Exception|\Throwable  $exception
-	 * @return string logged error filename
-	 */
-	protected function logException($exception, $file = null)
-	{
-		$file = $file ?: $this->getExceptionFile($exception);
-		$bs = $this->blueScreen ?: new BlueScreen;
-		$bs->renderToFile($exception, $file);
-		return $file;
-	}
-
-
-	/**
-	 * @param  mixed  $message
-	 * @return void
-	 */
-	protected function sendEmail($message)
-	{
-		$snooze = is_numeric($this->emailSnooze)
-			? $this->emailSnooze
-			: @strtotime($this->emailSnooze) - time(); // @ timezone may not be set
-
-		if (
-			$this->email
-			&& $this->mailer
-			&& @filemtime($this->directory . '/email-sent') + $snooze < time() // @ file may not exist
-			&& @file_put_contents($this->directory . '/email-sent', 'sent') // @ file may not be writable
-		) {
-			call_user_func($this->mailer, $message, implode(', ', (array) $this->email));
-		}
-	}
-
-
-	/**
-	 * Default mailer.
-	 * @param  mixed  $message
-	 * @param  string  $email
-	 * @return void
-	 * @internal
-	 */
-	public function defaultMailer($message, $email)
-	{
-		$host = preg_replace('#[^\w.-]+#', '', isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : php_uname('n'));
-		$parts = str_replace(
-			["\r\n", "\n"],
-			["\n", PHP_EOL],
-			[
-				'headers' => implode("\n", [
-					'From: ' . ($this->fromEmail ?: "noreply@$host"),
-					'X-Mailer: Tracy',
-					'Content-Type: text/plain; charset=UTF-8',
-					'Content-Transfer-Encoding: 8bit',
-				]) . "\n",
-				'subject' => "PHP: An error occurred on the server $host",
-				'body' => static::formatMessage($message) . "\n\nsource: " . Helpers::getSource(),
-			]
-		);
-
-		mail($email, $parts['subject'], $parts['body'], $parts['headers']);
-	}
+    /** @var string|null name of the directory where errors should be logged */
+    public $directory;
+
+    /** @var string|array|null email or emails to which send error notifications */
+    public $email;
+
+    /** @var string|null sender of email notifications */
+    public $fromEmail;
+
+    /** @var mixed interval for sending email is 2 days */
+    public $emailSnooze = '2 days';
+
+    /** @var callable handler for sending emails */
+    public $mailer;
+
+    /** @var BlueScreen|null */
+    private $blueScreen;
+
+
+    /**
+     * @param  string|null  $directory
+     * @param  string|array|null  $email
+     */
+    public function __construct($directory, $email = null, BlueScreen $blueScreen = null)
+    {
+        $this->directory = $directory;
+        $this->email = $email;
+        $this->blueScreen = $blueScreen;
+        $this->mailer = [$this, 'defaultMailer'];
+    }
+
+
+    /**
+     * Logs message or exception to file and sends email notification.
+     * @param  mixed  $message
+     * @param  string  $priority  one of constant ILogger::INFO, WARNING, ERROR (sends email), EXCEPTION (sends email), CRITICAL (sends email)
+     * @return string|null logged error filename
+     */
+    public function log($message, $priority = self::INFO)
+    {
+        if (!$this->directory) {
+            throw new \LogicException('Logging directory is not specified.');
+        } elseif (!is_dir($this->directory)) {
+            throw new \RuntimeException("Logging directory '$this->directory' is not found or is not directory.");
+        }
+
+        $exceptionFile = $message instanceof \Exception || $message instanceof \Throwable
+            ? $this->getExceptionFile($message)
+            : null;
+        $line = static::formatLogLine($message, $exceptionFile);
+        $file = $this->directory . '/' . strtolower($priority ?: self::INFO) . '.log';
+
+        if (!@file_put_contents($file, $line . PHP_EOL, FILE_APPEND | LOCK_EX)) { // @ is escalated to exception
+            throw new \RuntimeException("Unable to write to log file '$file'. Is directory writable?");
+        }
+
+        if ($exceptionFile) {
+            $this->logException($message, $exceptionFile);
+        }
+
+        if (in_array($priority, [self::ERROR, self::EXCEPTION, self::CRITICAL], true)) {
+            $this->sendEmail($message);
+        }
+
+        return $exceptionFile;
+    }
+
+
+    /**
+     * @param  mixed  $message
+     * @return string
+     */
+    public static function formatMessage($message)
+    {
+        if ($message instanceof \Exception || $message instanceof \Throwable) {
+            while ($message) {
+                $tmp[] = ($message instanceof \ErrorException
+                    ? Helpers::errorTypeToString($message->getSeverity()) . ': ' . $message->getMessage()
+                    : Helpers::getClass($message) . ': ' . $message->getMessage() . ($message->getCode() ? ' #' . $message->getCode() : '')
+                ) . ' in ' . $message->getFile() . ':' . $message->getLine();
+                $message = $message->getPrevious();
+            }
+            $message = implode("\ncaused by ", $tmp);
+
+        } elseif (!is_string($message)) {
+            $message = Dumper::toText($message);
+        }
+
+        return trim($message);
+    }
+
+
+    /**
+     * @param  mixed  $message
+     * @return string
+     */
+    public static function formatLogLine($message, $exceptionFile = null)
+    {
+        return implode(' ', [
+            @date('[Y-m-d H-i-s]'), // @ timezone may not be set
+            preg_replace('#\s*\r?\n\s*#', ' ', static::formatMessage($message)),
+            ' @  ' . Helpers::getSource(),
+            $exceptionFile ? ' @@  ' . basename($exceptionFile) : null,
+        ]);
+    }
+
+
+    /**
+     * @param  \Exception|\Throwable  $exception
+     * @return string
+     */
+    public function getExceptionFile($exception)
+    {
+        while ($exception) {
+            $data[] = [
+                get_class($exception), $exception->getMessage(), $exception->getCode(), $exception->getFile(), $exception->getLine(),
+                array_map(function ($item) { unset($item['args']); return $item; }, $exception->getTrace()),
+            ];
+            $exception = $exception->getPrevious();
+        }
+        $hash = substr(md5(serialize($data)), 0, 10);
+        $dir = strtr($this->directory . '/', '\\/', DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR);
+        foreach (new \DirectoryIterator($this->directory) as $file) {
+            if (strpos($file->getBasename(), $hash)) {
+                return $dir . $file;
+            }
+        }
+        return $dir . 'exception--' . @date('Y-m-d--H-i') . "--$hash.html"; // @ timezone may not be set
+    }
+
+
+    /**
+     * Logs exception to the file if file doesn't exist.
+     * @param  \Exception|\Throwable  $exception
+     * @return string logged error filename
+     */
+    protected function logException($exception, $file = null)
+    {
+        $file = $file ?: $this->getExceptionFile($exception);
+        $bs = $this->blueScreen ?: new BlueScreen;
+        $bs->renderToFile($exception, $file);
+        return $file;
+    }
+
+
+    /**
+     * @param  mixed  $message
+     * @return void
+     */
+    protected function sendEmail($message)
+    {
+        $snooze = is_numeric($this->emailSnooze)
+            ? $this->emailSnooze
+            : @strtotime($this->emailSnooze) - time(); // @ timezone may not be set
+
+        if (
+            $this->email
+            && $this->mailer
+            && @filemtime($this->directory . '/email-sent') + $snooze < time() // @ file may not exist
+            && @file_put_contents($this->directory . '/email-sent', 'sent') // @ file may not be writable
+        ) {
+            call_user_func($this->mailer, $message, implode(', ', (array) $this->email));
+        }
+    }
+
+
+    /**
+     * Default mailer.
+     * @param  mixed  $message
+     * @param  string  $email
+     * @return void
+     * @internal
+     */
+    public function defaultMailer($message, $email)
+    {
+        $host = preg_replace('#[^\w.-]+#', '', isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : php_uname('n'));
+        $parts = str_replace(
+            ["\r\n", "\n"],
+            ["\n", PHP_EOL],
+            [
+                'headers' => implode("\n", [
+                    'From: ' . ($this->fromEmail ?: "noreply@$host"),
+                    'X-Mailer: Tracy',
+                    'Content-Type: text/plain; charset=UTF-8',
+                    'Content-Transfer-Encoding: 8bit',
+                ]) . "\n",
+                'subject' => "PHP: An error occurred on the server $host",
+                'body' => static::formatMessage($message) . "\n\nsource: " . Helpers::getSource(),
+            ]
+        );
+
+        mail($email, $parts['subject'], $parts['body'], $parts['headers']);
+    }
 }

Spacing +16 added lines, -16 removed lines

@@ -63,9 +63,9 @@ 
 			? $this->getExceptionFile($message)
 			: null;
 		$line = static::formatLogLine($message, $exceptionFile);
-		$file = $this->directory . '/' . strtolower($priority ?: self::INFO) . '.log';
+		$file = $this->directory.'/'.strtolower($priority ?: self::INFO).'.log';
 
-		if (!@file_put_contents($file, $line . PHP_EOL, FILE_APPEND | LOCK_EX)) { // @ is escalated to exception
+		if (!@file_put_contents($file, $line.PHP_EOL, FILE_APPEND | LOCK_EX)) { // @ is escalated to exception
 			throw new \RuntimeException("Unable to write to log file '$file'. Is directory writable?");
 		}
 
@@ -90,9 +90,9 @@ 
 		if ($message instanceof \Exception || $message instanceof \Throwable) {
 			while ($message) {
 				$tmp[] = ($message instanceof \ErrorException
-					? Helpers::errorTypeToString($message->getSeverity()) . ': ' . $message->getMessage()
-					: Helpers::getClass($message) . ': ' . $message->getMessage() . ($message->getCode() ? ' #' . $message->getCode() : '')
-				) . ' in ' . $message->getFile() . ':' . $message->getLine();
+					? Helpers::errorTypeToString($message->getSeverity()).': '.$message->getMessage()
+					: Helpers::getClass($message).': '.$message->getMessage().($message->getCode() ? ' #'.$message->getCode() : '')
+				).' in '.$message->getFile().':'.$message->getLine();
 				$message = $message->getPrevious();
 			}
 			$message = implode("\ncaused by ", $tmp);
@@ -114,8 +114,8 @@ 
 		return implode(' ', [
 			@date('[Y-m-d H-i-s]'), // @ timezone may not be set
 			preg_replace('#\s*\r?\n\s*#', ' ', static::formatMessage($message)),
-			' @  ' . Helpers::getSource(),
-			$exceptionFile ? ' @@  ' . basename($exceptionFile) : null,
+			' @  '.Helpers::getSource(),
+			$exceptionFile ? ' @@  '.basename($exceptionFile) : null,
 		]);
 	}
 
@@ -129,18 +129,18 @@ 
 		while ($exception) {
 			$data[] = [
 				get_class($exception), $exception->getMessage(), $exception->getCode(), $exception->getFile(), $exception->getLine(),
-				array_map(function ($item) { unset($item['args']); return $item; }, $exception->getTrace()),
+				array_map(function($item){ unset($item['args']); return $item; }, $exception->getTrace()),
 			];
 			$exception = $exception->getPrevious();
 		}
 		$hash = substr(md5(serialize($data)), 0, 10);
-		$dir = strtr($this->directory . '/', '\\/', DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR);
+		$dir = strtr($this->directory.'/', '\\/', DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR);
 		foreach (new \DirectoryIterator($this->directory) as $file) {
 			if (strpos($file->getBasename(), $hash)) {
-				return $dir . $file;
+				return $dir.$file;
 			}
 		}
-		return $dir . 'exception--' . @date('Y-m-d--H-i') . "--$hash.html"; // @ timezone may not be set
+		return $dir.'exception--'.@date('Y-m-d--H-i')."--$hash.html"; // @ timezone may not be set
 	}
 
 
@@ -171,8 +171,8 @@ 
 		if (
 			$this->email
 			&& $this->mailer
-			&& @filemtime($this->directory . '/email-sent') + $snooze < time() // @ file may not exist
-			&& @file_put_contents($this->directory . '/email-sent', 'sent') // @ file may not be writable
+			&& @filemtime($this->directory.'/email-sent') + $snooze < time() // @ file may not exist
+			&& @file_put_contents($this->directory.'/email-sent', 'sent') // @ file may not be writable
 		) {
 			call_user_func($this->mailer, $message, implode(', ', (array) $this->email));
 		}
@@ -194,13 +194,13 @@ 
 			["\n", PHP_EOL],
 			[
 				'headers' => implode("\n", [
-					'From: ' . ($this->fromEmail ?: "noreply@$host"),
+					'From: '.($this->fromEmail ?: "noreply@$host"),
 					'X-Mailer: Tracy',
 					'Content-Type: text/plain; charset=UTF-8',
 					'Content-Transfer-Encoding: 8bit',
-				]) . "\n",
+				])."\n",
 				'subject' => "PHP: An error occurred on the server $host",
-				'body' => static::formatMessage($message) . "\n\nsource: " . Helpers::getSource(),
+				'body' => static::formatMessage($message)."\n\nsource: ".Helpers::getSource(),
 			]
 		);
 

Braces +2 added lines, -1 removed lines

@@ -65,7 +65,8 @@
 		$line = static::formatLogLine($message, $exceptionFile);
 		$file = $this->directory . '/' . strtolower($priority ?: self::INFO) . '.log';
 
-		if (!@file_put_contents($file, $line . PHP_EOL, FILE_APPEND | LOCK_EX)) { // @ is escalated to exception
+		if (!@file_put_contents($file, $line . PHP_EOL, FILE_APPEND | LOCK_EX)) {
+// @ is escalated to exception
 			throw new \RuntimeException("Unable to write to log file '$file'. Is directory writable?");
 		}
 

core/vendor/wikimedia/composer-merge-plugin/src/Merge/ExtraPackage.php

Unused Use Statements +1 added lines, -2 removed lines

@@ -10,8 +10,6 @@ 
 
 namespace Wikimedia\Composer\Merge;
 
-use Wikimedia\Composer\Logger;
-
 use Composer\Composer;
 use Composer\Json\JsonFile;
 use Composer\Package\BasePackage;
@@ -23,6 +21,7 @@ 
 use Composer\Package\RootPackageInterface;
 use Composer\Package\Version\VersionParser;
 use UnexpectedValueException;
+use Wikimedia\Composer\Logger;
 
 /**
  * Processing for a composer.json file that will be merged into

Spacing +17 added lines, -17 removed lines

@@ -116,7 +116,7 @@ 
         $file = new JsonFile($path);
         $json = $file->read();
         if (!isset($json['name'])) {
-            $json['name'] = 'merge-plugin/' .
+            $json['name'] = 'merge-plugin/'.
                 strtr($path, DIRECTORY_SEPARATOR, '-');
         }
         if (!isset($json['version'])) {
@@ -136,7 +136,7 @@ 
         // @codeCoverageIgnoreStart
         if (!$package instanceof CompletePackage) {
             throw new UnexpectedValueException(
-                'Expected instance of CompletePackage, got ' .
+                'Expected instance of CompletePackage, got '.
                 get_class($package)
             );
         }
@@ -233,10 +233,10 @@ 
         $type,
         RootPackageInterface $root,
         PluginState $state
-    ) {
+    ){
         $linkType = BasePackage::$supportedLinkTypes[$type];
-        $getter = 'get' . ucfirst($linkType['method']);
-        $setter = 'set' . ucfirst($linkType['method']);
+        $getter = 'get'.ucfirst($linkType['method']);
+        $setter = 'set'.ucfirst($linkType['method']);
 
         $requires = $this->package->{$getter}();
         if (empty($requires)) {
@@ -274,7 +274,7 @@ 
         array $origin,
         array $merge,
         $state
-    ) {
+    ){
         if ($state->ignoreDuplicateLinks() && $state->replaceDuplicateLinks()) {
             $this->logger->warning("Both replace and ignore-duplicates are true. These are mutually exclusive.");
             $this->logger->warning("Duplicate packages will be ignored.");
@@ -308,8 +308,8 @@ 
      */
     protected function mergeAutoload($type, RootPackageInterface $root)
     {
-        $getter = 'get' . ucfirst($type);
-        $setter = 'set' . ucfirst($type);
+        $getter = 'get'.ucfirst($type);
+        $setter = 'set'.ucfirst($type);
 
         $autoload = $this->package->{$getter}();
         if (empty($autoload)) {
@@ -337,7 +337,7 @@ 
 
         array_walk_recursive(
             $paths,
-            function (&$path) use ($base) {
+            function(&$path) use ($base) {
                 $path = "{$base}{$path}";
             }
         );
@@ -354,7 +354,7 @@ 
     protected function mergeStabilityFlags(
         RootPackageInterface $root,
         array $requires
-    ) {
+    ){
         $flags = $root->getStabilityFlags();
         $sf = new StabilityFlags($flags, $root->getMinimumStability());
 
@@ -374,8 +374,8 @@ 
     protected function mergePackageLinks($type, RootPackageInterface $root)
     {
         $linkType = BasePackage::$supportedLinkTypes[$type];
-        $getter = 'get' . ucfirst($linkType['method']);
-        $setter = 'set' . ucfirst($linkType['method']);
+        $getter = 'get'.ucfirst($linkType['method']);
+        $setter = 'set'.ucfirst($linkType['method']);
 
         $links = $this->package->{$getter}();
         if (!empty($links)) {
@@ -383,7 +383,7 @@ 
             // @codeCoverageIgnoreStart
             if ($root !== $unwrapped) {
                 $this->logger->warning(
-                    'This Composer version does not support ' .
+                    'This Composer version does not support '.
                     "'{$type}' merging for aliased packages."
                 );
             }
@@ -508,17 +508,17 @@ 
         $type,
         array $links,
         RootPackageInterface $root
-    ) {
+    ){
         $linkType = BasePackage::$supportedLinkTypes[$type];
         $version = $root->getVersion();
         $prettyVersion = $root->getPrettyVersion();
         $vp = $this->versionParser;
 
-        $method = 'get' . ucfirst($linkType['method']);
+        $method = 'get'.ucfirst($linkType['method']);
         $packages = $root->$method();
 
         return array_map(
-            function ($link) use ($linkType, $version, $prettyVersion, $vp, $packages) {
+            function($link) use ($linkType, $version, $prettyVersion, $vp, $packages) {
                 if ('self.version' === $link->getPrettyConstraint()) {
                     if (isset($packages[$link->getSource()])) {
                         /** @var Link $package */
@@ -566,7 +566,7 @@ 
     public static function unwrapIfNeeded(
         RootPackageInterface $root,
         $method = 'setExtra'
-    ) {
+    ){
         // @codeCoverageIgnoreStart
         if ($root instanceof RootAliasPackage &&
             !method_exists($root, $method)

Braces +2 added lines, -2 removed lines

@@ -337,7 +337,7 @@ 
 
         array_walk_recursive(
             $paths,
-            function (&$path) use ($base) {
+            function (&$path) use ($base){
                 $path = "{$base}{$path}";
             }
         );
@@ -518,7 +518,7 @@ 
         $packages = $root->$method();
 
         return array_map(
-            function ($link) use ($linkType, $version, $prettyVersion, $vp, $packages) {
+            function ($link) use ($linkType, $version, $prettyVersion, $vp, $packages){
                 if ('self.version' === $link->getPrettyConstraint()) {
                     if (isset($packages[$link->getSource()])) {
                         /** @var Link $package */

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -206,7 +206,7 @@
             if (!isset($repoJson['type'])) {
                 continue;
             }
-            $this->logger->info("Prepending {$repoJson['type']} repository");
+            $this->logger->info("prepending {$repoJson['type']} repository");
             $repo = $repoManager->createRepository(
                 $repoJson['type'],
                 $repoJson

core/vendor/wikimedia/composer-merge-plugin/src/Merge/PluginState.php

Doc Comments +1 added lines, -1 removed lines

@@ -229,7 +229,7 @@
     /**
      * Should an update be forced?
      *
-     * @return true If packages are not locked
+     * @return boolean If packages are not locked
      */
     public function forceUpdate()
     {

Spacing +12 added lines, -12 removed lines

@@ -157,13 +157,13 @@ 
             $config['include'] : array($config['include']);
         $this->requires = (is_array($config['require'])) ?
             $config['require'] : array($config['require']);
-        $this->recurse = (bool)$config['recurse'];
-        $this->replace = (bool)$config['replace'];
-        $this->ignore = (bool)$config['ignore-duplicates'];
-        $this->mergeDev = (bool)$config['merge-dev'];
-        $this->mergeExtra = (bool)$config['merge-extra'];
-        $this->mergeExtraDeep = (bool)$config['merge-extra-deep'];
-        $this->mergeScripts = (bool)$config['merge-scripts'];
+        $this->recurse = (bool) $config['recurse'];
+        $this->replace = (bool) $config['replace'];
+        $this->ignore = (bool) $config['ignore-duplicates'];
+        $this->mergeDev = (bool) $config['merge-dev'];
+        $this->mergeExtra = (bool) $config['merge-extra'];
+        $this->mergeExtraDeep = (bool) $config['merge-extra-deep'];
+        $this->mergeScripts = (bool) $config['merge-scripts'];
     }
 
     /**
@@ -193,7 +193,7 @@ 
      */
     public function setFirstInstall($flag)
     {
-        $this->firstInstall = (bool)$flag;
+        $this->firstInstall = (bool) $flag;
     }
 
     /**
@@ -213,7 +213,7 @@ 
      */
     public function setLocked($flag)
     {
-        $this->locked = (bool)$flag;
+        $this->locked = (bool) $flag;
     }
 
     /**
@@ -243,7 +243,7 @@ 
      */
     public function setDevMode($flag)
     {
-        $this->devMode = (bool)$flag;
+        $this->devMode = (bool) $flag;
     }
 
     /**
@@ -273,7 +273,7 @@ 
      */
     public function setDumpAutoloader($flag)
     {
-        $this->dumpAutoloader = (bool)$flag;
+        $this->dumpAutoloader = (bool) $flag;
     }
 
     /**
@@ -293,7 +293,7 @@ 
      */
     public function setOptimizeAutoloader($flag)
     {
-        $this->optimizeAutoloader = (bool)$flag;
+        $this->optimizeAutoloader = (bool) $flag;
     }
 
     /**

core/vendor/wikimedia/composer-merge-plugin/src/MergePlugin.php

Unused Use Statements +4 added lines, -5 removed lines

@@ -10,25 +10,24 @@
 
 namespace Wikimedia\Composer;
 
-use Wikimedia\Composer\Merge\ExtraPackage;
-use Wikimedia\Composer\Merge\MissingFileException;
-use Wikimedia\Composer\Merge\PluginState;
-
 use Composer\Composer;
 use Composer\DependencyResolver\Operation\InstallOperation;
 use Composer\EventDispatcher\Event as BaseEvent;
 use Composer\EventDispatcher\EventSubscriberInterface;
 use Composer\Factory;
+use Composer\IO\IOInterface;
 use Composer\Installer;
 use Composer\Installer\InstallerEvent;
 use Composer\Installer\InstallerEvents;
 use Composer\Installer\PackageEvent;
 use Composer\Installer\PackageEvents;
-use Composer\IO\IOInterface;
 use Composer\Package\RootPackageInterface;
 use Composer\Plugin\PluginInterface;
 use Composer\Script\Event as ScriptEvent;
 use Composer\Script\ScriptEvents;
+use Wikimedia\Composer\Merge\ExtraPackage;
+use Wikimedia\Composer\Merge\MissingFileException;
+use Wikimedia\Composer\Merge\PluginState;
 
 /**
  * Composer plugin that allows merging multiple composer.json files.

Spacing +3 added lines, -3 removed lines

@@ -217,7 +217,7 @@ 
         $root = $this->composer->getPackage();
 
         $files = array_map(
-            function ($files, $pattern) use ($required) {
+            function($files, $pattern) use ($required) {
                 if ($required && !$files) {
                     throw new MissingFileException(
                         "merge-plugin: No files matched required '{$pattern}'"
@@ -341,8 +341,8 @@ 
         if ($this->state->isFirstInstall()) {
             $this->state->setFirstInstall(false);
             $this->logger->info(
-                '<comment>' .
-                'Running additional update to apply merge settings' .
+                '<comment>'.
+                'Running additional update to apply merge settings'.
                 '</comment>'
             );
 

Braces +1 added lines, -1 removed lines

@@ -217,7 +217,7 @@
         $root = $this->composer->getPackage();
 
         $files = array_map(
-            function ($files, $pattern) use ($required) {
+            function ($files, $pattern) use ($required){
                 if ($required && !$files) {
                     throw new MissingFileException(
                         "merge-plugin: No files matched required '{$pattern}'"

manager/media/browser/mcpuk/core/browser.php

Doc Comments +5 added lines, -5 removed lines

@@ -317,7 +317,7 @@ 
     }

 

     /**

-     * @return bool

+     * @return null|boolean

      */

     protected function act_deleteDir()

     {

@@ -482,7 +482,7 @@ 
     }

 

     /**

-     * @return bool

+     * @return null|boolean

      */

     protected function act_delete()

     {

@@ -863,7 +863,7 @@ 
 

     /**

      * @param $file

-     * @param $dir

+     * @param string $dir

      * @return array

      */

     protected function moveUploadFile($file, $dir)

@@ -918,7 +918,7 @@ 
     }

 

     /**

-     * @param null $file

+     * @param string $file

      */

     protected function sendDefaultThumb($file = null)

     {

@@ -1174,7 +1174,7 @@ 
     }

 

     /**

-     * @param $message

+     * @param string $message

      * @param array|null $data

      */

     protected function errorMsg($message, array $data = null)

Spacing +32 added lines, -32 removed lines

@@ -42,7 +42,7 @@ 
             $this->get['dir'] = $dir;

         }

 

-        $thumbsDir = $this->config['uploadDir'] . "/" . $this->config['thumbsDir'];

+        $thumbsDir = $this->config['uploadDir']."/".$this->config['thumbsDir'];

         if ((

                 !is_dir($thumbsDir) &&

                 !@mkdir($thumbsDir, $this->config['dirPerms'])

@@ -114,7 +114,7 @@ 
             $this->session['dir'] = $this->type;

         } else {

             $type = $this->getTypeFromPath($this->session['dir']);

-            $dir = $this->config['uploadDir'] . "/" . $this->session['dir'];

+            $dir = $this->config['uploadDir']."/".$this->session['dir'];

             if (($type != $this->type) || !is_dir($dir) || !is_readable($dir)) {

                 $this->session['dir'] = $this->type;

             }

@@ -188,7 +188,7 @@ 
         }

         $file = "{$this->thumbsDir}/{$this->type}/{$this->get['dir']}/$file";

         if (!is_file($file) || !is_readable($file)) {

-            $file = "{$this->config['uploadDir']}/{$this->type}/{$this->get['dir']}/" . basename($file);

+            $file = "{$this->config['uploadDir']}/{$this->type}/{$this->get['dir']}/".basename($file);

             if (!is_file($file) || !is_readable($file)) {

                 $this->sendDefaultThumb($file);

             }

@@ -227,7 +227,7 @@ 
     protected function act_chDir()

     {

         $this->postDir(); // Just for existing check

-        $this->session['dir'] = $this->type . "/" . $this->post['dir'];

+        $this->session['dir'] = $this->type."/".$this->post['dir'];

         $dirWritable = dir::isWritable("{$this->config['uploadDir']}/{$this->session['dir']}");

 

         return json_encode(array(

@@ -300,12 +300,12 @@ 
         if (is_array($evtOut) && !empty($evtOut)) {

             $this->errorMsg(implode('\n', $evtOut));

         }

-        if (!@rename($dir, dirname($dir) . "/$newName")) {

+        if (!@rename($dir, dirname($dir)."/$newName")) {

             $this->errorMsg("Cannot rename the folder.");

         }

         $thumbDir = "$this->thumbsTypeDir/{$this->post['dir']}";

         if (is_dir($thumbDir)) {

-            @rename($thumbDir, dirname($thumbDir) . "/$newName");

+            @rename($thumbDir, dirname($thumbDir)."/$newName");

         }

 

         $this->modx->invokeEvent('OnFileBrowserRename', array(

@@ -401,9 +401,9 @@ 
         header("Cache-Control: must-revalidate, post-check=0, pre-check=0");

         header("Cache-Control: private", false);

         header("Content-Type: application/octet-stream");

-        header('Content-Disposition: attachment; filename="' . str_replace('"', "_", $this->post['file']) . '"');

+        header('Content-Disposition: attachment; filename="'.str_replace('"', "_", $this->post['file']).'"');

         header("Content-Transfer-Encoding:­ binary");

-        header("Content-Length: " . filesize($file));

+        header("Content-Length: ".filesize($file));

         readfile($file);

         die;

     }

@@ -475,7 +475,7 @@ 
         $thumbFile = "$thumbDir/{$this->post['file']}";

 

         if (file_exists($thumbFile)) {

-            @rename($thumbFile, "$thumbDir/" . basename($newName));

+            @rename($thumbFile, "$thumbDir/".basename($newName));

         }

 

         return true;

@@ -564,11 +564,11 @@ 
             } elseif (!file_exists($path)) {

                 $error[] = $this->label("The file '{file}' does not exist.", $replace);

             } elseif (substr($base, 0, 1) == ".") {

-                $error[] = "$base: " . $this->label("File name shouldn't begins with '.'");

+                $error[] = "$base: ".$this->label("File name shouldn't begins with '.'");

             } elseif (!$this->validateExtension($ext, $type)) {

-                $error[] = "$base: " . $this->label("Denied file extension.");

+                $error[] = "$base: ".$this->label("Denied file extension.");

             } elseif (file_exists("$dir/$base")) {

-                $error[] = "$base: " . $this->label("A file or folder with that name already exists.");

+                $error[] = "$base: ".$this->label("A file or folder with that name already exists.");

             } elseif (!is_readable($path) || !is_file($path)) {

                 $error[] = $this->label("Cannot read '{file}'.", $replace);

             } elseif (!@copy($path, "$dir/$base")) {

@@ -640,11 +640,11 @@ 
             } elseif (!file_exists($path)) {

                 $error[] = $this->label("The file '{file}' does not exist.", $replace);

             } elseif (substr($base, 0, 1) == ".") {

-                $error[] = "$base: " . $this->label("File name shouldn't begins with '.'");

+                $error[] = "$base: ".$this->label("File name shouldn't begins with '.'");

             } elseif (!$this->validateExtension($ext, $type)) {

-                $error[] = "$base: " . $this->label("Denied file extension.");

+                $error[] = "$base: ".$this->label("Denied file extension.");

             } elseif (file_exists("$dir/$base")) {

-                $error[] = "$base: " . $this->label("A file or folder with that name already exists.");

+                $error[] = "$base: ".$this->label("A file or folder with that name already exists.");

             } elseif (!is_readable($path) || !is_file($path)) {

                 $error[] = $this->label("Cannot read '{file}'.", $replace);

             } elseif (!file::isWritable($path) || !@rename($path, "$dir/$base")) {

@@ -702,7 +702,7 @@ 
             }

             $path = "{$this->config['uploadDir']}/$file";

             $base = basename($file);

-            $filepath = str_replace('/' . $base, '', $path);

+            $filepath = str_replace('/'.$base, '', $path);

             $replace = array('file' => $base);

             if (!is_file($path)) {

                 $error[] = $this->label("The file '{file}' does not exist.", $replace);

@@ -748,15 +748,15 @@ 
         if (!isset($this->post['dir']) || $this->config['denyZipDownload']) {

             $this->errorMsg("Unknown error.");

         }

-        $filename = basename($dir) . ".zip";

+        $filename = basename($dir).".zip";

         do {

-            $file = md5(time() . session_id());

+            $file = md5(time().session_id());

             $file = "{$this->config['uploadDir']}/$file.zip";

         } while (file_exists($file));

         new zipFolder($file, $dir);

         header("Content-Type: application/x-zip");

-        header('Content-Disposition: attachment; filename="' . str_replace('"', "_", $filename) . '"');

-        header("Content-Length: " . filesize($file));

+        header('Content-Disposition: attachment; filename="'.str_replace('"', "_", $filename).'"');

+        header("Content-Length: ".filesize($file));

         readfile($file);

         unlink($file);

         die;

@@ -790,7 +790,7 @@ 
         }

 

         do {

-            $file = md5(time() . session_id());

+            $file = md5(time().session_id());

             $file = "{$this->config['uploadDir']}/$file.zip";

         } while (file_exists($file));

 

@@ -803,8 +803,8 @@ 
             $zip->close();

         }

         header("Content-Type: application/x-zip");

-        header('Content-Disposition: attachment; filename="selected_files_' . basename($file) . '"');

-        header("Content-Length: " . filesize($file));

+        header('Content-Disposition: attachment; filename="selected_files_'.basename($file).'"');

+        header("Content-Length: ".filesize($file));

         readfile($file);

         unlink($file);

         die;

@@ -833,7 +833,7 @@ 
             if ($type != $this->type) {

                 continue;

             }

-            $file = $this->config['uploadDir'] . "/$file";

+            $file = $this->config['uploadDir']."/$file";

             if (!is_file($file) || !is_readable($file)) {

                 continue;

             }

@@ -841,7 +841,7 @@ 
         }

 

         do {

-            $file = md5(time() . session_id());

+            $file = md5(time().session_id());

             $file = "{$this->config['uploadDir']}/$file.zip";

         } while (file_exists($file));

 

@@ -854,8 +854,8 @@ 
             $zip->close();

         }

         header("Content-Type: application/x-zip");

-        header('Content-Disposition: attachment; filename="clipboard_' . basename($file) . '"');

-        header("Content-Length: " . filesize($file));

+        header('Content-Disposition: attachment; filename="clipboard_'.basename($file).'"');

+        header("Content-Length: ".filesize($file));

         readfile($file);

         unlink($file);

         die;

@@ -891,7 +891,7 @@ 
             return $response;

         }

         $filename = $this->normalizeFilename($file['name']);

-        $target = "$dir/" . file::getInexistantFilename($filename, $dir);

+        $target = "$dir/".file::getInexistantFilename($filename, $dir);

 

         if (!@move_uploaded_file($file['tmp_name'], $target) &&

             !@rename($file['tmp_name'], $target) &&

@@ -957,7 +957,7 @@ 
                 if (is_array($size) && count($size)) {

                     $preview = true;

                     if (!$this->config['noThumbnailsRecreation']) {

-                        $thumb_file = "$thumbDir/" . basename($file);

+                        $thumb_file = "$thumbDir/".basename($file);

                         if (!is_file($thumb_file) || filemtime($file) > filemtime($thumb_file)) {

                             $this->makeThumb($file);

                         }

@@ -974,7 +974,7 @@ 
             }

             $name = basename($file);

             $types = $this->config['types'];

-            $types = explode(' ', $types['images'] . ' ' . $types['image']);

+            $types = explode(' ', $types['images'].' '.$types['image']);

             if (substr($name, 0, 1) == '.' && !$this->config['showHiddenFiles']) {

                 continue;

             }

@@ -1054,7 +1054,7 @@ 
     {

         $dir = $this->typeDir;

         if (isset($this->post['dir'])) {

-            $dir .= "/" . $this->post['dir'];

+            $dir .= "/".$this->post['dir'];

         }

         if ($existent && (!is_dir($dir) || !is_readable($dir))) {

             $this->errorMsg("Inexistant or inaccessible folder.");

@@ -1071,7 +1071,7 @@ 
     {

         $dir = $this->typeDir;

         if (isset($this->get['dir'])) {

-            $dir .= "/" . $this->get['dir'];

+            $dir .= "/".$this->get['dir'];

         }

         if ($existent && (!is_dir($dir) || !is_readable($dir))) {

             $this->errorMsg("Inexistant or inaccessible folder.");

Braces +229 added lines, -229 removed lines

@@ -12,8 +12,8 @@ 
  * @link http://kcfinder.sunhater.com

  */

 

-class browser extends uploader

-{

+class browser extends uploader
+{
     protected $action;

     protected $thumbsDir;

     protected $thumbsTypeDir;

@@ -22,21 +22,21 @@ 
      * browser constructor.

      * @param DocumentParser $modx

      */

-    public function __construct(DocumentParser $modx)

-    {

+    public function __construct(DocumentParser $modx)
+    {
         parent::__construct($modx);

 

-        if (isset($this->post['dir'])) {

+        if (isset($this->post['dir'])) {
             $dir = $this->checkInputDir($this->post['dir'], true, false);

-            if ($dir === false) {

+            if ($dir === false) {
                 unset($this->post['dir']);

             }

             $this->post['dir'] = $dir;

         }

 

-        if (isset($this->get['dir'])) {

+        if (isset($this->get['dir'])) {
             $dir = $this->checkInputDir($this->get['dir'], true, false);

-            if ($dir === false) {

+            if ($dir === false) {
                 unset($this->get['dir']);

             }

             $this->get['dir'] = $dir;

@@ -54,7 +54,7 @@ 
                 !is_dir("$thumbsDir/{$this->type}") &&

                 !@mkdir("$thumbsDir/{$this->type}", $this->config['dirPerms'])

             )

-        ) {

+        ) {
             $this->errorMsg("Cannot access or create thumbnails folder.");

         }

 

@@ -67,10 +67,10 @@ 
             'pattern' => '/^.*\.zip$/i'

         ));

 

-        if (is_array($files) && count($files)) {

+        if (is_array($files) && count($files)) {
             $time = time();

-            foreach ($files as $file) {

-                if (is_file($file) && ($time - filemtime($file) > 3600)) {

+            foreach ($files as $file) {
+                if (is_file($file) && ($time - filemtime($file) > 3600)) {
                     unlink($file);

                 }

             }

@@ -79,7 +79,7 @@ 
         if (isset($this->get['theme']) &&

             ($this->get['theme'] == basename($this->get['theme'])) &&

             is_dir("themes/{$this->get['theme']}")

-        ) {

+        ) {
             $this->config['theme'] = $this->get['theme'];

         }

     }

@@ -87,47 +87,47 @@ 
     /**

      *

      */

-    public function action()

-    {

+    public function action()
+    {
         $act = isset($this->get['act']) ? $this->get['act'] : "browser";

-        if (!preg_match('@^[0-9a-zA-Z_]+$@', $act)) {

+        if (!preg_match('@^[0-9a-zA-Z_]+$@', $act)) {
             $this->errorMsg("Unknown error.");

         }

-        if (!method_exists($this, "act_$act")) {

+        if (!method_exists($this, "act_$act")) {
             $act = "browser";

         }

         $this->action = $act;

         $method = "act_$act";

-        if ($this->config['disabled']) {

+        if ($this->config['disabled']) {
             $message = $this->label("You don't have permissions to browse server.");

             if (in_array($act, array("browser", "upload")) ||

                 (substr($act, 0, 8) == "download")

-            ) {

+            ) {
                 $this->backMsg($message);

-            } else {

+            } else {
                 header("Content-Type: text/plain; charset={$this->charset}");

                 die(json_encode(array('error' => $message)));

             }

         }

 

-        if (!isset($this->session['dir'])) {

+        if (!isset($this->session['dir'])) {
             $this->session['dir'] = $this->type;

-        } else {

+        } else {
             $type = $this->getTypeFromPath($this->session['dir']);

             $dir = $this->config['uploadDir'] . "/" . $this->session['dir'];

-            if (($type != $this->type) || !is_dir($dir) || !is_readable($dir)) {

+            if (($type != $this->type) || !is_dir($dir) || !is_readable($dir)) {
                 $this->session['dir'] = $this->type;

             }

         }

         $this->session['dir'] = path::normalize($this->session['dir']);

 

-        if ($act == "browser") {

+        if ($act == "browser") {
             header("X-UA-Compatible: chrome=1");

             header("Content-Type: text/html; charset={$this->charset}");

         } elseif (

             (substr($act, 0, 8) != "download") &&

             !in_array($act, array("thumb", "upload"))

-        ) {

+        ) {
             header("Content-Type: text/plain; charset={$this->charset}");

         }

 

@@ -140,12 +140,12 @@ 
     /**

      * @return string

      */

-    protected function act_browser()

-    {

+    protected function act_browser()
+    {
         if (isset($this->get['dir']) &&

             is_dir("{$this->typeDir}/{$this->get['dir']}") &&

             is_readable("{$this->typeDir}/{$this->get['dir']}")

-        ) {

+        ) {
             $this->session['dir'] = path::normalize("{$this->type}/{$this->get['dir']}");

         }

 

@@ -155,11 +155,11 @@ 
     /**

      * @return string

      */

-    protected function act_init()

-    {

+    protected function act_init()
+    {
         $tree = $this->getDirInfo($this->typeDir);

         $tree['dirs'] = $this->getTree($this->session['dir']);

-        if (!is_array($tree['dirs']) || !count($tree['dirs'])) {

+        if (!is_array($tree['dirs']) || !count($tree['dirs'])) {
             unset($tree['dirs']);

         }

         $files = $this->getFiles($this->session['dir']);

@@ -176,37 +176,37 @@ 
     /**

      *

      */

-    protected function act_thumb()

-    {

+    protected function act_thumb()
+    {
         $this->getDir($this->get['dir'], true);

-        if (!isset($this->get['file']) || !isset($this->get['dir'])) {

+        if (!isset($this->get['file']) || !isset($this->get['dir'])) {
             $this->sendDefaultThumb();

         }

         $file = $this->get['file'];

-        if (basename($file) != $file) {

+        if (basename($file) != $file) {
             $this->sendDefaultThumb();

         }

         $file = "{$this->thumbsDir}/{$this->type}/{$this->get['dir']}/$file";

-        if (!is_file($file) || !is_readable($file)) {

+        if (!is_file($file) || !is_readable($file)) {
             $file = "{$this->config['uploadDir']}/{$this->type}/{$this->get['dir']}/" . basename($file);

-            if (!is_file($file) || !is_readable($file)) {

+            if (!is_file($file) || !is_readable($file)) {
                 $this->sendDefaultThumb($file);

             }

             $image = image::factory($this->imageDriver, $file);

-            if ($image->initError) {

+            if ($image->initError) {
                 $this->sendDefaultThumb($file);

             }

             list($tmp, $tmp, $type) = getimagesize($file);

             if (in_array($type, array(IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG)) &&

                 ($image->width <= $this->config['thumbWidth']) &&

                 ($image->height <= $this->config['thumbHeight'])

-            ) {

+            ) {
                 $mime =

                     ($type == IMAGETYPE_GIF) ? "gif" : (

                     ($type == IMAGETYPE_PNG) ? "png" : "jpeg");

                 $mime = "image/$mime";

                 httpCache::file($file, $mime);

-            } else {

+            } else {
                 $this->sendDefaultThumb($file);

             }

         }

@@ -216,16 +216,16 @@ 
     /**

      * @return string

      */

-    protected function act_expand()

-    {

+    protected function act_expand()
+    {
         return json_encode(array('dirs' => $this->getDirs($this->postDir())));

     }

 

     /**

      * @return string

      */

-    protected function act_chDir()

-    {

+    protected function act_chDir()
+    {
         $this->postDir(); // Just for existing check

         $this->session['dir'] = $this->type . "/" . $this->post['dir'];

         $dirWritable = dir::isWritable("{$this->config['uploadDir']}/{$this->session['dir']}");

@@ -239,30 +239,30 @@ 
     /**

      * @return bool

      */

-    protected function act_newDir()

-    {

+    protected function act_newDir()
+    {
         if (!$this->config['access']['dirs']['create'] ||

             !isset($this->post['dir']) ||

             !isset($this->post['newDir'])

-        ) {

+        ) {
             $this->errorMsg("Unknown error.");

         }

 

         $dir = $this->postDir();

         $newDir = $this->normalizeDirname(trim($this->post['newDir']));

-        if (!strlen($newDir)) {

+        if (!strlen($newDir)) {
             $this->errorMsg("Please enter new folder name.");

         }

-        if (preg_match('/[\/\\\\]/s', $newDir)) {

+        if (preg_match('/[\/\\\\]/s', $newDir)) {
             $this->errorMsg("Unallowable characters in folder name.");

         }

-        if (substr($newDir, 0, 1) == ".") {

+        if (substr($newDir, 0, 1) == ".") {
             $this->errorMsg("Folder name shouldn't begins with '.'");

         }

-        if (file_exists("$dir/$newDir")) {

+        if (file_exists("$dir/$newDir")) {
             $this->errorMsg("A file or folder with that name already exists.");

         }

-        if (!@mkdir("$dir/$newDir", $this->config['dirPerms'])) {

+        if (!@mkdir("$dir/$newDir", $this->config['dirPerms'])) {
             $this->errorMsg("Cannot create {dir} folder.", array('dir' => $newDir));

         }

 

@@ -272,12 +272,12 @@ 
     /**

      * @return string

      */

-    protected function act_renameDir()

-    {

+    protected function act_renameDir()
+    {
         if (!$this->config['access']['dirs']['rename'] ||

             !isset($this->post['dir']) ||

             !isset($this->post['newName'])

-        ) {

+        ) {
             $this->errorMsg("Unknown error.");

         }

 

@@ -288,23 +288,23 @@ 
             'filepath' => realpath($dir),

             'newname' => &$newName

         ));

-        if (!strlen($newName)) {

+        if (!strlen($newName)) {
             $this->errorMsg("Please enter new folder name.");

         }

-        if (preg_match('/[\/\\\\]/s', $newName)) {

+        if (preg_match('/[\/\\\\]/s', $newName)) {
             $this->errorMsg("Unallowable characters in folder name.");

         }

-        if (substr($newName, 0, 1) == ".") {

+        if (substr($newName, 0, 1) == ".") {
             $this->errorMsg("Folder name shouldn't begins with '.'");

         }

-        if (is_array($evtOut) && !empty($evtOut)) {

+        if (is_array($evtOut) && !empty($evtOut)) {
             $this->errorMsg(implode('\n', $evtOut));

         }

-        if (!@rename($dir, dirname($dir) . "/$newName")) {

+        if (!@rename($dir, dirname($dir) . "/$newName")) {
             $this->errorMsg("Cannot rename the folder.");

         }

         $thumbDir = "$this->thumbsTypeDir/{$this->post['dir']}";

-        if (is_dir($thumbDir)) {

+        if (is_dir($thumbDir)) {
             @rename($thumbDir, dirname($thumbDir) . "/$newName");

         }

 

@@ -319,18 +319,18 @@ 
     /**

      * @return bool

      */

-    protected function act_deleteDir()

-    {

+    protected function act_deleteDir()
+    {
         if (!$this->config['access']['dirs']['delete'] ||

             !isset($this->post['dir']) ||

             !strlen(trim($this->post['dir']))

-        ) {

+        ) {
             $this->errorMsg("Unknown error.");

         }

 

         $dir = $this->postDir();

 

-        if (!dir::isWritable($dir)) {

+        if (!dir::isWritable($dir)) {
             $this->errorMsg("Cannot delete the folder.");

         }

 

@@ -338,17 +338,17 @@ 
             'element'  => 'dir',

             'filepath' => realpath($dir)

         ));

-        if (is_array($evtOut) && !empty($evtOut)) {

+        if (is_array($evtOut) && !empty($evtOut)) {
             die(json_encode(array('error' => $evtOut)));

         }

 

         $result = !dir::prune($dir, false);

-        if (is_array($result) && count($result)) {

+        if (is_array($result) && count($result)) {
             $this->errorMsg("Failed to delete {count} files/folders.",

                 array('count' => count($result)));

         }

         $thumbDir = "$this->thumbsTypeDir/{$this->post['dir']}";

-        if (is_dir($thumbDir)) {

+        if (is_dir($thumbDir)) {
             dir::prune($thumbDir);

         }

         $this->modx->invokeEvent('OnFileBrowserDelete', array(

@@ -362,16 +362,16 @@ 
     /**

      * @return string

      */

-    protected function act_upload()

-    {

+    protected function act_upload()
+    {
         $response = array('success' => false, 'message' => $this->label("Unknown error."));

         if (!$this->config['access']['files']['upload'] ||

             !isset($this->post['dir'])

-        ) {

+        ) {
             return json_encode($response);

         }

         $dir = $this->postDir();

-        if (!dir::isWritable($dir)) {

+        if (!dir::isWritable($dir)) {
             $response['message'] = $this->label("Cannot access or write to upload folder.");

 

             return json_encode($response);

@@ -384,15 +384,15 @@ 
     /**

      *

      */

-    protected function act_download()

-    {

+    protected function act_download()
+    {
         $dir = $this->postDir();

         if (!isset($this->post['dir']) ||

             !isset($this->post['file']) ||

             strpos($this->post['file'], '../') !== false ||

             (false === ($file = "$dir/{$this->post['file']}")) ||

             !file_exists($file) || !is_readable($file)

-        ) {

+        ) {
             $this->errorMsg("Unknown error.");

         }

 

@@ -411,8 +411,8 @@ 
     /**

      * @return bool

      */

-    protected function act_rename()

-    {

+    protected function act_rename()
+    {
         $dir = $this->postDir();

         if (!$this->config['access']['files']['rename'] ||

             !isset($this->post['dir']) ||

@@ -421,7 +421,7 @@ 
             !isset($this->post['newName']) ||

             (false === ($file = "$dir/{$this->post['file']}")) ||

             !file_exists($file) || !is_readable($file) || !file::isWritable($file)

-        ) {

+        ) {
             $this->errorMsg("Unknown error.");

         }

 

@@ -430,7 +430,7 @@ 
             (file::getExtension($this->post['file'], true) !==

                 file::getExtension($this->post['newName'], true)

             )

-        ) {

+        ) {
             $this->errorMsg("You cannot rename the extension of files!");

         }

 

@@ -441,28 +441,28 @@ 
             'filename' => $this->post['file'],

             'newname' => &$newName

         ));

-        if (!strlen($newName)) {

+        if (!strlen($newName)) {
             $this->errorMsg("Please enter new file name.");

         }

-        if (preg_match('/[\/\\\\]/s', $newName)) {

+        if (preg_match('/[\/\\\\]/s', $newName)) {
             $this->errorMsg("Unallowable characters in file name.");

         }

-        if (substr($newName, 0, 1) == ".") {

+        if (substr($newName, 0, 1) == ".") {
             $this->errorMsg("File name shouldn't begins with '.'");

         }

         $_newName = $newName;

         $newName = "$dir/$newName";

-        if (file_exists($newName)) {

+        if (file_exists($newName)) {
             $this->errorMsg("A file or folder with that name already exists.");

         }

         $ext = file::getExtension($newName);

-        if (!$this->validateExtension($ext, $this->type)) {

+        if (!$this->validateExtension($ext, $this->type)) {
             $this->errorMsg("Denied file extension.");

         }

-        if (is_array($evtOut) && !empty($evtOut)) {

+        if (is_array($evtOut) && !empty($evtOut)) {
             $this->errorMsg(implode('\n', $evtOut));

         }

-        if (!@rename($file, $newName)) {

+        if (!@rename($file, $newName)) {
             $this->errorMsg("Unknown error.");

         }

         $this->modx->invokeEvent('OnFileBrowserRename', array(

@@ -474,7 +474,7 @@ 
         $thumbDir = "{$this->thumbsTypeDir}/{$this->post['dir']}";

         $thumbFile = "$thumbDir/{$this->post['file']}";

 

-        if (file_exists($thumbFile)) {

+        if (file_exists($thumbFile)) {
             @rename($thumbFile, "$thumbDir/" . basename($newName));

         }

 

@@ -484,8 +484,8 @@ 
     /**

      * @return bool

      */

-    protected function act_delete()

-    {

+    protected function act_delete()
+    {
         $dir = $this->postDir();

 

         if (!$this->config['access']['files']['delete'] ||

@@ -494,7 +494,7 @@ 
             strpos($this->post['file'], '../') !== false ||

             (false === ($file = "$dir/{$this->post['file']}")) ||

             !file_exists($file) || !is_readable($file) || !file::isWritable($file)

-        ) {

+        ) {
             $this->errorMsg("Cannot delete '{file}'.", array('file' => basename($file)));

         }

 

@@ -504,14 +504,14 @@ 
             'filepath' => realpath($dir)

         ));

 

-        if (is_array($evtOut) && !empty($evtOut)) {

+        if (is_array($evtOut) && !empty($evtOut)) {
             die(json_encode(array('error' => $evtOut)));

         }

 

         @unlink($file);

 

         $thumb = "{$this->thumbsTypeDir}/{$this->post['dir']}/{$this->post['file']}";

-        if (file_exists($thumb)) {

+        if (file_exists($thumb)) {
             @unlink($thumb);

         }

 

@@ -527,27 +527,27 @@ 
     /**

      * @return bool|string

      */

-    protected function act_cp_cbd()

-    {

+    protected function act_cp_cbd()
+    {
         $dir = $this->postDir();

         if (!$this->config['access']['files']['copy'] ||

             !isset($this->post['dir']) ||

             !is_dir($dir) || !is_readable($dir) || !dir::isWritable($dir) ||

             !isset($this->post['files']) || !is_array($this->post['files']) ||

             !count($this->post['files'])

-        ) {

+        ) {
             $this->errorMsg("Unknown error.");

         }

 

         $error = array();

-        foreach ($this->post['files'] as $file) {

+        foreach ($this->post['files'] as $file) {
             $file = path::normalize($file);

-            if (substr($file, 0, 1) == ".") {

+            if (substr($file, 0, 1) == ".") {
                 continue;

             }

             $type = explode("/", $file);

             $type = $type[0];

-            if ($type != $this->type) {

+            if ($type != $this->type) {
                 continue;

             }

             $path = "{$this->config['uploadDir']}/$file";

@@ -559,22 +559,22 @@ 
                 'filename' => $base,

                 'newpath' => realpath($dir)

             ));

-            if (is_array($evtOut) && !empty($evtOut)) {

+            if (is_array($evtOut) && !empty($evtOut)) {
                 $error[] = implode("\n", $evtOut);

-            } elseif (!file_exists($path)) {

+            } elseif (!file_exists($path)) {
                 $error[] = $this->label("The file '{file}' does not exist.", $replace);

-            } elseif (substr($base, 0, 1) == ".") {

+            } elseif (substr($base, 0, 1) == ".") {
                 $error[] = "$base: " . $this->label("File name shouldn't begins with '.'");

-            } elseif (!$this->validateExtension($ext, $type)) {

+            } elseif (!$this->validateExtension($ext, $type)) {
                 $error[] = "$base: " . $this->label("Denied file extension.");

-            } elseif (file_exists("$dir/$base")) {

+            } elseif (file_exists("$dir/$base")) {
                 $error[] = "$base: " . $this->label("A file or folder with that name already exists.");

-            } elseif (!is_readable($path) || !is_file($path)) {

+            } elseif (!is_readable($path) || !is_file($path)) {
                 $error[] = $this->label("Cannot read '{file}'.", $replace);

-            } elseif (!@copy($path, "$dir/$base")) {

+            } elseif (!@copy($path, "$dir/$base")) {
                 $error[] = $this->label("Cannot copy '{file}'.", $replace);

-            } else {

-                if (function_exists("chmod")) {

+            } else {
+                if (function_exists("chmod")) {
                     @chmod("$dir/$base", $this->config['filePerms']);

                 }

                 $this->modx->invokeEvent('OnFileBrowserCopy', array(

@@ -583,9 +583,9 @@ 
                     'newpath' => realpath($dir)

                 ));

                 $fromThumb = "{$this->thumbsDir}/$file";

-                if (is_file($fromThumb) && is_readable($fromThumb)) {

+                if (is_file($fromThumb) && is_readable($fromThumb)) {
                     $toThumb = "{$this->thumbsTypeDir}/{$this->post['dir']}";

-                    if (!is_dir($toThumb)) {

+                    if (!is_dir($toThumb)) {
                         @mkdir($toThumb, $this->config['dirPerms'], true);

                     }

                     $toThumb .= "/$base";

@@ -593,7 +593,7 @@ 
                 }

             }

         }

-        if (count($error)) {

+        if (count($error)) {
             return json_encode(array('error' => $error));

         }

 

@@ -603,27 +603,27 @@ 
     /**

      * @return bool|string

      */

-    protected function act_mv_cbd()

-    {

+    protected function act_mv_cbd()
+    {
         $dir = $this->postDir();

         if (!$this->config['access']['files']['move'] ||

             !isset($this->post['dir']) ||

             !is_dir($dir) || !is_readable($dir) || !dir::isWritable($dir) ||

             !isset($this->post['files']) || !is_array($this->post['files']) ||

             !count($this->post['files'])

-        ) {

+        ) {
             $this->errorMsg("Unknown error.");

         }

 

         $error = array();

-        foreach ($this->post['files'] as $file) {

+        foreach ($this->post['files'] as $file) {
             $file = path::normalize($file);

-            if (substr($file, 0, 1) == ".") {

+            if (substr($file, 0, 1) == ".") {
                 continue;

             }

             $type = explode("/", $file);

             $type = $type[0];

-            if ($type != $this->type) {

+            if ($type != $this->type) {
                 continue;

             }

             $path = "{$this->config['uploadDir']}/$file";

@@ -635,28 +635,28 @@ 
                 'filename' => $base,

                 'newpath' => realpath($dir)

             ));

-            if (is_array($evtOut) && !empty($evtOut)) {

+            if (is_array($evtOut) && !empty($evtOut)) {
                 $error[] = implode("\n", $evtOut);

-            } elseif (!file_exists($path)) {

+            } elseif (!file_exists($path)) {
                 $error[] = $this->label("The file '{file}' does not exist.", $replace);

-            } elseif (substr($base, 0, 1) == ".") {

+            } elseif (substr($base, 0, 1) == ".") {
                 $error[] = "$base: " . $this->label("File name shouldn't begins with '.'");

-            } elseif (!$this->validateExtension($ext, $type)) {

+            } elseif (!$this->validateExtension($ext, $type)) {
                 $error[] = "$base: " . $this->label("Denied file extension.");

-            } elseif (file_exists("$dir/$base")) {

+            } elseif (file_exists("$dir/$base")) {
                 $error[] = "$base: " . $this->label("A file or folder with that name already exists.");

-            } elseif (!is_readable($path) || !is_file($path)) {

+            } elseif (!is_readable($path) || !is_file($path)) {
                 $error[] = $this->label("Cannot read '{file}'.", $replace);

-            } elseif (!file::isWritable($path) || !@rename($path, "$dir/$base")) {

+            } elseif (!file::isWritable($path) || !@rename($path, "$dir/$base")) {
                 $error[] = $this->label("Cannot move '{file}'.", $replace);

-            } else {

-                if (function_exists("chmod")) {

+            } else {
+                if (function_exists("chmod")) {
                     @chmod("$dir/$base", $this->config['filePerms']);

                 }

                 $fromThumb = "{$this->thumbsDir}/$file";

-                if (is_file($fromThumb) && is_readable($fromThumb)) {

+                if (is_file($fromThumb) && is_readable($fromThumb)) {
                     $toThumb = "{$this->thumbsTypeDir}/{$this->post['dir']}";

-                    if (!is_dir($toThumb)) {

+                    if (!is_dir($toThumb)) {
                         @mkdir($toThumb, $this->config['dirPerms'], true);

                     }

                     $toThumb .= "/$base";

@@ -669,7 +669,7 @@ 
                 ));

             }

         }

-        if (count($error)) {

+        if (count($error)) {
             return json_encode(array('error' => $error));

         }

 

@@ -679,60 +679,60 @@ 
     /**

      * @return bool|string

      */

-    protected function act_rm_cbd()

-    {

+    protected function act_rm_cbd()
+    {
         if (!$this->config['access']['files']['delete'] ||

             !isset($this->post['files']) ||

             !is_array($this->post['files']) ||

             !count($this->post['files'])

-        ) {

+        ) {
             $this->errorMsg("Unknown error.");

         }

 

         $error = array();

-        foreach ($this->post['files'] as $file) {

+        foreach ($this->post['files'] as $file) {
             $file = path::normalize($file);

-            if (substr($file, 0, 1) == ".") {

+            if (substr($file, 0, 1) == ".") {
                 continue;

             }

             $type = explode("/", $file);

             $type = $type[0];

-            if ($type != $this->type) {

+            if ($type != $this->type) {
                 continue;

             }

             $path = "{$this->config['uploadDir']}/$file";

             $base = basename($file);

             $filepath = str_replace('/' . $base, '', $path);

             $replace = array('file' => $base);

-            if (!is_file($path)) {

+            if (!is_file($path)) {
                 $error[] = $this->label("The file '{file}' does not exist.", $replace);

-            } else {

+            } else {
                 $evtOut = $this->modx->invokeEvent('OnBeforeFileBrowserDelete', array(

                     'element'  => 'file',

                     'filename' => $base,

                     'filepath' => $filepath

                 ));

 

-                if (is_array($evtOut) && !empty($evtOut)) {

+                if (is_array($evtOut) && !empty($evtOut)) {
                     $error[] = implode("\n", $evtOut);

-                } else {

-                    if (!@unlink($path)) {

+                } else {
+                    if (!@unlink($path)) {
                         $error[] = $this->label("Cannot delete '{file}'.", $replace);

-                    } else {

+                    } else {
                         $this->modx->invokeEvent('OnFileBrowserDelete', array(

                             'element'  => 'file',

                             'filename' => $base,

                             'filepath' => $filepath

                         ));

                         $thumb = "{$this->thumbsDir}/$file";

-                        if (is_file($thumb)) {

+                        if (is_file($thumb)) {
                             @unlink($thumb);

                         }

                     }

                 }

             }

         }

-        if (count($error)) {

+        if (count($error)) {
             return json_encode(array('error' => $error));

         }

 

@@ -742,14 +742,14 @@ 
     /**

      * @throws Exception

      */

-    protected function act_downloadDir()

-    {

+    protected function act_downloadDir()
+    {
         $dir = $this->postDir();

-        if (!isset($this->post['dir']) || $this->config['denyZipDownload']) {

+        if (!isset($this->post['dir']) || $this->config['denyZipDownload']) {
             $this->errorMsg("Unknown error.");

         }

         $filename = basename($dir) . ".zip";

-        do {

+        do {
             $file = md5(time() . session_id());

             $file = "{$this->config['uploadDir']}/$file.zip";

         } while (file_exists($file));

@@ -765,39 +765,39 @@ 
     /**

      *

      */

-    protected function act_downloadSelected()

-    {

+    protected function act_downloadSelected()
+    {
         $dir = $this->postDir();

         if (!isset($this->post['dir']) ||

             !isset($this->post['files']) ||

             !is_array($this->post['files']) ||

             $this->config['denyZipDownload']

-        ) {

+        ) {
             $this->errorMsg("Unknown error.");

         }

 

         $zipFiles = array();

-        foreach ($this->post['files'] as $file) {

+        foreach ($this->post['files'] as $file) {
             $file = path::normalize($file);

-            if ((substr($file, 0, 1) == ".") || (strpos($file, '/') !== false)) {

+            if ((substr($file, 0, 1) == ".") || (strpos($file, '/') !== false)) {
                 continue;

             }

             $file = "$dir/$file";

-            if (!is_file($file) || !is_readable($file)) {

+            if (!is_file($file) || !is_readable($file)) {
                 continue;

             }

             $zipFiles[] = $file;

         }

 

-        do {

+        do {
             $file = md5(time() . session_id());

             $file = "{$this->config['uploadDir']}/$file.zip";

         } while (file_exists($file));

 

         $zip = new ZipArchive();

         $res = $zip->open($file, ZipArchive::CREATE);

-        if ($res === true) {

-            foreach ($zipFiles as $cfile) {

+        if ($res === true) {
+            foreach ($zipFiles as $cfile) {
                 $zip->addFile($cfile, basename($cfile));

             }

             $zip->close();

@@ -813,42 +813,42 @@ 
     /**

      *

      */

-    protected function act_downloadClipboard()

-    {

+    protected function act_downloadClipboard()
+    {
         if (!isset($this->post['files']) ||

             !is_array($this->post['files']) ||

             $this->config['denyZipDownload']

-        ) {

+        ) {
             $this->errorMsg("Unknown error.");

         }

 

         $zipFiles = array();

-        foreach ($this->post['files'] as $file) {

+        foreach ($this->post['files'] as $file) {
             $file = path::normalize($file);

-            if ((substr($file, 0, 1) == ".")) {

+            if ((substr($file, 0, 1) == ".")) {
                 continue;

             }

             $type = explode("/", $file);

             $type = $type[0];

-            if ($type != $this->type) {

+            if ($type != $this->type) {
                 continue;

             }

             $file = $this->config['uploadDir'] . "/$file";

-            if (!is_file($file) || !is_readable($file)) {

+            if (!is_file($file) || !is_readable($file)) {
                 continue;

             }

             $zipFiles[] = $file;

         }

 

-        do {

+        do {
             $file = md5(time() . session_id());

             $file = "{$this->config['uploadDir']}/$file.zip";

         } while (file_exists($file));

 

         $zip = new ZipArchive();

         $res = $zip->open($file, ZipArchive::CREATE);

-        if ($res === true) {

-            foreach ($zipFiles as $cfile) {

+        if ($res === true) {
+            foreach ($zipFiles as $cfile) {
                 $zip->addFile($cfile, basename($cfile));

             }

             $zip->close();

@@ -866,13 +866,13 @@ 
      * @param $dir

      * @return array

      */

-    protected function moveUploadFile($file, $dir)

-    {

+    protected function moveUploadFile($file, $dir)
+    {
         $response = array('success' => false, 'message' => $this->label('Unknown error.'));

         $message = $this->checkUploadedFile($file);

 

-        if ($message !== true) {

-            if (isset($file['tmp_name'])) {

+        if ($message !== true) {
+            if (isset($file['tmp_name'])) {
                 @unlink($file['tmp_name']);

             }

             $response['message'] = $message;

@@ -885,7 +885,7 @@ 
             'filepath' => realpath($dir)

         ));

 

-        if (is_array($evtOut) && !empty($evtOut)) {

+        if (is_array($evtOut) && !empty($evtOut)) {
             $response['message'] = $evtOut;

 

             return $response;

@@ -896,13 +896,13 @@ 
         if (!@move_uploaded_file($file['tmp_name'], $target) &&

             !@rename($file['tmp_name'], $target) &&

             !@copy($file['tmp_name'], $target)

-        ) {

+        ) {
             @unlink($file['tmp_name']);

 

             $response['message'] = $this->label("Cannot move uploaded file to target folder.");

 

             return $response;

-        } elseif (function_exists('chmod')) {

+        } elseif (function_exists('chmod')) {
             chmod($target, $this->config['filePerms']);

         }

 

@@ -920,13 +920,13 @@ 
     /**

      * @param null $file

      */

-    protected function sendDefaultThumb($file = null)

-    {

-        if ($file !== null) {

+    protected function sendDefaultThumb($file = null)
+    {
+        if ($file !== null) {
             $ext = file::getExtension($file);

             $thumb = "themes/{$this->config['theme']}/img/files/big/$ext.png";

         }

-        if (!isset($thumb) || !file_exists($thumb)) {

+        if (!isset($thumb) || !file_exists($thumb)) {
             $thumb = "themes/{$this->config['theme']}/img/files/big/..png";

         }

         header("Content-Type: image/png");

@@ -938,27 +938,27 @@ 
      * @param $dir

      * @return array

      */

-    protected function getFiles($dir)

-    {

+    protected function getFiles($dir)
+    {
         $thumbDir = "{$this->config['uploadDir']}/{$this->config['thumbsDir']}/$dir";

         $dir = "{$this->config['uploadDir']}/$dir";

         $return = array();

         $files = dir::content($dir, array('types' => "file"));

-        if ($files === false) {

+        if ($files === false) {
             return $return;

         }

 

-        foreach ($files as $file) {

+        foreach ($files as $file) {
             $ext = file::getExtension($file);

             $smallThumb = false;

             $preview = false;

-            if (in_array(strtolower($ext), array('png', 'jpg', 'gif', 'jpeg'))) {

+            if (in_array(strtolower($ext), array('png', 'jpg', 'gif', 'jpeg'))) {
                 $size = @getimagesize($file);

-                if (is_array($size) && count($size)) {

+                if (is_array($size) && count($size)) {
                     $preview = true;

-                    if (!$this->config['noThumbnailsRecreation']) {

+                    if (!$this->config['noThumbnailsRecreation']) {
                         $thumb_file = "$thumbDir/" . basename($file);

-                        if (!is_file($thumb_file) || filemtime($file) > filemtime($thumb_file)) {

+                        if (!is_file($thumb_file) || filemtime($file) > filemtime($thumb_file)) {
                             $this->makeThumb($file);

                         }

                         $smallThumb =

@@ -969,16 +969,16 @@ 
                 }

             }

             $stat = stat($file);

-            if ($stat === false) {

+            if ($stat === false) {
                 continue;

             }

             $name = basename($file);

             $types = $this->config['types'];

             $types = explode(' ', $types['images'] . ' ' . $types['image']);

-            if (substr($name, 0, 1) == '.' && !$this->config['showHiddenFiles']) {

+            if (substr($name, 0, 1) == '.' && !$this->config['showHiddenFiles']) {
                 continue;

             }

-            if ($this->type == 'images' && !in_array(strtolower($ext), $types)) {

+            if ($this->type == 'images' && !in_array(strtolower($ext), $types)) {
                 continue;

             }

             $bigIcon = file_exists("themes/{$this->config['theme']}/img/files/big/$ext.png");

@@ -1007,15 +1007,15 @@ 
      * @param int $index

      * @return array|bool

      */

-    protected function getTree($dir, $index = 0)

-    {

+    protected function getTree($dir, $index = 0)
+    {
         $path = explode("/", $dir);

 

         $pdir = "";

-        for ($i = 0; ($i <= $index && $i < count($path)); $i++) {

+        for ($i = 0; ($i <= $index && $i < count($path)); $i++) {
             $pdir .= "/{$path[$i]}";

         }

-        if (strlen($pdir)) {

+        if (strlen($pdir)) {
             $pdir = substr($pdir, 1);

         }

 

@@ -1023,23 +1023,23 @@ 
 

         $dirs = $this->getDirs($fdir);

 

-        if (is_array($dirs) && count($dirs) && ($index <= count($path) - 1)) {

+        if (is_array($dirs) && count($dirs) && ($index <= count($path) - 1)) {
 

-            foreach ($dirs as $i => $cdir) {

+            foreach ($dirs as $i => $cdir) {
                 if ($cdir['hasDirs'] &&

                     (

                         ($index == count($path) - 1) ||

                         ($cdir['name'] == $path[$index + 1])

                     )

-                ) {

+                ) {
                     $dirs[$i]['dirs'] = $this->getTree($dir, $index + 1);

-                    if (!is_array($dirs[$i]['dirs']) || !count($dirs[$i]['dirs'])) {

+                    if (!is_array($dirs[$i]['dirs']) || !count($dirs[$i]['dirs'])) {
                         unset($dirs[$i]['dirs']);

                         continue;

                     }

                 }

             }

-        } else {

+        } else {
             return false;

         }

 

@@ -1050,13 +1050,13 @@ 
      * @param bool $existent

      * @return string

      */

-    protected function postDir($existent = true)

-    {

+    protected function postDir($existent = true)
+    {
         $dir = $this->typeDir;

-        if (isset($this->post['dir'])) {

+        if (isset($this->post['dir'])) {
             $dir .= "/" . $this->post['dir'];

         }

-        if ($existent && (!is_dir($dir) || !is_readable($dir))) {

+        if ($existent && (!is_dir($dir) || !is_readable($dir))) {
             $this->errorMsg("Inexistant or inaccessible folder.");

         }

 

@@ -1067,13 +1067,13 @@ 
      * @param bool $existent

      * @return string

      */

-    protected function getDir($existent = true)

-    {

+    protected function getDir($existent = true)
+    {
         $dir = $this->typeDir;

-        if (isset($this->get['dir'])) {

+        if (isset($this->get['dir'])) {
             $dir .= "/" . $this->get['dir'];

         }

-        if ($existent && (!is_dir($dir) || !is_readable($dir))) {

+        if ($existent && (!is_dir($dir) || !is_readable($dir))) {
             $this->errorMsg("Inexistant or inaccessible folder.");

         }

 

@@ -1084,15 +1084,15 @@ 
      * @param $dir

      * @return array

      */

-    protected function getDirs($dir)

-    {

+    protected function getDirs($dir)
+    {
         $dirs = dir::content($dir, array('types' => "dir"));

         $return = array();

-        if (is_array($dirs)) {

+        if (is_array($dirs)) {
             $writable = dir::isWritable($dir);

-            foreach ($dirs as $cdir) {

+            foreach ($dirs as $cdir) {
                 $info = $this->getDirInfo($cdir);

-                if ($info === false) {

+                if ($info === false) {
                     continue;

                 }

                 $info['removable'] = $writable && $info['writable'];

@@ -1108,20 +1108,20 @@ 
      * @param bool $removable

      * @return array|bool

      */

-    protected function getDirInfo($dir, $removable = false)

-    {

-        if ((substr(basename($dir), 0, 1) == ".") || !is_dir($dir) || !is_readable($dir)) {

+    protected function getDirInfo($dir, $removable = false)
+    {
+        if ((substr(basename($dir), 0, 1) == ".") || !is_dir($dir) || !is_readable($dir)) {
             return false;

         }

         $dirs = dir::content($dir, array('types' => "dir"));

-        if (is_array($dirs)) {

-            foreach ($dirs as $key => $cdir) {

-                if (substr(basename($cdir), 0, 1) == ".") {

+        if (is_array($dirs)) {
+            foreach ($dirs as $key => $cdir) {
+                if (substr(basename($cdir), 0, 1) == ".") {
                     unset($dirs[$key]);

                 }

             }

             $hasDirs = count($dirs) ? true : false;

-        } else {

+        } else {
             $hasDirs = false;

         }

 

@@ -1134,7 +1134,7 @@ 
             'hasDirs'   => $hasDirs

         );

 

-        if ($dir == "{$this->config['uploadDir']}/{$this->session['dir']}") {

+        if ($dir == "{$this->config['uploadDir']}/{$this->session['dir']}") {
             $info['current'] = true;

         }

 

@@ -1146,21 +1146,21 @@ 
      * @param null $template

      * @return string

      */

-    protected function output($data = null, $template = null)

-    {

-        if (!is_array($data)) {

+    protected function output($data = null, $template = null)
+    {
+        if (!is_array($data)) {
             $data = array();

         }

-        if ($template === null) {

+        if ($template === null) {
             $template = $this->action;

         }

 

-        if (file_exists("tpl/tpl_$template.php")) {

+        if (file_exists("tpl/tpl_$template.php")) {
             ob_start();

             $eval = "unset(\$data);unset(\$template);unset(\$eval);";

             $_ = $data;

-            foreach (array_keys($data) as $key) {

-                if (preg_match('/^[a-z\d_]+$/i', $key)) {

+            foreach (array_keys($data) as $key) {
+                if (preg_match('/^[a-z\d_]+$/i', $key)) {
                     $eval .= "\$$key=\$_['$key'];";

                 }

             }

@@ -1177,14 +1177,14 @@ 
      * @param $message

      * @param array|null $data

      */

-    protected function errorMsg($message, array $data = null)

-    {

-        if (in_array($this->action, array("thumb", "upload", "download", "downloadDir"))) {

+    protected function errorMsg($message, array $data = null)
+    {
+        if (in_array($this->action, array("thumb", "upload", "download", "downloadDir"))) {
             die($this->label($message, $data));

         }

-        if (($this->action === null) || ($this->action == "browser")) {

+        if (($this->action === null) || ($this->action == "browser")) {
             $this->backMsg($message, $data);

-        } else {

+        } else {
             $message = $this->label($message, $data);

             die(json_encode(array('error' => $message)));

         }

manager/views/frame/1.blade.php

Spacing +21 added lines, -21 removed lines

@@ -37,14 +37,14 @@ 
                 mail_check_timeperiod: {{ $modx->getConfig('mail_check_timeperiod') }},

                 menu_height: {{ (int)$modx->getConfig('manager_menu_height') }},

                 tree_width: {{ (int)$MODX_widthSideBar }},

-                tree_min_width: <?= (int)$tree_min_width ?>,

-                session_timeout: <?= (int)$modx->getConfig('session_timeout') ?>,

-                site_start: <?= (int)$modx->getConfig('site_start') ?>,

+                tree_min_width: <?= (int) $tree_min_width ?>,

+                session_timeout: <?= (int) $modx->getConfig('session_timeout') ?>,

+                site_start: <?= (int) $modx->getConfig('site_start') ?>,

                 tree_page_click: {{ $modx->getConfig('tree_page_click') }},

                 theme: '{{ ManagerTheme::getTheme() }}',

                 theme_mode: '{{ ManagerTheme::getThemeStyle() }}',

                 which_browser: '<?= $user['which_browser'] ?>',

-                layout: <?= (int)$modx->getConfig('manager_layout') ?>,

+                layout: <?= (int) $modx->getConfig('manager_layout') ?>,

                 textdir: '<?= ManagerTheme::getTextDir() ?>',

                 global_tabs: <?= $modx->getConfig('global_tabs') ?>

 

@@ -129,7 +129,7 @@ 
                 delete a[b];

             },

             openedArray: [],

-            lockedElementsTranslation: <?= json_encode($unlockTranslations, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE) . "\n" ?>

+            lockedElementsTranslation: <?= json_encode($unlockTranslations, JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE)."\n" ?>

         };

         <?php

         $opened = array_filter(

@@ -141,7 +141,7 @@ 
                 )

             )

         );

-        echo (empty($opened) ? '' : 'modx.openedArray[' . implode("] = 1;\n		modx.openedArray[", $opened) . '] = 1;') . "\n";

+        echo (empty($opened) ? '' : 'modx.openedArray['.implode("] = 1;\n		modx.openedArray[", $opened).'] = 1;')."\n";

         ?>

     </script>

     <script src="{{ ManagerTheme::getThemeUrl() }}js/modx.min.js?v=<?= EVO_INSTALL_TIME ?>"></script>

@@ -221,7 +221,7 @@ 
                             <a href="javascript:;" class="dropdown-toggle" onclick="return false;">

                                 <span class="username"><?= entities($user['username'], $modx->getConfig('modx_charset')) ?></span>

                                 <?php if ($user['photo']) { ?>

-                                <span class="icon photo" style="background-image: url(<?= MODX_SITE_URL . entities($user['photo'], $modx->getConfig('modx_charset')) ?>);"></span>

+                                <span class="icon photo" style="background-image: url(<?= MODX_SITE_URL.entities($user['photo'], $modx->getConfig('modx_charset')) ?>);"></span>

                                 <?php } else { ?>

                                 <span class="icon"><i class="fa fa-user-circle"></i></span>

                                 <?php } ?>

@@ -248,7 +248,7 @@ 
                                 $version = 'Evolution';

                                 ?>

                                 <?php

-                                echo sprintf('<li><span class="dropdown-item" title="%s &ndash; %s" %s>' . $version . ' %s</span></li>', $modx->getPhpCompat()->entities($modx->getConfig('site_name')), $modx->getVersionData('full_appname'), $style, $modx->getConfig('settings_version'));

+                                echo sprintf('<li><span class="dropdown-item" title="%s &ndash; %s" %s>'.$version.' %s</span></li>', $modx->getPhpCompat()->entities($modx->getConfig('site_name')), $modx->getVersionData('full_appname'), $style, $modx->getConfig('settings_version'));

                                 ?>

                             </ul>

                         </li>

@@ -315,7 +315,7 @@ 
         <?php

         // invoke OnManagerTreeInit event

         $evtOut = $modx->invokeEvent('OnManagerTreeInit', $_REQUEST);

-        if(is_array($evtOut)) {

+        if (is_array($evtOut)) {

             echo implode("\n", $evtOut);

         }

         ?>

@@ -327,7 +327,7 @@ 
 

                 <a class="treeButton" id="treeMenu_collapsetree" onclick="modx.tree.collapseTree();" title="<?php echo $_lang['collapse_tree']; ?>"><i class="fa fa-arrow-circle-up"></i></a>

 

-                <?php if($modx->hasPermission('new_document')) { ?>

+                <?php if ($modx->hasPermission('new_document')) { ?>

                 <a class="treeButton" id="treeMenu_addresource" onclick="modx.tabs({url:'<?= MODX_MANAGER_URL ?>?a=4', title: '<?php echo $_lang['add_resource']; ?>'});" title="<?php echo $_lang['add_resource']; ?>"><i class="fa fa-file"></i></a>

                 <a class="treeButton" id="treeMenu_addweblink" onclick="modx.tabs({url:'<?= MODX_MANAGER_URL ?>?a=72', title: '<?php echo $_lang['add_weblink']; ?>'});" title="<?php echo $_lang['add_weblink']; ?>"><i class="fa fa-link"></i></a>

                 <?php } ?>

@@ -336,23 +336,23 @@ 
 

                 <a class="treeButton" id="treeMenu_sortingtree" onclick="modx.tree.showSorter(event);" title="<?php echo $_lang['sort_tree']; ?>"><i class="fa fa-sort"></i></a>

 

-                <?php if($modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) { ?>

+                <?php if ($modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) { ?>

                 <a class="treeButton" id="treeMenu_sortingindex" onclick="modx.tabs({url: '<?= MODX_MANAGER_URL ?>?a=56&id=0', title: '<?php echo $_lang['sort_menuindex']; ?>'});" title="<?php echo $_lang['sort_menuindex']; ?>"><i class="fa fa-sort-numeric-asc"></i></a>

                 <?php } ?>

 

                 @if($modx->getConfig('use_browser') && $modx->hasPermission('assets_images'))

-                <a class="treeButton" id="treeMenu_openimages" title="<?php echo $_lang["images_management"] . "\n" . $_lang['em_button_shift'] ?>"><i class="fa fa-camera"></i></a>

+                <a class="treeButton" id="treeMenu_openimages" title="<?php echo $_lang["images_management"]."\n".$_lang['em_button_shift'] ?>"><i class="fa fa-camera"></i></a>

                 @endif

 

                 @if($modx->getConfig('use_browser') && $modx->hasPermission('assets_files'))

-                <a class="treeButton" id="treeMenu_openfiles" title="<?php echo $_lang["files_management"] . "\n" . $_lang['em_button_shift'] ?>"><i class="fa fa-files-o"></i></a>

+                <a class="treeButton" id="treeMenu_openfiles" title="<?php echo $_lang["files_management"]."\n".$_lang['em_button_shift'] ?>"><i class="fa fa-files-o"></i></a>

                 @endif

 

-                <?php if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin')) { ?>

-                <a class="treeButton" id="treeMenu_openelements" title="<?php echo $_lang["element_management"] . "\n" . $_lang['em_button_shift'] ?>"><i class="fa fa-th"></i></a>

+                <?php if ($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin')) { ?>

+                <a class="treeButton" id="treeMenu_openelements" title="<?php echo $_lang["element_management"]."\n".$_lang['em_button_shift'] ?>"><i class="fa fa-th"></i></a>

                 <?php } ?>

 

-                <?php if($modx->hasPermission('empty_trash')) { ?>

+                <?php if ($modx->hasPermission('empty_trash')) { ?>

                 <a class="treeButton treeButtonDisabled" id="treeMenu_emptytrash" title="<?php echo $_lang['empty_recycle_bin_empty']; ?>"><i class="fa fa-trash-o"></i></a>

                 <?php } ?>

 

@@ -364,7 +364,7 @@ 
                 <?php

                 // invoke OnManagerTreePrerender event

                 $evtOut = $modx->invokeEvent('OnManagerTreePrerender', $modx->getDatabase()->escape($_REQUEST));

-                if(is_array($evtOut)) {

+                if (is_array($evtOut)) {

                     echo implode("\n", $evtOut);

                 }

                 $siteName = $modx->getPhpCompat()->entities($modx->getConfig('site_name'));

@@ -376,7 +376,7 @@ 
                 <?php

                 // invoke OnManagerTreeRender event

                 $evtOut = $modx->invokeEvent('OnManagerTreeRender', $modx->getDatabase()->escape($_REQUEST));

-                if(is_array($evtOut)) {

+                if (is_array($evtOut)) {

                     echo implode("\n", $evtOut);

                 }

                 ?>

@@ -470,7 +470,7 @@ 
     </div>

 

 <?php

-if(!function_exists('constructLink')) {

+if (!function_exists('constructLink')) {

     /**

      * @param string $action

      * @param string $img

@@ -479,7 +479,7 @@ 
      */

     function constructLink($action, $img, $text, $allowed)

     {

-        if ((bool)$allowed) {

+        if ((bool) $allowed) {

             echo sprintf('<div class="menuLink" id="item%s" onclick="modx.tree.menuHandler(%s);">', $action,

                 $action);

             echo sprintf('<i class="%s"></i> %s</div>', $img, $text);

@@ -520,7 +520,7 @@ 
     <script type="text/javascript">

 

         if (document.getElementById('treeMenu')) {

-            <?php if($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin')) { ?>

+            <?php if ($modx->hasPermission('edit_template') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('edit_chunk') || $modx->hasPermission('edit_plugin')) { ?>

 

             document.getElementById('treeMenu_openelements').onclick = function(e) {

                 e.preventDefault();

Braces +11 added lines, -11 removed lines

@@ -153,7 +153,7 @@ 
     <?php

     // invoke OnManagerTopPrerender event

     $evtOut = $modx->invokeEvent('OnManagerTopPrerender', $_REQUEST);

-    if (is_array($evtOut)) {

+    if (is_array($evtOut)) {
         echo implode("\n", $evtOut);

     }

     ?>

@@ -315,7 +315,7 @@ 
         <?php

         // invoke OnManagerTreeInit event

         $evtOut = $modx->invokeEvent('OnManagerTreeInit', $_REQUEST);

-        if(is_array($evtOut)) {

+        if(is_array($evtOut)) {
             echo implode("\n", $evtOut);

         }

         ?>

@@ -364,7 +364,7 @@ 
                 <?php

                 // invoke OnManagerTreePrerender event

                 $evtOut = $modx->invokeEvent('OnManagerTreePrerender', $modx->getDatabase()->escape($_REQUEST));

-                if(is_array($evtOut)) {

+                if(is_array($evtOut)) {
                     echo implode("\n", $evtOut);

                 }

                 $siteName = $modx->getPhpCompat()->entities($modx->getConfig('site_name'));

@@ -376,7 +376,7 @@ 
                 <?php

                 // invoke OnManagerTreeRender event

                 $evtOut = $modx->invokeEvent('OnManagerTreeRender', $modx->getDatabase()->escape($_REQUEST));

-                if(is_array($evtOut)) {

+                if(is_array($evtOut)) {
                     echo implode("\n", $evtOut);

                 }

                 ?>

@@ -414,11 +414,11 @@ 
             'tree_sortdir',

             'tree_nodename'

         );

-        foreach ($sortParams as $param) {

-            if (isset($_REQUEST[$param])) {

+        foreach ($sortParams as $param) {
+            if (isset($_REQUEST[$param])) {
                 $modx->getManagerApi()->saveLastUserSetting($param, $_REQUEST[$param]);

                 $_SESSION[$param] = $_REQUEST[$param];

-            } else if (!isset($_SESSION[$param])) {

+            } else if (!isset($_SESSION[$param])) {
                 $_SESSION[$param] = $modx->getManagerApi()->getLastUserSetting($param);

             }

         }

@@ -470,16 +470,16 @@ 
     </div>

 

 <?php

-if(!function_exists('constructLink')) {

+if(!function_exists('constructLink')) {
     /**

      * @param string $action

      * @param string $img

      * @param string $text

      * @param bool $allowed

      */

-    function constructLink($action, $img, $text, $allowed)

-    {

-        if ((bool)$allowed) {

+    function constructLink($action, $img, $text, $allowed)
+    {
+        if ((bool)$allowed) {
             echo sprintf('<div class="menuLink" id="item%s" onclick="modx.tree.menuHandler(%s);">', $action,

                 $action);

             echo sprintf('<i class="%s"></i> %s</div>', $img, $text);

manager/views/partials/footer.blade.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 global $SystemAlertMsgQueque;
 // display system alert window if messages are available
 if (count($SystemAlertMsgQueque) > 0) {
-    include MODX_MANAGER_PATH . 'includes/sysalert.display.inc.php';
+    include MODX_MANAGER_PATH.'includes/sysalert.display.inc.php';
 }
 ?>
 @stack('scripts.bot')

manager/views/page/4.blade.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php /** get the mutate page for adding content */ ?>
 @extends('manager::template.page')
 @section('content')
-    <?php include_once evolutionCMS()->get('ManagerTheme')->getFileProcessor("actions/mutate_content.dynamic.php");?>
+    <?php include_once evolutionCMS()->get('ManagerTheme')->getFileProcessor("actions/mutate_content.dynamic.php"); ?>
 @endsection