From d67fd9d1653f2a05706d8949470b6e30efcbca00 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 2 May 2018 13:05:54 +0800
Subject: [PATCH]  * remove custom-ajaxsethomepage page.

---
 module/backup/view/change.html.php          | 34 ++++++++++-----------
 module/custom/control.php                   | 21 -------------
 module/custom/view/ajaxsethomepage.html.php | 19 ------------
 module/product/control.php                  | 13 --------
 module/project/control.php                  | 11 -------
 module/qa/control.php                       | 12 --------
 6 files changed, 16 insertions(+), 94 deletions(-)
 delete mode 100644 module/custom/view/ajaxsethomepage.html.php

diff --git a/module/backup/view/change.html.php b/module/backup/view/change.html.php
index b0ba41fac5..a15eca7ea5 100644
--- a/module/backup/view/change.html.php
+++ b/module/backup/view/change.html.php
@@ -11,25 +11,23 @@
  */
 ?>
 <?php include '../../common/view/header.lite.html.php';?>
-<div id='titlebar'>
-  <div class='heading'>
-    <span class='prefix'><?php echo html::icon($lang->icons['edit']);?></span>
-    <strong><?php echo $lang->backup->change;?></strong>
+<div id='mainContent' class='main-content'>
+  <div class='main-header'>
+    <h2><?php echo $lang->backup->change;?></h2>
   </div>
+  <form method='post' target='hiddenwin' style='padding:10px 5%'>
+    <table class='w-p100'>
+      <tr>
+        <td>
+          <div class='input-group'>
+            <?php echo html::input('holdDays', $config->backup->holdDays, "class='form-control' autocomplete='off'");?>
+            <strong class='input-group-addon'><?php echo $lang->day;?></strong>
+          </div>
+        </td>
+        <td><?php echo html::submitButton();?></td>
+      </tr>
+    </table>
+  </form>
 </div>
-
-<form class='form-condensed' method='post' target='hiddenwin' style='padding: 30px 5%'>
-  <table class='w-p100'>
-    <tr>
-      <td>
-        <div class='input-group'>
-          <?php echo html::input('holdDays', $config->backup->holdDays, "class='form-control' autocomplete='off'");?>
-          <strong class='input-group-addon'><?php echo $lang->day;?></strong>
-        </div>
-      </td>
-      <td><?php echo html::submitButton();?></td>
-    </tr>
-  </table>
-</form>
 <?php include '../../common/view/footer.lite.html.php';?>
 
diff --git a/module/custom/control.php b/module/custom/control.php
index 353a7f6a5c..c447c06298 100644
--- a/module/custom/control.php
+++ b/module/custom/control.php
@@ -310,27 +310,6 @@ class custom extends control
         die(js::reload('parent'));
     }
 
