From e237e1eebd66b30a1bb6734826ed5e3cd2ea1fd7 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Tue, 2 Aug 2005 04:36:22 +0000
Subject: [PATCH] Back-porting the trunk back onto branch

---
 functions.php |   9 ++-
 kernel.php    |   4 +-
 template.php  |  11 ++-
 xml.php       | 213 +++++++++++++++++++++++---------------------------
 4 files changed, 117 insertions(+), 120 deletions(-)

diff --git a/functions.php b/functions.php
index a3919bd..2ce67ae 100644
--- a/functions.php
+++ b/functions.php
@@ -112,8 +112,9 @@ class Functions
 	*
 	* @param	str		The text of the file to be streamed
 	* @param	str		File name of the new file
+	* @param	bool	Whether or not to die after streaming the file
 	*/
-	function download_file($file, $name)
+	function download_file($file, $name, $exit = true)
 	{
 		if ($this->is_browser('ie') OR $this->is_browser('opera') OR $this->is_browser('safari'))
 		{
@@ -132,7 +133,11 @@ class Functions
 		header('Pragma: public');
 		
 		print($file);
-		exit;
+		
+		if ($exit)
+		{
+			exit;
+		}
 	}
 	
 	/**
diff --git a/kernel.php b/kernel.php
index 3b6ddac..d2df2d4 100644
--- a/kernel.php
+++ b/kernel.php
@@ -328,8 +328,8 @@ class Shared_Object_Framework
 		}
 		
 		$output = "\n<br />\n<table cellpadding=\"4\" cellspacing=\"1\" border=\"0\" width=\"500\" style=\"background-color: $color; color: black; font-family: Verdana, sans-serif; font-size: 12px;\">";
-		$output .= "\n<tr style=\"color: $font\">\n\t<td><strong>$prefix: $title</strong></td>\n</tr>";
-		$output .= "\n<tr style=\"background-color: #FFFFFF\">\n\t<td>$message</td>\n</tr>\n</table>\n<br />\n";
+		$output .= "\n<tr style=\"color: $font; text-align: left\">\n\t<td><strong>$prefix: $title</strong></td>\n</tr>";
+		$output .= "\n<tr style=\"background-color: #FFFFFF; text-align: left\">\n\t<td>$message</td>\n</tr>\n</table>\n<br />\n";
 		
 		if ($return)
 		{
diff --git a/template.php b/template.php
index 03341ad..2a5a371 100644
--- a/template.php
+++ b/template.php
@@ -292,8 +292,15 @@ class DB_Template
 			$debug .= "\n\t<li><strong>Source Control:</strong> $scinfo</li>";
 			
 			// query information
-			$debug .= "\n\t<li><strong>Total Queries:</strong> " . sizeof($_isso->db->history) . " (<a href=\"" . $_isso->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($_isso->db->history) . " (<a href=\"" . $_isso->sanitize($_SERVER['REQUEST_URI']) . ((strpos($_SERVER['REQUEST_URI'], '?') !== false) ? '&amp;query=1' : '?query=1') . "\">?</a>)</li>";
+			
+			// total execution time
+			if (defined('ISSO_MT_START'))
+			{
+				$_isso->load('functions');
+				$debug .= "\n\t<li><strong>Total Execution Time:</strong> " . round($_isso->funct->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($_isso->debuginfo) . ")</option>";
 			foreach ((array)$_isso->debuginfo AS $msg)
diff --git a/xml.php b/xml.php
index dff2034..2a2a0ca 100644
--- a/xml.php
+++ b/xml.php
@@ -41,12 +41,6 @@ class XML_Parser
 	*/
 	var $parser = null;
 	
-	/**
-	* Array of all parsed tag data
-	* @var	array
-	*/
-	var $taginfo = array();
-	
 	/**
 	* An array of function names that are to be executed for each tag name (name => function)
 	* @var	array()
@@ -55,42 +49,28 @@ class XML_Parser
 	var $taghandler = array();
 	
 	/**
-	* Whether we should trim CDATA elements
-	* @var	bool
-	* @see	parse()
+	* Current CDATA value
+	* @var	string
 	*/
-	var $trimdata = true;
+	var $cdata = '';
 	
 	/**
-	* Attribute data parsed from the tags
+	* Tag stack of all open nodes
 	* @var	array
-	* @see	_tag_start()
-	*/
-	var $attrdata = array();
-	
-	/**
-	* Internal tracker for the current tag
-	* @var	int;
 	*/
-	var $tagid = -1;
+	var $stack = array();
 	
 	/**
-	* Internal tracker for the name of the current tag
-	* @var	str
-	*/
-	var $tagname = '';
-	
-	/**
-	* An internal tree to sort out the nesting of elements
+	* Node list for all open tag attributes
 	* @var	array
 	*/
-	var $tree = array();
+	var $attribs = array();
 	
 	/**
-	* Internal tracker for the tag above the current one
-	* @var	int
+	* Resulting parsed array
+	* @var	array
 	*/
-	var $parent = -1;
+	var $result = array();
 	
 	/**
 	* Parse an XML file
@@ -101,22 +81,19 @@ class XML_Parser
 	*/
 	function parse($data)
 	{
-		global $_isso;
-		
-		// reset all the parser data before starting
-		$this->taginfo = array();
-		$this->attrdata = array();
-		$this->tagid = -1;
-		$this->tagname = '';
-		$this->tree = array();
-		$this->parentid = -1;
-		
+		$this->stack = array();
+		$this->attribs = array();
+		$this->result = array();
+		$this->cdata = '';
+
 		// create a new parser
 		$this->parser = xml_parser_create();
 		xml_set_object($this->parser, $this);
 		xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);
-		xml_set_element_handler($this->parser, '_tag_start', '_tag_end');
-		xml_set_character_data_handler($this->parser, '_cdata');
+		xml_set_element_handler($this->parser, 'handle_tag_start', 'handle_tag_end');
+		xml_set_character_data_handler($this->parser, 'handle_cdata');
+		
+		$this->attach_node($this->result);
 		
 		// parse the data and check for errors
 		if (!xml_parse($this->parser, $data))
@@ -125,54 +102,15 @@ class XML_Parser
 			$error['string'] = xml_error_string($error['code']);
 			$error['line'] = xml_get_current_line_number($this->parser);
 			$error['column'] = xml_get_current_column_number($this->parser);
-			trigger_error(sprintf("XML Error: %s (%d) at line %d colunn %d", $error['string'], $error['code'], $error['line'], $error['column']), E_USER_ERROR);
+			trigger_error("XML Error: $error[string] at line $error[line] colunn $error[column]", E_USER_ERROR);
 			exit;
 		}
 		
 		// destroy the parser
 		xml_parser_free($this->parser);
 		
