Much nicer debug output

Author: leofeyer

CHANGELOG.md

@@ -4,6 +4,9 @@ Contao Open Source CMS Changelog
 Version 3.0.beta1 (XXXX-XX-XX)
 ------------------------------
 
+### Improved
+Much nicer debug output.
+
 ### Changed
 Modules are now disabled by adding a `.skip` file instead of using the global
 `inactiveModules` array. This way the local configuration file does not have to

contao/install.php

@@ -135,7 +135,7 @@ public function run()
 				$this->Template->ftpUserError = true;
 				$this->outputAndExit();
 			}
-			elseif (ftp_size($resFtp, $GLOBALS['TL_CONFIG']['ftpPath'] . 'system/contao.css') == -1)
+			elseif (ftp_size($resFtp, $GLOBALS['TL_CONFIG']['ftpPath'] . 'assets/css/contao.css') == -1)
 			{
 				$this->Template->ftpPathError = true;
 				$this->outputAndExit();

robots.txt

@@ -11,7 +11,6 @@ Disallow: /share.php
 Disallow: /GPL.txt
 Disallow: /README.md
 Disallow: /LGPL.txt
-Allow: /system/html/
-Allow: /system/contao.css 
+Allow: /assets/
 Allow: /plugins/*.js
 Allow: /plugins/*.css

system/initialize.php

@@ -28,6 +28,12 @@
  */
 
 
+/**
+ * Store the microtime
+ */
+define('TL_START', microtime(true));
+
+
 /**
  * Define the root path to the Contao installation
  */

system/library/Contao/Database/Statement.php

@@ -401,7 +401,7 @@ protected function debugQuery($objResult=null)
 		if ($objResult !== null || strncmp(strtoupper($this->strQuery), 'SELECT', 6) !== 0)
 		{
 			$arrData[] = sprintf('%d rows affected', $this->affectedRows);
-			$GLOBALS['TL_DEBUG'][] = $arrData;
+			$GLOBALS['TL_DEBUG']['db'][] = $arrData;
 
 			return;
 		}
@@ -413,7 +413,7 @@ protected function debugQuery($objResult=null)
 			$arrData[] = $arrExplain;
 		}
 
-		$GLOBALS['TL_DEBUG'][] = $arrData;
+		$GLOBALS['TL_DEBUG']['db'][] = $arrData;
 	}
 
 

system/library/Contao/Template.php

@@ -295,10 +295,13 @@ public function output()
 		// Debug information
 		if ($GLOBALS['TL_CONFIG']['debugMode'])
 		{
-			echo "\n\n" . '<pre id="debug" style="width:80%;overflow:auto;margin:24px auto;padding:9px;background:#fff">' . "\n";
-			echo "<strong>Debug information</strong>\n\n";
+			echo "\n\n"
+				. '<div id="debug">' . "\n"
+				. '<p><span class="info">Contao debug information</span> <span class="time">Execution time: ' . $this->getFormattedNumber(microtime(true) - TL_START, 4) . ' seconds</span> <span class="memory">Memory usage: ' . $this->getReadableSize(memory_get_peak_usage()) . '</span> <span class="db">Database queries: ' . count($GLOBALS['TL_DEBUG']['db']) . '</span></p>' . "\n"
+				. '<div><pre>' . "\n";
 			print_r($GLOBALS['TL_DEBUG']);
-			echo '</pre>';
+			echo '</pre></div>'
+				. '<script>$$("#debug p", "#debug div").setStyle("width", window.getSize().x)</script>';
 		}
 	}
 

system/modules/backend/Automator.php

