7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Web] Allow ratelimit time frame "day"; Allow to create announcements

Browse Source
This commit is contained in:
andryyy
2020-05-11 11:52:02 +02:00
parent 02a74914b4
commit 767ae65946
11 changed files with 116 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
data/web/inc/footer.inc.php
View File

@@ -182,13 +182,9 @@ $(document).ready(function() {
</script>
<div class="container footer">
<?php
if (!empty($UI_TEXTS['ui_footer'])):
?>
<hr><?=$UI_TEXTS['ui_footer'];?>
<?php
endif;
?>
<?php if (!empty($UI_TEXTS['ui_footer'])) { ?>
<hr><?=$UI_TEXTS['ui_footer'];?>
<?php } ?>
</div>
</body>
</html>

9
data/web/inc/functions.customize.inc.php
View File

@@ -113,12 +113,18 @@ function customize($_action, $_item, $_data = null) {
$apps_name = $_data['apps_name'];
$help_text = $_data['help_text'];
$ui_footer = $_data['ui_footer'];
$ui_announcement_text = $_data['ui_announcement_text'];
$ui_announcement_type = (in_array($_data['ui_announcement_type'], array('info', 'warning', 'danger'))) ? $_data['ui_announcement_type'] : false;
$ui_announcement_active = (!empty($_data['ui_announcement_active']) ? 1 : 0);
try {
$redis->set('TITLE_NAME', htmlspecialchars($title_name));
$redis->set('MAIN_NAME', htmlspecialchars($main_name));
$redis->set('APPS_NAME', htmlspecialchars($apps_name));
$redis->set('HELP_TEXT', $help_text);
$redis->set('UI_FOOTER', $ui_footer);
$redis->set('UI_ANNOUNCEMENT_TEXT', $ui_announcement_text);
$redis->set('UI_ANNOUNCEMENT_TYPE', $ui_announcement_type);
$redis->set('UI_ANNOUNCEMENT_ACTIVE', $ui_announcement_active);
}
catch (RedisException $e) {
$_SESSION['return'][] = array(
@@ -208,6 +214,9 @@ function customize($_action, $_item, $_data = null) {
$redis->del('UI_IMPRESS');
}
$data['ui_footer'] = ($ui_footer = $redis->get('UI_FOOTER')) ? $ui_footer : false;
$data['ui_announcement_text'] = ($ui_announcement_text = $redis->get('UI_ANNOUNCEMENT_TEXT')) ? $ui_announcement_text : false;
$data['ui_announcement_type'] = ($ui_announcement_type = $redis->get('UI_ANNOUNCEMENT_TYPE')) ? $ui_announcement_type : false;
$data['ui_announcement_active'] = ($redis->get('UI_ANNOUNCEMENT_ACTIVE') == 1) ? 1 : 0;
return $data;
}
catch (RedisException $e) {

4
data/web/inc/functions.ratelimit.inc.php
View File

@@ -25,7 +25,7 @@ function ratelimit($_action, $_scope, $_data = null) {
foreach ($objects as $object) {
$rl_value = intval($_data['rl_value']);
$rl_frame = $_data['rl_frame'];
if (!in_array($rl_frame, array('s', 'm', 'h'))) {
if (!in_array($rl_frame, array('s', 'm', 'h', 'd'))) {
$_SESSION['return'][] = array(
'type' => 'danger',
'log' => array(__FUNCTION__, $_action, $_scope, $_data_log),
@@ -85,7 +85,7 @@ function ratelimit($_action, $_scope, $_data = null) {
foreach ($objects as $object) {
$rl_value = intval($_data['rl_value']);
$rl_frame = $_data['rl_frame'];
if (!in_array($rl_frame, array('s', 'm', 'h'))) {
if (!in_array($rl_frame, array('s', 'm', 'h', 'd'))) {
$_SESSION['return'][] = array(
'type' => 'danger',
'log' => array(__FUNCTION__, $_action, $_scope, $_data_log),

8
data/web/inc/header.inc.php
View File

@@ -138,3 +138,11 @@
</div><!--/.container-fluid -->
</nav>
<form action="/" method="post" id="logout"><input type="hidden" name="logout"></form>
<?php if (!empty($UI_TEXTS['ui_announcement_text']) &&
in_array($UI_TEXTS['ui_announcement_type'], array('info', 'warning', 'danger')) &&
$UI_TEXTS['ui_announcement_active'] == 1 &&
parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH) != '/') { ?>
<div class="container">
<div class="alert alert-<?=$UI_TEXTS['ui_announcement_type'];?>"><?=$UI_TEXTS['ui_announcement_text'];?></div>
</div>
<?php } ?>