From 6a4dda9bdef81bcf79abe5601fd7309e593078f3 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sat, 16 Jan 2010 21:15:12 -0800 Subject: Convert Admin_Users_Controller, User_Model and Group_Model to use model based validation. --- modules/user/controllers/users.php | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'modules/user/controllers/users.php') diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php index ca218393..71f9a889 100644 --- a/modules/user/controllers/users.php +++ b/modules/user/controllers/users.php @@ -95,14 +95,13 @@ class Users_Controller extends Controller { foreach ($locales as $locale => $display_name) { $locales[$locale] = SafeString::of_safe_html($display_name); } - if (count($locales) > 1) { - // Put "none" at the first position in the array - $locales = array_merge(array("" => t("« none »")), $locales); - $selected_locale = ($user && $user->locale) ? $user->locale : ""; - $form->dropdown("locale") - ->label(t("Language Preference")) - ->options($locales) - ->selected($selected_locale); - } + + // Put "none" at the first position in the array + $locales = array_merge(array("" => t("« none »")), $locales); + $selected_locale = ($user && $user->locale) ? $user->locale : ""; + $form->dropdown("locale") + ->label(t("Language Preference")) + ->options($locales) + ->selected($selected_locale); } } -- cgit v1.2.3 From 4a2d5bc9e234cc7e81e47131e8d8755919b773fc Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sat, 16 Jan 2010 21:24:18 -0800 Subject: Convert Users_Controller to model based validation. --- modules/user/controllers/users.php | 41 ++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 22 deletions(-) (limited to 'modules/user/controllers/users.php') diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php index 71f9a889..b3f39b47 100644 --- a/modules/user/controllers/users.php +++ b/modules/user/controllers/users.php @@ -26,34 +26,36 @@ class Users_Controller extends Controller { } $form = $this->_get_edit_form($user); - $valid = $form->validate(); - if ($valid) { + try { + $valid = $form->validate(); $user->full_name = $form->edit_user->full_name->value; - if ($form->edit_user->password->value) { - $user->password = $form->edit_user->password->value; - } + $user->password = $form->edit_user->password->value; $user->email = $form->edit_user->email->value; $user->url = $form->edit_user->url->value; - if ($form->edit_user->locale) { - $desired_locale = $form->edit_user->locale->value; - $new_locale = $desired_locale == "none" ? null : $desired_locale; - if ($new_locale != $user->locale) { - // Delete the session based locale preference - setcookie("g_locale", "", time() - 24 * 3600, "/"); - } - $user->locale = $new_locale; + $user->locale = $form->edit_user->locale->value; + $user->validate(); + } catch (ORM_Validation_Exception $e) { + // Translate ORM validation errors into form error messages + foreach ($e->validation->errors() as $key => $error) { + $form->edit_user->inputs[$key]->add_error($error, 1); + } + $valid = false; + } + + if ($valid) { + if ($user->original()->locale != $user->locale) { + // Delete the session based locale preference + setcookie("g_locale", "", time() - 24 * 3600, "/"); } + $user->save(); module::event("user_edit_form_completed", $user, $form); - message::success(t("User information updated.")); print json_encode( array("result" => "success", "resource" => url::site("users/{$user->id}"))); } else { - print json_encode( - array("result" => "error", - "form" => $form->__toString())); + print json_encode(array("result" => "error", "form" => (string) $form)); } } @@ -78,11 +80,6 @@ class Users_Controller extends Controller { ->matches($group->password); $group->input("email")->label(t("Email"))->id("g-email")->value($user->email); $group->input("url")->label(t("URL"))->id("g-url")->value($user->url); - $form->add_rules_from($user); - - $minimum_length = module::get_var("user", "mininum_password_length", 5); - $form->edit_user->password - ->rules($minimum_length ? "length[$minimum_length, 40]" : "length[40]"); module::event("user_edit_form", $user, $form); $group->submit("")->value(t("Save")); -- cgit v1.2.3 From b23f62259d76a1edb656ede0f02d08c2372a2494 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Wed, 20 Jan 2010 22:52:11 -0800 Subject: Stop using MY_ORM::original(). --- modules/user/controllers/users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/user/controllers/users.php') diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php index b3f39b47..b1c05efa 100644 --- a/modules/user/controllers/users.php +++ b/modules/user/controllers/users.php @@ -43,7 +43,7 @@ class Users_Controller extends Controller { } if ($valid) { - if ($user->original()->locale != $user->locale) { + if (isset($user->changed["locale"])) { // Delete the session based locale preference setcookie("g_locale", "", time() - 24 * 3600, "/"); } -- cgit v1.2.3 From e56318d07fe3cabcace5c4597c660260f80a0e00 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 22 Jan 2010 01:48:03 -0800 Subject: Don't try to access ORM::$changed externally; it's protected. --- modules/user/controllers/users.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'modules/user/controllers/users.php') diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php index b1c05efa..b1ac1944 100644 --- a/modules/user/controllers/users.php +++ b/modules/user/controllers/users.php @@ -32,7 +32,12 @@ class Users_Controller extends Controller { $user->password = $form->edit_user->password->value; $user->email = $form->edit_user->email->value; $user->url = $form->edit_user->url->value; - $user->locale = $form->edit_user->locale->value; + + if ($user->locale != $form->edit_user->locale->value) { + $user->locale = $form->edit_user->locale->value; + $flush_locale_cookie = true; + } + $user->validate(); } catch (ORM_Validation_Exception $e) { // Translate ORM validation errors into form error messages @@ -43,7 +48,7 @@ class Users_Controller extends Controller { } if ($valid) { - if (isset($user->changed["locale"])) { + if (isset($flush_locale_cookie)) { // Delete the session based locale preference setcookie("g_locale", "", time() - 24 * 3600, "/"); } -- cgit v1.2.3 From f0ae2c81654a056b19ba5f2b433f34cf32e9d953 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Thu, 28 Jan 2010 20:55:38 -0800 Subject: Localize edit form error messages. --- modules/user/controllers/users.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'modules/user/controllers/users.php') diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php index b1ac1944..ede1f0de 100644 --- a/modules/user/controllers/users.php +++ b/modules/user/controllers/users.php @@ -78,12 +78,17 @@ class Users_Controller extends Controller { private function _get_edit_form($user) { $form = new Forge("users/update/$user->id", "", "post", array("id" => "g-edit-user-form")); $group = $form->group("edit_user")->label(t("Edit User: %name", array("name" => $user->name))); - $group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name); + $group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name) + ->error_messages("length", t("Your name is too long")); self::_add_locale_dropdown($group, $user); - $group->password("password")->label(t("Password"))->id("g-password"); + $group->password("password")->label(t("Password"))->id("g-password") + ->error_messages("min_length", t("Your password is too short")); $group->password("password2")->label(t("Confirm Password"))->id("g-password2") - ->matches($group->password); - $group->input("email")->label(t("Email"))->id("g-email")->value($user->email); + ->matches($group->password) + ->error_messages("matches", t("The passwords you entered do not match")); + $group->input("email")->label(t("Email"))->id("g-email")->value($user->email) + ->error_messages("email", t("You must enter a valid email address")) + ->error_messages("required", t("You must enter a valid email address")); $group->input("url")->label(t("URL"))->id("g-url")->value($user->url); module::event("user_edit_form", $user, $form); -- cgit v1.2.3 From 79a1365991557d64776110b0a3a99ea42b1a70fe Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sat, 30 Jan 2010 20:43:53 -0800 Subject: Don't override the password in the database if it's empty in the form. Fixes ticket #995. --- modules/user/controllers/admin_users.php | 4 +++- modules/user/controllers/users.php | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'modules/user/controllers/users.php') diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php index 1b0e48a4..c11b0596 100644 --- a/modules/user/controllers/admin_users.php +++ b/modules/user/controllers/admin_users.php @@ -112,7 +112,9 @@ class Admin_Users_Controller extends Admin_Controller { $valid = $form->validate(); $user->name = $form->edit_user->inputs["name"]->value; $user->full_name = $form->edit_user->full_name->value; - $user->password = $form->edit_user->password->value; + if ($form->edit_user->password->value) { + $user->password = $form->edit_user->password->value; + } $user->email = $form->edit_user->email->value; $user->url = $form->edit_user->url->value; $user->locale = $form->edit_user->locale->value; diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php index ede1f0de..d0c67dd1 100644 --- a/modules/user/controllers/users.php +++ b/modules/user/controllers/users.php @@ -29,7 +29,9 @@ class Users_Controller extends Controller { try { $valid = $form->validate(); $user->full_name = $form->edit_user->full_name->value; - $user->password = $form->edit_user->password->value; + if ($form->edit_user->password->value) { + $user->password = $form->edit_user->password->value; + } $user->email = $form->edit_user->email->value; $user->url = $form->edit_user->url->value; -- cgit v1.2.3