summaryrefslogtreecommitdiff
path: root/modules/user
diff options
context:
space:
mode:
Diffstat (limited to 'modules/user')
-rw-r--r--modules/user/controllers/admin_users.php49
-rw-r--r--modules/user/controllers/password.php6
-rw-r--r--modules/user/controllers/users.php25
3 files changed, 42 insertions, 38 deletions
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index e14be393..24478aa5 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -54,9 +54,9 @@ class Admin_Users_Controller extends Admin_Controller {
$user->save();
module::event("user_add_form_admin_completed", $user, $form);
message::success(t("Created user %user_name", array("user_name" => $user->name)));
- print json_encode(array("result" => "success"));
+ json::reply(array("result" => "success"));
} else {
- print json_encode(array("result" => "error", "form" => (string) $form));
+ print json::reply(array("result" => "error", "html" => (string)$form));
}
}
@@ -81,13 +81,13 @@ class Admin_Users_Controller extends Admin_Controller {
$name = $user->name;
$user->delete();
} else {
- print json_encode(array("result" => "error", "form" => (string) $form));
+ json::reply(array("result" => "error", "html" => (string)$form));
}
$message = t("Deleted user %user_name", array("user_name" => $name));
log::success("user", $message);
message::success($message);
- print json_encode(array("result" => "success"));
+ json::reply(array("result" => "success"));
}
public function delete_user_form($id) {
@@ -134,9 +134,9 @@ class Admin_Users_Controller extends Admin_Controller {
$user->save();
module::event("user_edit_form_admin_completed", $user, $form);
message::success(t("Changed user %user_name", array("user_name" => $user->name)));
- print json_encode(array("result" => "success"));
+ json::reply(array("result" => "success"));
} else {
- print json_encode(array("result" => "error", "form" => (string) $form));
+ json::reply(array("result" => "error", "html" => (string) $form));
}
}
@@ -192,9 +192,9 @@ class Admin_Users_Controller extends Admin_Controller {
$group->save();
message::success(
t("Created group %group_name", array("group_name" => $group->name)));
- print json_encode(array("result" => "success"));
+ json::reply(array("result" => "success"));
} else {
- print json_encode(array("result" => "error", "form" => (string) $form));
+ json::reply(array("result" => "error", "html" => (string)$form));
}
}
@@ -215,13 +215,13 @@ class Admin_Users_Controller extends Admin_Controller {
$name = $group->name;
$group->delete();
} else {
- print json_encode(array("result" => "error", "form" => (string) $form));
+ json::reply(array("result" => "error", "html" => (string) $form));
}
$message = t("Deleted group %group_name", array("group_name" => $name));
log::success("group", $message);
message::success($message);
- print json_encode(array("result" => "success"));
+ json::reply(array("result" => "success"));
}
public function delete_group_form($id) {
@@ -258,11 +258,12 @@ class Admin_Users_Controller extends Admin_Controller {
$group->save();
message::success(
t("Changed group %group_name", array("group_name" => $group->name)));
- print json_encode(array("result" => "success"));
+ json::reply(array("result" => "success"));
} else {
+ $group->reload();
message::error(
t("Failed to change group %group_name", array("group_name" => $group->name)));
- print json_encode(array("result" => "error", "form" => (string) $form));
+ json::reply(array("result" => "error", "html" => (string) $form));
}
}
@@ -281,7 +282,9 @@ class Admin_Users_Controller extends Admin_Controller {
"admin/users/edit_user/$user->id", "", "post", array("id" => "g-edit-user-form"));
$group = $form->group("edit_user")->label(t("Edit user"));
$group->input("name")->label(t("Username"))->id("g-username")->value($user->name)
- ->error_messages("conflict", t("There is already a user with that username"));
+ ->error_messages("required", t("A name is required"))
+ ->error_messages("conflict", t("There is already a user with that username"))
+ ->error_messages("length", t("This name is too long"));
$group->input("full_name")->label(t("Full name"))->id("g-fullname")->value($user->full_name)
->error_messages("length", t("This name is too long"));
$group->password("password")->label(t("Password"))->id("g-password")
@@ -307,7 +310,7 @@ class Admin_Users_Controller extends Admin_Controller {
}
module::event("user_edit_form_admin", $user, $form);
- $group->submit("")->value(t("Modify User"));
+ $group->submit("")->value(t("Modify user"));
return $form;
}
@@ -352,7 +355,7 @@ class Admin_Users_Controller extends Admin_Controller {
$locales = array_merge(array("" => t("« none »")), $locales);
$selected_locale = ($user && $user->locale) ? $user->locale : "";
$form->dropdown("locale")
- ->label(t("Language Preference"))
+ ->label(t("Language preference"))
->options($locales)
->selected($selected_locale);
}
@@ -370,9 +373,13 @@ class Admin_Users_Controller extends Admin_Controller {
private function _get_group_edit_form_admin($group) {
$form = new Forge("admin/users/edit_group/$group->id", "", "post", array("id" => "g-edit-group-form"));
$form_group = $form->group("edit_group")->label(t("Edit group"));
- $form_group->input("name")->label(t("Name"))->id("g-name")->value($group->name);
- $form_group->inputs["name"]->error_messages(
- "conflict", t("There is already a group with that name"));
+ $form_group->input("name")->label(t("Name"))->id("g-name")->value($group->name)
+ ->error_messages("required", t("A name is required"));
+ $form_group->inputs["name"]->error_messages("conflict", t("There is already a group with that name"))
+ ->error_messages("required", t("You must enter a group name"))
+ ->error_messages("length",
+ t("The group name must be between %min_length and %max_length characters",
+ array("min_length" => 4, "max_length" => 255)));
$form_group->submit("")->value(t("Save"));
return $form;
}
@@ -381,8 +388,10 @@ class Admin_Users_Controller extends Admin_Controller {
$form = new Forge("admin/users/add_group", "", "post", array("id" => "g-add-group-form"));
$form_group = $form->group("add_group")->label(t("Add group"));
$form_group->input("name")->label(t("Name"))->id("g-name");
- $form_group->inputs["name"]->error_messages(
- "conflict", t("There is already a group with that name"));
+ $form_group->inputs["name"]->error_messages("conflict", t("There is already a group with that name"))
+ ->error_messages("required", t("You must enter a group name"))
+ ->error_messages("length", t("The group name must be at least %min_length characters",
+ array("min_length" => 4)));
$form_group->submit("")->value(t("Add group"));
return $form;
}
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
index 522b6b35..575720a8 100644
--- a/modules/user/controllers/password.php
+++ b/modules/user/controllers/password.php
@@ -27,8 +27,7 @@ class Password_Controller extends Controller {
if ($form->validate()) {
$this->_send_reset($form);
} else {
- print json_encode(array("result" => "error",
- "form" => (string) $form));
+ json::reply(array("result" => "error", "html" => (string)$form));
}
} else {
print $form;
@@ -83,8 +82,7 @@ class Password_Controller extends Controller {
// Always pretend that an email has been sent to avoid leaking
// information on what user names are actually real.
message::success(t("Password reset email sent"));
- print json_encode(
- array("result" => "success"));
+ json::reply(array("result" => "success"));
}
private static function _reset_form() {
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index 7f3f6b1f..5e6239d8 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -54,11 +54,10 @@ class Users_Controller extends Controller {
$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}")));
+ json::reply(array("result" => "success",
+ "resource" => url::site("users/{$user->id}")));
} else {
- print json_encode(array("result" => "error", "form" => (string) $form));
+ json::reply(array("result" => "error", "html" => (string)$form));
}
}
@@ -87,14 +86,13 @@ class Users_Controller extends Controller {
message::success(t("Password changed"));
module::event("user_auth", $user);
module::event("user_password_change", $user);
- print json_encode(
- array("result" => "success",
- "resource" => url::site("users/{$user->id}")));
+ json::reply(array("result" => "success",
+ "resource" => url::site("users/{$user->id}")));
} else {
log::warning("user", t("Failed password change for %name", array("name" => $user->name)));
$name = $user->name;
module::event("user_auth_failed", $name);
- print json_encode(array("result" => "error", "form" => (string) $form));
+ json::reply(array("result" => "error", "html" => (string)$form));
}
}
@@ -122,14 +120,13 @@ class Users_Controller extends Controller {
module::event("user_change_email_form_completed", $user, $form);
message::success(t("Email address changed"));
module::event("user_auth", $user);
- print json_encode(
- array("result" => "success",
- "resource" => url::site("users/{$user->id}")));
+ json::reply(array("result" => "success",
+ "resource" => url::site("users/{$user->id}")));
} else {
log::warning("user", t("Failed email change for %name", array("name" => $user->name)));
$name = $user->name;
module::event("user_auth_failed", $name);
- print json_encode(array("result" => "error", "form" => (string) $form));
+ json::reply(array("result" => "error", "html" => (string)$form));
}
}
@@ -192,7 +189,7 @@ class Users_Controller extends Controller {
$group->password("password")->label(t("Current password"))->id("g-password")
->callback("auth::validate_too_many_failed_auth_attempts")
->callback("user::valid_password")
- ->error_messages("invalid", t("Incorrect password"))
+ ->error_messages("invalid_password", t("Incorrect password"))
->error_messages(
"too_many_failed_auth_attempts",
t("Too many incorrect passwords. Try again later"));
@@ -234,7 +231,7 @@ class Users_Controller extends Controller {
$locales = array_merge(array("" => t("« none »")), $locales);
$selected_locale = ($user && $user->locale) ? $user->locale : "";
$form->dropdown("locale")
- ->label(t("Language Preference"))
+ ->label(t("Language preference"))
->options($locales)
->selected($selected_locale);
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-15 15:44:38 +0000