claunia/qemudb
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add and use version::objectGetEntriesCount(). Only display the user menu's 'view rejected

Browse Source 
apps' link for non-admins
This commit is contained in:
Alexander Nicolaysen Sørnes
2007-04-04 00:30:42 +00:00
committed by WineHQ
parent 89535dbe01
commit 970cbca7f3
5 changed files with 77 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/sidebar_admin.php
View File

@@ -12,7 +12,7 @@ function global_admin_menu() {
$g->add("View App Queue (".application::objectGetEntriesCount(true, false).")",
BASE."objectManager.php?sClass=application&bIsQueue=true&sTitle=".
"Application%20Queue");
$g->add("View Version Queue (".$_SESSION['current']->getQueuedVersionCount().")",
$g->add("View Version Queue (".version::objectGetEntriesCount(true, false).")",
BASE."admin/adminAppQueue.php");
$g->add("View Screenshot Queue (".appData::objectGetEntriesCount("true",
false, "screenshot").")",
@@ -45,6 +45,8 @@ function global_admin_menu() {
true).")",
BASE."objectManager.php?sClass=application&bIsQueue=true&bIsRejected=true&".
"sTitle=Rejected%20Applications");
$g->add("View Rejected Versions (".version::objectGetEntriesCount(true, true).")",
BASE."appsubmit.php");
$g->add("View Rejected Test Results (".testData::objectGetEntriesCount(true,
true).")",
BASE."objectManager.php?sClass=testData&bIsQueue=true&bIsRejected=true&".

8
include/sidebar_login.php
View File

@@ -34,9 +34,11 @@ function global_sidebar_login() {
$g->addmisc(version::fullNameLink($versionId), "center");
}
}
$appsRejected = $_SESSION['current']->getAllRejectedApps();
if($appsRejected)
$g->addmisc("<a href='".BASE."appsubmit.php?'>Review Rejected Apps</a>", "center");
$iAppsRejected = application::objectGetEntriesCount(true, true) +
version::objectGetEntriesCount(true, true);
if($iAppsRejected && !$_SESSION['current']->hasPriv("admin"))
$g->addmisc("<a href='".BASE."appsubmit.php?'>Review Rejected Apps ".
"($iAppsRejected)</a>", "center");
$aMonitored = Monitor::getVersionsMonitored($_SESSION['current']);
if($aMonitored)

2
include/sidebar_maintainer_admin.php
View File

@@ -7,7 +7,7 @@ function global_maintainer_admin_menu() {
$g = new htmlmenu("Maintainer Admin");
$g->add("View Version Queue (".$_SESSION['current']->getQueuedVersionCount().")",
$g->add("View Version Queue (".version::objectGetEntriesCount(true, false).")",
BASE."admin/adminAppQueue.php");
$g->add("View Screenshot Queue (".appData::objectGetEntriesCount("true",
false, "screenshot").")",

57
include/user.php
View File

@@ -265,40 +265,6 @@ class User {
return Maintainer::isUserSuperMaintainer($this, $iAppId);
}
/* get the number of queued applications */
function getQueuedAppCount()
{
/* return 0 because non-admins have no way to process new apps */
if(!$this->hasPriv("admin"))
return 0;
$sQuery = "SELECT count(*) as queued_apps FROM appFamily WHERE queued='true'";
$hResult = query_parameters($sQuery);
$oRow = mysql_fetch_object($hResult);
return $oRow->queued_apps;
}
function getQueuedVersionCount()
{
if($this->hasPriv("admin"))
{
$hResult = query_parameters("SELECT count(*) as queued_versions FROM appVersion WHERE queued='true'");
} else
{
/* find all queued versions of applications that the user is a super maintainer of */
$hResult = query_parameters("SELECT count(*) as queued_versions FROM appVersion, appMaintainers
WHERE appVersion.queued='true' AND appMaintainers.superMaintainer ='1'
AND appVersion.appId = appMaintainers.appId
AND appMaintainers.userId ='?'", $this->iUserId);
}
$oRow = mysql_fetch_object($hResult);
/* we don't want to count the versions that are implicit in the applications */
/* that are in the queue */
return $oRow->queued_versions - $this->getQueuedAppCount();
}
function addPriv($sPriv)
{
if(!$this->isLoggedIn() || !$sPriv)
@@ -500,29 +466,6 @@ class User {
return query_appdb($sQuery);
}
function getAllRejectedApps()
{
$hResult = query_parameters("SELECT appVersion.versionId, appFamily.appId
FROM appVersion, appFamily
WHERE appFamily.appId = appVersion.appId
AND (appFamily.queued = 'rejected' OR appVersion.queued = 'rejected')
AND appVersion.submitterId = '?'",
$this->iUserId);
if(!$hResult || mysql_num_rows($hResult) == 0)
return;
$retval = array();
$c = 0;
while($oRow = mysql_fetch_object($hResult))
{
$retval[$c] = array($oRow->appId, $oRow->versionId);
$c++;
}
return $retval;
}
function isAppSubmitter($iAppId)
{
$hResult = query_parameters("SELECT appId FROM appFamily

68
include/version.php
View File

@@ -1152,6 +1152,74 @@ class Version {
$this->sName."</a>";
return $sLink;
}
function objectGetEntriesCount($bQueued, $bRejected)
{
$sQueued = objectManager::getQueueString($bQueued, $bRejected);
if($bQueued && !version::canEdit())
{
/* Users should see their own rejected entries */
if($bRejected)
$sIncludeUserSubmissions = "OR appVersion.submitterId = '".
$_SESSION['current']->iUserId."'";
$sQuery = "SELECT COUNT(DISTINCT appVersion.versionId) as count FROM
appVersion, appMaintainers, appFamily WHERE
appFamily.appId = appVersion.appId
AND
appFamily.queued = 'false'
AND
(
(
(
(
appMaintainers.appId = appVersion.appId
AND
superMaintainer = '1'
)
OR
(
appMaintainers.versionId = appVersion.versionId
AND
superMaintainer = '0'
)
)
AND
appMaintainers.userId = '?'
AND
appMaintainers.queued = 'false'
)
$sIncludeUserSubmissions
)
AND
appVersion.queued = '?'";
$hResult = query_parameters($sQuery, $_SESSION['current']->iUserId, $sQueued);
} else
{
$sQuery = "SELECT COUNT(DISTINCT versionId) as count
FROM appVersion, appFamily WHERE
appFamily.appId = appVersion.appId
AND
appFamily.queued = 'false'
AND
appVersion.queued = '?'";
$hResult = query_parameters($sQuery, $sQueued);
}
if(!$hResult)
return FALSE;
if(!$oRow = mysql_fetch_object($hResult))
return FALSE;
return $oRow->count;
}
function canEdit()
{
return $_SESSION['current']->hasPriv("admin");
}
}
?>