mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-01 12:42:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

文件末尾添加换行符

Browse Source
This commit is contained in:
麦当苗儿
2013-04-15 16:16:53 +08:00
parent 0dc1abcbe5
commit 9b1a67881e
85 changed files with 102 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Org/README.md
View File

@@ -1 +1 @@
Org命名空间目录
Org命名空间目录

3
Library/Think/App.php
View File

@@ -223,5 +223,4 @@ class App {
//保证$_REQUEST正常取值
$_REQUEST = array_merge($_POST,$_GET);
}
}
}

2
Library/Think/Auto.php
View File

@@ -56,4 +56,4 @@ class Auto {
}
return $data;
}
}
}

2
Library/Think/Behavior/ContentReplace.php
View File

@@ -62,4 +62,4 @@ class ContentReplace {
return $content;
}
}
}

2
Library/Think/Behavior/LocationTemplate.php
View File

@@ -45,4 +45,4 @@ class LocationTemplate {
$templateFile = MODULE_PATH.'View/'.$template.'.html';
return $templateFile;
}
}
}

2
Library/Think/Behavior/ReadHtmlCache.php
View File

@@ -119,4 +119,4 @@ class ReadHtmlCacheBehavior {
return !method_exists($class,$action);
}
}
}

2
Library/Think/Behavior/ShowPageTrace.php
View File

@@ -87,4 +87,4 @@ class ShowPageTrace {
include Config::has('tmpl_trace_file')?Config::get('tmpl_trace_file'):THINK_PATH.'tpl/page_trace.tpl';
return ob_get_clean();
}
}
}

2
Library/Think/Behavior/TokenBuild.php
View File

@@ -58,4 +58,4 @@ class TokenBuildBehavior extends Behavior {
$token = '<input type="hidden" name="'.$tokenName.'" value="'.$tokenKey.'_'.$tokenValue.'" />';
return $token;
}
}
}

4
Library/Think/Cache.php
View File

