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

规范修正

Browse Source
This commit is contained in:
thinkphp
2015-10-04 22:32:55 +08:00
parent 27e724bb3c
commit 3b21161c0a
9 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/org/image/driver/imagick.php
View File

@@ -11,8 +11,8 @@
namespace think\image\driver; namespace think\image\driver;
use think\Lang as Lang; use think\Lang;
use think\image\driver\Imagick as Imagick;
class Imagick class Imagick
{ {
/** /**

10
library/org/validate.php
View File

@@ -11,10 +11,12 @@
namespace think; namespace think;
use think\Lang;
class Validate class Validate
{ {
// 自动验证定义
protected $validate = []; // 自动验证定义 protected $validate = [];
// 是否批处理验证 // 是否批处理验证
protected $patchValidate = false; protected $patchValidate = false;
protected $error = ''; protected $error = '';
@@ -54,7 +56,7 @@ class Validate
if (0 == strpos($val[2], '{%') && strpos($val[2], '}')) if (0 == strpos($val[2], '{%') && strpos($val[2], '}'))
// 支持提示信息的多语言 使用 {%语言定义} 方式 // 支持提示信息的多语言 使用 {%语言定义} 方式
{ {
$val[2] = L(substr($val[2], 2, -1)); $val[2] = Lang::get(substr($val[2], 2, -1));
} }
$val[3] = isset($val[3]) ? $val[3] : 0; $val[3] = isset($val[3]) ? $val[3] : 0;
@@ -166,7 +168,7 @@ class Validate
list($min, $max) = explode(',', $rule); list($min, $max) = explode(',', $rule);
return $length >= $min && $length <= $max; return $length >= $min && $length <= $max;
} else { } else {
// 指定长度 // 指定长度
return $length == $rule; return $length == $rule;
} }
case 'expire': case 'expire':

4
library/think/app.php
View File

@@ -11,8 +11,6 @@
namespace think; namespace think;
use think\Exception;
/** /**
* App 应用管理 * App 应用管理
* @author liu21st <liu21st@gmail.com> * @author liu21st <liu21st@gmail.com>
@@ -73,7 +71,7 @@ class App
$namespace = MODULE_NAME . '\\' . CONTROLLER_LAYER . '\\' . CONTROLLER_NAME . '\\'; $namespace = MODULE_NAME . '\\' . CONTROLLER_LAYER . '\\' . CONTROLLER_NAME . '\\';
} else { } else {
// 空控制器 // 空控制器
$namespace = MODULE_NAME . '\\' . CONTROLLER_LAYER . '\\empty\\'; $namespace = MODULE_NAME . '\\' . CONTROLLER_LAYER . '\\' . $config['empty_controller'] . '\\';
} }
$actionName = strtolower(ACTION_NAME); $actionName = strtolower(ACTION_NAME);
if (class_exists($namespace . $actionName)) { if (class_exists($namespace . $actionName)) {

2
library/think/controller.php
View File

@@ -179,7 +179,7 @@ class Controller
private function dispatchJump($message, $status = 1, $jumpUrl = '', $ajax = false) private function dispatchJump($message, $status = 1, $jumpUrl = '', $ajax = false)
{ {
if (true === $ajax || IS_AJAX) { if (true === $ajax || IS_AJAX) {
// AJAX提交 // AJAX提交
$data = is_array($ajax) ? $ajax : []; $data = is_array($ajax) ? $ajax : [];
$data['info'] = $message; $data['info'] = $message;
$data['status'] = $status; $data['status'] = $status;

4
library/think/db/driver/mongo.php
View File

@@ -13,8 +13,8 @@ namespace think\db\driver;
use think\db\Driver; use think\db\Driver;
use think\Exception; use think\Exception;
use think\Lang as Lang; use think\Lang;
use think\Log as Log; use think\Log;
/** /**
* Mongo数据库驱动 * Mongo数据库驱动

6
library/think/route.php
View File

@@ -105,7 +105,7 @@ class Route
// 完整域名或者IP配置 // 完整域名或者IP配置
$rule = $rules[$_SERVER['HTTP_HOST']]; $rule = $rules[$_SERVER['HTTP_HOST']];
} else { } else {
// 子域名配置 // 子域名配置
$domain = array_slice(explode('.', $_SERVER['HTTP_HOST']), 0, -2); $domain = array_slice(explode('.', $_SERVER['HTTP_HOST']), 0, -2);
if (!empty($domain)) { if (!empty($domain)) {
$subDomain = implode('.', $domain); $subDomain = implode('.', $domain);
@@ -221,7 +221,7 @@ class Route
$len2 = substr_count($rule, '/'); $len2 = substr_count($rule, '/');
if ($len1 >= $len2) { if ($len1 >= $len2) {
if ('$' == substr($rule, -1, 1)) { if ('$' == substr($rule, -1, 1)) {
// 完整匹配 // 完整匹配
if ($len1 != $len2) { if ($len1 != $len2) {
continue; continue;
} else { } else {
@@ -364,7 +364,7 @@ class Route
$var = []; $var = [];
foreach ($m2 as $key => $val) { foreach ($m2 as $key => $val) {
if (0 === strpos($val, ':')) { if (0 === strpos($val, ':')) {
// 动态变量 // 动态变量
if (strpos($val, '\\')) { if (strpos($val, '\\')) {
$type = substr($val, -1); $type = substr($val, -1);
if ('d' == $type && !is_numeric($m1[$key])) { if ('d' == $type && !is_numeric($m1[$key])) {

2
library/think/template/taglib.php
View File

@@ -205,7 +205,7 @@ class TagLib
case 'CONST':$parseStr = strtoupper($vars[2]); case 'CONST':$parseStr = strtoupper($vars[2]);
break; break;
case 'LANG': case 'LANG':
$parseStr = 'L("' . $vars[2] . '")'; $parseStr = '\think\Lang::get("' . $vars[2] . '")';
break; break;
case 'CONFIG': case 'CONFIG':
if (isset($vars[3])) { if (isset($vars[3])) {

2
traits/think/model/auto.php
View File

@@ -209,7 +209,7 @@ trait Auto
if (empty($val[5]) || self::MODEL_BOTH == $val[5] || $val[5] == $type) { if (empty($val[5]) || self::MODEL_BOTH == $val[5] || $val[5] == $type) {
if (0 == strpos($val[2], '{%') && strpos($val[2], '}')) { if (0 == strpos($val[2], '{%') && strpos($val[2], '}')) {
// 支持提示信息的多语言 使用 {%语言定义} 方式 // 支持提示信息的多语言 使用 {%语言定义} 方式
$val[2] = L(substr($val[2], 2, -1)); $val[2] = \think\Lang::get(substr($val[2], 2, -1));
} }
$val[3] = isset($val[3]) ? $val[3] : EXISTS_VALIDATE; $val[3] = isset($val[3]) ? $val[3] : EXISTS_VALIDATE;
$val[4] = isset($val[4]) ? $val[4] : 'regex'; $val[4] = isset($val[4]) ? $val[4] : 'regex';

1
traits/think/model/extend.php
View File

@@ -13,6 +13,7 @@ namespace traits\think\model;
use think\Lang; use think\Lang;
use think\Loader; use think\Loader;
trait Extend trait Extend
{ {