mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-06 23:02:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/top-think/think

Browse Source
This commit is contained in:
thinkphp
2016-01-19 18:54:45 +08:00
parent ae9a5a7bca c6340fc410
commit 43718894fb
3 changed files with 29 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
library/think/Template.php
View File

@@ -593,40 +593,26 @@ class Template
$flag = substr($str, 0, 1); $flag = substr($str, 0, 1);
switch ($flag) { switch ($flag) {
case '$': // 解析模板变量 格式 {$varName} case '$': // 解析模板变量 格式 {$varName}
$this->parseVar($str);
switch ($this->config['tpl_var_identify']) {
case 'array':
$begin = 0;
break;
case 'obj':
$begin = 1;
break;
default:
// 如果是自动识别.语法，则要查找:之后的?号
$begin = strpos($str, ':');
}
// 是否带有?号 // 是否带有?号
if (false !== $pos = strpos($str, '?', $begin)) { if (false !== $pos = strpos($str, '?')) {
$array = preg_split('/([!=]={1,2}|(?<!-)[><]={0,1})/', substr($str, 0, $pos), 2, PREG_SPLIT_DELIM_CAPTURE); $array = preg_split('/([!=]={1,2}|(?<!-)[><]={0,1})/', substr($str, 0, $pos), 2, PREG_SPLIT_DELIM_CAPTURE);
$name = trim($array[0]); $name = $array[0];
$this->parseVar($name);
$this->parseVarFunction($name); $this->parseVarFunction($name);
$str = trim(substr($str, $pos + 1)); $str = trim(substr($str, $pos + 1));
$this->parseVar($str);
$first = substr($str, 0, 1); $first = substr($str, 0, 1);
if (isset($array[1])) { if (isset($array[1])) {
// 设置了判断条件 $this->parseVar($array[2]);
// XXX: 加入这句原本是为解决变量末声明的问题，但$name中是多个条件时会解析错误，故注释掉 $name .= $array[1] . $array[2];
/*if (strpos($name, '[')) {
$name = 'isset(' . $name . ') && ' . $name;
}*/
$name .= $array[1] . trim($array[2]);
if ('=' == $first) { if ('=' == $first) {
// {$varname?='xxx'} $varname为真时才输出xxx // {$varname?='xxx'} $varname为真时才输出xxx
$str = '<?php if( ' . $name . ' ) echo ' . substr($str, 1) . '; ?>'; $str = '<?php if(' . $name . ') echo ' . substr($str, 1) . '; ?>';
} else { } else {
$str = '<?php echo (' . $name . ') ? ' . $str . '; ?>'; $str = '<?php echo (' . $name . ')?' . $str . '; ?>';
} }
} elseif ($begin || ')' == substr($name, -1, 1)) { } elseif (')' == substr($name, -1, 1)) {
// $name为对象或是自动识别，或者含有函数 // $name为对象或是自动识别，或者含有函数
switch ($first) { switch ($first) {
case '?': case '?':
@@ -651,18 +637,19 @@ class Template
break; break;
case ':': case ':':
// {$varname?:'xxx'} $varname为真时输出$varname,否则输出xxx // {$varname?:'xxx'} $varname为真时输出$varname,否则输出xxx
$str = '<?php echo !empty(' . $name . ') ? ' . $name . $str . '; ?>'; $str = '<?php echo !empty(' . $name . ')?' . $name . $str . '; ?>';
break; break;
default: default:
if (strpos($str, ':')) { if (strpos($str, ':')) {
// {$varname ? 'a' : 'b'} $varname为真时输出a,否则输出b // {$varname ? 'a' : 'b'} $varname为真时输出a,否则输出b
$str = '<?php echo !empty(' . $name . ') ? ' . $str . '; ?>'; $str = '<?php echo !empty(' . $name . ')?' . $str . '; ?>';
} else { } else {
$str = '<?php echo ' . $name . '?' . $str . '; ?>'; $str = '<?php echo ' . $name . '?' . $str . '; ?>';
} }
} }
} }
} else { } else {
$this->parseVar($str);
$this->parseVarFunction($str); $this->parseVarFunction($str);
$str = '<?php echo ' . $str . '; ?>'; $str = '<?php echo ' . $str . '; ?>';
} }
@@ -674,11 +661,14 @@ class Template
break; break;
case '~': // 执行某个函数 case '~': // 执行某个函数
$str = substr($str, 1); $str = substr($str, 1);
$this->parseVar($str);
$str = '<?php ' . $str . '; ?>'; $str = '<?php ' . $str . '; ?>';
break; break;
case '-': case '-':
case '+': // 输出计算 case '+': // 输出计算
$str = '<?php echo ' . $str . '; ?>'; $str = substr($str, 1);
$this->parseVar($str);
$str = '<?php echo ' . $flag . $str . '; ?>';
break; break;
case '/': // 注释标签 case '/': // 注释标签
$flag2 = substr($str, 1, 1); $flag2 = substr($str, 1, 1);
@@ -777,9 +767,9 @@ class Template
switch ($fun) { switch ($fun) {
case 'default': // 特殊模板函数 case 'default': // 特殊模板函数
if (false === strpos($name, '(')) { if (false === strpos($name, '(')) {
$name = '((isset(' . $name . ') && (' . $name . ' !== \'\')?(' . $name . '):' . $args[1] . ')'; $name = '(isset(' . $name . ') && (' . $name . ' !== \'\')?' . $name . ':' . $args[1] . ')';
} else { } else {
$name = '((' . $name . ' !== \'\')?(' . $name . '):' . $args[1] . ')'; $name = '(' . $name . ' !== \'\'?' . $name . ':' . $args[1] . ')';
} }
break; break;
default: // 通用模板函数 default: // 通用模板函数
@@ -981,9 +971,9 @@ class Template
$begin = $this->config['tpl_begin']; $begin = $this->config['tpl_begin'];
$end = $this->config['tpl_end']; $end = $this->config['tpl_end'];
if (strlen(ltrim($begin, '\\')) == 1 && strlen(ltrim($end, '\\')) == 1) { if (strlen(ltrim($begin, '\\')) == 1 && strlen(ltrim($end, '\\')) == 1) {
$regex = $begin . '((?:[\$\:\-\+][a-wA-w_][\w\.\:\[\(\*\/\-\+\%_]|\/[\*\/])(?>[^' . $end . ']*))' . $end; $regex = $begin . '((?:[\$\:\-\+~][\$a-wA-w_][\w\.\:\[\(\*\/\-\+\%_]|\/[\*\/])(?>[^' . $end . ']*))' . $end;
} else { } else {
$regex = $begin . '((?:[\$\:\-\+][a-wA-w_][\w\.\:\[\(\*\/\-\+\%_]|\/[\*\/])(?>(?:(?!' . $end . ').)*))' . $end; $regex = $begin . '((?:[\$\:\-\+~][\$a-wA-w_][\w\.\:\[\(\*\/\-\+\%_]|\/[\*\/])(?>(?:(?!' . $end . ').)*))' . $end;
} }
break; break;
} }

5
library/think/template/TagLib.php
View File

@@ -324,7 +324,10 @@ class TagLib
$_taglibs[$tag][0] = strlen(ltrim($this->tpl->config('taglib_begin'), '\\') . $tag); $_taglibs[$tag][0] = strlen(ltrim($this->tpl->config('taglib_begin'), '\\') . $tag);
$_taglibs[$tag][1] = strlen(ltrim($this->tpl->config('taglib_end'), '\\')); $_taglibs[$tag][1] = strlen(ltrim($this->tpl->config('taglib_end'), '\\'));
} }
$result['expression'] = trim(substr($str, $_taglibs[$tag][0], -$_taglibs[$tag][1])); $result['expression'] = substr($str, $_taglibs[$tag][0], -$_taglibs[$tag][1]);
// 清除自闭合标签尾部/
$result['expression'] = rtrim($result['expression'], '/');
$result['expression'] = trim($result['expression']);
} elseif (empty($this->tags[$tag]) || !empty($this->tags[$tag]['attr'])) { } elseif (empty($this->tags[$tag]) || !empty($this->tags[$tag]['attr'])) {
throw new Exception('_XML_TAG_ERROR_:' . $tag); throw new Exception('_XML_TAG_ERROR_:' . $tag);
} }

