smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-04 18:34:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix bug with URL controlled debugging, works now (Monte)

Browse Source
This commit is contained in:
mohrt
2001-08-03 19:59:29 +00:00
parent 4e03665cc1
commit 8a74d27767
4 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
FAQ
View File

@@ -140,6 +140,9 @@ A: The easiest thing to do is grab all of PEAR and install it locally for your
directory. There won't be a version of Smarty that runs without PEAR, as it directory. There won't be a version of Smarty that runs without PEAR, as it
dependant on it, and may become moreso in the future. dependant on it, and may become moreso in the future.
Q: Javascript is causing Smarty errors in my templates.
A: Surround your javascript with {literal}{/literal} tags. See the docs.
DREAMWEAVER DREAMWEAVER
----------- -----------

1
NEWS
View File

@@ -1,3 +1,4 @@
- fixed syntax error when including a non-existant template with security enabled (Monte)
- fixed comments handling to allow commenting out template blocks. (Andrei) - fixed comments handling to allow commenting out template blocks. (Andrei)
- implemented named capture buffers, with results accessible via - implemented named capture buffers, with results accessible via
$smarty.capture.<name>. (Andrei) $smarty.capture.<name>. (Andrei)

23
Smarty.class.php
View File

@@ -116,12 +116,13 @@ class Smarty
var $security = false; // enable template security (default false) var $security = false; // enable template security (default false)
var $secure_dir = array('./templates'); // array of directories considered secure var $secure_dir = array('./templates'); // array of directories considered secure
var $secure_ext = array('.tpl'); // array of file extentions considered secure
var $security_settings = array( var $security_settings = array(
'PHP_HANDLING' => false, 'PHP_HANDLING' => false,
'IF_FUNCS' => array('array', 'list', 'IF_FUNCS' => array('array', 'list',
'isset', 'empty', 'isset', 'empty',
'count', 'sizeof', 'count', 'sizeof',
'in_array'), 'in_array','is_array'),
'INCLUDE_ANY' => false, 'INCLUDE_ANY' => false,
'PHP_TAGS' => false, 'PHP_TAGS' => false,
'MODIFIER_FUNCS' => array('count') 'MODIFIER_FUNCS' => array('count')
@@ -193,6 +194,7 @@ class Smarty
var $_extract = false; // flag for custom functions var $_extract = false; // flag for custom functions
var $_included_tpls = array(); // list of run-time included templates var $_included_tpls = array(); // list of run-time included templates
var $_inclusion_depth = 0; // current template inclusion depth var $_inclusion_depth = 0; // current template inclusion depth
var $_smarty_debug_id = 'SMARTY_DEBUG'; // id in query string to turn on debug mode
/*======================================================================*\ /*======================================================================*\
@@ -602,7 +604,7 @@ class Smarty
if ($display) { if ($display) {
if (isset($results)) { echo $results; } if (isset($results)) { echo $results; }
if ($this->debugging || ($this->debugging_ctrl == 'URL' && (!empty($QUERY_STRING) && strstr('SMARTY_DEBUG',$QUERY_STRING)))) { echo $this->_generate_debug_output(); } if ($this->debugging || ($this->debugging_ctrl == 'URL' && (!empty($QUERY_STRING) && strstr($QUERY_STRING,$this->_smarty_debug_id)))) { echo $this->_generate_debug_output(); }
return; return;
} else { } else {
if (isset($results)) { return $results; } if (isset($results)) { return $results; }
@@ -773,7 +775,15 @@ function _generate_debug_output() {
// relative pathname to $template_dir // relative pathname to $template_dir
$resource_name = $this->template_dir.'/'.$resource_name; $resource_name = $this->template_dir.'/'.$resource_name;
} }
if (file_exists($resource_name) && is_readable($resource_name)) {
$template_source = $this->_read_file($resource_name);
$template_timestamp = filemtime($resource_name);
} else {
$this->_trigger_error_msg("unable to read template resource: \"$tpl_path\"");
return false;
}
// if security is on, make sure template comes from a $secure_dir // if security is on, make sure template comes from a $secure_dir
if ($this->security && !$this->security_settings['INCLUDE_ANY']) { if ($this->security && !$this->security_settings['INCLUDE_ANY']) {
$resource_is_secure = false; $resource_is_secure = false;
foreach ($this->secure_dir as $curr_dir) { foreach ($this->secure_dir as $curr_dir) {
@@ -787,14 +797,6 @@ function _generate_debug_output() {
return false; return false;
} }
} }
if (file_exists($resource_name) && is_readable($resource_name)) {
$template_source = $this->_read_file($resource_name);
$template_timestamp = filemtime($resource_name);
return true;
} else {
$this->_trigger_error_msg("unable to read template resource: \"$tpl_path\"");
return false;
}
break; break;
default: default:
if (isset($this->resource_funcs[$resource_type])) { if (isset($this->resource_funcs[$resource_type])) {
@@ -843,6 +845,7 @@ function _generate_debug_output() {
$smarty_compiler->compiler_funcs = $this->compiler_funcs; $smarty_compiler->compiler_funcs = $this->compiler_funcs;
$smarty_compiler->security = $this->security; $smarty_compiler->security = $this->security;
$smarty_compiler->secure_dir = $this->secure_dir; $smarty_compiler->secure_dir = $this->secure_dir;
$smarty_compiler->secure_ext = $this->secure_ext;
$smarty_compiler->security_settings = $this->security_settings; $smarty_compiler->security_settings = $this->security_settings;
if ($smarty_compiler->_compile_file($tpl_file, $template_source, $template_compiled)) if ($smarty_compiler->_compile_file($tpl_file, $template_source, $template_compiled))

23
libs/Smarty.class.php
View File

@@ -116,12 +116,13 @@ class Smarty
var $security = false; // enable template security (default false) var $security = false; // enable template security (default false)
var $secure_dir = array('./templates'); // array of directories considered secure var $secure_dir = array('./templates'); // array of directories considered secure
var $secure_ext = array('.tpl'); // array of file extentions considered secure
var $security_settings = array( var $security_settings = array(
'PHP_HANDLING' => false, 'PHP_HANDLING' => false,
'IF_FUNCS' => array('array', 'list', 'IF_FUNCS' => array('array', 'list',
'isset', 'empty', 'isset', 'empty',
'count', 'sizeof', 'count', 'sizeof',
'in_array'), 'in_array','is_array'),
'INCLUDE_ANY' => false, 'INCLUDE_ANY' => false,
'PHP_TAGS' => false, 'PHP_TAGS' => false,
'MODIFIER_FUNCS' => array('count') 'MODIFIER_FUNCS' => array('count')
@@ -193,6 +194,7 @@ class Smarty
var $_extract = false; // flag for custom functions var $_extract = false; // flag for custom functions
var $_included_tpls = array(); // list of run-time included templates var $_included_tpls = array(); // list of run-time included templates
var $_inclusion_depth = 0; // current template inclusion depth var $_inclusion_depth = 0; // current template inclusion depth
var $_smarty_debug_id = 'SMARTY_DEBUG'; // id in query string to turn on debug mode
/*======================================================================*\ /*======================================================================*\
@@ -602,7 +604,7 @@ class Smarty
if ($display) { if ($display) {
if (isset($results)) { echo $results; } if (isset($results)) { echo $results; }
if ($this->debugging || ($this->debugging_ctrl == 'URL' && (!empty($QUERY_STRING) && strstr('SMARTY_DEBUG',$QUERY_STRING)))) { echo $this->_generate_debug_output(); } if ($this->debugging || ($this->debugging_ctrl == 'URL' && (!empty($QUERY_STRING) && strstr($QUERY_STRING,$this->_smarty_debug_id)))) { echo $this->_generate_debug_output(); }
return; return;
} else { } else {
if (isset($results)) { return $results; } if (isset($results)) { return $results; }
@@ -773,7 +775,15 @@ function _generate_debug_output() {
// relative pathname to $template_dir // relative pathname to $template_dir
$resource_name = $this->template_dir.'/'.$resource_name; $resource_name = $this->template_dir.'/'.$resource_name;
} }
if (file_exists($resource_name) && is_readable($resource_name)) {
$template_source = $this->_read_file($resource_name);
$template_timestamp = filemtime($resource_name);
} else {
$this->_trigger_error_msg("unable to read template resource: \"$tpl_path\"");
return false;
}
// if security is on, make sure template comes from a $secure_dir // if security is on, make sure template comes from a $secure_dir
if ($this->security && !$this->security_settings['INCLUDE_ANY']) { if ($this->security && !$this->security_settings['INCLUDE_ANY']) {
$resource_is_secure = false; $resource_is_secure = false;
foreach ($this->secure_dir as $curr_dir) { foreach ($this->secure_dir as $curr_dir) {
@@ -787,14 +797,6 @@ function _generate_debug_output() {
return false; return false;
} }
} }
if (file_exists($resource_name) && is_readable($resource_name)) {
$template_source = $this->_read_file($resource_name);
$template_timestamp = filemtime($resource_name);
return true;
} else {
$this->_trigger_error_msg("unable to read template resource: \"$tpl_path\"");
return false;
}
break; break;
default: default:
if (isset($this->resource_funcs[$resource_type])) { if (isset($this->resource_funcs[$resource_type])) {
@@ -843,6 +845,7 @@ function _generate_debug_output() {
$smarty_compiler->compiler_funcs = $this->compiler_funcs; $smarty_compiler->compiler_funcs = $this->compiler_funcs;
$smarty_compiler->security = $this->security; $smarty_compiler->security = $this->security;
$smarty_compiler->secure_dir = $this->secure_dir; $smarty_compiler->secure_dir = $this->secure_dir;
$smarty_compiler->secure_ext = $this->secure_ext;
$smarty_compiler->security_settings = $this->security_settings; $smarty_compiler->security_settings = $this->security_settings;
if ($smarty_compiler->_compile_file($tpl_file, $template_source, $template_compiled)) if ($smarty_compiler->_compile_file($tpl_file, $template_source, $template_compiled))