make isAdmin accept a user name, too
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@669 b3834d28-1941-0410-a4f8-b48e95affb8f
This commit is contained in:
parent
6a6cba1a4d
commit
6c9542f24b
1 changed files with 11 additions and 3 deletions
|
@ -305,9 +305,14 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService
|
|||
/**
|
||||
* Checks if the given user is an administrator.
|
||||
* Uses global admin_users property containing admin
|
||||
* user names
|
||||
* user names.
|
||||
*
|
||||
* @param integer|array $user User ID or user row from DB
|
||||
* Passing the user id makes this function load the user
|
||||
* from database. For efficiency reasons, try to pass
|
||||
* the user name or database row.
|
||||
*
|
||||
* @param integer|array|string $user User ID or user row from DB
|
||||
* or user name
|
||||
*
|
||||
* @return boolean True if the user is admin
|
||||
*/
|
||||
|
@ -315,10 +320,13 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService
|
|||
{
|
||||
if (is_numeric($user)) {
|
||||
$user = $this->getUser($user);
|
||||
$user = $user['username'];
|
||||
} else if (is_array($user)) {
|
||||
$user = $user['username'];
|
||||
}
|
||||
|
||||
if (isset($GLOBALS['admin_users'])
|
||||
&& in_array($user['username'], $GLOBALS['admin_users'])
|
||||
&& in_array($user, $GLOBALS['admin_users'])
|
||||
) {
|
||||
return true;
|
||||
} else {
|
||||
|
|
Loading…
Reference in a new issue