@@ -12,7 +12,6 @@
namespace Think;
class Cache {
/**
* 操作句柄
* @var object
@@ -36,5 +35,4 @@ class Cache {
static public function __callStatic($method, $params){
return call_user_func_array(array(self::$handler, $method), $params);
}
}
}

2
Library/Think/Cache/Driver/Apc.php
View File

@@ -98,4 +98,4 @@ class Apc {
public function clear() {
return apc_clear_cache();
}
}
}

2
Library/Think/Cache/Driver/Db.php
View File

@@ -143,4 +143,4 @@ class Db {
return $this->handler->execute('TRUNCATE TABLE `'.$this->options['table'].'`');
}
}
}

2
Library/Think/Cache/Driver/Eaccelerator.php
View File

@@ -98,4 +98,4 @@ class Eaccelerator {
public function clear() {
return ;
}
}
}

2
Library/Think/Cache/Driver/File.php
View File

@@ -181,4 +181,4 @@ class File {
return true;
}
}
}
}

2
Library/Think/Cache/Driver/Memcache.php
View File

@@ -110,4 +110,4 @@ class Memcache {
public function clear() {
return $this->handler->flush();
}
}
}

2
Library/Think/Cache/Driver/Secache.php
View File

@@ -719,4 +719,4 @@ class SecacheClient{
trigger_error($errstr,$errno);
}
}
}

2
Library/Think/Cache/Driver/Simple.php
View File

@@ -96,4 +96,4 @@ class Simple {
$filename = $this->filename('*');
array_map("unlink", glob($filename));
}
}
}

2
Library/Think/Cache/Driver/Sqlite.php
View File

@@ -116,4 +116,4 @@ class Sqlite {
sqlite_query($this->handler, $sql);
return ;
}
}
}

2
Library/Think/Cache/Driver/Wincache.php
View File

@@ -100,4 +100,4 @@ class Wincache {
public function clear() {
return ;
}
}
}

2
Library/Think/Cache/Driver/Xcache.php
View File

@@ -103,4 +103,4 @@ class Xcache {
public function clear() {
return ;
}
}
}

2
Library/Think/Config.php
View File

@@ -88,4 +88,4 @@ class Config {
}
return null; // 避免非法参数
}
}
}

2
Library/Think/Config/Driver/Ini.php
View File

@@ -19,4 +19,4 @@ class Ini {
return parse_ini_string($config,true);
}
}
}
}

2
Library/Think/Config/Driver/Xml.php
View File

@@ -26,4 +26,4 @@ class Xml {
}
return $result;
}
}
}

2
Library/Think/Controller.php
View File

@@ -171,4 +171,4 @@ class Controller {
exit ;
}
}
}
}

2
Library/Think/Controller/Amf.php
View File

@@ -26,4 +26,4 @@ abstract class Amf {
return ;
}
}
}

2
Library/Think/Controller/Phprpc.php
View File

@@ -31,4 +31,4 @@ abstract class Phprpc {
echo $server->comment();
}
}
}

2
Library/Think/Controller/Rest.php
View File

@@ -212,4 +212,4 @@ abstract class Rest {
}
return false;
}
}
}

2
Library/Think/Cookie.php
View File

@@ -128,4 +128,4 @@ class Cookie {
}
return;
}
}
}

2
Library/Think/Create.php
View File

@@ -99,4 +99,4 @@ class Create {
file_put_contents(APP_PATH.$module.'/alias.php',"<?php\nreturn [\n];");
}
}
}
}

2
Library/Think/Crypt.php
View File

@@ -71,4 +71,4 @@ class Crypt {
}
return base64_decode($str);
}
}
}

2
Library/Think/Db.php
View File

@@ -107,4 +107,4 @@ class Db {
static public function __callStatic($method, $params){
return call_user_func_array(array(self::$_instance, $method), $params);
}
}
}

2
Library/Think/Db/Driver.php
View File

@@ -966,4 +966,4 @@ abstract class Driver {
// 关闭连接
$this->close();
}
}
}

4
Library/Think/Db/Driver/Mysql.php
View File

@@ -13,7 +13,7 @@ namespace Think\Db\Driver;
use Think\Db\Driver;
/**
* PDO数据库驱动
* mysql数据库驱动
* @category Extend
* @package Extend
* @subpackage Driver.Db
@@ -72,4 +72,4 @@ class Mysql extends Driver{
return $key;
}
}
}

36
Library/Think/Db/Driver/Oracle.php
View File

@@ -113,24 +113,24 @@ class Oracle extends Driver{
/**
* 获取最后插入id ,仅适用于采用序列+触发器结合生成ID的方式
* 在config.php中指定
'DB_TRIGGER_PREFIX' => 'tr_',
'DB_SEQUENCE_PREFIX' => 'ts_',
* 'DB_TRIGGER_PREFIX' => 'tr_',
* 'DB_SEQUENCE_PREFIX' => 'ts_',
* eg:表 tb_user
相对tb_user的序列为：
-- Create sequence
create sequence TS_USER
minvalue 1
maxvalue 999999999999999999999999999
start with 1
increment by 1
nocache;
相对tb_user,ts_user的触发器为：
create or replace trigger TR_USER
before insert on "TB_USER"
for each row
begin
select "TS_USER".nextval into :NEW.ID from dual;
end;
* 相对tb_user的序列为：
* -- Create sequence
* create sequence TS_USER
* minvalue 1
* maxvalue 999999999999999999999999999
* start with 1
* increment by 1
* nocache;
* 相对tb_user,ts_user的触发器为：
* create or replace trigger TR_USER
* before insert on "TB_USER"
* for each row
* begin
* select "TS_USER".nextval into :NEW.ID from dual;
* end;
* @access public
* @return integer
*/
@@ -169,4 +169,4 @@ class Oracle extends Driver{
if(!$lock) return '';
return ' FOR UPDATE NOWAIT ';
}
}
}

2
Library/Think/Db/Driver/Pgsql.php
View File

@@ -77,4 +77,4 @@ class Pgsql extends Driver{
return $limitStr;
}
}
}

2
Library/Think/Db/Driver/Sqlite.php
View File

@@ -87,4 +87,4 @@ class Sqlite extends Driver {
}
return $limitStr;
}
}
}

2
Library/Think/Db/Driver/Sqlsrv.php
View File

@@ -128,4 +128,4 @@ class Sqlsrv extends Driver{
return $this->execute($sql);
}
}
}

2
Library/Think/Db/Lite.php
View File

@@ -408,4 +408,4 @@ class Lite {
// 关闭连接
$this->close();
}
}
}

