Merge remote-tracking branch 'origin/master' into dev

data/Dockerfiles/dovecot/imapsync_cron.pl

@@ -33,7 +33,7 @@ open my $file, '<', "/etc/sogo/sieve.creds";
 my $creds = <$file>; 
 close $file;
 my ($master_user, $master_pass) = split /:/, $creds;
-my $sth = $dbh->prepare("SELECT id, user1, user2, host1, authmech1, password1, exclude, port1, enc1, delete2duplicates, maxage, subfolder2, delete1, delete2, automap, skipcrossduplicates, maxbytespersecond FROM imapsync WHERE active = 1 AND (UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(last_run) > mins_interval * 60 OR last_run IS NULL) ORDER BY last_run");
+my $sth = $dbh->prepare("SELECT id, user1, user2, host1, authmech1, password1, exclude, port1, enc1, delete2duplicates, maxage, subfolder2, delete1, delete2, automap, skipcrossduplicates, maxbytespersecond FROM imapsync WHERE active = 1 AND is_running = 0 AND (UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP(last_run) > mins_interval * 60 OR last_run IS NULL) ORDER BY last_run");
 $sth->execute();
 my $row;
 

data/Dockerfiles/sogo/bootstrap-sogo.sh

@@ -9,8 +9,8 @@ done
 # Wait until port becomes free and send sig
 until ! nc -z sogo-mailcow 20000;
 do
-	killall -TERM sogod
-	sleep 3
+        killall -TERM sogod
+        sleep 3
 done
 
 # Recreate view
@@ -57,8 +57,8 @@ EOF
 
 # Generate multi-domain setup
 while read line
-	do
-	echo "        <key>${line}</key>
+        do
+        echo "        <key>${line}</key>
         <dict>
             <key>SOGoMailDomain</key>
             <string>${line}</string>

data/web/admin.php

@@ -147,7 +147,7 @@ $tfa_data = get_tfa();
         <a href="#fwdhosts" class="list-group-item"><?=$lang['admin']['forwarding_hosts'];?></a>
         <a href="#f2bparams" class="list-group-item"><?=$lang['admin']['f2b_parameters'];?></a>
         <a href="#relayhosts" class="list-group-item">Relayhosts</a>
-        <a href="#quarantaine" class="list-group-item"><?=$lang['admin']['quarantine'];?></a>
+        <a href="#quarantaine" class="list-group-item"><?=$lang['admin']['quarantaine'];?></a>
         <a href="#customize" class="list-group-item"><?=$lang['admin']['customize'];?></a>
         <a href="#top" class="list-group-item" style="border-top:1px dashed #dadada">↸ <?=$lang['admin']['to_top'];?></a>
       </div>
@@ -416,26 +416,26 @@ $tfa_data = get_tfa();
 
     <span class="anchor" id="quarantaine"></span>
     <div class="panel panel-default">
-      <div class="panel-heading"><?=$lang['admin']['quarantine'];?></div>
+      <div class="panel-heading"><?=$lang['admin']['quarantaine'];?></div>
       <div class="panel-body">
        <?php $q_data = quarantaine('settings'); ?>
         <form class="form" data-id="quarantaine" role="form" method="post">
           <div class="row">
             <div class="col-sm-6">
               <div class="form-group">
-                <label for="retention_size"><?=$lang['admin']['quarantine_retention_size'];?></label>
+                <label for="retention_size"><?=$lang['admin']['quarantaine_retention_size'];?></label>
                 <input type="number" class="form-control" id="retention_size" name="retention_size" value="<?=$q_data['retention_size'];?>" required>
               </div>
             </div>
             <div class="col-sm-6">
               <div class="form-group">
-                <label for="max_size"><?=$lang['admin']['quarantine_max_size'];?></label>
+                <label for="max_size"><?=$lang['admin']['quarantaine_max_size'];?></label>
                 <input type="number" class="form-control" id="max_size" name="max_size" value="<?=$q_data['max_size'];?>" required>
               </div>
             </div>
           </div>
           <div class="form-group">
-            <label for="exclude_domains"><?=$lang['admin']['quarantine_exclude_domains'];?></label><br />
+            <label for="exclude_domains"><?=$lang['admin']['quarantaine_exclude_domains'];?></label><br />
             <select data-width="100%" id="exclude_domains" name="exclude_domains" class="selectpicker" title="<?=$lang['tfa']['select'];?>" multiple>
               <?php
               foreach (array_merge(mailbox('get', 'domains'), mailbox('get', 'alias_domains')) as $domain):