-		// data manipulation -- kind of resource intensive :-/
-		foreach ($this->taginfo AS $tagname => $parents)
-		{
-			foreach ($parents AS $parentid => $ids)
-			{
-				foreach ($ids AS $tagid => $data)
-				{
-					// trim data if necessary
-					if ($this->trimdata)
-					{
-						$_isso->debug("data trim: on");
-						if (($trimmed = trim($data)) != '')
-						{
-							$data = $trimmed;
-						}
-					}
-					
-					// if we have a data handler, operate it now
-					if (isset($this->taghandler["$tagname"]))
-					{
-						$_isso->debug("handler: " . $this->taghandler["$tagname"]);
-						if (function_exists($this->taghandler["$tagname"]))
-						{
-							$data = $this->taghandler["$tagname"]($data, $this);
-						}
-						else
-						{
-							trigger_error('Could not find the function [' . $this->taghandler["$tagname"] . '()] for the XML tag "' . $tagname . '"', E_USER_ERROR);
-						}
-					}
-					
-					$return["$tagid"] = array('tagid' => $tagid, 'tagname' => $tagname, 'parentid' => $parentid, 'attributes' => $this->attrdata["$tagid"], 'data' => $data);
-				}
-			}
-		}
-		
-		// place the normal order on things
-		ksort($return);
-		
 		// done... send the results back
