update

zengminghui · Jun 26, 2018 · 1b2c0b3 · 1b2c0b3
1 parent 213d412
commit 1b2c0b3
Show file tree

Hide file tree

Showing 7 changed files with 89 additions and 55 deletions.
diff --git a/application/controllers/Index.php b/application/controllers/Index.php
@@ -4,7 +4,7 @@
  * Author:资料空白
  * Date:20180604
  */
-class IndexController extends PcBasicController
+class IndexController extends BasicController
 {
 
 	public function init()
@@ -14,12 +14,12 @@ public function init()
 
 	public function indexAction()
 	{
-		if(!$this->login OR empty($this->uinfo))
-		{
+		if(file_exists(APP_PATH.'/conf/install.lock')){
 			$this->redirect("/product/");
+			return FALSE;
 		}else{
-			$this->redirect("/member/");
+			$this->redirect("/install/");
+			return FALSE;
 		}
-		return FALSE;
 	}
 }
diff --git a/application/library/Core/Basic.php b/application/library/Core/Basic.php
@@ -6,26 +6,14 @@
  * Date: 2018-6-8
  */
 
-class BasicController extends Yaf\Controller_Abstract {
-
-	protected $uinfo=array();
-	protected $userid=0;
-	protected $login=FALSE;
+class BasicController extends Yaf\Controller_Abstract
+{
 	protected $config=array();
-	protected $Pagination=NULL;
 	protected $isHttps=FALSE;
 	protected $isAjax=FALSE;
 	protected $isGet=FALSE;
 	protected $isPost=FALSE;
 
-  	public function init(){	
-		//初始化分页
-		$this->Pagination=new Pagination();
-		//系统默认配置
-		$data['config']=$this->config=$this->load('config')->getConfig();
-        $this->getView()->assign($data);
-	}
-
 	public function get($key, $filter = TRUE){
 		if($filter){
 			return filterStr($this->getRequest()->get($key));

diff --git a/application/library/Core/BasicAdmin.php b/application/library/Core/BasicAdmin.php
@@ -7,32 +7,28 @@
  */
 class AdminBasicController extends BasicController
 {
-
-    protected $AdminUser = array();//管理员用户信息
+    protected $AdminUser = array();
 	public $serverPrivateKey = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKrU5gne1HvK18yk9aFX+LIgf8bIZvW/TgAAQWUkLkVDf1s91r6JmlmJsvGDz1KWuFEtU5k+ZTY+znh0ncLfgdTcmVvymp1D4fhEKt/JSaZNZe7Fb3kfl7iT15pQBivirrkpP1dwyM5EzafkRo5wKOktbQLYglW/e+ChVf4L+mqXAgMBAAECgYBcweb6Wwzi/rv4OWXKKps2FSFsTSpiq3Jt27WmdmPNZh4D6+rrYIn3riYEr35mKMKCCWuIHPIV5zpy+1ciFfxHNifvwVs9zpWGYkuvyI2Ar41zODI8doYFaQjWUBf/xJziabTEn1pFsH+Q8xWqr0fXdFdKYt6lYnjZR3bJIL79yQJBANaEQ0MqPqbj4s6L++igcgizkPOQ00a0kRdv6R0wQWqXg5fseg776sUv301XYbTnc7BlmHsQUQsYcROOqzhZlNsCQQDL3f2ehMGecX2qnImBGbXIRIIF1DnjULDzBpz/ijMYg1trIRRjBirWFj6cQOEOxlW2A8qpz1ZxR9zfSzjYXG/1AkBPn8xvs9CJlfDsBd29XUC2piBZqBokFoX8kxeONAk0DYVU8Pvlb/CWvMxAIv0rbvXsNenBVC8g1TOztLMtOWMdAkEAgC1ZyXHknm7yuPNkzOPSVFEmgu21W8OfDZ2p1k0Y5R+puch5ne0Bv8sKoIl2NyjiOOdXY761tdGeAFK2MeqkhQJALGjfBtrV9c3u3XVVbpASadkkOcUvXOb8fyRvTv03Bg3cbF3hP6ucb5SPEg6dDHixRj25S+JTiYH5WxbtyYni5g==";
 
-
     public function init()
     {
         parent::init();
-        //系统默认
+		$sysvars = $data = array();
+		$data['config']=$this->config = $this->load('config')->getConfig();
         $sysvars['isHttps'] = $this->isHttps = isHttps();
         $sysvars['isAjax'] = $this->isAjax = isAjax();
         $sysvars['isGet'] = $this->isGet = isGet();
         $sysvars['isPost'] = $this->isPost = isPost();
         $sysvars['currentUrl'] = stripHTML(str_replace('//', '/', $_SERVER['REQUEST_URI']));
         $data['sysvars'] = $sysvars;
-        //登录处理
         $AdminUser = $this->getSession('AdminUser');
         if (is_array($AdminUser) AND !empty($AdminUser) AND $AdminUser['expiretime'] > time()) {
             $AdminUser['expiretime'] = time() + 15 * 60;
             $this->setSession('AdminUser', $AdminUser);
             $data['AdminUser'] = $this->AdminUser = $AdminUser;
-
         } else {
             $this->unsetSession('AdminUser');
         }
-		//防csrf攻击
 		$data['csrf_token'] = $this->createCsrfToken();
 		$this->getView()->assign($data);
     }

diff --git a/application/library/Core/BasicPc.php b/application/library/Core/BasicPc.php
@@ -6,42 +6,28 @@
  * Date: 2016-3-8
  */
 
-class PcBasicController extends BasicController {
-	protected $weixin=NULL;
-	protected $isWeixin=FALSE;
+class PcBasicController extends BasicController
+{
+	protected $uinfo=array();
+	protected $userid=0;
+	protected $login=FALSE;
 	public $serverPrivateKey = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKrU5gne1HvK18yk9aFX+LIgf8bIZvW/TgAAQWUkLkVDf1s91r6JmlmJsvGDz1KWuFEtU5k+ZTY+znh0ncLfgdTcmVvymp1D4fhEKt/JSaZNZe7Fb3kfl7iT15pQBivirrkpP1dwyM5EzafkRo5wKOktbQLYglW/e+ChVf4L+mqXAgMBAAECgYBcweb6Wwzi/rv4OWXKKps2FSFsTSpiq3Jt27WmdmPNZh4D6+rrYIn3riYEr35mKMKCCWuIHPIV5zpy+1ciFfxHNifvwVs9zpWGYkuvyI2Ar41zODI8doYFaQjWUBf/xJziabTEn1pFsH+Q8xWqr0fXdFdKYt6lYnjZR3bJIL79yQJBANaEQ0MqPqbj4s6L++igcgizkPOQ00a0kRdv6R0wQWqXg5fseg776sUv301XYbTnc7BlmHsQUQsYcROOqzhZlNsCQQDL3f2ehMGecX2qnImBGbXIRIIF1DnjULDzBpz/ijMYg1trIRRjBirWFj6cQOEOxlW2A8qpz1ZxR9zfSzjYXG/1AkBPn8xvs9CJlfDsBd29XUC2piBZqBokFoX8kxeONAk0DYVU8Pvlb/CWvMxAIv0rbvXsNenBVC8g1TOztLMtOWMdAkEAgC1ZyXHknm7yuPNkzOPSVFEmgu21W8OfDZ2p1k0Y5R+puch5ne0Bv8sKoIl2NyjiOOdXY761tdGeAFK2MeqkhQJALGjfBtrV9c3u3XVVbpASadkkOcUvXOb8fyRvTv03Bg3cbF3hP6ucb5SPEg6dDHixRj25S+JTiYH5WxbtyYni5g==";
-  	public function init(){	
+
+	public function init(){	
 		parent::init();
-		//系统默认
 		$sysvars = $data = array();
+		$data['config']=$this->config=$this->load('config')->getConfig();
 		$sysvars['isHttps']=$this->isHttps=isHttps();
 		$sysvars['isAjax']=$this->isAjax=isAjax();
 		$sysvars['isGet']=$this->isGet=isGet();
 		$sysvars['isPost']=$this->isPost=isPost();
 		$sysvars['currentUrl']=stripHTML(str_replace('//', '/',$_SERVER['REQUEST_URI']));
 		$sysvars['currentUrlSign']=md5(URL_KEY.$sysvars['currentUrl']);
 		$data['sysvars']=$sysvars; 
-		//2.获取当前路径页面的SEO设置
-		$request = \Yaf\Dispatcher::getInstance()->getRequest();
-		$seo_array=$this->load('seo')->getConfig();
-		$seo_k=$request->getModuleName().'-'.$request->getControllerName().'-'.$request->getActionName();
-		if(isset($seo_array[$seo_k]) AND !empty($seo_array[$seo_k])){
-			$seo=$seo_array[$seo_k];
-			$data['title']=$seo['title']?$seo['title']:'';
-			$data['keywords']=$seo['keywords']?$seo['keywords']:'';
-			$data['description']=$seo['description']?$seo['description']:'';
-		}else{
-			$data['title']='';
-			$data['keywords']='';
-			$data['description']='';
-		}
-		//3.登录的判断,加入登录超时判断
         $uinfo = $this->getSession('uinfo');
 		if(is_array($uinfo) AND !empty($uinfo) AND $uinfo['expiretime']>time()){
-
 			$groupName=$this->load('user_group')->getConfig();
 			$uinfo['groupName'] = $groupName[$uinfo['groupid']];
-
 			$uinfo['expiretime'] = time() + 15*60;
 			$this->setSession('uinfo',$uinfo);
 			$data['login']=$this->login=true;
@@ -51,12 +37,6 @@ public function init(){
 			$data['login']=$this->login=false;
 			$this->unsetSession('uinfo');
 		}
-		//微信打开的
-  		if(isMobile() AND isWeixin()){
-			$this->isWeixin=TRUE;
-			$this->weixin = WeixinApi::getInstance();
-		}
-		$data['isWeixin']=$this->isWeixin;
 		//防csrf攻击
 		$data['csrf_token'] = $this->createCsrfToken();
         $this->getView()->assign($data);

diff --git a/application/modules/Install/controllers/Index.php b/application/modules/Install/controllers/Index.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * 功能：安装模块
+ * Author:资料空白
+ * Date:20180626
+ */
+
+class IndexController extends BasicController
+{
+
+	public function init()
+    {
+        parent::init();
+    }
+
+    public function indexAction()
+    {
+		$data = array();
+        $this->getView()->assign($data);
+    }
+
+
+}
diff --git a/application/modules/Install/views/index/index.html b/application/modules/Install/views/index/index.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>ZFAKA平台-by资料空白</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <meta name="keywords" content="资料空白">
+    <meta name="description" content="ZFAKA平台正在由资料空白开发">
+    <link rel="stylesheet" href="/res/layui/css/layui.css">
+    <link rel="stylesheet" href="/res/css/global.css">
+    <script>
+    var TOKEN = "<?php echo $csrf_token;?>";
+    if (self != top) {
+        top.location = self.location;
+    }
+    </script>
+</head>
+
+<body>
+    <div class="fly-header layui-bg-black">
+        <div class="layui-container">
+            <a class="fly-logo" href="/"><img src="/res/images/logo.png" alt="layui"></a>
+            <ul class="layui-nav fly-nav">
+                <li class="layui-nav-item">
+                    <a href="javascript:;">安装</a>
+                </li>
+            </ul>
+
+    </div>
+<div class="layui-container fly-marginTop fly-user-main">
+    <div class="layui-row layui-col-space15">
+		<form class="layui-form layui-form-pane" action="">
+		 <div class="layui-form-item layui-form-text">
+			<label class="layui-form-label">服务条款</label>
+			<div class="layui-input-block">
+			  <textarea placeholder="" class="layui-textarea">内容我还没想好.</textarea>
+			</div>
+		  </div>
+		  <div class="layui-form-item">
+			<button class="layui-btn" lay-submit="" lay-filter="demo2">同意</button>
+		  </div>
+		</form>
+    </div>
+</div>
+<!--引入公共底文件-->
+<?php include COMMON_PATH.'/footer.html';?>
diff --git a/conf/application.ini b/conf/application.ini
@@ -17,7 +17,7 @@ application.dispatcher.defaultAction  = index
 application.view.ext                  = "html"
 
 ;声明存在的模块名,多个用,分隔
-application.modules                   = Index,Member,Help,Product,Admin,Crontab
+application.modules                   = Index,Member,Help,Product,Admin,Crontab,Install
 
 
 ; 生产环境