Alexander Nicolaysen Sørnes : vendor: Rename 'queued' to 'state'

[Chris Morgan]

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

Author: Alexander Nicolaysen Sørnes <alex at thehandofagony.com>
Date:   Wed Dec 12 19:03:21 2007 +0100

vendor: Rename 'queued' to 'state'

---

 include/application_queue.php |    4 ++--
 include/vendor.php            |   18 +++++++++++-------
 tables/appdb_tables.sql       |    2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/include/application_queue.php b/include/application_queue.php
index 3c98455..e48d887 100644
--- a/include/application_queue.php
+++ b/include/application_queue.php
@@ -94,7 +94,7 @@ class application_queue
     {
         /* The vendor is not necessarily queued, as it could have existed on
            beforehand */
-        if($this->oVendor->sQueued != "false")
+        if($this->oVendor->objectGetState() != 'accepted')
             $this->oVendor->unQueue();
 
         $this->oApp->unQueue();
@@ -188,7 +188,7 @@ class application_queue
 
             /* Display the new vendor form for new applications or if we
                are processing an application and the vendor is queued */
-            if(!$this->oApp->iAppId || $this->oVendor->sQueued != "false")
+            if(!$this->oApp->iAppId || $this->oVendor->objectGetState() != 'accepted')
             {
                 echo html_frame_start("New Vendor", "90%");
                 $this->oVendor->outputEditor();
diff --git a/include/vendor.php b/include/vendor.php
index 0690415..1ede853 100644
--- a/include/vendor.php
+++ b/include/vendor.php
@@ -10,7 +10,7 @@ class Vendor {
     var $iVendorId;
     var $sName;
     var $sWebpage;
-    var $sQueued;
+    private $sState;
     var $aApplicationsIds;  // an array that contains the appId of every application linked to this vendor
 
     /**    
@@ -39,7 +39,7 @@ class Vendor {
             $this->iVendorId = $oRow->vendorId;
             $this->sName = $oRow->vendorName;
             $this->sWebpage = $oRow->vendorURL;
-            $this->sQueued = $oRow->queued;
+            $this->sState = $oRow->state;
         }
 
         /*
@@ -57,7 +57,6 @@ class Vendor {
         }
     }
 
-
     /**
      * Creates a new vendor.
      *
@@ -83,10 +82,10 @@ class Vendor {
             }
         }
 
-        $hResult = query_parameters("INSERT INTO vendor (vendorName, vendorURL, queued) ".
+        $hResult = query_parameters("INSERT INTO vendor (vendorName, vendorURL, state) ".
                                     "VALUES ('?', '?', '?')",
                                         $this->sName, $this->sWebpage,
-                                        $this->mustBeQueued() ? "true" : "false");
+                                        $this->mustBeQueued() ? 'queued' : 'accepted');
         if($hResult)
         {
             $this->iVendorId = query_appdb_insert_id();
@@ -109,8 +108,8 @@ class Vendor {
         if(!$this->canEdit())
             return FALSE;
 
-        $hResult = query_parameters("UPDATE vendor SET queued = '?' WHERE vendorId = '?'",
-                                       'false', $this->iVendorId);
+        $hResult = query_parameters("UPDATE vendor SET state = '?' WHERE vendorId = '?'",
+                                       'accepted', $this->iVendorId);
 
         if(!$hResult)
             return FALSE;
@@ -282,6 +281,11 @@ class Vendor {
         return $oOMTableRow;
     }
 
+    public function objectGetState()
+    {
+        return $this->sState;
+    }
+
     function canEdit()
     {
         if($_SESSION['current']->hasPriv("admin"))
diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql
index 4273e3e..6d265f4 100644
--- a/tables/appdb_tables.sql
+++ b/tables/appdb_tables.sql
@@ -23,7 +23,7 @@ create table vendor (
        vendorId         int not null auto_increment,
        vendorName       varchar(100) not null,
        vendorURL        varchar(200),
-       queued           enum('true','false') NOT NULL default 'false',
+       state           enum('accepted','queued') NOT NULL default 'accepted',
        key(vendorId)
 );