session类和input类调整

注释调整

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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);
     }
 

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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];

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 )
 // +----------------------------------------------------------------------

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数据库驱动

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数据库驱动 

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数据库驱动

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数据库驱动

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数据库驱动

library/think/db/driver/sqlsrv.php

@@ -10,7 +10,7 @@
 // +----------------------------------------------------------------------
 
 namespace think\db\driver;
-use think\db\driver;
+use think\db\Driver;
 use PDO;
 
 /**

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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)

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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);
     }

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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;
 }

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 )
 // +----------------------------------------------------------------------

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;
 }

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;
 }

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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();
+    }
+
 }

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------

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 )
 // +----------------------------------------------------------------------