@@ -75,8 +75,8 @@ $(document).ready(function() {
});
// IE fix to hide scrollbars when table body is empty
- $('tbody').filter(function (index) {
- return $(this).children().length < 1;
+ $('tbody').filter(function (index) {
+ return $(this).children().length < 1;
}).remove();
// Init Bootstrap Selectpicker
diff --git a/data/web/inc/functions.inc.php b/data/web/inc/functions.inc.php
index cfa3fdb4..37acb736 100644
--- a/data/web/inc/functions.inc.php
+++ b/data/web/inc/functions.inc.php
@@ -52,6 +52,7 @@ function init_db_schema() {
$data = '';
}
}
+ // Create index if not exists
$stmt = $pdo->query("SHOW INDEX FROM sogo_acl WHERE KEY_NAME = 'sogo_acl_c_folder_id_idx'");
$num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC));
if ($num_results == 0) {
@@ -67,6 +68,22 @@ function init_db_schema() {
'msg' => 'Database initialization completed.'
);
}
+ // Add newly added columns
+ $stmt = $pdo->query("SHOW COLUMNS FROM `mailbox` LIKE 'kind'");
+ $num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC));
+ if ($num_results == 0) {
+ $pdo->query("ALTER TABLE `mailbox` ADD `kind` varchar(100) NOT NULL DEFAULT ''");
+ }
+ $stmt = $pdo->query("SHOW COLUMNS FROM `mailbox` LIKE 'multiple_bookings'");
+ $num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC));
+ if ($num_results == 0) {
+ $pdo->query("ALTER TABLE `mailbox` ADD `multiple_bookings` tinyint(1) NOT NULL DEFAULT '0'");
+ }
+ $stmt = $pdo->query("SHOW COLUMNS FROM `mailbox` LIKE 'wants_tagged_subject'");
+ $num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC));
+ if ($num_results == 0) {
+ $pdo->query("ALTER TABLE `mailbox` ADD `wants_tagged_subject` tinyint(1) NOT NULL DEFAULT '0'");
+ }
}
function verify_ssha256($hash, $password) {
// Remove tag if any
@@ -2630,6 +2647,101 @@ function get_sender_acl_handles($mailbox, $which) {
}
return false;
}
+function tagging_options($action, $data = null) {
+ global $lang;
+ global $pdo;
+ $username = $_SESSION['mailcow_cc_username'];
+ if ($action == "get") {
+ if (!filter_var($username, FILTER_VALIDATE_EMAIL)) {
+ return false;
+ }
+ try {
+ $stmt = $pdo->prepare("SELECT `wants_tagged_subject` FROM `mailbox` WHERE `username` = :username");
+ $stmt->execute(array(':username' => $username));
+ $SelectData = $stmt->fetch(PDO::FETCH_ASSOC);
+ }
+ catch(PDOException $e) {
+ $_SESSION['return'] = array(
+ 'type' => 'danger',
+ 'msg' => 'MySQL: '.$e
+ );
+ return false;
+ }
+ return $SelectData['wants_tagged_subject'];
+ }
+ elseif ($action == "set") {
+ ($data['tagged_mail_handler'] == "subject") ? $wants_tagged_subject = '1' : $wants_tagged_subject = '0';
+ if (!filter_var($username, FILTER_VALIDATE_EMAIL)) {
+ $_SESSION['return'] = array(
+ 'type' => 'danger',
+ 'msg' => sprintf($lang['danger']['username_invalid'])
+ );
+ return false;
+ }
+ try {
+ $stmt = $pdo->prepare("UPDATE `mailbox` SET `wants_tagged_subject` = :wants_tagged_subject WHERE `username` = :username");
+ $stmt->execute(array(':username' => $username, ':wants_tagged_subject' => $wants_tagged_subject));
+ $SelectData = $stmt->fetch(PDO::FETCH_ASSOC);
+ }
+ catch(PDOException $e) {
+ $_SESSION['return'] = array(
+ 'type' => 'danger',
+ 'msg' => 'MySQL: '.$e
+ );
+ return false;
+ }
+ $_SESSION['return'] = array(
+ 'type' => 'success',
+ 'msg' => sprintf($lang['success']['mailbox_modified'], $username)
+ );
+ }
+ return false;
+}
+function user_object_info($action, $data = null) {
+ global $lang;
+ global $pdo;
+ $username = $_SESSION['mailcow_cc_username'];
+ if ($action == "get") {
+ if (!filter_var($username, FILTER_VALIDATE_EMAIL)) {
+ return false;
+ }
+ try {
+ $stmt = $pdo->prepare("SELECT IFNULL(GROUP_CONCAT(`address` SEPARATOR ', '), '✘') AS `aliases` FROM `alias` WHERE `goto` = :username_goto AND `address` NOT LIKE '@%' AND `address` != :username_address");
+ $stmt->execute(array(':username_goto' => $username, ':username_address' => $username));
+ $run = $stmt->fetchAll(PDO::FETCH_ASSOC);
+ while ($row = array_shift($run)) {
+ $data['aliases'] = $row['aliases'];
+ }
+ $stmt = $pdo->prepare("SELECT IFNULL(GROUP_CONCAT(`send_as` SEPARATOR ', '), '✘') AS `send_as` FROM `sender_acl` WHERE `logged_in_as` = :username AND `send_as` NOT LIKE '@%';");
+ $stmt->execute(array(':username' => $username));
+ $run = $stmt->fetchAll(PDO::FETCH_ASSOC);
+ while ($row = array_shift($run)) {
+ $data['aliases_also_send_as'] = $row['send_as'];
+ }
+ $stmt = $pdo->prepare("SELECT IFNULL(GROUP_CONCAT(`send_as` SEPARATOR ', '), '✘') AS `send_as` FROM `sender_acl` WHERE `logged_in_as` = :username AND `send_as` LIKE '@%';");
+ $stmt->execute(array(':username' => $username));
+ $run = $stmt->fetchAll(PDO::FETCH_ASSOC);
+ while ($row = array_shift($run)) {
+ $data['aliases_send_as_all'] = $row['send_as'];
+ }
+ $stmt = $pdo->prepare("SELECT IFNULL(GROUP_CONCAT(`address` SEPARATOR ', '), '✘') as `address` FROM `alias` WHERE `goto` = :username AND `address` LIKE '@%';");
+ $stmt->execute(array(':username' => $username));
+ $run = $stmt->fetchAll(PDO::FETCH_ASSOC);
+ while ($row = array_shift($run)) {
+ $data['is_catch_all'] = $row['address'];
+ }
+ return $data;
+ }
+ catch(PDOException $e) {
+ $_SESSION['return'] = array(
+ 'type' => 'danger',
+ 'msg' => 'MySQL: '.$e
+ );
+ return false;
+ }
+ }
+ return false;
+}
function is_valid_domain_name($domain_name) {
if (empty($domain_name)) {
return false;
diff --git a/data/web/inc/init.sql b/data/web/inc/init.sql
index 4335ff20..183c55e1 100644
--- a/data/web/inc/init.sql
+++ b/data/web/inc/init.sql
@@ -78,6 +78,9 @@ CREATE TABLE IF NOT EXISTS `mailbox` (
`modified` datetime NOT NULL DEFAULT '2016-01-01 00:00:00',
`tls_enforce_in` tinyint(1) NOT NULL DEFAULT '0',
`tls_enforce_out` tinyint(1) NOT NULL DEFAULT '0',
+ `kind` varchar(100) NOT NULL DEFAULT '',
+ `multiple_bookings` tinyint(1) NOT NULL DEFAULT '0',
+ `wants_tagged_subject` tinyint(1) NOT NULL DEFAULT '0',
`active` tinyint(1) NOT NULL DEFAULT '1',
PRIMARY KEY (`username`),
KEY `domain` (`domain`)
diff --git a/data/web/inc/triggers.inc.php b/data/web/inc/triggers.inc.php
index 484881c4..70e91640 100644
--- a/data/web/inc/triggers.inc.php
+++ b/data/web/inc/triggers.inc.php
@@ -51,6 +51,9 @@ if (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == "user
if (isset($_POST["trigger_set_spam_score"])) {
set_spam_score($_POST);
}
+ if (isset($_POST["trigger_set_tagging_options"])) {
+ tagging_options('set', $_POST);
+ }
if (isset($_POST["trigger_set_policy_list"])) {
set_policy_list($_POST);
}
diff --git a/data/web/inc/vars.inc.php b/data/web/inc/vars.inc.php
index 0c716b38..5c41e6d3 100644
--- a/data/web/inc/vars.inc.php
+++ b/data/web/inc/vars.inc.php
@@ -15,7 +15,6 @@ $database_name = getenv('DBNAME');
// Other variables
$mailcow_hostname = getenv('MAILCOW_HOSTNAME');
-date_default_timezone_set(getenv('TZ'));
// Where to go after adding and editing objects
// Can be "form" or "previous"
diff --git a/data/web/lang/lang.de.php b/data/web/lang/lang.de.php
index 09b79c9b..8727ca75 100644
--- a/data/web/lang/lang.de.php
+++ b/data/web/lang/lang.de.php
@@ -102,6 +102,8 @@ $lang['user']['did_you_know'] = '
Wussten Sie schon? Sie können Ihre E-Ma
$lang['user']['spam_aliases'] = 'Temporäre E-Mail Aliasse';
$lang['user']['alias'] = 'Alias';
$lang['user']['aliases'] = 'Aliasse';
+$lang['user']['is_catch_all'] = 'Ist Catch-All Adresse für Domain(s)';
+$lang['user']['aliases_also_send_as'] = 'Darf außerdem versenden als';
$lang['user']['aliases_send_as_all'] = 'Absender für folgende Domains nicht prüfen';
$lang['user']['alias_create_random'] = 'Zufälligen Alias generieren';
$lang['user']['alias_extend_all'] = 'Gültigkeit +1h';
@@ -141,6 +143,14 @@ $lang['user']['no_record'] = 'Kein Eintrag';
$lang['user']['misc_settings'] = 'Sonstige Kontoeinstellungen';
$lang['user']['misc_delete_profile'] = 'Sonstige Kontoeinstellungen';
+
+$lang['user']['tag_handling'] = 'Umgang mit getaggten E-Mails steuern';
+$lang['user']['tag_in_subfolder'] = 'In Unterordner';
+$lang['user']['tag_in_subject'] = 'In Betreff';
+$lang['user']['tag_help_explain'] = 'Als Unterordner: Es wird ein Ordner mit dem Namen des Tags unterhalb der Inbox erstellt ("INBOX/Facebook").
+In Betreff: Der Name des Tags wird dem Betreff angefügt, etwa "[Facebook] Meine Neuigkeiten".';
+$lang['user']['tag_help_example'] = 'Beispiel für eine getaggte E-Mail-Adresse: ich
+Facebook@example.org';
+
$lang['start']['dashboard'] = '%s - Dashboard';
$lang['start']['start_rc'] = 'Roundcube öffnen';
$lang['start']['start_sogo'] = 'SOGo öffnen';
diff --git a/data/web/lang/lang.en.php b/data/web/lang/lang.en.php
index ce9906d5..801d8479 100644
--- a/data/web/lang/lang.en.php
+++ b/data/web/lang/lang.en.php
@@ -103,6 +103,10 @@ $lang['user']['new_password_description'] = 'Requirement: 6 characters long, let
$lang['user']['did_you_know'] = '
Did you know? You can use tags in your email address ("me+
privat@example.com") to move messages to a folder automatically (example: "privat").';
$lang['user']['spam_aliases'] = 'Temporary email aliases';
$lang['user']['alias'] = 'Alias';
+$lang['user']['aliases'] = 'Aliases';
+$lang['user']['is_catch_all'] = 'Catch-all for domain/s';
+$lang['user']['aliases_also_send_as'] = 'Also allowed to send as';
+$lang['user']['aliases_send_as_all'] = 'Do not check sender access for following domains';
$lang['user']['alias_create_random'] = 'Generate random alias';
$lang['user']['alias_extend_all'] = 'Extend aliases by 1 hour';
$lang['user']['alias_valid_until'] = 'Valid until';
@@ -141,6 +145,14 @@ $lang['user']['no_record'] = 'No Record';
$lang['user']['misc_settings'] = 'Other profile settings';
$lang['user']['misc_delete_profile'] = 'Other profile settings';
+
+$lang['user']['tag_handling'] = 'Set handling for tagged mail';
+$lang['user']['tag_in_subfolder'] = 'In subfolder';
+$lang['user']['tag_in_subject'] = 'In subject';
+$lang['user']['tag_help_explain'] = 'In subfolder: a new subfolder named after the tag will be created below INBOX ("INBOX/Facebook").
+In subject: the tags name will be prepended to the mails subject, example: "[Facebook] Meine Neuigkeiten".';
+$lang['user']['tag_help_example'] = 'Example for a tagged email address: ich
+Facebook@example.org';
+
$lang['start']['dashboard'] = '%s - dashboard';
$lang['start']['start_rc'] = 'Open Roundcube';
$lang['start']['start_sogo'] = 'Open SOGo';
diff --git a/data/web/user.php b/data/web/user.php
index a0c04bc4..08d129d7 100644
--- a/data/web/user.php
+++ b/data/web/user.php
@@ -14,42 +14,86 @@ if (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == 'user
@@ -321,8 +365,7 @@ if (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == 'user