From e96ac8493fce9d88e07442f0d16324e18758df95 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 23 Feb 2015 20:54:16 +0800
Subject: [PATCH] =?UTF-8?q?session=E7=B1=BB=E5=92=8Cinput=E7=B1=BB?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E6=B3=A8=E9=87=8A=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base.php                                      |   4 +-
 library/org/auto.php                          |   4 +-
 library/org/crypt.php                         |   4 +-
 library/org/filter.php                        | 222 ------------------
 library/org/image.php                         |   4 +-
 library/org/oauth.php                         |   4 +-
 library/org/parser.php                        |   4 +-
 library/org/transform.php                     |   6 +-
 library/org/upload.php                        |   4 +-
 library/org/validate.php                      |   4 +-
 library/think/app.php                         |   4 +-
 library/think/cache.php                       |   4 +-
 library/think/cache/driver/apc.php            |   4 +-
 library/think/cache/driver/db.php             |   4 +-
 library/think/cache/driver/eaccelerator.php   |   4 +-
 library/think/cache/driver/file.php           |   4 +-
 library/think/cache/driver/memcache.php       |   4 +-
 library/think/cache/driver/redis.php          |   4 +-
 library/think/cache/driver/secache.php        |   4 +-
 library/think/cache/driver/simple.php         |   4 +-
 library/think/cache/driver/sqlite.php         |   4 +-
 library/think/cache/driver/wincache.php       |   4 +-
 library/think/cache/driver/xcache.php         |   4 +-
 library/think/config.php                      |   6 +-
 library/think/config/driver/ini.php           |   4 +-
 library/think/config/driver/xml.php           |   4 +-
 library/think/controller.php                  |   4 +-
 library/think/controller/Amf.php              |   4 +-
 library/think/controller/Phprpc.php           |   4 +-
 library/think/controller/Rest.php             |   4 +-
 library/think/cookie.php                      |   4 +-
 library/think/create.php                      |   4 +-
 library/think/db.php                          |   6 +-
 library/think/db/driver.php                   |   4 +-
 library/think/db/driver/mongo.php             |   6 +-
 library/think/db/driver/mysql.php             |   6 +-
 library/think/db/driver/oracle.php            |   6 +-
 library/think/db/driver/pgsql.php             |   6 +-
 library/think/db/driver/sqlite.php            |   6 +-
 library/think/db/driver/sqlsrv.php            |   2 +-
 library/think/db/lite.php                     |   4 +-
 library/think/debug.php                       |   4 +-
 library/think/error.php                       |   4 +-
 library/think/exception.php                   |   4 +-
 library/think/hook.php                        |   4 +-
 library/think/input.php                       | 193 +++++++++------
 library/think/lang.php                        |   4 +-
 library/think/loader.php                      |   4 +-
 library/think/log.php                         |   6 +-
 library/think/log/driver/file.php             |   4 +-
 library/think/model.php                       |   4 +-
 .../{ExtendModel.php => extend_model.php}     |   6 +-
 .../model/{MongoModel.php => mongo_model.php} |   2 +-
 .../{RelationModel.php => relation_model.php} |   6 +-
 .../model/{ViewModel.php => view_model.php}   |   6 +-
 library/think/route.php                       |   4 +-
 library/think/seesion/driver.php              |   4 +-
 library/think/session.php                     |  72 +++---
 library/think/template.php                    |   4 +-
 library/think/template/driver/file.php        |   4 +-
 library/think/template/taglib.php             |   4 +-
 library/think/url.php                         |   4 +-
 library/think/view.php                        |   4 +-
 library/think/view/driver/think.php           |   4 +-
 mode/common.php                               |   2 +-
 start.php                                     |   6 +-
 traits/think/model/auto.php                   |   4 +-
 traits/think/model/extend.php                 |   4 +-
 traits/think/model/query.php                  |   4 +-
 traits/think/model/relation.php               |   4 +-
 traits/think/model/view.php                   |   4 +-
 71 files changed, 315 insertions(+), 464 deletions(-)
 delete mode 100644 library/org/filter.php
 rename library/think/model/{ExtendModel.php => extend_model.php} (83%)
 rename library/think/model/{MongoModel.php => mongo_model.php} (99%)
 rename library/think/model/{RelationModel.php => relation_model.php} (79%)
 rename library/think/model/{ViewModel.php => view_model.php} (79%)

