From 7490fbdccd17fc641759d6f041e5906b1cb4bf5b Mon Sep 17 00:00:00 2001
From: Shea Ramage <shea.ramage@gmail.com>
Date: Thu, 20 May 2021 01:07:55 -0400
Subject: [PATCH] [Web] Remove SOGo admin login hint (#4100)

* Remove old SOGo Admin Login hint

* Remove unneeded code blocks after change
---
 data/web/lang/lang.cs.json | 1 -
 data/web/lang/lang.da.json | 1 -
 data/web/lang/lang.de.json | 1 -
 data/web/lang/lang.en.json | 1 -
 data/web/lang/lang.es.json | 2 +-
 data/web/lang/lang.fi.json | 2 +-
 data/web/lang/lang.fr.json | 1 -
 data/web/lang/lang.it.json | 2 +-
 data/web/lang/lang.ko.json | 1 -
 data/web/lang/lang.lv.json | 2 +-
 data/web/lang/lang.nl.json | 1 -
 data/web/lang/lang.pl.json | 2 +-
 data/web/lang/lang.ro.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/lang/lang.zh.json | 1 -
 data/web/mailbox.php       | 5 -----
 18 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/data/web/lang/lang.cs.json b/data/web/lang/lang.cs.json
index 7e830279..c11937f2 100644
--- a/data/web/lang/lang.cs.json
+++ b/data/web/lang/lang.cs.json
@@ -693,7 +693,6 @@
         "sieve_preset_7": "Přesměrovat a ponechat/zahodit",
         "sieve_preset_8": "Zahodit zprávu poslanou na alias, do něhož patří i odesílatel",
         "sieve_preset_header": "Vizte následující ukázková pravidla. Více informací na <a href=\"https://en.wikipedia.org/wiki/Sieve_(mail_filtering_language)\" target=\"_blank\">Wikipedii</a>.",
-        "sogo_allow_admin_hint": "Přihlásit se do SOGo jako správce může jen uživatel s existujícím profilem SOGo. Uživatel se musí do SOGo alespoň jednou přihlásit.",
         "sogo_visible": "Alias dostupný v SOGo",
         "sogo_visible_n": "Skrýt alias v SOGo",
         "sogo_visible_y": "Zobrazit alias v SOGo",
diff --git a/data/web/lang/lang.da.json b/data/web/lang/lang.da.json
index 77012484..797b9dd4 100644
--- a/data/web/lang/lang.da.json
+++ b/data/web/lang/lang.da.json
@@ -725,7 +725,6 @@
         "sieve_preset_7": "Omdiriger og hold/slip",
         "sieve_preset_8": "Kassér besked sendt til en aliasadresse, som afsenderen er en del af",
         "sieve_preset_header": "Se eksemplet på forudindstillinger nedenfor. For flere detaljer se <a href=\"https://en.wikipedia.org/wiki/Sieve_(mail_filtering_language)\" target=\"_blank\">Wikipedia</a>.",
-        "sogo_allow_admin_hint": "Administrative SOGo-logins er kun tilgængelige for postkasser med en eksisterende SOGo-profil. En bruger skal have været logget på SOGo mindst én gang.",
         "sogo_visible": "Alias er synligt i SOGo",
         "sogo_visible_n": "Skjul alias i SOGo",
         "sogo_visible_y": "Vis alias i SOGo",
diff --git a/data/web/lang/lang.de.json b/data/web/lang/lang.de.json
index 04594d71..85e1ec40 100644
--- a/data/web/lang/lang.de.json
+++ b/data/web/lang/lang.de.json
@@ -767,7 +767,6 @@
         "sieve_preset_7": "Weiterleiten und behalten oder verwerfen",
         "sieve_preset_8": "Nachricht verwerfen, wenn Absender und Alias-Ziel identisch sind.",
         "sieve_preset_header": "Beispielinhalte zur Einsicht stehen nachstehend bereit. Siehe auch <a href=\"https://de.wikipedia.org/wiki/Sieve\" target=\"_blank\">Wikipedia</a>.",
-        "sogo_allow_admin_hint": "Administrative SOGo-Logins sind nur für Mailboxen verfügbar, die bereits ein SOGo-Profil besitzen. Ein Benutzer muss zumindest einmal in SOGo eingeloggt gewesen sein, um ein Profil zu besitzen.",
         "sogo_visible": "Alias Sichtbarkeit in SOGo",
         "sogo_visible_n": "Alias in SOGo verbergen",
         "sogo_visible_y": "Alias in SOGo anzeigen",
diff --git a/data/web/lang/lang.en.json b/data/web/lang/lang.en.json
index d5004e3d..d2a2a7bc 100644
--- a/data/web/lang/lang.en.json
+++ b/data/web/lang/lang.en.json
@@ -765,7 +765,6 @@
         "sieve_preset_7": "Redirect and keep/drop",
         "sieve_preset_8": "Discard message sent to an alias address the sender is part of",
         "sieve_preset_header": "Please see the example presets below. For more details see <a href=\"https://en.wikipedia.org/wiki/Sieve_(mail_filtering_language)\" target=\"_blank\">Wikipedia</a>.",
-        "sogo_allow_admin_hint": "Administrative SOGo logins are only available for mailboxes with an existing SOGo profile. A user must have been logged in to SOGo at least once.",
         "sogo_visible": "Alias is visible in SOGo",
         "sogo_visible_n": "Hide alias in SOGo",
         "sogo_visible_y": "Show alias in SOGo",
diff --git a/data/web/lang/lang.es.json b/data/web/lang/lang.es.json
index 83a77460..eac99a5b 100644
--- a/data/web/lang/lang.es.json
+++ b/data/web/lang/lang.es.json
@@ -772,4 +772,4 @@
         "fuzzy_learn_error": "Error aprendiendo hash: %s",
         "ip_invalid": "IP inválida omitida: %s"
     }