data/web/inc/init_db.inc.php

@@ -3,7 +3,7 @@ function init_db_schema() {
   try {
     global $pdo;
 
-    $db_version = "30012018_1521";
+    $db_version = "08022018_1219";
 
     $stmt = $pdo->query("SHOW TABLES LIKE 'versions'");
     $num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC));
@@ -360,7 +360,7 @@ function init_db_schema() {
           "automap" => "TINYINT(1) NOT NULL DEFAULT '0'",
           "skipcrossduplicates" => "TINYINT(1) NOT NULL DEFAULT '0'",
           "is_running" => "TINYINT(1) NOT NULL DEFAULT '0'",
-          "returned_text" => "TEXT",
+          "returned_text" => "MEDIUMTEXT",
           "last_run" => "TIMESTAMP NULL DEFAULT NULL",
           "created" => "DATETIME(0) NOT NULL DEFAULT NOW(0)",
           "modified" => "DATETIME ON UPDATE CURRENT_TIMESTAMP",

data/web/lang/lang.en.php

@@ -576,10 +576,10 @@ $lang['admin']['api_key'] = "API key";
 $lang['admin']['activate_api'] = "Activate API";
 $lang['admin']['regen_api_key'] = "Regenerate API key";
 
-$lang['admin']['quarantine'] = "Quarantaine";
-$lang['admin']['quarantine_retention_size'] = "Retentions per mailbox:";
-$lang['admin']['quarantine_max_size'] = "Maximum size in MiB (larger elements are discarded):";
-$lang['admin']['quarantine_exclude_domains'] = "Exclude domains and alias-domains:";
+$lang['admin']['quarantaine'] = "Quarantine";
+$lang['admin']['quarantaine_retention_size'] = "Retentions per mailbox:";
+$lang['admin']['quarantaine_max_size'] = "Maximum size in MiB (larger elements are discarded):";
+$lang['admin']['quarantaine_exclude_domains'] = "Exclude domains and alias-domains:";
 
 $lang['admin']['ui_texts'] = "UI labels and texts";
 $lang['admin']['help_text'] = "Override help text below login mask (HTML allowed)";
@@ -620,8 +620,8 @@ $lang['success']['reset_main_logo'] = "Reset to default logo";
 $lang['success']['items_released'] = "Selected items were released";
 $lang['danger']['imagick_exception'] = "Error: Imagick exception while reading image";
 
-$lang['quarantaine']['quarantaine'] = "Quarantaine";
-$lang['quarantaine']['qinfo'] = "The quarantaine system will save rejected mail to the database, while the sender will <em>not</em> be given the impression of a delivered mail.";
+$lang['quarantaine']['quarantaine'] = "Quarantine";
+$lang['quarantaine']['qinfo'] = "The quarantine system will save rejected mail to the database, while the sender will <em>not</em> be given the impression of a delivered mail.";
 $lang['quarantaine']['release'] = "Release";
 $lang['quarantaine']['empty'] = 'No results';
 $lang['quarantaine']['toggle_all'] = 'Toggle all';
@@ -634,18 +634,18 @@ $lang['quarantaine']['qid'] = "Rspamd QID";
 $lang['quarantaine']['sender'] = "Sender";
 $lang['quarantaine']['show_item'] = "Show item";
 $lang['quarantaine']['check_hash'] = "Search file hash @ VT";
-$lang['quarantaine']['qitem'] = "Quarantaine item";
+$lang['quarantaine']['qitem'] = "Quarantine item";
 $lang['quarantaine']['subj'] = "Subject";
 $lang['quarantaine']['text_plain_content'] = "Content (text/plain)";
 $lang['quarantaine']['text_from_html_content'] = "Content (converted html)";
 $lang['quarantaine']['atts'] = "Attachments";
 
-$lang['header']['quarantaine'] = "Quarantaine";
+$lang['header']['quarantaine'] = "Quarantine";
 $lang['header']['debug'] = "Debug";
 
 $lang['quarantaine']['release_body'] = "We have attached your message as eml file to this message.";
 $lang['danger']['release_send_failed'] = "Message could not be released: %s";
-$lang['quarantaine']['release_subject'] = "Potentially damaging quarantaine item %s";
+$lang['quarantaine']['release_subject'] = "Potentially damaging quarantine item %s";
 
 $lang['mailbox']['bcc_map_type'] = "BCC type";
 $lang['mailbox']['bcc_type'] = "BCC type";