-    /**
-     * Ajax set homepage.
-     * 
-     * @param  string $module 
-     * @param  string $page 
-     * @access public
-     * @return void
-     */
-    public function ajaxSetHomepage($module, $page = '')
-    {
-        if(empty($page))
-        {
-            $this->view->title  = $this->lang->homepage;
-            $this->view->module = $module;
-            die($this->display());
-        }
-
-        $account = $this->app->user->account;
-        $this->loadModel('setting')->setItem("$account.$module.homepage", $page);
-    }
-
     /**
      * Custom menu view
      *
diff --git a/module/custom/view/ajaxsethomepage.html.php b/module/custom/view/ajaxsethomepage.html.php
deleted file mode 100644
index 04365c571a..0000000000
--- a/module/custom/view/ajaxsethomepage.html.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * The setIndexPage view file of custom module of ZenTaoPMS.
- *
- * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
- * @license     ZPL (http://zpl.pub/page/zplv12.html)
- * @author      Yidong Wang <yidong@cnezsoft.com>
- * @package     custom
- * @version     $Id$
- * @link        http://www.zentao.net
- */
-?>
-<?php include '../../common/view/header.lite.html.php';?>
-<script>
-var result = confirm('<?php echo $this->lang->custom->notice->indexPage[$module];?>');
-$.get(createLink('custom', 'ajaxSetHomepage', 'module=<?php echo $module?>&page=' + (result ? 'index' : 'browse')), function(){location.reload(true)});
-</script>
-<?php include '../../common/view/footer.lite.html.php';?>
-
diff --git a/module/product/control.php b/module/product/control.php
index e0797ef202..aed75b3501 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -50,19 +50,6 @@ class product extends control
     public function index($locate = 'auto', $productID = 0, $status = 'noclosed', $orderBy = 'order_desc', $recTotal = 0, $recPerPage = 10, $pageID = 1)
     {
         if($this->config->global->flow == 'onlyTest') $this->locate($this->createLink($this->moduleName, 'build'));
-
-        if($this->app->user->account == 'guest' or commonModel::isTutorialMode()) $this->config->product->homepage = 'index';
-        if(!isset($this->config->product->homepage))
-        {
-            if($this->products and $this->app->getViewType() != 'mhtml') die($this->fetch('custom', 'ajaxSetHomepage', "module=product"));
-
-            $this->config->product->homepage = 'index';
-            $this->fetch('custom', 'ajaxSetHomepage', "module=product&page=index");
-        }
-
-        $homepage = $this->config->product->homepage;
-        if($homepage == 'browse' and $locate == 'auto') $locate = 'yes';
-
         if($locate == 'yes') $this->locate($this->createLink($this->moduleName, 'browse'));
 
         if($this->app->getViewType() != 'mhtml') unset($this->lang->product->menu->index);
diff --git a/module/project/control.php b/module/project/control.php
index 2dd0e0bf64..bfb93d97d4 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -39,17 +39,6 @@ class project extends control
      */
     public function index($locate = 'auto', $projectID = 0)
     {
-        if($this->app->user->account == 'guest' or commonModel::isTutorialMode()) $this->config->project->homepage = 'index';
-        if(!isset($this->config->project->homepage))
-        {
-            if($this->projects and $this->app->viewType != 'mhtml') die($this->fetch('custom', 'ajaxSetHomepage', "module=project"));
-
-            $this->config->project->homepage = 'index';
-            $this->fetch('custom', 'ajaxSetHomepage', "module=project&page=index");
-        }
-
-        $homepage = $this->config->project->homepage;
-        if($homepage == 'browse' and $locate == 'auto') $locate = 'yes';
         if($locate == 'yes') $this->locate($this->createLink('project', 'task'));
 
         if($this->app->viewType != 'mhtml') unset($this->lang->project->menu->index);
diff --git a/module/qa/control.php b/module/qa/control.php
index 0e4a1d259f..15a11c8c0b 100644
--- a/module/qa/control.php
+++ b/module/qa/control.php
@@ -20,19 +20,7 @@ class qa extends control
     public function index($locate = 'auto', $productID = 0)
     {
         $this->products = $this->loadModel('product')->getPairs('nocode');
-        if($this->app->user->account == 'guest' or commonModel::isTutorialMode()) $this->config->qa->homepage = 'index';
-        if(!isset($this->config->qa->homepage))
-        {
-            if($this->products and $this->app->viewType != 'mhtml') die($this->fetch('custom', 'ajaxSetHomepage', "module=qa"));
-
-            $this->config->qa->homepage = 'index';
-            $this->fetch('custom', 'ajaxSetHomepage', "module=qa&page=index");
-        }
-
         if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', "fromModule=qa")));
-
-        $homepage = $this->config->qa->homepage;
-        if($homepage == 'browse' and $locate == 'auto') $locate = 'yes';
         if($locate == 'yes') $this->locate($this->createLink('bug', 'browse'));
 
         if($this->app->viewType != 'mhtml') unset($this->lang->qa->menu->index);