objectManager: Handle sState in URLs

This commit is contained in:
Alexander Nicolaysen Sørnes
2008-01-06 01:14:56 +01:00
committed by Chris Morgan
parent d4c09ee6f3
commit f04c6fe4dc
4 changed files with 40 additions and 26 deletions

View File

@@ -65,7 +65,19 @@ class ObjectManager
public function setState($sState) public function setState($sState)
{ {
/* Ensure that the given state is valid */
switch($sState)
{
case 'accepted':
case 'queued':
case 'rejected':
case 'deleted':
$this->sState = $sState; $this->sState = $sState;
return true;
default:
return false;
}
} }
public function getIsQueue() public function getIsQueue()

View File

@@ -21,7 +21,7 @@ function global_sidebar_menu()
$g->add("Screenshots", BASE."objectManager.php?sClass=screenshot&sTitle=View+Screenshots"); $g->add("Screenshots", BASE."objectManager.php?sClass=screenshot&sTitle=View+Screenshots");
$g->add("Browse Apps", BASE."appbrowse.php"); $g->add("Browse Apps", BASE."appbrowse.php");
$g->add("Browse Newest Apps", BASE."objectManager.php?sClass=application&". $g->add("Browse Newest Apps", BASE."objectManager.php?sClass=application&".
"bIsQueue=false&sTitle=Newest%20apps&sOrderBy=appId&bAscending=false"); 'sTitle=Newest%20apps&sOrderBy=appId&bAscending=false');
$g->add("Downloadable Apps", BASE."browse_downloadable.php"); $g->add("Downloadable Apps", BASE."browse_downloadable.php");
$g->add("Browse Apps by Rating", BASE."browse_by_rating.php"); $g->add("Browse Apps by Rating", BASE."browse_by_rating.php");
$g->add("Top 25", BASE."votestats.php"); $g->add("Top 25", BASE."votestats.php");
@@ -29,8 +29,8 @@ function global_sidebar_menu()
"sTitle=Submit+Application&sAction=add"); "sTitle=Submit+Application&sAction=add");
$g->add("Help & Documentation", BASE."help/"); $g->add("Help & Documentation", BASE."help/");
$g->add("Statistics", BASE."appdbStats.php"); $g->add("Statistics", BASE."appdbStats.php");
$g->add("Distributions (".distribution::objectGetEntriesCount(false, false).")", BASE."objectManager.php?sClass=distribution&bIsQueue=false&sTitle=View%20Distributions"); $g->add("Distributions (".distribution::objectGetEntriesCount(false, false).")", BASE.'objectManager.php?sClass=distribution&sTitle=View%20Distributions');
$g->add("Vendors (".vendor::objectGetEntriesCount(false, false).")", BASE."objectManager.php?sClass=vendor&bIsQueue=false&sTitle=View%20Vendors"); $g->add("Vendors (".vendor::objectGetEntriesCount(false, false).")", BASE.'objectManager.php?sClass=vendor&sTitle=View%20Vendors');
$g->add("Email your suggestions for improving the AppDB", "mailto:appdb@winehq.org"); $g->add("Email your suggestions for improving the AppDB", "mailto:appdb@winehq.org");
$g->done(); $g->done();

View File

