Alexander Nicolaysen Sørnes : objectManager: Get rid of setIsQueue/Rejected

[Chris Morgan]

Module: appdb
Branch: master
Commit: 61d2291e3beb2e39d345b516af7f0f5b6be4489e
URL:    http://source.winehq.org/git/appdb.git/?a=commit;h=61d2291e3beb2e39d345b516a...

Author: Alexander Nicolaysen Sørnes 
Date:   Wed Jan  2 00:28:32 2008 +0100

objectManager: Get rid of setIsQueue/Rejected

---

include/objectManager.php |   22 ++++++----------------
 include/util.php          |    9 +++++++++
 objectManager.php         |   19 +++++--------------
 3 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/include/objectManager.php b/include/objectManager.php
index 30c7b62..2dbfdf2 100644
--- a/include/objectManager.php
+++ b/include/objectManager.php
@@ -60,14 +60,14 @@ class ObjectManager
       return $this->sClass;
     }

-    public function setIsQueue($bIsQueue)
+    public function getState()
     {
-      $this->bIsQueue = $bIsQueue;
+        return $this->sState;
+    }

-      if($this->sState != 'rejected' && $bIsQueue)
-          $this->sState = 'queued';
-      else if ($this->sState == 'queued' && !$bIsQueue)
-          $this->sState = 'accepted';
+    public function setState($sState)
+    {
+        $this->sState = $sState;
     }

public function getIsQueue()
@@ -85,16 +85,6 @@ class ObjectManager
       $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)
     {
         /* No use to continue if there are no sortable fields */
diff --git a/include/util.php b/include/util.php
index 0048da7..0822b3c 100644
--- a/include/util.php
+++ b/include/util.php
@@ -234,6 +234,15 @@ function make_maintainer_rating_list($varname, $cvalue)
     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 */
 function getNumberOfComments()
 {
diff --git a/objectManager.php b/objectManager.php
index 11f1e23..8be8181 100644
--- a/objectManager.php
+++ b/objectManager.php
@@ -42,10 +42,12 @@ $aClean['iId'] = isset($aClean['iId']) ? $aClean['iId'] : 0;

$oObject = new objectManager($aClean['sClass'], $aClean['sTitle'], $aClean['iId']);

-if(isset($aClean['bIsQueue']) && $aClean['bIsQueue'] == 'true')
-  $oObject->setIsQueue(true);
+if(getInput('bIsRejected', $aClean) == 'true')
+    $oObject->setState('rejected');
+else if(getInput('bIsQueue', $aClean) == 'true')
+  $oObject->setState('queued');
 else
-  $oObject->setIsQueue(false);
+  $oObject->setState('accepted');

if(isset($aClean['sReturnToTitle']))
   $oObject->setReturnToTitle($aClean['sReturnToTitle']);
@@ -53,17 +55,6 @@ if(isset($aClean['sReturnToTitle']))
 if(isset($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->setSortInfo($aClean);