summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2009-10-21 11:49:42 -0700
committerTim Almdal <tnalmdal@shaw.ca>2009-10-21 11:49:42 -0700
commitf04177f138df71e6317073b12b754a1c32d0c523 (patch)
tree2fa6007578349c04ef7af6fcc30502323a2ad7a2
parent182c8414a1535f7f141ebca350a2b79d0d4a63ff (diff)
re-add the lookup_group_by_name API Method.
-rw-r--r--modules/gallery/libraries/Identity.php7
-rw-r--r--modules/gallery/libraries/drivers/Identity.php11
-rw-r--r--modules/user/libraries/drivers/Identity/Gallery.php13
3 files changed, 26 insertions, 5 deletions
diff --git a/modules/gallery/libraries/Identity.php b/modules/gallery/libraries/Identity.php
index bfc523f4..1dd5d23b 100644
--- a/modules/gallery/libraries/Identity.php
+++ b/modules/gallery/libraries/Identity.php
@@ -200,6 +200,13 @@ class Identity_Core {
}
/**
+ * @see Identity_Driver::lookup_group_by_name.
+ */
+ static function lookup_group_by_name($name) {
+ return self::instance()->driver->lookup_group_by_name($name);
+ }
+
+ /**
* @see Identity_Driver::get_user_list.
*/
static function get_user_list($ids) {
diff --git a/modules/gallery/libraries/drivers/Identity.php b/modules/gallery/libraries/drivers/Identity.php
index 5b35d49b..39b2a9c7 100644
--- a/modules/gallery/libraries/drivers/Identity.php
+++ b/modules/gallery/libraries/drivers/Identity.php
@@ -102,12 +102,19 @@ interface Identity_Driver {
* @param integer id
* @return Group_Definition the user object, or null if the name was invalid.
*/
- static function lookup_group($id);
+ public function lookup_group($id);
+
+ /**
+ * Look up the group by name.
+ * @param string $name the name of the group to locate
+ * @return Group_Definition
+ */
+ public function lookup_group_by_name($name);
/**
* List the groups defined in the Identity Provider
*/
- static function groups();
+ public function groups();
} // End Identity Driver Definition
diff --git a/modules/user/libraries/drivers/Identity/Gallery.php b/modules/user/libraries/drivers/Identity/Gallery.php
index 17327c17..36f37543 100644
--- a/modules/user/libraries/drivers/Identity/Gallery.php
+++ b/modules/user/libraries/drivers/Identity/Gallery.php
@@ -118,16 +118,23 @@ class Identity_Gallery_Driver implements Identity_Driver {
/**
* @see Identity_Driver::lookup_group.
*/
- static function lookup_group($id) {
+ public function lookup_group($id) {
return group::lookup_by_field("id", $id);
}
/**
+ * @see Identity_Driver::lookup_group_by_name.
+ */
+ public function lookup_group_by_name($name) {
+ return group::lookup_by_field("name", $name);
+ }
+
+ /**
* @see Identity_Driver::get_user_list.
*/
public function get_user_list($ids) {
return ORM::factory("user")
- ->in("id", ids)
+ ->in("id", $ids)
->find_all()
->as_array();
}
@@ -135,7 +142,7 @@ class Identity_Gallery_Driver implements Identity_Driver {
/**
* @see Identity_Driver::groups.
*/
- static function groups() {
+ public function groups() {
return ORM::factory("group")->find_all();
}