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

New events when granting and revoking roles

Browse Source 
Four new events for when roles are granted or revoked.
This commit is contained in:
Evan Prodromou 2010-10-22 10:31:50 -04:00
parent 07bc50eaed
commit 1d85bfece1
2 changed files with 51 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
EVENTS.txt
View File

@ -1142,3 +1142,19 @@ StartShowNoticeForm: before showing the notice form (before <form>)
EndShowNoticeForm: after showing the notice form (after <form>) EndShowNoticeForm: after showing the notice form (after <form>)
- $action: action being executed - $action: action being executed
StartGrantRole: when a role is being assigned
- $profile: profile that will have the role
- $role: string name of the role
EndGrantRole: when a role has been successfully assigned
- $profile: profile that will have the role
- $role: string name of the role
StartRevokeRole: when a role is being revoked
- $profile: profile that will lose the role
- $role: string name of the role
EndRevokeRole: when a role has been revoked
- $profile: profile that lost the role
- $role: string name of the role

61
classes/Profile.php
View File

@ -758,43 +758,52 @@ class Profile extends Memcached_DataObject
function grantRole($name) function grantRole($name)
{ {
$role = new Profile_role(); if (Event::handle('StartGrantRole', array($this, $name))) {
$role->profile_id = $this->id; $role = new Profile_role();
$role->role = $name;
$role->created = common_sql_now();
$result = $role->insert(); $role->profile_id = $this->id;
$role->role = $name;
$role->created = common_sql_now();
if (!$result) { $result = $role->insert();
common_log_db_error($role, 'INSERT', __FILE__);
return false; if (!$result) {
throw new Exception("Can't save role '$name' for profile '{$this->id}'");
}
Event::handle('EndGrantRole', array($this, $name));
} }
return true; return $result;
} }
function revokeRole($name) function revokeRole($name)
{ {
$role = Profile_role::pkeyGet(array('profile_id' => $this->id, if (Event::handle('StartRevokeRole', array($this, $name))) {
'role' => $name));
if (empty($role)) { $role = Profile_role::pkeyGet(array('profile_id' => $this->id,
// TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist. 'role' => $name));
// TRANS: %1$s is the role name, %2$s is the user ID (number).
throw new Exception(sprintf(_('Cannot revoke role "%1$s" for user #%2$d; does not exist.'),$name, $this->id)); if (empty($role)) {
// TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
// TRANS: %1$s is the role name, %2$s is the user ID (number).
throw new Exception(sprintf(_('Cannot revoke role "%1$s" for user #%2$d; does not exist.'),$name, $this->id));
}
$result = $role->delete();
if (!$result) {
common_log_db_error($role, 'DELETE', __FILE__);
// TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
// TRANS: %1$s is the role name, %2$s is the user ID (number).
throw new Exception(sprintf(_('Cannot revoke role "%1$s" for user #%2$d; database error.'),$name, $this->id));
}
Event::handle('EndRevokeRole', array($this, $name));
return true;
} }
$result = $role->delete();
if (!$result) {
common_log_db_error($role, 'DELETE', __FILE__);
// TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
// TRANS: %1$s is the role name, %2$s is the user ID (number).
throw new Exception(sprintf(_('Cannot revoke role "%1$s" for user #%2$d; database error.'),$name, $this->id));
}
return true;
} }
function isSandboxed() function isSandboxed()