Bug 92763 Add Windows XP as OS selection for entering/searching bugs

patch by ddk r=bbaetz r=justdave
Bug 135666 Creating bugs: OS detection doesn't work for Internet Explorer, Win NT 4.
patch by ddk+johannes.pellenz@sdm.de r=bbaetz r=justdave

Adds Windows XP to the bugzilla OS list
Activates the Windows XP detection (it was commented out waiting for this fix...)
Makes Windows NT (4) detection match the pattern everything else used

diff --git a/checksetup.pl b/checksetup.pl
index 6ae737c78322b7a885e973a75218b7021cbfbe2b..463382fb5bb36c393a91ec247ca8260665f7fa83 100755 (executable)
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -442,6 +442,7 @@ LocalVar('opsys', '
         "Windows ME",  # Millenium Edition (upgrade of 98)
         "Windows 2000",
         "Windows NT",
+        "Windows XP",
         "Mac System 7",
         "Mac System 7.5",
         "Mac System 7.6.1",

diff --git a/enter_bug.cgi b/enter_bug.cgi
index 8ca0443b379b1c3014aee567ad4c39ad2f00e87e..ec008b9d6385a5649654e222d78defb3c7f8ca5a 100755 (executable)
--- a/enter_bug.cgi
+++ b/enter_bug.cgi
@@ -173,11 +173,11 @@ sub pickos {
             /\(.*IBM.*\)/ && do {return "OS/2";};
             /\(.*QNX.*\)/ && do {return "Neutrino";};
             /\(.*VMS.*\)/ && do {return "OpenVMS";};
-#            /\(.*Windows XP.*\)/ && do {return "Windows XP";};
-#            /\(.*Windows NT 5\.1.*\)/ && do {return "Windows XP";};
+            /\(.*Windows XP.*\)/ && do {return "Windows XP";};
+            /\(.*Windows NT 5\.1.*\)/ && do {return "Windows XP";};
             /\(.*Windows 2000.*\)/ && do {return "Windows 2000";};
-            /Windows NT 5.*\)/ && do {return "Windows 2000";};
-            /\(Windows.*NT/ && do {return "Windows NT";};
+            /\(.*Windows NT 5.*\)/ && do {return "Windows 2000";};
+            /\(.*Windows.*NT.*\)/ && do {return "Windows NT";};
             /\(.*Win.*98.*4\.9.*\)/ && do {return "Windows ME";};
             /\(.*Win98.*\)/ && do {return "Windows 98";};
             /\(.*Win95.*\)/ && do {return "Windows 95";};

diff --git a/queryhelp.cgi b/queryhelp.cgi
index 16345af649382e26c1138e718f74044684091ef5..597a5182fdd1b955db27f646b2ff1adb3acf431e 100755 (executable)
--- a/queryhelp.cgi
+++ b/queryhelp.cgi
@@ -116,32 +116,99 @@ print qq{
 <td align="left" valign="top">
 
 <SELECT NAME="bug_status" MULTIPLE SIZE="7">
-<OPTION VALUE="UNCONFIRMED">UNCONFIRMED<OPTION VALUE="NEW">NEW<OPTION VALUE="ASSIGNED">ASSIGNED<OPTION VALUE="REOPENED">REOPENED<OPTION VALUE="RESOLVED">RESOLVED<OPTION VALUE="VERIFIED">VERIFIED<OPTION VALUE="CLOSED">CLOSED</SELECT>
+<OPTION VALUE="UNCONFIRMED">UNCONFIRMED
+<OPTION VALUE="NEW">NEW
+<OPTION VALUE="ASSIGNED">ASSIGNED
+<OPTION VALUE="REOPENED">REOPENED
+<OPTION VALUE="RESOLVED">RESOLVED
+<OPTION VALUE="VERIFIED">VERIFIED
+<OPTION VALUE="CLOSED">CLOSED
+</SELECT>
 
 </td>
 <td align="left" valign="top">
 <SELECT NAME="resolution" MULTIPLE SIZE="7">
-<OPTION VALUE="FIXED">FIXED<OPTION VALUE="INVALID">INVALID<OPTION VALUE="WONTFIX">WONTFIX<OPTION VALUE="LATER">LATER<OPTION VALUE="REMIND">REMIND<OPTION VALUE="DUPLICATE">DUPLICATE<OPTION VALUE="WORKSFORME">WORKSFORME<OPTION VALUE="MOVED">MOVED<OPTION VALUE="---">---</SELECT>
+<OPTION VALUE="FIXED">FIXED
+<OPTION VALUE="INVALID">INVALID
+<OPTION VALUE="WONTFIX">WONTFIX
+<OPTION VALUE="LATER">LATER
+<OPTION VALUE="REMIND">REMIND
+<OPTION VALUE="DUPLICATE">DUPLICATE
+<OPTION VALUE="WORKSFORME">WORKSFORME
+<OPTION VALUE="MOVED">MOVED
+<OPTION VALUE="---">---
+</SELECT>
 
 </td>
 <td align="left" valign="top">
 <SELECT NAME="rep_platform" MULTIPLE SIZE="7">
-<OPTION VALUE="All">All<OPTION VALUE="DEC">DEC<OPTION VALUE="HP">HP<OPTION VALUE="Macintosh">Macintosh<OPTION VALUE="PC">PC<OPTION VALUE="SGI">SGI<OPTION VALUE="Sun">Sun<OPTION VALUE="Other">Other</SELECT>
+<OPTION VALUE="All">All
+<OPTION VALUE="DEC">DEC
+<OPTION VALUE="HP">HP
+<OPTION VALUE="Macintosh">Macintosh
+<OPTION VALUE="PC">PC
+<OPTION VALUE="SGI">SGI
+<OPTION VALUE="Sun">Sun
+<OPTION VALUE="Other">Other
+</SELECT>
 
 </td>
 <td align="left" valign="top">
 <SELECT NAME="op_sys" MULTIPLE SIZE="7">
-<OPTION VALUE="All">All<OPTION VALUE="Windows 3.1">Windows 3.1<OPTION VALUE="Windows 95">Windows 95<OPTION VALUE="Windows 98">Windows 98<OPTION VALUE="Windows ME">Windows ME<OPTION VALUE="Windows 2000">Windows 2000<OPTION VALUE="Windows NT">Windows NT<OPTION VALUE="Mac System 7">Mac System 7<OPTION VALUE="Mac System 7.5">Mac System 7.5<OPTION VALUE="Mac System 7.6.1">Mac System 7.6.1<OPTION VALUE="Mac System 8.0">Mac System 8.0<OPTION VALUE="Mac System 8.5">Mac System 8.5<OPTION VALUE="Mac System 8.6">Mac System 8.6<OPTION VALUE="Mac System 9.0">Mac System 9.0<OPTION VALUE="Linux">Linux<OPTION VALUE="BSDI">BSDI<OPTION VALUE="FreeBSD">FreeBSD<OPTION VALUE="NetBSD">NetBSD<OPTION VALUE="OpenBSD">OpenBSD<OPTION VALUE="AIX">AIX<OPTION VALUE="BeOS">BeOS<OPTION VALUE="HP-UX">HP-UX<OPTION VALUE="IRIX">IRIX<OPTION VALUE="Neutrino">Neutrino<OPTION VALUE="OpenVMS">OpenVMS<OPTION VALUE="OS/2">OS/2<OPTION VALUE="OSF/1">OSF/1<OPTION VALUE="Solaris">Solaris<OPTION VALUE="SunOS">SunOS<OPTION VALUE="other">other</SELECT>
+<OPTION VALUE="All">All
+<OPTION VALUE="Windows 3.1">Windows 3.1
+<OPTION VALUE="Windows 95">Windows 95
+<OPTION VALUE="Windows 98">Windows 98
+<OPTION VALUE="Windows ME">Windows ME
+<OPTION VALUE="Windows 2000">Windows 2000
+<OPTION VALUE="Windows NT">Windows NT
+<OPTION VALUE="Windows XP">Windows XP
+<OPTION VALUE="Mac System 7">Mac System 7
+<OPTION VALUE="Mac System 7.5">Mac System 7.5
+<OPTION VALUE="Mac System 7.6.1">Mac System 7.6.1
+<OPTION VALUE="Mac System 8.0">Mac System 8.0
+<OPTION VALUE="Mac System 8.5">Mac System 8.5
+<OPTION VALUE="Mac System 8.6">Mac System 8.6
+<OPTION VALUE="Mac System 9.0">Mac System 9.0
+<OPTION VALUE="Linux">Linux
+<OPTION VALUE="BSDI">BSDI
+<OPTION VALUE="FreeBSD">FreeBSD
+<OPTION VALUE="NetBSD">NetBSD
+<OPTION VALUE="OpenBSD">OpenBSD
+<OPTION VALUE="AIX">AIX
+<OPTION VALUE="BeOS">BeOS
+<OPTION VALUE="HP-UX">HP-UX
+<OPTION VALUE="IRIX">IRIX
+<OPTION VALUE="Neutrino">Neutrino
+<OPTION VALUE="OpenVMS">OpenVMS
+<OPTION VALUE="OS/2">OS/2
+<OPTION VALUE="OSF/1">OSF/1
+<OPTION VALUE="Solaris">Solaris
+<OPTION VALUE="SunOS">SunOS
+<OPTION VALUE="other">other
+</SELECT>
 
 </td>
 <td align="left" valign="top">
 <SELECT NAME="priority" MULTIPLE SIZE="7">
-<OPTION VALUE="P1">P1<OPTION VALUE="P2">P2<OPTION VALUE="P3">P3<OPTION VALUE="P4">P4<OPTION VALUE="P5">P5</SELECT>
+<OPTION VALUE="P1">P1
+<OPTION VALUE="P2">P2
+<OPTION VALUE="P3">P3
+<OPTION VALUE="P4">P4
+<OPTION VALUE="P5">P5
+</SELECT>
 
 </td>
 <td align="left" valign="top">
 <SELECT NAME="bug_severity" MULTIPLE SIZE="7">
-<OPTION VALUE="blocker">blocker<OPTION VALUE="critical">critical<OPTION VALUE="major">major<OPTION VALUE="normal">normal<OPTION VALUE="minor">minor<OPTION VALUE="trivial">trivial<OPTION VALUE="enhancement">enhancement</SELECT>
+<OPTION VALUE="blocker">blocker
+<OPTION VALUE="critical">critical
+<OPTION VALUE="major">major
+<OPTION VALUE="normal">normal
+<OPTION VALUE="minor">minor
+<OPTION VALUE="trivial">trivial
+<OPTION VALUE="enhancement">enhancement
+</SELECT>
 </td>
 </tr>
 </table>