From e7cc7845346add53caf7e1acd4f564299f3b660d Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 29 Aug 2019 10:57:40 +0800
Subject: [PATCH]  * finish task #6281,6282.

---
 module/common/lang/en.php            |  3 +-
 module/common/lang/menuOrder.php     |  3 +-
 module/common/lang/zh-cn.php         |  3 +-
 module/common/view/footer.html.php   |  8 +++--
 module/message/config.php            |  7 +++++
 module/message/control.php           | 32 ++++++++++++++++++++
 module/message/lang/zh-cn.php        | 10 +++++++
 module/message/view/browser.html.php | 45 ++++++++++++++++++++++++++++
 8 files changed, 106 insertions(+), 5 deletions(-)
 create mode 100644 module/message/view/browser.html.php

diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 026ada60e2..bc425bd66a 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -385,7 +385,8 @@ $lang->admin->subMenu = new stdclass();
 $lang->admin->subMenu->message = new stdclass();
 $lang->admin->subMenu->message->mail    = array('link' => 'Mail|mail|index', 'subModule' => 'mail');
 $lang->admin->subMenu->message->webhook = array('link' => 'Webhook|webhook|browse', 'subModule' => 'webhook');
-$lang->admin->subMenu->message->setting = array('link' => 'Settings|message|setting', 'subModule' => 'message');
+$lang->admin->subMenu->message->browser = array('link' => 'Browser|message|browser');
+$lang->admin->subMenu->message->setting = array('link' => 'Settings|message|setting');
 
 $lang->admin->subMenu->sso = new stdclass();
 $lang->admin->subMenu->sso->ranzhi = 'Zdoo|admin|sso';
diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php
index a6d5e9e360..e293cb96b8 100644
--- a/module/common/lang/menuOrder.php
+++ b/module/common/lang/menuOrder.php
@@ -117,7 +117,8 @@ $lang->admin->menuOrder[50] = 'system';
 $lang->admin->subMenuOrder = new stdclass();
 $lang->admin->subMenuOrder->message[5]  = 'mail';
 $lang->admin->subMenuOrder->message[10] = 'webhook';
-$lang->admin->subMenuOrder->message[15] = 'setting';
+$lang->admin->subMenuOrder->message[15] = 'browser';
+$lang->admin->subMenuOrder->message[20] = 'setting';
 $lang->admin->subMenuOrder->sso[5]      = 'ranzhi';
 $lang->admin->subMenuOrder->dev[5]      = 'api';
 $lang->admin->subMenuOrder->dev[10]     = 'db';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 96d560411b..52c95088e5 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -385,7 +385,8 @@ $lang->admin->subMenu = new stdclass();
 $lang->admin->subMenu->message = new stdclass();
 $lang->admin->subMenu->message->mail    = array('link' => '邮件|mail|index', 'subModule' => 'mail');
 $lang->admin->subMenu->message->webhook = array('link' => 'Webhook|webhook|browse', 'subModule' => 'webhook');
-$lang->admin->subMenu->message->setting = array('link' => '设置|message|setting', 'subModule' => 'message');
+$lang->admin->subMenu->message->browser = array('link' => '浏览器|message|browser');
+$lang->admin->subMenu->message->setting = array('link' => '设置|message|setting');
 
 $lang->admin->subMenu->sso = new stdclass();
 $lang->admin->subMenu->sso->ranzhi = '然之协同|admin|sso';
diff --git a/module/common/view/footer.html.php b/module/common/view/footer.html.php
index d26562a5fc..8aec434767 100755
--- a/module/common/view/footer.html.php
+++ b/module/common/view/footer.html.php
@@ -25,7 +25,10 @@ function ajaxIgnoreBrowser(){$.get(createLink('misc', 'ajaxIgnoreBrowser'));}
 $(function(){showBrowserNotice()});
 <?php endif;?>
 
-/* Alert get message. */
+<?php $this->app->loadConfig('message');?>
+<?php if($config->message->browser->turnon):?>
+/* Alert got messages. */
+needPing = false;
 $(function()
 {
     var windowBlur = false;
@@ -52,8 +55,9 @@ $(function()
                 }
             }
         });
-    }, 5 * 60 * 1000);
+    }, <?php echo $config->message->browser->pollTime * 1000;?>);
 })
+<?php endif;?>
 
 <?php if(!empty($config->sso->redirect)):?>
 <?php