-		return $return;
+		return $this->result;
 	}
 	
 	/**
@@ -182,28 +120,30 @@ class XML_Parser
 	* @param	str		Tag name
 	* @param	array	Tag attributes
 	*/
-	function _tag_start($parser, $name, $attributes)
+	function handle_tag_start(&$parser, $name, $attrs)
 	{
-		// we're opening a new tag
-		$this->tagid++;
-		$this->tagname = $name;
-		
-		// copy all tag attributes
-		array_walk($attributes, 'trim');
-		$this->attrdata[ $this->tagid ] = $attributes;
-		
-		// refocus the array
-		end($this->tree);
-		
-		// calculate the parent
-		$this->parent = current($this->tree);
-		$this->parent = (($this->parent === false) ? -1 : $this->parent);
-		
-		// add the current element onto the array
-		array_push($this->tree, $this->tagid);
-		
-		// initialize the data set
-		$this->taginfo["$name"][ $this->parent ][ $this->tagid ] = '';
+		// trim attributes
+		array_walk($attrs, 'trim');
+
+		// existing node set
+		if (isset($this->attribs["$name"]))
+		{
+			// node set has < 1 child nodes
+			if (!isset($this->attribs["$name"][0]))
+			{
+				$tmp = $this->attribs["$name"];
+				unset($this->attribs["$name"]);
+				$this->attribs["$name"][0] = $tmp;
+			}
+			
+			// create a new child node
+			$this->attach_node($this->attribs["$name"][] = (array)$attrs);
+		}
+		// node set doesn't exist, so create it
+		else
+		{
+			$this->attach_node($this->attribs["$name"] = (array)$attrs);
+		}
 	}
 	
 	/**
@@ -212,14 +152,9 @@ class XML_Parser
 	* @param	res		XML parser
 	* @param	str		CDATA from tag
 	*/
-	function _cdata($parser, $data)
+	function handle_cdata(&$parser, $data)
 	{
-		// read in the CDATA
-		if ($this->parent == $this->tagid AND !isset($this->taginfo[ $this->tagname ][ $this->parent ][ $this->tagid ]))
-		{
-			$this->taginfo[ $this->tagname ][ $this->parent ][ $this->tagid ] = '';
-		}
-		$this->taginfo[ $this->tagname ][ $this->parent ][ $this->tagid ] .= $data;
+		$this->cdata .= $data;
 	}
 	
 	/**
@@ -228,10 +163,60 @@ class XML_Parser
 	* @param	res		XML parser
 	* @param	str		Tag name
 	*/
-	function _tag_end($parser, $name)
+	function handle_tag_end(&$parser, $name)
+	{
+		global $_isso;
+		
+		// attach data to the node
+		if (($this->cdata = trim($this->cdata)) != '')
+		{
+			// if we have a data handler, operate it now
+			if (isset($this->taghandler["$name"]))
+			{
+				$_isso->debug("handler: " . $this->taghandler["$name"]);
+				if (function_exists($this->taghandler["$name"]))
+				{
+					$this->cdata = $this->taghandler["$name"]($this->cdata, $this);
+				}
+				else
+				{
+					trigger_error('Could not find the function [' . $this->taghandler["$name"] . '()] for the XML tag "' . $name . '"', E_USER_ERROR);
+				}
+			}
+			
+			$this->attribs['value'] = $this->cdata;
+		}
+		
+		$this->cdata = '';
+		
+		// remove the node
+		$this->detach_node();
+	}
+	
+	/**
+	* Shifts the node tree
+	*
+	* @param	array	Node to place into the stack
+	*/
+	function attach_node(&$node)
+	{
+		// create a new node
+		$this->stack[ count($this->stack) ] =& $node;
+		
+		// new attributes to work with
+		$this->attribs =& $node;
+	}
+	
+	/**
+	* Unshifts the node tree
+	*/
+	function detach_node()
 	{
-		// pop off the end element
-		array_pop($this->tree);
+		// drop the newest node
+		unset($this->stack[ count($this->stack) - 1 ]);
+		
+		// assign the attributes to the next newest node
+		$this->attribs =& $this->stack[ count($this->stack) - 1 ];
 	}
 }
 
-- 
2.22.5