From b73d2a7e63323d16727bdf008dc49d7b93635b83 Mon Sep 17 00:00:00 2001
From: messju <messju@localhost>
Date: Fri, 16 Apr 2004 08:03:07 +0000
Subject: [PATCH] reverted stuff

---
 libs/core/core.assemble_plugin_filepath.php | 11 +++++------
 libs/core/core.read_cache_file.php          |  3 ---
 libs/core/core.write_file.php               |  4 +---
 libs/debug.tpl                              |  4 ++--
 libs/plugins/function.eval.php              |  2 +-
 libs/plugins/function.popup.php             |  4 +---
 libs/plugins/modifier.escape.php            |  7 +------
 libs/plugins/shared.make_timestamp.php      | 16 +++++++---------
 8 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/libs/core/core.assemble_plugin_filepath.php b/libs/core/core.assemble_plugin_filepath.php
index 48f6d2c4..cb8f5441 100644
--- a/libs/core/core.assemble_plugin_filepath.php
+++ b/libs/core/core.assemble_plugin_filepath.php
@@ -29,6 +29,11 @@ function smarty_core_assemble_plugin_filepath($params, &$smarty)
         // see if path is relative
         if (!preg_match("/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/", $_plugin_dir)) {
             $_relative_paths[] = $_plugin_dir;
+            // relative path, see if it is in the SMARTY_DIR
+            if (@is_readable(SMARTY_DIR . $_plugin_filepath)) {
+                $_return = SMARTY_DIR . $_plugin_filepath;
+                break;
+            }
         }
         // try relative to cwd (or absolute)
         if (@is_readable($_plugin_filepath)) {
@@ -50,12 +55,6 @@ function smarty_core_assemble_plugin_filepath($params, &$smarty)
                     $_return = $_params['new_file_path'];
                     break;
                 }
-                // maybe it is in the SMARTY_DIR
-                if (@is_readable(SMARTY_DIR . $_plugin_filepath)) {
-                    $_return = SMARTY_DIR . $_plugin_filepath;
-                    break;
-                }
-
             }
         }
     }
diff --git a/libs/core/core.read_cache_file.php b/libs/core/core.read_cache_file.php
index dcecc384..2ab42811 100644
--- a/libs/core/core.read_cache_file.php
+++ b/libs/core/core.read_cache_file.php
@@ -41,7 +41,6 @@ function smarty_core_read_cache_file(&$params, &$smarty)
         $_auto_id = $smarty->_get_auto_id($params['cache_id'], $params['compile_id']);
         $_cache_file = $smarty->_get_auto_filename($smarty->cache_dir, $params['tpl_file'], $_auto_id);
         $params['results'] = $smarty->_read_file($_cache_file);