2
Library/Think/Debug.php
View File

@@ -109,4 +109,4 @@ class Debug {
}else
return $output;
}
}
}

2
Library/Think/Error.php
View File

@@ -114,4 +114,4 @@ class Error {
include Config::get('exception_tmpl');
exit;
}
}
}

2
Library/Think/Exception.php
View File

@@ -13,4 +13,4 @@ namespace Think;
class Exception extends \Exception {
}
}

2
Library/Think/Filter.php
View File

@@ -219,4 +219,4 @@ class Filter {
}
return $string;
}
}
}

2
Library/Think/Image/Driver/Gd.php
View File

@@ -546,4 +546,4 @@ class Gd{
public function __destruct() {
empty($this->im) || imagedestroy($this->im);
}
}
}

2
Library/Think/Image/Driver/Imagick.php
View File

@@ -588,4 +588,4 @@ class Imagick{
public function __destruct() {
empty($this->im) || $this->im->destroy();
}
}
}

2
Library/Think/Input.php
View File

@@ -87,4 +87,4 @@ class Input {
$value .= ' ';
}
}
}
}

2
Library/Think/Lang.php
View File

@@ -51,4 +51,4 @@ class Lang {
$name = strtolower($name);
return isset(self::$_lang[$range][$name]) ? self::$_lang[$range][$name] : $name;
}
}
}

3
Library/Think/Loader.php
View File

@@ -227,5 +227,4 @@ class Loader {
}
return $_instance[$identify];
}
}
}

3
Library/Think/Log.php
View File

@@ -81,5 +81,4 @@ class Log {
static public function write($log,$level,$destination='') {
self::$storage && self::$storage->write("{$level}: {$log}",$destination);
}
}
}

2
Library/Think/Log/Driver/File.php
View File

@@ -40,4 +40,4 @@ class File {
rename($destination,dirname($destination).'/'.time().'-'.basename($destination));
error_log("[{$now}] ".$_SERVER['REMOTE_ADDR'].' '.$_SERVER['REQUEST_URI']."\r\n{$log}\r\n", 3,$destination);
}
}
}

3
Library/Think/Model.php
View File

@@ -1174,5 +1174,4 @@ class Model {
$this->$name = $value;
return $this;
}
}
}

3
Library/Think/Model/Lite.php
View File

@@ -12,7 +12,6 @@
namespace Think\Model;
class Lite {
// 当前数据库操作对象
protected $db = null;
// 数据库名称
@@ -232,4 +231,4 @@ class Lite {
return $this->db->getLastSql($this->name);
}
}
}

3
Library/Think/Oauth.php
View File

@@ -68,5 +68,4 @@ class Oauth {
static public function call($api,$param='',$method='GET'){
return self::$handler->call($api,$param,$method);
}
}
}

2
Library/Think/Oauth/Driver.php
View File

@@ -230,4 +230,4 @@ abstract class Driver {
* 获取当前授权用户的用户信息
*/
abstract public function getOauthInfo();
}
}

2
Library/Think/Oauth/Driver/Baidu.php
View File

@@ -90,4 +90,4 @@ class Baidu extends Driver{
}
}
}
}

2
Library/Think/Oauth/Driver/Diandian.php
View File

@@ -90,4 +90,4 @@ class Diandian extends Driver{
}
}
}
}

2
Library/Think/Oauth/Driver/Douban.php
View File

@@ -88,4 +88,4 @@ class Douban extends Driver{
}
}
}
}

2
Library/Think/Oauth/Driver/Github.php
View File

@@ -90,4 +90,4 @@ class Github extends Driver{
}
}
}
}

2
Library/Think/Oauth/Driver/Google.php
View File

@@ -96,4 +96,4 @@ class Google extends Driver{
}
}
}
}

2
Library/Think/Oauth/Driver/Kaixin.php
View File

@@ -91,4 +91,4 @@ class Kaixin extends Driver{
}
}
}
}

2
Library/Think/Oauth/Driver/Msn.php
View File

@@ -97,4 +97,4 @@ class Msn extends Driver{
}
}
}
}

2
Library/Think/Oauth/Driver/Qq.php
View File

@@ -99,4 +99,4 @@ class Qq extends Driver{
E("获取腾讯QQ用户信息失败：{$data['msg']}");
}
}
}
}

