From b8785cf56ab102f08272a3e623b23aec01b7b6b5 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Thu, 11 Apr 2019 11:58:57 +0200
Subject: [PATCH] FEAT #8805 User lang
---
sql/structure.sql | 2 +-
src/app/user/controllers/UserController.php | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/sql/structure.sql b/sql/structure.sql
index f0deb42b9b..8e1d90e32b 100755
--- a/sql/structure.sql
+++ b/sql/structure.sql
@@ -226,7 +226,7 @@ CREATE TABLE users
picture text,
enabled boolean DEFAULT TRUE,
mode character varying(50) NOT NULL,
- preferences jsonb NOT NULL DEFAULT '{"writingMode" : "direct", "writingSize" : 1, "writingColor" : "#000000", "notifications" : true}',
+ preferences jsonb NOT NULL DEFAULT '{"lang" : "fr", "writingMode" : "direct", "writingSize" : 1, "writingColor" : "#000000", "notifications" : true}',
cookie_key character varying(255) DEFAULT NULL::character varying,
cookie_date timestamp without time zone,
password_modification_date timestamp without time zone DEFAULT CURRENT_TIMESTAMP,
diff --git a/src/app/user/controllers/UserController.php b/src/app/user/controllers/UserController.php
index 5aa8b5779b..734074eb9a 100755
--- a/src/app/user/controllers/UserController.php
+++ b/src/app/user/controllers/UserController.php
@@ -132,6 +132,7 @@ class UserController
}
$check = Validator::arrayType()->notEmpty()->validate($body['preferences']);
+ $check = $check && Validator::stringType()->notEmpty()->validate($body['preferences']['lang']) && in_array($body['preferences']['lang'], ['fr', 'en']);
$check = $check && Validator::stringType()->notEmpty()->validate($body['preferences']['writingMode']);
$check = $check && Validator::intType()->notEmpty()->validate($body['preferences']['writingSize']);
$check = $check && Validator::stringType()->notEmpty()->validate($body['preferences']['writingColor']);
@@ -362,7 +363,7 @@ class UserController
$user['picture'] = 'data:image/png;base64,' . $user['picture'];
}
- $user['preferences'] = (array)json_decode($user['preferences']);
+ $user['preferences'] = json_decode($user['preferences'], true);
$user['canManageRestUsers'] = UserController::hasPrivilege(['userId' => $args['id'], 'privilege' => 'manage_rest_users']);
return $user;
--
GitLab