From 863467667d2be9dbd4a6e45d4143153fdbe9cf42 Mon Sep 17 00:00:00 2001
From: Jonathan Ernst <Jonathan@ernstfamily.ch>
Date: Wed, 2 Feb 2005 02:39:40 +0000
Subject: [PATCH] Don't use appId in for objects related to appVersion,
 appVersion implies an appId

---
 admin/adminAppQueue.php |  4 ++--
 include/application.php |  4 ++--
 screenshots.php         | 11 +++++------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/admin/adminAppQueue.php b/admin/adminAppQueue.php
index 7a25df7..d7123d2 100644
--- a/admin/adminAppQueue.php
+++ b/admin/adminAppQueue.php
@@ -306,7 +306,7 @@ if ($_REQUEST['sub'])
         //Send Status Email
         if ($ob->queueEmail && $goodtogo)
         {
-            $sFullAppName = lookupAppName($_REQUEST['appParent'])." Version: ".lookupVersionName($_REQUEST['appParent'], $_REQUEST['appVersion']);
+            $sFullAppName = lookupAppName($_REQUEST['appParent'])." Version: ".lookupVersionName($_REQUEST['appVersion']);
              
             $sSubject =  "Application Database Status Report";
             $sMsg  = "Your application: ".$sFullAppName." has been entered ";
@@ -322,7 +322,7 @@ if ($_REQUEST['sub'])
             if($sEmail)
             {
                 $sFullAppName = "Application: ".lookupAppName($_REQUEST['appParent']).
-                    " Version: ".lookupVersionName($_REQUEST['appParent'], $_REQUEST['appVersion']);
+                    " Version: ".lookupVersionName($_REQUEST['appVersion']);
                 $sSubject = "New ".$sFullAppName;
                 $sMsg  = APPDB_ROOT."appview.php?appId=".$_REQUEST['appParent']."&versionId=".$_REQUEST['appVersion']."\r\n";
                 $sMsg .= "New Application added to database:\r\n";
diff --git a/include/application.php b/include/application.php
index b0865de..b49a005 100644
--- a/include/application.php
+++ b/include/application.php
@@ -97,9 +97,9 @@ function deleteAppVersion($versionId)
         addmsg("Application Version $versionId deleted", "green");
 }
 
-function lookupVersionName($appId, $versionId)
+function lookupVersionName($versionId)
 {
-    $result = query_appdb("SELECT versionName FROM appVersion WHERE versionId = $versionId and appId = $appId");
+    $result = query_appdb("SELECT versionName FROM appVersion WHERE versionId = $versionId");
     if(!$result || mysql_num_rows($result) != 1)
         return null;
     $ob = mysql_fetch_object($result);
diff --git a/screenshots.php b/screenshots.php
index 1ee97a9..5008c51 100644
--- a/screenshots.php
+++ b/screenshots.php
@@ -31,11 +31,10 @@ if($_REQUEST['cmd'])
                 $sEmail = get_notify_email_address_list($_REQUEST['appId'], $_REQUEST['versionId']);
                 if($sEmail)
                 {
-                    $sFullAppName = "Screenshot added to ".lookupAppName($_REQUEST['appId'])." ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']);
+                    $sFullAppName = "Screenshot added to ".lookupAppName($_REQUEST['appId'])." ".lookupVersionName($_REQUEST['versionId']);
                     $sMsg  = APPDB_ROOT."screenshots.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']."\n";
                     $sMsg .= "\n";
-                    $sMsg .= $_SESSION['current']->sRealname." added screenshot ".$_REQUEST['screenshot_desc']." to ".$sFullAppName."\n";
-          
+                    $sMsg .= $_SESSION['current']->sRealname." added screenshot ".$_REQUEST['screenshot_desc']." to ".$sFullAppName."\n";          
                     mail_appdb($sEmail, $sFullAppName ,$sMsg);
                 }
                 addmsg("The image was successfully added into the database", "green");
@@ -50,7 +49,7 @@ if($_REQUEST['cmd'])
                 $sEmail = get_notify_email_address_list($_REQUEST['appId'], $_REQUEST['versionId']);
                 if($sEmail)
                 {
-                    $sFullAppName = "Screenshot queued for ".lookupAppName($_REQUEST['appId'])." ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']);
+                    $sFullAppName = "Screenshot queued for ".lookupAppName($_REQUEST['appId'])." ".lookupVersionName($_REQUEST['versionId']);
                     $sMsg  = APPDB_ROOT."admin/adminAppDataQueue.php?queueId=".mysql_insert_id()."\n";
                     $sMsg .= "\n";
                     $sMsg .= ($_SESSION['current']->sRealname ? $_SESSION['current']->sRealname : "an anonymous user")." submitted a screenshot ".$_REQUEST['screenshot_desc']." for ".$sFullAppName."\n";
@@ -74,7 +73,7 @@ if($_REQUEST['cmd'])
                 $sEmail = get_notify_email_address_list($_REQUEST['appId'], $_REQUEST['versionId']);
                 if($sEmail)
                 {
-                    $sFullAppName = "Screenshot deleted from ".lookupAppName($_REQUEST['appId'])." ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']);
+                    $sFullAppName = "Screenshot deleted from ".lookupAppName($_REQUEST['appId'])." ".lookupVersionName($_REQUEST['versionId']);
                     $sMsg  = APPDB_ROOT."screenshots.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']."\n";
                     $sMsg .= "\n";
                     $sMsg .= ($_SESSION['current']->sRealname ? $_SESSION['current']->sRealname : "Anonymous")." deleted screenshot from ".$sFullAppName."\r\n";
@@ -119,7 +118,7 @@ if($result && mysql_num_rows($result))
                 $c=1;
             }
             $currentVersionId=$ob->versionId;
-            echo html_frame_start("Version ".lookupVersionName($_REQUEST['appId'], $currentVersionId));
+            echo html_frame_start("Version ".lookupVersionName($currentVersionId));
             echo "<div align=center><table><tr>\n";
         }
         $oScreenshot = new Screenshot($ob->id);