diff --git a/base.php b/base.php
index fd417be1..f657cfd8 100644
--- a/base.php
+++ b/base.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/org/auto.php b/library/org/auto.php
index ff80c001..9f8acfea 100644
--- a/library/org/auto.php
+++ b/library/org/auto.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/org/crypt.php b/library/org/crypt.php
index 4c237cc6..8c50a37e 100644
--- a/library/org/crypt.php
+++ b/library/org/crypt.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/org/filter.php b/library/org/filter.php
deleted file mode 100644
index 6b0ec25f..00000000
--- a/library/org/filter.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
-// +----------------------------------------------------------------------
-// | Author: liu21st <liu21st@gmail.com>
-// +----------------------------------------------------------------------
-
-namespace think;
-
-class Filter {
-    //html标签设置
-    static public $htmlTags = [
-        'allow' => 'table|td|th|tr|i|b|u|strong|img|p|br|div|strong|em|ul|ol|li|dl|dd|dt|a',
-        'ban' => 'html|head|meta|link|base|basefont|body|bgsound|title|style|script|form|iframe|frame|frameset|applet|id|ilayer|layer|name|script|style|xml',
-    ];
-
-    static public function filter($data,$filter,$option=''){
-        return filter_var($data,is_int($filter)?$filter:filter_id($filter),$option);
-    }
-
-    static private function filter_input($type,$name,$filter,$options=''){
-        return filter_input($type,$name,is_int($filter)?$filter:filter_id($filter),$option);
-    }
-
-    static public function get($name,$filter,$option=''){
-        return self::filter_input(INPUT_GET,$name,$filter,$option);
-    }
-
-    static public function post($name,$filter,$option=''){
-        return self::filter_input(INPUT_POST,$name,$filter,$option);
-    }
-
-    static public function cookie($name,$filter,$option=''){
-        return self::filter_input(INPUT_COOKIE,$name,$filter,$option);
-    }
-
-    static public function server($name,$filter,$option=''){
-        return self::filter_input(INPUT_SERVER,$name,$filter,$option);
-    }
-
-    /**
-     * 处理字符串，以便可以正常进行搜索
-     * @access public
-     * @param string $string 要处理的字符串
-     * @return string
-     */
-    static public function forSearch($string) {
-        return str_replace( ['%','_'], ['\%','\_'], $string );
-    }
-
-    /**
-     * @access public
-     * @param string $string 要处理的字符串
-     * @return string
-     */
-    static public function forShow($string) {
-        return self::nl2Br( self::hsc($string) );
-    }
-
-    /**
-     * 处理纯文本数据，以便在textarea标签中显示
-     * @access public
-     * @param string $string 要处理的字符串
-     * @return string
-     */
-    static public function forTarea($string) {
-        return str_ireplace(['<textarea>','</textarea>'], ['&lt;textarea>','&lt;/textarea>'], $string);
-    }
-
-    /**
-     * 将数据中的单引号和双引号进行转义
-     * @access public
-     * @param string $text 要处理的字符串
-     * @return string
-     */
-    static public function forTag($string) {
-        return str_replace(['"',"'"], ['&quot;','&#039;'], $string);
-    }
-
-    /**
-     * 把换行转换为<br />标签
-     * @access public
-     * @param string $string 要处理的字符串
-     * @return string
-     */
-    static public function nl2Br($string) {
-        return nl2Br($string);
-    }
-
-    /**
-     * 如果 magic_quotes_gpc 为关闭状态，这个函数可以转义字符串
-     * @access public
-     * @param string $string 要处理的字符串
-     * @return string
-     */
-    static public function addSlashes($string) {
-        return addslashes($string);
-    }
-
-    /**
-     * 用于在textbox表单中显示html代码
-     * @access public
-     * @param string $string 要处理的字符串
-     * @return string
-     */
-    static function hsc($string) {
-        return preg_replace(["/&amp;/i", "/&nbsp;/i"], ['&', '&amp;nbsp;'], htmlspecialchars($string, ENT_QUOTES));
-    }
-
-    /**
-     * 是hsc()方法的逆操作
-     * @access public
-     * @param string $text 要处理的字符串
-     * @return string
-     */
-    static function undoHsc($text) {
-        return preg_replace(["/&gt;/i", "/&lt;/i", "/&quot;/i", "/&#039;/i", '/&amp;nbsp;/i'], [">", "<", "\"", "'", "&nbsp;"], $text);
-    }
-
-    /**
-     * 输出安全的html，用于过滤危险代码
-     * @access public
-     * @param string $text 要处理的字符串
-     * @param mixed $allowTags 允许的标签列表，如 table|td|th|td
-     * @return string
-     */
-    static public function safeHtml($text, $allowTags = null) {
-        $text =  trim($text);
-        //完全过滤注释
-        $text = preg_replace('/<!--?.*-->/','',$text);
-        //完全过滤动态代码
-        $text =  preg_replace('/<\?|\?'.'>/','',$text);
-        //完全过滤js
-        $text = preg_replace('/<script?.*\/script>/','',$text);
-
-        $text =  str_replace('[','&#091;',$text);
-        $text = str_replace(']','&#093;',$text);
-        $text =  str_replace('|','&#124;',$text);
-        //过滤换行符
-        $text = preg_replace('/\r?\n/','',$text);
-        //br
-        $text =  preg_replace('/<br(\s\/)?'.'>/i','[br]',$text);
-        $text = preg_replace('/(\[br\]\s*){10,}/i','[br]',$text);
-        //过滤危险的属性，如：过滤on事件lang js
-        while(preg_match('/(<[^><]+)(lang|on|action|background|codebase|dynsrc|lowsrc)[^><]+/i',$text,$mat)){
-            $text=str_replace($mat[0],$mat[1],$text);
-        }
-        while(preg_match('/(<[^><]+)(window\.|javascript:|js:|about:|file:|document\.|vbs:|cookie)([^><]*)/i',$text,$mat)){
-            $text=str_replace($mat[0],$mat[1].$mat[3],$text);
-        }
-        if( empty($allowTags) ) { $allowTags = self::$htmlTags['allow']; }
-        //允许的HTML标签
-        $text =  preg_replace('/<('.$allowTags.')( [^><\[\]]*)>/i','[\1\2]',$text);
-        //过滤多余html
-        if ( empty($banTag) ) { $banTag = self::$htmlTags['ban']; }
-        $text =  preg_replace('/<\/?('.$banTag.')[^><]*>/i','',$text);
-        //过滤合法的html标签
-        while(preg_match('/<([a-z]+)[^><\[\]]*>[^><]*<\/\1>/i',$text,$mat)){
-            $text=str_replace($mat[0],str_replace('>',']',str_replace('<','[',$mat[0])),$text);
-        }
-        //转换引号
-        while(preg_match('/(\[[^\[\]]*=\s*)(\"|\')([^\2=\[\]]+)\2([^\[\]]*\])/i',$text,$mat)){
-            $text=str_replace($mat[0],$mat[1].'|'.$mat[3].'|'.$mat[4],$text);
-        }
-        //空属性转换
-        $text =  str_replace('\'\'','||',$text);
-        $text = str_replace('""','||',$text);
-        //过滤错误的单个引号
-        while(preg_match('/\[[^\[\]]*(\"|\')[^\[\]]*\]/i',$text,$mat)){
-            $text=str_replace($mat[0],str_replace($mat[1],'',$mat[0]),$text);
-        }
-        //转换其它所有不合法的 < >
-        $text =  str_replace('<','&lt;',$text);
-        $text = str_replace('>','&gt;',$text);
-        $text = str_replace('"','&quot;',$text);
-        //反转换
-        $text =  str_replace('[','<',$text);
-        $text =  str_replace(']','>',$text);
-        $text =  str_replace('|','"',$text);
-        //过滤多余空格
-        $text =  str_replace('  ',' ',$text);
-        return $text;
-    }
-
-    /**
-     * 删除html标签，得到纯文本。可以处理嵌套的标签
-     * @access public
-     * @param string $string 要处理的html
-     * @return string
-     */
-    static public function deleteHtmlTags($string) {
-        while(strstr($string, '>')) {
-            $currentBeg = strpos($string, '<');
-            $currentEnd = strpos($string, '>');
-            $tmpStringBeg = @substr($string, 0, $currentBeg);
-            $tmpStringEnd = @substr($string, $currentEnd + 1, strlen($string));
-            $string = $tmpStringBeg.$tmpStringEnd;
-        }
-        return $string;
-    }
-
-    /**
-     * 处理文本中的换行
-     * @access public
-     * @param string $string 要处理的字符串
-     * @param mixed $br 对换行的处理，
-     *        false：去除换行；true：保留原样；string：替换成string
-     * @return string
-     */
-    static public function nl2($string, $br = '<br />') {
-        if ($br == false) {
-            $string = preg_replace("/(\015\012)|(\015)|(\012)/", '', $string);
-        } elseif ($br != true){
-            $string = preg_replace("/(\015\012)|(\015)|(\012)/", $br, $string);
-        }
-        return $string;
-    }
-}
diff --git a/library/org/image.php b/library/org/image.php
index f0c3d353..92c8f591 100644
--- a/library/org/image.php
+++ b/library/org/image.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2010 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/org/oauth.php b/library/org/oauth.php
index c7b3de70..48a6b436 100644
--- a/library/org/oauth.php
+++ b/library/org/oauth.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2013 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/org/parser.php b/library/org/parser.php
index 9c7921e5..460eb651 100644
--- a/library/org/parser.php
+++ b/library/org/parser.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/org/transform.php b/library/org/transform.php
index 662ddd97..6fd1226c 100644
--- a/library/org/transform.php
+++ b/library/org/transform.php
@@ -1,12 +1,12 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
-// | Author: 麦当苗儿 <zuojiazi.cn@gmail.com> <http://www.zjzit.cn>
+// | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
 
 namespace think;
