Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 11 insertions, 8 deletions

diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index b5dc6cb5..521f82fa 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -48,9 +48,10 @@ class Admin_Users_Controller extends Controller {
         $desired_locale = $form->add_user->locale->value;
         $user->locale = $desired_locale == "none" ? null : $desired_locale;
       }
-
       $user->save();
-      message::success(t("Created user %user_name", array("user_name" => p::clean($user->name))));
+      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"));
     } else {
       print json_encode(array("result" => "error",
@@ -83,7 +84,7 @@ class Admin_Users_Controller extends Controller {
                               "form" => $form->__toString()));
     }
 
-    $message = t("Deleted user %user_name", array("user_name" => p::clean($name)));
+    $message = t("Deleted user %user_name", array("user_name" => $name));
     log::success("user", $message);
     message::success($message);
     print json_encode(array("result" => "success"));
@@ -128,6 +129,7 @@ class Admin_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;
       if ($form->edit_user->locale) {
         $desired_locale = $form->edit_user->locale->value;
         $user->locale = $desired_locale == "none" ? null : $desired_locale;
@@ -138,8 +140,9 @@ class Admin_Users_Controller extends Controller {
         $user->admin = $form->edit_user->admin->checked;
       }
       $user->save();
+      module::event("user_edit_form_admin_completed", $user, $form);
 
-      message::success(t("Changed user %user_name", array("user_name" => p::clean($user->name))));
+      message::success(t("Changed user %user_name", array("user_name" => $user->name)));
       print json_encode(array("result" => "success"));
     } else {
       print json_encode(array("result" => "error",
@@ -201,7 +204,7 @@ class Admin_Users_Controller extends Controller {
       $group = group::create($new_name);
       $group->save();
       message::success(
-        t("Created group %group_name", array("group_name" => p::clean($group->name))));
+        t("Created group %group_name", array("group_name" => $group->name)));
       print json_encode(array("result" => "success"));
     } else {
       print json_encode(array("result" => "error",
@@ -230,7 +233,7 @@ class Admin_Users_Controller extends Controller {
                               "form" => $form->__toString()));
     }
 
-    $message = t("Deleted group %group_name", array("group_name" => p::clean($name)));
+    $message = t("Deleted group %group_name", array("group_name" => $name));
     log::success("group", $message);
     message::success($message);
     print json_encode(array("result" => "success"));
@@ -268,11 +271,11 @@ class Admin_Users_Controller extends Controller {
       $group->name = $form->edit_group->inputs["name"]->value;
       $group->save();
       message::success(
-        t("Changed group %group_name", array("group_name" => p::clean($group->name))));
+        t("Changed group %group_name", array("group_name" => $group->name)));
       print json_encode(array("result" => "success"));
     } else {
       message::error(
-        t("Failed to change group %group_name", array("group_name" => p::clean($group->name))));
+        t("Failed to change group %group_name", array("group_name" => $group->name)));
       print json_encode(array("result" => "error",
                               "form" => $form->__toString()));
     }