From e679d3df0e55530c056d701b4773ff7e74f5c82c Mon Sep 17 00:00:00 2001 From: maTh Date: Tue, 21 Mar 2023 18:47:07 +0100 Subject: [PATCH] Improved: show Terms of Service in config menu (#5215) * Use constants for path to TOS * improve comments * TOS title moved to template * TOS available via config menu * CSS: improve handling of content of TOS/about * give info about set/unset TOS in system config * fix target * i18n FR * i18n DE --- app/Controllers/authController.php | 2 +- app/Controllers/indexController.php | 6 ++--- app/Controllers/userController.php | 2 +- app/i18n/cz/admin.php | 5 ++++ app/i18n/de/admin.php | 5 ++++ app/i18n/el/admin.php | 5 ++++ app/i18n/en-us/admin.php | 5 ++++ app/i18n/en/admin.php | 5 ++++ app/i18n/es/admin.php | 5 ++++ app/i18n/fr/admin.php | 5 ++++ app/i18n/he/admin.php | 5 ++++ app/i18n/id/admin.php | 5 ++++ app/i18n/it/admin.php | 5 ++++ app/i18n/ja/admin.php | 5 ++++ app/i18n/ko/admin.php | 5 ++++ app/i18n/nl/admin.php | 5 ++++ app/i18n/oc/admin.php | 5 ++++ app/i18n/pl/admin.php | 5 ++++ app/i18n/pt-br/admin.php | 5 ++++ app/i18n/ru/admin.php | 5 ++++ app/i18n/sk/admin.php | 5 ++++ app/i18n/tr/admin.php | 5 ++++ app/i18n/zh-cn/admin.php | 5 ++++ app/i18n/zh-tw/admin.php | 5 ++++ app/layout/aside_configure.phtml | 5 ++++ app/layout/header.phtml | 5 ++++ app/views/configure/system.phtml | 13 ++++++++++ app/views/index/about.phtml | 2 +- app/views/index/tos.phtml | 33 +++++++++++++++++------- constants.php | 3 ++- data/tos.example.html | 2 +- p/themes/Alternative-Dark/adark.css | 14 ---------- p/themes/Alternative-Dark/adark.rtl.css | 14 ---------- p/themes/Ansum/_configuration.scss | 9 ------- p/themes/Ansum/ansum.css | 9 ++----- p/themes/Ansum/ansum.rtl.css | 7 ----- p/themes/BlueLagoon/BlueLagoon.css | 14 ---------- p/themes/BlueLagoon/BlueLagoon.rtl.css | 14 ---------- p/themes/Dark/dark.css | 14 ---------- p/themes/Dark/dark.rtl.css | 14 ---------- p/themes/Flat/flat.css | 14 ---------- p/themes/Flat/flat.rtl.css | 14 ---------- p/themes/Mapco/_configuration.scss | 9 ------- p/themes/Mapco/mapco.css | 7 ----- p/themes/Mapco/mapco.rtl.css | 7 ----- p/themes/Nord/nord.css | 15 ----------- p/themes/Nord/nord.rtl.css | 15 ----------- p/themes/Origine/origine.css | 14 ---------- p/themes/Origine/origine.rtl.css | 14 ---------- p/themes/Pafat/pafat.css | 14 ---------- p/themes/Pafat/pafat.rtl.css | 14 ---------- p/themes/Screwdriver/screwdriver.css | 14 ---------- p/themes/Screwdriver/screwdriver.rtl.css | 14 ---------- p/themes/Swage/swage.css | 13 +--------- p/themes/Swage/swage.rtl.css | 11 +------- p/themes/Swage/swage.scss | 9 ------- p/themes/base-theme/base.css | 14 ---------- p/themes/base-theme/base.rtl.css | 14 ---------- p/themes/base-theme/frss.css | 14 ++++++++++ p/themes/base-theme/frss.rtl.css | 14 ++++++++++ 60 files changed, 193 insertions(+), 348 deletions(-) diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php index e8f6807bd..9f9d19623 100644 --- a/app/Controllers/authController.php +++ b/app/Controllers/authController.php @@ -239,7 +239,7 @@ class FreshRSS_auth_Controller extends FreshRSS_ActionController { Minz_Error::error(403); } - $this->view->show_tos_checkbox = file_exists(join_path(DATA_PATH, 'tos.html')); + $this->view->show_tos_checkbox = file_exists(TOS_FILENAME); $this->view->show_email_field = FreshRSS_Context::$system_conf->force_email_validation; $this->view->preferred_language = Minz_Translate::getLanguage(null, Minz_Request::getPreferredLanguages(), FreshRSS_Context::$system_conf->language); FreshRSS_View::prependTitle(_t('gen.auth.registration.title') . ' · '); diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php index 968518e3f..9cb235d21 100644 --- a/app/Controllers/indexController.php +++ b/app/Controllers/indexController.php @@ -282,13 +282,13 @@ class FreshRSS_index_Controller extends FreshRSS_ActionController { } /** - * This action displays the EULA page of FreshRSS. + * This action displays the EULA/TOS (Terms of Service) page of FreshRSS. * This page is enabled only if admin created a data/tos.html file. * The content of the page is the content of data/tos.html. - * It returns 404 if there is no EULA. + * It returns 404 if there is no EULA/TOS. */ public function tosAction() { - $terms_of_service = file_get_contents(join_path(DATA_PATH, 'tos.html')); + $terms_of_service = file_get_contents(TOS_FILENAME); if (!$terms_of_service) { Minz_Error::error(404); } diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php index ac8f3be82..01656099c 100644 --- a/app/Controllers/userController.php +++ b/app/Controllers/userController.php @@ -318,7 +318,7 @@ class FreshRSS_user_Controller extends FreshRSS_ActionController { ); } - $tos_enabled = file_exists(join_path(DATA_PATH, 'tos.html')); + $tos_enabled = file_exists(TOS_FILENAME); $accept_tos = Minz_Request::param('accept_tos', false); if ($system_conf->force_email_validation && empty($email)) { diff --git a/app/i18n/cz/admin.php b/app/i18n/cz/admin.php index 988ddee6a..5c7ba6ad5 100644 --- a/app/i18n/cz/admin.php +++ b/app/i18n/cz/admin.php @@ -183,6 +183,11 @@ return array( ), 'title' => 'Registrační formulář uživatele', ), + 'tos' => array( + 'disabled' => 'is not given', // TODO + 'enabled' => 'is enabled', // TODO + 'help' => 'How to enable the Terms of Service', // TODO + ), ), 'update' => array( '_' => 'Aktualizace systému', diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php index 717b77cc2..5f88c2845 100644 --- a/app/i18n/de/admin.php +++ b/app/i18n/de/admin.php @@ -183,6 +183,11 @@ return array( ), 'title' => 'Benutzer-Registrierungsformular', ), + 'tos' => array( + 'disabled' => 'sind nicht aktiviert', + 'enabled' => 'sind aktiv', + 'help' => 'So werden die Nutzungsbedingungen aktiviert', + ), ), 'update' => array( '_' => 'System aktualisieren', diff --git a/app/i18n/el/admin.php b/app/i18n/el/admin.php index b54e923c8..514a48076 100644 --- a/app/i18n/el/admin.php +++ b/app/i18n/el/admin.php @@ -183,6 +183,11 @@ return array( ), 'title' => 'Φόρμα εγγραφής χρήστη', ), + 'tos' => array( + 'disabled' => 'is not given', // TODO + 'enabled' => 'is enabled', // TODO + 'help' => 'How to enable the Terms of Service', // TODO + ), ), 'update' => array( '_' => 'Ενημέρωση συστήματος', diff --git a/app/i18n/en-us/admin.php b/app/i18n/en-us/admin.php index 471c2cf24..fd9379311 100644 --- a/app/i18n/en-us/admin.php +++ b/app/i18n/en-us/admin.php @@ -183,6 +183,11 @@ return array( ), 'title' => 'User registration form', // IGNORE ), + 'tos' => array( + 'disabled' => 'is not given', // IGNORE + 'enabled' => 'is enabled', // IGNORE + 'help' => 'How to enable the Terms of Service', // IGNORE + ), ), 'update' => array( '_' => 'Update system', // IGNORE diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php index 4746d971f..a0a005bb4 100644 --- a/app/i18n/en/admin.php +++ b/app/i18n/en/admin.php @@ -183,6 +183,11 @@ return array( ), 'title' => 'User registration form', ), + 'tos' => array( + 'disabled' => 'is not given', // TODO + 'enabled' => 'is enabled', // TODO + 'help' => 'How to enable the Terms of Service', // TODO + ), ), 'update' => array( '_' => 'Update system', diff --git a/app/i18n/es/admin.php b/app/i18n/es/admin.php index 868cac45d..73eff6118 100644 --- a/app/i18n/es/admin.php +++ b/app/i18n/es/admin.php @@ -183,6 +183,11 @@ return array( ), 'title' => 'Formulario de registro del usuario', ), + 'tos' => array( + 'disabled' => 'is not given', // TODO + 'enabled' => 'is enabled', // TODO + 'help' => 'How to enable the Terms of Service', // TODO + ), ), 'update' => array( '_' => 'Actualizar sistema', diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php index 4a628e2fe..d03252677 100644 --- a/app/i18n/fr/admin.php +++ b/app/i18n/fr/admin.php @@ -183,6 +183,11 @@ return array( ), 'title' => 'Formulaire d’inscription utilisateur', ), + 'tos' => array( + 'disabled' => 'non renseigné', + 'enabled' => 'activées', + 'help' => 'Comment activer les conditions d’utilisation', + ), ), 'update' => array( '_' => 'Système de mise à jour', diff --git a/app/i18n/he/admin.php b/app/i18n/he/admin.php index 982712af4..1aeb3f2a3 100644 --- a/app/i18n/he/admin.php +++ b/app/i18n/he/admin.php @@ -183,6 +183,11 @@ return array( ), 'title' => 'User registration form', // TODO ), + 'tos' => array( + 'disabled' => 'is not given', // TODO + 'enabled' => 'is enabled', // TODO + 'help' => 'How to enable the Terms of Service', // TODO + ), ), 'update' => array( '_' => 'מערכת העדכון', diff --git a/app/i18n/id/admin.php b/app/i18n/id/admin.php index eba48647b..26175ff01 100644 --- a/app/i18n/id/admin.php +++ b/app/i18n/id/admin.php @@ -183,6 +183,11 @@ return array( ), 'title' => 'Formulir Pendaftaran Pengguna', ), + 'tos' => array( + 'disabled' => 'is not given', // TODO + 'enabled' => 'is enabled', // TODO + 'help' => 'How to enable the Terms of Service', // TODO + ), ), 'update' => array( '_' => 'Update system', // TODO diff --git a/app/i18n/it/admin.php b/app/i18n/it/admin.php index 596d14c17..0ad3c5e90 100644 --- a/app/i18n/it/admin.php +++ b/app/i18n/it/admin.php @@ -183,6 +183,11 @@ return array( ), 'title' => 'Form di registrazione utente', ), + 'tos' => array( + 'disabled' => 'is not given', // TODO + 'enabled' => 'is enabled', // TODO + 'help' => 'How to enable the Terms of Service', // TODO + ), ), 'update' => array( '_' => 'Aggiornamento sistema', diff --git a/app/i18n/ja/admin.php b/app/i18n/ja/admin.php index 41b3bf7b3..4013d9e61 100644 --- a/app/i18n/ja/admin.php +++ b/app/i18n/ja/admin.php @@ -183,6 +183,11 @@ return array( ), 'title' => 'ユーザー登録', ), + 'tos' => array( + 'disabled' => 'is not given', // TODO + 'enabled' => 'is enabled', // TODO + 'help' => 'How to enable the Terms of Service', // TODO + ), ), 'update' => array( '_' => 'システムアップデート', diff --git a/app/i18n/ko/admin.php b/app/i18n/ko/admin.php index 7d20e0c43..319a5ff06 100644 --- a/app/i18n/ko/admin.php +++ b/app/i18n/ko/admin.php @@ -183,6 +183,11 @@ return array( ), 'title' => '사용자 회원가입 양식', ), + 'tos' => array( + 'disabled' => 'is not given', // TODO + 'enabled' => 'is enabled', // TODO + 'help' => 'How to enable the Terms of Service', // TODO + ), ), 'update' => array( '_' => '업데이트', diff --git a/app/i18n/nl/admin.php b/app/i18n/nl/admin.php index 58e7fac90..354df441c 100644 --- a/app/i18n/nl/admin.php +++ b/app/i18n/nl/admin.php @@ -183,6 +183,11 @@ return array( ), 'title' => 'Gebruikersregistratieformulier', ), + 'tos' => array( + 'disabled' => 'is not given', // TODO + 'enabled' => 'is enabled', // TODO + 'help' => 'How to enable the Terms of Service', // TODO + ), ), 'update' => array( '_' => 'Versie controle', diff --git a/app/i18n/oc/admin.php b/app/i18n/oc/admin.php index 2ba5b9098..e50c5b53b 100644 --- a/app/i18n/oc/admin.php +++ b/app/i18n/oc/admin.php @@ -183,6 +183,11 @@ return array( ), 'title' => 'Formulari d’inscripcion utilizaire', ), + 'tos' => array( + 'disabled' => 'is not given', // TODO + 'enabled' => 'is enabled', // TODO + 'help' => 'How to enable the Terms of Service', // TODO + ), ), 'update' => array( '_' => 'Sistèma de mesa a jorn', diff --git a/app/i18n/pl/admin.php b/app/i18n/pl/admin.php index f7cc2b696..53b59d3d0 100644 --- a/app/i18n/pl/admin.php +++ b/app/i18n/pl/admin.php @@ -183,6 +183,11 @@ return array( ), 'title' => 'Formularz rejestracji użytkowników', ), + 'tos' => array( + 'disabled' => 'is not given', // TODO + 'enabled' => 'is enabled', // TODO + 'help' => 'How to enable the Terms of Service', // TODO + ), ), 'update' => array( '_' => 'Aktualizacja', diff --git a/app/i18n/pt-br/admin.php b/app/i18n/pt-br/admin.php index bf5406b39..9595214f4 100644 --- a/app/i18n/pt-br/admin.php +++ b/app/i18n/pt-br/admin.php @@ -183,6 +183,11 @@ return array( ), 'title' => 'Formulário de Cadastro de Usuário', ), + 'tos' => array( + 'disabled' => 'is not given', // TODO + 'enabled' => 'is enabled', // TODO + 'help' => 'How to enable the Terms of Service', // TODO + ), ), 'update' => array( '_' => 'Atualização do sistema', diff --git a/app/i18n/ru/admin.php b/app/i18n/ru/admin.php index 4313106d8..de8377da4 100644 --- a/app/i18n/ru/admin.php +++ b/app/i18n/ru/admin.php @@ -183,6 +183,11 @@ return array( ), 'title' => 'Форма регистрации пользователей', ), + 'tos' => array( + 'disabled' => 'is not given', // TODO + 'enabled' => 'is enabled', // TODO + 'help' => 'How to enable the Terms of Service', // TODO + ), ), 'update' => array( '_' => 'Обновление системы', diff --git a/app/i18n/sk/admin.php b/app/i18n/sk/admin.php index 69649d63d..b0faa0ae2 100644 --- a/app/i18n/sk/admin.php +++ b/app/i18n/sk/admin.php @@ -183,6 +183,11 @@ return array( ), 'title' => 'Registračný formulár používateľa', ), + 'tos' => array( + 'disabled' => 'is not given', // TODO + 'enabled' => 'is enabled', // TODO + 'help' => 'How to enable the Terms of Service', // TODO + ), ), 'update' => array( '_' => 'Aktualizácia systému', diff --git a/app/i18n/tr/admin.php b/app/i18n/tr/admin.php index 1a6d83b21..60f89b897 100644 --- a/app/i18n/tr/admin.php +++ b/app/i18n/tr/admin.php @@ -183,6 +183,11 @@ return array( ), 'title' => 'Kullanıcı kayıt formu', ), + 'tos' => array( + 'disabled' => 'is not given', // TODO + 'enabled' => 'is enabled', // TODO + 'help' => 'How to enable the Terms of Service', // TODO + ), ), 'update' => array( '_' => 'Sistem güncelleme', diff --git a/app/i18n/zh-cn/admin.php b/app/i18n/zh-cn/admin.php index 79bcde2e1..c4568ac39 100644 --- a/app/i18n/zh-cn/admin.php +++ b/app/i18n/zh-cn/admin.php @@ -183,6 +183,11 @@ return array( ), 'title' => '用户注册表单', ), + 'tos' => array( + 'disabled' => 'is not given', // TODO + 'enabled' => 'is enabled', // TODO + 'help' => 'How to enable the Terms of Service', // TODO + ), ), 'update' => array( '_' => '更新系统', diff --git a/app/i18n/zh-tw/admin.php b/app/i18n/zh-tw/admin.php index 869555dde..91ff4331f 100644 --- a/app/i18n/zh-tw/admin.php +++ b/app/i18n/zh-tw/admin.php @@ -183,6 +183,11 @@ return array( ), 'title' => '使用者註冊表單', ), + 'tos' => array( + 'disabled' => 'is not given', // TODO + 'enabled' => 'is enabled', // TODO + 'help' => 'How to enable the Terms of Service', // TODO + ), ), 'update' => array( '_' => '更新系統', diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml index 03b8108f7..6acb08f02 100644 --- a/app/layout/aside_configure.phtml +++ b/app/layout/aside_configure.phtml @@ -84,6 +84,11 @@
  • + +
  • + +
  • + diff --git a/app/layout/header.phtml b/app/layout/header.phtml index 0a49d5992..37dd39d6c 100644 --- a/app/layout/header.phtml +++ b/app/layout/header.phtml @@ -103,6 +103,11 @@ diff --git a/app/views/configure/system.phtml b/app/views/configure/system.phtml index bf14cac5d..58879fc7e 100644 --- a/app/views/configure/system.phtml +++ b/app/views/configure/system.phtml @@ -83,6 +83,19 @@ +
    + +
    + + + + +

    + +
    +
    +