@@ -194,7 +194,7 @@ public function purgeScriptsFolder()
 		{
 			foreach ($arrScripts as $strFile)
 			{
-				if ($strFile != 'index.html' && $strFile != 'contao.css' && !is_dir(TL_ROOT . '/system/scripts/' . $strFile))
+				if ($strFile != 'index.html' && $strFile != 'contao.css' && $strFile != 'debug.css' && !is_dir(TL_ROOT . '/system/scripts/' . $strFile))
 				{
 					unlink(TL_ROOT . '/assets/css/' . $strFile);
 				}

system/modules/backend/BackendTemplate.php

@@ -114,6 +114,12 @@ public function output()
 			$this->stylesheets = $strStyleSheets;
 		}
 
+		// Add the debug style sheet
+		if ($GLOBALS['TL_CONFIG']['debugMode'])
+		{
+			$this->stylesheets .= '<link rel="stylesheet" href="' . $this->addStaticUrlTo('assets/css/debug.css') . '" media="all">' . "\n";
+		}
+
 		// JavaScripts
 		if (is_array($GLOBALS['TL_JAVASCRIPT']) && !empty($GLOBALS['TL_JAVASCRIPT']))
 		{

system/modules/backend/StyleSheets.php

@@ -97,7 +97,7 @@ public function updateStyleSheets()
 		foreach (scan(TL_ROOT . '/assets/css', true) as $file)
 		{
 			// Skip directories
-			if (is_dir(TL_ROOT . '/assets/css/' . $file) || $file == 'contao.css')
+			if (is_dir(TL_ROOT . '/assets/css/' . $file) || $file == 'contao.css' || $file == 'debug.css')
 			{
 				continue;
 			}

system/modules/backend/templates/be_install.html5

@@ -8,6 +8,7 @@
 <link rel="stylesheet" href="<?php echo TL_SCRIPT_URL; ?>system/themes/<?php echo $this->theme; ?>/basic.css" media="all">
 <link rel="stylesheet" href="<?php echo TL_SCRIPT_URL; ?>system/themes/<?php echo $this->theme; ?>/install.css" media="all">
 <!--[if IE]><link rel="stylesheet" href="<?php echo TL_SCRIPT_URL; ?>system/themes/<?php echo $this->theme; ?>/iefixes.css"><![endif]-->
+<?php echo $this->stylesheets; ?>
 <script><?php echo $this->getLocaleString(); ?></script>
 <script src="<?php echo TL_PLUGINS_URL; ?>plugins/mootools/<?php echo MOOTOOLS; ?>/mootools-core.js"></script>
 <script src="<?php echo TL_PLUGINS_URL; ?>plugins/mootools/<?php echo MOOTOOLS; ?>/mootools-more.js"></script>

system/modules/backend/templates/be_login.html5

@@ -12,6 +12,7 @@
   echo $objCombiner->getCombinedFile();
 ?>" media="all">
 <!--[if IE]><link rel="stylesheet" href="<?php echo TL_SCRIPT_URL; ?>system/themes/<?php echo $this->theme; ?>/iefixes.css"><![endif]-->
+<?php echo $this->stylesheets; ?>
 <script><?php echo $this->getLocaleString(); ?></script>
 <script src="<?php
   $objCombiner = new Combiner();

system/modules/backend/templates/be_password.html5

@@ -11,6 +11,7 @@
   echo $objCombiner->getCombinedFile();
 ?>" media="all">
 <!--[if IE]><link rel="stylesheet" href="<?php echo TL_SCRIPT_URL; ?>system/themes/<?php echo $this->theme; ?>/iefixes.css"><![endif]-->
+<?php echo $this->stylesheets; ?>
 <script><?php echo $this->getLocaleString(); ?></script>
 <script src="<?php
   $objCombiner = new Combiner();

system/modules/frontend/PageRegular.php

@@ -437,6 +437,12 @@ protected function createHeaderScripts(Database_Result $objPage, Database_Result
 			$strStyleSheets .= '<link' . (($objPage->outputFormat == 'xhtml') ? ' type="text/css"' : '') . ' rel="stylesheet" href="' . $objCombiner->getCombinedFile() . '" media="all"' . $strTagEnding . "\n";
 		}
 
+		// Add the debug style sheet
+		if ($GLOBALS['TL_CONFIG']['debugMode'])
+		{
+			$strStyleSheets .= '<link rel="stylesheet" href="' . $this->addStaticUrlTo('assets/css/debug.css') . '" media="all">' . "\n";
+		}
+
 		// Always add conditional style sheets at the end
 		$strStyleSheets .= $strCcStyleSheets;