update misc changes

This commit is contained in:
mohrt
2002-02-21 17:14:10 +00:00
parent 18a148586c
commit 4a77dab318
8 changed files with 16 additions and 23 deletions

View File

@@ -3,7 +3,7 @@
/** /**
* Config_File class. * Config_File class.
* *
* @version 1.5.2 * @version 2.0
* @author Andrei Zmievski <andrei@php.net> * @author Andrei Zmievski <andrei@php.net>
* @access public * @access public
* *

3
NEWS
View File

@@ -1,3 +1,6 @@
Version 2.0
-----------
- removed $tpl_file_ext variable, no longer used (Monte)
- added "hex" and "hexentity" attributes to escape modifier (Monte) - added "hex" and "hexentity" attributes to escape modifier (Monte)
- removed dependency on PEAR. (Andrei) - removed dependency on PEAR. (Andrei)
- update popup_init to accept src attribute. (Monte, Duncan Forrest) - update popup_init to accept src attribute. (Monte, Duncan Forrest)

View File

@@ -5,7 +5,7 @@
* Author: Monte Ohrt <monte@ispi.net> * Author: Monte Ohrt <monte@ispi.net>
* Andrei Zmievski <andrei@php.net> * Andrei Zmievski <andrei@php.net>
* *
* Version: 1.5.2 * Version: 2.0
* Copyright: 2001,2002 ispi of Lincoln, Inc. * Copyright: 2001,2002 ispi of Lincoln, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -101,8 +101,6 @@ class Smarty
var $default_template_handler_func = ''; // function to handle missing templates var $default_template_handler_func = ''; // function to handle missing templates
var $tpl_file_ext = '.tpl'; // template file extention (deprecated)
var $php_handling = SMARTY_PHP_PASSTHRU; var $php_handling = SMARTY_PHP_PASSTHRU;
// how smarty handles php tags in the templates // how smarty handles php tags in the templates
// possible values: // possible values:
@@ -159,7 +157,7 @@ class Smarty
var $_conf_obj = null; // configuration object var $_conf_obj = null; // configuration object
var $_config = array(); // loaded configuration settings var $_config = array(); // loaded configuration settings
var $_smarty_md5 = 'f8d698aea36fcbead2b9d5359ffca76f'; // md5 checksum of the string 'Smarty' var $_smarty_md5 = 'f8d698aea36fcbead2b9d5359ffca76f'; // md5 checksum of the string 'Smarty'
var $_version = '1.5.2'; // Smarty version number var $_version = '2.0'; // Smarty version number
var $_extract = false; // flag for custom functions var $_extract = false; // flag for custom functions
var $_inclusion_depth = 0; // current template inclusion depth var $_inclusion_depth = 0; // current template inclusion depth
var $_compile_id = null; // for different compiled templates var $_compile_id = null; // for different compiled templates
@@ -488,10 +486,8 @@ class Smarty
\*======================================================================*/ \*======================================================================*/
function fetch($_smarty_tpl_file, $_smarty_cache_id = null, $_smarty_compile_id = null, $_smarty_display = false) function fetch($_smarty_tpl_file, $_smarty_cache_id = null, $_smarty_compile_id = null, $_smarty_display = false)
{ {
global $HTTP_SERVER_VARS, $QUERY_STRING, $HTTP_COOKIE_VARS;
if (!$this->debugging && $this->debugging_ctrl == 'URL' if (!$this->debugging && $this->debugging_ctrl == 'URL'
&& strstr($QUERY_STRING, $this->_smarty_debug_id)) { && strstr($GLOBALS['QUERY_STRING'], $this->_smarty_debug_id)) {
$this->debugging = true; $this->debugging = true;
} }
@@ -526,8 +522,7 @@ class Smarty
$_smarty_results .= $this->_generate_debug_output(); $_smarty_results .= $this->_generate_debug_output();
} }
if ($this->cache_modified_check) { if ($this->cache_modified_check) {
global $HTTP_IF_MODIFIED_SINCE; $last_modified_date = substr($GLOBALS['HTTP_IF_MODIFIED_SINCE'], 0, strpos($GLOBALS['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3);
$last_modified_date = substr($HTTP_IF_MODIFIED_SINCE, 0, strpos($HTTP_IF_MODIFIED_SINCE, 'GMT') + 3);
$gmt_mtime = gmdate('D, d M Y H:i:s', $this->_cache_info['timestamp']).' GMT'; $gmt_mtime = gmdate('D, d M Y H:i:s', $this->_cache_info['timestamp']).' GMT';
if (@count($this->_cache_info['insert_tags']) == 0 if (@count($this->_cache_info['insert_tags']) == 0
&& $gmt_mtime == $last_modified_date) { && $gmt_mtime == $last_modified_date) {

View File

@@ -6,7 +6,7 @@
* Author: Monte Ohrt <monte@ispi.net> * Author: Monte Ohrt <monte@ispi.net>
* Andrei Zmievski <andrei@php.net> * Andrei Zmievski <andrei@php.net>
* *
* Version: 1.5.2 * Version: 2.0
* Copyright: 2001,2002 ispi of Lincoln, Inc. * Copyright: 2001,2002 ispi of Lincoln, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or

View File

@@ -14,7 +14,7 @@
<address><email>andrei@php.net</email></address> <address><email>andrei@php.net</email></address>
</affiliation> </affiliation>
</author> </author>
<edition>Version 1.5.2</edition> <edition>Version 2.0</edition>
<copyright><year>2001</year><holder>ispi of Lincoln, Inc.</holder></copyright> <copyright><year>2001</year><holder>ispi of Lincoln, Inc.</holder></copyright>
</bookinfo> </bookinfo>
<chapter> <chapter>

View File

@@ -3,7 +3,7 @@
/** /**
* Config_File class. * Config_File class.
* *
* @version 1.5.2 * @version 2.0
* @author Andrei Zmievski <andrei@php.net> * @author Andrei Zmievski <andrei@php.net>
* @access public * @access public
* *

View File

@@ -5,7 +5,7 @@
* Author: Monte Ohrt <monte@ispi.net> * Author: Monte Ohrt <monte@ispi.net>
* Andrei Zmievski <andrei@php.net> * Andrei Zmievski <andrei@php.net>
* *
* Version: 1.5.2 * Version: 2.0
* Copyright: 2001,2002 ispi of Lincoln, Inc. * Copyright: 2001,2002 ispi of Lincoln, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@@ -101,8 +101,6 @@ class Smarty
var $default_template_handler_func = ''; // function to handle missing templates var $default_template_handler_func = ''; // function to handle missing templates
var $tpl_file_ext = '.tpl'; // template file extention (deprecated)
var $php_handling = SMARTY_PHP_PASSTHRU; var $php_handling = SMARTY_PHP_PASSTHRU;
// how smarty handles php tags in the templates // how smarty handles php tags in the templates
// possible values: // possible values:
@@ -159,7 +157,7 @@ class Smarty
var $_conf_obj = null; // configuration object var $_conf_obj = null; // configuration object
var $_config = array(); // loaded configuration settings var $_config = array(); // loaded configuration settings
var $_smarty_md5 = 'f8d698aea36fcbead2b9d5359ffca76f'; // md5 checksum of the string 'Smarty' var $_smarty_md5 = 'f8d698aea36fcbead2b9d5359ffca76f'; // md5 checksum of the string 'Smarty'
var $_version = '1.5.2'; // Smarty version number var $_version = '2.0'; // Smarty version number
var $_extract = false; // flag for custom functions var $_extract = false; // flag for custom functions
var $_inclusion_depth = 0; // current template inclusion depth var $_inclusion_depth = 0; // current template inclusion depth
var $_compile_id = null; // for different compiled templates var $_compile_id = null; // for different compiled templates
@@ -488,10 +486,8 @@ class Smarty
\*======================================================================*/ \*======================================================================*/
function fetch($_smarty_tpl_file, $_smarty_cache_id = null, $_smarty_compile_id = null, $_smarty_display = false) function fetch($_smarty_tpl_file, $_smarty_cache_id = null, $_smarty_compile_id = null, $_smarty_display = false)
{ {
global $HTTP_SERVER_VARS, $QUERY_STRING, $HTTP_COOKIE_VARS;
if (!$this->debugging && $this->debugging_ctrl == 'URL' if (!$this->debugging && $this->debugging_ctrl == 'URL'
&& strstr($QUERY_STRING, $this->_smarty_debug_id)) { && strstr($GLOBALS['QUERY_STRING'], $this->_smarty_debug_id)) {
$this->debugging = true; $this->debugging = true;
} }
@@ -526,8 +522,7 @@ class Smarty
$_smarty_results .= $this->_generate_debug_output(); $_smarty_results .= $this->_generate_debug_output();
} }
if ($this->cache_modified_check) { if ($this->cache_modified_check) {
global $HTTP_IF_MODIFIED_SINCE; $last_modified_date = substr($GLOBALS['HTTP_IF_MODIFIED_SINCE'], 0, strpos($GLOBALS['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3);
$last_modified_date = substr($HTTP_IF_MODIFIED_SINCE, 0, strpos($HTTP_IF_MODIFIED_SINCE, 'GMT') + 3);
$gmt_mtime = gmdate('D, d M Y H:i:s', $this->_cache_info['timestamp']).' GMT'; $gmt_mtime = gmdate('D, d M Y H:i:s', $this->_cache_info['timestamp']).' GMT';
if (@count($this->_cache_info['insert_tags']) == 0 if (@count($this->_cache_info['insert_tags']) == 0
&& $gmt_mtime == $last_modified_date) { && $gmt_mtime == $last_modified_date) {

View File

@@ -6,7 +6,7 @@
* Author: Monte Ohrt <monte@ispi.net> * Author: Monte Ohrt <monte@ispi.net>
* Andrei Zmievski <andrei@php.net> * Andrei Zmievski <andrei@php.net>
* *
* Version: 1.5.2 * Version: 2.0
* Copyright: 2001,2002 ispi of Lincoln, Inc. * Copyright: 2001,2002 ispi of Lincoln, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or