Use object manager to process screenshot queue. Temporary fix for mysql overloading by

limiting screenshot processing to submitters.
This commit is contained in:
Alexander Nicolaysen Sørnes
2007-03-11 03:07:43 +00:00
committed by WineHQ
parent ad2f0a0504
commit e9060a68d5
4 changed files with 190 additions and 13 deletions

View File

@@ -8,6 +8,33 @@ require_once(BASE."include/util.php");
class appData
{
var $iId;
var $iAppId;
var $iVersionId;
var $iSubmitterId;
var $sSubmitTime;
function appData($iId = null, $oRow = null)
{
if(!$iId)
return;
if(!$oRow)
{
$hResult = query_parameters("SELECT * FROM appData WHERE $iId = '?'", $iId);
$oRow = mysql_fetch_object();
}
if($oRow)
{
$this->iSubmitterId = $oRow->submitterId;
$this->iAppId = $oRow->appId;
$this->iVersionId = $oRow->versionId;
$this->sSubmitTime = $oRow->submitTime;
$this->iId = $iId;
}
}
function listSubmittedBy($iUserId, $bQueued = true)
{
$hResult = query_parameters("SELECT appData.TYPE, appData.appId,
@@ -78,10 +105,10 @@ class appData
if(($sQueued == "true" || $sQueued == "all") && !appData::canEdit($sType))
return FALSE;
if(($sQueued == "true" || $sQueued == "all") &&
/* if(($sQueued == "true" || $sQueued == "all") &&
!$_SESSION['current']->hasPriv("admin"))
{
$sQuery = "SELECT COUNT(DISTINCT id) as count FROM appData, appMaintainers,
$sQuery = "SELECT COUNT(DISTINCT id) as count FROM appData, appMaintainers,
appVersion, appFamily
WHERE appMaintainers.userId = '?' AND
((((appMaintainers.appId = appFamily.appId) OR appMaintainers.appId =
@@ -99,7 +126,7 @@ class appData
if($sType)
{
$sQuery = " AND type = '?'";
$sQuery .= " AND type = '?'";
$hResult = query_parameters($sQuery, $_SESSION['current']->iUserId,
$sType);
} else {
@@ -111,17 +138,31 @@ class appData
appFamily, appVersion
WHERE ((appData.appId = appFamily.appId) OR (appData.versionId =
appVersion.versionId)) AND appVersion.queued = 'false' AND
appFamily.queued = 'false'";
appFamily.queued = 'false'";*/
$sQuery = "SELECT COUNT(*) as count FROM appData WHERE 1";
if($sQueued == "true" || $sQueued == "false")
$sQuery .= " AND appData.queued = '$sQueued'";
if($_SESSION['current']->hasPriv("admin"))
{
if($sType)
{
$sQuery .= " AND type = '?'";
$hResult = query_parameters($sQuery,$sType);
$hResult = query_parameters($sQuery, $sType);
} else
$hResult = query_parameters($sQuery);
} else
{
$sQuery .= " AND submitterId = '?'";
if($sType)
{
$sQuery .= " AND type = '?'";
$hResult = query_parameters($sQuery, $_SESSION['current']->iUserId,
$sType);
} else
$hResult = query_parameters($sQuery, $_SESSION['current']->iUserId);
}
if(!$hResult)
@@ -131,6 +172,68 @@ class appData
return FALSE;
return $oRow->count;
}
function objectOutputHeader($sClass, $sType)
{
$aCells = array(
"Submission Date",
"Submitter",
"Application",
"Version");
if(appData::canEdit($sType))
$aCells[] = "Action";
echo html_tr($aCells, $sClass);
}
function objectGetEntries($bQueued, $sType)
{
if($bQueued && !appData::canEdit($sType))
return FALSE;
/*
if($bQueued && !$_SESSION['current']->hasPriv("admin"))
{
$sQuery = "SELECT DISTINCT appData.* FROM appData, appMaintainers,
appVersion, appFamily
WHERE appMaintainers.userId = '?' AND
((((appMaintainers.appId = appFamily.appId) OR appMaintainers.appId =
appVersion.appId) AND
appMaintainers.superMaintainer = '1' AND (appData.appId =
appMaintainers.appId OR (appData.versionId = appVersion.versionId
AND appVersion.appId = appMaintainers.appId))
) OR (appMaintainers.superMaintainer = '0' AND appMaintainers.versionId =
appVersion.versionId AND appMaintainers.versionId = appData.versionId))
AND appVersion.queued = 'false' AND
appFamily.queued = 'false' AND appData.queued = '?' AND
appData.type = '?'";
$hResult = query_parameters($sQuery, $_SESSION['current']->iUserId,
$bQueued ? "true" : "false", $sType);
} else
{
$sQuery = "SELECT DISTINCT appData.* FROM appData, appFamily, appVersion
WHERE ((appData.appId = appFamily.appId) OR (appData.versionId =
appVersion.versionId)) AND appVersion.queued = 'false' AND
appFamily.queued = 'false' AND appData.queued = '?' AND
appData.type = '?'"; */
$sQuery = "SELECT * FROM appData WHERE queued = '?' AND type = '?'";
if($_SESSION['current']->hasPriv("admin"))
$hResult = query_parameters($sQuery, $bQueued ? "true" : "false", $sType);
else
{
$sQuery .= " AND submitterId = '?'";
$hResult = query_parameters($sQuery, $bQueued ? "true" : "false", $sType,
$_SESSION['current']->iUserId);
}
if(!$hResult)
return FALSE;
return $hResult;
}
function canEdit($sType = null)
@@ -148,6 +251,35 @@ class appData
return FALSE;
}
}
function objectOutputTableRow($oObject, $sClass)
{
$oVersion = new Version($this->iVersionId);
if(!$this->iAppId)
$this->iAppId = $oVersion->iAppId;
$oApp = new Application($this->iAppId);
$oUser = new User($this->iSubmitterId);
$aCells = array(
print_date(mysqldatetime_to_unixtimestamp($this->sSubmitTime)),
$oUser->sRealname,
$oApp->sName,
$this->iVersionId ? $oVersion->sName : "N/A");
if(appData::canEdit($oObject->sClass))
$aCells[] = "[ <a href=\"".BASE."admin/adminAppDataQueue.php?iId=".
"$this->iId\">Process</a> ]";
echo html_tr($aCells, $sClass);
}
function objectDisplayQueueProcessingHelp()
{
$sHelp = "<p>This is a list of application data submitted by users. ".
"Please inspect the data carefully before accepting or rejecting it.</p>";
echo $sHelp;
}
}
?>