paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Web] Minor fixes and changes

master
andryyy 2019-08-10 15:57:07 +02:00
parent 22357a539d
commit d8dfd5061b
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/web/inc/functions.mailbox.inc.php
View File

@ -3383,7 +3383,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
$_SESSION['return'][] = array(
'type' => 'danger',
'log' => array(__FUNCTION__, $_action, $_type, $_data_log, $_attr),
'msg' => 'domain_not_empty'
'msg' => array('domain_not_empty', $domain)
);
continue;
}

2
data/web/inc/init_db.inc.php
View File

@ -8,7 +8,7 @@ function init_db_schema() {
$stmt = $pdo->query("SHOW TABLES LIKE 'versions'");
$num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC));
if ($num_results != 0) {
$stmt = $pdo->query("SELECT `version` FROM `versions`");
$stmt = $pdo->query("SELECT `version` FROM `versions` WHERE `application` = 'db_schema'");
if ($stmt->fetch(PDO::FETCH_ASSOC)['version'] == $db_version) {
return true;
}

2
data/web/lang/lang.de.php
View File

@ -152,7 +152,7 @@ $lang['danger']['domain_quota_m_in_use'] = 'Domain Speicherplatzlimit muss grö
$lang['danger']['mailboxes_in_use'] = 'Maximale Anzahl an Mailboxen muss größer oder gleich %d sein';
$lang['danger']['aliases_in_use'] = 'Maximale Anzahl an Aliassen muss größer oder gleich %d sein';
$lang['danger']['sender_acl_invalid'] = 'Sender ACL %s ist ungültig';
$lang['danger']['domain_not_empty'] = 'Kann nur leere Domains entfernen';
$lang['danger']['domain_not_empty'] = 'Domain %s ist nicht leer';
$lang['danger']['validity_missing'] = 'Bitte geben Sie eine Gültigkeitsdauer an';
$lang['user']['loading'] = "Lade...";
$lang['user']['force_pw_update'] = 'Das Passwort für diesen Benutzer <b>muss</b> geändert werden, damit die Zugriffssperre auf die Groupwarekomponenten wieder freigeschaltet wird.';

2
data/web/lang/lang.en.php
View File

@ -156,7 +156,7 @@ $lang['danger']['domain_quota_m_in_use'] = "Domain quota must be greater or equa
$lang['danger']['mailboxes_in_use'] = "Max. mailboxes must be greater or equal to %d";
$lang['danger']['aliases_in_use'] = "Max. aliases must be greater or equal to %d";
$lang['danger']['sender_acl_invalid'] = "Sender ACL value %s is invalid";
$lang['danger']['domain_not_empty'] = "Cannot remove non-empty domain";
$lang['danger']['domain_not_empty'] = "Cannot remove non-empty domain %s";
$lang['danger']['validity_missing'] = 'Please assign a period of validity';
$lang['user']['loading'] = "Loading...";
$lang['user']['force_pw_update'] = 'You <b>must</b> set a new password to be able to access groupware related services.';