From 3e6e3c2330cb8210fc99b86703c994eb1390669a Mon Sep 17 00:00:00 2001
From: "psychoticwolf%carolina.rr.com" <psychoticwolf%carolina.rr.com>
Date: Tue, 19 Oct 2004 07:40:56 +0000
Subject: [PATCH] Bug 264906. Various Application Manager Issues (and
 inc_footer typo). Patch by Chris Thomas. r=Wolf.

---
 webtools/update/core/inc_footer.php       |  2 +-
 webtools/update/developers/appmanager.php | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/webtools/update/core/inc_footer.php b/webtools/update/core/inc_footer.php
index 5874190ddd0..526a556b8d5 100644
--- a/webtools/update/core/inc_footer.php
+++ b/webtools/update/core/inc_footer.php
@@ -44,7 +44,7 @@
     <li><a href="/about/contact/">Contact Us</a></li>
     <li><a href="http://www.mozilla.org/foundation/donate.html">Donate</a></li>
    </ul>
-    <p><strong>Update-Beta is a technology Preivew. For internal use only.</strong><br>
+    <p><strong>Update-Beta is a technology Preview. For internal use only.</strong><br>
     Copyright &copy; 2004 The Mozilla Organization</p>
   </div>
   <!-- closes #footer-->
diff --git a/webtools/update/developers/appmanager.php b/webtools/update/developers/appmanager.php
index 628465863e8..0bd0fa23627 100755
--- a/webtools/update/developers/appmanager.php
+++ b/webtools/update/developers/appmanager.php
@@ -57,7 +57,7 @@ if (!$function) {
 
 <?php
 
-  $sql = "SELECT * FROM `t_applications` ORDER BY `AppName` ASC, `Release` ASC, `SubVer` ASC";
+  $sql = "SELECT * FROM `t_applications` ORDER BY `AppName` ASC, `major` ASC, `minor` ASC, `release` ASC, `SubVer` ASC";
   $sql_result = mysql_query($sql, $connection) or trigger_error("<div class=\"error\">MySQL Error ".mysql_errno().": ".mysql_error()."</div>", E_USER_NOTICE);
 
   $lastname = "";
@@ -87,10 +87,7 @@ if (!$function) {
     }
 
     echo"<a href=\"?function=editcategory&appid=".$row["AppID"]."\">";
-    echo"".$row["Release"]."";
-
-    if ($row["SubVer"] != "final") {echo"".$row["SubVer"]."";}
-
+    echo $row["Version"];
     echo"</a>";
 
     $lastname = $row["AppName"];
@@ -150,7 +147,7 @@ GUID: <input name="otherguid" type="text" size="25" MAXSIZE="50" value="">
     if ($_POST[AppName] != "Mozilla" && $_POST[SubVer] == "final") {
       $_POST[SubVer] = "";
     }
-    $sql = "UPDATE `t_applications` SET `AppName`='$_POST[AppName]', `Release`='$_POST[Release]', `SubVer`='$_POST[SubVer]',`GUID`='$_POST[GUID]' WHERE `appid`='$_POST[appid]'";
+    $sql = "UPDATE `t_applications` SET `AppName`='$_POST[AppName]', `major`='$_POST[Major]', `minor`='$_POST[Minor]', `release`='$_POST[Release]', `SubVer`='$_POST[SubVer]',`GUID`='$_POST[GUID]' WHERE `appid`='$_POST[appid]'";
     $sql_result = mysql_query($sql, $connection) or trigger_error("<div class=\"error\">MySQL Error ".mysql_errno().": ".mysql_error()."</div>", E_USER_NOTICE);
 
     echo"<div class=\"success\">Your update to $_POST[AppName], has been successful.</div>";
@@ -175,10 +172,12 @@ if (!$appid) { $appid = $_POST["appid"]; }
 <form name="editcategory" method="post" action="?function=editcategory">
 <?php
   echo"Name:  <input name=\"AppName\" type=\"text\" size=\"30\" maxlength=\"30\" value=\"".$row["AppName"]."\" /><br />\n";
-  echo"Release:  <input name=\"Release\" type=\"text\" size=\"5\" maxlength=\"5\" value=\"".$row["Release"]."\" />";
+  echo"Major:  <input name=\"Major\" type=\"text\" size=\"5\" maxlength=\"5\" value=\"".$row["major"]."\" />";
+  echo"Minor:  <input name=\"Minor\" type=\"text\" size=\"5\" maxlength=\"5\" value=\"".$row["minor"]."\" />";
+  echo"Release:  <input name=\"Release\" type=\"text\" size=\"5\" maxlength=\"5\" value=\"".$row["release"]."\" />";
   echo"  <select name=\"SubVer\"/><br />\n";
 
-  $subvers = array("+"=>"+", "a"=>"alpha", "b"=>"beta", "final"=>"final");
+  $subvers = array(""=>"", "+"=>"+", "a"=>"alpha", "b"=>"beta", "final"=>"final");
 
   foreach($subvers as $key => $subver) {
     $subver = ucwords($subver);