From 447c207fb954e0f1031cec65b40f8062c9f2ee42 Mon Sep 17 00:00:00 2001 From: andryyy Date: Wed, 29 Apr 2020 10:57:49 +0200 Subject: [PATCH] [Web] Disable login for mailbox users, other SKIP_SOGO checks and fixes --- data/web/edit.php | 27 ++++++++------------ data/web/inc/header.inc.php | 50 +++++++++++-------------------------- data/web/lang/lang.de.json | 5 ++++ data/web/lang/lang.en.json | 5 ++++ data/web/lang/lang.es.json | 1 + data/web/lang/lang.fi.json | 1 + data/web/lang/lang.fr.json | 1 + data/web/lang/lang.lv.json | 1 + data/web/lang/lang.nl.json | 1 + data/web/lang/lang.pl.json | 1 + data/web/lang/lang.ru.json | 1 + data/web/lang/lang.sk.json | 1 + data/web/lang/lang.sv.json | 1 + data/web/mailbox.php | 17 +++---------- data/web/modals/mailbox.php | 48 ++++++++++++----------------------- data/web/user.php | 2 ++ 16 files changed, 67 insertions(+), 96 deletions(-) diff --git a/data/web/edit.php b/data/web/edit.php index 4d880629..5187b552 100644 --- a/data/web/edit.php +++ b/data/web/edit.php @@ -28,7 +28,9 @@ if (isset($_SESSION['mailcow_cc_role'])) {
+ +
@@ -48,17 +50,13 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +

- +
@@ -577,7 +575,6 @@ if (isset($_SESSION['mailcow_cc_role'])) {

-
@@ -712,9 +709,11 @@ if (isset($_SESSION['mailcow_cc_role'])) {
-
- -
+
@@ -725,9 +724,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
@@ -736,9 +733,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
- +
diff --git a/data/web/inc/header.inc.php b/data/web/inc/header.inc.php index 429745c2..7ecf3d21 100644 --- a/data/web/inc/header.inc.php +++ b/data/web/inc/header.inc.php @@ -38,9 +38,9 @@ } ?> - + - + @@ -91,10 +91,7 @@ if ($_SESSION['mailcow_cc_role'] == 'admin' || $_SESSION['mailcow_cc_role'] == 'domainadmin') { ?> > - + > - + > - +
    • - +
    • - +
    • - +
  • ()
    • - +
  • [ slave ]
    • - +
    diff --git a/data/web/lang/lang.de.json b/data/web/lang/lang.de.json index 9780e111..2b859399 100644 --- a/data/web/lang/lang.de.json +++ b/data/web/lang/lang.de.json @@ -46,6 +46,7 @@ "delete2duplicates": "Lösche Duplikate im Ziel", "description": "Beschreibung", "destination": "Ziel", + "disable_login": "Login verbieten", "domain": "Domain", "domain_matches_hostname": "Domain %s darf nicht dem Hostnamen entsprechen", "domain_quota_m": "Domain Speicherplatz gesamt (MiB)", @@ -59,6 +60,7 @@ "goto_null": "Nachrichten sofort verwerfen", "goto_spam": "Nachrichten als Spam lernen", "hostname": "Host", + "inactive": "Inaktiv", "kind": "Art", "mailbox_quota_def": "Standard-Quota einer Mailbox", "mailbox_quota_m": "Max. Speicherplatz pro Mailbox (MiB)", @@ -454,6 +456,7 @@ "delete2duplicates": "Lösche Duplikate im Ziel", "delete_ays": "Soll der Löschvorgang wirklich ausgeführt werden?", "description": "Beschreibung", + "disable_login": "Login verbieten", "domain": "Domain bearbeiten", "domain_admin": "Domain-Administrator bearbeiten", "domain_quota": "Domain Speicherplatz gesamt (MiB)", @@ -472,6 +475,7 @@ "generate": "generieren", "grant_types": "Grant types", "hostname": "Servername", + "inactive": "Inaktiv", "kind": "Art", "mailbox": "Mailbox bearbeiten", "mailbox_quota_def": "Standard-Quota einer Mailbox", @@ -613,6 +617,7 @@ "daily": "Täglich", "deactivate": "Deaktivieren", "description": "Beschreibung", + "disable_login": "Login verbieten", "disable_x": "Deaktiviere", "domain": "Domain", "domain_admins": "Domain-Administratoren", diff --git a/data/web/lang/lang.en.json b/data/web/lang/lang.en.json index fb3ad31b..41223ad7 100644 --- a/data/web/lang/lang.en.json +++ b/data/web/lang/lang.en.json @@ -46,6 +46,7 @@ "delete2duplicates": "Delete duplicates on destination", "description": "Description", "destination": "Destination", + "disable_login": "Disallow login", "domain": "Domain", "domain_matches_hostname": "Domain %s matches hostname", "domain_quota_m": "Total domain quota (MiB)", @@ -59,6 +60,7 @@ "goto_null": "Silently discard mail", "goto_spam": "Learn as spam", "hostname": "Host", + "inactive": "Inactive", "kind": "Kind", "mailbox_quota_def": "Default mailbox quota", "mailbox_quota_m": "Max. quota per mailbox (MiB)", @@ -453,6 +455,7 @@ "delete2duplicates": "Delete duplicates on destination", "delete_ays": "Please confirm the deletion process.", "description": "Description", + "disable_login": "Disallow login", "domain": "Edit domain", "domain_admin": "Edit domain administrator", "domain_quota": "Domain quota", @@ -471,6 +474,7 @@ "generate": "generate", "grant_types": "Grant types", "hostname": "Hostname", + "inactive": "Inactive", "kind": "Kind", "mailbox": "Edit mailbox", "mailbox_quota_def": "Default mailbox quota", @@ -612,6 +616,7 @@ "daily": "Daily", "deactivate": "Deactivate", "description": "Description", + "disable_login": "Disallow login", "disable_x": "Disable", "domain": "Domain", "domain_admins": "Domain administrators", diff --git a/data/web/lang/lang.es.json b/data/web/lang/lang.es.json index 83ea9119..8e947aad 100644 --- a/data/web/lang/lang.es.json +++ b/data/web/lang/lang.es.json @@ -388,6 +388,7 @@ "gal_info": "El GAL contiene todos los objetos de un dominio y no puede ser editado por ningún usuario. Falta información de disponibilidad en SOGo, si está desactivada. Reinicia SOGo para aplicar los cambios.", "grant_types": "Grant types", "hostname": "Hostname", + "inactive": "Inactivo", "kind": "Tipo", "mailbox": "Editar buzón", "mailbox_quota_def": "Cuota de buzón predeterminada", diff --git a/data/web/lang/lang.fi.json b/data/web/lang/lang.fi.json index 25c69b22..84906bb5 100644 --- a/data/web/lang/lang.fi.json +++ b/data/web/lang/lang.fi.json @@ -437,6 +437,7 @@ "gal_info": "GAL ( kalenteri ) sisältää kaikki verkkotunnus alueen objektit, eikä yksikään käyttäjä voi muokata sitä. Vapaat ja varatut ajat-tiedot SOGosta puuttuu, jos se on poistettu käytöstä! Uudelleen käynnistä SOGo ja ota muutokset käyttöön.", "grant_types": "Oikeus tyypiy", "hostname": "Hostname", + "inactive": "Passiivinen", "kind": "Kiltti", "mailbox": "Muokkaa sähköposti tiliä", "mailbox_quota_def": "Sähköpostin oletus kiintiö", diff --git a/data/web/lang/lang.fr.json b/data/web/lang/lang.fr.json index f4d227b0..ebaab09a 100644 --- a/data/web/lang/lang.fr.json +++ b/data/web/lang/lang.fr.json @@ -181,6 +181,7 @@ "exclude": "Objets à exclure (expression régulière)", "full_name": "Nom complet", "hostname": "Nom d'hôte", + "inactive": "Inactif", "kind": "Type", "mailbox": "Éditer la boîte", "max_aliases": "Alias max.", diff --git a/data/web/lang/lang.lv.json b/data/web/lang/lang.lv.json index 1e2d025c..dc3a5a79 100644 --- a/data/web/lang/lang.lv.json +++ b/data/web/lang/lang.lv.json @@ -228,6 +228,7 @@ "force_pw_update_info": "Šis lietotājs varēs pieslēgties tikai %s.", "full_name": "Pilns vārds", "hostname": "Hosta nosaukums", + "inactive": "Neaktīvs", "kind": "Veids", "mailbox": "Rediģēt pastkasti", "max_aliases": "Maks. aliases", diff --git a/data/web/lang/lang.nl.json b/data/web/lang/lang.nl.json index 0f0e18cd..360446cb 100644 --- a/data/web/lang/lang.nl.json +++ b/data/web/lang/lang.nl.json @@ -469,6 +469,7 @@ "generate": "genereer", "grant_types": "Grant types", "hostname": "Hostname", + "inactive": "Inactief", "kind": "Soort", "mailbox": "Wijzig postvak", "mailbox_quota_def": "Standaard postvakquotum", diff --git a/data/web/lang/lang.pl.json b/data/web/lang/lang.pl.json index 995f088c..b174dfc9 100644 --- a/data/web/lang/lang.pl.json +++ b/data/web/lang/lang.pl.json @@ -162,6 +162,7 @@ "exclude": "Wyklucz obiekty (regex)", "full_name": "Pełna nazwa", "hostname": "Nazwa hosta", + "inactive": "Nieaktywny", "kind": "Rodzaj", "mailbox": "Edytuj skrzynkę", "max_aliases": "Maks. liczba aliasów", diff --git a/data/web/lang/lang.ru.json b/data/web/lang/lang.ru.json index be181dad..66454c45 100644 --- a/data/web/lang/lang.ru.json +++ b/data/web/lang/lang.ru.json @@ -468,6 +468,7 @@ "generate": "сгенерировать", "grant_types": "Разрешено типы", "hostname": "Имя хоста", + "inactive": "Неактивный", "kind": "Тип", "mailbox": "Изменение почтового ящика", "mailbox_quota_def": "Квота по умолчанию", diff --git a/data/web/lang/lang.sk.json b/data/web/lang/lang.sk.json index 2523a065..9c48e2cd 100644 --- a/data/web/lang/lang.sk.json +++ b/data/web/lang/lang.sk.json @@ -466,6 +466,7 @@ "generate": "generovať", "grant_types": "Typy opravnení", "hostname": "Hostiteľ", + "inactive": "Neaktívny", "kind": "Druh", "mailbox": "Upraviť poštovú schránku", "mailbox_quota_def": "Predvolená veľkosť poštovej schránky", diff --git a/data/web/lang/lang.sv.json b/data/web/lang/lang.sv.json index 55e1a831..2661b8be 100644 --- a/data/web/lang/lang.sv.json +++ b/data/web/lang/lang.sv.json @@ -472,6 +472,7 @@ "generate": "generera", "grant_types": "Grant-typer", "hostname": "Värdnamn", + "inactive": "Inaktiv", "kind": "Typ", "mailbox": "Ändra postlåda", "mailbox_quota_def": "Standard kvot på postlådor", diff --git a/data/web/mailbox.php b/data/web/mailbox.php index f8313b58..366aea09 100644 --- a/data/web/mailbox.php +++ b/data/web/mailbox.php @@ -92,15 +92,11 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI']; - +
    - +
    @@ -256,16 +252,11 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
    • - +
    • - - +
    diff --git a/data/web/modals/mailbox.php b/data/web/modals/mailbox.php index 4f5ed4df..66c741bb 100644 --- a/data/web/modals/mailbox.php +++ b/data/web/modals/mailbox.php @@ -62,11 +62,14 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
    -
    - -
    +
    +
    @@ -129,9 +132,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
    - +
    @@ -140,9 +141,7 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
    - +
    @@ -183,29 +182,18 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
    - + - + - +
    - +

    - +
    @@ -313,17 +301,13 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
    - +

    - +
    diff --git a/data/web/user.php b/data/web/user.php index 1a40fb54..3c49bbe1 100644 --- a/data/web/user.php +++ b/data/web/user.php @@ -307,6 +307,7 @@ elseif (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == '

    +
    :
    @@ -322,6 +323,7 @@ elseif (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == '

    +