>
diff --git a/data/web/inc/init_db.inc.php b/data/web/inc/init_db.inc.php
index c349593c0..7aba1183c 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 = "03062021_2320";
+ $db_version = "07062021_2320";
$stmt = $pdo->query("SHOW TABLES LIKE 'versions'");
$num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC));
@@ -1214,6 +1214,7 @@ function init_db_schema() {
$pdo->query("UPDATE `pushover` SET `attributes` = JSON_SET(`attributes`, '$.only_x_prio', \"0\") WHERE JSON_VALUE(`attributes`, '$.only_x_prio') IS NULL;");
// mailbox
$pdo->query("UPDATE `mailbox` SET `attributes` = '{}' WHERE `attributes` = '' OR `attributes` IS NULL;");
+ $pdo->query("UPDATE `mailbox` SET `attributes` = JSON_SET(`attributes`, '$.passwd_update', \"0\") WHERE JSON_VALUE(`attributes`, '$.passwd_update') IS NULL;");
$pdo->query("UPDATE `mailbox` SET `attributes` = JSON_SET(`attributes`, '$.relayhost', \"0\") WHERE JSON_VALUE(`attributes`, '$.relayhost') IS NULL;");
$pdo->query("UPDATE `mailbox` SET `attributes` = JSON_SET(`attributes`, '$.xmpp_access', \"1\") WHERE JSON_VALUE(`attributes`, '$.xmpp_access') IS NULL;");
$pdo->query("UPDATE `mailbox` SET `attributes` = JSON_SET(`attributes`, '$.xmpp_admin', \"0\") WHERE JSON_VALUE(`attributes`, '$.xmpp_admin') IS NULL;");
diff --git a/data/web/inc/prerequisites.inc.php b/data/web/inc/prerequisites.inc.php
index f2ede8eb7..7e9a24f3c 100644
--- a/data/web/inc/prerequisites.inc.php
+++ b/data/web/inc/prerequisites.inc.php
@@ -209,7 +209,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/sessions.inc.php';
if (!isset($_SESSION['mailcow_locale']) && !isset($_COOKIE['mailcow_locale'])) {
if ($DETECT_LANGUAGE && isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
$header_lang = strtolower(substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2));
- if (in_array($header_lang, $AVAILABLE_LANGUAGES)) {
+ if (array_key_exists($header_lang, $AVAILABLE_LANGUAGES)) {
$_SESSION['mailcow_locale'] = $header_lang;
}
}
@@ -220,7 +220,7 @@ if (!isset($_SESSION['mailcow_locale']) && !isset($_COOKIE['mailcow_locale'])) {
if (isset($_COOKIE['mailcow_locale'])) {
(preg_match('/^[a-z]{2}$/', $_COOKIE['mailcow_locale'])) ? $_SESSION['mailcow_locale'] = $_COOKIE['mailcow_locale'] : setcookie("mailcow_locale", "", time() - 300);
}
-if (isset($_GET['lang']) && in_array($_GET['lang'], $AVAILABLE_LANGUAGES)) {
+if (isset($_GET['lang']) && array_key_exists($_GET['lang'], $AVAILABLE_LANGUAGES)) {
$_SESSION['mailcow_locale'] = $_GET['lang'];
setcookie("mailcow_locale", $_GET['lang'], time()+30758400); // one year
}
diff --git a/data/web/inc/vars.inc.php b/data/web/inc/vars.inc.php
index 33df0d7bb..1c3a23927 100644
--- a/data/web/inc/vars.inc.php
+++ b/data/web/inc/vars.inc.php
@@ -79,9 +79,29 @@ $DETECT_LANGUAGE = true;
$DEFAULT_LANG = 'en';
// Available languages
-// Use (ISO 639-1) Code standard
-// See https://www.loc.gov/standards/iso639-2/php/code_list.php
-$AVAILABLE_LANGUAGES = array('ca', 'cs', 'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ko', 'lv', 'nl', 'pl', 'pt', 'ro', 'ru', 'sk', 'sv', 'zh');
+// https://www.iso.org/obp/ui/#search
+// https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
+$AVAILABLE_LANGUAGES = array(
+ 'cs' => 'Čeština (Czech)',
+ 'da' => 'Danish (Dansk)',
+ 'de' => 'Deutsch (German)',
+ 'en' => 'English',
+ 'es' => 'Español (Spanish)',
+ 'fi' => 'Suomi (Finish)',
+ 'fr' => 'Français (French)',
+ 'hu' => 'Magyar (Hungarian)',
+ 'it' => 'Italiano (Italian)',
+ 'ko' => '한국어 (Korean)',
+ 'lv' => 'latviešu (Latvian)',
+ 'nl' => 'Nederlands (Dutch)',
+ 'pl' => 'Język Polski (Polish)',
+ 'pt' => 'Português (Portuguese)',
+ 'ro' => 'Română (Romanian)',
+ 'ru' => 'Pусский (Russian)',
+ 'sk' => 'Slovenčina (Slovak)',
+ 'sv' => 'Svenska (Swedish)',
+ 'zh' => '中文 (Chinese)'
+);
// Change theme (default: lumen)
// Needs to be one of those: cerulean, cosmo, cyborg, darkly, flatly, journal, lumen, paper, readable, sandstone,
diff --git a/data/web/index.php b/data/web/index.php
index 3ec37b2b0..7ecfeb4ce 100644
--- a/data/web/index.php
+++ b/data/web/index.php
@@ -72,13 +72,13 @@ $_SESSION['index_query_string'] = $_SERVER['QUERY_STRING'];
diff --git a/data/web/js/site/user.js b/data/web/js/site/user.js
index 65728c850..3b3956f17 100644
--- a/data/web/js/site/user.js
+++ b/data/web/js/site/user.js
@@ -99,11 +99,11 @@ jQuery(function($){
$.each(data.sasl, function (i, item) {
var datetime = new Date(item.datetime.replace(/-/g, "/"));
var local_datetime = datetime.toLocaleDateString(undefined, {year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit", second: "2-digit"});
- item.app_password?app_password=', via App':app_password="",item.location?ip_location=", "+item.location:ip_location="";
- "smtp"==item.service?service=''+item.service.toUpperCase()+'
':"imap"==item.service?service=' '+item.service.toUpperCase()+"
":service=''+item.service.toUpperCase()+"
";
- item.real_rip.startsWith("Web")?real_rip=item.real_rip:real_rip=''+item.real_rip+"";
+ item.app_password ? app_password = ' (App)' : app_password = "", item.location ? ip_location = ' ' : ip_location = "";
+ "smtp" == item.service ? service = '' + item.service.toUpperCase() + '
' : "imap" == item.service ? service = ' ' + item.service.toUpperCase() + "
" : service = '' + item.service.toUpperCase() + "
";
+ item.real_rip.startsWith("Web") ? real_rip = item.real_rip : real_rip = '' + item.real_rip + "";
ip_data = real_rip + ip_location + app_password;
- $(".last-login").append(''+local_datetime+" "+service+" "+lang.from+" "+ip_data+"");
+ $(".last-login").append('' + local_datetime + " " + service + " " + lang.from + " " + ip_data + "");
})
$('.last-login').append('');
}
diff --git a/data/web/user.php b/data/web/user.php
index fa11d7189..bd7123d58 100644
--- a/data/web/user.php
+++ b/data/web/user.php
@@ -23,8 +23,7 @@ if (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == 'doma
@@ -177,7 +176,7 @@ elseif (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == '
-
+