diff --git a/library/org/upload.php b/library/org/upload.php
index 338898f8..11cd13a1 100644
--- a/library/org/upload.php
+++ b/library/org/upload.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/org/validate.php b/library/org/validate.php
index d6837799..d74aab07 100644
--- a/library/org/validate.php
+++ b/library/org/validate.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/app.php b/library/think/app.php
index d3862629..dfb66a62 100644
--- a/library/think/app.php
+++ b/library/think/app.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/cache.php b/library/think/cache.php
index 2a986c70..b2dee9a8 100644
--- a/library/think/cache.php
+++ b/library/think/cache.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | ThinkCache
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2006-2012 http://thinkphp.cn All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/cache/driver/apc.php b/library/think/cache/driver/apc.php
index 42545c0d..9af3d6a1 100644
--- a/library/think/cache/driver/apc.php
+++ b/library/think/cache/driver/apc.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | ThinkCache
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2006-2012 http://thinkphp.cn All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/cache/driver/db.php b/library/think/cache/driver/db.php
index 00551a35..848665aa 100644
--- a/library/think/cache/driver/db.php
+++ b/library/think/cache/driver/db.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | ThinkCache
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2006-2012 http://thinkphp.cn All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/cache/driver/eaccelerator.php b/library/think/cache/driver/eaccelerator.php
index 625fee74..af49a8c4 100644
--- a/library/think/cache/driver/eaccelerator.php
+++ b/library/think/cache/driver/eaccelerator.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | ThinkCache
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2006-2012 http://thinkphp.cn All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/cache/driver/file.php b/library/think/cache/driver/file.php
index 60ba51ec..0a33755f 100644
--- a/library/think/cache/driver/file.php
+++ b/library/think/cache/driver/file.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | ThinkCache
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2006-2012 http://thinkphp.cn All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/cache/driver/memcache.php b/library/think/cache/driver/memcache.php
index 0cdb534c..796b98fc 100644
--- a/library/think/cache/driver/memcache.php
+++ b/library/think/cache/driver/memcache.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | ThinkCache
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2006-2012 http://thinkphp.cn All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/cache/driver/redis.php b/library/think/cache/driver/redis.php
index e7895a9b..c56dda3a 100644
--- a/library/think/cache/driver/redis.php
+++ b/library/think/cache/driver/redis.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | ThinkCache
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2006-2012 http://thinkphp.cn All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/cache/driver/secache.php b/library/think/cache/driver/secache.php
index 40130475..0b066a08 100644
--- a/library/think/cache/driver/secache.php
+++ b/library/think/cache/driver/secache.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | ThinkCache
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2006-2012 http://thinkphp.cn All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/cache/driver/simple.php b/library/think/cache/driver/simple.php
index 48f40193..2ba515c7 100644
--- a/library/think/cache/driver/simple.php
+++ b/library/think/cache/driver/simple.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | ThinkCache
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2006-2012 http://thinkphp.cn All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/cache/driver/sqlite.php b/library/think/cache/driver/sqlite.php
index 22261e8c..8a733143 100644
--- a/library/think/cache/driver/sqlite.php
+++ b/library/think/cache/driver/sqlite.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | ThinkCache
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2006-2012 http://thinkphp.cn All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/cache/driver/wincache.php b/library/think/cache/driver/wincache.php
index 6dfeaa08..bf0a7cdf 100644
--- a/library/think/cache/driver/wincache.php
+++ b/library/think/cache/driver/wincache.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | ThinkCache
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2006-2012 http://thinkphp.cn All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/cache/driver/xcache.php b/library/think/cache/driver/xcache.php
index 9a9b08fa..291ca738 100644
--- a/library/think/cache/driver/xcache.php
+++ b/library/think/cache/driver/xcache.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | ThinkCache
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2006-2012 http://thinkphp.cn All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/config.php b/library/think/config.php
index 260b159e..c44fe49f 100644
--- a/library/think/config.php
+++ b/library/think/config.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
@@ -25,7 +25,7 @@ class Config {
         if(empty($type)) {
             $type   =   substr(strrchr($config, '.'),1);
         }
-        $class  =   '\Think\Config\Driver\\'.ucwords($type);
+        $class  =   '\\think\\config\driver\\'.ucwords($type);
         self::set((new $class())->parse($config),'',$range);
     }
 
