From b587dbfd172172ff992ef84b7c3e923c29504e71 Mon Sep 17 00:00:00 2001
From: Tony Lambregts <tony.lambregts@gmail.com>
Date: Tue, 17 Jan 2006 02:33:14 +0000
Subject: [PATCH] Only create new distributions if the user didn't pick one
 from the dropdown menu.  Previous behavior would create a new distribution if
 any text was present in the 'distribution' textbox, even if a distribution is
 picked from the dropdown menu.

---
 appsubmit.php   | 16 +++++++++-------
 testResults.php | 31 +++++++++++++++++--------------
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/appsubmit.php b/appsubmit.php
index e981f6c..d960d1e 100644
--- a/appsubmit.php
+++ b/appsubmit.php
@@ -181,14 +181,16 @@ if ($_REQUEST['sub'])
             {
                  $oVersion->create();
             }
-
-            $sDistribution = trim($_REQUEST['sDistribution']);
-            if(!empty($sDistribution))
+            if(!$_REQUEST['iDistributionId'])
             {
-                $oDistribution = new distribution();
-                $oDistribution->sName = $sDistribution;
-                $oDistribution->create();
-                $oTest->iDistributionId = $oDistribution->iDistributionId;
+                $sDistribution = trim($_REQUEST['sDistribution']);
+                if(!empty($sDistribution))
+                {
+                    $oDistribution = new distribution();
+                    $oDistribution->sName = $sDistribution;
+                    $oDistribution->create();
+                    $oTest->iDistributionId = $oDistribution->iDistributionId;
+                }
             }
             $oTest->iVersionId = $oVersion->iVersionId;
             if(is_numeric($oTest->iTestingId))
diff --git a/testResults.php b/testResults.php
index 2e6dafe..f0cdab4 100644
--- a/testResults.php
+++ b/testResults.php
@@ -27,22 +27,25 @@ if ($_REQUEST['sub'])
         $oTest->GetOutputEditorValues(); // retrieve the values from the current $_REQUEST 
         if(empty($errors))
         {
-            $sDistribution = trim($_REQUEST['sDistribution']);
-            if(!empty($sDistribution))
+            if(!$_REQUEST['iDistributionId'])
             {
-                $oDistribution = new distribution();
-                $oDistribution->sName = $sDistribution;
-                $oDistribution->create();
-                $oTest->iDistributionId = $oDistribution->iDistributionId;
+                $sDistribution = trim($_REQUEST['sDistribution']);
+                if(!empty($sDistribution))
+                {
+                    $oDistribution = new distribution();
+                    $oDistribution->sName = $sDistribution;
+                    $oDistribution->create();
+                    $oTest->iDistributionId = $oDistribution->iDistributionId;
+                }
+            }
+            if($_REQUEST['sub'] == 'Submit')
+            {
+	        $oTest->create();
+            } else if($_REQUEST['sub'] == 'Resubmit')
+            {
+                $oTest->update(true);
+	        $oTest->ReQueue();
             }
-		if($_REQUEST['sub'] == 'Submit')
-		{
-	            $oTest->create();
-		} else if($_REQUEST['sub'] == 'Resubmit')
-		{
-	            $oTest->update(true);
-	            $oTest->ReQueue();
-		}
             redirect($_SERVER['PHP_SELF']);
         } else 
         {