From 2ff66ab389dc351bcdf5e339258fbb07472f6d4e Mon Sep 17 00:00:00 2001 From: Chris Morgan Date: Sun, 30 Oct 2005 02:07:54 +0000 Subject: [PATCH] Simplify and fix User::hasAppVersionModifyPermission() --- include/user.php | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/include/user.php b/include/user.php index f3a9fae..1a20b5e 100644 --- a/include/user.php +++ b/include/user.php @@ -866,17 +866,16 @@ class User { if($this->hasPriv("admin")) return true; - $sQuery = "SELECT appVersion.versionId FROM appVersion, appFamily, appMaintainers - WHERE appFamily.appId = appVersion.appId - AND appFamily.appId = appMaintainers.appId - AND appMaintainers.superMaintainer = '1' - AND appMaintainers.userId = '".$this->iUserId."' - AND appVersion.versionId = '".$oVersion->iVersionId."';"; - $hResult = query_appdb($sQuery); - if(mysql_num_rows($hResult)) + if($this->isSuperMaintainer($oVersion->iAppId)) return true; - else - return false; + + if($this->isMaintainer($oVersion->iVersionId)) + return true; + + if(($oVersion->sQueued != 'false') && ($this->iUserId == $oVersion->iSubmitterId)) + return true; + + return false; } /**