move membership/adminship tests to profile

diff --git a/classes/Profile.php b/classes/Profile.php
index 31bdf71d59b9923abacbab890e692b8864f442bf..ab5a48e57f986ef6315c2aab89a97b85ca0c960c 100644 (file)
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -121,7 +121,7 @@ class Profile extends Memcached_DataObject
         return $avatar;
     }
 
-    function crop_avatars($x, $y, $w, $h) 
+    function crop_avatars($x, $y, $w, $h)
     {
 
         $avatar = $this->getOriginalAvatar();
@@ -139,7 +139,7 @@ class Profile extends Memcached_DataObject
         return true;
     }
 
-    function delete_avatars($original=true) 
+    function delete_avatars($original=true)
     {
         $avatar = new Avatar();
         $avatar->profile_id = $this->id;
@@ -187,4 +187,34 @@ class Profile extends Memcached_DataObject
                                  'profile:notices:'.$this->id,
                                  $offset, $limit, $since_id, $before_id);
     }
+
+    function isMember($group)
+    {
+        $mem = new Group_member();
+
+        $mem->group_id = $group->id;
+        $mem->profile_id = $this->id;
+
+        if ($mem->find()) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    function isAdmin($group)
+    {
+        $mem = new Group_member();
+
+        $mem->group_id = $group->id;
+        $mem->profile_id = $this->id;
+        $mem->is_admin = 1;
+
+        if ($mem->find()) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
 }

diff --git a/classes/User.php b/classes/User.php
index 9a1ebddc414c858cfa07a3706212f713c34ee5f0..5dadd6b440339878d40e218869ca97708ae40f8b 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -494,31 +494,14 @@ class User extends Memcached_DataObject
 
     function isMember($group)
     {
-        $mem = new Group_member();
-
-        $mem->group_id = $group->id;
-        $mem->profile_id = $this->id;
-
-        if ($mem->find()) {
-            return true;
-        } else {
-            return false;
-        }
+        $profile = $this->getProfile();
+        return $profile->isMember($group);
     }
 
     function isAdmin($group)
     {
-        $mem = new Group_member();
-
-        $mem->group_id = $group->id;
-        $mem->profile_id = $this->id;
-        $mem->is_admin = 1;
-
-        if ($mem->find()) {
-            return true;
-        } else {
-            return false;
-        }
+        $profile = $this->getProfile();
+        return $profile->isAdmin($group);
     }
 
     function getGroups($offset=0, $limit=null)