-}
\ No newline at end of file
+}
diff --git a/data/web/lang/lang.fi.json b/data/web/lang/lang.fi.json
index ea623b55..25bfe4dc 100644
--- a/data/web/lang/lang.fi.json
+++ b/data/web/lang/lang.fi.json
@@ -889,4 +889,4 @@
         "session_token": "Lomakkeen tunnus sanoma ei kelpaa: tunnus sanoman risti riita",
         "session_ua": "Lomakkeen tunnus sanoma ei kelpaa: käyttäjä agentin tarkistus virhe"
     }
-}
\ No newline at end of file
+}
diff --git a/data/web/lang/lang.fr.json b/data/web/lang/lang.fr.json
index 2ac240f1..e8177ae8 100644
--- a/data/web/lang/lang.fr.json
+++ b/data/web/lang/lang.fr.json
@@ -752,7 +752,6 @@
 		"sieve_preset_7": "Rediriger et garder/déposer",
 		"sieve_preset_8": "Supprimer le message envoyé à une adresse alias dont fait partie l’expéditeur",
 		"sieve_preset_header": "Voir les exemples de préréglages ci-dessous. Pour plus de détails voir <a href=\"https://en.wikipedia.org/wiki/Sieve_(mail_filtering_language)\" target=\"_blank\">Wikipedia</a>.",
-		"sogo_allow_admin_hint": "Les connexions administratives Sogo ne sont disponibles que pour les boîtes mail avec un profil SOGo existant. Un utilisateur doit avoir été connecté à Sogo au moins une fois.",
 		"sogo_visible": "Alias visible dans SOGo",
 		"sogo_visible_n": "Masquer alias dans SOGo",
 		"sogo_visible_y": "Afficher alias dans SOGo",
diff --git a/data/web/lang/lang.it.json b/data/web/lang/lang.it.json
index b3ad0924..bdcc12b0 100644
--- a/data/web/lang/lang.it.json
+++ b/data/web/lang/lang.it.json
@@ -380,4 +380,4 @@
         "week": "Settimana",
         "weeks": "Settimane"
     }
-}
\ No newline at end of file
+}
diff --git a/data/web/lang/lang.ko.json b/data/web/lang/lang.ko.json
index a208d416..7e484fc9 100644
--- a/data/web/lang/lang.ko.json
+++ b/data/web/lang/lang.ko.json
@@ -696,7 +696,6 @@
         "sieve_preset_7": "Redirect and keep/drop",
         "sieve_preset_8": "Discard message sent to an alias address the sender is part of",
         "sieve_preset_header": "Please see the example presets below. For more details see <a href=\"https://en.wikipedia.org/wiki/Sieve_(mail_filtering_language)\" target=\"_blank\">Wikipedia</a>.",
