From eabce91540dacb467db5851b6fd206030561942e Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Sun, 10 Mar 2024 18:03:15 +0100 Subject: [PATCH] new: Allow user to accept to be contacted --- locales/fr_FR/LC_MESSAGES/main.mo | Bin 57032 -> 57628 bytes locales/fr_FR/LC_MESSAGES/main.po | 153 ++++++++++-------- src/Application.php | 2 + src/cli/Help.php | 1 + src/cli/Users.php | 11 +- src/controllers/Registrations.php | 12 +- src/controllers/Showcases.php | 2 + src/controllers/my/Preferences.php | 14 +- ...ion202403100001AddAcceptContactToUsers.php | 30 ++++ ...00002SetAutoloadModalToShowcaseContact.php | 28 ++++ src/models/User.php | 3 + src/schema.sql | 1 + src/views/my/preferences/edit.phtml | 13 ++ src/views/registrations/new.phtml | 12 ++ src/views/showcases/show_contact.phtml | 31 ++++ 15 files changed, 238 insertions(+), 75 deletions(-) create mode 100644 src/migrations/Migration202403100001AddAcceptContactToUsers.php create mode 100644 src/migrations/Migration202403100002SetAutoloadModalToShowcaseContact.php create mode 100644 src/views/showcases/show_contact.phtml diff --git a/locales/fr_FR/LC_MESSAGES/main.mo b/locales/fr_FR/LC_MESSAGES/main.mo index d803680b67084702478859945eae90fb906fddf8..65b73bbe2c708097c4156bd00f23d17bbe66bf3c 100644 GIT binary patch delta 12524 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 diff --git a/locales/fr_FR/LC_MESSAGES/main.po b/locales/fr_FR/LC_MESSAGES/main.po index 71876f37..afcc8b6c 100644 --- a/locales/fr_FR/LC_MESSAGES/main.po +++ b/locales/fr_FR/LC_MESSAGES/main.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: flusio\n" -"POT-Creation-Date: 2023-09-08 16:05+0200\n" -"PO-Revision-Date: 2023-09-08 16:06+0200\n" +"POT-Creation-Date: 2024-03-10 18:30+0100\n" +"PO-Revision-Date: 2024-03-10 18:31+0100\n" "Last-Translator: Marien Fressinaud \n" "Language-Team: \n" "Language: fr_FR\n" @@ -10,15 +10,15 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 3.3.2\n" +"X-Generator: Poedit 3.4.2\n" "X-Poedit-Basepath: ../../../src\n" "X-Poedit-KeywordsList: _f;_n:1,2;_nf:1,2;Translatable\n" "X-Poedit-SearchPath-0: .\n" #: assets/javascripts/controllers/back_button_controller.js:47 -#: views/_layouts/connected.phtml:221 -#: views/_layouts/connected_blocked.phtml:180 -#: views/_layouts/not_connected.phtml:147 +#: views/_layouts/connected.phtml:225 +#: views/_layouts/connected_blocked.phtml:184 +#: views/_layouts/not_connected.phtml:151 msgid "Back" msgstr "Retour" @@ -51,7 +51,7 @@ msgstr "Afficher" #: controllers/Links.php:270 controllers/Links.php:442 #: controllers/Mastodon.php:211 controllers/Mastodon.php:297 #: controllers/News.php:75 controllers/Passwords.php:89 -#: controllers/Passwords.php:192 controllers/Registrations.php:105 +#: controllers/Passwords.php:192 controllers/Registrations.php:103 #: controllers/Sessions.php:85 controllers/Support.php:70 #: controllers/collections/Filters.php:105 #: controllers/collections/Followers.php:49 @@ -61,7 +61,7 @@ msgstr "Afficher" #: controllers/collections/Shares.php:98 controllers/collections/Shares.php:211 #: controllers/links/Messages.php:84 controllers/links/Repairing.php:99 #: controllers/links/Searches.php:106 controllers/my/Account.php:111 -#: controllers/my/Preferences.php:78 controllers/my/Profile.php:73 +#: controllers/my/Preferences.php:82 controllers/my/Profile.php:73 #: controllers/my/Security.php:93 controllers/my/Security.php:209 #: controllers/my/Subscription.php:74 controllers/my/Validation.php:138 msgid "A security verification failed: you should retry to submit the form." @@ -77,7 +77,7 @@ msgstr "L’une des thématiques associées n’existe pas." #: controllers/Groups.php:161 controllers/Importations.php:48 #: controllers/Links.php:499 controllers/Mastodon.php:87 #: controllers/Messages.php:93 controllers/Messages.php:141 -#: controllers/Sessions.php:208 controllers/collections/Read.php:73 +#: controllers/Sessions.php:206 controllers/collections/Read.php:73 #: controllers/collections/Read.php:139 controllers/collections/Read.php:200 #: controllers/importations/Opml.php:79 controllers/importations/Pocket.php:110 #: controllers/importations/Pocket.php:157 @@ -136,7 +136,7 @@ msgid "The token has expired, you should reset your password again." msgstr "" "Le token a expiré, vous devez de nouveau réinitialiser votre mot de passe." -#: controllers/Registrations.php:118 +#: controllers/Registrations.php:116 msgid "You must accept the terms of service." msgstr "Vous devez accepter les conditions générales d’utilisation." @@ -307,7 +307,7 @@ msgid "Links never to read" msgstr "Liens à ne jamais lire" #: models/Collection.php:153 models/Collection.php:186 -#: views/_layouts/connected.phtml:82 views/news/index.phtml:3 +#: views/_layouts/connected.phtml:86 views/news/index.phtml:3 #: views/news/index.phtml:16 msgid "News" msgstr "Journal" @@ -530,128 +530,128 @@ msgstr "Commentaires sur %s" msgid "Error: " msgstr "Erreur : " -#: views/_layouts/connected.phtml:43 views/_layouts/connected_blocked.phtml:39 -#: views/_layouts/not_connected.phtml:57 views/_layouts/onboarding.phtml:39 +#: views/_layouts/connected.phtml:47 views/_layouts/connected_blocked.phtml:43 +#: views/_layouts/not_connected.phtml:61 views/_layouts/onboarding.phtml:43 msgid "Skip to main content" msgstr "Accéder au contenu principal" -#: views/_layouts/connected.phtml:50 views/_layouts/connected_blocked.phtml:46 -#: views/_layouts/not_connected.phtml:64 views/_layouts/onboarding.phtml:46 +#: views/_layouts/connected.phtml:54 views/_layouts/connected_blocked.phtml:50 +#: views/_layouts/not_connected.phtml:68 views/_layouts/onboarding.phtml:50 #, php-format msgid "You need to activate JavaScript in order to use %s." msgstr "Vous devez activer JavaScript pour utiliser %s." -#: views/_layouts/connected.phtml:58 views/_layouts/connected_blocked.phtml:54 -#: views/_layouts/not_connected.phtml:72 +#: views/_layouts/connected.phtml:62 views/_layouts/connected_blocked.phtml:58 +#: views/_layouts/not_connected.phtml:76 #, php-format msgid "You’re using a demo version of %s, the data are reset every night." msgstr "" "Vous utilisez une version de démo de %s, les données sont réinitialisées " "chaque nuit." -#: views/_layouts/connected.phtml:66 views/_layouts/connected_blocked.phtml:62 +#: views/_layouts/connected.phtml:70 views/_layouts/connected_blocked.phtml:66 msgid "You must validate your account →" msgstr "Vous devez valider votre compte →" -#: views/_layouts/connected.phtml:93 views/links/index.phtml:3 +#: views/_layouts/connected.phtml:97 views/links/index.phtml:3 #: views/links/index.phtml:19 msgid "My links" msgstr "Mes liens" -#: views/_layouts/connected.phtml:104 views/feeds/index.phtml:3 +#: views/_layouts/connected.phtml:108 views/feeds/index.phtml:3 #: views/feeds/index.phtml:15 msgid "Feeds" msgstr "Flux" -#: views/_layouts/connected.phtml:117 views/collections/_selector.phtml:83 +#: views/_layouts/connected.phtml:121 views/collections/_selector.phtml:83 #: views/collections/groups/edit.phtml:88 views/links/searches/show.phtml:9 #: views/links/searches/show.phtml:21 msgid "New" msgstr "Nouveau" -#: views/_layouts/connected.phtml:126 views/_layouts/connected.phtml:129 -#: views/_layouts/connected_blocked.phtml:85 -#: views/_layouts/connected_blocked.phtml:88 +#: views/_layouts/connected.phtml:130 views/_layouts/connected.phtml:133 +#: views/_layouts/connected_blocked.phtml:89 +#: views/_layouts/connected_blocked.phtml:92 #, php-format msgid "Menu of %s" msgstr "Menu de %s" -#: views/_layouts/connected.phtml:147 -#: views/_layouts/connected_blocked.phtml:106 views/my/profile/edit.phtml:3 +#: views/_layouts/connected.phtml:151 +#: views/_layouts/connected_blocked.phtml:110 views/my/profile/edit.phtml:3 #: views/my/profile/edit.phtml:14 msgid "Profile" msgstr "Profil" -#: views/_layouts/connected.phtml:157 -#: views/_layouts/connected_blocked.phtml:116 views/my/preferences/edit.phtml:3 +#: views/_layouts/connected.phtml:161 +#: views/_layouts/connected_blocked.phtml:120 views/my/preferences/edit.phtml:3 #: views/my/preferences/edit.phtml:12 msgid "Preferences" msgstr "Préférences" -#: views/_layouts/connected.phtml:167 -#: views/_layouts/connected_blocked.phtml:126 views/my/account/show.phtml:3 +#: views/_layouts/connected.phtml:171 +#: views/_layouts/connected_blocked.phtml:130 views/my/account/show.phtml:3 #: views/my/account/show.phtml:11 msgid "Account & data" msgstr "Compte & données" -#: views/_layouts/connected.phtml:179 -#: views/_layouts/connected_blocked.phtml:138 views/pages/addons.phtml:3 +#: views/_layouts/connected.phtml:183 +#: views/_layouts/connected_blocked.phtml:142 views/pages/addons.phtml:3 #: views/pages/addons.phtml:11 msgid "Add-ons" msgstr "Extensions" -#: views/_layouts/connected.phtml:189 -#: views/_layouts/connected_blocked.phtml:148 views/support/show.phtml:3 +#: views/_layouts/connected.phtml:193 +#: views/_layouts/connected_blocked.phtml:152 views/support/show.phtml:3 #: views/support/show.phtml:12 msgid "Help & support" msgstr "Aide & support" -#: views/_layouts/connected.phtml:198 -#: views/_layouts/connected_blocked.phtml:157 +#: views/_layouts/connected.phtml:202 +#: views/_layouts/connected_blocked.phtml:161 msgid "Log out" msgstr "Se déconnecter" -#: views/_layouts/connected.phtml:232 views/_layouts/connected.phtml:233 +#: views/_layouts/connected.phtml:236 views/_layouts/connected.phtml:237 msgid "Search links by words or URL" msgstr "Rechercher des liens par mots ou URL" -#: views/_layouts/connected.phtml:241 views/links/searches/show.phtml:47 +#: views/_layouts/connected.phtml:245 views/links/searches/show.phtml:47 #: views/links/searches/show.phtml:63 msgid "Search" msgstr "Rechercher" -#: views/_layouts/error.phtml:18 +#: views/_layouts/error.phtml:22 msgid "Oh no 😟" msgstr "Oh non 😟" -#: views/_layouts/not_connected.phtml:92 views/registrations/new.phtml:160 +#: views/_layouts/not_connected.phtml:96 views/registrations/new.phtml:172 msgid "Sign up" msgstr "S’inscrire" -#: views/_layouts/not_connected.phtml:96 views/sessions/new.phtml:97 +#: views/_layouts/not_connected.phtml:100 views/sessions/new.phtml:97 msgid "Login" msgstr "Se connecter" -#: views/_layouts/not_connected.phtml:110 views/onboarding/step1.phtml:26 +#: views/_layouts/not_connected.phtml:114 views/onboarding/step1.phtml:26 msgid "Choose your language" msgstr "Choisissez votre langue" -#: views/_layouts/not_connected.phtml:160 views/pages/about.phtml:3 +#: views/_layouts/not_connected.phtml:164 views/pages/about.phtml:3 #: views/pages/about.phtml:11 views/support/show.phtml:115 #, php-format msgid "About %s" msgstr "À propos de %s" -#: views/_layouts/onboarding.phtml:65 +#: views/_layouts/onboarding.phtml:69 #, php-format msgid "Step %d on %d" msgstr "Étape %d sur %d" -#: views/_layouts/onboarding.phtml:67 +#: views/_layouts/onboarding.phtml:71 msgid "skip" msgstr "passer" -#: views/_layouts/onboarding.phtml:69 +#: views/_layouts/onboarding.phtml:73 msgid "finished" msgstr "terminé" @@ -691,7 +691,7 @@ msgstr "Page suivante" #: views/my/security/show.phtml:41 views/my/security/show.phtml:81 #: views/passwords/edit.phtml:58 views/passwords/forgot.phtml:48 #: views/registrations/new.phtml:51 views/registrations/new.phtml:76 -#: views/registrations/new.phtml:122 views/registrations/new.phtml:134 +#: views/registrations/new.phtml:122 views/registrations/new.phtml:146 #: views/sessions/new.phtml:49 views/sessions/new.phtml:88 #: views/support/show.phtml:51 views/support/show.phtml:75 msgid "Error" @@ -844,7 +844,7 @@ msgstr "Afficher la collection publiquement" #: views/collections/edit.phtml:132 views/collections/filters/edit.phtml:90 #: views/collections/groups/edit.phtml:105 views/groups/edit.phtml:53 #: views/links/edit.phtml:82 views/mastodon/show.phtml:86 -#: views/messages/edit.phtml:53 views/my/preferences/edit.phtml:86 +#: views/messages/edit.phtml:53 views/my/preferences/edit.phtml:99 #: views/my/profile/edit.phtml:101 views/my/security/show.phtml:94 msgid "Save changes" msgstr "Enregistrer les modifications" @@ -1966,11 +1966,17 @@ msgstr "" "En mode compact, vous voyez plus de liens en un coup d’œil, mais vous " "pourriez vous sentir submergé par la quantité d’informations." -#: views/my/preferences/edit.phtml:76 +#: views/my/preferences/edit.phtml:75 views/registrations/new.phtml:137 +msgid "Accept to be contacted by email to help improve the service (optional)." +msgstr "" +"Accepter d’être contacté‧e par courriel pour aider à améliorer le service " +"(facultatif)." + +#: views/my/preferences/edit.phtml:89 msgid "Enable beta features" msgstr "Activer les fonctionnalités bêta" -#: views/my/preferences/edit.phtml:80 +#: views/my/preferences/edit.phtml:93 msgid "" "With beta features you test some features before everyone else, but you " "enter a turbulent zone." @@ -2624,7 +2630,7 @@ msgstr "" msgid "And a password" msgstr "Et un mot de passe" -#: views/registrations/new.phtml:140 +#: views/registrations/new.phtml:152 #, php-format msgid "" "Before going any further, please read the " @@ -2634,11 +2640,11 @@ msgstr "" "target=\"_blank\">les conditions générales d’utilisation pour vous " "assurer que celles-ci vous conviennent." -#: views/registrations/new.phtml:153 +#: views/registrations/new.phtml:165 msgid "Accept the terms of service" msgstr "Accepter les conditions générales d’utilisation" -#: views/registrations/new.phtml:167 +#: views/registrations/new.phtml:179 msgid "Already an account?" msgstr "Déjà un compte ?" @@ -2662,15 +2668,34 @@ msgstr "Mot de passe oublié ?" msgid "No account yet?" msgstr "Pas encore de compte ?" -#: views/showcases/show_link.phtml:3 views/showcases/show_link.phtml:10 +#: views/showcases/show_contact.phtml:3 views/showcases/show_contact.phtml:11 +msgid "You can help to improve the service" +msgstr "Vous pouvez aider à améliorer le service" + +#: views/showcases/show_contact.phtml:15 +#, php-format +msgid "To help us improve %s, you can now accept to be contacted by email." +msgstr "" +"Afin de nous aider à améliorer %s, vous pouvez désormais accepter d’être " +"contacté par courriel." + +#: views/showcases/show_contact.phtml:20 +msgid "Go to your preferences" +msgstr "Rendez-vous dans vos préférences" + +#: views/showcases/show_contact.phtml:27 +msgid "No thanks!" +msgstr "Non merci !" + +#: views/showcases/show_link.phtml:3 views/showcases/show_link.phtml:11 msgid "Links have been improved" msgstr "Les liens ont été améliorés" -#: views/showcases/show_link.phtml:14 views/showcases/show_navigation.phtml:14 +#: views/showcases/show_link.phtml:15 views/showcases/show_navigation.phtml:15 msgid "Something has changed!" msgstr "Quelque chose a changé !" -#: views/showcases/show_link.phtml:18 +#: views/showcases/show_link.phtml:19 msgid "" "The link interface is now more consistent and practical. " "You can mark a link as read, or add it to your bookmarks in one click. The " @@ -2682,7 +2707,7 @@ msgstr "" "un clic. Le lien « lire » a été enlevé, mais ne vous inquiétez pas : vous " "pouvez toujours cliquer sur les titres pour lire vos liens !" -#: views/showcases/show_link.phtml:23 +#: views/showcases/show_link.phtml:24 msgid "" "The screenshot of a link card. The actions at its bottom allow to mark as " "read, add to bookmarks and store the link." @@ -2690,12 +2715,12 @@ msgstr "" "La capture d’écran d’un lien. Les actions en-dessous du lien permettent de " "le marquer comme lu, de l’ajouter aux signets et de le ranger." -#: views/showcases/show_link.phtml:28 +#: views/showcases/show_link.phtml:29 msgid "The look of the links on mobile has also been improved to save space." msgstr "" "Les liens ont également été améliorés sur mobile pour gagner de la place." -#: views/showcases/show_link.phtml:32 views/showcases/show_navigation.phtml:32 +#: views/showcases/show_link.phtml:33 views/showcases/show_navigation.phtml:33 msgid "" "Don’t hesitate to give feedback from the “Help & support” " "menu!" @@ -2703,16 +2728,16 @@ msgstr "" "N’hésitez pas à faire des retours depuis le menu « Aide & " "support » !" -#: views/showcases/show_link.phtml:38 views/showcases/show_navigation.phtml:38 +#: views/showcases/show_link.phtml:39 views/showcases/show_navigation.phtml:39 msgid "Got it!" msgstr "C’est noté !" #: views/showcases/show_navigation.phtml:3 -#: views/showcases/show_navigation.phtml:10 +#: views/showcases/show_navigation.phtml:11 msgid "A new navigation is available" msgstr "Une nouvelle navigation est disponible" -#: views/showcases/show_navigation.phtml:18 +#: views/showcases/show_navigation.phtml:19 msgid "" "The navigation has been revised to make it more intuitive. " "The things you own are now separated from the things you follow." @@ -2721,12 +2746,12 @@ msgstr "" "Les choses que vous possédez sont désormais séparées des choses que vous " "suivez." -#: views/showcases/show_navigation.phtml:23 +#: views/showcases/show_navigation.phtml:24 msgid "The navigation bar showing three tabs: News, My links and Feeds" msgstr "" "La barre de navigation qui montre trois onglets : Journal, Mes liens et Flux" -#: views/showcases/show_navigation.phtml:28 +#: views/showcases/show_navigation.phtml:29 msgid "" "Your bookmarks, read links and your own collections are now under the “My " "links” tab. Followed collections and feeds are only one concept and can be " diff --git a/src/Application.php b/src/Application.php index 852ccb07..1718194c 100644 --- a/src/Application.php +++ b/src/Application.php @@ -132,6 +132,8 @@ public function run(\Minz\Request $request): mixed $autoload_modal_url = \Minz\Url::for('showcase', ['id' => 'navigation']); } elseif ($current_user->autoload_modal === 'showcase link') { $autoload_modal_url = \Minz\Url::for('showcase', ['id' => 'link']); + } elseif ($current_user->autoload_modal === 'showcase contact') { + $autoload_modal_url = \Minz\Url::for('showcase', ['id' => 'contact']); } // Force CSRF token to avoid weird issues when user did nothing for a while diff --git a/src/cli/Help.php b/src/cli/Help.php index 81a1ff2f..f1da9aa5 100644 --- a/src/cli/Help.php +++ b/src/cli/Help.php @@ -92,6 +92,7 @@ public function show(): Response $usage .= " --url=TEXT where TEXT is an external URL\n"; $usage .= "\n"; $usage .= " users List all the users\n"; + $usage .= " [--to-contact=BOOL] list only the users who accepted to be contacted (default: false)\n"; $usage .= " users create Create a user\n"; $usage .= " --email=EMAIL\n"; $usage .= " --password=PASSWORD\n"; diff --git a/src/cli/Users.php b/src/cli/Users.php index 0ef7b706..5ee96f80 100644 --- a/src/cli/Users.php +++ b/src/cli/Users.php @@ -19,11 +19,20 @@ class Users /** * List all the users ordered by created_at. * + * @request_param bool to-contact + * * @response 200 */ public function index(Request $request): Response { - $users = models\User::listAll(); + $to_contact = $request->paramBoolean('to-contact'); + + if ($to_contact) { + $users = models\User::listBy(['accept_contact' => true]); + } else { + $users = models\User::listAll(); + } + usort($users, function ($user1, $user2) { if ($user1->created_at == $user2->created_at) { return 0; diff --git a/src/controllers/Registrations.php b/src/controllers/Registrations.php index 365ecd6f..4af0cf70 100644 --- a/src/controllers/Registrations.php +++ b/src/controllers/Registrations.php @@ -59,7 +59,8 @@ public function new(): Response * @request_param string email * @request_param string username * @request_param string password - * @request_param string accept_terms + * @request_param bool accept_terms + * @request_param bool accept_contact * * @response 302 / if already connected * @response 302 /login if registrations are closed @@ -68,10 +69,6 @@ public function new(): Response * @response 400 if the service has terms of service and accept_terms is false * @response 400 if email already exists * @response 302 /onboarding - * - * @param \Minz\Request $request - * - * @return \Minz\Response */ public function create(Request $request): Response { @@ -91,7 +88,8 @@ public function create(Request $request): Response $username = $request->param('username', ''); $email = $request->param('email', ''); $password = $request->param('password', ''); - $accept_terms = $request->param('accept_terms', false); + $accept_terms = $request->paramBoolean('accept_terms'); + $accept_contact = $request->paramBoolean('accept_contact'); $csrf = $request->param('csrf', ''); if (!\Minz\Csrf::validate($csrf)) { @@ -134,6 +132,8 @@ public function create(Request $request): Response ]); } + $user->accept_contact = $accept_contact; + // Initialize the validation token $validation_token = new models\Token(1, 'day', 16); $validation_token->save(); diff --git a/src/controllers/Showcases.php b/src/controllers/Showcases.php index 4000973a..afabebfb 100644 --- a/src/controllers/Showcases.php +++ b/src/controllers/Showcases.php @@ -29,6 +29,8 @@ public function show(Request $request): Response return Response::ok('showcases/show_navigation.phtml'); } elseif ($id === 'link') { return Response::ok('showcases/show_link.phtml'); + } elseif ($id === 'contact') { + return Response::ok('showcases/show_contact.phtml'); } else { return Response::notFound('not_found.phtml'); } diff --git a/src/controllers/my/Preferences.php b/src/controllers/my/Preferences.php index 634deffb..cd2e8e55 100644 --- a/src/controllers/my/Preferences.php +++ b/src/controllers/my/Preferences.php @@ -34,6 +34,7 @@ public function edit(Request $request): Response return Response::ok('my/preferences/edit.phtml', [ 'locale' => $user->locale, 'option_compact_mode' => $user->option_compact_mode, + 'accept_contact' => $user->accept_contact, // Don't name it "beta_enabled" because there's already a global // view variable named like this. 'is_beta_enabled' => models\FeatureFlag::isEnabled('beta', $user->id), @@ -45,8 +46,9 @@ public function edit(Request $request): Response * * @request_param string csrf * @request_param string locale - * @request_param boolean option_compact_mode - * @request_param boolean beta_enabled + * @request_param bool option_compact_mode + * @request_param bool accept_contact + * @request_param bool beta_enabled * @request_param string from * * @response 302 /login?redirect_to=:from @@ -59,8 +61,9 @@ public function edit(Request $request): Response public function update(Request $request): Response { $locale = $request->param('locale', ''); - $option_compact_mode = $request->paramBoolean('option_compact_mode', false); - $beta_enabled = $request->paramBoolean('beta_enabled', false); + $option_compact_mode = $request->paramBoolean('option_compact_mode'); + $accept_contact = $request->paramBoolean('accept_contact'); + $beta_enabled = $request->paramBoolean('beta_enabled'); $csrf = $request->param('csrf', ''); $from = $request->param('from', ''); @@ -73,6 +76,7 @@ public function update(Request $request): Response return Response::badRequest('my/preferences/edit.phtml', [ 'locale' => $locale, 'option_compact_mode' => $option_compact_mode, + 'accept_contact' => $accept_contact, 'is_beta_enabled' => $beta_enabled, 'from' => $from, 'error' => _('A security verification failed: you should retry to submit the form.'), @@ -82,6 +86,7 @@ public function update(Request $request): Response $old_locale = $user->locale; $user->locale = trim($locale); $user->option_compact_mode = $option_compact_mode; + $user->accept_contact = $accept_contact; $errors = $user->validate(); if ($errors) { @@ -89,6 +94,7 @@ public function update(Request $request): Response return Response::badRequest('my/preferences/edit.phtml', [ 'locale' => $locale, 'option_compact_mode' => $option_compact_mode, + 'accept_contact' => $accept_contact, 'is_beta_enabled' => $beta_enabled, 'from' => $from, 'errors' => $errors, diff --git a/src/migrations/Migration202403100001AddAcceptContactToUsers.php b/src/migrations/Migration202403100001AddAcceptContactToUsers.php new file mode 100644 index 00000000..3a00f097 --- /dev/null +++ b/src/migrations/Migration202403100001AddAcceptContactToUsers.php @@ -0,0 +1,30 @@ +exec(<<<'SQL' + ALTER TABLE users + ADD COLUMN accept_contact BOOLEAN NOT NULL DEFAULT false; + SQL); + + return true; + } + + public function rollback(): bool + { + $database = \Minz\Database::get(); + + $database->exec(<<<'SQL' + ALTER TABLE users + DROP COLUMN accept_contact; + SQL); + + return true; + } +} diff --git a/src/migrations/Migration202403100002SetAutoloadModalToShowcaseContact.php b/src/migrations/Migration202403100002SetAutoloadModalToShowcaseContact.php new file mode 100644 index 00000000..8b35a061 --- /dev/null +++ b/src/migrations/Migration202403100002SetAutoloadModalToShowcaseContact.php @@ -0,0 +1,28 @@ +exec(<<<'SQL' + UPDATE users SET autoload_modal = 'showcase contact'; + SQL); + + return true; + } + + public function rollback(): bool + { + $database = \Minz\Database::get(); + + $database->exec(<<<'SQL' + UPDATE users SET autoload_modal = ''; + SQL); + + return true; + } +} diff --git a/src/models/User.php b/src/models/User.php index 30d52305..475c18f4 100644 --- a/src/models/User.php +++ b/src/models/User.php @@ -91,6 +91,9 @@ class User #[Database\Column] public bool $option_compact_mode; + #[Database\Column] + public bool $accept_contact; + public function __construct(string $username, string $email, string $password) { $this->id = \Minz\Random::timebased(); diff --git a/src/schema.sql b/src/schema.sql index 3294a957..6eb9879f 100644 --- a/src/schema.sql +++ b/src/schema.sql @@ -38,6 +38,7 @@ CREATE TABLE users ( csrf TEXT NOT NULL DEFAULT '', autoload_modal TEXT NOT NULL DEFAULT '', option_compact_mode BOOLEAN NOT NULL DEFAULT false, + accept_contact BOOLEAN NOT NULL DEFAULT false, validated_at TIMESTAMPTZ, validation_token TEXT REFERENCES tokens ON DELETE SET NULL ON UPDATE CASCADE, diff --git a/src/views/my/preferences/edit.phtml b/src/views/my/preferences/edit.phtml index 98a8652f..f827fe9e 100644 --- a/src/views/my/preferences/edit.phtml +++ b/src/views/my/preferences/edit.phtml @@ -63,6 +63,19 @@

+
+ + /> + + +
+
+
+ + + +
+
diff --git a/src/views/showcases/show_contact.phtml b/src/views/showcases/show_contact.phtml new file mode 100644 index 00000000..96a0b689 --- /dev/null +++ b/src/views/showcases/show_contact.phtml @@ -0,0 +1,31 @@ +layout('base.phtml', [ + 'title' => _('You can help to improve the service'), + 'canonical' => url_full('showcase', ['id' => 'contact']), + 'modal_enabled' => true, + ]); +?> + +
+
+

+
+ +

+ +

+ +

+ + + +

+ +
+
+ +
+
+