diff options
Diffstat (limited to 'classes')
| -rwxr-xr-x | classes/Group_inbox.php | 2 | ||||
| -rw-r--r-- | classes/Profile.php | 34 | ||||
| -rw-r--r-- | classes/User.php | 25 |
3 files changed, 37 insertions, 24 deletions
diff --git a/classes/Group_inbox.php b/classes/Group_inbox.php index 826889636..523506ec5 100755 --- a/classes/Group_inbox.php +++ b/classes/Group_inbox.php @@ -2,7 +2,7 @@ /** * Table Definition for group_inbox */ -require_once 'classes/Memcached_DataObject'; +require_once 'classes/Memcached_DataObject.php'; class Group_inbox extends Memcached_DataObject { diff --git a/classes/Profile.php b/classes/Profile.php index 31bdf71d5..ab5a48e57 100644 --- 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 9a1ebddc4..5dadd6b44 100644 --- 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) |