From 40d5f295e6729fded3df2fa38fab45d69bfe8884 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Sat, 15 Jan 2005 22:11:07 +0000
Subject: [PATCH] Added advanced SCM debug information.

---
 template.php | 67 +++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 59 insertions(+), 8 deletions(-)

diff --git a/template.php b/template.php
index c3307cd..98d3378 100644
--- a/template.php
+++ b/template.php
@@ -153,19 +153,21 @@ class DB_Template
 		
 		if ($_isso->debug)
 		{
+			// --- START
+			$debug = "\n<ul>";
+			
+			// templates
 			$optlist = array();
+			$usage = array();
 			foreach ($this->usage AS $name => $count)
 			{
-				if (isset($this->uncached["$name"]))
+				if (in_array($name, $this->uncached))
 				{
 					$optlist[] = $name . '[' . $count . ']';
 				}
+				$usage[] = $name . " ($count)";
 			}
 			
-			// --- START
-			$debug = "\n<ul>";
-			
-			// template usage
 			$sizeof = sizeof($this->uncached);
 			if ($sizeof > 0)
 			{
@@ -180,9 +182,50 @@ class DB_Template
 				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
+					{
+						$scinfo = 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);
+						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);
+					}
 					break;
 				}
 			}
+			$scinfo = trim($scinfo);			
 			$debug .= "\n\t<li><strong>Source Control:</strong> $scinfo</li>";
 			
 			// query information
@@ -192,7 +235,7 @@ class DB_Template
 			$debug .= "\n\t<li>\n\t\t<select>\n\t\t\t<option>Debug Notices (" . sizeof($_isso->debuginfo) . ")</option>";
 			foreach ((array)$_isso->debuginfo AS $msg)
 			{
-				$debug .= "\n\t\t\t<option>$msg</option>";
+				$debug .= "\n\t\t\t<option>--- $msg</option>";
 			}
 			$debug .= "\n\t</select>\n\t</li>";
 			
@@ -201,15 +244,23 @@ class DB_Template
 			$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\t<option>--- $mod</option>";
 			}
 			$debug .= "\n\t</select>\n\t</li>";
+			
+			// template usage
+			$debug .= "\n\t<li>\n\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 .= "\b\t</select>\n\t</li>";
 						
 			// --- END
 			$debug .= "\n</ul>";
 			
 			$debug = "\n<hr />\n" . $_isso->_message('Debug Information', $debug, 1, true);
-			$template = str_replace('</body>', "\n\n<!-- dev debug -->$debug\n<!-- / dev debug -->\n\n</body>", $template);
+			$template = str_replace('</body>', "\n\n<!-- dev debug -->\n<div align=\"center\">\n$debug\n</div>\n<!-- / dev debug -->\n\n</body>", $template);
 		}
 		
 		print(stripslashes($template));
-- 
2.43.5