From 88dbcb9c4bf3a08759e277b52529ff96254347ca Mon Sep 17 00:00:00 2001
From: molong <ycgpp@126.com>
Date: Tue, 16 Jan 2018 22:27:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E8=A3=85=E6=A8=A1=E5=9D=97=E6=A8=A1?=
 =?UTF-8?q?=E7=89=88=E6=9B=BF=E6=8D=A2=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/common/controller/User.php    | 2 +-
 application/install/config.php            | 6 ------
 application/install/view/public/base.html | 4 ++--
 application/user/controller/Login.php     | 9 ++++-----
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/application/common/controller/User.php b/application/common/controller/User.php
index 1ba01651..9d43244d 100644
--- a/application/common/controller/User.php
+++ b/application/common/controller/User.php
@@ -14,7 +14,7 @@ class User extends Front {
 	public function _initialize() {
 		parent::_initialize();
 
-		if (!is_login() and !in_array($this->url, array('user/login/index', 'user/index/verify'))) {
+		if (!is_login() and !in_array($this->url_path, array('user/login/index', 'user/index/verify'))) {
 			return $this->redirect('user/login/index');
 		} elseif (is_login()) {
 			$user = model('User')->getInfo(session('user_auth.uid'));
diff --git a/application/install/config.php b/application/install/config.php
index bb54f548..0086d39e 100644
--- a/application/install/config.php
+++ b/application/install/config.php
@@ -2,12 +2,6 @@
 return array(
 
 	'view_replace_str' => array(
-		'__ADDONS__'           => BASE_PATH . '/addons',
-		'__PUBLIC__'           => BASE_PATH . '/public',
-		'__STATIC__'           => BASE_PATH . '/application/admin/static',
-		'__IMG__'              => BASE_PATH . '/application/admin/static/images',
-		'__CSS__'              => BASE_PATH . '/application/admin/static/css',
-		'__JS__'               => BASE_PATH . '/application/admin/static/js',
 		'__COMPANY__'          => '南昌腾速科技有限公司',
 		'__NAME__'             => 'SentCMS网站管理系统',
 		'__COMPANY_WEBSITE__' => 'www.tensent.cn',
diff --git a/application/install/view/public/base.html b/application/install/view/public/base.html
index 4b8eb365..0f390d40 100644
--- a/application/install/view/public/base.html
+++ b/application/install/view/public/base.html
@@ -7,8 +7,8 @@
 <meta name="description" content="">
 <meta name="author" content="">
 <!-- zui -->
-<link href="__PUBLIC__/css/bootstrap/bootstrap.min.css" rel="stylesheet">
-<script src="__PUBLIC__/js/jquery.js"></script>
+<link href="__STATIC__/css/libs/bootstrap.min.css" rel="stylesheet">
+<script src="__STATIC__/js/jquery.js"></script>
 <style>
 body{font-family: "Microsoft Yahei",'新宋体';}
 .container{background: #ffffff; margin: 50px auto; padding: 20px 0; width: 1024px;}
diff --git a/application/user/controller/Login.php b/application/user/controller/Login.php
index f19848d2..26fb57bf 100644
--- a/application/user/controller/Login.php
+++ b/application/user/controller/Login.php
@@ -13,7 +13,7 @@ use app\common\controller\Front;
 class Login extends Front{
 
 	public function index($username = '', $password = '', $verify = ''){
-		if (IS_POST) {
+		if ($this->request->isPost()) {
 			if (!$username || !$password) {
 				return $this->error('用户名或者密码不能为空！','');
 			}
@@ -48,7 +48,7 @@ class Login extends Front{
 	}
 
 	public function register($username = '', $password = '', $repassword = '', $email = '', $verify = ''){
-		if (IS_POST) {
+		if ($this->request->isPost()) {
 			$user = model('User');
 			
 			//验证码验证
@@ -72,7 +72,7 @@ class Login extends Front{
 	}
 
 	public function forget($email = '', $verify = ''){
-		if (IS_POST) {
+		if ($this->request->isPost()) {
 			//验证码验证
 			$this->checkVerify($verify);
 			if (!$email) {
@@ -100,8 +100,7 @@ class Login extends Front{
 	}
 
 	public function find(){
-		//http://127.0.0.2/user/login/find.html?time=1467174578&token=b561PJhVI2OjWUPNLsAMdeW8AKZLw/RcqyXUHBa1mCiX2OUzvq0D69Rt40F/n7zfJKR05d7qA41G6/33NQ
-		if (IS_POST) {
+		if ($this->request->isPost()) {
 			$data = $this->request->post();
 			//验证码验证
 			$this->checkVerify($data['verify']);