From 2c44f6d4a3ef3d377376cc52bbd95b4d8353e94b Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Sat, 19 Mar 2005 05:01:45 +0000
Subject: [PATCH] IT WORKS... well... almost. <else /> doesn't YET.

---
 template.php | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/template.php b/template.php
index 3c6ea03..2f47480 100644
--- a/template.php
+++ b/template.php
@@ -392,11 +392,6 @@ class DB_Template
 	{
 		global $_isso;
 		
-		if (!$_isso->is_loaded('functions'))
-		{
-			$_isso->load('functions');
-		}
-		
 		// Tag data
 		$tag_start = '<if condition=\"';
 		$tag_start_end = '\">';
@@ -467,19 +462,18 @@ class DB_Template
 				
 				// save all the data for later so we can do a quick replacement
 				$parsed["$depth"]["$last"] = array(
+					'raw' => $fullspread,
 					'parsed' => '" . iff(' . stripslashes($expression) . ',"' . $conditional . '","") . "',
-					'start' => $last,
+					/*'start' => $last,
 					'end' => $end,
-					'unique' => '',
 					'length' => array(
-						'raw' => strlen($fullspread),
+						'raw' => $end - $last, //strlen($fullspread),
 						'new' => 0
-					)
+					)*/
 				);
-				$parsed["$depth"]["$last"]['unique'] = '<IFRUN>' . $_isso->funct->rand(strlen($parsed["$depth"]["$last"]['parsed']) - 15) . '</IFRUN>';
-				$parsed["$depth"]["$last"]['length']['new'] = strlen($parsed["$depth"]["$last"]['parsed']);
+				//$parsed["$depth"]["$last"]['length']['new'] = strlen($parsed["$depth"]["$last"]['parsed']);
 				
-				$temp =& $parsed["$depth"]["$last"];
+				//$temp =& $parsed["$depth"]["$last"];
 				
 				//$template = substr_replace($template, $temp['unique'], $temp['start'], $temp['end']);
 				
@@ -498,16 +492,17 @@ class DB_Template
 		//print_r($parsed);
 		
 		$offset = 0;
-		krsort($parsed);
+		ksort($parsed);
 		foreach ($parsed AS $depth => $conditionals)
 		{
-			krsort($conditionals);
+			ksort($conditionals);
 			//print_r($conditionals);
 			foreach ($conditionals AS $parsed)
 			{
-				print_r($parsed);
-				$template = substr_replace($template, $parsed['parsed'], $parsed['start'] - $offset, strlen($parsed['parsed']));
-				echo ' ' . $parsed['length']['raw'] - $parsed['length']['new'] . ' ';
+				$template = str_replace($parsed['raw'], $parsed['parsed'], $template);
+				//print_r($parsed);
+				//$template = substr_replace($template, $parsed['parsed'], $parsed['start'] - $offset, strlen($parsed['parsed']) + $offset);
+				//$offset += 2 * ($parsed['length']['raw'] - $parsed['length']['new']);
 				//$template = str_replace($conditional['unique'], $conditional['parsed'], $template);
 			}
 		}
-- 
2.43.5