From 732a694846c6a057c4aab2bac10bcf22e633e189 Mon Sep 17 00:00:00 2001 From: ThinkPHP Date: Sun, 14 Apr 2013 19:28:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E7=B1=BB=E5=BA=93=E4=BB=8ETh?= =?UTF-8?q?ink=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4=E7=A7=BB=E5=88=B0Org=20?= =?UTF-8?q?Think=E7=9B=AE=E5=BD=95=E7=A7=BB=E5=85=A5Library=E7=9B=AE?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- {Think => Library/Org}/Crypt.php | 4 ++-- {Think => Library/Org}/Image.php | 6 ++---- {Think => Library/Org}/Image/Driver/Gd.php | 4 ++-- {Think => Library/Org}/Image/Driver/Gif.php | 2 +- {Think => Library/Org}/Image/Driver/Imagick.php | 5 ++--- {Think => Library/Org}/Oauth.php | 6 +++--- {Think => Library/Org}/Oauth/Driver.php | 3 +-- {Think => Library/Org}/Oauth/Driver/Baidu.php | 4 ++-- {Think => Library/Org}/Oauth/Driver/Diandian.php | 4 ++-- {Think => Library/Org}/Oauth/Driver/Douban.php | 4 ++-- {Think => Library/Org}/Oauth/Driver/Github.php | 4 ++-- {Think => Library/Org}/Oauth/Driver/Google.php | 4 ++-- {Think => Library/Org}/Oauth/Driver/Kaixin.php | 4 ++-- {Think => Library/Org}/Oauth/Driver/Msn.php | 4 ++-- {Think => Library/Org}/Oauth/Driver/Qq.php | 4 ++-- {Think => Library/Org}/Oauth/Driver/Renren.php | 4 ++-- {Think => Library/Org}/Oauth/Driver/Sina.php | 4 ++-- {Think => Library/Org}/Oauth/Driver/Sohu.php | 4 ++-- {Think => Library/Org}/Oauth/Driver/T163.php | 4 ++-- {Think => Library/Org}/Oauth/Driver/Taobao.php | 4 ++-- {Think => Library/Org}/Oauth/Driver/Tencent.php | 4 ++-- {Think => Library/Org}/Oauth/Driver/X360.php | 4 ++-- {Think => Library/Org}/Parser.php | 5 ++--- {Think => Library/Org}/Parser/Driver/Markdown.php | 2 +- {Think => Library/Org}/Parser/Driver/Ubb.php | 2 +- Library/Org/README.md | 1 - {Think => Library/Org}/Upload.php | 4 ++-- {Think => Library/Think}/App.php | 0 {Think => Library/Think}/Auto.php | 0 {Think => Library/Think}/Behavior/ContentReplace.php | 0 {Think => Library/Think}/Behavior/LocationTemplate.php | 0 {Think => Library/Think}/Behavior/ReadHtmlCache.php | 0 {Think => Library/Think}/Behavior/ShowPageTrace.php | 0 {Think => Library/Think}/Behavior/TokenBuild.php | 0 {Think => Library/Think}/Cache.php | 0 {Think => Library/Think}/Cache/Driver/Apc.php | 0 {Think => Library/Think}/Cache/Driver/Db.php | 0 {Think => Library/Think}/Cache/Driver/Eaccelerator.php | 0 {Think => Library/Think}/Cache/Driver/File.php | 0 {Think => Library/Think}/Cache/Driver/Memcache.php | 0 {Think => Library/Think}/Cache/Driver/Redis.php | 0 {Think => Library/Think}/Cache/Driver/Secache.php | 0 {Think => Library/Think}/Cache/Driver/Simple.php | 0 {Think => Library/Think}/Cache/Driver/Sqlite.php | 0 {Think => Library/Think}/Cache/Driver/Wincache.php | 0 {Think => Library/Think}/Cache/Driver/Xcache.php | 0 {Think => Library/Think}/Config.php | 0 {Think => Library/Think}/Config/Driver/Ini.php | 0 {Think => Library/Think}/Config/Driver/Xml.php | 0 {Think => Library/Think}/Controller.php | 0 {Think => Library/Think}/Controller/Amf.php | 0 {Think => Library/Think}/Controller/Phprpc.php | 0 {Think => Library/Think}/Controller/Rest.php | 0 {Think => Library/Think}/Cookie.php | 0 {Think => Library/Think}/Create.php | 0 {Think => Library/Think}/Db.php | 0 {Think => Library/Think}/Db/Driver.php | 0 {Think => Library/Think}/Db/Driver/Mysql.php | 0 {Think => Library/Think}/Db/Driver/Oracle.php | 0 {Think => Library/Think}/Db/Driver/Pgsql.php | 0 {Think => Library/Think}/Db/Driver/Sqlite.php | 0 {Think => Library/Think}/Db/Driver/Sqlsrv.php | 0 {Think => Library/Think}/Db/Lite.php | 0 {Think => Library/Think}/Debug.php | 0 {Think => Library/Think}/Error.php | 0 {Think => Library/Think}/Exception.php | 0 {Think => Library/Think}/Filter.php | 0 {Think => Library/Think}/Input.php | 0 {Think => Library/Think}/Lang.php | 0 {Think => Library/Think}/Loader.php | 0 {Think => Library/Think}/Log.php | 0 {Think => Library/Think}/Log/Driver/File.php | 0 {Think => Library/Think}/Model.php | 0 {Think => Library/Think}/Model/Lite.php | 0 {Think => Library/Think}/Route.php | 0 {Think => Library/Think}/Seesion/Driver.php | 0 {Think => Library/Think}/Session.php | 0 {Think => Library/Think}/Tag.php | 0 {Think => Library/Think}/Template.php | 0 {Think => Library/Think}/Template/Driver/File.php | 0 {Think => Library/Think}/Template/TagLib.php | 0 {Think => Library/Think}/Template/TagLib/Cx.php | 0 {Think => Library/Think}/Url.php | 0 {Think => Library/Think}/Validate.php | 0 {Think => Library/Think}/View.php | 0 {Think => Library/Think}/View/Driver/Think.php | 0 base.php | 5 +++-- 87 files changed, 52 insertions(+), 57 deletions(-) rename {Think => Library/Org}/Crypt.php (98%) rename {Think => Library/Org}/Image.php (93%) rename {Think => Library/Org}/Image/Driver/Gd.php (99%) rename {Think => Library/Org}/Image/Driver/Gif.php (99%) rename {Think => Library/Org}/Image/Driver/Imagick.php (99%) rename {Think => Library/Org}/Oauth.php (96%) rename {Think => Library/Org}/Oauth/Driver.php (99%) rename {Think => Library/Org}/Oauth/Driver/Baidu.php (98%) rename {Think => Library/Org}/Oauth/Driver/Diandian.php (98%) rename {Think => Library/Org}/Oauth/Driver/Douban.php (98%) rename {Think => Library/Org}/Oauth/Driver/Github.php (98%) rename {Think => Library/Org}/Oauth/Driver/Google.php (98%) rename {Think => Library/Org}/Oauth/Driver/Kaixin.php (98%) rename {Think => Library/Org}/Oauth/Driver/Msn.php (98%) rename {Think => Library/Org}/Oauth/Driver/Qq.php (98%) rename {Think => Library/Org}/Oauth/Driver/Renren.php (98%) rename {Think => Library/Org}/Oauth/Driver/Sina.php (98%) rename {Think => Library/Org}/Oauth/Driver/Sohu.php (98%) rename {Think => Library/Org}/Oauth/Driver/T163.php (98%) rename {Think => Library/Org}/Oauth/Driver/Taobao.php (98%) rename {Think => Library/Org}/Oauth/Driver/Tencent.php (98%) rename {Think => Library/Org}/Oauth/Driver/X360.php (98%) rename {Think => Library/Org}/Parser.php (91%) rename {Think => Library/Org}/Parser/Driver/Markdown.php (99%) rename {Think => Library/Org}/Parser/Driver/Ubb.php (99%) delete mode 100644 Library/Org/README.md rename {Think => Library/Org}/Upload.php (99%) rename {Think => Library/Think}/App.php (100%) rename {Think => Library/Think}/Auto.php (100%) rename {Think => Library/Think}/Behavior/ContentReplace.php (100%) rename {Think => Library/Think}/Behavior/LocationTemplate.php (100%) rename {Think => Library/Think}/Behavior/ReadHtmlCache.php (100%) rename {Think => Library/Think}/Behavior/ShowPageTrace.php (100%) rename {Think => Library/Think}/Behavior/TokenBuild.php (100%) rename {Think => Library/Think}/Cache.php (100%) rename {Think => Library/Think}/Cache/Driver/Apc.php (100%) rename {Think => Library/Think}/Cache/Driver/Db.php (100%) rename {Think => Library/Think}/Cache/Driver/Eaccelerator.php (100%) rename {Think => Library/Think}/Cache/Driver/File.php (100%) rename {Think => Library/Think}/Cache/Driver/Memcache.php (100%) rename {Think => Library/Think}/Cache/Driver/Redis.php (100%) rename {Think => Library/Think}/Cache/Driver/Secache.php (100%) rename {Think => Library/Think}/Cache/Driver/Simple.php (100%) rename {Think => Library/Think}/Cache/Driver/Sqlite.php (100%) rename {Think => Library/Think}/Cache/Driver/Wincache.php (100%) rename {Think => Library/Think}/Cache/Driver/Xcache.php (100%) rename {Think => Library/Think}/Config.php (100%) rename {Think => Library/Think}/Config/Driver/Ini.php (100%) rename {Think => Library/Think}/Config/Driver/Xml.php (100%) rename {Think => Library/Think}/Controller.php (100%) rename {Think => Library/Think}/Controller/Amf.php (100%) rename {Think => Library/Think}/Controller/Phprpc.php (100%) rename {Think => Library/Think}/Controller/Rest.php (100%) rename {Think => Library/Think}/Cookie.php (100%) rename {Think => Library/Think}/Create.php (100%) rename {Think => Library/Think}/Db.php (100%) rename {Think => Library/Think}/Db/Driver.php (100%) rename {Think => Library/Think}/Db/Driver/Mysql.php (100%) rename {Think => Library/Think}/Db/Driver/Oracle.php (100%) rename {Think => Library/Think}/Db/Driver/Pgsql.php (100%) rename {Think => Library/Think}/Db/Driver/Sqlite.php (100%) rename {Think => Library/Think}/Db/Driver/Sqlsrv.php (100%) rename {Think => Library/Think}/Db/Lite.php (100%) rename {Think => Library/Think}/Debug.php (100%) rename {Think => Library/Think}/Error.php (100%) rename {Think => Library/Think}/Exception.php (100%) rename {Think => Library/Think}/Filter.php (100%) rename {Think => Library/Think}/Input.php (100%) rename {Think => Library/Think}/Lang.php (100%) rename {Think => Library/Think}/Loader.php (100%) rename {Think => Library/Think}/Log.php (100%) rename {Think => Library/Think}/Log/Driver/File.php (100%) rename {Think => Library/Think}/Model.php (100%) rename {Think => Library/Think}/Model/Lite.php (100%) rename {Think => Library/Think}/Route.php (100%) rename {Think => Library/Think}/Seesion/Driver.php (100%) rename {Think => Library/Think}/Session.php (100%) rename {Think => Library/Think}/Tag.php (100%) rename {Think => Library/Think}/Template.php (100%) rename {Think => Library/Think}/Template/Driver/File.php (100%) rename {Think => Library/Think}/Template/TagLib.php (100%) rename {Think => Library/Think}/Template/TagLib/Cx.php (100%) rename {Think => Library/Think}/Url.php (100%) rename {Think => Library/Think}/Validate.php (100%) rename {Think => Library/Think}/View.php (100%) rename {Think => Library/Think}/View/Driver/Think.php (100%) diff --git a/Think/Crypt.php b/Library/Org/Crypt.php similarity index 98% rename from Think/Crypt.php rename to Library/Org/Crypt.php index e6bfba93..6f01c2fa 100644 --- a/Think/Crypt.php +++ b/Library/Org/Crypt.php @@ -8,8 +8,8 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ -namespace Think; + +namespace Org; class Crypt { /** diff --git a/Think/Image.php b/Library/Org/Image.php similarity index 93% rename from Think/Image.php rename to Library/Org/Image.php index bfb0b0a5..f8afe0f8 100644 --- a/Think/Image.php +++ b/Library/Org/Image.php @@ -8,10 +8,8 @@ // +---------------------------------------------------------------------- // | Author: 麦当苗儿 // +---------------------------------------------------------------------- -// | ThinkImage.class.php 2013-03-05 -// +---------------------------------------------------------------------- -namespace Think; +namespace Org; /* 缩略图相关常量定义 */ define('THINKIMAGE_THUMB_SCALING', 1); //常量，标识缩略图等比例缩放类型 @@ -50,7 +48,7 @@ class Image { */ public function init($type = 'Gd', $imgname = null){ /* 引入处理库，实例化图片处理对象 */ - $class = '\Think\Image\Driver\\'.ucwords($type); + $class = '\\Org\\Image\\Driver\\'.ucwords($type); self::$im = new $class($imgname); return self::$im; } diff --git a/Think/Image/Driver/Gd.php b/Library/Org/Image/Driver/Gd.php similarity index 99% rename from Think/Image/Driver/Gd.php rename to Library/Org/Image/Driver/Gd.php index 1fd83652..6b458e3c 100644 --- a/Think/Image/Driver/Gd.php +++ b/Library/Org/Image/Driver/Gd.php @@ -11,7 +11,7 @@ // | ImageGd.class.php 2013-03-05 // +---------------------------------------------------------------------- -namespace Think\Image\Driver; +namespace Org\Image\Driver; class Gd{ /** * 图像资源对象 @@ -62,7 +62,7 @@ class Gd{ //打开图像 if('gif' == $this->info['type']){ - $class = '\Think\Image\Driver\Gif'; + $class = '\Org\Image\Driver\Gif'; $this->gif = new $class($imgname); $this->im = imagecreatefromstring($this->gif->image()); } else { diff --git a/Think/Image/Driver/Gif.php b/Library/Org/Image/Driver/Gif.php similarity index 99% rename from Think/Image/Driver/Gif.php rename to Library/Org/Image/Driver/Gif.php index 8fbfba97..5c08cd52 100644 --- a/Think/Image/Driver/Gif.php +++ b/Library/Org/Image/Driver/Gif.php @@ -10,7 +10,7 @@ // +---------------------------------------------------------------------- // | GIF.class.php 2013-03-09 // +---------------------------------------------------------------------- -namespace Think\Image\Driver; +namespace Org\Image\Driver; class Gif{ /** * GIF帧列表 diff --git a/Think/Image/Driver/Imagick.php b/Library/Org/Image/Driver/Imagick.php similarity index 99% rename from Think/Image/Driver/Imagick.php rename to Library/Org/Image/Driver/Imagick.php index efd370f8..59ffb50e 100644 --- a/Think/Image/Driver/Imagick.php +++ b/Library/Org/Image/Driver/Imagick.php @@ -8,9 +8,8 @@ // +---------------------------------------------------------------------- // | Author: 麦当苗儿 // +---------------------------------------------------------------------- -// | ImageImagick.class.php 2013-03-06 -// +---------------------------------------------------------------------- -namespace Think\Image\Driver; + +namespace Org\Image\Driver; class Imagick{ /** * 图像资源对象 diff --git a/Think/Oauth.php b/Library/Org/Oauth.php similarity index 96% rename from Think/Oauth.php rename to Library/Org/Oauth.php index a2e73bb5..057f95f4 100644 --- a/Think/Oauth.php +++ b/Library/Org/Oauth.php @@ -8,8 +8,8 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ -namespace Think; + +namespace Org; // oauth登录接口 // // Oauth::connect('qq',['app_key'=>'','app_secret'=>'','callback'=>'','authorize'=>'']); // 链接QQ登录 @@ -33,7 +33,7 @@ class Oauth { * @return object */ static public function connect($type,$options=[]) { - $class = 'Think\\Oauth\\Driver\\'.ucwords($type); + $class = 'Org\\Oauth\\Driver\\'.ucwords($type); self::$handler = new $class($options); return self::$handler; } diff --git a/Think/Oauth/Driver.php b/Library/Org/Oauth/Driver.php similarity index 99% rename from Think/Oauth/Driver.php rename to Library/Org/Oauth/Driver.php index 4abf8ddd..388901af 100644 --- a/Think/Oauth/Driver.php +++ b/Library/Org/Oauth/Driver.php @@ -8,9 +8,8 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ -namespace Think\Oauth; +namespace Org\Oauth; abstract class Driver { /** diff --git a/Think/Oauth/Driver/Baidu.php b/Library/Org/Oauth/Driver/Baidu.php similarity index 98% rename from Think/Oauth/Driver/Baidu.php rename to Library/Org/Oauth/Driver/Baidu.php index 84a82714..18b32f5c 100644 --- a/Think/Oauth/Driver/Baidu.php +++ b/Library/Org/Oauth/Driver/Baidu.php @@ -9,8 +9,8 @@ // | Author: 麦当苗儿 // +---------------------------------------------------------------------- -namespace Think\Oauth\Driver; -use Think\Oauth\Driver; +namespace Org\Oauth\Driver; +use Org\Oauth\Driver; class Baidu extends Driver{ /** * 获取requestCode的api接口 diff --git a/Think/Oauth/Driver/Diandian.php b/Library/Org/Oauth/Driver/Diandian.php similarity index 98% rename from Think/Oauth/Driver/Diandian.php rename to Library/Org/Oauth/Driver/Diandian.php index bf8cb589..58014be4 100644 --- a/Think/Oauth/Driver/Diandian.php +++ b/Library/Org/Oauth/Driver/Diandian.php @@ -9,8 +9,8 @@ // | Author: 杨维杰 // +---------------------------------------------------------------------- -namespace Think\Oauth\Driver; -use Think\Oauth\Driver; +namespace Org\Oauth\Driver; +use Org\Oauth\Driver; class Diandian extends Driver{ /** * 获取requestCode的api接口 diff --git a/Think/Oauth/Driver/Douban.php b/Library/Org/Oauth/Driver/Douban.php similarity index 98% rename from Think/Oauth/Driver/Douban.php rename to Library/Org/Oauth/Driver/Douban.php index 94c4aa43..76689af3 100644 --- a/Think/Oauth/Driver/Douban.php +++ b/Library/Org/Oauth/Driver/Douban.php @@ -9,8 +9,8 @@ // | Author: 麦当苗儿 // +---------------------------------------------------------------------- -namespace Think\Oauth\Driver; -use Think\Oauth\Driver; +namespace Org\Oauth\Driver; +use Org\Oauth\Driver; class Douban extends Driver{ /** * 获取requestCode的api接口 diff --git a/Think/Oauth/Driver/Github.php b/Library/Org/Oauth/Driver/Github.php similarity index 98% rename from Think/Oauth/Driver/Github.php rename to Library/Org/Oauth/Driver/Github.php index 5ab3335d..00386103 100644 --- a/Think/Oauth/Driver/Github.php +++ b/Library/Org/Oauth/Driver/Github.php @@ -9,8 +9,8 @@ // | Author: 麦当苗儿 // +---------------------------------------------------------------------- -namespace Think\Oauth\Driver; -use Think\Oauth\Driver; +namespace Org\Oauth\Driver; +use Org\Oauth\Driver; class Github extends Driver{ /** * 获取requestCode的api接口 diff --git a/Think/Oauth/Driver/Google.php b/Library/Org/Oauth/Driver/Google.php similarity index 98% rename from Think/Oauth/Driver/Google.php rename to Library/Org/Oauth/Driver/Google.php index d30a7f5d..88653466 100644 --- a/Think/Oauth/Driver/Google.php +++ b/Library/Org/Oauth/Driver/Google.php @@ -9,8 +9,8 @@ // | Author: 麦当苗儿 // +---------------------------------------------------------------------- -namespace Think\Oauth\Driver; -use Think\Oauth\Driver; +namespace Org\Oauth\Driver; +use Org\Oauth\Driver; class Google extends Driver{ /** * 获取requestCode的api接口 diff --git a/Think/Oauth/Driver/Kaixin.php b/Library/Org/Oauth/Driver/Kaixin.php similarity index 98% rename from Think/Oauth/Driver/Kaixin.php rename to Library/Org/Oauth/Driver/Kaixin.php index dfac5485..042c234a 100644 --- a/Think/Oauth/Driver/Kaixin.php +++ b/Library/Org/Oauth/Driver/Kaixin.php @@ -9,8 +9,8 @@ // | Author: 麦当苗儿 // +---------------------------------------------------------------------- -namespace Think\Oauth\Driver; -use Think\Oauth\Driver; +namespace Org\Oauth\Driver; +use Org\Oauth\Driver; class Kaixin extends Driver{ /** * 获取requestCode的api接口 diff --git a/Think/Oauth/Driver/Msn.php b/Library/Org/Oauth/Driver/Msn.php similarity index 98% rename from Think/Oauth/Driver/Msn.php rename to Library/Org/Oauth/Driver/Msn.php index 429e2c61..2e018c83 100644 --- a/Think/Oauth/Driver/Msn.php +++ b/Library/Org/Oauth/Driver/Msn.php @@ -9,8 +9,8 @@ // | Author: 麦当苗儿 // +---------------------------------------------------------------------- -namespace Think\Oauth\Driver; -use Think\Oauth\Driver; +namespace Org\Oauth\Driver; +use Org\Oauth\Driver; class Msn extends Driver{ /** * 获取requestCode的api接口 diff --git a/Think/Oauth/Driver/Qq.php b/Library/Org/Oauth/Driver/Qq.php similarity index 98% rename from Think/Oauth/Driver/Qq.php rename to Library/Org/Oauth/Driver/Qq.php index 0b1b270d..cd56f36f 100644 --- a/Think/Oauth/Driver/Qq.php +++ b/Library/Org/Oauth/Driver/Qq.php @@ -9,8 +9,8 @@ // | Author: liu21st // +---------------------------------------------------------------------- -namespace Think\Oauth\Driver; -use Think\Oauth\Driver; +namespace Org\Oauth\Driver; +use Org\Oauth\Driver; class Qq extends Driver{ /** * 获取requestCode的api接口 diff --git a/Think/Oauth/Driver/Renren.php b/Library/Org/Oauth/Driver/Renren.php similarity index 98% rename from Think/Oauth/Driver/Renren.php rename to Library/Org/Oauth/Driver/Renren.php index f8ca4957..0147df83 100644 --- a/Think/Oauth/Driver/Renren.php +++ b/Library/Org/Oauth/Driver/Renren.php @@ -9,8 +9,8 @@ // | Author: 麦当苗儿 // +---------------------------------------------------------------------- -namespace Think\Oauth\Driver; -use Think\Oauth\Driver; +namespace Org\Oauth\Driver; +use Org\Oauth\Driver; class Renren extends Driver{ /** * 获取requestCode的api接口 diff --git a/Think/Oauth/Driver/Sina.php b/Library/Org/Oauth/Driver/Sina.php similarity index 98% rename from Think/Oauth/Driver/Sina.php rename to Library/Org/Oauth/Driver/Sina.php index da2165e5..e0f6e4c5 100644 --- a/Think/Oauth/Driver/Sina.php +++ b/Library/Org/Oauth/Driver/Sina.php @@ -9,8 +9,8 @@ // | Author: 麦当苗儿 // +---------------------------------------------------------------------- -namespace Think\Oauth\Driver; -use Think\Oauth\Driver; +namespace Org\Oauth\Driver; +use Org\Oauth\Driver; class Sina extends Driver{ /** * 获取requestCode的api接口 diff --git a/Think/Oauth/Driver/Sohu.php b/Library/Org/Oauth/Driver/Sohu.php similarity index 98% rename from Think/Oauth/Driver/Sohu.php rename to Library/Org/Oauth/Driver/Sohu.php index 9f652461..151abeeb 100644 --- a/Think/Oauth/Driver/Sohu.php +++ b/Library/Org/Oauth/Driver/Sohu.php @@ -9,8 +9,8 @@ // | Author: 麦当苗儿 // +---------------------------------------------------------------------- -namespace Think\Oauth\Driver; -use Think\Oauth\Driver; +namespace Org\Oauth\Driver; +use Org\Oauth\Driver; class Sohu extends Driver{ /** * 获取requestCode的api接口 diff --git a/Think/Oauth/Driver/T163.php b/Library/Org/Oauth/Driver/T163.php similarity index 98% rename from Think/Oauth/Driver/T163.php rename to Library/Org/Oauth/Driver/T163.php index 6de83651..fa2d4989 100644 --- a/Think/Oauth/Driver/T163.php +++ b/Library/Org/Oauth/Driver/T163.php @@ -9,8 +9,8 @@ // | Author: 麦当苗儿 // +---------------------------------------------------------------------- -namespace Think\Oauth\Driver; -use Think\Oauth\Driver; +namespace Org\Oauth\Driver; +use Org\Oauth\Driver; class T163 extends Driver{ /** * 获取requestCode的api接口 diff --git a/Think/Oauth/Driver/Taobao.php b/Library/Org/Oauth/Driver/Taobao.php similarity index 98% rename from Think/Oauth/Driver/Taobao.php rename to Library/Org/Oauth/Driver/Taobao.php index f257b9b0..1a61b858 100644 --- a/Think/Oauth/Driver/Taobao.php +++ b/Library/Org/Oauth/Driver/Taobao.php @@ -9,8 +9,8 @@ // | Author: 麦当苗儿 // +---------------------------------------------------------------------- -namespace Think\Oauth\Driver; -use Think\Oauth\Driver; +namespace Org\Oauth\Driver; +use Org\Oauth\Driver; class Taobao extends Driver{ /** * 获取requestCode的api接口 diff --git a/Think/Oauth/Driver/Tencent.php b/Library/Org/Oauth/Driver/Tencent.php similarity index 98% rename from Think/Oauth/Driver/Tencent.php rename to Library/Org/Oauth/Driver/Tencent.php index eab8ec11..a2453a7c 100644 --- a/Think/Oauth/Driver/Tencent.php +++ b/Library/Org/Oauth/Driver/Tencent.php @@ -9,8 +9,8 @@ // | Author: 麦当苗儿 // +---------------------------------------------------------------------- -namespace Think\Oauth\Driver; -use Think\Oauth\Driver; +namespace Org\Oauth\Driver; +use Org\Oauth\Driver; class Tencent extends Driver{ /** * 获取requestCode的api接口 diff --git a/Think/Oauth/Driver/X360.php b/Library/Org/Oauth/Driver/X360.php similarity index 98% rename from Think/Oauth/Driver/X360.php rename to Library/Org/Oauth/Driver/X360.php index 43938806..ae814ac4 100644 --- a/Think/Oauth/Driver/X360.php +++ b/Library/Org/Oauth/Driver/X360.php @@ -9,8 +9,8 @@ // | Author: 麦当苗儿 // +---------------------------------------------------------------------- -namespace Think\Oauth\Driver; -use Think\Oauth\Driver; +namespace Org\Oauth\Driver; +use Org\Oauth\Driver; class X360 extends Driver{ /** * 获取requestCode的api接口 diff --git a/Think/Parser.php b/Library/Org/Parser.php similarity index 91% rename from Think/Parser.php rename to Library/Org/Parser.php index c3b96718..e1f6bffd 100644 --- a/Think/Parser.php +++ b/Library/Org/Parser.php @@ -8,9 +8,8 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ -namespace Think; +namespace Org; // 内容解析类 class Parser { @@ -19,7 +18,7 @@ class Parser { // 解析内容 static public function parse($content,$type){ if(!isset(self::$handler[$type])) { - $class = '\\Think\\Parser\\Driver\\'.ucwords($type); + $class = '\\Org\\Parser\\Driver\\'.ucwords($type); self::$handler[$type] = new $class(); } return self::$handler[$type]->parse($content); diff --git a/Think/Parser/Driver/Markdown.php b/Library/Org/Parser/Driver/Markdown.php similarity index 99% rename from Think/Parser/Driver/Markdown.php rename to Library/Org/Parser/Driver/Markdown.php index d743b78e..cd14300d 100644 --- a/Think/Parser/Driver/Markdown.php +++ b/Library/Org/Parser/Driver/Markdown.php @@ -15,7 +15,7 @@ * 应用到ThinkPHP中，因而修改为ThinkPHP规范的命名空间 */ # namespace Michelf; -namespace Think\Parser\Driver; +namespace Org\Parser\Driver; # # The following two constants are deprecated: avoid using them, they'll diff --git a/Think/Parser/Driver/Ubb.php b/Library/Org/Parser/Driver/Ubb.php similarity index 99% rename from Think/Parser/Driver/Ubb.php rename to Library/Org/Parser/Driver/Ubb.php index 6ff1c1f7..a4f1dede 100644 --- a/Think/Parser/Driver/Ubb.php +++ b/Library/Org/Parser/Driver/Ubb.php @@ -11,7 +11,7 @@ // | Ubb.php 2013-04-03 // +---------------------------------------------------------------------- -namespace Think\Parser\Driver; +namespace Org\Parser\Driver; class Ubb{ /** diff --git a/Library/Org/README.md b/Library/Org/README.md deleted file mode 100644 index f7e2b587..00000000 --- a/Library/Org/README.md +++ /dev/null @@ -1 +0,0 @@ -ThinkPHP 扩展类库目录 \ No newline at end of file diff --git a/Think/Upload.php b/Library/Org/Upload.php similarity index 99% rename from Think/Upload.php rename to Library/Org/Upload.php index b8415a2b..03d1e8df 100644 --- a/Think/Upload.php +++ b/Library/Org/Upload.php @@ -8,8 +8,8 @@ // +---------------------------------------------------------------------- // | Author: liu21st // +---------------------------------------------------------------------- -// $Id$ -namespace Think; + +namespace Org; class Upload { protected $config = [ 'max_size' => -1, // 上传文件的最大值 diff --git a/Think/App.php b/Library/Think/App.php similarity index 100% rename from Think/App.php rename to Library/Think/App.php diff --git a/Think/Auto.php b/Library/Think/Auto.php similarity index 100% rename from Think/Auto.php rename to Library/Think/Auto.php diff --git a/Think/Behavior/ContentReplace.php b/Library/Think/Behavior/ContentReplace.php similarity index 100% rename from Think/Behavior/ContentReplace.php rename to Library/Think/Behavior/ContentReplace.php diff --git a/Think/Behavior/LocationTemplate.php b/Library/Think/Behavior/LocationTemplate.php similarity index 100% rename from Think/Behavior/LocationTemplate.php rename to Library/Think/Behavior/LocationTemplate.php diff --git a/Think/Behavior/ReadHtmlCache.php b/Library/Think/Behavior/ReadHtmlCache.php similarity index 100% rename from Think/Behavior/ReadHtmlCache.php rename to Library/Think/Behavior/ReadHtmlCache.php diff --git a/Think/Behavior/ShowPageTrace.php b/Library/Think/Behavior/ShowPageTrace.php similarity index 100% rename from Think/Behavior/ShowPageTrace.php rename to Library/Think/Behavior/ShowPageTrace.php diff --git a/Think/Behavior/TokenBuild.php b/Library/Think/Behavior/TokenBuild.php similarity index 100% rename from Think/Behavior/TokenBuild.php rename to Library/Think/Behavior/TokenBuild.php diff --git a/Think/Cache.php b/Library/Think/Cache.php similarity index 100% rename from Think/Cache.php rename to Library/Think/Cache.php diff --git a/Think/Cache/Driver/Apc.php b/Library/Think/Cache/Driver/Apc.php similarity index 100% rename from Think/Cache/Driver/Apc.php rename to Library/Think/Cache/Driver/Apc.php diff --git a/Think/Cache/Driver/Db.php b/Library/Think/Cache/Driver/Db.php similarity index 100% rename from Think/Cache/Driver/Db.php rename to Library/Think/Cache/Driver/Db.php diff --git a/Think/Cache/Driver/Eaccelerator.php b/Library/Think/Cache/Driver/Eaccelerator.php similarity index 100% rename from Think/Cache/Driver/Eaccelerator.php rename to Library/Think/Cache/Driver/Eaccelerator.php diff --git a/Think/Cache/Driver/File.php b/Library/Think/Cache/Driver/File.php similarity index 100% rename from Think/Cache/Driver/File.php rename to Library/Think/Cache/Driver/File.php diff --git a/Think/Cache/Driver/Memcache.php b/Library/Think/Cache/Driver/Memcache.php similarity index 100% rename from Think/Cache/Driver/Memcache.php rename to Library/Think/Cache/Driver/Memcache.php diff --git a/Think/Cache/Driver/Redis.php b/Library/Think/Cache/Driver/Redis.php similarity index 100% rename from Think/Cache/Driver/Redis.php rename to Library/Think/Cache/Driver/Redis.php diff --git a/Think/Cache/Driver/Secache.php b/Library/Think/Cache/Driver/Secache.php similarity index 100% rename from Think/Cache/Driver/Secache.php rename to Library/Think/Cache/Driver/Secache.php diff --git a/Think/Cache/Driver/Simple.php b/Library/Think/Cache/Driver/Simple.php similarity index 100% rename from Think/Cache/Driver/Simple.php rename to Library/Think/Cache/Driver/Simple.php diff --git a/Think/Cache/Driver/Sqlite.php b/Library/Think/Cache/Driver/Sqlite.php similarity index 100% rename from Think/Cache/Driver/Sqlite.php rename to Library/Think/Cache/Driver/Sqlite.php diff --git a/Think/Cache/Driver/Wincache.php b/Library/Think/Cache/Driver/Wincache.php similarity index 100% rename from Think/Cache/Driver/Wincache.php rename to Library/Think/Cache/Driver/Wincache.php diff --git a/Think/Cache/Driver/Xcache.php b/Library/Think/Cache/Driver/Xcache.php similarity index 100% rename from Think/Cache/Driver/Xcache.php rename to Library/Think/Cache/Driver/Xcache.php diff --git a/Think/Config.php b/Library/Think/Config.php similarity index 100% rename from Think/Config.php rename to Library/Think/Config.php diff --git a/Think/Config/Driver/Ini.php b/Library/Think/Config/Driver/Ini.php similarity index 100% rename from Think/Config/Driver/Ini.php rename to Library/Think/Config/Driver/Ini.php diff --git a/Think/Config/Driver/Xml.php b/Library/Think/Config/Driver/Xml.php similarity index 100% rename from Think/Config/Driver/Xml.php rename to Library/Think/Config/Driver/Xml.php diff --git a/Think/Controller.php b/Library/Think/Controller.php similarity index 100% rename from Think/Controller.php rename to Library/Think/Controller.php diff --git a/Think/Controller/Amf.php b/Library/Think/Controller/Amf.php similarity index 100% rename from Think/Controller/Amf.php rename to Library/Think/Controller/Amf.php diff --git a/Think/Controller/Phprpc.php b/Library/Think/Controller/Phprpc.php similarity index 100% rename from Think/Controller/Phprpc.php rename to Library/Think/Controller/Phprpc.php diff --git a/Think/Controller/Rest.php b/Library/Think/Controller/Rest.php similarity index 100% rename from Think/Controller/Rest.php rename to Library/Think/Controller/Rest.php diff --git a/Think/Cookie.php b/Library/Think/Cookie.php similarity index 100% rename from Think/Cookie.php rename to Library/Think/Cookie.php diff --git a/Think/Create.php b/Library/Think/Create.php similarity index 100% rename from Think/Create.php rename to Library/Think/Create.php diff --git a/Think/Db.php b/Library/Think/Db.php similarity index 100% rename from Think/Db.php rename to Library/Think/Db.php diff --git a/Think/Db/Driver.php b/Library/Think/Db/Driver.php similarity index 100% rename from Think/Db/Driver.php rename to Library/Think/Db/Driver.php diff --git a/Think/Db/Driver/Mysql.php b/Library/Think/Db/Driver/Mysql.php similarity index 100% rename from Think/Db/Driver/Mysql.php rename to Library/Think/Db/Driver/Mysql.php diff --git a/Think/Db/Driver/Oracle.php b/Library/Think/Db/Driver/Oracle.php similarity index 100% rename from Think/Db/Driver/Oracle.php rename to Library/Think/Db/Driver/Oracle.php diff --git a/Think/Db/Driver/Pgsql.php b/Library/Think/Db/Driver/Pgsql.php similarity index 100% rename from Think/Db/Driver/Pgsql.php rename to Library/Think/Db/Driver/Pgsql.php diff --git a/Think/Db/Driver/Sqlite.php b/Library/Think/Db/Driver/Sqlite.php similarity index 100% rename from Think/Db/Driver/Sqlite.php rename to Library/Think/Db/Driver/Sqlite.php diff --git a/Think/Db/Driver/Sqlsrv.php b/Library/Think/Db/Driver/Sqlsrv.php similarity index 100% rename from Think/Db/Driver/Sqlsrv.php rename to Library/Think/Db/Driver/Sqlsrv.php diff --git a/Think/Db/Lite.php b/Library/Think/Db/Lite.php similarity index 100% rename from Think/Db/Lite.php rename to Library/Think/Db/Lite.php diff --git a/Think/Debug.php b/Library/Think/Debug.php similarity index 100% rename from Think/Debug.php rename to Library/Think/Debug.php diff --git a/Think/Error.php b/Library/Think/Error.php similarity index 100% rename from Think/Error.php rename to Library/Think/Error.php diff --git a/Think/Exception.php b/Library/Think/Exception.php similarity index 100% rename from Think/Exception.php rename to Library/Think/Exception.php diff --git a/Think/Filter.php b/Library/Think/Filter.php similarity index 100% rename from Think/Filter.php rename to Library/Think/Filter.php diff --git a/Think/Input.php b/Library/Think/Input.php similarity index 100% rename from Think/Input.php rename to Library/Think/Input.php diff --git a/Think/Lang.php b/Library/Think/Lang.php similarity index 100% rename from Think/Lang.php rename to Library/Think/Lang.php diff --git a/Think/Loader.php b/Library/Think/Loader.php similarity index 100% rename from Think/Loader.php rename to Library/Think/Loader.php diff --git a/Think/Log.php b/Library/Think/Log.php similarity index 100% rename from Think/Log.php rename to Library/Think/Log.php diff --git a/Think/Log/Driver/File.php b/Library/Think/Log/Driver/File.php similarity index 100% rename from Think/Log/Driver/File.php rename to Library/Think/Log/Driver/File.php diff --git a/Think/Model.php b/Library/Think/Model.php similarity index 100% rename from Think/Model.php rename to Library/Think/Model.php diff --git a/Think/Model/Lite.php b/Library/Think/Model/Lite.php similarity index 100% rename from Think/Model/Lite.php rename to Library/Think/Model/Lite.php diff --git a/Think/Route.php b/Library/Think/Route.php similarity index 100% rename from Think/Route.php rename to Library/Think/Route.php diff --git a/Think/Seesion/Driver.php b/Library/Think/Seesion/Driver.php similarity index 100% rename from Think/Seesion/Driver.php rename to Library/Think/Seesion/Driver.php diff --git a/Think/Session.php b/Library/Think/Session.php similarity index 100% rename from Think/Session.php rename to Library/Think/Session.php diff --git a/Think/Tag.php b/Library/Think/Tag.php similarity index 100% rename from Think/Tag.php rename to Library/Think/Tag.php diff --git a/Think/Template.php b/Library/Think/Template.php similarity index 100% rename from Think/Template.php rename to Library/Think/Template.php diff --git a/Think/Template/Driver/File.php b/Library/Think/Template/Driver/File.php similarity index 100% rename from Think/Template/Driver/File.php rename to Library/Think/Template/Driver/File.php diff --git a/Think/Template/TagLib.php b/Library/Think/Template/TagLib.php similarity index 100% rename from Think/Template/TagLib.php rename to Library/Think/Template/TagLib.php diff --git a/Think/Template/TagLib/Cx.php b/Library/Think/Template/TagLib/Cx.php similarity index 100% rename from Think/Template/TagLib/Cx.php rename to Library/Think/Template/TagLib/Cx.php diff --git a/Think/Url.php b/Library/Think/Url.php similarity index 100% rename from Think/Url.php rename to Library/Think/Url.php diff --git a/Think/Validate.php b/Library/Think/Validate.php similarity index 100% rename from Think/Validate.php rename to Library/Think/Validate.php diff --git a/Think/View.php b/Library/Think/View.php similarity index 100% rename from Think/View.php rename to Library/Think/View.php diff --git a/Think/View/Driver/Think.php b/Library/Think/View/Driver/Think.php similarity index 100% rename from Think/View/Driver/Think.php rename to Library/Think/View/Driver/Think.php diff --git a/base.php b/base.php index cdbb36a9..b97fb1c5 100644 --- a/base.php +++ b/base.php @@ -16,9 +16,10 @@ define('MAGIC_QUOTES_GPC',false); define('THINK_VERSION', '4.0beta'); // 系统常量 defined('THINK_PATH') or define('THINK_PATH', dirname(__FILE__).'/'); -defined('CORE_PATH') or define('CORE_PATH', THINK_PATH.'Think/'); -defined('APP_PATH') or define('APP_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/'); defined('LIB_PATH') or define('LIB_PATH', THINK_PATH.'Library/'); +defined('CORE_PATH') or define('CORE_PATH', LIB_PATH.'Think/'); +defined('ORG_PATH') or define('ORG_PATH', LIB_PATH.'Org/'); +defined('APP_PATH') or define('APP_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/'); defined('RUNTIME_PATH') or define('RUNTIME_PATH', realpath(APP_PATH).'/Runtime/'); defined('DATA_PATH') or define('DATA_PATH', RUNTIME_PATH.'Data/'); defined('LOG_PATH') or define('LOG_PATH', RUNTIME_PATH.'Log/');