From 684f426067b306541308588962f9d049eb652fb2 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Sun, 18 Dec 2005 07:54:11 +0000
Subject: [PATCH] Moving the debug block at the end of compiled pages into the
 kernel that can be used both without code duplication

---
 kernel.php   | 110 ++++++++++++++---------------------------
 printer.php  | 107 +---------------------------------------
 template.php | 136 +--------------------------------------------------
 3 files changed, 42 insertions(+), 311 deletions(-)

diff --git a/kernel.php b/kernel.php
index 19bb2fa..a3b469f 100644
--- a/kernel.php
+++ b/kernel.php
@@ -824,26 +824,39 @@ class Shared_Object_Framework
 	{
 		$debug = '';
 		
-		if ($this->registry->debug)
+		if ($this->debug)
 		{
-			// --- START
 			$debug = "\n<ul>";
 			
 			// templates
 			if ($dotemplates)
 			{
+				// both template and template_fs are viable, so we need to determine the right one
+				if ($this->is_loaded('template'))
+				{
+					$tpl_obj =& $this->modules['template'];
+				}
+				else if ($this->is_loaded('template_fs'))
+				{
+					$tpl_obj =& $this->modules['template_fs'];
+				}
+				else
+				{
+					$tpl_obj = null;
+				}
+				
 				$optlist = array();
 				$usage = array();
-				foreach ($this->usage AS $name => $count)
+				foreach ($tpl_obj->usage AS $name => $count)
 				{
-					if (in_array($name, $this->uncached))
+					if (in_array($name, $tpl_obj->uncached))
 					{
 						$optlist[] = $name . '[' . $count . ']';
 					}
 					$usage[] = $name . " ($count)";
 				}
 				
-				$sizeof = sizeof($this->uncached);
+				$sizeof = sizeof($tpl_obj->uncached);
 				if ($sizeof > 0)
 				{
 					$debug .= "\n\t<li><strong style=\"color: red\">Uncached Template(s):</strong> $sizeof ( " . implode(' &nbsp; ', $optlist) . " )</li>";
@@ -852,93 +865,48 @@ class Shared_Object_Framework
 			
 			// source control
 			$scinfo = 'Not Under Source Control';
-			$possiblescms = array('cvs', 'svn', 'cvs_information', 'svn_information', 'scm', 'sc_information', 'scm_information');
-			foreach ($possiblescms AS $scm)
+			if (defined('SVN'))
 			{
-				if (defined(strtoupper($scm)))
+				$scinfo = constant('SVN');
+				
+				if ($test == '$' . 'Id: $')
 				{
-					$scinfo = constant(strtoupper($scm));
-					
-					$type = '';					
-					// CVS
-					if (strpos($scinfo, 'RCSfile:') !== false)
-					{
-						$type = 'cvs';
-					}
-					else if (strpos($scinfo, ',v ') !== false)
-					{
-						$type = 'cvs';
-					}
-					// SVN
-					else if (strpos($scinfo, 'URL:') !== false)
-					{
-						$type = 'svn';
-					}
-					else if (strpos($scinfo, 'https://') !== false OR strpos($scinfo, 'http://') !== false)
-					{
-						$type= 'svn';
-					}
-					// not found so just return it
-					// try a SVN ID tag as we can't really tell if we're using it
-					else
-					{
-						$test = preg_replace('#\$' . 'Id: (.+?) (.+?) [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}(.+?) (.+?) \$#', '\\1 - SVN \\2', $scinfo);
-						if ($test == '$' . 'Id: $')
-						{
-							$scinfo = 'Not Under Source Control';	
-						}
-						else
-						{
-							$scinfo = $test;
-						}
-						break;
-					}
-					
-					if ($type == 'cvs')
-					{
-						$scinfo = preg_replace('#\$' . 'RCSfile: (.+?) \$#', '\\1', $scinfo);
-						$scinfo = preg_replace('#\$' . 'Revision: (.+?) \$#', 'CVS \\1', $scinfo);
-						$scinfo = preg_replace('#\$' . 'Id: (.+?) (.+?) [0-9]{4}/[0-9]{2}/[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} (.+?) (.+?) \$#', '\\1 - CVS \\2', $scinfo);
-					}
-					else if ($type == 'svn')
-					{
-						$scinfo = preg_replace('#\$' . '(Head)?URL: (.+?) \$#e', "end(explode('/', '\\2'))", $scinfo);
-						$scinfo = preg_replace('#\$' . '(LastModified)?Revision: (.+?) \$#', 'SVN \\2', $scinfo);
-						$scinfo = preg_replace('#\$' . 'Id: (.+?) ([0-9].+?) [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}(.+?) (.+?) \$#', '\\1 - SVN \\2', $scinfo);
-					}
-					else
-					{
-						$scinfo = 'Not Under Source Control';
-					}
-					break;
+					$scinfo = 'Not Under Source Control';
+				}
+				else
+				{
+					$scinfo = preg_replace('#\$' . '(Head)?URL: (.+?) \$#e', "end(explode('/', '\\2'))", $scinfo);
+					$scinfo = preg_replace('#\$' . '(LastModified)?Revision: (.+?) \$#', 'SVN \\2', $scinfo);
+					$scinfo = preg_replace('#\$' . 'Id: (.+?) ([0-9].+?) [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}(.+?) (.+?) \$#', '\\1 - SVN \\2', $scinfo);
 				}
 			}
+			
 			$scinfo = trim($scinfo);			
 			$debug .= "\n\t<li><strong>Source Control:</strong> $scinfo</li>";
 			
 			// query information
-			if (is_object($this->registry->modules['db_mysql']))
+			if (is_object($this->modules['db_mysql']))
 			{
-				$debug .= "\n\t<li><strong>Total Queries:</strong> " . sizeof($this->registry->modules['db_mysql']->history) . " (<a href=\"" . $this->registry->sanitize($_SERVER['REQUEST_URI']) . ((strpos($_SERVER['REQUEST_URI'], '?') !== false) ? '&amp;query=1' : '?query=1') . "\">?</a>)</li>";
+				$debug .= "\n\t<li><strong>Total Queries:</strong> " . sizeof($this->modules['db_mysql']->history) . " (<a href=\"" . $this->sanitize($_SERVER['REQUEST_URI']) . ((strpos($_SERVER['REQUEST_URI'], '?') !== false) ? '&amp;query=1' : '?query=1') . "\">?</a>)</li>";
 			}
 			
 			// total execution time
 			if (defined('ISSO_MT_START'))
 			{
 				$this->registry->load('functions', 'functions');
-				$debug .= "\n\t<li><strong>Total Execution Time:</strong> " . round($this->registry->modules['functions']->fetch_microtime_diff(ISSO_MT_START), 10) . "</li>";
+				$debug .= "\n\t<li><strong>Total Execution Time:</strong> " . round($this->modules['functions']->fetch_microtime_diff(ISSO_MT_START), 10) . "</li>";
 			}
 			
 			// debug notices
-			$debug .= "\n\t<li>\n\t\t<select>\n\t\t\t<option>Debug Notices (" . sizeof($this->registry->debuginfo) . ")</option>";
-			foreach ((array)$this->registry->debuginfo AS $msg)
+			$debug .= "\n\t<li>\n\t\t<select>\n\t\t\t<option>Debug Notices (" . sizeof($this->debuginfo) . ")</option>";
+			foreach ((array)$this->debuginfo AS $msg)
 			{
 				$debug .= "\n\t\t\t<option>--- $msg</option>";
 			}
 			$debug .= "\n\t\t</select>\n\t</li>";
 			
 			// loaded modules
-			$modules = $this->registry->show_modules(true);
+			$modules = $this->show_modules(true);
 			$debug .= "\n\t<li>\n\t\t<select>\n\t\t\t<option>Loaded Modules (" . sizeof($modules) . ")</option>";
 			foreach ($modules AS $mod)
 			{
@@ -949,7 +917,7 @@ class Shared_Object_Framework
 			// template usage
 			if ($dotemplates)
 			{
-				$debug .= "\n\t<li>\n\t\t<select>\n\t\t\t<option>Template Usage (" . array_sum($this->usage) . ")</option>";
+				$debug .= "\n\t<li>\n\t\t<select>\n\t\t\t<option>Template Usage (" . array_sum($tpl_obj->usage) . ")</option>";
 				foreach ($usage AS $tpl)
 				{
 					$debug .= "\n\t\t\t<option>--- $tpl</option>";
@@ -957,11 +925,9 @@ class Shared_Object_Framework
 				$debug .= "\n\t\t</select>\n\t</li>";
 			}
 			
-			// --- END
 			$debug .= "\n</ul>";
 			
-			$debug = "\n<hr />\n" . $this->registry->message('Debug Information', $debug, 1, true, false);
-			$template = str_replace('</body>', "\n\n<!-- dev debug -->\n<div align=\"center\">\n$debug\n</div>\n<!-- / dev debug -->\n\n</body>", $template);
+			$debug = "\n\n<!-- dev debug -->\n<div align=\"center\">\n\n<hr />\n" . $this->message('Debug Information', $debug, 1, true, false) . "\n</div>\n<!-- / dev debug -->\n\n";
 		}
 		
 		return $debug;
diff --git a/printer.php b/printer.php
index 8f4ae4d..e21b868 100644
--- a/printer.php
+++ b/printer.php
@@ -364,111 +364,8 @@ JS;
 		{
 			echo "\n<!-- page end -->\n</div>";
 		}
-
-		if ($this->registry->debug)
-		{
-			// source control
-			$scinfo = 'Not Under Source Control';
-			$possiblescms = array('cvs', 'svn', 'cvs_information', 'svn_information', 'scm', 'sc_information', 'scm_information');
-			foreach ($possiblescms AS $scm)
-			{
-				if (defined(strtoupper($scm)))
-				{
-					$scinfo = constant(strtoupper($scm));
-					
-					$type = '';					
-					// CVS
-					if (strpos($scinfo, 'RCSfile:') !== false)
-					{
-						$type = 'cvs';
-					}
-					else if (strpos($scinfo, ',v ') !== false)
-					{
-						$type = 'cvs';
-					}
-					// SVN
-					else if (strpos($scinfo, 'URL:') !== false)
-					{
-						$type = 'svn';
-					}
-					else if (strpos($scinfo, 'https://') !== false OR strpos($scinfo, 'http://') !== false)
-					{
-						$type= 'svn';
-					}
-					// not found so just return it
-					// try a SVN ID tag as we can't really tell if we're using it
-					else
-					{
-						$test = preg_replace('#\$' . 'Id: (.+?) (.+?) [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}(.+?) (.+?) \$#', '\\1 - SVN \\2', $scinfo);
-						if ($test == '$' . 'Id: $')
-						{
-							$scinfo = 'Not Under Source Control';	
-						}
-						else
-						{
-							$scinfo = $test;
-						}
-						break;
-					}
-					
-					if ($type == 'cvs')
-					{
-						$scinfo = preg_replace('#\$' . 'RCSfile: (.+?) \$#', '\\1', $scinfo);
-						$scinfo = preg_replace('#\$' . 'Revision: (.+?) \$#', 'CVS \\1', $scinfo);
-						$scinfo = preg_replace('#\$' . 'Id: (.+?) (.+?) [0-9]{4}/[0-9]{2}/[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} (.+?) (.+?) \$#', '\\1 - CVS \\2', $scinfo);
-					}
-					else if ($type == 'svn')
-					{
-						$scinfo = preg_replace('#\$' . '(Head)?URL: (.+?) \$#e', "end(explode('/', '\\2'))", $scinfo);
-						$scinfo = preg_replace('#\$' . '(LastModified)?Revision: (.+?) \$#', 'SVN \\2', $scinfo);
-						$scinfo = preg_replace('#\$' . 'Id: (.+?) ([0-9].+?) [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}(.+?) (.+?) \$#', '\\1 - SVN \\2', $scinfo);
-					}
-					else
-					{
-						$scinfo = 'Not Under Source Control';
-					}
-					break;
-				}
-			}
-			$scinfo = trim($scinfo);
-			$debug = "\n\t<li><strong>Source Control:</strong> $scinfo</li>";
-			
-			// query information
-			if (is_object($this->registry->modules['db_mysql']))
-			{
-				$debug .= "\n\t<li><strong>Total Queries:</strong> " . sizeof($this->registry->modules['db_mysql']->history) . " (<a href=\"" . $this->registry->sanitize($_SERVER['REQUEST_URI']) . ((strpos($_SERVER['REQUEST_URI'], '?') !== false) ? '&amp;query=1' : '?query=1') . "\">?</a>)</li>";
-			}
-			
-			// total execution time
-			if (defined('ISSO_MT_START'))
-			{
-				$this->registry->load('functions', 'functions');
-				$debug .= "\n\t<li><strong>Total Execution Time:</strong> " . round($this->registry->modules['functions']->fetch_microtime_diff(ISSO_MT_START), 10) . "</li>";
-			}
-			
-			// debug notices
-			$debug .= "\n\t<li>\n\t\t<select>\n\t\t\t<option>Debug Notices (" . sizeof($this->registry->debuginfo) . ")</option>";
-			foreach ((array)$this->registry->debuginfo AS $msg)
-			{
-				$debug .= "\n\t\t\t<option>--- $msg</option>";
-			}
-			$debug .= "\n\t\t</select>\n\t</li>";
-			
-			// loaded modules
-			$modules = $this->registry->show_modules(true);
-			$debug .= "\n\t<li>\n\t\t<select>\n\t\t\t<option>Loaded Modules (" . sizeof($modules) . ")</option>";
-			foreach ($modules AS $mod)
-			{
-				$debug .= "\n\t\t\t<option>--- $mod</option>";
-			}
-			$debug .= "\n\t\t</select>\n\t</li>";
-						
-			// --- END
-			$debug .= "\n</ul>";
-			
-			$debug = "\n<hr />\n" . $this->registry->message('Debug Information', $debug, 1, true, false);
-			echo "\n\n<!-- dev debug -->\n<div align=\"center\">\n$debug\n</div>\n<!-- / dev debug -->\n\n";
-		}
+		
+		echo $this->registry->construct_debug_block(false);
 		
 		echo "\n\n</body>\n</html>";
 		
diff --git a/template.php b/template.php
index 78c8484..009bb7a 100644
--- a/template.php
+++ b/template.php
@@ -223,140 +223,8 @@ class Template
 			exit;
 		}
 		
-		if ($this->registry->debug)
-		{
-			// --- START
-			$debug = "\n<ul>";
-			
-			// templates
-			$optlist = array();
-			$usage = array();
-			foreach ($this->usage AS $name => $count)
-			{
-				if (in_array($name, $this->uncached))
-				{
-					$optlist[] = $name . '[' . $count . ']';
-				}
-				$usage[] = $name . " ($count)";
-			}
-			
-			$sizeof = sizeof($this->uncached);
-			if ($sizeof > 0)
-			{
-				$debug .= "\n\t<li><strong style=\"color: red\">Uncached Template(s):</strong> $sizeof ( " . implode(' &nbsp; ', $optlist) . " )</li>";
-			}
-			
-			// source control
-			$scinfo = 'Not Under Source Control';
-			$possiblescms = array('cvs', 'svn', 'cvs_information', 'svn_information', 'scm', 'sc_information', 'scm_information');
-			foreach ($possiblescms AS $scm)
-			{
-				if (defined(strtoupper($scm)))
-				{
-					$scinfo = constant(strtoupper($scm));
-					
-					$type = '';					
-					// CVS
-					if (strpos($scinfo, 'RCSfile:') !== false)
-					{
-						$type = 'cvs';
-					}
-					else if (strpos($scinfo, ',v ') !== false)
-					{
-						$type = 'cvs';
-					}
-					// SVN
-					else if (strpos($scinfo, 'URL:') !== false)
-					{
-						$type = 'svn';
-					}
-					else if (strpos($scinfo, 'https://') !== false OR strpos($scinfo, 'http://') !== false)
-					{
-						$type= 'svn';
-					}
-					// not found so just return it
-					// try a SVN ID tag as we can't really tell if we're using it
-					else
-					{
-						$test = preg_replace('#\$' . 'Id: (.+?) (.+?) [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}(.+?) (.+?) \$#', '\\1 - SVN \\2', $scinfo);
-						if ($test == '$' . 'Id: $')
-						{
-							$scinfo = 'Not Under Source Control';	
-						}
-						else
-						{
-							$scinfo = $test;
-						}
-						break;
-					}
-					
-					if ($type == 'cvs')
-					{
-						$scinfo = preg_replace('#\$' . 'RCSfile: (.+?) \$#', '\\1', $scinfo);
-						$scinfo = preg_replace('#\$' . 'Revision: (.+?) \$#', 'CVS \\1', $scinfo);
-						$scinfo = preg_replace('#\$' . 'Id: (.+?) (.+?) [0-9]{4}/[0-9]{2}/[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} (.+?) (.+?) \$#', '\\1 - CVS \\2', $scinfo);
-					}
-					else if ($type == 'svn')
-					{
-						$scinfo = preg_replace('#\$' . '(Head)?URL: (.+?) \$#e', "end(explode('/', '\\2'))", $scinfo);
-						$scinfo = preg_replace('#\$' . '(LastModified)?Revision: (.+?) \$#', 'SVN \\2', $scinfo);
-						$scinfo = preg_replace('#\$' . 'Id: (.+?) ([0-9].+?) [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}(.+?) (.+?) \$#', '\\1 - SVN \\2', $scinfo);
-					}
-					else
-					{
-						$scinfo = 'Not Under Source Control';
-					}
-					break;
-				}
-			}
-			$scinfo = trim($scinfo);			
-			$debug .= "\n\t<li><strong>Source Control:</strong> $scinfo</li>";
-			
-			// query information
-			if (is_object($this->registry->modules['db_mysql']))
-			{
-				$debug .= "\n\t<li><strong>Total Queries:</strong> " . sizeof($this->registry->modules['db_mysql']->history) . " (<a href=\"" . $this->registry->sanitize($_SERVER['REQUEST_URI']) . ((strpos($_SERVER['REQUEST_URI'], '?') !== false) ? '&amp;query=1' : '?query=1') . "\">?</a>)</li>";
-			}
-			
-			// total execution time
-			if (defined('ISSO_MT_START'))
-			{
-				$this->registry->load('functions', 'functions');
-				$debug .= "\n\t<li><strong>Total Execution Time:</strong> " . round($this->registry->modules['functions']->fetch_microtime_diff(ISSO_MT_START), 10) . "</li>";
-			}
-			
-			// debug notices
-			$debug .= "\n\t<li>\n\t\t<select>\n\t\t\t<option>Debug Notices (" . sizeof($this->registry->debuginfo) . ")</option>";
-			foreach ((array)$this->registry->debuginfo AS $msg)
-			{
-				$debug .= "\n\t\t\t<option>--- $msg</option>";
-			}
-			$debug .= "\n\t\t</select>\n\t</li>";
-			
-			// loaded modules
-			$modules = $this->registry->show_modules(true);
-			$debug .= "\n\t<li>\n\t\t<select>\n\t\t\t<option>Loaded Modules (" . sizeof($modules) . ")</option>";
-			foreach ($modules AS $mod)
-			{
-				$debug .= "\n\t\t\t<option>--- $mod</option>";
-			}
-			$debug .= "\n\t\t</select>\n\t</li>";
-			
-			// template usage
-			$debug .= "\n\t<li>\n\t\t<select>\n\t\t\t<option>Template Usage (" . array_sum($this->usage) . ")</option>";
-			foreach ($usage AS $tpl)
-			{
-				$debug .= "\n\t\t\t<option>--- $tpl</option>";
-			}
-			$debug .= "\n\t\t</select>\n\t</li>";
-						
-			// --- END
-			$debug .= "\n</ul>";
-			
-			$debug = "\n<hr />\n" . $this->registry->message('Debug Information', $debug, 1, true, false);
-			$template = str_replace('</body>', "\n\n<!-- dev debug -->\n<div align=\"center\">\n$debug\n</div>\n<!-- / dev debug -->\n\n</body>", $template);
-		}
-		
+		$template = str_replace('</body>', $this->registry->construct_debug_block(true) . '</body>', $template);
+
 		print($template);
 	}
 	
-- 
2.43.5