Skip to content
This repository was archived by the owner on Jan 4, 2020. It is now read-only.

Commit fcfdde9

Browse files
liu21stliu21st
committed
Merge branch 'master' of github.com:liu21st/thinkphp
2 parents 22e5e7f + 43362b9 commit fcfdde9

File tree

4 files changed

+63
-60
lines changed

4 files changed

+63
-60
lines changed

‎ThinkPHP/Common/functions.php

+12-12
Original file line numberDiff line numberDiff line change
@@ -332,16 +332,16 @@ function I($name, $default = '', $filter = null, $datas = null)
332332
break;
333333
case 'param':
334334
switch ($_SERVER['REQUEST_METHOD']) {
335-
case 'POST':
335+
case 'POST':
336336
$input = $_POST;
337337
break;
338-
case 'PUT':
338+
case 'PUT':
339339
if (is_null($_PUT)) {
340340
parse_str(file_get_contents('php://input'), $_PUT);
341341
}
342342
$input = $_PUT;
343343
break;
344-
default:
344+
default:
345345
$input = $_GET;
346346
}
347347
break;
@@ -418,19 +418,19 @@ function I($name, $default = '', $filter = null, $datas = null)
418418
}
419419
if (!empty($type)) {
420420
switch (strtolower($type)) {
421-
case 'a': // 数组
421+
case 'a': // 数组
422422
$data = (array) $data;
423423
break;
424-
case 'd': // 数字
424+
case 'd': // 数字
425425
$data = (int) $data;
426426
break;
427-
case 'f': // 浮点
427+
case 'f': // 浮点
428428
$data = (float) $data;
429429
break;
430-
case 'b': // 布尔
430+
case 'b': // 布尔
431431
$data = (boolean) $data;
432432
break;
433-
case 's': // 字符串
433+
case 's':// 字符串
434434
default:
435435
$data = (string) $data;
436436
}
@@ -704,7 +704,7 @@ function M($name = '', $tablePrefix = '', $connection = '')
704704
function parse_res_name($name, $layer, $level = 1)
705705
{
706706
if (strpos($name, '://')) {
707-
// 指定扩展资源
707+
// 指定扩展资源
708708
list($extend, $name) = explode('://', $name);
709709
} else {
710710
$extend = '';
@@ -1026,7 +1026,7 @@ function U($url = '', $vars = '', $suffix = true, $domain = false)
10261026
$urlCase = C('URL_CASE_INSENSITIVE');
10271027
if ($url) {
10281028
if (0 === strpos($url, '/')) {
1029-
// 定义路由
1029+
// 定义路由
10301030
$route = true;
10311031
$url = substr($url, 1);
10321032
if ('/' != $depr) {
@@ -1315,7 +1315,7 @@ function xml_encode($data, $root = 'think', $item = 'item', $attr = '', $id = 'i
13151315
$attr = empty($attr) ? '' : " {$attr}";
13161316
$xml = "<?xml version=\"1.0\" encoding=\"{$encoding}\"?>";
13171317
$xml .= "<{$root}{$attr}>";
1318-
$xml .= dataToXml($data, $item, $id);
1318+
$xml .= data_to_xml($data, $item, $id);
13191319
$xml .= "</{$root}>";
13201320
return $xml;
13211321
}
@@ -1336,7 +1336,7 @@ function data_to_xml($data, $item = 'item', $id = 'id')
13361336
$key = $item;
13371337
}
13381338
$xml .= "<{$key}{$attr}>";
1339-
$xml .= (is_array($val) || is_object($val)) ? dataToXml($val, $item, $id) : $val;
1339+
$xml .= (is_array($val) || is_object($val)) ? data_to_xml($val, $item, $id) : $val;
13401340
$xml .= "</{$key}>";
13411341
}
13421342
return $xml;

‎ThinkPHP/Library/Think/Build.class.php

+47-44
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,24 @@ class Build
1818

1919
protected static $controller = '<?php
2020
namespace [MODULE]\Controller;
21+
2122
use Think\Controller;
22-
class [CONTROLLER]Controller extends Controller {
23-
public function index(){
24-
$this->show(\'<style type="text/css">*{ padding: 0; margin: 0; } div{ padding: 4px 48px;} body{ background: #fff; font-family: "微软雅黑"; color: #333;font-size:24px} h1{ font-size: 100px; font-weight: normal; margin-bottom: 12px; } p{ line-height: 1.8em; font-size: 36px } a,a:hover{color:blue;}</style><div style="padding: 24px 48px;"> <h1>:)</h1><p>欢迎使用 <b>ThinkPHP</b>！</p><br/>版本 V{$Think.version}</div><script type="text/javascript" src="http://ad.topthink.com/Public/static/client.js"></script><thinkad id="ad_55e75dfae343f5a1"></thinkad><script type="text/javascript" src="http://tajs.qq.com/stats?sId=9347272" charset="UTF-8"></script>\',\'utf-8\');
23+
24+
class [CONTROLLER]Controller extends Controller
25+
{
26+
public function index()
27+
{
28+
[CONTENT]
2529
}
2630
}';
2731

2832
protected static $model = '<?php
2933
namespace [MODULE]\Model;
34+
3035
use Think\Model;
31-
class [MODEL]Model extends Model {
36+
37+
class [MODEL]Model extends Model
38+
{
3239
3340
}';
3441
// 检测应用目录是否需要自动创建
@@ -88,24 +95,12 @@ public static function buildAppDir($module)
8895
file_put_contents(APP_PATH . $module . '/Conf/config' . CONF_EXT, '.php' == CONF_EXT ? "<?php\nreturn array(\n\t//'配置项'=>'配置值'\n);" : '');
8996
}
9097

91-
// 生成模块的测试控制器
92-
if (defined('BUILD_CONTROLLER_LIST')) {
93-
// 自动生成的控制器列表（注意大小写）
94-
$list = explode(',', BUILD_CONTROLLER_LIST);
95-
foreach ($list as $controller) {
96-
self::buildController($module, $controller);
97-
}
98-
} else {
99-
// 生成默认的控制器
100-
self::buildController($module);
101-
}
102-
// 生成模块的模型
98+
// 自动生成控制器类
99+
self::buildController($module, defined('BUILD_CONTROLLER_LIST') ? BUILD_CONTROLLER_LIST : C('DEFAULT_CONTROLLER'));
100+
101+
// 自动生成模型类
103102
if (defined('BUILD_MODEL_LIST')) {
104-
// 自动生成的控制器列表（注意大小写）
105-
$list = explode(',', BUILD_MODEL_LIST);
106-
foreach ($list as $model) {
107-
self::buildModel($module, $model);
108-
}
103+
self::buildModel($module, BUILD_MODEL_LIST);
109104
}
110105
} else {
111106
header('Content-Type:text/html; charset=utf-8');
@@ -139,36 +134,45 @@ public static function buildRuntime()
139134
}
140135

141136
// 创建控制器类
142-
public static function buildController($module, $controller = 'Index')
137+
public static function buildController($module, $controllers)
143138
{
144-
$file = APP_PATH . $module . '/Controller/' . $controller . 'Controller' . EXT;
145-
if (!is_file($file)) {
146-
$content = str_replace(array('[MODULE]', '[CONTROLLER]'), array($module, $controller), self::$controller);
147-
if (!C('APP_USE_NAMESPACE')) {
148-
$content = preg_replace('/namespace\s(.*?);/', '', $content, 1);
149-
}
150-
$dir = dirname($file);
151-
if (!is_dir($dir)) {
152-
mkdir($dir, 0755, true);
139+
$list = is_array($controllers) ? $controllers : explode(',', $controllers);
140+
$hello = '$this->show(\'<style type="text/css">*{ padding: 0; margin: 0; } div{ padding: 4px 48px;} body{ background: #fff; font-family: "微软雅黑"; color: #333;font-size:24px} h1{ font-size: 100px; font-weight: normal; margin-bottom: 12px; } p{ line-height: 1.8em; font-size: 36px } a,a:hover{color:blue;}</style><div style="padding: 24px 48px;"> <h1>:)</h1><p>欢迎使用 <b>ThinkPHP</b>！</p><br/>版本 V{$Think.version}</div><script type="text/javascript" src="http://ad.topthink.com/Public/static/client.js"></script><thinkad id="ad_55e75dfae343f5a1"></thinkad><script type="text/javascript" src="http://tajs.qq.com/stats?sId=9347272" charset="UTF-8"></script>\',\'utf-8\');';
141+
142+
foreach ($list as $controller) {
143+
$hello = C('DEFAULT_CONTROLLER') == $controller ? $hello : '';
144+
$file = APP_PATH . $module . '/Controller/' . $controller . 'Controller' . EXT;
145+
if (!is_file($file)) {
146+
$content = str_replace(array('[MODULE]', '[CONTROLLER]', '[CONTENT]'), array($module, $controller, $hello), self::$controller);
147+
if (!C('APP_USE_NAMESPACE')) {
148+
$content = preg_replace('/namespace\s(.*?);/', '', $content, 1);
149+
}
150+
$dir = dirname($file);
151+
if (!is_dir($dir)) {
152+
mkdir($dir, 0755, true);
153+
}
154+
file_put_contents($file, $content);
153155
}
154-
file_put_contents($file, $content);
155156
}
156157
}
157158

158159
// 创建模型类
159-
public static function buildModel($module, $model)
160+
public static function buildModel($module, $models)
160161
{
161-
$file = APP_PATH . $module . '/Model/' . $model . 'Model' . EXT;
162-
if (!is_file($file)) {
163-
$content = str_replace(array('[MODULE]', '[MODEL]'), array($module, $model), self::$model);
164-
if (!C('APP_USE_NAMESPACE')) {
165-
$content = preg_replace('/namespace\s(.*?);/', '', $content, 1);
166-
}
167-
$dir = dirname($file);
168-
if (!is_dir($dir)) {
169-
mkdir($dir, 0755, true);
162+
$list = is_array($models) ? $models : explode(',', $models);
163+
foreach ($list as $model) {
164+
$file = APP_PATH . $module . '/Model/' . $model . 'Model' . EXT;
165+
if (!is_file($file)) {
166+
$content = str_replace(array('[MODULE]', '[MODEL]'), array($module, $model), self::$model);
167+
if (!C('APP_USE_NAMESPACE')) {
168+
$content = preg_replace('/namespace\s(.*?);/', '', $content, 1);
169+
}
170+
$dir = dirname($file);
171+
if (!is_dir($dir)) {
172+
mkdir($dir, 0755, true);
173+
}
174+
file_put_contents($file, $content);
170175
}
171-
file_put_contents($file, $content);
172176
}
173177
}
174178

@@ -187,7 +191,6 @@ public static function buildDirSecure($dirs = array())
187191
foreach ($dirs as $dir) {
188192
file_put_contents($dir . $filename, $content);
189193
}
190-
191194
}
192195
}
193196
}

‎ThinkPHP/Mode/Api/functions.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,7 @@ function xml_encode($data, $root = 'think', $item = 'item', $attr = '', $id = 'i
930930
$attr = empty($attr) ? '' : " {$attr}";
931931
$xml = "<?xml version=\"1.0\" encoding=\"{$encoding}\"?>";
932932
$xml .= "<{$root}{$attr}>";
933-
$xml .= dataToXml($data, $item, $id);
933+
$xml .= data_to_xml($data, $item, $id);
934934
$xml .= "</{$root}>";
935935
return $xml;
936936
}
@@ -951,7 +951,7 @@ function data_to_xml($data, $item = 'item', $id = 'id')
951951
$key = $item;
952952
}
953953
$xml .= "<{$key}{$attr}>";
954-
$xml .= (is_array($val) || is_object($val)) ? dataToXml($val, $item, $id) : $val;
954+
$xml .= (is_array($val) || is_object($val)) ? data_to_xml($val, $item, $id) : $val;
955955
$xml .= "</{$key}>";
956956
}
957957
return $xml;
@@ -1141,7 +1141,7 @@ function cookie($name, $value = '', $option = null)
11411141
// 要删除的cookie前缀，不指定则删除config设置的指定前缀
11421142
$prefix = empty($value) ? $config['prefix'] : $value;
11431143
if (!empty($prefix)) {
1144-
// 如果前缀为空字符串将不作处理直接返回
1144+
// 如果前缀为空字符串将不作处理直接返回
11451145
foreach ($_COOKIE as $key => $val) {
11461146
if (0 === stripos($key, $prefix)) {
11471147
setcookie($key, '', time() - 3600, $config['path'], $config['domain']);

‎ThinkPHP/Mode/Lite/functions.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ function load($name, $baseUrl = '', $ext = '.php')
573573
$name = str_replace(array('.', '#'), array('/', '.'), $name);
574574
if (empty($baseUrl)) {
575575
if (0 === strpos($name, '@/')) {
576-
//加载当前模块函数库
576+
//加载当前模块函数库
577577
$baseUrl = MODULE_PATH . 'Common/';
578578
$name = substr($name, 2);
579579
} else {

0 commit comments

Comments
 (0)