X Tutup
Skip to content

Commit fe3909b

Browse files
liu21stliu21st
committed
文件换行格式保存为unix格式
1 parent 7925683 commit fe3909b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+9737
-9739
lines changed

‎ThinkPHP/Common/common.php‎

Lines changed: 606 additions & 606 deletions
Large diffs are not rendered by default.

‎ThinkPHP/Common/functions.php‎

Lines changed: 752 additions & 752 deletions
Large diffs are not rendered by default.

‎ThinkPHP/Common/runtime.php‎

Lines changed: 241 additions & 241 deletions
Large diffs are not rendered by default.

‎ThinkPHP/Conf/convention.php‎

Lines changed: 142 additions & 142 deletions
Large diffs are not rendered by default.

‎ThinkPHP/Conf/debug.php‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
<?php
2-
// +----------------------------------------------------------------------
3-
// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
4-
// +----------------------------------------------------------------------
5-
// | Copyright (c) 2006-2012 http://thinkphp.cn All rights reserved.
6-
// +----------------------------------------------------------------------
7-
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
8-
// +----------------------------------------------------------------------
9-
// | Author: liu21st <liu21st@gmail.com>
10-
// +----------------------------------------------------------------------
11-
12-
/**
13-
* ThinkPHP 默认的调试模式配置文件
14-
* 如果项目有定义自己的调试模式配置文件，本文件无效
15-
* @category Think
16-
* @package Common
17-
* @author liu21st <liu21st@gmail.com>
18-
* @version $Id: debug.php 3071 2012-07-15 07:59:23Z liu21st@gmail.com $
19-
*/
20-
defined('THINK_PATH') or exit();
21-
// 调试模式下面默认设置 可以在项目配置目录下重新定义 debug.php 覆盖
22-
return array(
23-
'LOG_RECORD' => true, // 进行日志记录
24-
'LOG_EXCEPTION_RECORD' => true, // 是否记录异常信息日志
25-
'LOG_LEVEL' => 'EMERG,ALERT,CRIT,ERR,WARN,NOTIC,INFO,DEBUG,SQL', // 允许记录的日志级别
26-
'DB_FIELDS_CACHE' => false, // 字段缓存信息
27-
'DB_SQL_LOG' => true, // 记录SQL信息
28-
'APP_FILE_CASE' => true, // 是否检查文件的大小写 对Windows平台有效
29-
'TMPL_CACHE_ON' => false, // 是否开启模板编译缓存,设为false则每次都会重新编译
30-
'TMPL_STRIP_SPACE' => false, // 是否去除模板文件里面的html空格与换行
31-
'SHOW_ERROR_MSG' => true, // 显示错误信息
1+
<?php
2+
// +----------------------------------------------------------------------
3+
// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
4+
// +----------------------------------------------------------------------
5+
// | Copyright (c) 2006-2012 http://thinkphp.cn All rights reserved.
6+
// +----------------------------------------------------------------------
7+
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
8+
// +----------------------------------------------------------------------
9+
// | Author: liu21st <liu21st@gmail.com>
10+
// +----------------------------------------------------------------------
11+
12+
/**
13+
* ThinkPHP 默认的调试模式配置文件
14+
* 如果项目有定义自己的调试模式配置文件，本文件无效
15+
* @category Think
16+
* @package Common
17+
* @author liu21st <liu21st@gmail.com>
18+
* @version $Id: debug.php 3071 2012-07-15 07:59:23Z liu21st@gmail.com $
19+
*/
20+
defined('THINK_PATH') or exit();
21+
// 调试模式下面默认设置 可以在项目配置目录下重新定义 debug.php 覆盖
22+
return array(
23+
'LOG_RECORD' => true, // 进行日志记录
24+
'LOG_EXCEPTION_RECORD' => true, // 是否记录异常信息日志
25+
'LOG_LEVEL' => 'EMERG,ALERT,CRIT,ERR,WARN,NOTIC,INFO,DEBUG,SQL', // 允许记录的日志级别
26+
'DB_FIELDS_CACHE' => false, // 字段缓存信息
27+
'DB_SQL_LOG' => true, // 记录SQL信息
28+
'APP_FILE_CASE' => true, // 是否检查文件的大小写 对Windows平台有效
29+
'TMPL_CACHE_ON' => false, // 是否开启模板编译缓存,设为false则每次都会重新编译
30+
'TMPL_STRIP_SPACE' => false, // 是否去除模板文件里面的html空格与换行
31+
'SHOW_ERROR_MSG' => true, // 显示错误信息
3232
);

‎ThinkPHP/Conf/tags.php‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
1-
<?php
2-
// +----------------------------------------------------------------------
3-
// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
4-
// +----------------------------------------------------------------------
5-
// | Copyright (c) 2006-2012 http://thinkphp.cn All rights reserved.
6-
// +----------------------------------------------------------------------
7-
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
8-
// +----------------------------------------------------------------------
9-
// | Author: liu21st <liu21st@gmail.com>
10-
// +----------------------------------------------------------------------
11-
12-
// 系统默认的核心行为扩展列表文件
13-
return array(
14-
'app_init' => array(
15-
),
16-
'app_begin' => array(
17-
'ReadHtmlCache', // 读取静态缓存
18-
),
19-
'route_check' => array(
20-
'CheckRoute', // 路由检测
21-
),
22-
'app_end' => array(),
23-
'path_info' => array(),
24-
'action_begin' => array(),
25-
'action_end' => array(),
26-
'view_begin' => array(),
27-
'view_template' => array(
28-
'LocationTemplate', // 自动定位模板文件
29-
),
30-
'view_parse' => array(
31-
'ParseTemplate', // 模板解析 支持PHP、内置模板引擎和第三方模板引擎
32-
),
33-
'view_filter' => array(
34-
'ContentReplace', // 模板输出替换
35-
'TokenBuild', // 表单令牌
36-
'WriteHtmlCache', // 写入静态缓存
37-
'ShowRuntime', // 运行时间显示
38-
),
39-
'view_end' => array(
40-
'ShowPageTrace', // 页面Trace显示
41-
),
1+
<?php
2+
// +----------------------------------------------------------------------
3+
// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
4+
// +----------------------------------------------------------------------
5+
// | Copyright (c) 2006-2012 http://thinkphp.cn All rights reserved.
6+
// +----------------------------------------------------------------------
7+
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
8+
// +----------------------------------------------------------------------
9+
// | Author: liu21st <liu21st@gmail.com>
10+
// +----------------------------------------------------------------------
11+
12+
// 系统默认的核心行为扩展列表文件
13+
return array(
14+
'app_init' => array(
15+
),
16+
'app_begin' => array(
17+
'ReadHtmlCache', // 读取静态缓存
18+
),
19+
'route_check' => array(
20+
'CheckRoute', // 路由检测
21+
),
22+
'app_end' => array(),
23+
'path_info' => array(),
24+
'action_begin' => array(),
25+
'action_end' => array(),
26+
'view_begin' => array(),
27+
'view_template' => array(
28+
'LocationTemplate', // 自动定位模板文件
29+
),
30+
'view_parse' => array(
31+
'ParseTemplate', // 模板解析 支持PHP、内置模板引擎和第三方模板引擎
32+
),
33+
'view_filter' => array(
34+
'ContentReplace', // 模板输出替换
35+
'TokenBuild', // 表单令牌
36+
'WriteHtmlCache', // 写入静态缓存
37+
'ShowRuntime', // 运行时间显示
38+
),
39+
'view_end' => array(
40+
'ShowPageTrace', // 页面Trace显示
41+
),
4242
);

‎ThinkPHP/LICENSE.txt‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
2-
ThinkPHP遵循Apache2开源协议发布，并提供免费使用。
3-
版权所有Copyright © 2006-2012 by ThinkPHP (http://thinkphp.cn)
4-
All rights reserved。
5-
ThinkPHP® 商标和著作权所有者为上海顶想信息科技有限公司。
6-
7-
Apache Licence是著名的非盈利开源组织Apache采用的协议。
8-
该协议和BSD类似，鼓励代码共享和尊重原作者的著作权，
9-
允许代码修改，再作为开源或商业软件发布。需要满足
10-
的条件：
11-
1． 需要给代码的用户一份Apache Licence ；
12-
2． 如果你修改了代码，需要在被修改的文件中说明；
13-
3． 在延伸的代码中（修改和有源代码衍生的代码中）需要
14-
带有原来代码中的协议，商标，专利声明和其他原来作者规
15-
定需要包含的说明；
16-
4． 如果再发布的产品中包含一个Notice文件，则在Notice文
17-
件中需要带有本协议内容。你可以在Notice中增加自己的
18-
许可，但不可以表现为对Apache Licence构成更改。
19-
具体的协议参考：http://www.apache.org/licenses/LICENSE-2.0
20-
21-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
22-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
23-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
24-
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
25-
COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
26-
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
27-
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
28-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
29-
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30-
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
31-
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
32-
POSSIBILITY OF SUCH DAMAGE.
1+
2+
ThinkPHP遵循Apache2开源协议发布，并提供免费使用。
3+
版权所有Copyright © 2006-2012 by ThinkPHP (http://thinkphp.cn)
4+
All rights reserved。
5+
ThinkPHP® 商标和著作权所有者为上海顶想信息科技有限公司。
6+
7+
Apache Licence是著名的非盈利开源组织Apache采用的协议。
8+
该协议和BSD类似，鼓励代码共享和尊重原作者的著作权，
9+
允许代码修改，再作为开源或商业软件发布。需要满足
10+
的条件：
11+
1． 需要给代码的用户一份Apache Licence ；
12+
2． 如果你修改了代码，需要在被修改的文件中说明；
13+
3． 在延伸的代码中（修改和有源代码衍生的代码中）需要
14+
带有原来代码中的协议，商标，专利声明和其他原来作者规
15+
定需要包含的说明；
16+
4． 如果再发布的产品中包含一个Notice文件，则在Notice文
17+
件中需要带有本协议内容。你可以在Notice中增加自己的
18+
许可，但不可以表现为对Apache Licence构成更改。
19+
具体的协议参考：http://www.apache.org/licenses/LICENSE-2.0
20+
21+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
22+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
23+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
24+
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
25+
COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
26+
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
27+
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
28+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
29+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30+
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
31+
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
32+
POSSIBILITY OF SUCH DAMAGE.

‎ThinkPHP/Lang/en-us.php‎

Lines changed: 34 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -8,51 +8,47 @@
88
// +----------------------------------------------------------------------
99
// | Author: liu21st <liu21st@gmail.com>
1010
// +----------------------------------------------------------------------
11-
// $Id: en-us.php 3034 2012-06-20 16:07:41Z liu21st@gmail.com $
1211

1312
/**
14-
+------------------------------------------------------------------------------
1513
* ThinkPHP English language package
16-
+------------------------------------------------------------------------------
1714
* @category Think
1815
* @package Lang
1916
* @author liu21st <liu21st@gmail.com>
2017
* @version $Id: zh-cn.php 3034 2012-10-17 21:14:00Z yangweijiester@gmail.com $
21-
+------------------------------------------------------------------------------
22-
*/
18+
*/
2319
return array(
2420
// core
25-
'_MODULE_NOT_EXIST_'=> 'Module can not been loaded',
26-
'_ERROR_ACTION_'=> 'Error action',
27-
'_LANGUAGE_NOT_LOAD_'=> 'Can\'t load language package',
28-
'_TEMPLATE_NOT_EXIST_'=> 'Template does\'t exist',
29-
'_MODULE_'=>'Module',
30-
'_ACTION_'=>'Action',
31-
'_ACTION_NOT_EXIST_'=>'Action does\'t exist Or not defined',
32-
'_MODEL_NOT_EXIST_'=>'Model does\'t exist Or not defined',
33-
'_VALID_ACCESS_'=>'No access',
34-
'_XML_TAG_ERROR_'=>'XML tag syntax errors',
35-
'_DATA_TYPE_INVALID_'=>'Invlid data type!',
36-
'_OPERATION_WRONG_'=>'Operation error occurs',
37-
'_NOT_LOAD_DB_'=>'Unable to load the database',
38-
'_NO_DB_DRIVER_'=>'Unable to load database driver',
39-
'_NOT_SUPPORT_DB_'=>'The system is temporarily not support database',
40-
'_NO_DB_CONFIG_'=>'Not define the database configuration',
41-
'_NOT_SUPPERT_'=>'The system does not support',
42-
'_CACHE_TYPE_INVALID_'=>'Unable to load the cache type',
43-
'_FILE_NOT_WRITEABLE_'=>'Directory (file) is not writable',
44-
'_METHOD_NOT_EXIST_'=>'The method you requested does not exist!',
45-
'_CLASS_NOT_EXIST_'=>'Instantiating a class does not exist！',
46-
'_CLASS_CONFLICT_'=>'Class name conflicts',
47-
'_TEMPLATE_ERROR_'=>'Template Engine errors',
48-
'_CACHE_WRITE_ERROR_'=>'Cache file write failed!',
49-
'_TAGLIB_NOT_EXIST_'=>'Tag library is not defined',
50-
'_OPERATION_FAIL_'=>'Operation failed!',
51-
'_OPERATION_SUCCESS_'=>'Operation successed!',
52-
'_SELECT_NOT_EXIST_'=>'Record does not exist!',
53-
'_EXPRESS_ERROR_'=>'Expression errors',
54-
'_TOKEN_ERROR_'=>'Form\'s token errors',
55-
'_RECORD_HAS_UPDATE_'=>'Record has been updated',
56-
'_NOT_ALLOW_PHP_'=>'PHP codes are not allowed in the template',
57-
'_PARAM_ERROR_'=>'Parameter error or undefined',
21+
'_MODULE_NOT_EXIST_' => 'Module can not been loaded',
22+
'_ERROR_ACTION_' => 'Error action',
23+
'_LANGUAGE_NOT_LOAD_' => 'Can\'t load language package',
24+
'_TEMPLATE_NOT_EXIST_' => 'Template does\'t exist',
25+
'_MODULE_' => 'Module',
26+
'_ACTION_' => 'Action',
27+
'_ACTION_NOT_EXIST_' => 'Action does\'t exist Or not defined',
28+
'_MODEL_NOT_EXIST_' => 'Model does\'t exist Or not defined',
29+
'_VALID_ACCESS_' => 'No access',
30+
'_XML_TAG_ERROR_' => 'XML tag syntax errors',
31+
'_DATA_TYPE_INVALID_' => 'Invlid data type!',
32+
'_OPERATION_WRONG_' => 'Operation error occurs',
33+
'_NOT_LOAD_DB_' => 'Unable to load the database',
34+
'_NO_DB_DRIVER_' => 'Unable to load database driver',
35+
'_NOT_SUPPORT_DB_' => 'The system is temporarily not support database',
36+
'_NO_DB_CONFIG_' => 'Not define the database configuration',
37+
'_NOT_SUPPERT_' => 'The system does not support',
38+
'_CACHE_TYPE_INVALID_' => 'Unable to load the cache type',
39+
'_FILE_NOT_WRITEABLE_' => 'Directory (file) is not writable',
40+
'_METHOD_NOT_EXIST_' => 'The method you requested does not exist!',
41+
'_CLASS_NOT_EXIST_' => 'Instantiating a class does not exist！',
42+
'_CLASS_CONFLICT_' => 'Class name conflicts',
43+
'_TEMPLATE_ERROR_' => 'Template Engine errors',
44+
'_CACHE_WRITE_ERROR_' => 'Cache file write failed!',
45+
'_TAGLIB_NOT_EXIST_' => 'Tag library is not defined',
46+
'_OPERATION_FAIL_' => 'Operation failed!',
47+
'_OPERATION_SUCCESS_' => 'Operation successed!',
48+
'_SELECT_NOT_EXIST_' => 'Record does not exist!',
49+
'_EXPRESS_ERROR_' => 'Expression errors',
50+
'_TOKEN_ERROR_' => 'Form\'s token errors',
51+
'_RECORD_HAS_UPDATE_' => 'Record has been updated',
52+
'_NOT_ALLOW_PHP_' => 'PHP codes are not allowed in the template',
53+
'_PARAM_ERROR_' => 'Parameter error or undefined',
5854
);

0 commit comments

Comments
 (0)
X Tutup