-        "sogo_allow_admin_hint": "Administrative SOGo logins are only available for mailboxes with an existing SOGo profile. A user must have been logged in to SOGo at least once.",
         "sogo_visible": "Alias is visible in SOGo",
         "sogo_visible_n": "Hide alias in SOGo",
         "sogo_visible_y": "Show alias in SOGo",
diff --git a/data/web/lang/lang.lv.json b/data/web/lang/lang.lv.json
index 57b69511..c73a1850 100644
--- a/data/web/lang/lang.lv.json
+++ b/data/web/lang/lang.lv.json
@@ -542,4 +542,4 @@
         "week": "Nedēļa",
         "weeks": "Nedēļas"
     }
-}
\ No newline at end of file
+}
diff --git a/data/web/lang/lang.nl.json b/data/web/lang/lang.nl.json
index a3f50362..24487f91 100644
--- a/data/web/lang/lang.nl.json
+++ b/data/web/lang/lang.nl.json
@@ -751,7 +751,6 @@
         "sieve_preset_7": "Forward en behoud/verwijder",
         "sieve_preset_8": "Verwijder mail verstuurd naar een aliasadres van de afzender",
         "sieve_preset_header": "Zie de onderstaande voorbeelden. Raadpleeg <a href=\"https://en.wikipedia.org/wiki/Sieve_(mail_filtering_language)\" target=\"_blank\">Wikipedia</a> voor meer informatie.",
-        "sogo_allow_admin_hint": "Administratieve SOGo-logins zijn uitsluitend beschikbaar voor mailboxen met een bestaand SOGo-profiel. Een gebruiker moet zich ten minste één keer aanmelden bij SOGo.",
         "sogo_visible": "Alias tonen in SOGo",
         "sogo_visible_n": "Verberg alias in SOGo",
         "sogo_visible_y": "Toon alias in SOGo",
diff --git a/data/web/lang/lang.pl.json b/data/web/lang/lang.pl.json
index 1af3d98c..27f16139 100644
--- a/data/web/lang/lang.pl.json
+++ b/data/web/lang/lang.pl.json
@@ -424,4 +424,4 @@
         "weekly": "Co tydzień",
         "weeks": "Tygodnie"
     }
-}
\ No newline at end of file
+}
diff --git a/data/web/lang/lang.ro.json b/data/web/lang/lang.ro.json
index 06468552..e2218f8a 100644
--- a/data/web/lang/lang.ro.json
+++ b/data/web/lang/lang.ro.json
@@ -762,7 +762,6 @@
         "sieve_preset_7": "Redirecționează și păstrează/aruncă",
         "sieve_preset_8": "Renunțați la mesajul trimis la o adresă alias din care face parte expeditorul",
         "sieve_preset_header": "Vedeți exemplul de presetări de mai jos. Pentru mai multe detalii accesați <a href=\"https://en.wikipedia.org/wiki/Sieve_(mail_filtering_language)\" target=\"_blank\">Wikipedia</a>.",
-        "sogo_allow_admin_hint": "Conectările SOGo administrative sunt disponibile numai pentru căsuțele poștale cu un profil SOGo existent. Un utilizator trebuie să se fi fost conectat la SOGo cel puțin o dată.",
         "sogo_visible": "Aliasul este vizibil în SOGo",
         "sogo_visible_n": "Ascunde alias în SOGo",
         "sogo_visible_y": "Afișază alias în SOGo",
diff --git a/data/web/lang/lang.ru.json b/data/web/lang/lang.ru.json
index 3be9918f..25a3823e 100644
--- a/data/web/lang/lang.ru.json
+++ b/data/web/lang/lang.ru.json
@@ -765,7 +765,6 @@
         "sieve_preset_7": "Redirect and keep/drop",
         "sieve_preset_8": "Discard message sent to an alias address the sender is part of",
         "sieve_preset_header": "Пожалуйста, ознакомьтесь с примерами ниже. Для более подробной информации прочитайте <a href=\"https://en.wikipedia.org/wiki/Sieve_(mail_filtering_language)\" target=\"_blank\">Sieve Wikipedia</a>.",
