diff --git a/library/think/parser.php b/library/org/parser.php similarity index 100% rename from library/think/parser.php rename to library/org/parser.php diff --git a/library/think/parser/driver/Markdown.php b/library/org/parser/driver/Markdown.php similarity index 100% rename from library/think/parser/driver/Markdown.php rename to library/org/parser/driver/Markdown.php diff --git a/library/think/parser/driver/Ubb.php b/library/org/parser/driver/Ubb.php similarity index 100% rename from library/think/parser/driver/Ubb.php rename to library/org/parser/driver/Ubb.php diff --git a/library/think/transform.php b/library/org/transform.php similarity index 100% rename from library/think/transform.php rename to library/org/transform.php diff --git a/library/think/session.php b/library/think/session.php index d54fa823..d5d985d8 100644 --- a/library/think/session.php +++ b/library/think/session.php @@ -33,39 +33,49 @@ class Session { * @return void */ static public function init($config=[]) { - if(isset($config['prefix'])) + 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'])) { session_id($config['id']); } ini_set('session.auto_start', 0); - if(isset($config['name'])) + if(isset($config['name'])){ session_name($config['name']); - if(isset($config['path'])) + } + if(isset($config['path'])) { session_save_path($config['path']); - if(isset($config['domain'])) + } + 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['use_trans_sid'])) + if(isset($config['use_trans_sid'])) { ini_set('session.use_trans_sid', $config['use_trans_sid']?1:0); - if(isset($config['use_cookies'])) + } + if(isset($config['use_cookies'])) { ini_set('session.use_cookies', $config['use_cookies']?1:0); - if(isset($config['cache_limiter'])) + } + if(isset($config['cache_limiter'])) { session_cache_limiter($config['cache_limiter']); - if(isset($config['cache_expire'])) + } + if(isset($config['cache_expire'])) { session_cache_expire($config['cache_expire']); + } if(!empty($config['type'])) { // 读取session驱动 $class = 'Think\\Session\\Driver\\'. ucwords(strtolower($config['type'])); // 检查驱动类 session_set_save_handler(new $class()); } // 启动session - if($config['auto_start']) session_start(); + if($config['auto_start']) { + session_start(); + } } /** diff --git a/library/think/storage.php b/library/think/storage.php deleted file mode 100644 index c74ad8db..00000000 --- a/library/think/storage.php +++ /dev/null @@ -1,40 +0,0 @@ - -// +---------------------------------------------------------------------- -namespace think; -// 分布式文件存储类 -class Storage { - - /** - * 操作句柄 - * @var string - * @access protected - */ - static protected $handler; - - /** - * 连接分布式文件系统 - * @access public - * @param string $type 文件类型 - * @param array $options 配置数组 - * @return void - */ - static public function connect($type='File',$options=array()) { - $class = 'Think\\Storage\\Driver\\'.ucwords($type); - self::$handler = new $class($options); - } - - static public function __callstatic($method,$args){ - //调用缓存驱动的方法 - if(method_exists(self::$handler, $method)){ - return call_user_func_array(array(self::$handler,$method), $args); - } - } -} diff --git a/library/think/storage/Driver/File.php b/library/think/storage/Driver/File.php deleted file mode 100644 index 33f9a87c..00000000 --- a/library/think/storage/Driver/File.php +++ /dev/null @@ -1,126 +0,0 @@ - -// +---------------------------------------------------------------------- -namespace think\storage\driver; -use think\storage; - -// 本地文件写入存储类 -class File extends Storage{ - - private $contents=array(); - - /** - * 架构函数 - * @access public - */ - public function __construct() { - } - - /** - * 文件内容读取 - * @access public - * @param string $filename 文件名 - * @return string - */ - public function read($filename,$type=''){ - return $this->get($filename,'content',$type); - } - - /** - * 文件写入 - * @access public - * @param string $filename 文件名 - * @param string $content 文件内容 - * @return boolean - */ - public function put($filename,$content,$type=''){ - $dir = dirname($filename); - if(!is_dir($dir)){ - mkdir($dir,0777,true); - } - if(false === file_put_contents($filename,$content)){ - E(L('_STORAGE_WRITE_ERROR_').':'.$filename); - }else{ - $this->contents[$filename]=$content; - return true; - } - } - - /** - * 文件追加写入 - * @access public - * @param string $filename 文件名 - * @param string $content 追加的文件内容 - * @return boolean - */ - public function append($filename,$content,$type=''){ - if(is_file($filename)){ - $content = $this->read($filename,$type).$content; - } - return $this->put($filename,$content,$type); - } - - /** - * 加载文件 - * @access public - * @param string $filename 文件名 - * @param array $vars 传入变量 - * @return void - */ - public function load($_filename,$vars=null){ - if(!is_null($vars)){ - extract($vars, EXTR_OVERWRITE); - } - include $_filename; - } - - /** - * 文件是否存在 - * @access public - * @param string $filename 文件名 - * @return boolean - */ - public function has($filename,$type=''){ - return is_file($filename); - } - - /** - * 文件删除 - * @access public - * @param string $filename 文件名 - * @return boolean - */ - public function unlink($filename,$type=''){ - unset($this->contents[$filename]); - return is_file($filename) ? unlink($filename) : false; - } - - /** - * 读取文件信息 - * @access public - * @param string $filename 文件名 - * @param string $name 信息名 mtime或者content - * @return boolean - */ - public function get($filename,$name,$type=''){ - if(!isset($this->contents[$filename])){ - if(!is_file($filename)) { - return false; - } - $this->contents[$filename] = file_get_contents($filename); - } - $content=$this->contents[$filename]; - $info = array( - 'mtime' => filemtime($filename), - 'content' => $content - ); - return $info[$name]; - } -} diff --git a/library/think/storage/Driver/Sae.php b/library/think/storage/Driver/Sae.php deleted file mode 100644 index ad8ca423..00000000 --- a/library/think/storage/Driver/Sae.php +++ /dev/null @@ -1,195 +0,0 @@ - -// +---------------------------------------------------------------------- -namespace think\storage\driver; -use think\storage; - -// SAE环境文件写入存储类 -class Sae extends Storage{ - - /** - * 架构函数 - * @access public - */ - private $mc; - private $kvs = array(); - private $htmls = array(); - private $contents = array(); - public function __construct() { - if(!function_exists('memcache_init')){ - header('Content-Type:text/html;charset=utf-8'); - exit('请在SAE平台上运行代码。'); - } - $this->mc = @memcache_init(); - if(!$this->mc){ - header('Content-Type:text/html;charset=utf-8'); - exit('您未开通Memcache服务，请在SAE管理平台初始化Memcache服务'); - } - } - - /** - * 获得SaeKv对象 - */ - private function getKv(){ - static $kv; - if(!$kv){ - $kv = new \SaeKV(); - if(!$kv->init()) - E('您没有初始化KVDB，请在SAE管理平台初始化KVDB服务'); - } - return $kv; - } - - - /** - * 文件内容读取 - * @access public - * @param string $filename 文件名 - * @return string - */ - public function read($filename,$type=''){ - switch(strtolower($type)){ - case 'f': - $kv = $this->getKv(); - if(!isset($this->kvs[$filename])){ - $this->kvs[$filename]=$kv->get($filename); - } - return $this->kvs[$filename]; - default: - return $this->get($filename,'content',$type); - } - } - - /** - * 文件写入 - * @access public - * @param string $filename 文件名 - * @param string $content 文件内容 - * @return boolean - */ - public function put($filename,$content,$type=''){ - switch(strtolower($type)){ - case 'f': - $kv = $this->getKv(); - $this->kvs[$filename] = $content; - return $kv->set($filename,$content); - case 'html': - $kv = $this->getKv(); - $content = time().$content; - $this->htmls[$filename] = $content; - return $kv->set($filename,$content); - default: - $content = time().$content; - if(!$this->mc->set($filename,$content,MEMCACHE_COMPRESSED,0)){ - E(L('_STORAGE_WRITE_ERROR_').':'.$filename); - }else{ - $this->contents[$filename] = $content; - return true; - } - } - } - - /** - * 文件追加写入 - * @access public - * @param string $filename 文件名 - * @param string $content 追加的文件内容 - * @return boolean - */ - public function append($filename,$content,$type=''){ - if($old_content = $this->read($filename,$type)){ - $content = $old_content.$content; - } - return $this->put($filename,$content,$type); - } - - /** - * 加载文件 - * @access public - * @param string $_filename 文件名 - * @param array $vars 传入变量 - * @return void - */ - public function load($_filename,$vars=null){ - if(!is_null($vars)){ - extract($vars, EXTR_OVERWRITE); - } - eval('?>'.$this->read($_filename)); - } - - /** - * 文件是否存在 - * @access public - * @param string $filename 文件名 - * @return boolean - */ - public function has($filename,$type=''){ - if($this->read($filename,$type)){ - return true; - }else{ - return false; - } - } - - /** - * 文件删除 - * @access public - * @param string $filename 文件名 - * @return boolean - */ - public function unlink($filename,$type=''){ - switch(strtolower($type)){ - case 'f': - $kv = $this->getKv(); - unset($this->kvs[$filename]); - return $kv->delete($filename); - case 'html': - $kv = $this->getKv(); - unset($this->htmls[$filename]); - return $kv->delete($filename); - default: - unset($this->contents[$filename]); - return $this->mc->delete($filename); - } - } - - /** - * 读取文件信息 - * @access public - * @param string $filename 文件名 - * @param string $name 信息名 mtime或者content - * @return boolean - */ - public function get($filename,$name,$type=''){ - switch(strtolower($type)){ - case 'html': - if(!isset($this->htmls[$filename])){ - $kv = $this->getKv(); - $this->htmls[$filename] = $kv->get($filename); - } - $content = $this->htmls[$filename]; - break; - default: - if(!isset($this->contents[$filename])){ - $this->contents[$filename] = $this->mc->get($filename); - } - $content = $this->contents[$filename]; - } - if(false===$content){ - return false; - } - $info = array( - 'mtime' => substr($content,0,10), - 'content' => substr($content,10) - ); - return $info[$name]; - } - -} \ No newline at end of file