2
Library/Think/Oauth/Driver/Renren.php
View File

@@ -113,4 +113,4 @@ class Renren extends Driver{
E("获取人人网用户信息失败：{$data['error_msg']}");
}
}
}
}

2
Library/Think/Oauth/Driver/Sina.php
View File

@@ -90,4 +90,4 @@ class Sina extends Driver{
}
}
}
}

2
Library/Think/Oauth/Driver/Sohu.php
View File

@@ -90,4 +90,4 @@ class Sohu extends Driver{
}
}
}
}

2
Library/Think/Oauth/Driver/T163.php
View File

@@ -92,4 +92,4 @@ class T163 extends Driver{
}
}
}
}

2
Library/Think/Oauth/Driver/Taobao.php
View File

@@ -94,4 +94,4 @@ class Taobao extends Driver{
}
}
}
}

2
Library/Think/Oauth/Driver/Tencent.php
View File

@@ -95,4 +95,4 @@ class Tencent extends Driver{
}
}
}
}

2
Library/Think/Oauth/Driver/X360.php
View File

@@ -90,4 +90,4 @@ class X360 extends Driver{
}
}
}
}

2
Library/Think/Parser.php
View File

@@ -29,4 +29,4 @@ class Parser {
static public function __callStatic($method, $params){
return self::parse($params[0],$method);
}
}
}

1
Library/Think/Parser/Driver/Ubb.php
View File

@@ -287,5 +287,4 @@ class Ubb{
return [$addr, $text];
}
}

2
Library/Think/Route.php
View File

@@ -423,4 +423,4 @@ class Route {
$_GET = array_merge($var,$_GET);
}
}
}
}

2
Library/Think/Seesion/Driver.php
View File

@@ -19,4 +19,4 @@ class Driver extends SessionHandler {
$this->config = array_merge($this->config,$config);
}
}
}

2
Library/Think/Session.php
View File

@@ -157,4 +157,4 @@ class Session {
static public function __callStatic($name,$args) {
self::operate($name);
}
}
}

3
Library/Think/Tag.php
View File

@@ -81,5 +81,4 @@ class Tag {
}
return ;
}
}
}

2
Library/Think/Template.php
View File

@@ -717,4 +717,4 @@ class Template {
return $template;
}
}
}
}

2
Library/Think/Template/Driver/File.php
View File

@@ -42,4 +42,4 @@ class File {
}
return true;
}
}
}

2
Library/Think/Template/TagLib.php
View File

@@ -241,4 +241,4 @@ class TagLib {
public function getTags(){
return $this->tags;
}
}
}

3
Library/Think/Template/TagLib/Cx.php
View File

@@ -611,5 +611,4 @@ class Cx extends TagLib {
$parseStr .= '<?php } ?>';
return $parseStr;
}
}
}

2
Library/Think/Upload.php
View File

@@ -512,4 +512,4 @@ class Upload {
public function getErrorMsg() {
return $this->error;
}
}
}

2
Library/Think/Url.php
View File

@@ -148,4 +148,4 @@ class Url {
}
return false;
}
}
}

2
Library/Think/Validate.php
View File

@@ -186,4 +186,4 @@ class Validate {
$rule = $validate[strtolower($rule)];
return preg_match($rule,$value)===1;
}
}
}

2
Library/Think/View.php
View File

@@ -225,4 +225,4 @@ class View {
// 输出模板文件
echo $content;
}
}
}

2
Library/Think/View/Driver/Think.php
View File

@@ -25,4 +25,4 @@ class Think {
$this->template->fetch($template,$data);
}
}
}
}

2
base.php
View File

@@ -226,4 +226,4 @@ function parse_name($name, $type=0) {
} else {
return strtolower(trim(preg_replace("/[A-Z]/", "_\\0", $name), "_"));
}
}
}

2
convention.php
View File

@@ -55,4 +55,4 @@ return [
'db_rw_separate' => false, // 数据库读写是否分离 主从式有效
'db_master_num' => 1, // 读写分离后 主服务器数量
'db_slave_no' => '', // 指定从服务器序号
];
];

2
start.php
View File

@@ -53,4 +53,4 @@ if(is_file(APP_PATH.'build.php')) { // 自动化创建脚本
Create::build(include APP_PATH.'build.php');
}
// 执行应用
App::run();
App::run();