GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

move membership/adminship tests to profile

This commit is contained in:
Evan Prodromou 2009-01-21 13:57:18 -05:00
parent 3260106537
commit 8516ccfb9d
2 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
classes/Profile.php
View File

@ -121,7 +121,7 @@ class Profile extends Memcached_DataObject
return $avatar; return $avatar;
} }
function crop_avatars($x, $y, $w, $h) function crop_avatars($x, $y, $w, $h)
{ {
$avatar = $this->getOriginalAvatar(); $avatar = $this->getOriginalAvatar();
@ -139,7 +139,7 @@ class Profile extends Memcached_DataObject
return true; return true;
} }
function delete_avatars($original=true) function delete_avatars($original=true)
{ {
$avatar = new Avatar(); $avatar = new Avatar();
$avatar->profile_id = $this->id; $avatar->profile_id = $this->id;
@ -187,4 +187,34 @@ class Profile extends Memcached_DataObject
'profile:notices:'.$this->id, 'profile:notices:'.$this->id,
$offset, $limit, $since_id, $before_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;
}
}
} }

25
classes/User.php
View File

@ -494,31 +494,14 @@ class User extends Memcached_DataObject
function isMember($group) function isMember($group)
{ {
$mem = new Group_member(); $profile = $this->getProfile();
return $profile->isMember($group);
$mem->group_id = $group->id;
$mem->profile_id = $this->id;
if ($mem->find()) {
return true;
} else {
return false;
}
} }
function isAdmin($group) function isAdmin($group)
{ {
$mem = new Group_member(); $profile = $this->getProfile();
return $profile->isAdmin($group);
$mem->group_id = $group->id;
$mem->profile_id = $this->id;
$mem->is_admin = 1;
if ($mem->find()) {
return true;
} else {
return false;
}
} }
function getGroups($offset=0, $limit=null) function getGroups($offset=0, $limit=null)