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

objectManager: Get rid of setIsQueue/Rejected

Browse Source
This commit is contained in:
Alexander Nicolaysen Sørnes
2008-01-02 00:28:32 +01:00
committed by Chris Morgan
parent 6508c7f430
commit 61d2291e3b
3 changed files with 20 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/objectManager.php
View File

@@ -60,14 +60,14 @@ class ObjectManager
return $this->sClass; return $this->sClass;
} }
public function setIsQueue($bIsQueue) public function getState()
{ {
$this->bIsQueue = $bIsQueue; return $this->sState;
}
if($this->sState != 'rejected' && $bIsQueue) public function setState($sState)
$this->sState = 'queued'; {
else if ($this->sState == 'queued' && !$bIsQueue) $this->sState = $sState;
$this->sState = 'accepted';
} }
public function getIsQueue() public function getIsQueue()
@@ -85,16 +85,6 @@ class ObjectManager
$this->sReturnToTitle = $sTitle; $this->sReturnToTitle = $sTitle;
} }
public function setIsRejected($bIsRejected)
{
$this->bIsRejected = $bIsRejected;
if($bIsRejected)
$this->sState = 'rejected';
else if ($this->sState == 'rejected')
$this->sState = 'queued';
}
public function setSortInfo($aClean = null) public function setSortInfo($aClean = null)
{ {
/* No use to continue if there are no sortable fields */ /* No use to continue if there are no sortable fields */

9
include/util.php
View File

@@ -234,6 +234,15 @@ function make_maintainer_rating_list($varname, $cvalue)
return $sTxt; return $sTxt;
} }
/* Get the element with specified key from an array if it is defined */
function getInput($sVar, $aInput)
{
if(array_key_exists($sVar, $aInput))
return $aInput[$sVar];
return null;
}
/* Get the number of users in the database */ /* Get the number of users in the database */
function getNumberOfComments() function getNumberOfComments()
{ {

19
objectManager.php
View File

@@ -42,10 +42,12 @@ $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(isset($aClean['bIsQueue']) && $aClean['bIsQueue'] == 'true') if(getInput('bIsRejected', $aClean) == 'true')
$oObject->setIsQueue(true); $oObject->setState('rejected');
else if(getInput('bIsQueue', $aClean) == 'true')
$oObject->setState('queued');
else else
$oObject->setIsQueue(false); $oObject->setState('accepted');
if(isset($aClean['sReturnToTitle'])) if(isset($aClean['sReturnToTitle']))
$oObject->setReturnToTitle($aClean['sReturnToTitle']); $oObject->setReturnToTitle($aClean['sReturnToTitle']);
@@ -53,17 +55,6 @@ if(isset($aClean['sReturnToTitle']))
if(isset($aClean['sReturnTo'])) if(isset($aClean['sReturnTo']))
$oObject->setReturnTo($aClean['sReturnTo']); $oObject->setReturnTo($aClean['sReturnTo']);
$aClean['bIsRejected'] = isset($aClean['bIsRejected']) ? $aClean['bIsRejected'] : false;
/* If it is rejected it is defined as queued */
if($aClean['bIsRejected'] == 'true')
{
$oObject->setIsRejected(true);
$oObject->setIsQueue(true);
} else
{
$oObject->setIsRejected(false);
}
$oObject->getMultiPageDataFromInput($aClean); $oObject->getMultiPageDataFromInput($aClean);
$oObject->setSortInfo($aClean); $oObject->setSortInfo($aClean);