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

update include path bug

Browse Source
This commit is contained in:
mohrt
2000-08-08 21:10:12 +00:00
parent 497badbe64
commit 506e38f76b
3 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
README
View File

@@ -166,7 +166,7 @@ templates/index.php
{include header.tpl} {include header.tpl}
{* This is a template comment *} {* This is a template comment *}
hello, my name is {$Name}.<br> hello, my name is {$Name}.<br>
{if $Name == "Joe"} {if $Name eq "Joe"}
I am Joe.<br> I am Joe.<br>
{else} {else}
I am not Joe.<br> I am not Joe.<br>
@@ -193,14 +193,17 @@ IF/ELSE LOGIC:
Smarty supports if/else logic like so: Smarty supports if/else logic like so:
{if $Name == "John"} {if $Name eq "John"}
I am John! I am John!
{else} {else}
I am not John. I am not John.
{/if} {/if}
A few important things to know: A few important things to know:
* arguments to {if ..} are passed "as is" to the php parser. * arguments to {if ...} are passed "as is" to the php parser.
* "eq", "ne","neq", "gt", "lt", "lte", "le", "gte" "ge",
"==","!=",">","<","<=",">=" are all valid conditional
qualifiers.
SECTIONS: SECTIONS:
@@ -228,6 +231,8 @@ A few important things to know:
like so: {$section_name.variable_name} like so: {$section_name.variable_name}
* It is OK to mention variables of parent sections * It is OK to mention variables of parent sections
within nested child sections. within nested child sections.
* nothing in the section will display if the
looping array is unset.
Sections can be nested, like so: Sections can be nested, like so:

8
Smarty.class.php
View File

@@ -266,6 +266,12 @@ class Smarty
if(!($template_contents = $this->_read_file($filepath))) if(!($template_contents = $this->_read_file($filepath)))
return false; return false;
if(preg_match("/^(.+)\/([^\/]+)$/",$compilepath,$match))
{
$ctpl_file_dir = $match[1];
$ctpl_file_name = $match[2];
}
if(!$this->allow_php) if(!$this->allow_php)
{ {
// escape php tags in templates // escape php tags in templates
@@ -307,7 +313,7 @@ class Smarty
$search[] = "/^".$ld."\s*\/if\s*".$rd."$/i"; // replace /if tags $search[] = "/^".$ld."\s*\/if\s*".$rd."$/i"; // replace /if tags
$replace[] = "<?php endif; ?>"; $replace[] = "<?php endif; ?>";
$search[] = "/^".$ld."\s*include\s*\"?([^\s\}]+)\"?".$rd."$/i"; // replace include tags $search[] = "/^".$ld."\s*include\s*\"?([^\s\}]+)\"?".$rd."$/i"; // replace include tags
$replace[] = "<?php include(\"\\1\"); ?>"; $replace[] = "<?php include(\"".$ctpl_file_dir."/\\1\"); ?>";
$search[] = "/^".$ld."\s*section\s+name\s*=\s*\"?([\w\d]+)\"?\s+\\\$([^\}\s]+)\s*".$rd."$/i"; // replace section tags $search[] = "/^".$ld."\s*section\s+name\s*=\s*\"?([\w\d]+)\"?\s+\\\$([^\}\s]+)\s*".$rd."$/i"; // replace section tags
$replace[] = "<?php for(\$\\1_secvar=0; \$\\1_secvar<count(\$\\2); \$\\1_secvar++): ?>"; $replace[] = "<?php for(\$\\1_secvar=0; \$\\1_secvar<count(\$\\2); \$\\1_secvar++): ?>";
$search[] = "/^".$ld."\s*\/section\s*".$rd."$/i"; // replace /section tags $search[] = "/^".$ld."\s*\/section\s*".$rd."$/i"; // replace /section tags

8
libs/Smarty.class.php
View File

@@ -266,6 +266,12 @@ class Smarty
if(!($template_contents = $this->_read_file($filepath))) if(!($template_contents = $this->_read_file($filepath)))
return false; return false;
if(preg_match("/^(.+)\/([^\/]+)$/",$compilepath,$match))
{
$ctpl_file_dir = $match[1];
$ctpl_file_name = $match[2];
}
if(!$this->allow_php) if(!$this->allow_php)
{ {
// escape php tags in templates // escape php tags in templates
@@ -307,7 +313,7 @@ class Smarty
$search[] = "/^".$ld."\s*\/if\s*".$rd."$/i"; // replace /if tags $search[] = "/^".$ld."\s*\/if\s*".$rd."$/i"; // replace /if tags
$replace[] = "<?php endif; ?>"; $replace[] = "<?php endif; ?>";
$search[] = "/^".$ld."\s*include\s*\"?([^\s\}]+)\"?".$rd."$/i"; // replace include tags $search[] = "/^".$ld."\s*include\s*\"?([^\s\}]+)\"?".$rd."$/i"; // replace include tags
$replace[] = "<?php include(\"\\1\"); ?>"; $replace[] = "<?php include(\"".$ctpl_file_dir."/\\1\"); ?>";
$search[] = "/^".$ld."\s*section\s+name\s*=\s*\"?([\w\d]+)\"?\s+\\\$([^\}\s]+)\s*".$rd."$/i"; // replace section tags $search[] = "/^".$ld."\s*section\s+name\s*=\s*\"?([\w\d]+)\"?\s+\\\$([^\}\s]+)\s*".$rd."$/i"; // replace section tags
$replace[] = "<?php for(\$\\1_secvar=0; \$\\1_secvar<count(\$\\2); \$\\1_secvar++): ?>"; $replace[] = "<?php for(\$\\1_secvar=0; \$\\1_secvar<count(\$\\2); \$\\1_secvar++): ?>";
$search[] = "/^".$ld."\s*\/section\s*".$rd."$/i"; // replace /section tags $search[] = "/^".$ld."\s*\/section\s*".$rd."$/i"; // replace /section tags