From 52d87c3eaa352b765e1be3c2c0b9a3ce0bfabdc8 Mon Sep 17 00:00:00 2001 From: Sam Cohen Date: Wed, 13 Sep 2023 14:58:10 -0600 Subject: Allow configuration of Base URL via website (#5656) * Allow configuration of Base URL via website * Fix alphabetization of CREDITS * Apply suggestions from code review * Add Automatic recommendation --------- Co-authored-by: Alexandre Alapetite --- CREDITS.md | 1 + app/Controllers/configureController.php | 1 + app/i18n/cz/admin.php | 4 ++++ app/i18n/de/admin.php | 4 ++++ app/i18n/el/admin.php | 4 ++++ app/i18n/en-us/admin.php | 4 ++++ app/i18n/en/admin.php | 4 ++++ app/i18n/es/admin.php | 4 ++++ app/i18n/fa/admin.php | 4 ++++ app/i18n/fr/admin.php | 4 ++++ app/i18n/he/admin.php | 4 ++++ app/i18n/hu/admin.php | 4 ++++ app/i18n/id/admin.php | 4 ++++ app/i18n/it/admin.php | 4 ++++ app/i18n/ja/admin.php | 4 ++++ app/i18n/ko/admin.php | 4 ++++ app/i18n/lv/admin.php | 4 ++++ app/i18n/nl/admin.php | 4 ++++ app/i18n/oc/admin.php | 4 ++++ app/i18n/pl/admin.php | 4 ++++ app/i18n/pt-br/admin.php | 4 ++++ app/i18n/ru/admin.php | 4 ++++ app/i18n/sk/admin.php | 4 ++++ app/i18n/tr/admin.php | 4 ++++ app/i18n/zh-cn/admin.php | 4 ++++ app/i18n/zh-tw/admin.php | 4 ++++ app/views/configure/system.phtml | 9 +++++++++ lib/Minz/Configuration.php | 2 +- 28 files changed, 108 insertions(+), 1 deletion(-) diff --git a/CREDITS.md b/CREDITS.md index c3e1287ac..81c39003c 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -186,6 +186,7 @@ People are sorted by name so please keep this order. * [Rosemary Le Faive](https://github.com/rosiel): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:rosiel) * [ryoku-cha](https://github.com/ryoku-cha): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:ryoku-cha) * [Sadetdin EYILI](https://github.com/sad270): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:sad270) +* [Sam Cohen](https://github.com/samc1213): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:samc1213) * [Sandro Jäckel](https://github.com/SuperSandro2000): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:SuperSandro2000), [Web](https://supersandro.de/) * [Sebastian K](https://github.com/skrollme): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:skrollme) * [shn7798](https://github.com/shn7798): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:shn7798), [Web](http://www.code2talk.com/) diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php index efd90255a..ef16f6b60 100644 --- a/app/Controllers/configureController.php +++ b/app/Controllers/configureController.php @@ -474,6 +474,7 @@ class FreshRSS_configure_Controller extends FreshRSS_ActionController { FreshRSS_Context::$system_conf->title = Minz_Request::paramString('instance-name') ?: 'FreshRSS'; FreshRSS_Context::$system_conf->auto_update_url = Minz_Request::paramString('auto-update-url'); FreshRSS_Context::$system_conf->force_email_validation = Minz_Request::paramBoolean('force-email-validation'); + FreshRSS_Context::$system_conf->base_url = Minz_Request::paramString('base-url'); FreshRSS_Context::$system_conf->save(); invalidateHttpCache(); diff --git a/app/i18n/cz/admin.php b/app/i18n/cz/admin.php index cecd44680..61a7666d2 100644 --- a/app/i18n/cz/admin.php +++ b/app/i18n/cz/admin.php @@ -159,6 +159,10 @@ return array( 'system' => array( '_' => 'Nastavení systému', 'auto-update-url' => 'Adresa URL serveru pro automatické aktualizace', + 'base-url' => array( + '_' => 'Base URL', // TODO + 'recommendation' => 'Automatic recommendation: %s', // TODO + ), 'cookie-duration' => array( 'help' => 'v sekundách', 'number' => 'Trvání ponechání přihlášení', diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php index 4782af4b6..5ac49f7a5 100644 --- a/app/i18n/de/admin.php +++ b/app/i18n/de/admin.php @@ -159,6 +159,10 @@ return array( 'system' => array( '_' => 'Systemeinstellungen', 'auto-update-url' => 'Auto-Update URL', + 'base-url' => array( + '_' => 'Base URL', // TODO + 'recommendation' => 'Automatic recommendation: %s', // TODO + ), 'cookie-duration' => array( 'help' => 'in Sekunden', 'number' => 'Eingeloggt bleiben für', diff --git a/app/i18n/el/admin.php b/app/i18n/el/admin.php index e85471a02..079e43412 100644 --- a/app/i18n/el/admin.php +++ b/app/i18n/el/admin.php @@ -159,6 +159,10 @@ return array( 'system' => array( '_' => 'Ρυθμίσεις συστήματος', 'auto-update-url' => 'Αυτόματη ενημέρωση URL διακομιστή', + 'base-url' => array( + '_' => 'Base URL', // TODO + 'recommendation' => 'Automatic recommendation: %s', // TODO + ), 'cookie-duration' => array( 'help' => 'σε δευτερόλεπτα', 'number' => 'Διάρκεια παραμονής σε σύνδεση', diff --git a/app/i18n/en-us/admin.php b/app/i18n/en-us/admin.php index 14ac6a666..ffe417be6 100644 --- a/app/i18n/en-us/admin.php +++ b/app/i18n/en-us/admin.php @@ -159,6 +159,10 @@ return array( 'system' => array( '_' => 'System configuration', // IGNORE 'auto-update-url' => 'Auto-update server URL', // IGNORE + 'base-url' => array( + '_' => 'Base URL', // IGNORE + 'recommendation' => 'Automatic recommendation: %s', // IGNORE + ), 'cookie-duration' => array( 'help' => 'in seconds', // IGNORE 'number' => 'Duration to keep logged in', // IGNORE diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php index cc7686367..342674464 100644 --- a/app/i18n/en/admin.php +++ b/app/i18n/en/admin.php @@ -159,6 +159,10 @@ return array( 'system' => array( '_' => 'System configuration', 'auto-update-url' => 'Auto-update server URL', + 'base-url' => array( + '_' => 'Base URL', + 'recommendation' => 'Automatic recommendation: %s', + ), 'cookie-duration' => array( 'help' => 'in seconds', 'number' => 'Duration to keep logged in', diff --git a/app/i18n/es/admin.php b/app/i18n/es/admin.php index 9ddd9abcc..72e3ab601 100644 --- a/app/i18n/es/admin.php +++ b/app/i18n/es/admin.php @@ -159,6 +159,10 @@ return array( 'system' => array( '_' => 'Configuración del sistema', 'auto-update-url' => 'URL de auto-actualización', + 'base-url' => array( + '_' => 'Base URL', // TODO + 'recommendation' => 'Automatic recommendation: %s', // TODO + ), 'cookie-duration' => array( 'help' => 'en segundos', 'number' => 'Duración para mantenerse conectado', diff --git a/app/i18n/fa/admin.php b/app/i18n/fa/admin.php index e93b76988..f1925d678 100644 --- a/app/i18n/fa/admin.php +++ b/app/i18n/fa/admin.php @@ -159,6 +159,10 @@ return array( 'system' => array( '_' => ' پیکربندی سیستم', 'auto-update-url' => ' به روز رسانی خودکار URL سرور', + 'base-url' => array( + '_' => 'Base URL', // TODO + 'recommendation' => 'Automatic recommendation: %s', // TODO + ), 'cookie-duration' => array( 'help' => ' در ثانیه', 'number' => ' مدت زمان ورود به سیستم', diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php index 31bc7ebb4..86d4eaa59 100644 --- a/app/i18n/fr/admin.php +++ b/app/i18n/fr/admin.php @@ -159,6 +159,10 @@ return array( 'system' => array( '_' => 'Configuration du système', 'auto-update-url' => 'URL du service de mise à jour', + 'base-url' => array( + '_' => 'URL de la racine', + 'recommendation' => 'Recommandation automatique: %s', + ), 'cookie-duration' => array( 'help' => 'en secondes', 'number' => 'Durée avant expiration de la session', diff --git a/app/i18n/he/admin.php b/app/i18n/he/admin.php index b0c708da2..6b66b5c23 100644 --- a/app/i18n/he/admin.php +++ b/app/i18n/he/admin.php @@ -159,6 +159,10 @@ return array( 'system' => array( '_' => 'System configuration', // TODO 'auto-update-url' => 'Auto-update server URL', // TODO + 'base-url' => array( + '_' => 'Base URL', // TODO + 'recommendation' => 'Automatic recommendation: %s', // TODO + ), 'cookie-duration' => array( 'help' => 'in seconds', // TODO 'number' => 'Duration to keep logged in', // TODO diff --git a/app/i18n/hu/admin.php b/app/i18n/hu/admin.php index 4d52dc978..9f6e2236a 100755 --- a/app/i18n/hu/admin.php +++ b/app/i18n/hu/admin.php @@ -159,6 +159,10 @@ return array( 'system' => array( '_' => 'Rendszer konfiguráció', 'auto-update-url' => 'Szerver URL automata frissítése', + 'base-url' => array( + '_' => 'Base URL', // TODO + 'recommendation' => 'Automatic recommendation: %s', // TODO + ), 'cookie-duration' => array( 'help' => 'másodpercekben', 'number' => 'Bejelentkezési sütik megtartási ideje', diff --git a/app/i18n/id/admin.php b/app/i18n/id/admin.php index bdeaefc28..f0a7d57a5 100644 --- a/app/i18n/id/admin.php +++ b/app/i18n/id/admin.php @@ -159,6 +159,10 @@ return array( 'system' => array( '_' => 'Sistem konfigurasi', 'auto-update-url' => 'Auto-update server URL', // TODO + 'base-url' => array( + '_' => 'Base URL', // TODO + 'recommendation' => 'Automatic recommendation: %s', // TODO + ), 'cookie-duration' => array( 'help' => 'dalam hitungan detik', 'number' => 'Durasi untuk terus masuk', diff --git a/app/i18n/it/admin.php b/app/i18n/it/admin.php index ccaf5272c..33be96f62 100644 --- a/app/i18n/it/admin.php +++ b/app/i18n/it/admin.php @@ -159,6 +159,10 @@ return array( 'system' => array( '_' => 'Configurazione di sistema', 'auto-update-url' => 'Aggiorna automaticamente l’URL del server', + 'base-url' => array( + '_' => 'Base URL', // TODO + 'recommendation' => 'Automatic recommendation: %s', // TODO + ), 'cookie-duration' => array( 'help' => 'in secondi', 'number' => 'Tempo in cui rimanere loggati', diff --git a/app/i18n/ja/admin.php b/app/i18n/ja/admin.php index 61cfddbcd..ca564e4ef 100644 --- a/app/i18n/ja/admin.php +++ b/app/i18n/ja/admin.php @@ -159,6 +159,10 @@ return array( 'system' => array( '_' => 'システム設定', 'auto-update-url' => '自動アップグレードするサーバーのURL', + 'base-url' => array( + '_' => 'Base URL', // TODO + 'recommendation' => 'Automatic recommendation: %s', // TODO + ), 'cookie-duration' => array( 'help' => '秒', 'number' => 'ログを残す間隔', diff --git a/app/i18n/ko/admin.php b/app/i18n/ko/admin.php index 45b1a7a9e..1b5d9ec7d 100644 --- a/app/i18n/ko/admin.php +++ b/app/i18n/ko/admin.php @@ -159,6 +159,10 @@ return array( 'system' => array( '_' => '시스템 설정', 'auto-update-url' => '자동 업데이트 서버 URL', + 'base-url' => array( + '_' => 'Base URL', // TODO + 'recommendation' => 'Automatic recommendation: %s', // TODO + ), 'cookie-duration' => array( 'help' => '초', 'number' => '로그인 유지 시간', diff --git a/app/i18n/lv/admin.php b/app/i18n/lv/admin.php index 796ac3bb9..ba1f70816 100644 --- a/app/i18n/lv/admin.php +++ b/app/i18n/lv/admin.php @@ -159,6 +159,10 @@ return array( 'system' => array( '_' => 'Sistēmas konfigurācija', 'auto-update-url' => 'Automātiskās atjaunināšanas servera URL', + 'base-url' => array( + '_' => 'Base URL', // TODO + 'recommendation' => 'Automatic recommendation: %s', // TODO + ), 'cookie-duration' => array( 'help' => 'sekundēs', 'number' => 'Pieteikšanās ilgums', diff --git a/app/i18n/nl/admin.php b/app/i18n/nl/admin.php index 0ec89b0a9..6dc489fee 100644 --- a/app/i18n/nl/admin.php +++ b/app/i18n/nl/admin.php @@ -159,6 +159,10 @@ return array( 'system' => array( '_' => 'Systeem configuratie', 'auto-update-url' => 'Automatische update server URL', + 'base-url' => array( + '_' => 'Base URL', // TODO + 'recommendation' => 'Automatic recommendation: %s', // TODO + ), 'cookie-duration' => array( 'help' => 'in seconden', 'number' => 'Tijdsduur om ingelogd te blijven', diff --git a/app/i18n/oc/admin.php b/app/i18n/oc/admin.php index c0ee531e4..dee99a20b 100644 --- a/app/i18n/oc/admin.php +++ b/app/i18n/oc/admin.php @@ -159,6 +159,10 @@ return array( 'system' => array( '_' => 'Configuracion sistèma', 'auto-update-url' => 'URL del servici de mesa a jorn', + 'base-url' => array( + '_' => 'Base URL', // TODO + 'recommendation' => 'Automatic recommendation: %s', // TODO + ), 'cookie-duration' => array( 'help' => 'en segondas', 'number' => 'Durada de téner d’ésser connectat', diff --git a/app/i18n/pl/admin.php b/app/i18n/pl/admin.php index 847355d7d..a754afec0 100644 --- a/app/i18n/pl/admin.php +++ b/app/i18n/pl/admin.php @@ -159,6 +159,10 @@ return array( 'system' => array( '_' => 'Konfiguracja serwisu', 'auto-update-url' => 'Adres serwera automatycznej aktualizacji', + 'base-url' => array( + '_' => 'Base URL', // TODO + 'recommendation' => 'Automatic recommendation: %s', // TODO + ), 'cookie-duration' => array( 'help' => 'w sekundach', 'number' => 'Czas przez który użytkownik pozostanie zalogowany', diff --git a/app/i18n/pt-br/admin.php b/app/i18n/pt-br/admin.php index de9b0448f..d678672a4 100644 --- a/app/i18n/pt-br/admin.php +++ b/app/i18n/pt-br/admin.php @@ -159,6 +159,10 @@ return array( 'system' => array( '_' => 'Configuração do sistema', 'auto-update-url' => 'URL do servidor para atualização automática', + 'base-url' => array( + '_' => 'Base URL', // TODO + 'recommendation' => 'Automatic recommendation: %s', // TODO + ), 'cookie-duration' => array( 'help' => 'em segundos', 'number' => 'Manter seção ativa durante', diff --git a/app/i18n/ru/admin.php b/app/i18n/ru/admin.php index b14598526..8a3fe284f 100644 --- a/app/i18n/ru/admin.php +++ b/app/i18n/ru/admin.php @@ -159,6 +159,10 @@ return array( 'system' => array( '_' => 'Системные настройки', 'auto-update-url' => 'URL сервера для автоматического обновления', + 'base-url' => array( + '_' => 'Base URL', // TODO + 'recommendation' => 'Automatic recommendation: %s', // TODO + ), 'cookie-duration' => array( 'help' => 'в секундах', 'number' => 'Оставаться в системе на протяжении', diff --git a/app/i18n/sk/admin.php b/app/i18n/sk/admin.php index 614b826c2..d8273bae6 100644 --- a/app/i18n/sk/admin.php +++ b/app/i18n/sk/admin.php @@ -159,6 +159,10 @@ return array( 'system' => array( '_' => 'Nastavenia systému', 'auto-update-url' => 'Odkaz na aktualizačný server', + 'base-url' => array( + '_' => 'Base URL', // TODO + 'recommendation' => 'Automatic recommendation: %s', // TODO + ), 'cookie-duration' => array( 'help' => 'v sekundách', 'number' => 'Dobra, počas ktorej ste prihlásený', diff --git a/app/i18n/tr/admin.php b/app/i18n/tr/admin.php index cce628792..683fdca4c 100644 --- a/app/i18n/tr/admin.php +++ b/app/i18n/tr/admin.php @@ -159,6 +159,10 @@ return array( 'system' => array( '_' => 'Sistem yapılandırması', 'auto-update-url' => 'Otomatik güncelleme sunucu URL', + 'base-url' => array( + '_' => 'Base URL', // TODO + 'recommendation' => 'Automatic recommendation: %s', // TODO + ), 'cookie-duration' => array( 'help' => 'saniye', 'number' => 'Oturum açık kalma süresi', diff --git a/app/i18n/zh-cn/admin.php b/app/i18n/zh-cn/admin.php index e5a0c481c..11895b34e 100644 --- a/app/i18n/zh-cn/admin.php +++ b/app/i18n/zh-cn/admin.php @@ -159,6 +159,10 @@ return array( 'system' => array( '_' => '系统配置', 'auto-update-url' => '自动更新服务器 URL', + 'base-url' => array( + '_' => 'Base URL', // TODO + 'recommendation' => 'Automatic recommendation: %s', // TODO + ), 'cookie-duration' => array( 'help' => '单位：秒', 'number' => '保持登录的时长', diff --git a/app/i18n/zh-tw/admin.php b/app/i18n/zh-tw/admin.php index 2482f3968..68f64f56c 100644 --- a/app/i18n/zh-tw/admin.php +++ b/app/i18n/zh-tw/admin.php @@ -159,6 +159,10 @@ return array( 'system' => array( '_' => '系統配置', 'auto-update-url' => '自動升級伺服器地址', + 'base-url' => array( + '_' => 'Base URL', // TODO + 'recommendation' => 'Automatic recommendation: %s', // TODO + ), 'cookie-duration' => array( 'help' => '單位（秒）', 'number' => '保持登錄的時長', diff --git a/app/views/configure/system.phtml b/app/views/configure/system.phtml index 58879fc7e..fdd3d727e 100644 --- a/app/views/configure/system.phtml +++ b/app/views/configure/system.phtml @@ -21,6 +21,15 @@ +
+ +
+ +

+
+
+
diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php index bbe20b153..91635c4e0 100644 --- a/lib/Minz/Configuration.php +++ b/lib/Minz/Configuration.php @@ -2,7 +2,7 @@ /** * Manage configuration for the application. - * @property-read string $base_url + * @property string $base_url * @property array{'type':string,'host':string,'user':string,'password':string,'base':string,'prefix':string, * 'connection_uri_params':string,'pdo_options':array} $db * @property-read string $disable_update -- cgit v1.2.3