stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-05-20 11:29:24 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for ticket #201.

Browse Source 
1) create common update function so processing consistent between the
user edit and admin edit.
2) created common private helper function to build the user edit form
the same way.
So a user can now change their user name if the new one doesn't exist.
This commit is contained in:
Tim Almdal
2009-04-03 17:33:07 +00:00
parent d35a0cdb61
commit 9ed0dd51bf
3 changed files with 46 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
modules/user/controllers/admin_users.php
View File

@@ -96,28 +96,12 @@ class Admin_Users_Controller extends Controller {
}
$form = user::get_edit_form_admin($user);
$form->edit_user->password->rules("-required");
$valid = $form->validate();
if ($valid) {
$new_name = $form->edit_user->inputs["name"]->value;
if (ORM::factory("user")
->where("name", $new_name)
->where("id !=", $id)
->find()
->loaded) {
$form->edit_user->inputs["name"]->add_error("in_use", 1);
$valid = false;
}
$valid = user::update($user, $form);
}
if ($valid) {
$user->name = $new_name;
$user->full_name = $form->edit_user->full_name->value;
$user->password = $form->edit_user->password->value;
$user->email = $form->edit_user->email->value;
$desired_locale = $form->edit_user->locale->value;
$user->locale = $desired_locale == "none" ? null : $desired_locale;
$user->save();
message::success(t("Changed user %user_name", array("user_name" => $user->name)));
print json_encode(array("result" => "success"));
} else {
@@ -159,7 +143,6 @@ class Admin_Users_Controller extends Controller {
public function add_group() {
access::verify_csrf();
$form = group::get_add_form_admin();
$valid = $form->validate();
if ($valid) {
$new_name = $form->add_group->inputs["name"]->value;