-        # $params['results'] = file_get_contents($_cache_file);
     }
 
     if (empty($params['results'])) {
@@ -53,8 +52,6 @@ function smarty_core_read_cache_file(&$params, &$smarty)
     $cache_header = $cache_split[0];
 
     $_cache_info = unserialize($cache_header);
-    if (!isset($_cache_info['expires']))
-        $_cache_info['expires'] = time() + $smarty->cache_lifetime;
 
     if ($smarty->caching == 2 && isset ($_cache_info['expires'])){
         // caching by expiration time
diff --git a/libs/core/core.write_file.php b/libs/core/core.write_file.php
index 3adaf9e3..b4fa92e5 100644
--- a/libs/core/core.write_file.php
+++ b/libs/core/core.write_file.php
@@ -25,9 +25,7 @@ function smarty_core_write_file($params, &$smarty)
 
     // write to tmp file, then rename it to avoid
     // file locking race condition
-    # $_tmp_file = $_dirname . DIRECTORY_SEPARATOR . uniqid('');
-    $_tmp_file = tempnam($_dirname , '_tmp');
-    # $_tmp_file = $_dirname . DIRECTORY_SEPARATOR . uniqid('', true);
+    $_tmp_file = $_dirname . DIRECTORY_SEPARATOR . uniqid('');
 
     if (!($fd = @fopen($_tmp_file, 'w'))) {
         $smarty->trigger_error("problem writing temporary file '$_tmp_file'");
diff --git a/libs/debug.tpl b/libs/debug.tpl
index 4d04b8d0..01265fb4 100644
--- a/libs/debug.tpl
+++ b/libs/debug.tpl
@@ -29,14 +29,14 @@
 </BODY></HTML>
 {else}
 <SCRIPT language=javascript>
-	if( !self.name || ( self.name == '' ) ) {ldelim}
+	if( self.name == '' ) {ldelim}
 	   var title = 'Console';
 	{rdelim}
 	else {ldelim}
 	   var title = 'Console_' + self.name;
 	{rdelim}
 	_smarty_console = window.open("",title.value,"width=680,height=600,resizable,scrollbars=yes");
-	_smarty_console.document.write("<HTML><TITLE>Smarty Debug " +title+"</TITLE><BODY bgcolor=#ffffff>");
+	_smarty_console.document.write("<HTML><TITLE>Smarty Debug Console_"+self.name+"</TITLE><BODY bgcolor=#ffffff>");
 	_smarty_console.document.write("<table border=0 width=100%>");
 	_smarty_console.document.write("<tr bgcolor=#cccccc><th colspan=2>Smarty Debug Console</th></tr>");
 	_smarty_console.document.write("<tr bgcolor=#cccccc><td colspan=2><b>included templates & config files (load time in seconds):</b></td></tr>");
diff --git a/libs/plugins/function.eval.php b/libs/plugins/function.eval.php
index 7fde6749..3a4b8b2b 100644
--- a/libs/plugins/function.eval.php
+++ b/libs/plugins/function.eval.php
@@ -20,7 +20,7 @@
 function smarty_function_eval($params, &$smarty)
 {
 
-    if (!array_key_exists('var', $params)) {
+    if (!isset($params['var'])) {
         $smarty->trigger_error("eval: missing 'var' parameter");
         return;
     }
diff --git a/libs/plugins/function.popup.php b/libs/plugins/function.popup.php
index cdd167a4..80bd62aa 100644
--- a/libs/plugins/function.popup.php
+++ b/libs/plugins/function.popup.php
@@ -99,9 +99,7 @@ function smarty_function_popup($params, &$smarty)
 
     if (empty($trigger)) { $trigger = "onmouseover"; }
 
-    $retval = $trigger . '="' . htmlspecialchars(
-        'return overlib(\''.preg_replace(array("!'!","![\r\n]!"),
-                                         array("\'",'\r'),$text).'\'');
+    $retval = $trigger . '="return overlib(\''.preg_replace(array("!'!","![\r\n]!"),array("\'",'\r'),$text).'\'';
     $retval .= $append . ');" onmouseout="nd();"';
 
     return $retval;
diff --git a/libs/plugins/modifier.escape.php b/libs/plugins/modifier.escape.php
index 3681b7df..b4979554 100644
--- a/libs/plugins/modifier.escape.php
+++ b/libs/plugins/modifier.escape.php
@@ -51,12 +51,7 @@ function smarty_modifier_escape($string, $esc_type = 'html')
 
         case 'javascript':
             // escape quotes and backslashes and newlines
-            $return = strtr($string, array(
-                                "\x08" => '\\b', "\x09" => '\\t', "\n" => '\\n', 
-                                "\x0b" => '\\v', "\x0c" => '\\f', "\r" => '\\r', 
-                                '"' => '\\"', '\'' => '\\\'', '\\' => '\\\\'));
-
-            return preg_replace('!<(/\w)!', "<\\\\$1", $return);
+            return strtr($string, array('\\'=>'\\\\',"'"=>"\\'",'"'=>'\\"',"\r"=>'\\r',"\n"=>'\\n'));
 
         default:
             return $string;
diff --git a/libs/plugins/shared.make_timestamp.php b/libs/plugins/shared.make_timestamp.php
index ec1a7039..acdd7773 100644
--- a/libs/plugins/shared.make_timestamp.php
+++ b/libs/plugins/shared.make_timestamp.php
@@ -16,20 +16,18 @@
 function smarty_make_timestamp($string)
 {
     if(empty($string)) {
-        // now
-        $time = -1;
+        $string = "now";
+    }
+    $time = strtotime($string);
+    if (is_numeric($time) && $time != -1)
+        return $time;
 
-    } elseif (preg_match('/^\d{14}$/', $string)) {
-        // is mysql timestamp format of YYYYMMDDHHMMSS?
+    // is mysql timestamp format of YYYYMMDDHHMMSS?
+    if (preg_match('/^\d{14}$/', $string)) {
         $time = mktime(substr($string,8,2),substr($string,10,2),substr($string,12,2),
                substr($string,4,2),substr($string,6,2),substr($string,0,4));
 
         return $time;
-
-    } else {
-        $time = strtotime($string);
-        if (is_numeric($time) && $time != -1)
-            return $time;
     }
 
     // couldn't recognize it, try to return a time