fix: removed old code for optional email address

thorsten · Mar 28, 2024 · 1f6f30a · 1f6f30a
1 parent 4c385a5
commit 1f6f30a
Show file tree

Hide file tree

Showing 31 changed files with 0 additions and 48 deletions.
diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Frontend/CommentController.php b/phpmyfaq/src/phpMyFAQ/Controller/Frontend/CommentController.php
@@ -100,11 +100,6 @@ public function create(Request $request): JsonResponse
             return $this->json(['error' => Translation::get('errSaveComment')], Response::HTTP_BAD_REQUEST);
         }
 
-        // If e-mail address is set to optional
-        if (!$this->configuration->get('main.optionalMailAddress') && empty($mailer)) {
-            $mailer = $this->configuration->getAdminEmail();
-        }
-
         // Check display name and e-mail address for not logged-in users
         if (!$user->isLoggedIn()) {
             $user = new User($this->configuration);

diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Frontend/ContactController.php b/phpmyfaq/src/phpMyFAQ/Controller/Frontend/ContactController.php
@@ -51,11 +51,6 @@ public function create(Request $request): JsonResponse
             return $this->json(['error' => Translation::get('msgCaptcha')], Response::HTTP_BAD_REQUEST);
         }
 
-        // If e-mail address is set to optional
-        if (!$this->configuration->get('main.optionalMailAddress') && is_null($email)) {
-            $email = $this->configuration->getAdminEmail();
-        }
-
         if (
             $author !== '' &&
             $author !== '0' &&

diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Frontend/QuestionController.php b/phpmyfaq/src/phpMyFAQ/Controller/Frontend/QuestionController.php
@@ -68,11 +68,6 @@ public function create(Request $request): JsonResponse
         $userQuestion = trim(strip_tags((string) $data->question));
         $save = Filter::filterVar($data->save ?? 0, FILTER_VALIDATE_INT);
 
-        // Handle optional email address
-        if (!$this->configuration->get('main.optionalMailAddress') && empty($email)) {
-            $email = $this->configuration->getAdminEmail();
-        }
-
         // If smart answering is disabled, save the question immediately
         if (false === $this->configuration->get('main.enableSmartAnswering')) {
             $save = true;

diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Frontend/UserController.php b/phpmyfaq/src/phpMyFAQ/Controller/Frontend/UserController.php
@@ -205,11 +205,6 @@ public function requestUserRemoval(Request $request): JsonResponse
         $email = trim((string) Filter::filterVar($data->email, FILTER_VALIDATE_EMAIL));
         $question = trim((string) Filter::filterVar($data->question, FILTER_SANITIZE_SPECIAL_CHARS));
 
-        // If e-mail address is set to optional
-        if (!$this->configuration->get('main.optionalMailAddress') && is_null($email)) {
-            $email = $this->configuration->getAdminEmail();
-        }
-
         // Validate User ID, Username and email
         if (
             !$user->getUserById($userId) ||

diff --git a/phpmyfaq/translations/language_ar.php b/phpmyfaq/translations/language_ar.php
@@ -622,7 +622,6 @@
 $PMF_LANG['msgEditFaqDat'] = 'تحرير';
 $LANG_CONF['search.numberSearchTerms'] = array('input', 'Number of listed search terms');
 $LANG_CONF['records.orderingPopularFaqs'] = array('select', 'Sorting of the top faq\'s');
-$LANG_CONF['main.optionalMailAddress'] = array('checkbox', 'Mail address as mandatory field (default: deactivated)');
 $PMF_LANG['msgTransToolRemove'] = 'حذف';
 $PMF_LANG['msgTransToolLanguageNumberOfPlurals'] = 'Number of plural forms';
 $PMF_LANG['msgTransToolLanguageOnePlural'] = 'This language has only one plural form';

diff --git a/phpmyfaq/translations/language_cs.php b/phpmyfaq/translations/language_cs.php
@@ -779,7 +779,6 @@
 $PMF_LANG['msgUpdateFaqDate'] = 'vložit datum editace';
 $PMF_LANG['msgKeepFaqDate'] = 'ponechat původní datum';
 $PMF_LANG['msgEditFaqDat'] = 'vložit vlastní datum';
-$LANG_CONF['main.optionalMailAddress'] = array('checkbox', 'Emailová adresa jako povinné pole (výchozí: deaktivováno)');
 $LANG_CONF['search.useAjaxSearchOnStartpage'] = array('checkbox', 'Okamžitá odpověď na úvodní straně (výchozí: deaktivováno)');
 $LANG_CONF['search.relevance'] = array('select', 'Řadit podle důležitosti');
 $LANG_CONF['search.enableRelevance'] = array("checkbox", "Aktivovat podporu důležitosti? (výchozí: vypnuto)");

diff --git a/phpmyfaq/translations/language_de.php b/phpmyfaq/translations/language_de.php
@@ -980,7 +980,6 @@
 $PMF_LANG['msgUpdateFaqDate'] = "aktualisieren";
 $PMF_LANG['msgKeepFaqDate'] = "behalten";
 $PMF_LANG['msgEditFaqDat'] = "ändern";
-$LANG_CONF['main.optionalMailAddress'] = ["checkbox", "Angabe der E-Mailadresse als Pflichtfeld "];
 
 // added v2.6.99 - 2010-11-24 by Gustavo Solt
 $LANG_CONF['search.relevance'] = ["select", "Sortierung nach Relevanz"];

diff --git a/phpmyfaq/translations/language_en.php b/phpmyfaq/translations/language_en.php
@@ -980,7 +980,6 @@
 $PMF_LANG['msgUpdateFaqDate'] = 'update';
 $PMF_LANG['msgKeepFaqDate'] = 'keep';
 $PMF_LANG['msgEditFaqDat'] = 'edit';
-$LANG_CONF['main.optionalMailAddress'] = ['checkbox', 'Mail address as mandatory field'];
 
 // added v2.6.99 - 2010-11-24 by Gustavo Solt
 $LANG_CONF['search.relevance'] = ['select', 'Sort by relevance'];

diff --git a/phpmyfaq/translations/language_es.php b/phpmyfaq/translations/language_es.php
@@ -978,7 +978,6 @@
 $PMF_LANG['msgUpdateFaqDate'] = 'actualizar';
 $PMF_LANG['msgKeepFaqDate'] = 'mantener';
 $PMF_LANG['msgEditFaqDat'] = 'editar';
-$LANG_CONF['main.optionalMailAddress'] = array('checkbox', 'E-mail como campo obligatorio ');
 
 // added v2.6.99 - 2010-11-24 by Gustavo Solt
 $LANG_CONF['search.relevance'] = array('select', 'Ordenar por relevancia');

diff --git a/phpmyfaq/translations/language_fa.php b/phpmyfaq/translations/language_fa.php
@@ -539,7 +539,6 @@
 $PMF_LANG['msgLoginUser'] = 'ورود';
 $LANG_CONF['search.numberSearchTerms'] = array('input', ' تعداد کلمات کلیدی فهرست شده');
 $LANG_CONF['records.orderingPopularFAQs'] = array('select', 'مرتب‌ کردن پرسش‌های متداول برتر\'s');
-$LANG_CONF['main.optionalMailAddress'] = array('checkbox', 'اجبار در ورود آدرس ایمیل (پیش فرض: غیر فعال)');
 $LANG_CONF['search.useAjaxSearchOnStartpage'] = array('checkbox', 'پاسخ سریع در صفحه آغازین (پیش‌فرض: غیرفعال)');
 $LANG_CONF['search.relevance'] = array('select', 'مرتب کردن بر اساس رابطه');
 $LANG_CONF['search.enableRelevance'] = array('checkbox', 'پشتیبانی از رابطه فعال شود؟ (پیش‌فرض: غبرفعال)');

diff --git a/phpmyfaq/translations/language_fi.php b/phpmyfaq/translations/language_fi.php
@@ -785,7 +785,6 @@
 $PMF_LANG['msgUpdateFaqDate'] = 'päivitä';
 $PMF_LANG['msgKeepFaqDate'] = 'pidä';
 $PMF_LANG['msgEditFaqDat'] = 'muokkaa';
-$LANG_CONF['main.optionalMailAddress'] = array('checkbox', 'Sähköpostiosoite pakollisena kenttänä (oletus: ei käytössä)');
 $LANG_CONF['search.relevance'] = array('select', 'Järjestä relevanssin mukaan');
 $LANG_CONF['search.enableRelevance'] = array('checkbox', 'Aktivoi relevanssituki? (oletus: pois käytöstä)');
 $PMF_LANG['searchControlCenter'] = 'Haun asetukset';

diff --git a/phpmyfaq/translations/language_fr-ca.php b/phpmyfaq/translations/language_fr-ca.php
@@ -704,7 +704,6 @@
 $PMF_LANG['msgEditFaqDat'] = 'édition';
 $LANG_CONF['search.numberSearchTerms'] = array("input", "Nombre de termes trouvés");
 $LANG_CONF['records.orderingPopularFaqs'] = array("select", "Trier par FaqHelper les plus populaires");
-$LANG_CONF['main.optionalMailAddress'] = array("checkbox", "Adresse courriel comme champ obligatoire (défaut : désactivé)");
 $PMF_LANG['ad_record_sticky'] = 'Épingler cette faq :';
 $PMF_LANG['ad_entry_sticky'] = 'Épingler cette faq ';
 $PMF_LANG['stickyRecordsHeader'] = 'FAQs épinglées';

diff --git a/phpmyfaq/translations/language_fr.php b/phpmyfaq/translations/language_fr.php
@@ -980,7 +980,6 @@
 $PMF_LANG["msgUpdateFaqDate"] = "Mettre à jour";
 $PMF_LANG["msgKeepFaqDate"] = "Conserver";
 $PMF_LANG["msgEditFaqDat"] = "Editer";
-$LANG_CONF["main.optionalMailAddress"] = ["checkbox", "Adresse email comme champ obligatoire"];
 
 // added v2.6.99 - 2010-11-24 by Gustavo Solt
 $LANG_CONF["search.relevance"] = ["select", "Tri par pertinence"];

diff --git a/phpmyfaq/translations/language_hu.php b/phpmyfaq/translations/language_hu.php
@@ -577,7 +577,6 @@
 $PMF_LANG['socialNetworksControlCenter'] = 'Közösségi beállítások';
 $LANG_CONF['search.numberSearchTerms'] = array('input', 'Találatok száma');
 $LANG_CONF['records.orderingPopularFaqs'] = array('select', 'Sorting of the top FAQ\'s');
-$LANG_CONF['main.optionalMailAddress'] = array('checkbox', 'Mail address as mandatory field (default: deactivated)');
 $LANG_CONF['search.relevance'] = array('select', 'Relevancia szerint sorba');
 $LANG_CONF['search.enableRelevance'] = array('checkbox', 'Activate relevance support? (default: disabled)');
 $PMF_LANG['msgTransToolRemove'] = 'Eltávolítás';

diff --git a/phpmyfaq/translations/language_it.php b/phpmyfaq/translations/language_it.php
@@ -869,7 +869,6 @@
 $PMF_LANG['msgLoginUser'] = 'Accedi';
 $LANG_CONF['search.numberSearchTerms'] = array('input', 'Numero di termini di ricerca inseriti');
 $LANG_CONF['records.orderingPopularFaqs'] = array('select', 'Sorting of the top FAQ');
-$LANG_CONF['main.optionalMailAddress'] = array('checkbox', 'Campo email obbligatorio (default: disattivato)');
 $LANG_CONF['search.useAjaxSearchOnStartpage'] = array('checkbox', 'Risposta Istantanea su pagina iniziale (default: disattivato)');
 $LANG_CONF['search.relevance'] = array('select', 'Ordina per importanza');
 $LANG_CONF['search.enableRelevance'] = array('checkbox', 'Attivare supporto importanza? (default: disattivo)');

diff --git a/phpmyfaq/translations/language_ja.php b/phpmyfaq/translations/language_ja.php
@@ -776,7 +776,6 @@
 $PMF_LANG['msgUpdateFaqDate'] = '更新';
 $PMF_LANG['msgKeepFaqDate'] = '維持';
 $PMF_LANG['msgEditFaqDat'] = '編集';
-$LANG_CONF['main.optionalMailAddress'] = array("checkbox", "Mail address as mandatory field (default: deactivated)");
 $PMF_LANG['ad_entry_savedfail'] = '<strong>データベースエラー</strong>が発生しました。';
 $PMF_LANG['searchControlCenter'] = '検索';
 $PMF_LANG['search.relevance.thema-content-keywords'] = '質問 - 回答 - キーワード';

diff --git a/phpmyfaq/translations/language_lt.php b/phpmyfaq/translations/language_lt.php
@@ -1004,6 +1004,5 @@
 $PMF_LANG['msgUpdateFaqDate'] = 'atnaujinti';
 $PMF_LANG['msgKeepFaqDate'] = 'palikti';
 $PMF_LANG['msgEditFaqDat'] = 'redaguoti';
-$LANG_CONF['main.optionalMailAddress'] = array('checkbox', 'El. pašto adresas yra būtinas laukas (numatyta r.: išjungta)');
 
 return $PMF_LANG;
diff --git a/phpmyfaq/translations/language_mn.php b/phpmyfaq/translations/language_mn.php
@@ -992,7 +992,6 @@
 $PMF_LANG['msgUpdateFaqDate'] = 'шинэчлэх';
 $PMF_LANG['msgKeepFaqDate'] = 'keep';
 $PMF_LANG['msgEditFaqDat'] = 'засах';
-$LANG_CONF['main.optionalMailAddress'] = array('checkbox', 'Mail address as mandatory field (үндсэн: идэвхгүй)');
 $LANG_CONF['search.useAjaxSearchOnStartpage'] = array('checkbox', 'Instant Response on startpage (үндсэн: идэвхгүй)');
 
 // added v2.6.99 - 2010-11-24 by Gustavo Solt

diff --git a/phpmyfaq/translations/language_ms.php b/phpmyfaq/translations/language_ms.php
@@ -775,6 +775,5 @@
 $PMF_LANG['msgUpdateFaqDate'] = 'kemaskini';
 $PMF_LANG['msgKeepFaqDate'] = 'pegang';
 $PMF_LANG['msgEditFaqDat'] = 'edit';
-$LANG_CONF['main.optionalMailAddress'] = array("checkbox", "Alamat surat menyurat sebagai ruangan mandatori (lalai: tidak aktif)");
 
 return $PMF_LANG;
diff --git a/phpmyfaq/translations/language_nb.php b/phpmyfaq/translations/language_nb.php
@@ -742,9 +742,7 @@
 $PMF_LANG['msgEditFaqDat'] = 'endre';
 $LANG_CONF['search.numberSearchTerms'] = array('input', 'Antall søkeord vist');
 $LANG_CONF['records.orderingPopularFaqs'] = array("select", "Sortering av topp-faq's");
-$LANG_CONF['main.optionalMailAddress'] = array('checkbox', 'e-post adresse som obligatorisk felt (standard: deaktivert)');
 $LANG_CONF['records.orderingPopularFaqs'] = array('select', 'Sortering av topp OSSer');
-$LANG_CONF['main.optionalMailAddress'] = array('checkbox', 'e-post adresse som obligatorisk felt (Standard: deaktivert)');
 $PMF_LANG['msgTransToolRemove'] = 'Fjern';
 $PMF_LANG['msgTransToolLanguageNumberOfPlurals'] = 'Antall flertallsformer';
 $PMF_LANG['msgTransToolLanguageOnePlural'] = 'Dette språket har bare en flertallsform';

diff --git a/phpmyfaq/translations/language_nl.php b/phpmyfaq/translations/language_nl.php
@@ -742,7 +742,6 @@
 $PMF_LANG['msgEditFaqDat'] = 'bewerk';
 $LANG_CONF['search.numberSearchTerms'] = array('input', 'Aantal genoteerde zoektermen');
 $LANG_CONF['records.orderingPopularFaqs'] = array('select', 'Sortering van de top FAQ\'s');
-$LANG_CONF['main.optionalMailAddress'] = array('checkbox', 'E-mail adres als verplicht veld (standaard: gedeactiveerd)');
 $PMF_LANG['msgTransToolRemove'] = 'Verwijder';
 $PMF_LANG['msgTransToolLanguageNumberOfPlurals'] = 'Aantal meervoud';
 $PMF_LANG['msgTransToolLanguageOnePlural'] = 'Deze taal kent slechts een meervoudsvorm';

diff --git a/phpmyfaq/translations/language_pl.php b/phpmyfaq/translations/language_pl.php
@@ -790,7 +790,6 @@
 $PMF_LANG['msgEditFaqDat'] = 'edytuj';
 $LANG_CONF['search.numberSearchTerms'] = array('input', 'Liczba notowanych haseł');
 $LANG_CONF['records.orderingPopularFaqs'] = array('select', 'Sortowanie FAQ wg najlepszych');
-$LANG_CONF['main.optionalMailAddress'] = array('checkbox', 'Mail jako obowiązkowe pole (domyślnie: wyłączony)');
 $PMF_LANG['securityControlCenter'] = 'Konfiguracja bezpieczeństwa';
 $PMF_LANG['ad_search_delsuc'] = 'Szukana fraza została usunięta.';
 $PMF_LANG['ad_search_delfail'] = 'Szukana fraza nie została usunięta.';

diff --git a/phpmyfaq/translations/language_pt-br.php b/phpmyfaq/translations/language_pt-br.php
@@ -755,7 +755,6 @@
 $PMF_LANG['msgEditFaqDat'] = 'editar';
 $LANG_CONF['search.numberSearchTerms'] = array('input', 'Número de termos de busca listados');
 $LANG_CONF['records.orderingPopularFaqs'] = array('select', 'Ordenação das Top FAQs');
-$LANG_CONF['main.optionalMailAddress'] = array('checkbox', 'E-mail como campo obrigatório (padrão: desativado)');
 $PMF_LANG['msgTransToolRemove'] = 'Remover';
 $PMF_LANG['msgTransToolLanguageNumberOfPlurals'] = 'Número de formas plurais';
 $PMF_LANG['msgTransToolLanguageOnePlural'] = 'Este idioma tem apenas um formato de plural';

diff --git a/phpmyfaq/translations/language_pt.php b/phpmyfaq/translations/language_pt.php
@@ -762,7 +762,6 @@
 $PMF_LANG['msgUpdateFaqDate'] = 'Atualizar';
 $PMF_LANG['msgKeepFaqDate'] = 'Manter';
 $PMF_LANG['msgEditFaqDat'] = 'Editar';
-$LANG_CONF['main.optionalMailAddress'] = array('checkbox', 'Marcar como obrigatório o campo do endereço de <em>e-mail</em> <small>(pré-definição: desativada)</small>');
 $LANG_CONF['search.relevance'] = array('select', 'Ordenar por relevância');
 $LANG_CONF['search.enableRelevance'] = array('checkbox', 'Ativar a utilização da relevância? <small>(pré-definição: desativada)</small>');
 $PMF_LANG['searchControlCenter'] = 'Pesquisa';

diff --git a/phpmyfaq/translations/language_ro.php b/phpmyfaq/translations/language_ro.php
@@ -540,7 +540,6 @@
 $PMF_LANG['msgEditFaqDat'] = 'editeaza';
 $LANG_CONF['search.numberSearchTerms'] = array('input', 'Numarul listei de termeni cautati');
 $LANG_CONF['records.orderingPopularFaqs'] = array("select", "Sorteaza  topul intrebarilor");
-$LANG_CONF['main.optionalMailAddress'] = array('checkbox', 'Adresa de email camp obligatoriu (normal:dezactivat)');
 $PMF_LANG['msgTransToolRemove'] = 'Sterge';
 $PMF_LANG['msgTransToolLanguageNumberOfPlurals'] = 'Numarul formelor plurale';
 $PMF_LANG['msgTransToolLanguageOnePlural'] = 'Aceasta limba are decat o forma plurala';

diff --git a/phpmyfaq/translations/language_sk.php b/phpmyfaq/translations/language_sk.php
@@ -985,6 +985,5 @@
 $PMF_LANG['msgUpdateFaqDate'] = 'aktualizovať';
 $PMF_LANG['msgKeepFaqDate'] = 'ponechať';
 $PMF_LANG['msgEditFaqDat'] = 'upraviť';
-$LANG_CONF['main.optionalMailAddress'] = array('checkbox', 'E-mailová adresa ako povinné pole (prednastavené: deaktivované)');
 
 return $PMF_LANG;
diff --git a/phpmyfaq/translations/language_sv.php b/phpmyfaq/translations/language_sv.php
@@ -688,7 +688,6 @@
 $PMF_LANG['msgEditFaqDat'] = 'redigera';
 $LANG_CONF['search.numberSearchTerms'] = array('input', 'Antal söktermer');
 $LANG_CONF['records.orderingPopularFaqs'] = array("select", "Sortera de mest populära inläggen");
-$LANG_CONF['main.optionalMailAddress'] = array('checkbox', 'E-post-adress är obligatorisk (standard: valfri)');
 $PMF_LANG['msgEdit'] = 'Redigera';
 $PMF_LANG['msgDelete'] = 'Ta bort';
 $PMF_LANG['msgYes'] = 'ja';

diff --git a/phpmyfaq/translations/language_th.php b/phpmyfaq/translations/language_th.php
@@ -767,6 +767,5 @@
 $PMF_LANG['msgEditFaqDat'] = 'แก้ไข';
 $LANG_CONF['search.numberSearchTerms'] = array('input', 'จำนวนของผลการค้นที่จะแสดง');
 $LANG_CONF['records.orderingPopularFaqs'] = array("select", "เรียงลำดับเรื่องของ faq");
-$LANG_CONF['main.optionalMailAddress'] = array('checkbox', 'ช่องอีเมล์เป็นช่องที่จำเป็นต้องกรอก (ค่าเริ่มต้น: ปิด)');
 
 return $PMF_LANG;
diff --git a/phpmyfaq/translations/language_tr.php b/phpmyfaq/translations/language_tr.php
@@ -968,7 +968,6 @@
 $PMF_LANG['msgUpdateFaqDate'] = "güncelle";
 $PMF_LANG['msgKeepFaqDate'] = "sakla";
 $PMF_LANG['msgEditFaqDat'] = "düzenle";
-$LANG_CONF['main.optionalMailAddress'] = array('checkbox', 'Mail address as mandatory field');
 
 // added v2.6.99 - 2010-11-24 by Gustavo Solt
 $LANG_CONF['search.relevance'] = array('select', 'Sort by relevance');

diff --git a/phpmyfaq/translations/language_tw.php b/phpmyfaq/translations/language_tw.php
@@ -967,7 +967,6 @@
 $PMF_LANG['msgUpdateFaqDate'] = "更新";
 $PMF_LANG['msgKeepFaqDate'] = "保留";
 $PMF_LANG['msgEditFaqDat'] = "編輯";
-$LANG_CONF['main.optionalMailAddress'] = array("checkbox", "郵件地址為命令的欄位 (預設: 關閉) Mail address as mandatory field (default: deactivated)");
 
 // added v2.6.99 - 2010-11-24 by Gustavo Solt 開發者
 $LANG_CONF['search.relevance'] = array("select", "Sort by relevance");

diff --git a/phpmyfaq/translations/language_zh.php b/phpmyfaq/translations/language_zh.php
@@ -768,7 +768,6 @@
 $PMF_LANG['msgEditFaqDat'] = '编辑';
 $LANG_CONF['search.numberSearchTerms'] = array('input', '列出的搜索条目数目');
 $LANG_CONF['records.orderingPopularFaqs'] = array('select', '为顶级问答排序');
-$LANG_CONF['main.optionalMailAddress'] = array('checkbox', '邮件地址作为强制要求 (默认: 不激活)');
 $PMF_LANG['securityControlCenter'] = '安全设置';
 $PMF_LANG['ad_search_delsuc'] = '搜索语句删除成功';
 $PMF_LANG['ad_search_delfail'] = '搜索语句未被删除。';