diff --git a/module/index/ui/index.html.php b/module/index/ui/index.html.php index 38f40a77b5..62a22fdfd9 100644 --- a/module/index/ui/index.html.php +++ b/module/index/ui/index.html.php @@ -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); diff --git a/module/message/config.php b/module/message/config.php index c637cac386..776e58b6da 100644 --- a/module/message/config.php +++ b/module/message/config.php @@ -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; diff --git a/module/message/control.php b/module/message/control.php index cccdc50aa3..87a1019154 100644 --- a/module/message/control.php +++ b/module/message/control.php @@ -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; diff --git a/module/message/lang/de.php b/module/message/lang/de.php index f209176bf7..8b9d003a40 100644 --- a/module/message/lang/de.php +++ b/module/message/lang/de.php @@ -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'; diff --git a/module/message/lang/en.php b/module/message/lang/en.php index 1f2284ea19..a1e74b4c2b 100644 --- a/module/message/lang/en.php +++ b/module/message/lang/en.php @@ -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'; diff --git a/module/message/lang/fr.php b/module/message/lang/fr.php index 41bb7919ec..c8d9472dab 100644 --- a/module/message/lang/fr.php +++ b/module/message/lang/fr.php @@ -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'; diff --git a/module/message/lang/zh-cn.php b/module/message/lang/zh-cn.php index dccd7cc1d4..04d8829194 100644 --- a/module/message/lang/zh-cn.php +++ b/module/message/lang/zh-cn.php @@ -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] = '打开'; diff --git a/module/message/ui/browser.html.php b/module/message/ui/browser.html.php index 9595487640..e350f796c0 100644 --- a/module/message/ui/browser.html.php +++ b/module/message/ui/browser.html.php @@ -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)