summaryrefslogtreecommitdiff
path: root/modules/user
diff options
context:
space:
mode:
Diffstat (limited to 'modules/user')
-rw-r--r--modules/user/controllers/admin_users.php168
-rw-r--r--modules/user/controllers/users.php63
-rw-r--r--modules/user/helpers/group.php17
-rw-r--r--modules/user/helpers/user.php26
-rw-r--r--modules/user/helpers/user_installer.php18
-rw-r--r--modules/user/libraries/drivers/IdentityProvider/Gallery.php13
-rw-r--r--modules/user/models/group.php41
-rw-r--r--modules/user/models/user.php103
-rw-r--r--modules/user/tests/No_Direct_ORM_Access_Test.php2
-rw-r--r--modules/user/tests/User_Groups_Test.php29
-rw-r--r--modules/user/tests/User_Installer_Test.php2
-rw-r--r--modules/user/views/user_form.html.php2
12 files changed, 254 insertions, 230 deletions
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 96b86fff..1b0e48a4 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -21,12 +21,8 @@ class Admin_Users_Controller extends Admin_Controller {
public function index() {
$view = new Admin_View("admin.html");
$view->content = new View("admin_users.html");
- $view->content->users = ORM::factory("user")
- ->order_by("name", "ASC")
- ->find_all();
- $view->content->groups = ORM::factory("group")
- ->order_by("name", "ASC")
- ->find_all();
+ $view->content->users = ORM::factory("user")->order_by("name", "ASC")->find_all();
+ $view->content->groups = ORM::factory("group")->order_by("name", "ASC")->find_all();
print $view;
}
@@ -34,31 +30,32 @@ class Admin_Users_Controller extends Admin_Controller {
access::verify_csrf();
$form = $this->_get_user_add_form_admin();
- $valid = $form->validate();
- $name = $form->add_user->inputs["name"]->value;
- if ($user = user::lookup_by_name($name)) {
- $form->add_user->inputs["name"]->add_error("in_use", 1);
+ try {
+ $user = ORM::factory("user");
+ $valid = $form->validate();
+ $user->name = $form->add_user->inputs["name"]->value;
+ $user->full_name = $form->add_user->full_name->value;
+ $user->password = $form->add_user->password->value;
+ $user->email = $form->add_user->email->value;
+ $user->url = $form->add_user->url->value;
+ $user->locale = $form->add_user->locale->value;
+ $user->admin = $form->add_user->admin->checked;
+ $user->validate();
+ } catch (ORM_Validation_Exception $e) {
+ // Translate ORM validation errors into form error messages
+ foreach ($e->validation->errors() as $key => $error) {
+ $form->add_user->inputs[$key]->add_error($error, 1);
+ }
$valid = false;
}
if ($valid) {
- $user = user::create(
- $name, $form->add_user->full_name->value, $form->add_user->password->value);
- $user->email = $form->add_user->email->value;
- $user->admin = $form->add_user->admin->checked;
-
- if ($form->add_user->locale) {
- $desired_locale = $form->add_user->locale->value;
- $user->locale = $desired_locale == "none" ? null : $desired_locale;
- }
$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"));
} else {
- print json_encode(array("result" => "error",
- "form" => $form->__toString()));
+ print json_encode(array("result" => "error", "form" => (string) $form));
}
}
@@ -85,8 +82,7 @@ class Admin_Users_Controller extends Admin_Controller {
$name = $user->name;
$user->delete();
} else {
- print json_encode(array("result" => "error",
- "form" => $form->__toString()));
+ print json_encode(array("result" => "error", "form" => (string) $form));
}
$message = t("Deleted user %user_name", array("user_name" => $name));
@@ -112,43 +108,34 @@ class Admin_Users_Controller extends Admin_Controller {
}
$form = $this->_get_user_edit_form_admin($user);
- $valid = $form->validate();
- if ($valid) {
- $new_name = $form->edit_user->inputs["name"]->value;
- $temp_user = user::lookup_by_name($new_name);
- if ($new_name != $user->name &&
- ($temp_user && $temp_user->id != $user->id)) {
- $form->edit_user->inputs["name"]->add_error("in_use", 1);
- $valid = false;
- } else {
- $user->name = $new_name;
- }
- }
-
- if ($valid) {
+ try {
+ $valid = $form->validate();
+ $user->name = $form->edit_user->inputs["name"]->value;
$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;
- $user->locale = $desired_locale == "none" ? null : $desired_locale;
- }
-
- // An admin can change the admin status for any user but themselves
+ $user->locale = $form->edit_user->locale->value;
if ($user->id != identity::active_user()->id) {
$user->admin = $form->edit_user->admin->checked;
}
+
+ $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) {
$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"));
} else {
- print json_encode(array("result" => "error",
- "form" => $form->__toString()));
+ print json_encode(array("result" => "error", "form" => (string) $form));
}
}
@@ -193,25 +180,26 @@ class Admin_Users_Controller extends Admin_Controller {
access::verify_csrf();
$form = $this->_get_group_add_form_admin();
- $valid = $form->validate();
- if ($valid) {
- $new_name = $form->add_group->inputs["name"]->value;
- $group = group::lookup_by_name($new_name);
- if (!empty($group)) {
- $form->add_group->inputs["name"]->add_error("in_use", 1);
- $valid = false;
+ try {
+ $valid = $form->validate();
+ $group = ORM::factory("group");
+ $group->name = $form->add_group->inputs["name"]->value;
+ $group->validate();
+ } catch (ORM_Validation_Exception $e) {
+ // Translate ORM validation errors into form error messages
+ foreach ($e->validation->errors() as $key => $error) {
+ $form->add_group->inputs[$key]->add_error($error, 1);
}
+ $valid = false;
}
if ($valid) {
- $group = group::create($new_name);
$group->save();
message::success(
t("Created group %group_name", array("group_name" => $group->name)));
print json_encode(array("result" => "success"));
} else {
- print json_encode(array("result" => "error",
- "form" => $form->__toString()));
+ print json_encode(array("result" => "error", "form" => (string) $form));
}
}
@@ -232,8 +220,7 @@ class Admin_Users_Controller extends Admin_Controller {
$name = $group->name;
$group->delete();
} else {
- print json_encode(array("result" => "error",
- "form" => $form->__toString()));
+ print json_encode(array("result" => "error", "form" => (string) $form));
}
$message = t("Deleted group %group_name", array("group_name" => $name));
@@ -260,19 +247,19 @@ class Admin_Users_Controller extends Admin_Controller {
}
$form = $this->_get_group_edit_form_admin($group);
- $valid = $form->validate();
-
- if ($valid) {
- $new_name = $form->edit_group->inputs["name"]->value;
- $group = group::lookup_by_name($name);
- if ($group->loaded()) {
- $form->edit_group->inputs["name"]->add_error("in_use", 1);
- $valid = false;
+ try {
+ $valid = $form->validate();
+ $group->name = $form->edit_group->inputs["name"]->value;
+ $group->validate();
+ } catch (ORM_Validation_Exception $e) {
+ // Translate ORM validation errors into form error messages
+ foreach ($e->validation->errors() as $key => $error) {
+ $form->edit_group->inputs[$key]->add_error($error, 1);
}
+ $valid = false;
}
if ($valid) {
- $group->name = $form->edit_group->inputs["name"]->value;
$group->save();
message::success(
t("Changed group %group_name", array("group_name" => $group->name)));
@@ -280,8 +267,7 @@ class Admin_Users_Controller extends Admin_Controller {
} else {
message::error(
t("Failed to change group %group_name", array("group_name" => $group->name)));
- print json_encode(array("result" => "error",
- "form" => $form->__toString()));
+ print json_encode(array("result" => "error", "form" => (string) $form));
}
}
@@ -301,7 +287,7 @@ class Admin_Users_Controller extends Admin_Controller {
$group = $form->group("edit_user")->label(t("Edit user"));
$group->input("name")->label(t("Username"))->id("g-username")->value($user->name);
$group->inputs["name"]->error_messages(
- "in_use", t("There is already a user with that username"));
+ "conflict", t("There is already a user with that username"));
$group->input("full_name")->label(t("Full name"))->id("g-fullname")->value($user->full_name);
self::_add_locale_dropdown($group, $user);
$group->password("password")->label(t("Password"))->id("g-password");
@@ -310,10 +296,6 @@ class Admin_Users_Controller extends Admin_Controller {
$group->input("email")->label(t("Email"))->id("g-email")->value($user->email);
$group->input("url")->label(t("URL"))->id("g-url")->value($user->url);
$group->checkbox("admin")->label(t("Admin"))->id("g-admin")->checked($user->admin);
- $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_admin", $user, $form);
$group->submit("")->value(t("Modify User"));
@@ -324,7 +306,7 @@ class Admin_Users_Controller extends Admin_Controller {
$form = new Forge("admin/users/add_user", "", "post", array("id" => "g-add-user-form"));
$group = $form->group("add_user")->label(t("Add user"));
$group->input("name")->label(t("Username"))->id("g-username")
- ->error_messages("in_use", t("There is already a user with that username"));
+ ->error_messages("conflict", t("There is already a user with that username"));
$group->input("full_name")->label(t("Full name"))->id("g-fullname");
$group->password("password")->label(t("Password"))->id("g-password");
$group->password("password2")->label(t("Confirm password"))->id("g-password2")
@@ -333,11 +315,6 @@ class Admin_Users_Controller extends Admin_Controller {
$group->input("url")->label(t("URL"))->id("g-url");
self::_add_locale_dropdown($group);
$group->checkbox("admin")->label(t("Admin"))->id("g-admin");
- $form->add_rules_from(ORM::factory("user"));
-
- $minimum_length = module::get_var("user", "mininum_password_length", 5);
- $form->add_user->password
- ->rules($minimum_length ? "required|length[$minimum_length, 40]" : "length[40]");
module::event("user_add_form_admin", $user, $form);
$group->submit("")->value(t("Add user"));
@@ -349,15 +326,14 @@ class Admin_Users_Controller extends Admin_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);
}
private function _get_user_delete_form_admin($user) {
@@ -375,9 +351,8 @@ class Admin_Users_Controller extends Admin_Controller {
$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(
- "in_use", t("There is already a group with that name"));
+ "conflict", t("There is already a group with that name"));
$form_group->submit("")->value(t("Save"));
- $form->add_rules_from($group);
return $form;
}
@@ -386,9 +361,8 @@ class Admin_Users_Controller extends Admin_Controller {
$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(
- "in_use", t("There is already a group with that name"));
+ "conflict", t("There is already a group with that name"));
$form_group->submit("")->value(t("Add group"));
- $form->add_rules_from(ORM::factory("group"));
return $form;
}
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index ca218393..b1ac1944 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -26,34 +26,41 @@ 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;
+
+ 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
+ foreach ($e->validation->errors() as $key => $error) {
+ $form->edit_user->inputs[$key]->add_error($error, 1);
+ }
+ $valid = false;
+ }
+
+ if ($valid) {
+ if (isset($flush_locale_cookie)) {
+ // 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 +85,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"));
@@ -95,14 +97,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);
}
}
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index 2ada0ac1..38124b0d 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -25,23 +25,6 @@
*/
class group_Core {
/**
- * Create a new group.
- *
- * @param string $name
- * @return Group_Definition the group object
- */
- static function create($name) {
- $group = ORM::factory("group")->where("name", "=", $name)->find();
- if ($group->loaded()) {
- throw new Exception("@todo GROUP_ALREADY_EXISTS $name");
- }
-
- $group->name = $name;
- $group->save();
- return $group;
- }
-
- /**
* The group of all possible visitors. This includes the guest user.
*
* @return Group_Definition the group object
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index e092aecc..3561021f 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -36,32 +36,6 @@ class user_Core {
}
/**
- * Create a new user.
- *
- * @param string $name
- * @param string $full_name
- * @param string $password
- * @return User_Model
- */
- static function create($name, $full_name, $password) {
- $user = ORM::factory("user")->where("name", "=", $name)->find();
- if ($user->loaded()) {
- throw new Exception("@todo USER_ALREADY_EXISTS $name");
- }
-
- $user->name = $name;
- $user->full_name = $full_name;
- $user->password = $password;
-
- // Required groups
- $user->add(group::everybody());
- $user->add(group::registered_users());
-
- $user->save();
- return $user;
- }
-
- /**
* Is the password provided correct?
*
* @param user User Model
diff --git a/modules/user/helpers/user_installer.php b/modules/user/helpers/user_installer.php
index 38f8020b..1d49998d 100644
--- a/modules/user/helpers/user_installer.php
+++ b/modules/user/helpers/user_installer.php
@@ -85,20 +85,28 @@ class user_installer {
UNIQUE KEY(`user_id`, `group_id`))
DEFAULT CHARSET=utf8;");
- $everybody = group::create("Everybody");
+ $everybody = ORM::factory("group");
+ $everybody->name = "Everybody";
$everybody->special = true;
$everybody->save();
- $registered = group::create("Registered Users");
+ $registered = ORM::factory("group");
+ $registered->name = "Registered Users";
$registered->special = true;
$registered->save();
- $guest = user::create("guest", "Guest User", "");
+ $guest = ORM::factory("user");
+ $guest->name = "guest";
+ $guest->full_name = "Guest User";
+ $guest->password = "";
$guest->guest = true;
- $guest->remove($registered);
$guest->save();
- $admin = user::create("admin", "Gallery Administrator", "admin");
+ $admin = ORM::factory("user");
+ $admin->name = "admin";
+ $admin->full_name = "Gallery Administrator";
+ $admin->password = "admin";
+ $admin->email = "unknown@unknown.com";
$admin->admin = true;
$admin->save();
diff --git a/modules/user/libraries/drivers/IdentityProvider/Gallery.php b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
index d874512c..666f185f 100644
--- a/modules/user/libraries/drivers/IdentityProvider/Gallery.php
+++ b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
@@ -38,8 +38,13 @@ class IdentityProvider_Gallery_Driver implements IdentityProvider_Driver {
/**
* @see IdentityProvider_Driver::create_user.
*/
- public function create_user($name, $full_name, $password) {
- return user::create($name, $full_name, $password);
+ public function create_user($name, $full_name, $password, $email) {
+ $user = ORM::factory("user");
+ $user->name = $name;
+ $user->full_name = $full_name;
+ $user->password = $password;
+ $user->email = $email;
+ return $user->save();
}
/**
@@ -91,7 +96,9 @@ class IdentityProvider_Gallery_Driver implements IdentityProvider_Driver {
* @see IdentityProvider_Driver::create_group.
*/
public function create_group($name) {
- return group::create($name);
+ $group = ORM::factory("group");
+ $group->name = $name;
+ return $group->save();
}
/**
diff --git a/modules/user/models/group.php b/modules/user/models/group.php
index 10f6f4b3..85114ede 100644
--- a/modules/user/models/group.php
+++ b/modules/user/models/group.php
@@ -20,9 +20,6 @@
class Group_Model extends ORM implements Group_Definition {
protected $has_and_belongs_to_many = array("users");
- var $form_rules = array(
- "name" => "required|length[4,255]");
-
/**
* @see ORM::delete()
*/
@@ -37,18 +34,44 @@ class Group_Model extends ORM implements Group_Definition {
return $this->users->find_all();
}
- public function save() {
- if (!$this->loaded()) {
- $created = 1;
+ /**
+ * Specify our rules here so that we have access to the instance of this model.
+ */
+ public function validate($array=null) {
+ // validate() is recursive, only modify the rules on the outermost call.
+ if (!$array) {
+ $this->rules = array(
+ "name" => array("rules" => array("required", "length[4,255]"),
+ "callbacks" => array(array($this, "valid_name"))));
}
- $original = clone $this->original();
- parent::save();
- if (isset($created)) {
+ parent::validate($array);
+ }
+
+ public function save() {
+ if (!$this->loaded()) {
+ // New group
+ parent::save();
module::event("group_created", $this);
} else {
+ // Updated group
+ $original = ORM::factory("group")->where("id", "=", $this->id)->find();
+ parent::save();
module::event("group_updated", $original, $this);
}
+
return $this;
}
+
+ /**
+ * Validate the user name. Make sure there are no conflicts.
+ */
+ public function valid_name(Validation $v, $field) {
+ if (db::build()->from("groups")
+ ->where("name", "=", $this->name)
+ ->where("id", "<>", $this->id)
+ ->count_records() == 1) {
+ $v->add_error("name", "conflict");
+ }
+ }
} \ No newline at end of file
diff --git a/modules/user/models/user.php b/modules/user/models/user.php
index edba2a2c..7c97bae7 100644
--- a/modules/user/models/user.php
+++ b/modules/user/models/user.php
@@ -19,14 +19,7 @@
*/
class User_Model extends ORM implements User_Definition {
protected $has_and_belongs_to_many = array("groups");
-
- var $form_rules = array(
- "name" => "required|length[1,32]",
- "full_name" => "length[0,255]",
- "email" => "required|valid_email|length[1,255]",
- "password" => "length[1,40]",
- "url" => "valid_url",
- "locale" => "length[2,10]");
+ protected $password_length = null;
public function __set($column, $value) {
switch ($column) {
@@ -35,6 +28,7 @@ class User_Model extends ORM implements User_Definition {
break;
case "password":
+ $this->password_length = strlen($value);
$value = user::hash_password($value);
break;
}
@@ -65,18 +59,51 @@ class User_Model extends ORM implements User_Definition {
return $this->groups->find_all();
}
+ /**
+ * Specify our rules here so that we have access to the instance of this model.
+ */
+ public function validate($array=null) {
+ // validate() is recursive, only modify the rules on the outermost call.
+ if (!$array) {
+ $this->rules = array(
+ "admin" => array("callbacks" => array(array($this, "valid_admin"))),
+ "email" => array("rules" => array("length[1,255]", "valid::email"),
+ "callbacks" => array(array($this, "valid_email"))),
+ "full_name" => array("rules" => array("length[0,255]")),
+ "locale" => array("rules" => array("length[2,10]")),
+ "name" => array("rules" => array("length[1,32]", "required"),
+ "callbacks" => array(array($this, "valid_name"))),
+ "password" => array("callbacks" => array(array($this, "valid_password"))),
+ "url" => array("rules" => array("valid::url")),
+ );
+ }
+
+ parent::validate($array);
+ }
+
+ /**
+ * Handle any business logic necessary to create or update a user.
+ * @see ORM::save()
+ *
+ * @return ORM User_Model
+ */
public function save() {
if (!$this->loaded()) {
- $created = 1;
- }
+ // New user
+ $this->add(group::everybody());
+ if (!$this->guest) {
+ $this->add(group::registered_users());
+ }
- $original = clone $this->original();
- parent::save();
- if (isset($created)) {
+ parent::save();
module::event("user_created", $this);
} else {
+ // Updated user
+ $original = ORM::factory("user")->where("id", "=", $this->id)->find();
+ parent::save();
module::event("user_updated", $original, $this);
}
+
return $this;
}
@@ -88,4 +115,54 @@ class User_Model extends ORM implements User_Definition {
public function display_name() {
return empty($this->full_name) ? $this->name : $this->full_name;
}
+
+ /**
+ * Validate the user name. Make sure there are no conflicts.
+ */
+ public function valid_name(Validation $v, $field) {
+ if (db::build()->from("users")
+ ->where("name", "=", $this->name)
+ ->where("id", "<>", $this->id)
+ ->count_records() == 1) {
+ $v->add_error("name", "conflict");
+ }
+ }
+
+ /**
+ * Validate the password.
+ */
+ public function valid_password(Validation $v, $field) {
+ if ($this->guest) {
+ return;
+ }
+
+ if (!$this->loaded() || $this->password_length) {
+ $minimum_length = module::get_var("user", "mininum_password_length", 5);
+ if ($this->password_length < $minimum_length) {
+ $v->add_error("password", "min_length");
+ }
+ }
+ }
+
+ /**
+ * Validate the admin bit.
+ */
+ public function valid_admin(Validation $v, $field) {
+ if ($this->id == identity::active_user()->id && !$this->admin) {
+ $v->add_error("admin", "locked");
+ }
+ }
+
+ /**
+ * Validate the email field.
+ */
+ public function valid_email(Validation $v, $field) {
+ if ($this->guest) { // guests don't require an email address
+ return;
+ }
+
+ if (empty($this->email)) {
+ $v->add_error("email", "required");
+ }
+ }
}
diff --git a/modules/user/tests/No_Direct_ORM_Access_Test.php b/modules/user/tests/No_Direct_ORM_Access_Test.php
index 440321fa..c372258e 100644
--- a/modules/user/tests/No_Direct_ORM_Access_Test.php
+++ b/modules/user/tests/No_Direct_ORM_Access_Test.php
@@ -19,7 +19,7 @@
*/
require_once(MODPATH . "gallery/tests/Gallery_Filters.php");
-class No_Direct_ORM_Access_Test extends Unit_Test_Case {
+class No_Direct_ORM_Access_Test extends Gallery_Unit_Test_Case {
public function no_access_to_users_table_test() {
$dir = new UserModuleFilterIterator(
new PhpCodeFilterIterator(
diff --git a/modules/user/tests/User_Groups_Test.php b/modules/user/tests/User_Groups_Test.php
index 163b7d79..d0026d89 100644
--- a/modules/user/tests/User_Groups_Test.php
+++ b/modules/user/tests/User_Groups_Test.php
@@ -18,33 +18,10 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
-class User_Groups_Test extends Unit_Test_Case {
- public function teardown() {
- try {
- $group = ORM::factory("group")->where("name", "=", "user_groups_test")->find();
- if ($group->loaded()) {
- $group->delete();
- }
- } catch (Exception $e) { }
-
- try {
- $user = ORM::factory("user")->where("name", "=", "user_groups_test")->find();
- if ($user->loaded()) {
- $user->delete();
- }
- } catch (Exception $e) { }
- }
-
+class User_Groups_Test extends Gallery_Unit_Test_Case {
public function add_user_to_group_test() {
- $user = ORM::factory("user");
- $user->name = "user_groups_test";
- $user->full_name = "user groups test";
- $user->password = "test password";
- $user->save();
-
- $group = ORM::factory("group");
- $group->name = "user_groups_test";
- $group->save();
+ $user = test::random_user();
+ $group = test::random_group();
$group->add($user);
$group->save();
diff --git a/modules/user/tests/User_Installer_Test.php b/modules/user/tests/User_Installer_Test.php
index 12a10eda..b3c5960a 100644
--- a/modules/user/tests/User_Installer_Test.php
+++ b/modules/user/tests/User_Installer_Test.php
@@ -22,7 +22,7 @@
* This test case operates under the assumption that user_installer::install() is called by the
* test controller before it starts.
*/
-class User_Installer_Test extends Unit_Test_Case {
+class User_Installer_Test extends Gallery_Unit_Test_Case {
public function install_creates_admin_user_test() {
$user = ORM::factory("user", 1);
$this->assert_equal("guest", $user->name);
diff --git a/modules/user/views/user_form.html.php b/modules/user/views/user_form.html.php
index 039ae8a5..4ce2b532 100644
--- a/modules/user/views/user_form.html.php
+++ b/modules/user/views/user_form.html.php
@@ -1,5 +1,5 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
-<script type="text/javascript">
+<script type="text/javascript">
$("form").ready(function(){
$('input[name="password"]').user_password_strength();
});
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 17:17:24 +0000