改进Appe类 Request和Route类

This commit is contained in:
thinkphp
2016-05-24 16:35:57 +08:00
parent 6e11fbc025
commit a3fae7c6dc
6 changed files with 103 additions and 47 deletions

View File

@@ -28,7 +28,6 @@ use think\Route;
*/
class App
{
/**
* 执行应用程序
* @access public
@@ -40,6 +39,18 @@ class App
{
is_null($request) && $request = Request::instance();
define('NOW_TIME', $request->time());
define('REQUEST_METHOD', $request->method());
define('HTTP_HOST', $request->host());
define('IS_GET', REQUEST_METHOD == 'GET' ? true : false);
define('IS_POST', REQUEST_METHOD == 'POST' ? true : false);
define('IS_PUT', REQUEST_METHOD == 'PUT' ? true : false);
define('IS_DELETE', REQUEST_METHOD == 'DELETE' ? true : false);
define('IS_AJAX', $request->isAjax());
define('__EXT__', $request->ext());
define('IS_CGI', $request->isCgi());
define('IS_CLI', $request->isCli());
// 初始化应用(公共模块)
$config = self::initModule(COMMON_MODULE, Config::get());
@@ -343,12 +354,8 @@ class App
*/
public static function route($request, array $config)
{
define('__INFO__', $request->pathinfo());
define('__EXT__', $request->ext());
// 检测URL禁用后缀
if ($config['url_deny_suffix'] && preg_match('/\.(' . $config['url_deny_suffix'] . ')$/i', __INFO__)) {
if ($config['url_deny_suffix'] && preg_match('/\.(' . $config['url_deny_suffix'] . ')$/i', $request->pathinfo())) {
throw new Exception('url suffix deny');
}