diff --git a/classes/paranoia.class.php b/classes/paranoia.class.php index ed575583..67e28a60 100644 --- a/classes/paranoia.class.php +++ b/classes/paranoia.class.php @@ -80,7 +80,7 @@ function check_paranoia($Property, $Paranoia, $UserClass, $UserID = false) { case 'ratio': case 'uploaded': case 'lastseen': - if (check_perms('users_mod', $UserClass)) + if (check_perms('users_mod')) return PARANOIA_OVERRIDDEN; break; case 'snatched': case 'snatched+': diff --git a/classes/permissions.class.php b/classes/permissions.class.php index 4af3060e..ae57dbb5 100644 --- a/classes/permissions.class.php +++ b/classes/permissions.class.php @@ -14,8 +14,7 @@ public static function check_perms($PermissionName, $MinClass = 0) { return ( isset(G::$LoggedUser['Permissions'][$PermissionName]) && G::$LoggedUser['Permissions'][$PermissionName] - && (G::$LoggedUser['Class'] >= $MinClass - || G::$LoggedUser['EffectiveClass'] >= $MinClass + && (G::$LoggedUser['EffectiveClass'] >= $MinClass || $Override) ) ? true : false; } diff --git a/sections/friends/friends.php b/sections/friends/friends.php index 6d82599c..ce03c908 100644 --- a/sections/friends/friends.php +++ b/sections/friends/friends.php @@ -30,13 +30,14 @@ m.Username, m.Uploaded, m.Downloaded, - m.PermissionID, + p.Level, m.Paranoia, m.LastAccess, i.Avatar FROM friends AS f JOIN users_main AS m ON f.FriendID = m.ID JOIN users_info AS i ON f.FriendID = i.UserID + LEFT JOIN permissions AS p ON p.ID = m.PermissionID WHERE f.UserID = '$UserID' ORDER BY Username LIMIT $Limit");