Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'ztflow-daitingting-main#daitingting' of zentao/zentaopms (#78)

Browse Source
This commit is contained in:
丁国栋
2024-06-12 02:54:04 +00:00
committed by Gitfox
parent c93236be29 b875304c72
commit df90f4da87
8 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/index/ui/index.html.php
+1 -1
View File
@@ -28,7 +28,7 @@ jsVar('manualText', $lang->manual);
jsVar('manualUrl', ((!empty($config->isINT)) ? $config->manualUrl['int'] : $config->manualUrl['home']) . '&theme=' . $_COOKIE['theme']);
jsVar('langData', array_merge(array('search' => $lang->index->search, 'searchAB' => $lang->searchAB), (array)$lang->index->dock));
jsVar('browserMessage', $browserMessage);
jsVar('pollTime', (!empty($config->message->browser->turnon) && isset($config->message->browser->pollTime)) ? $config->message->browser->pollTime : 600);
jsVar('pollTime', (!empty($config->message->browser->turnon) && !empty($config->message->browser->pollTime)) ? $config->message->browser->pollTime : 600);
jsVar('turnon', empty($config->message->browser->turnon) ? 0 : 1);
jsVar('runnable', $this->loadModel('cron')->runnable());
jsVar('showFeatures', $showFeatures);
module/message/config.php
+3 -2
View File
@@ -40,5 +40,6 @@ $config->message->setting['webhook']['setting'] = $config->message->available['
$config->message->setting['mail']['setting'] = $config->message->available['mail'];
$config->message->browser = new stdclass();
$config->message->browser->turnon = 1;
$config->message->browser->pollTime = 300;
$config->message->browser->turnon = 1;
$config->message->browser->pollTime = 300;
$config->message->browser->minPollTime = 30;
module/message/control.php
+2
View File
@@ -45,6 +45,8 @@ class message extends control
if($_POST)
{
$data = fixer::input('post')->get();
if(empty($data->pollTime)) $this->send(array('result' => 'fail', 'message' => array('pollTime' => sprintf($this->lang->error->notempty, $this->lang->message->browserSetting->pollTime))));
if($data->pollTime < $this->config->message->browser->minPollTime) $this->send(array('result' => 'fail', 'message' => array('pollTime' => $this->lang->message->browserSetting->pollTimeTip)));
$browserConfig = new stdclass();
$browserConfig->turnon = $data->turnon;
module/message/lang/de.php
+1
View File
@@ -13,6 +13,7 @@ $lang->message->browserSetting = new stdclass();
$lang->message->browserSetting->turnon = 'Notification';
$lang->message->browserSetting->pollTime = 'Polling Time';
$lang->message->browserSetting->pollTimeTip = 'Polling time can not less than 30 seconds.';
$lang->message->browserSetting->pollTimePlaceholder = 'Notify the time intervals for the search by seconds.';
$lang->message->browserSetting->turnonList[1] = 'On';
module/message/lang/en.php
+1
View File
@@ -13,6 +13,7 @@ $lang->message->browserSetting = new stdclass();
$lang->message->browserSetting->turnon = 'Notification';
$lang->message->browserSetting->pollTime = 'Polling Time';
$lang->message->browserSetting->pollTimeTip = 'Polling time can not less than 30 seconds.';
$lang->message->browserSetting->pollTimePlaceholder = 'Notify the time intervals for the search by seconds.';
$lang->message->browserSetting->turnonList[1] = 'On';
module/message/lang/fr.php
+1
View File
@@ -13,6 +13,7 @@ $lang->message->browserSetting = new stdclass();
$lang->message->browserSetting->turnon = 'Notification';
$lang->message->browserSetting->pollTime = 'Intervalle';
$lang->message->browserSetting->pollTimeTip = 'Polling time can not less than 30 seconds.';
$lang->message->browserSetting->pollTimePlaceholder = 'Notifier les intervalles de temps pour la recherche par secondes.';
$lang->message->browserSetting->turnonList[1] = 'On';
module/message/lang/zh-cn.php
+1
View File
@@ -13,6 +13,7 @@ $lang->message->browserSetting = new stdclass();
$lang->message->browserSetting->turnon = '是否打开';
$lang->message->browserSetting->pollTime = '轮询时间';
$lang->message->browserSetting->pollTimeTip = '轮询时间不能小于30秒。';
$lang->message->browserSetting->pollTimePlaceholder = '通知的时间间隔，以秒为单位。';
$lang->message->browserSetting->turnonList[1] = '打开';
module/message/ui/browser.html.php
+1
View File
@@ -34,6 +34,7 @@ formPanel
formGroup
(
set::width('1/2'),
set::required(true),
set::label($lang->message->browserSetting->pollTime),
set::name('pollTime'),
set::value($browserConfig->pollTime)