diff --git a/library/think/config/driver/ini.php b/library/think/config/driver/ini.php
index bfa33da0..8e29bece 100644
--- a/library/think/config/driver/ini.php
+++ b/library/think/config/driver/ini.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2013 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/config/driver/xml.php b/library/think/config/driver/xml.php
index a77e5ae8..d740bdd2 100644
--- a/library/think/config/driver/xml.php
+++ b/library/think/config/driver/xml.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2013 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/controller.php b/library/think/controller.php
index 61f4b7f7..270f1960 100644
--- a/library/think/controller.php
+++ b/library/think/controller.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/controller/Amf.php b/library/think/controller/Amf.php
index b545a926..fe636084 100644
--- a/library/think/controller/Amf.php
+++ b/library/think/controller/Amf.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2006-2012 http://thinkphp.cn All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/controller/Phprpc.php b/library/think/controller/Phprpc.php
index 27246055..20ec4de2 100644
--- a/library/think/controller/Phprpc.php
+++ b/library/think/controller/Phprpc.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2006-2012 http://thinkphp.cn All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/controller/Rest.php b/library/think/controller/Rest.php
index 460b631f..b73dbe56 100644
--- a/library/think/controller/Rest.php
+++ b/library/think/controller/Rest.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2006-2012 http://thinkphp.cn All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/cookie.php b/library/think/cookie.php
index 2555b280..ebc5525c 100644
--- a/library/think/cookie.php
+++ b/library/think/cookie.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/create.php b/library/think/create.php
index 6b377003..61d5ce39 100644
--- a/library/think/create.php
+++ b/library/think/create.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2013 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/db.php b/library/think/db.php
index be973f49..f1d7ed19 100644
--- a/library/think/db.php
+++ b/library/think/db.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
@@ -33,7 +33,7 @@ class Db {
             // 解析连接参数 支持数组和字符串
             $options    =   self::parseConfig($config);
             // 如果采用lite方式 仅支持原生SQL 包括query和execute方法
-            $class  =   $lite?  'Think\Db\Lite' :   'Think\\Db\\Driver\\'.ucwords($options['type']);
+            $class  =   $lite?  'think\db\Lite' :   'think\\db\\driver\\'.ucwords($options['type']);
             self::$instance[$md5]   =   new $class($options);
         }
         self::$_instance    =   self::$instance[$md5];
