Start simplifying the interface by moving the static methods from user.php and group.php. Tried creating a identity helper, but the helper identity.php was confused with the library Identity.php. So got around this by making the methods on Identity static and calling the instance within the static methods. Also temporarily moved the user.php and group.php back into the user module.

6 files changed, 13 insertions, 13 deletions

diff --git a/modules/comment/controllers/comments.php b/modules/comment/controllers/comments.php
index 82b12893..84d6ca47 100644
--- a/modules/comment/controllers/comments.php
+++ b/modules/comment/controllers/comments.php
@@ -65,7 +65,7 @@ class Comments_Controller extends REST_Controller {
     $form = comment::get_add_form($item);
     $valid = $form->validate();
     if ($valid) {
-      if (user::active()->guest && !$form->add_comment->inputs["name"]->value) {
+      if (Identity::active()->guest && !$form->add_comment->inputs["name"]->value) {
         $form->add_comment->inputs["name"]->add_error("missing", 1);
         $valid = false;
       }
@@ -78,13 +78,13 @@ class Comments_Controller extends REST_Controller {
 
     if ($valid) {
       $comment = comment::create(
-        $item, user::active(),
+        $item, Identity::active(),
         $form->add_comment->text->value,
         $form->add_comment->inputs["name"]->value,
         $form->add_comment->email->value,
         $form->add_comment->url->value);
 
-      $active = user::active();
+      $active = Identity::active();
       if ($active->guest) {
         $form->add_comment->inputs["name"]->value("");
         $form->add_comment->email->value("");
@@ -192,7 +192,7 @@ class Comments_Controller extends REST_Controller {
    *  @see REST_Controller::form_edit($resource)
    */
   public function _form_edit($comment) {
-    if (!user::active()->admin) {
+    if (!Identity::active()->admin) {
       access::forbidden();
     }
     print comment::get_edit_form($comment);
diff --git a/modules/comment/helpers/comment.php b/modules/comment/helpers/comment.php
index 7b2332a8..38d65db6 100644
--- a/modules/comment/helpers/comment.php
+++ b/modules/comment/helpers/comment.php
@@ -75,7 +75,7 @@ class comment_Core {
     module::event("comment_add_form", $form);
     $group->submit("")->value(t("Add"));
 
-    $active = user::active();
+    $active = Identity::active();
     if (!$active->guest) {
       $group->inputs["name"]->value($active->full_name)->disabled("disabled");
       $group->email->value($active->email)->disabled("disabled");
diff --git a/modules/comment/models/comment.php b/modules/comment/models/comment.php
index de9b0cd6..5e29e778 100644
--- a/modules/comment/models/comment.php
+++ b/modules/comment/models/comment.php
@@ -23,7 +23,7 @@ class Comment_Model extends ORM {
   }
 
   function author() {
-    return user::lookup($this->author_id);
+    return Identity::lookup_user($this->author_id);
   }
 
   function author_name() {
diff --git a/modules/comment/tests/Comment_Event_Test.php b/modules/comment/tests/Comment_Event_Test.php
index c51c65c9..eb301893 100644
--- a/modules/comment/tests/Comment_Event_Test.php
+++ b/modules/comment/tests/Comment_Event_Test.php
@@ -22,7 +22,7 @@ class Comment_Event_Test extends Unit_Test_Case {
     $rand = rand();
     $album = album::create(ORM::factory("item", 1), "test_$rand", "test_$rand");
     $comment = comment::create(
-      $album, user::guest(), "text_$rand", "name_$rand", "email_$rand", "url_$rand");
+      $album, Identity::guest(), "text_$rand", "name_$rand", "email_$rand", "url_$rand");
 
     $album->delete();
 
diff --git a/modules/comment/tests/Comment_Helper_Test.php b/modules/comment/tests/Comment_Helper_Test.php
index f84fe0f9..e8ab7c79 100644
--- a/modules/comment/tests/Comment_Helper_Test.php
+++ b/modules/comment/tests/Comment_Helper_Test.php
@@ -48,7 +48,7 @@ class Comment_Helper_Test extends Unit_Test_Case {
     $rand = rand();
     $root = ORM::factory("item", 1);
     $comment = comment::create(
-      $root, user::guest(), "text_$rand", "name_$rand", "email_$rand", "url_$rand");
+      $root, Identity::guest(), "text_$rand", "name_$rand", "email_$rand", "url_$rand");
 
     $this->assert_equal("name_$rand", $comment->author_name());
     $this->assert_equal("email_$rand", $comment->author_email());
@@ -77,7 +77,7 @@ class Comment_Helper_Test extends Unit_Test_Case {
   public function create_comment_for_user_test() {
     $rand = rand();
     $root = ORM::factory("item", 1);
-    $admin = user::lookup(2);
+    $admin = Identity::lookup_user(2);
     $comment = comment::create(
       $root, $admin, "text_$rand", "name_$rand", "email_$rand", "url_$rand");
 
diff --git a/modules/comment/tests/Comment_Model_Test.php b/modules/comment/tests/Comment_Model_Test.php
index f4c68b15..76de2a34 100644
--- a/modules/comment/tests/Comment_Model_Test.php
+++ b/modules/comment/tests/Comment_Model_Test.php
@@ -22,17 +22,17 @@ class Comment_Model_Test extends Unit_Test_Case {
   public function cant_view_comments_for_unviewable_items_test() {
     $root = ORM::factory("item", 1);
     $album = album::create($root, rand(), rand(), rand());
-    $comment = comment::create($album, user::guest(), "text", "name", "email", "url");
-    user::set_active(user::guest());
+    $comment = comment::create($album, Identity::guest(), "text", "name", "email", "url");
+    Identity::set_active(Identity::guest());
 
     // We can see the comment when permissions are granted on the album
-    access::allow(group::everybody(), "view", $album);
+    access::allow(Identity::everybody(), "view", $album);
     $this->assert_equal(
       1,
       ORM::factory("comment")->viewable()->where("comments.id", $comment->id)->count_all());
 
     // We can't see the comment when permissions are denied on the album
-    access::deny(group::everybody(), "view", $album);
+    access::deny(Identity::everybody(), "view", $album);
     $this->assert_equal(
       0,
       ORM::factory("comment")->viewable()->where("comments.id", $comment->id)->count_all());