From 18c7cb019da160526ca3efe163290109a3773ed3 Mon Sep 17 00:00:00 2001 From: osaajani Date: Thu, 14 Nov 2019 23:09:56 +0100 Subject: [PATCH] revert unwanted change to publics/User, fix errors phone & Settings --- controllers/internals/Phone.php | 18 +++++++++++++++--- controllers/internals/Setting.php | 4 ++-- controllers/publics/Phone.php | 4 ++-- controllers/publics/Setting.php | 2 +- controllers/publics/User.php | 6 +++--- models/Phone.php | 11 +++++++++++ models/Setting.php | 13 +++++++++++++ 7 files changed, 47 insertions(+), 11 deletions(-) diff --git a/controllers/internals/Phone.php b/controllers/internals/Phone.php index 59b676c..b087b43 100755 --- a/controllers/internals/Phone.php +++ b/controllers/internals/Phone.php @@ -24,6 +24,18 @@ namespace controllers\internals; $this->model = $this->model ?? new \models\Phone($this->bdd); return $this->model; } + + + /** + * Return a phone by his number + * @param string $number : Phone number + * @return array + */ + public function get_by_number(string $number) + { + return $this->get_model()->get_by_number($number); + } + /** * Return a phone for a user by a number @@ -33,7 +45,7 @@ namespace controllers\internals; */ public function get_by_number_and_user(int $id_user, string $number) { - return $this->model_phone->get_by_number_and_user($id_user, $number); + return $this->get_model()->get_by_number_and_user($id_user, $number); } @@ -54,7 +66,7 @@ namespace controllers\internals; 'adapter_datas' => $adapter_datas, ]; - return (bool) $this->model_phone->insert($phone); + return (bool) $this->get_model()->insert($phone); } @@ -76,6 +88,6 @@ namespace controllers\internals; 'adapter_datas' => json_encode($adapter_datas), ]; - return (bool) $this->model_phone->update_for_user($id_user, $id, $phone); + return (bool) $this->get_model()->update_for_user($id_user, $id, $phone); } } diff --git a/controllers/internals/Setting.php b/controllers/internals/Setting.php index 81d6075..cf234eb 100755 --- a/controllers/internals/Setting.php +++ b/controllers/internals/Setting.php @@ -54,9 +54,9 @@ namespace controllers\internals; */ public function update_for_user (int $id_user, string $name, $value) : bool { - return (bool) $this->get_model()->update($id_user, $name, $value); + return (bool) $this->get_model()->update_by_name_for_user($id_user, $name, $value); } - + /** * Create a new setting diff --git a/controllers/publics/Phone.php b/controllers/publics/Phone.php index c30bdff..e492572 100755 --- a/controllers/publics/Phone.php +++ b/controllers/publics/Phone.php @@ -37,7 +37,7 @@ class Phone extends \descartes\Controller { $id_user = $_SESSION['user']['id']; $page = (int) $page; - $phones = $this->internal_phone->list_for_user($_SESSION['user']['id']$id_user, 25, $page); + $phones = $this->internal_phone->list_for_user($id_user, 25, $page); $adapters = []; $adapters_metas = $this->internal_adapter->list_adapters(); @@ -163,7 +163,7 @@ class Phone extends \descartes\Controller } - $success = $this->internal_phone->create($_SESSION['user']['id'], $id_user, $number, $adapter, $adapter_datas); + $success = $this->internal_phone->create($id_user, $number, $adapter, $adapter_datas); if (!$success) { \FlashMessage\FlashMessage::push('danger', 'Impossible de créer ce téléphone.'); diff --git a/controllers/publics/Setting.php b/controllers/publics/Setting.php index 4a6f62f..04f5d1f 100755 --- a/controllers/publics/Setting.php +++ b/controllers/publics/Setting.php @@ -60,7 +60,7 @@ namespace controllers\publics; return $this->redirect(\descartes\Router::url('Setting', 'show')); } - $update_setting_result = $this->internal_setting->update_for_user($_SESSION['user']['id'], $_SESSION['user']['id'], $setting_name, $setting_value); + $update_setting_result = $this->internal_setting->update_for_user($_SESSION['user']['id'], $setting_name, $setting_value); if (false === $update_setting_result) { \FlashMessage\FlashMessage::push('danger', 'Impossible de mettre à jour ce réglage.'); diff --git a/controllers/publics/User.php b/controllers/publics/User.php index 750b7d6..72d0d7c 100755 --- a/controllers/publics/User.php +++ b/controllers/publics/User.php @@ -40,7 +40,7 @@ class User extends \descartes\Controller public function list($page = 0) { $page = (int) $page; - $users = $this->internal_user->list_for_user($_SESSION['user']['id'], 25, $page); + $users = $this->internal_user->list(25, $page); $this->render('user/list', ['users' => $users]); } @@ -71,7 +71,7 @@ class User extends \descartes\Controller $ids = $_GET['ids'] ?? []; foreach ($ids as $id) { - $this->internal_user->delete_for_user($_SESSION['user']['id'], $id); + $this->internal_user->delete($id); } return $this->redirect(\descartes\Router::url('User', 'list')); @@ -122,7 +122,7 @@ class User extends \descartes\Controller return $this->redirect(\descartes\Router::url('User', 'add')); } - $user_id = $this->internal_user->create($_SESSION['user']['id'], $email, $password, $admin); + $user_id = $this->internal_user->create($email, $password, $admin); if (!$user_id) { \FlashMessage\FlashMessage::push('danger', 'Impossible de créer ce user.'); diff --git a/models/Phone.php b/models/Phone.php index 5ac9b94..2078ea0 100755 --- a/models/Phone.php +++ b/models/Phone.php @@ -30,4 +30,15 @@ namespace models; { return $this->_select_one('phone', ['number' => $number, 'id_user' => $id_user]); } + + + /** + * Return a phone by his number + * @param string $number : phone number + * @return array + */ + public function get_by_number (string $number) + { + return $this->_select_one('phone', ['number' => $number]); + } } diff --git a/models/Setting.php b/models/Setting.php index 8ee63f7..0883981 100755 --- a/models/Setting.php +++ b/models/Setting.php @@ -18,4 +18,17 @@ namespace models; * @return string */ protected function get_table_name() : string { return 'setting'; } + + + /** + * Update a setting for a user by his name + * @param int $id_user : user id + * @param string $name : setting name + * @param mixed $value : new value of the setting + * @return int : number of modified settings + */ + public function update_by_name_for_user(int $id_user, string $name, $value) + { + return $this->_update($this->get_table_name(), ['value' => $value], ['id_user' => $id_user, 'name' => $name]); + } }