@@ -10,34 +10,34 @@ function global_admin_menu() {
$g = new htmlmenu("Global Admin"); $g = new htmlmenu("Global Admin");
$g->add("App Queue (".application::objectGetEntriesCount(true, false).")", $g->add("App Queue (".application::objectGetEntriesCount(true, false).")",
BASE."objectManager.php?sClass=application_queue&bIsQueue=true&sTitle=". BASE.'objectManager.php?sClass=application_queue&sState=queued&sTitle='.
"Application%20Queue"); 'Application%20Queue');
$g->add("Version Queue (".version::objectGetEntriesCount(true, false).")", $g->add("Version Queue (".version::objectGetEntriesCount(true, false).")",
BASE."objectManager.php?sClass=version_queue&bIsQueue=true&sTitle=". BASE.'objectManager.php?sClass=version_queue&sState=queued&sTitle='.
"Version%20Queue"); 'Version%20Queue');
$g->add("Screenshot Queue (".appData::objectGetEntriesCount("true", $g->add("Screenshot Queue (".appData::objectGetEntriesCount("true",
false, "screenshot").")", false, "screenshot").")",
BASE."objectManager.php?sClass=screenshot&bIsQueue=true&sTitle=". BASE.'objectManager.php?sClass=screenshot&sState=queued&sTitle='.
"Screenshot%20Queue"); 'Screenshot%20Queue');
$g->add("Maintainer Queue (".Maintainer::objectGetEntriesCount(true, false).")", $g->add("Maintainer Queue (".Maintainer::objectGetEntriesCount(true, false).")",
BASE."objectManager.php?sClass=maintainer&bIsQueue=true&sTitle=". BASE.'objectManager.php?sClass=maintainer&sState=queued&sTitle='.
"Maintainer%20Queue"); 'Maintainer%20Queue');
$g->add("Test Results Queue (".testData::objectGetEntriesCount(true, false).")", $g->add("Test Results Queue (".testData::objectGetEntriesCount(true, false).")",
BASE."objectManager.php?sClass=testData_queue&bIsQueue=true&sTitle=". BASE.'objectManager.php?sClass=testData_queue&sState=queued&sTitle='.
"Test%20Results%20Queue"); 'Test%20Results%20Queue');
$g->add("Bug Link Queue (".bug::objectGetEntriesCount(true, false).")", $g->add("Bug Link Queue (".bug::objectGetEntriesCount(true, false).")",
BASE."objectManager.php?sClass=bug&bIsQueue=true&sTitle=". BASE.'objectManager.php?sClass=bug&sState=queued&sTitle='.
"Bug%20Link%20Queue"); 'Bug%20Link%20Queue');
$g->addmisc(" "); $g->addmisc(" ");
$g->add("Maintainer Entries (".Maintainer::getMaintainerCount().")", $g->add("Maintainer Entries (".Maintainer::getMaintainerCount().")",
BASE."admin/adminMaintainers.php"); BASE."admin/adminMaintainers.php");
$g->add("Bug Links (".bug::objectGetEntriesCount(false, false).")", $g->add("Bug Links (".bug::objectGetEntriesCount(false, false).")",
BASE."objectManager.php?sClass=bug&bIsQueue=false&sTitle=". BASE."objectManager.php?sClass=bug&sTitle=".
"Bug%20Links"); "Bug%20Links");
$g->add("Test Results (".testData::objectGetEntriesCount(false, false).")", $g->add("Test Results (".testData::objectGetEntriesCount(false, false).")",
BASE."objectManager.php?sClass=testData&bIsQueue=false&sTitle=". BASE."objectManager.php?sClass=testData&sTitle=".
"View%20Test%20Results"); "View%20Test%20Results");
$g->add("Users Management", BASE."admin/adminUsers.php"); $g->add("Users Management", BASE."admin/adminUsers.php");
$g->add("Comments Management", BASE."admin/adminCommentView.php"); $g->add("Comments Management", BASE."admin/adminCommentView.php");
@@ -47,15 +47,15 @@ function global_admin_menu() {
$g->add("Rejected Applications (".application::objectGetEntriesCount(true, $g->add("Rejected Applications (".application::objectGetEntriesCount(true,
true).")", true).")",
BASE."objectManager.php?sClass=application_queue&bIsQueue=true&bIsRejected=". BASE.'objectManager.php?sClass=application_queue&sState=rejected&'.
"true&sTitle=Rejected%20Applications"); 'sTitle=Rejected%20Applications');
$g->add("Rejected Versions (".version::objectGetEntriesCount(true, true).")", $g->add("Rejected Versions (".version::objectGetEntriesCount(true, true).")",
BASE."objectManager.php?sClass=version_queue&bIsQueue=true&". BASE.'objectManager.php?sClass=version_queue&sState=rejected&'.
"bIsRejected=true&sTitle=Rejected%20Versions"); 'sTitle=Rejected%20Versions');
$g->add("Rejected Test Results (".testData::objectGetEntriesCount(true, $g->add("Rejected Test Results (".testData::objectGetEntriesCount(true,
true).")", true).")",
BASE."objectManager.php?sClass=testData_queue&bIsQueue=true". BASE.'objectManager.php?sClass=testData_queue&sState=rejected&'.
"&bIsRejected=true&sTitle=Rejected%20Test%20Results"); 'sTitle=Rejected%20Test%20Results');
$g->addmisc(" "); $g->addmisc(" ");

View File

@@ -42,7 +42,9 @@ $aClean['iId'] = isset($aClean['iId']) ? $aClean['iId'] : 0;
$oObject = new objectManager($aClean['sClass'], $aClean['sTitle'], $aClean['iId']); $oObject = new objectManager($aClean['sClass'], $aClean['sTitle'], $aClean['iId']);
if(getInput('bIsRejected', $aClean) == 'true') if(getInput('sState', $aClean))
$oObject->setState($aClean['sState']);
else if(getInput('bIsRejected', $aClean) == 'true') // Compatibility with old URLs
$oObject->setState('rejected'); $oObject->setState('rejected');
else if(getInput('bIsQueue', $aClean) == 'true') else if(getInput('bIsQueue', $aClean) == 'true')
$oObject->setState('queued'); $oObject->setState('queued');