version: Add 'pending' queue state

include/version.php

@@ -92,7 +92,11 @@ class version {
         if(!$_SESSION['current']->canCreateVersion())
             return;
 
-        $this->sQueued = $this->mustBeQueued() ? "true" : "false";
+        $oApp = new application($this->iAppId);
+        if($oApp->sQueued != "false")
+            $this->sQueued = "pending";
+        else
+            $this->sQueued = $this->mustBeQueued() ? "true" : "false";
 
         $hResult = query_parameters("INSERT INTO appVersion
                    (versionName, description, maintainer_release,
@@ -274,7 +278,7 @@ class version {
             return;
 
         // If we are not in the queue, we can't move the version out of the queue.
-        if(!$this->sQueued == 'true')
+        if($this->sQueued == 'false')
             return false;
 
         if(query_parameters("UPDATE appVersion SET queued = '?' WHERE versionId = '?'",

include/version_queue.php

@@ -52,7 +52,6 @@ class version_queue
 
     function reQueue()
     {
-        $this->oVersion->reQueue();
         $this->oDownloadUrl->reQueue();
     }
 

tables/appdb_tables.sql

@@ -58,7 +58,7 @@ create table appVersion (
   maintainer_release    text,
   submitTime            datetime NOT NULL,
   submitterId           int(11) NOT NULL default '0',
-  queued                enum('true','false','rejected') NOT NULL default 'false',
+  queued                enum('true','false','rejected','pending') NOT NULL default 'false',
   license		enum('Retail','Open Source','Freeware','Demo','Shareware'),
   obsoleteBy            int(11) NOT NULL default '0',
   key(versionId),