diff --git a/library/think/db/driver.php b/library/think/db/driver.php
index c068d19d..b07dfb8d 100644
--- a/library/think/db/driver.php
+++ b/library/think/db/driver.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/db/driver/mongo.php b/library/think/db/driver/mongo.php
index 6fdb6f12..32c69281 100644
--- a/library/think/db/driver/mongo.php
+++ b/library/think/db/driver/mongo.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2006-2012 http://thinkphp.cn All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
@@ -10,7 +10,7 @@
 // +----------------------------------------------------------------------
 
 namespace think\db\driver;
-use think\db\driver;
+use think\db\Driver;
 
 /**
  * Mongo数据库驱动
diff --git a/library/think/db/driver/mysql.php b/library/think/db/driver/mysql.php
index e7d68859..d51bf815 100644
--- a/library/think/db/driver/mysql.php
+++ b/library/think/db/driver/mysql.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2006-2012 http://thinkphp.cn All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
@@ -10,7 +10,7 @@
 // +----------------------------------------------------------------------
 
 namespace think\db\driver;
-use think\db\driver;
+use think\db\Driver;
 
 /**
  * mysql数据库驱动 
diff --git a/library/think/db/driver/oracle.php b/library/think/db/driver/oracle.php
index d9dd2836..53c25df9 100644
--- a/library/think/db/driver/oracle.php
+++ b/library/think/db/driver/oracle.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2006-2012 http://thinkphp.cn All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
@@ -10,7 +10,7 @@
 // +----------------------------------------------------------------------
 
 namespace think\db\driver;
-use think\db\driver;
+use think\db\Driver;
 
 /**
  * Oracle数据库驱动
diff --git a/library/think/db/driver/pgsql.php b/library/think/db/driver/pgsql.php
index f9bb7243..89e181f1 100644
--- a/library/think/db/driver/pgsql.php
+++ b/library/think/db/driver/pgsql.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2006-2012 http://thinkphp.cn All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
@@ -10,7 +10,7 @@
 // +----------------------------------------------------------------------
 
 namespace think\db\driver;
-use think\db\driver;
+use think\db\Driver;
 
 /**
  * Pgsql数据库驱动
diff --git a/library/think/db/driver/sqlite.php b/library/think/db/driver/sqlite.php
index d670df4e..d0f6acb8 100644
--- a/library/think/db/driver/sqlite.php
+++ b/library/think/db/driver/sqlite.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2006-2012 http://thinkphp.cn All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
@@ -10,7 +10,7 @@
 // +----------------------------------------------------------------------
 
 namespace think\db\driver;
-use think\db\driver;
+use think\db\Driver;
 
 /**
  * Sqlite数据库驱动
diff --git a/library/think/db/driver/sqlsrv.php b/library/think/db/driver/sqlsrv.php
index 141ebd01..2eb965b5 100644
--- a/library/think/db/driver/sqlsrv.php
+++ b/library/think/db/driver/sqlsrv.php
@@ -10,7 +10,7 @@
 // +----------------------------------------------------------------------
 
 namespace think\db\driver;
-use think\db\driver;
+use think\db\Driver;
 use PDO;
 
 /**
diff --git a/library/think/db/lite.php b/library/think/db/lite.php
index 6d50dd43..e3117ebf 100644
--- a/library/think/db/lite.php
+++ b/library/think/db/lite.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/debug.php b/library/think/debug.php
index 82fe911f..91f26fcc 100644
--- a/library/think/debug.php
+++ b/library/think/debug.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/error.php b/library/think/error.php
index 32bca00b..65c6cad1 100644
--- a/library/think/error.php
+++ b/library/think/error.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/exception.php b/library/think/exception.php
index 5d959cf8..6e97d08b 100644
--- a/library/think/exception.php
+++ b/library/think/exception.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/hook.php b/library/think/hook.php
index a1ad0716..d8bb4e2e 100644
--- a/library/think/hook.php
+++ b/library/think/hook.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/input.php b/library/think/input.php
index d05796a2..2940eaf5 100644
--- a/library/think/input.php
+++ b/library/think/input.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
@@ -15,6 +15,125 @@ class Input {
     // 全局过滤规则
     static $filter  =   null;
 
+    /**
+     * 获取get变量
+     * @access public
+     * @param string $name 数据名称
+     * @param string $default 默认值     
+     * @param string $filter 过滤方法   
+     * @return mixed
+     */
+    static public function get($name='',$default=null,$filter='') {
+        return self::getData($name,$_GET,$filter,$default);
+    }
+
+    /**
+     * 获取post变量
+     * @access public
+     * @param string $name 数据名称
+     * @param string $default 默认值     
+     * @param string $filter 过滤方法   
+     * @return mixed
+     */
+    static public function post($name='',$default=null,$filter='') {
+        return self::getData($name,$_POST,$filter,$default);
+    }
+
+    /**
+     * 获取put变量
+     * @access public
+     * @param string $name 数据名称
+     * @param string $default 默认值     
+     * @param string $filter 过滤方法   
+     * @return mixed
+     */
+    static public function put($name='',$default=null,$filter='') {
+        static $_PUT    =   null;    
+        if(is_null($_PUT)){
+            parse_str(file_get_contents('php://input'), $_PUT);
+        }
+        return self::getData($name,$_PUT,$filter,$default);
+    }
+
+    /**
+     * 获取post变量
+     * @access public
+     * @param string $name 数据名称
+     * @param string $default 默认值     
+     * @param string $filter 过滤方法   
+     * @return mixed
+     */
+    static public function param($name='',$default=null,$filter='') {
+        switch($_SERVER['REQUEST_METHOD']) {
+            case 'POST':
+                return self::post($name,$default,$filter);
+            case 'PUT':
+                return self::put($name,$default,$filter);
+            default:
+                return self::get($name,$default,$filter);
+        }        
+    }
+
+    /**
+     * 获取request变量
+     * @access public
+     * @param string $name 数据名称
+     * @param string $default 默认值     
+     * @param string $filter 过滤方法   
+     * @return mixed
+     */
+    static public function request($name='',$default=null,$filter='') {
+        return self::getData($name,$_REQUEST,$filter,$default);
+    }
+
+    /**
+     * 获取session变量
+     * @access public
+     * @param string $name 数据名称
+     * @param string $default 默认值     
+     * @param string $filter 过滤方法   
+     * @return mixed
+     */
+    static public function session($name='',$default=null,$filter='') {
+        return self::getData($name,$_SESSION,$filter,$default);
+    }
+
+    /**
+     * 获取cookie变量
+     * @access public
+     * @param string $name 数据名称
+     * @param string $default 默认值     
+     * @param string $filter 过滤方法   
+     * @return mixed
+     */
+    static public function cookie($name='',$default=null,$filter='') {
+        return self::getData($name,$_COOKIE,$filter,$default);
+    }
+
+    /**
+     * 获取post变量
+     * @access public
+     * @param string $name 数据名称
+     * @param string $default 默认值     
+     * @param string $filter 过滤方法   
+     * @return mixed
+     */
+    static public function server($name='',$default=null,$filter='') {
+        return self::getData($name,$_SERVER,$filter,$default);
+    }
+
+    /**
+     * 获取GLOBALS变量
+     * @access public
+     * @param string $name 数据名称
+     * @param string $default 默认值     
+     * @param string $filter 过滤方法   
+     * @return mixed
+     */
+    static public function globals($name='',$default=null,$filter='') {
+        return self::getData($name,$GLOBALS,$filter,$default);
+    }
+
     /**
      * 获取系统变量 支持过滤和默认值
      * @access public
@@ -22,73 +141,16 @@ class Input {
      * @param array $args 参数 array(key,filter,default)
      * @return mixed
      */
