mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 06:38:00 +02:00
Code Issues Releases Wiki Activity

getperms() was not functioning correctly when multiple values checked.

Browse Source
This commit is contained in:
CaMer0n
2011-05-11 11:52:50 +00:00
parent 270495d416
commit a09dec0b6c
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
class2.php
View File

@@ -1159,14 +1159,21 @@ function check_class($var, $userclass = USERCLASS_LIST, $uid = 0)
function getperms($arg, $ap = ADMINPERMS) function getperms($arg, $ap = ADMINPERMS)
{ {
// $ap = "4"; // Just for testing.
if(!ADMIN || trim($ap) === '') if(!ADMIN || trim($ap) === '')
{ {
return false; return FALSE;
}
if($arg === 0) // Common-error avoidance with getperms(0)
{
$arg = '0';
} }
if ($ap === '0' || $ap === '0.') // BC fix. if ($ap === '0' || $ap === '0.') // BC fix.
{ {
return true; return TRUE;
} }
if ($arg == 'P' && preg_match("#(.*?)/".e107::getInstance()->getFolder('plugins')."(.*?)/(.*?)#", e_SELF, $matches)) if ($arg == 'P' && preg_match("#(.*?)/".e107::getInstance()->getFolder('plugins')."(.*?)/(.*?)#", e_SELF, $matches))
@@ -1183,24 +1190,24 @@ function getperms($arg, $ap = ADMINPERMS)
$ap_array = explode('.',$ap); $ap_array = explode('.',$ap);
if(in_array($arg,$ap_array)) if(in_array($arg,$ap_array,FALSE))
{ {
return true; return TRUE;
} }
elseif(strpos($arg, "|")) // check for multiple perms - separated by '|'. elseif(strpos($arg, "|")) // check for multiple perms - separated by '|'.
{ {
$tmp = explode("|", $arg); $tmp = explode("|", $arg);
foreach($tmp as $val) foreach($tmp as $val)
{ {
if(in_array($arg,$ap_array)) if(in_array($val,$ap_array))
{ {
return true; return TRUE;
} }
} }
} }
else else
{ {
return false; return FALSE;
} }
} }