diff --git a/module/message/config.php b/module/message/config.php
index 8af4f3cc17..88187a902b 100644
--- a/module/message/config.php
+++ b/module/message/config.php
@@ -10,6 +10,7 @@ $config->message->objectTypes['case']        = array('opened', 'edited', 'commen
 $config->message->objectTypes['testtask']    = array('opened', 'edited', 'started', 'blocked', 'closed', 'activated');
 $config->message->objectTypes['todo']        = array('opened', 'edited');
 
+$config->message->available = array();
 $config->message->available['mail']['story']    = $config->message->objectTypes['story'];
 $config->message->available['mail']['task']     = $config->message->objectTypes['task'];
 $config->message->available['mail']['bug']      = $config->message->objectTypes['bug'];
@@ -23,9 +24,15 @@ $config->message->available['message']['task']     = $config->message->objectTyp
 $config->message->available['message']['testtask'] = $config->message->objectTypes['testtask'];
 $config->message->available['message']['todo']     = $config->message->objectTypes['todo'];
 
+$config->message->typeLink = array();
 $config->message->typeLink['mail']    = 'mail|index';
 $config->message->typeLink['webhook'] = 'webhook|browse';
 
+$config->message->setting = array();
 $config->message->setting['message']['setting']  = $config->message->available['message'];
 $config->message->setting['webhook']['setting']  = $config->message->available['webhook'];
 $config->message->setting['mail']['setting']     = $config->message->available['mail'];
+
+$config->message->browser = new stdclass();
+$config->message->browser->turnon   = 1;
+$config->message->browser->pollTime = 5 * 60;
diff --git a/module/message/control.php b/module/message/control.php
index 9b36897266..bf4f3d11ea 100644
--- a/module/message/control.php
+++ b/module/message/control.php
@@ -31,6 +31,36 @@ class message extends control
         if(common::hasPriv('message', 'setting')) $this->locate($this->createLink('message', 'setting'));
     }
 
+    /**
+     * Browser Setting
+     * 
+     * @access public
+     * @return void
+     */
+    public function browser()
+    {
+        $browserConfig = $this->config->message->browser;
+
+        if($_POST)
+        {
+            $data = fixer::input('post')->get();
+
+            $browserConfig = new stdclass();
+            $browserConfig->turnon   = $data->turnon;
+            $browserConfig->pollTime = $data->pollTime;
+
+            $this->loadModel('setting')->setItems('system.message.browser', $browserConfig);
+            if(dao::isError()) die(js::error(dao::getError()));
+        }
+
+        $this->view->title      = $this->lang->message->browser;
+        $this->view->position[] = $this->lang->message->common;
+        $this->view->position[] = $this->lang->message->browser;
+
+        $this->view->browserConfig = $browserConfig;
+        $this->display();
+    }
+
     /**
      * Setting
      *
@@ -71,6 +101,8 @@ class message extends control
      */
     public function ajaxGetMessage($windowBlur = false)
     {
+        if($this->config->message->browser->turnon == 0) die();
+
         $waitMessages = $this->message->getMessages('wait');
         $todos = $this->message->getNoticeTodos();
         if(empty($waitMessages) and empty($todos)) die();
diff --git a/module/message/lang/zh-cn.php b/module/message/lang/zh-cn.php
index 5895d62d0b..678ef2d9e1 100644
--- a/module/message/lang/zh-cn.php
+++ b/module/message/lang/zh-cn.php
@@ -2,7 +2,17 @@
 $lang->message->common  = '消息';
 $lang->message->index   = '首页';
 $lang->message->setting = '设置';
+$lang->message->browser = '浏览器通知';
 
 $lang->message->typeList['mail']     = '邮件';
 $lang->message->typeList['message']  = '浏览器通知';
 $lang->message->typeList['webhook']  = 'Webhook';
+
+$lang->message->browserSetting = new stdclass();
+$lang->message->browserSetting->turnon   = '是否打开';
+$lang->message->browserSetting->pollTime = '轮询时间';
+
+$lang->message->browserSetting->pollTimePlaceholder = '通知查询的时间间隔，以秒为单位。';
+
+$lang->message->browserSetting->turnonList[1] = '打开';
+$lang->message->browserSetting->turnonList[0] = '关闭';
diff --git a/module/message/view/browser.html.php b/module/message/view/browser.html.php
new file mode 100644
index 0000000000..f9279e53c3
--- /dev/null
+++ b/module/message/view/browser.html.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * The browser view file of message 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     message
+ * @version     $Id$
+ * @link        http://www.zentao.net
+ */
+?>
+<?php include './header.html.php';?>
+<div id='mainContent' class='main-content'>
+  <div class='center-block mw-800px'>
+    <div class='main-header'>
+      <h2>
+        <?php echo $lang->message->browser;?>
+        <small class='text-muted'> <?php echo $lang->arrow . $lang->message->setting;?></small>
+      </h2>
+    </div>
+    <form method='post' id='dataform'>
+      <table class='table table-form'>
+        <tr>
+          <th class='rowhead w-130px'><?php echo $lang->message->browserSetting->turnon; ?></th>
+          <td class='w-p25-f'><?php echo html::radio('turnon', $lang->message->browserSetting->turnonList, $browserConfig->turnon);?></td>
+          <td></td>
+          <td></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->message->browserSetting->pollTime; ?></th>
+          <td><?php echo html::input('pollTime', $browserConfig->pollTime, "class='form-control'");?></td>
+          <td colspan='2'><?php echo $lang->message->browserSetting->pollTimePlaceholder?></td>
+        </tr>
+        <tr>
+          <td colspan='4' class='text-center'>
+            <?php echo html::submitButton();?>
+            <?php echo html::backButton();?>
+          </td>
+        </tr>
+      </table>
+    </form>
+  </div>
+</div>
+<?php include '../../common/view/footer.html.php';?>