-    static public function __callStatic($method,$args=[]) {
-        static $_PUT    =   null;    
-        $name           =   $args[0];        
-        $default        =   isset($args[2]) ? $args[2] : null;
+    static private function getData($name,$input,$filter,$default) {
         if(strpos($name,'/')){ // 指定修饰符
             list($name,$type)   =   explode('/',$name,2);
         }else{ // 默认强制转换为字符串
             $type   =   's';
-        }
-        switch(strtolower($method)) {
-            case 'get'     :   
-                $input =& $_GET;
-                break;
-            case 'post'    :   
-                $input =& $_POST;
-                break;
-            case 'put'     :   
-                if(is_null($_PUT)){
-                    parse_str(file_get_contents('php://input'), $_PUT);
-                }
-                $input  =   $_PUT;
-                break;
-            case 'param'   :
-                switch($_SERVER['REQUEST_METHOD']) {
-                    case 'POST':
-                        $input  =  $_POST;
-                        break;
-                    case 'PUT':
-                        if(is_null($_PUT)){
-                            parse_str(file_get_contents('php://input'), $_PUT);
-                        }
-                        $input  =   $_PUT;
-                        break;
-                    default:
-                        $input  =  $_GET;
-                }
-                break;
-            case 'path'    :   
-                $input  =   [];
-                if(!empty($_SERVER['PATH_INFO'])){
-                    $depr   =   Config::get('url_pathinfo_depr');
-                    $input  =   explode($depr,trim($_SERVER['PATH_INFO'],$depr));            
-                }
-                break;
-            case 'request' :   
-                $input =& $_REQUEST;   
-                break;
-            case 'session' :   
-                $input =& $_SESSION;   
-                break;
-            case 'cookie'  :   
-                $input =& $_COOKIE;    
-                break;
-            case 'server'  :   
-                $input =& $_SERVER;    
-                break;
-            case 'globals' :   
-                $input =& $GLOBALS;    
-                break;
-            default:
-                return null;
-        }
-
+        }        
+        $filters    =   isset($filter)? $filter : self::$filter;
         if(''==$name) { // 获取全部变量
             $data       =   $input;
-            if(isset(self::$filter)) {
-                $filter =   self::$filter;
+            if($filters) {
                 if(is_string($filters)){
                     $filters    =   explode(',',$filters);
                 }
@@ -98,8 +160,7 @@ class Input {
             }
         }elseif(isset($input[$name])) { // 取值操作
             $data       =   $input[$name];
-            if(!empty($args[1])) {
-                $filters    =   explode(',',$args[1]);
+            if($filters) {
                 if(is_string($filters)){
                     if(0 === strpos($filters,'/')){
                         if(1 !== preg_match($filters,(string)$data)){
@@ -163,7 +224,7 @@ class Input {
     }
 
     static public function filter($filter, $data) {
-        $result = array();
+        $result = [];
         foreach ($data as $key => $val) {
             $result[$key] = is_array($val)
              ? self::filter($filter, $val)
diff --git a/library/think/lang.php b/library/think/lang.php
index 72d5dfe8..6a0e21a2 100644
--- a/library/think/lang.php
+++ b/library/think/lang.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/loader.php b/library/think/loader.php
index 8f82937c..e66ed23e 100644
--- a/library/think/loader.php
+++ b/library/think/loader.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/log.php b/library/think/log.php
index 6835c911..bb2aec8f 100644
--- a/library/think/log.php
+++ b/library/think/log.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
@@ -20,7 +20,7 @@ class Log {
     // 日志初始化
     static public function init($config=[]){
         $type   =   isset($config['type'])?$config['type']:'File';
-        $class  =   'Think\\Log\\Driver\\'. ucwords($type);
+        $class  =   '\\think\\log\\driver\\'. ucwords($type);
         unset($config['type']);
         self::$storage = new $class($config);
     }
diff --git a/library/think/log/driver/file.php b/library/think/log/driver/file.php
index be23dca9..1231d72c 100644
--- a/library/think/log/driver/file.php
+++ b/library/think/log/driver/file.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/model.php b/library/think/model.php
index 3682fee4..9b123042 100644
--- a/library/think/model.php
+++ b/library/think/model.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/model/ExtendModel.php b/library/think/model/extend_model.php
similarity index 83%
rename from library/think/model/ExtendModel.php
rename to library/think/model/extend_model.php
index 335d3498..b770c42d 100644
--- a/library/think/model/ExtendModel.php
+++ b/library/think/model/extend_model.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
@@ -17,5 +17,5 @@ T('think/model/extend');
 T('think/model/query');
 
 class ExtendModel extends \think\model {
-	use extend, query;
+    use extend, query;
 }
\ No newline at end of file
diff --git a/library/think/model/MongoModel.php b/library/think/model/mongo_model.php
similarity index 99%
rename from library/think/model/MongoModel.php
rename to library/think/model/mongo_model.php
index fedcf843..41d52e39 100644
--- a/library/think/model/MongoModel.php
+++ b/library/think/model/mongo_model.php
@@ -2,7 +2,7 @@
 // +----------------------------------------------------------------------
 // | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2010 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/model/RelationModel.php b/library/think/model/relation_model.php
similarity index 79%
rename from library/think/model/RelationModel.php
rename to library/think/model/relation_model.php
index 3e142d84..dd86a521 100644
--- a/library/think/model/RelationModel.php
+++ b/library/think/model/relation_model.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
@@ -13,5 +13,5 @@ namespace think\model;
 
 T('think/model/relation');
 class RelationModel extends \think\model {
-	use \traits\think\model\relation;
+    use \traits\think\model\relation;
 }
\ No newline at end of file
diff --git a/library/think/model/ViewModel.php b/library/think/model/view_model.php
similarity index 79%
rename from library/think/model/ViewModel.php
rename to library/think/model/view_model.php
index 39bce566..cad50e04 100644
--- a/library/think/model/ViewModel.php
+++ b/library/think/model/view_model.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
@@ -13,5 +13,5 @@ namespace think\model;
 
 T('think/model/view');
 class ViewModel extends \think\model {
-	use \traits\think\model\view;
+    use \traits\think\model\view;
 }
\ No newline at end of file
diff --git a/library/think/route.php b/library/think/route.php
index 55b3b61d..7a293773 100644
--- a/library/think/route.php
+++ b/library/think/route.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/seesion/driver.php b/library/think/seesion/driver.php
index 6cac339a..aa26375e 100644
--- a/library/think/seesion/driver.php
+++ b/library/think/seesion/driver.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2013 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/session.php b/library/think/session.php
index fa739883..54081b18 100644
--- a/library/think/session.php
+++ b/library/think/session.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
@@ -21,9 +21,9 @@ class Session {
      */
     static public function prefix($prefix=''){
         if(empty($prefix)) {
-            return self::$config['prefix'];
+            return self::$prefix;
         }else{
-            self::$config['prefix']   =   $prefix;
+            self::$prefix   =   $prefix;
         }
     }
 
@@ -36,12 +36,9 @@ class Session {
         if(isset($config['prefix'])){
             self::$prefix  =   $config['prefix'];
         }
-        if(isset($config['var_session_id']) && isset($_REQUEST[$config['var_session_id']])){
-            session_id($_REQUEST[$config['var_session_id']]);
-        }elseif(isset($config['id'])) {
+        if(isset($config['id'])) {
             session_id($config['id']);
         }
-        ini_set('session.auto_start', 0);
         if(isset($config['name'])){        
             session_name($config['name']);
         }
@@ -51,9 +48,9 @@ class Session {
         if(isset($config['domain']))  {        
             ini_set('session.cookie_domain', $config['domain']);
         }
-        if(isset($name['expire']))          {
-            ini_set('session.gc_maxlifetime',   $name['expire']);
-            ini_set('session.cookie_lifetime',  $name['expire']);
+        if(isset($config['expire']))          {
+            ini_set('session.gc_maxlifetime',   $config['expire']);
+            ini_set('session.cookie_lifetime',  $config['expire']);
         }
         if(isset($config['use_trans_sid'])) { 
             ini_set('session.use_trans_sid', $config['use_trans_sid']?1:0);
@@ -68,14 +65,16 @@ class Session {
             session_cache_expire($config['cache_expire']);
         }
         if(!empty($config['type'])) { // 读取session驱动
-            $class      = 'Think\\Session\\Driver\\'. ucwords(strtolower($config['type']));
+            $class      = '\\think\\session\\driver\\'. ucwords(strtolower($config['type']));
             // 检查驱动类
             session_set_save_handler(new $class());
         }
         // 启动session
-        if($config['auto_start']) {
+        if(!empty($config['auto_start'])){
+            ini_set('session.auto_start', 0);
             session_start();
-        }
+        }        
+
     }
 
     /**
@@ -186,25 +185,38 @@ class Session {
     }
 
     /**
-     * session管理
-     * @param string $name session操作名称
+     * 暂停session
      * @return void
      */
-    static private function operate($name) {
-        if('pause'==$name){ // 暂停session
-            session_write_close();
-        }elseif('start'==$name){ // 启动session
-            session_start();
-        }elseif('destroy'==$name){ // 销毁session
-            $_SESSION =  [];
-            session_unset();
-            session_destroy();
-        }elseif('regenerate'==$name){ // 重新生成id
-            session_regenerate_id();
-        }
+    static public function pause() {
+        // 暂停session
+        session_write_close();
     }
 
-    static public function __callStatic($name,$args) {
-        self::operate($name);
+    /**
+     * 启动session
+     * @return void
+     */
+    static public function start() {
+        session_start();
     }
+
+    /**
+     * 销毁session
+     * @return void
+     */
+    static public function destroy() {
+        $_SESSION =  [];
+        session_unset();
+        session_destroy();
+    }
+
+    /**
+     * 重新生成session_id
+     * @return void
+     */
+    static private function regenerate() {
+        session_regenerate_id();
+    }
+
 }
diff --git a/library/think/template.php b/library/think/template.php
index d44fb679..b937ece7 100644
--- a/library/think/template.php
+++ b/library/think/template.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | ThinkTemplate -- ThinkPHP Template
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2013 http://thinkphp.cn All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/template/driver/file.php b/library/think/template/driver/file.php
index 7181db4d..b30aa811 100644
--- a/library/think/template/driver/file.php
+++ b/library/think/template/driver/file.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/template/taglib.php b/library/think/template/taglib.php
index b01499d5..26d3f61f 100644
--- a/library/think/template/taglib.php
+++ b/library/think/template/taglib.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2013 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/url.php b/library/think/url.php
index 24aead79..b9caddfe 100644
--- a/library/think/url.php
+++ b/library/think/url.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/view.php b/library/think/view.php
index eedf5e75..a69cc35b 100644
--- a/library/think/view.php
+++ b/library/think/view.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/library/think/view/driver/think.php b/library/think/view/driver/think.php
index 30d82d7a..3a2dc980 100644
--- a/library/think/view/driver/think.php
+++ b/library/think/view/driver/think.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/mode/common.php b/mode/common.php
index d8e20766..091091b4 100644
--- a/mode/common.php
+++ b/mode/common.php
@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-namespace Think;      
+   
 /**
  * ThinkPHP 普通模式定义
  */
diff --git a/start.php b/start.php
index f75590ac..993085c3 100644
--- a/start.php
+++ b/start.php
@@ -1,15 +1,15 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
 
-namespace Think;
+namespace think;
 
 //--------------------------
 // ThinkPHP 引导文件
diff --git a/traits/think/model/auto.php b/traits/think/model/auto.php
index 54f1d444..5f2f871d 100644
--- a/traits/think/model/auto.php
+++ b/traits/think/model/auto.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/traits/think/model/extend.php b/traits/think/model/extend.php
index a7435e8d..bcf021e0 100644
--- a/traits/think/model/extend.php
+++ b/traits/think/model/extend.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/traits/think/model/query.php b/traits/think/model/query.php
index 45baba5f..fb0a172f 100644
--- a/traits/think/model/query.php
+++ b/traits/think/model/query.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/traits/think/model/relation.php b/traits/think/model/relation.php
index 92ec7a6e..74f08eb3 100644
--- a/traits/think/model/relation.php
+++ b/traits/think/model/relation.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
diff --git a/traits/think/model/view.php b/traits/think/model/view.php
index 9e900ec3..14818d30 100644
--- a/traits/think/model/view.php
+++ b/traits/think/model/view.php
@@ -1,8 +1,8 @@
 <?php
 // +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
 // +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------