refactoring, isHtmlMode moved to Helpers

Author: dg

src/Tracy/Bar.php

@@ -54,11 +54,11 @@ public function getPanel($id)
 	public function render()
 	{
 		@session_start(); // @ session may be already started or it is not possible to start session
-		$session = & $_SESSION['__NF']['tracybar-2.3'];
-		$redirect = preg_match('#^Location:#im', implode("\n", headers_list()));
-		if ($redirect) {
+		$previousBars = & $_SESSION['__NF']['tracybar-2.3'];
+		$isRedirect = preg_match('#^Location:#im', implode("\n", headers_list()));
+		if ($isRedirect) {
 			Dumper::fetchLiveData();
-			Dumper::$livePrefix = count($session) . 'p';
+			Dumper::$livePrefix = count($previousBars) . 'p';
 		}
 
 		$obLevel = ob_get_level();
@@ -90,14 +90,14 @@ public function render()
 			}
 		}
 
-		if ($redirect) {
-			$session[] = ['panels' => $panels, 'liveData' => Dumper::fetchLiveData()];
+		if ($isRedirect) {
+			$previousBars[] = ['panels' => $panels, 'liveData' => Dumper::fetchLiveData()];
 			return;
 		}
 
 		$liveData = Dumper::fetchLiveData();
 
-		foreach (array_reverse((array) $session) as $reqId => $info) {
+		foreach (array_reverse((array) $previousBars) as $reqId => $info) {
 			$panels[] = [
 				'tab' => '<span title="Previous request before redirect">previous</span>',
 				'panel' => NULL,
@@ -109,7 +109,7 @@ public function render()
 			}
 			$liveData += $info['liveData'];
 		}
-		$session = NULL;
+		$previousBars = NULL;
 
 		require __DIR__ . '/assets/Bar/bar.phtml';
 	}

src/Tracy/Debugger.php

@@ -169,16 +169,17 @@ public static function enable($mode = NULL, $logDirectory = NULL, $email = NULL)
 		}
 		error_reporting(E_ALL);
 
-		if (!self::$enabled) {
-			register_shutdown_function([__CLASS__, 'shutdownHandler']);
-			set_exception_handler([__CLASS__, 'exceptionHandler']);
-			set_error_handler([__CLASS__, 'errorHandler']);
+		if (self::$enabled) {
+			return;
+		}
+		self::$enabled = TRUE;
 
-			array_map('class_exists', ['Tracy\Bar', 'Tracy\BlueScreen', 'Tracy\DefaultBarPanel', 'Tracy\Dumper',
-				'Tracy\FireLogger', 'Tracy\Helpers', 'Tracy\Logger']);
+		register_shutdown_function([__CLASS__, 'shutdownHandler']);
+		set_exception_handler([__CLASS__, 'exceptionHandler']);
+		set_error_handler([__CLASS__, 'errorHandler']);
 
-			self::$enabled = TRUE;
-		}
+		array_map('class_exists', ['Tracy\Bar', 'Tracy\BlueScreen', 'Tracy\DefaultBarPanel', 'Tracy\Dumper',
+			'Tracy\FireLogger', 'Tracy\Helpers', 'Tracy\Logger']);
 	}
 
 
@@ -209,7 +210,7 @@ public static function shutdownHandler()
 				FALSE
 			);
 
-		} elseif (self::$showBar && !connection_aborted() && !self::$productionMode && self::isHtmlMode()) {
+		} elseif (self::$showBar && !connection_aborted() && !self::$productionMode && Helpers::isHtmlMode()) {
 			self::$reserved = NULL;
 			self::removeOutputBuffers(FALSE);
 			self::getBar()->render();
@@ -234,7 +235,7 @@ public static function exceptionHandler($exception, $exit = TRUE)
 			$protocol = isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.1';
 			$code = isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE ') !== FALSE ? 503 : 500;
 			header("$protocol $code", TRUE, $code);
-			if (self::isHtmlMode()) {
+			if (Helpers::isHtmlMode()) {
 				header('Content-Type: text/html; charset=UTF-8');
 			}
 		}
@@ -249,15 +250,15 @@ public static function exceptionHandler($exception, $exit = TRUE)
 			} catch (\Exception $e) {
 			}
 
-			if (self::isHtmlMode()) {
+			if (Helpers::isHtmlMode()) {
 				$logged = empty($e);
 				require self::$errorTemplate ?: __DIR__ . '/assets/Debugger/error.500.phtml';
 			} elseif (PHP_SAPI === 'cli') {
 				fwrite(STDERR, 'ERROR: application encountered an error and can not continue. '
 					. (isset($e) ? "Unable to log error.\n" : "Error was logged.\n"));
 			}
 
-		} elseif (!connection_aborted() && self::isHtmlMode()) {
+		} elseif (!connection_aborted() && Helpers::isHtmlMode()) {
 			self::getBlueScreen()->render($exception);
 			if (self::$showBar) {
 				self::getBar()->render();
@@ -368,19 +369,11 @@ public static function errorHandler($severity, $message, $file, $line, $context)
 
 		} else {
 			self::fireLog(new ErrorException($message, 0, $severity, $file, $line));
-			return self::isHtmlMode() ? NULL : FALSE; // FALSE calls normal error handler
+			return Helpers::isHtmlMode() ? NULL : FALSE; // FALSE calls normal error handler
 		}
 	}
 
 
-	private static function isHtmlMode()
-	{
-		return empty($_SERVER['HTTP_X_REQUESTED_WITH'])
-			&& PHP_SAPI !== 'cli'
-			&& !preg_match('#^Content-Type: (?!text/html)#im', implode("\n", headers_list()));
-	}
-
-
 	private static function removeOutputBuffers($errorOccurred)
 	{
 		while (ob_get_level() > self::$obLevel) {

src/Tracy/Helpers.php

@@ -213,4 +213,20 @@ public static function getSuggestion(array $items, $value)
 		return $best;
 	}
 
+
+	/** @internal */
+	public static function isHtmlMode()
+	{
+		return !self::isAjax()
+			&& PHP_SAPI !== 'cli'
+			&& !preg_match('#^Content-Type: (?!text/html)#im', implode("\n", headers_list()));
+	}
+
+
+	/** @internal */
+	public static function isAjax()
+	{
+		return isset($_SERVER['HTTP_X_REQUESTED_WITH']);
+	}
+
 }