10
library/think/template/taglib/Cx.php
View File

@@ -253,7 +253,7 @@ class Cx extends Taglib
{ {
$name = !empty($tag['expression']) ? $tag['expression'] : $tag['name']; $name = !empty($tag['expression']) ? $tag['expression'] : $tag['name'];
$name = $this->autoBuildVar($name); $name = $this->autoBuildVar($name);
$parseStr = '<?php switch(' . $name . '): ?>' . $content . '<?php endswitch;?>'; $parseStr = '<?php switch(' . $name . '): ?>' . $content . '<?php endswitch; ?>';
return $parseStr; return $parseStr;
} }
@@ -270,20 +270,20 @@ class Cx extends Taglib
$flag = substr($value, 0, 1); $flag = substr($value, 0, 1);
if ('$' == $flag || ':' == $flag) { if ('$' == $flag || ':' == $flag) {
$value = $this->autoBuildVar($value); $value = $this->autoBuildVar($value);
$value = 'case ' . $value . ': '; $value = 'case ' . $value . ':';
} elseif (strpos($value, '|')) { } elseif (strpos($value, '|')) {
$values = explode('|', $value); $values = explode('|', $value);
$value = ''; $value = '';
foreach ($values as $val) { foreach ($values as $val) {
$value .= 'case "' . addslashes($val) . '": '; $value .= 'case "' . addslashes($val) . '":';
} }
} else { } else {
$value = 'case "' . $value . '": '; $value = 'case "' . $value . '":';
} }
$parseStr = '<?php ' . $value . ' ?>' . $content; $parseStr = '<?php ' . $value . ' ?>' . $content;
$isBreak = isset($tag['break']) ? $tag['break'] : ''; $isBreak = isset($tag['break']) ? $tag['break'] : '';
if ('' == $isBreak || $isBreak) { if ('' == $isBreak || $isBreak) {
$parseStr .= '<?php break;?>'; $parseStr .= '<?php break; ?>';
} }
return $parseStr; return $parseStr;
} }