-        "sogo_allow_admin_hint": "Административные логины SOGo доступны только для почтовых ящиков с существующим профилем SOGo. Пользователь должен был войти в SOGo хотя бы один раз.",
         "sogo_visible": "Отображать псевдоним в SOGo",
         "sogo_visible_n": "Не отображать псевдоним в SOGo",
         "sogo_visible_y": "Отображать псевдоним в SOGo",
diff --git a/data/web/lang/lang.sk.json b/data/web/lang/lang.sk.json
index 2502032e..39df5723 100644
--- a/data/web/lang/lang.sk.json
+++ b/data/web/lang/lang.sk.json
@@ -765,7 +765,6 @@
         "sieve_preset_7": "Presmerovať a uchovať/zahodiť",
         "sieve_preset_8": "Zahodiť správu odoslanú na alias adresu, ktorej je odosielateľ súčasťou",
         "sieve_preset_header": "Prosím pozrite sa na ukážku nižšie. Pre viac informácií pozrite <a href=\"https://en.wikipedia.org/wiki/Sieve_(mail_filtering_language)\" target=\"_blank\">Wikipedia</a>.",
-        "sogo_allow_admin_hint": "Administratívne SOGo prihlásenia sú dostupné pre poštové schránky s existujúcim SOGo profilom. Požívateľ musí byť prihlásený do SOGo najmenej raz.",
         "sogo_visible": "Alias je viditeľný v SOGo",
         "sogo_visible_n": "Skryť alias v SOGo",
         "sogo_visible_y": "Zobraziť alias v SOGo",
diff --git a/data/web/lang/lang.sv.json b/data/web/lang/lang.sv.json
index c4b72ab9..135f6c0f 100644
--- a/data/web/lang/lang.sv.json
+++ b/data/web/lang/lang.sv.json
@@ -767,7 +767,6 @@
         "sieve_preset_7": "Vidarebefodra och behåll, eller kasta meddelandet.",
         "sieve_preset_8": "Kasta meddelanden som skickas till en alias-adress som avsändaren redan tillhör.",
         "sieve_preset_header": "Exempel på postfilter finns nedan. För mer information se <a href=\"https://en.wikipedia.org/wiki/Sieve_(mail_filtering_language)\" target=\"_blank\">Wikipedia</a>.",
-        "sogo_allow_admin_hint": "Administrativ SOGo-inloggning är endast tillgängliga för postlådor med en befintlig SOGo-profil. Användaren måste ha varit inloggad på SOGo minst en gång innan.",
         "sogo_visible": "Visa detta alias i SOGo",
         "sogo_visible_n": "Dölj alias i SOGo",
         "sogo_visible_y": "Visa alias i SOGo",
diff --git a/data/web/lang/lang.zh.json b/data/web/lang/lang.zh.json
index 56eadc2e..6adfb52c 100644
--- a/data/web/lang/lang.zh.json
+++ b/data/web/lang/lang.zh.json
@@ -711,7 +711,6 @@
         "sieve_preset_7": "重定向邮件并保留/删除",
         "sieve_preset_8": "删除发件人发送给自己别名地址的邮件",
         "sieve_preset_header": "请看下方的示例预设。 查看 <a href=\"https://en.wikipedia.org/wiki/Sieve_(mail_filtering_language)\" target=\"_blank\">Wikipedia</a> 以了解更多细节。",
-        "sogo_allow_admin_hint": "只允许存在个人资料的邮箱帐号以SOGo管理员登录，即用户需要在先前至少登录过一次。",
         "sogo_visible": "SOGo别名显示",
         "sogo_visible_n": "在SOGo中隐藏别名",
         "sogo_visible_y": "在SOGo中显示别名",
diff --git a/data/web/mailbox.php b/data/web/mailbox.php
index c850cd11..e209f617 100644
--- a/data/web/mailbox.php
+++ b/data/web/mailbox.php
@@ -111,11 +111,6 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
                 </ul>
               </div>
             </div>
-            <?php if (getenv('ALLOW_ADMIN_EMAIL_LOGIN') == "y" && getenv('SKIP_SOGO') != "y") { ?>
-            <div class="panel-body help-block">
-            <?=$lang['mailbox']['sogo_allow_admin_hint'];?>
-            </div>
-            <?php } ?>
             <div class="mass-actions-mailbox" data-actions-header="true"></div>
             <div class="table-responsive">
               <table id="mailbox_table" class="table table-striped"></table>