From 956e5391def0c3d9225fa969c0760bade43d2ec5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Nicolaysen=20S=C3=B8rnes?=
 <alex@thehandofagony.com>
Date: Wed, 12 Dec 2007 19:13:16 +0100
Subject: [PATCH] distribution: Make sState member private

---
 include/distribution.php   | 7 ++++++-
 include/testData_queue.php | 6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/include/distribution.php b/include/distribution.php
index 16fc41b..d6c916a 100644
--- a/include/distribution.php
+++ b/include/distribution.php
@@ -13,7 +13,7 @@ class distribution {
     var $sUrl;
     var $sSubmitTime;
     var $iSubmitterId;
-    var $sState;
+    private $sState;
     var $aTestingIds;
 
      // constructor, fetches the data.
@@ -556,6 +556,11 @@ class distribution {
         return $oOMTableRow;
     }
 
+    public function objectGetState()
+    {
+        return $this->sState;
+    }
+
     // Whether the user has permission to edit distributions
     function canEdit()
     {
diff --git a/include/testData_queue.php b/include/testData_queue.php
index 4ef5ab6..d6ef874 100644
--- a/include/testData_queue.php
+++ b/include/testData_queue.php
@@ -49,7 +49,7 @@ class testData_queue
         $this->oTestData->unQueue();
 
         /* Avoid a misguiding message about the distribution being unqueued */
-        if($this->oDistribution->sStatus != 'accepted')
+        if($this->oDistribution->objectGetState() != 'accepted')
             $this->oDistribution->unQueue();
     }
 
@@ -77,7 +77,7 @@ class testData_queue
         /* If we are processing queued test results with a queued distribution,
            we display some additional help here */
         if($this->oDistribution->iDistributionId &&
-                $this->oDistribution->sStatus != 'accepted' && $this->canEdit())
+                $this->oDistribution->objectGetState() != 'accepted' && $this->canEdit())
         {
             echo "The user submitted a new distribution, which will be un-queued ".
                 "together with the test data unless you select an existing one ".
@@ -88,7 +88,7 @@ class testData_queue
            distribution is un-queued, there is no need to display the
            distribution form here */
         if(!$this->oTestData->iDistributionId or 
-                $this->oDistribution->sStatus != 'accepted')
+                $this->oDistribution->objectGetState() != 'accepted')
         {
             echo html_frame_start("New Distribution", "90%");
             $this->oDistribution->outputEditor();