summaryrefslogtreecommitdiff
path: root/modules/user
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2009-12-26 11:24:50 -0800
committerTim Almdal <tnalmdal@shaw.ca>2009-12-26 11:24:50 -0800
commit3060a6f662da66008d57a461bf1c9b5b4aa2b002 (patch)
tree442fd290505817efc0324f2af6e01805cb7396aa /modules/user
parent1cd6a615bb47a33794e4a4f690c87a348ab752d7 (diff)
parent32d25dafd5b033338b6a9bb8c7c53edab462543a (diff)
Merge branch 'master' into talmdal_dev
Conflicts: modules/gallery/controllers/albums.php modules/gallery/controllers/movies.php modules/gallery/controllers/photos.php
Diffstat (limited to 'modules/user')
-rw-r--r--modules/user/controllers/admin_users.php22
-rw-r--r--modules/user/controllers/password.php2
-rw-r--r--modules/user/helpers/group.php6
-rw-r--r--modules/user/helpers/user.php8
-rw-r--r--modules/user/libraries/drivers/IdentityProvider/Gallery.php2
-rw-r--r--modules/user/models/group.php8
-rw-r--r--modules/user/models/user.php8
-rw-r--r--modules/user/tests/User_Groups_Test.php8
-rw-r--r--modules/user/views/admin_users_group.html.php4
9 files changed, 38 insertions, 30 deletions
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index b3284385..96b86fff 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -22,10 +22,10 @@ class Admin_Users_Controller extends Admin_Controller {
$view = new Admin_View("admin.html");
$view->content = new View("admin_users.html");
$view->content->users = ORM::factory("user")
- ->orderby("name", "ASC")
+ ->order_by("name", "ASC")
->find_all();
$view->content->groups = ORM::factory("group")
- ->orderby("name", "ASC")
+ ->order_by("name", "ASC")
->find_all();
print $view;
}
@@ -77,7 +77,7 @@ class Admin_Users_Controller extends Admin_Controller {
$user = user::lookup($id);
if (empty($user)) {
- kohana::show_404();
+ throw new Kohana_404_Exception();
}
$form = $this->_get_user_delete_form_admin($user);
@@ -98,7 +98,7 @@ class Admin_Users_Controller extends Admin_Controller {
public function delete_user_form($id) {
$user = user::lookup($id);
if (empty($user)) {
- kohana::show_404();
+ throw new Kohana_404_Exception();
}
print $this->_get_user_delete_form_admin($user);
}
@@ -108,7 +108,7 @@ class Admin_Users_Controller extends Admin_Controller {
$user = user::lookup($id);
if (empty($user)) {
- kohana::show_404();
+ throw new Kohana_404_Exception();
}
$form = $this->_get_user_edit_form_admin($user);
@@ -155,7 +155,7 @@ class Admin_Users_Controller extends Admin_Controller {
public function edit_user_form($id) {
$user = user::lookup($id);
if (empty($user)) {
- kohana::show_404();
+ throw new Kohana_404_Exception();
}
$v = new View("user_form.html");
@@ -224,7 +224,7 @@ class Admin_Users_Controller extends Admin_Controller {
$group = group::lookup($id);
if (empty($group)) {
- kohana::show_404();
+ throw new Kohana_404_Exception();
}
$form = $this->_get_group_delete_form_admin($group);
@@ -245,7 +245,7 @@ class Admin_Users_Controller extends Admin_Controller {
public function delete_group_form($id) {
$group = group::lookup($id);
if (empty($group)) {
- kohana::show_404();
+ throw new Kohana_404_Exception();
}
print $this->_get_group_delete_form_admin($group);
@@ -256,7 +256,7 @@ class Admin_Users_Controller extends Admin_Controller {
$group = group::lookup($id);
if (empty($group)) {
- kohana::show_404();
+ throw new Kohana_404_Exception();
}
$form = $this->_get_group_edit_form_admin($group);
@@ -265,7 +265,7 @@ class Admin_Users_Controller extends Admin_Controller {
if ($valid) {
$new_name = $form->edit_group->inputs["name"]->value;
$group = group::lookup_by_name($name);
- if ($group->loaded) {
+ if ($group->loaded()) {
$form->edit_group->inputs["name"]->add_error("in_use", 1);
$valid = false;
}
@@ -288,7 +288,7 @@ class Admin_Users_Controller extends Admin_Controller {
public function edit_group_form($id) {
$group = group::lookup($id);
if (empty($group)) {
- kohana::show_404();
+ throw new Kohana_404_Exception();
}
print $this->_get_group_edit_form_admin($group);
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
index e18e76b6..8309d2cc 100644
--- a/modules/user/controllers/password.php
+++ b/modules/user/controllers/password.php
@@ -47,7 +47,7 @@ class Password_Controller extends Controller {
$valid = $form->validate();
if ($valid) {
$user = user::lookup_by_name($form->reset->inputs["name"]->value);
- if (!$user->loaded || empty($user->email)) {
+ if (!$user->loaded() || empty($user->email)) {
$form->reset->inputs["name"]->add_error("no_email", 1);
$valid = false;
}
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index 3aaf1b11..2ada0ac1 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -31,8 +31,8 @@ class group_Core {
* @return Group_Definition the group object
*/
static function create($name) {
- $group = ORM::factory("group")->where("name", $name)->find();
- if ($group->loaded) {
+ $group = ORM::factory("group")->where("name", "=", $name)->find();
+ if ($group->loaded()) {
throw new Exception("@todo GROUP_ALREADY_EXISTS $name");
}
@@ -86,7 +86,7 @@ class group_Core {
private static function _lookup_by_field($field_name, $value) {
try {
$user = model_cache::get("group", $value, $field_name);
- if ($user->loaded) {
+ if ($user->loaded()) {
return $user;
}
} catch (Exception $e) {
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index f9f16da5..e092aecc 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -44,8 +44,8 @@ class user_Core {
* @return User_Model
*/
static function create($name, $full_name, $password) {
- $user = ORM::factory("user")->where("name", $name)->find();
- if ($user->loaded) {
+ $user = ORM::factory("user")->where("name", "=", $name)->find();
+ if ($user->loaded()) {
throw new Exception("@todo USER_ALREADY_EXISTS $name");
}
@@ -86,7 +86,7 @@ class user_Core {
}
// Passwords with <&"> created by G2 prior to 2.1 were hashed with entities
- $sanitizedPassword = html::specialchars($password, false);
+ $sanitizedPassword = html::chars($password, false);
$guess = (strlen($valid) == 32) ? md5($sanitizedPassword)
: ($salt . md5($salt . $sanitizedPassword));
if (!strcmp($guess, $valid)) {
@@ -163,7 +163,7 @@ class user_Core {
private static function _lookup_user_by_field($field_name, $value) {
try {
$user = model_cache::get("user", $value, $field_name);
- if ($user->loaded) {
+ if ($user->loaded()) {
return $user;
}
} catch (Exception $e) {
diff --git a/modules/user/libraries/drivers/IdentityProvider/Gallery.php b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
index f02c53a2..50064287 100644
--- a/modules/user/libraries/drivers/IdentityProvider/Gallery.php
+++ b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
@@ -63,7 +63,7 @@ class IdentityProvider_Gallery_Driver implements IdentityProvider_Driver {
}
// Passwords with <&"> created by G2 prior to 2.1 were hashed with entities
- $sanitizedPassword = html::specialchars($password, false);
+ $sanitizedPassword = html::chars($password, false);
$guess = (strlen($valid) == 32) ? md5($sanitizedPassword)
: ($salt . md5($salt . $sanitizedPassword));
if (!strcmp($guess, $valid)) {
diff --git a/modules/user/models/group.php b/modules/user/models/group.php
index 4432fc69..515788a3 100644
--- a/modules/user/models/group.php
+++ b/modules/user/models/group.php
@@ -20,7 +20,7 @@
class Group_Model extends ORM implements Group_Definition {
protected $has_and_belongs_to_many = array("users");
- var $rules = array(
+ var $form_rules = array(
"name" => "required|length[4,255]");
/**
@@ -33,8 +33,12 @@ class Group_Model extends ORM implements Group_Definition {
module::event("group_deleted", $old);
}
+ public function users() {
+ return $this->users->find_all();
+ }
+
public function save() {
- if (!$this->loaded) {
+ if (!$this->loaded()) {
$created = 1;
}
parent::save();
diff --git a/modules/user/models/user.php b/modules/user/models/user.php
index bd61def8..7d5bf413 100644
--- a/modules/user/models/user.php
+++ b/modules/user/models/user.php
@@ -20,7 +20,7 @@
class User_Model extends ORM implements User_Definition {
protected $has_and_belongs_to_many = array("groups");
- var $rules = array(
+ var $form_rules = array(
"name" => "required|length[1,32]",
"full_name" => "length[0,255]",
"email" => "required|valid_email|length[1,255]",
@@ -61,8 +61,12 @@ class User_Model extends ORM implements User_Definition {
md5($this->email), $size, $default ? "&d=" . urlencode($default) : "");
}
+ public function groups() {
+ return $this->groups->find_all();
+ }
+
public function save() {
- if (!$this->loaded) {
+ if (!$this->loaded()) {
$created = 1;
}
parent::save();
diff --git a/modules/user/tests/User_Groups_Test.php b/modules/user/tests/User_Groups_Test.php
index 3da8dd34..163b7d79 100644
--- a/modules/user/tests/User_Groups_Test.php
+++ b/modules/user/tests/User_Groups_Test.php
@@ -21,15 +21,15 @@
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 = 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 = ORM::factory("user")->where("name", "=", "user_groups_test")->find();
+ if ($user->loaded()) {
$user->delete();
}
} catch (Exception $e) { }
diff --git a/modules/user/views/admin_users_group.html.php b/modules/user/views/admin_users_group.html.php
index b7e573b3..6c6c341e 100644
--- a/modules/user/views/admin_users_group.html.php
+++ b/modules/user/views/admin_users_group.html.php
@@ -13,9 +13,9 @@
<? endif ?>
</h4>
-<? if ($group->users->count() > 0): ?>
+<? if ($group->users->count_all() > 0): ?>
<ul class="g-member-list">
- <? foreach ($group->users as $i => $user): ?>
+ <? foreach ($group->users->find_all() as $i => $user): ?>
<li class="g-user">
<?= html::clean($user->name) ?>
<? if (!$group->special): ?>