From 2d049f37da24a74685430068a38626cf8e495670 Mon Sep 17 00:00:00 2001 From: andryyy Date: Wed, 8 Jul 2020 19:36:05 +0200 Subject: [PATCH] [Web] Allow mins_interval of max 1 month for sync jobs, fixes #3642 --- data/web/edit.php | 4 ++-- data/web/inc/functions.mailbox.inc.php | 4 ++-- data/web/inc/init_db.inc.php | 4 ++-- data/web/modals/mailbox.php | 4 ++-- data/web/modals/user.php | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/data/web/edit.php b/data/web/edit.php index ddc2287f..0eecb797 100644 --- a/data/web/edit.php +++ b/data/web/edit.php @@ -1243,8 +1243,8 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- - 1-3600 + + 1-43800
diff --git a/data/web/inc/functions.mailbox.inc.php b/data/web/inc/functions.mailbox.inc.php index 5f091743..1d6062fa 100644 --- a/data/web/inc/functions.mailbox.inc.php +++ b/data/web/inc/functions.mailbox.inc.php @@ -352,7 +352,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) { ); return false; } - if (!filter_var($mins_interval, FILTER_VALIDATE_INT, array('options' => array('min_range' => 1, 'max_range' => 3600)))) { + if (!filter_var($mins_interval, FILTER_VALIDATE_INT, array('options' => array('min_range' => 1, 'max_range' => 43800)))) { $_SESSION['return'][] = array( 'type' => 'danger', 'log' => array(__FUNCTION__, $_action, $_type, $_data_log, $_attr), @@ -1650,7 +1650,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) { ); continue; } - if (!filter_var($mins_interval, FILTER_VALIDATE_INT, array('options' => array('min_range' => 1, 'max_range' => 3600)))) { + if (!filter_var($mins_interval, FILTER_VALIDATE_INT, array('options' => array('min_range' => 1, 'max_range' => 43800)))) { $_SESSION['return'][] = array( 'type' => 'danger', 'log' => array(__FUNCTION__, $_action, $_type, $_data_log, $_attr), diff --git a/data/web/inc/init_db.inc.php b/data/web/inc/init_db.inc.php index bf053cab..a8a4aa55 100644 --- a/data/web/inc/init_db.inc.php +++ b/data/web/inc/init_db.inc.php @@ -3,7 +3,7 @@ function init_db_schema() { try { global $pdo; - $db_version = "12052020_1828"; + $db_version = "08072020_1932"; $stmt = $pdo->query("SHOW TABLES LIKE 'versions'"); $num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC)); @@ -564,7 +564,7 @@ function init_db_schema() { "password1" => "VARCHAR(255) NOT NULL", "exclude" => "VARCHAR(500) NOT NULL DEFAULT ''", "maxage" => "SMALLINT NOT NULL DEFAULT '0'", - "mins_interval" => "VARCHAR(50) NOT NULL DEFAULT '0'", + "mins_interval" => "SMALLINT UNSIGNED NOT NULL DEFAULT '0'", "maxbytespersecond" => "VARCHAR(50) NOT NULL DEFAULT '0'", "port1" => "SMALLINT UNSIGNED NOT NULL", "enc1" => "ENUM('TLS','SSL','PLAIN') DEFAULT 'TLS'", diff --git a/data/web/modals/mailbox.php b/data/web/modals/mailbox.php index 4d1aeb79..063a1066 100644 --- a/data/web/modals/mailbox.php +++ b/data/web/modals/mailbox.php @@ -457,8 +457,8 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- - 1-3600 + + 1-43800
diff --git a/data/web/modals/user.php b/data/web/modals/user.php index 15c72b5b..e4c18611 100644 --- a/data/web/modals/user.php +++ b/data/web/modals/user.php @@ -53,8 +53,8 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
- - 1-3600 + + 1-43800