tidy appdb html to make it validate - try 4

2008-02-23 12:06:24 +11:00
parent ccbc842d5c
commit 16949bb71c
50 changed files with 414 additions and 411 deletions
--- a/5
+++ b/5
@@ -6,9 +6,8 @@ WineHQ Application Database Coding Practice
 - Respect html coding standards. The current doctype is HTML 4.01 transitional (http://www.w3.org/TR/REC-html40/)
 Try to make your content validate nicely (http://validator.w3.org/)

- Think about upward compatibility. Some day we might choose another doctype like XHTML 1.0
-(i.e. <br /> instead of <br>, avoid using style tags and properties (bgcolor, borders & co) and use stylesheets instead)
-
+Avoid using implicitly closed elements eg. <br/> in HTML 4.01 transitional, as it can lead to validation errors.
+http://www.w3.org/TR/html401/struct/text.html#edef-BR

 /**
 * Variables naming
--- a/admin/adminCommentView.php
+++ b/admin/adminCommentView.php
@@ -22,15 +22,15 @@ if($ItemsPerPage > 100) $ItemsPerPage = 100;

 /* display page selection links */
 echo "<center>";
-echo "<b>Page $currentPage of $totalPages</b><br />";
+echo "<b>Page $currentPage of $totalPages</b><br>";
 display_page_range($currentPage, $pageRange, $totalPages, $_SERVER['PHP_SELF']."?iItemsPerPage=".$ItemsPerPage);
-echo "<br />";
-echo "<br />";
+echo "<br>";
+echo "<br>";

 /* display the option to choose how many comments per-page to display */
 echo "<form method=\"get\" name=\"sMessage\" action=\"".$_SERVER['PHP_SELF']."\">";
 echo "<b>Number of comments per page:</b>";
-echo "&nbsp<select name='iItemsPerPage'>";
+echo "&nbsp;<select name='iItemsPerPage'>";

 $ItemsPerPageArray = array(10, 20, 50, 100, 500);
 foreach($ItemsPerPageArray as $i => $value)
@@ -43,7 +43,7 @@ foreach($ItemsPerPageArray as $i => $value)
 echo "</select>";

 echo "<input type=hidden name=iPage value=$currentPage>";
-echo "&nbsp<input type=submit value='Refresh'>";
+echo "&nbsp;<input type=submit value='Refresh'>";
 echo "</form>";

 echo "</center>";
--- a/admin/adminMaintainers.php
+++ b/admin/adminMaintainers.php
@@ -63,13 +63,13 @@ if (isset($aClean['sSub']))
                echo "<tr class=color4>\n";
                echo "    <td style=\"$style;border-left:thin solid\">Maintainer summary</td>\n";
                if($oUser->sRealname == "")
-                    echo "    <td style=\"$style\"><a href=\"mailto:".$oUser->sEmail."\">&nbsp</a></td>\n";
+                    echo "    <td style=\"$style\"><a href=\"mailto:".$oUser->sEmail."\">&nbsp;</a></td>\n";
                else
                    echo "    <td style=\"$style\"><a href=\"mailto:".$oUser->sEmail."\">".$oUser->sRealname."</a></td>\n";

                $count = Maintainer::getMaintainerCountForUser($oUser, true);
                if($count == 0)
-                    echo "    <td style=\"$style\">&nbsp</td>\n";
+                    echo "    <td style=\"$style\">&nbsp;</td>\n";
                else if($count <= 1)
                    echo "    <td style=\"$style\">".$count." app</td>\n";
                else
@@ -78,13 +78,13 @@ if (isset($aClean['sSub']))

                $count = Maintainer::getMaintainerCountForUser($oUser, false);
                if($count == 0)
-                    echo "    <td style=\"$style\">&nbsp</td>\n";
+                    echo "    <td style=\"$style\">&nbsp;</td>\n";
                else if($count <= 1)
                    echo "    <td style=\"$style\">".$count." version</td>\n";
                else
                    echo "    <td style=\"$style\">".$count." versions</td>\n";

-                echo "    <td align=\"center\" style=\"$style;border-right:thin solid\">&nbsp</td>\n";
+                echo "    <td align=\"center\" style=\"$style;border-right:thin solid\">&nbsp;</td>\n";
                echo "</tr>\n\n";

                $oldUserId = $oRow->userId;
@@ -102,7 +102,7 @@ if (isset($aClean['sSub']))
                $oVersion = new version($oRow->versionId);
                echo "    <td>".$oVersion->objectMakeLink()."</td>\n";
            }
-            echo "    <td align=\"center\">[<a href='".BASE."objectManager.php?sClass=maintainer&iId=$oRow->maintainerId&bIsQueue=false&sTitle=Admin%20Maintainers&sAction=delete&sReturnTo=".APPDB_ROOT."admin/adminMaintainers.php'>delete</a>]</td>\n";
+            echo "    <td align=\"center\">[<a href='".BASE."objectManager.php?sClass=maintainer&amp;iId=$oRow->maintainerId&amp;bIsQueue=false&amp;sTitle=Admin%20Maintainers&amp;sAction=delete&amp;sReturnTo=".APPDB_ROOT."admin/adminMaintainers.php'>delete</a>]</td>\n";
            echo "</tr>\n\n";
            $c++;
        }
--- a/admin/adminScreenshots.php
+++ b/admin/adminScreenshots.php
@@ -27,7 +27,7 @@ if(isset($aClean['sCmd']))
    } 
    util_redirect_and_exit($_SERVER['PHP_SELF'].
             "?iItemsPerPage=".$aClean['iItemsPerPage'].
-             "&iPage=".$aClean['iPage']);
+             "&amp;iPage=".$aClean['iPage']);
 }


@@ -39,7 +39,7 @@ if(isset($aClean['sRegenerate']))
    $hResult = query_parameters($sQuery);
    while($oRow = query_fetch_object($hResult))
    {
-        echo "REGENERATING IMAGE ".$oRow->id."<br/>";
+        echo "REGENERATING IMAGE ".$oRow->id."<br>";
        $screenshot = new Screenshot($oRow->id);
        $screenshot->generate();
        $screenshot->free();
@@ -49,7 +49,7 @@ if(isset($aClean['sRegenerate']))
 echo "<center>";
 echo "<a href=\"".$_SERVER['PHP_SELF'].
     "?bRegenerate=true\">Regenerate all screenshots ! ".
-      "(use only if you know what you are doing)</a><br />";
+      "(use only if you know what you are doing)</a><br>";
 echo "</center>";

 /* display a range of 10 pages */
@@ -67,16 +67,16 @@ $offset = (($currentPage-1) * $ItemsPerPage);

 /* display page selection links */
 echo "<center>";
-echo "<b>Page $currentPage of $totalPages</b><br />";
+echo "<b>Page $currentPage of $totalPages</b><br>";
 display_page_range($currentPage, $pageRange, $totalPages,
                  $_SERVER['PHP_SELF']."?iItemsPerPage=".$ItemsPerPage);
-echo "<br />";
-echo "<br />";
+echo "<br>";
+echo "<br>";

 /* display the option to choose how many screenshots per-page to display */
 echo '<form method="get" name="message" action="'.$_SERVER['PHP_SELF'].'">';
 echo '<b>Number of Screenshots per page:</b>';
-echo "&nbsp<select name='iItemsPerPage'>";
+echo "&nbsp;<select name='iItemsPerPage'>";

 $ItemsPerPageArray = array(6, 9, 12, 15, 18, 21, 24);
 foreach($ItemsPerPageArray as $i => $value)
@@ -89,7 +89,7 @@ foreach($ItemsPerPageArray as $i => $value)
 echo "</select>";

 echo "<input type=hidden name=page value=$currentPage>";
-echo "&nbsp<input type=submit value='Refresh'>";
+echo "&nbsp;<input type=submit value='Refresh'>";
 echo "</form>";

 echo "</center>";
@@ -111,18 +111,18 @@ while ($oRow = query_fetch_object($Ids))
    echo $img;
    echo "<div align=center>". substr($oRow->description,0,20). "\n";

-    echo "<br />[".$oApp->objectMakeLink()."]";    
+    echo "<br>[".$oApp->objectMakeLink()."]";    

-    echo "<br />[".$oVersion->objectMakeLink()."]";
+    echo "<br>[".$oVersion->objectMakeLink()."]";
    
    //show admin delete link
    if($_SESSION['current']->isLoggedIn() && 
      ($_SESSION['current']->hasPriv("admin") || 
       $_SESSION['current']->isMaintainer($aClean['iVersionId'])))
    {
-        echo "<br />[<a href='".$_SERVER['PHP_SELF'];
-        echo "?sCmd=delete&iImageId=$oRow->id";
-        echo "&iPage=".$currentPage."&iItemsPerPage=".$ItemsPerPage."'>";
+        echo "<br>[<a href='".$_SERVER['PHP_SELF'];
+        echo "?sCmd=delete&amp;iImageId=$oRow->id";
+        echo "&amp;iPage=".$currentPage."&amp;iItemsPerPage=".$ItemsPerPage."'>";
        echo "Delete Image</a>]";
    }
    echo "</div></td>\n";
@@ -131,7 +131,7 @@ while ($oRow = query_fetch_object($Ids))
   $c++;

 }
-echo "</tr></table></div><br />\n";
+echo "</tr></table></div><br>\n";

 /* display page selection links */
 echo "<center>";
--- a/admin/adminUsers.php
+++ b/admin/adminUsers.php
@@ -66,8 +66,8 @@ if ( isset($aClean['sOrderBy']) )
        <tr>
            <td class="color1">Pattern</td>
            <td>
-            <input type="text" name="sSearch" value="<?php echo $aClean['sSearch'];?>"/>
-            <br /><small>(leave blank to match all)</small>
+            <input type="text" name="sSearch" value="<?php echo $aClean['sSearch'];?>">
+            <br><small>(leave blank to match all)</small>
            </td>
        </tr>
        <tr>
--- a/admin/editAppVersion.php
+++ b/admin/editAppVersion.php
@@ -37,12 +37,12 @@ if(!empty($aClean['sSubmit']))
        $oVersion->outputEditor(false, true); /* false = not allowing the user to modify the parent application */
        
    echo '<table border=0 cellpadding=2 cellspacing=0 width="100%">',"\n";
-    echo '<tr><td colspan=2 align=center class=color2><input type="submit" name="sSubmit" value="Update Database" /></td></tr>',"\n";
+    echo '<tr><td colspan=2 align=center class=color2><input type="submit" name="sSubmit" value="Update Database"></td></tr>',"\n";
    echo html_table_end();

    echo "</form>";

-    echo "<br/><br/>\n";
+    echo "<br><br>\n";

    /* URL editor */
    echo url::outputEditor("editAppVersion.php", $oVersion);
@@ -59,8 +59,8 @@ if(!empty($aClean['sSubmit']))
    {
        // move version form
        echo '<form enctype="multipart/form-data" action="moveAppVersion.php" method="post">',"\n";
-        echo '<input type="hidden" name="iAppId" value="'.$oVersion->iAppId.'" />';
-        echo '<input type="hidden" name="iVersionId" value="'.$oVersion->iVersionId.'" />';
+        echo '<input type="hidden" name="iAppId" value="'.$oVersion->iAppId.'">';
+        echo '<input type="hidden" name="iVersionId" value="'.$oVersion->iVersionId.'">';
        echo html_frame_start("Move version to another application","90%","",0);
        echo '<center><input type="submit" name="sView" value="Move this version"></center>',"\n";
        echo html_frame_end();
--- a/admin/editBundle.php
+++ b/admin/editBundle.php
@@ -63,7 +63,7 @@ if($hResult && query_num_rows($hResult))
        //set row color
        if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; }
 		    
-        $delete_link = "[<a href='editBundle.php?sCmd=delete&iBundleId=".$aClean['iBundleId']."&iAppId=$oRow->appId'>delete</a>]";
+        $delete_link = "[<a href='editBundle.php?sCmd=delete&amp;iBundleId=".$aClean['iBundleId']."&amp;iAppId=$oRow->appId'>delete</a>]";

        echo "<tr class=$bgcolor>\n";
        echo "    <td>$oRow->appName &nbsp;</td>\n";
--- a/admin/maintainerNotification.php
+++ b/admin/maintainerNotification.php
@@ -12,7 +12,7 @@ apidb_header("Maintiner notification info");

 // display all currently notified maintainers
 $hResult = maintainer::objectGetEntries(false, false);
-echo "Maintainers with a non-zero notification level<br />\n";
+echo "Maintainers with a non-zero notification level<br>\n";

 $bFoundNonZero = false;
 while($oRow = query_fetch_object($hResult))
@@ -22,24 +22,24 @@ while($oRow = query_fetch_object($hResult))
  if($oMaintainer->iNotificationLevel != 0)
  {
    $bFoundNonZero = true;
-    echo "iMaintainerId: $oMaintainer->iMaintainerId<br />";
-    echo "iNotificationLevel: $oMaintainer->iNotificationLevel<br />";
-    echo "<br />\n";
+    echo "iMaintainerId: $oMaintainer->iMaintainerId<br>";
+    echo "iNotificationLevel: $oMaintainer->iNotificationLevel<br>";
+    echo "<br>\n";
  }
 }

 if(!$bFoundNonZero)
 {
-  echo "No maintainers have a non-zero notification level<br />\n";
+  echo "No maintainers have a non-zero notification level<br>\n";
 }


-echo "<br />\n"; 
-echo "<br />\n"; 
+echo "<br>\n"; 
+echo "<br>\n"; 


 // retrieve all of the maintainers
-echo "Maintainers with notification iTargetLevel != 0<br />\n";
+echo "Maintainers with notification iTargetLevel != 0<br>\n";
 $hResult = maintainer::objectGetEntries(false, false);
 while($oRow = query_fetch_object($hResult))
 {
@@ -49,10 +49,10 @@ while($oRow = query_fetch_object($hResult))

  if($oNotificationUpdate->iTargetLevel != 0)
  {
-    echo "iMaintainerId: $oMaintainer->iMaintainerId<br />\n";
-    echo "iNotificationLevel: $oMaintainer->iNotificationLevel<br />\n";
-    echo "iTargetLevel: $oNotificationUpdate->iTargetLevel<br />\n";
-    echo "<br />\n";
+    echo "iMaintainerId: $oMaintainer->iMaintainerId<br>\n";
+    echo "iNotificationLevel: $oMaintainer->iNotificationLevel<br>\n";
+    echo "iTargetLevel: $oNotificationUpdate->iTargetLevel<br>\n";
+    echo "<br>\n";
  }
 }

--- a/admin/moveAppVersion.php
+++ b/admin/moveAppVersion.php
@@ -34,8 +34,8 @@ if(!empty($aClean['sAction']))

    echo "<form method=post action='moveAppVersion.php'>\n";
    echo html_frame_start("Move ".$oApp->sName." ".$oVersion->sName, "90%","",0);
-    echo '<input type="hidden" name="iAppId" value="'.$oVersion->iAppId.'" />';
-    echo '<input type="hidden" name="iVersionId" value="'.$oVersion->iVersionId.'" />';
+    echo '<input type="hidden" name="iAppId" value="'.$oVersion->iAppId.'">';
+    echo '<input type="hidden" name="iVersionId" value="'.$oVersion->iVersionId.'">';


    /* build a table of applications and their versions */
@@ -58,7 +58,7 @@ if(!empty($aClean['sAction']))
            echo '<tr style="background: #CCDDFF; border: thin solid; font-weight:bold;"><td align="left" style="padding-left:20px;">';
            $sUrl = $oApp->objectMakeUrl();
            echo '<a href="'.$sUrl.'">'.substr($oRow->appName, 0, 30).'</a></td><td> - '.$oRow->appId.'</td>';
-            echo "<td style='padding-left:20px;'><a href='moveAppVersion.php?sAction=move&iVersionId=$oVersion->iVersionId&iAppId=$oRow->appId'>Move here</a></td></tr>";
+            echo "<td style='padding-left:20px;'><a href='moveAppVersion.php?sAction=move&amp;iVersionId=$oVersion->iVersionId&amp;iAppId=$oRow->appId'>Move here</a></td></tr>";
            echo '<tr style="border-left: thin solid; border-right:thin solid; background: #FAFBE2;"><td style="padding-left:40px;" colspan="3" align="left">'.$oRow->versionName.'</td></tr>';
        } else /* just add another version */
        {
--- a/appbrowse.php
+++ b/appbrowse.php
@@ -17,12 +17,12 @@ function admin_menu()
    global $aClean;

    $m = new htmlmenu("Admin");
-    $m->add('Edit this Category', BASE."objectManager.php?iId=${aClean[iCatId]}&sClass=category&sAction=edit");
+    $m->add('Edit this Category', BASE."objectManager.php?iId=${aClean[iCatId]}&amp;sClass=category&amp;sAction=edit");

    /* We only allow deletion of the category if it is empty */
    $oCat = new category($aClean['iCatId']);
    if(!sizeof($oCat->aApplicationsIds))
-        $m->add('Delete this Category', BASE."objectManager.php?iId=${aClean[iCatId]}&sClass=category&sAction=delete");
+        $m->add('Delete this Category', BASE."objectManager.php?iId=${aClean[iCatId]}&amp;sClass=category&amp;sAction=delete");

    $m->done();
 }
@@ -45,7 +45,7 @@ echo "<div class='default_container'>\n";
 if($subs)
 {
    echo html_frame_start("",'98%','',2);
-    echo "<p><b>Category: ". $sCatFullPath ."</b><br />\n";
+    echo "<p><b>Category: ". $sCatFullPath ."</b><br>\n";
    echo html_frame_end();
    
    echo html_frame_start("","98%","",0);
@@ -110,7 +110,7 @@ $apps = $oCat->aApplicationsIds;
 if($apps)
 {
    echo html_frame_start("",'98%','',2);
-    echo "<p><b>Category: ". $sCatFullPath ."</b><br />\n";
+    echo "<p><b>Category: ". $sCatFullPath ."</b><br>\n";
    echo html_frame_end();
    
    echo html_frame_start("","98%","",0);
--- a/application.css
+++ b/application.css
@@ -1,4 +1,4 @@
-/***********************************************************************/
+;/***********************************************************************/
 /* The following styles are used for application description and notes */
 /***********************************************************************/

@@ -76,3 +76,7 @@ div.note_title { font-weight: bold; border-bottom: 1px solid; padding: 4px;
 div.rating_header { padding: 8px; }
 div.rating_title { padding-bottom: 4px; font-weight: bold; font-size: 160%; }
 div.topx_style { padding:7px; margin:6px; border:2px solid; }
+div.imgarea { text-align:center;    text-align:center;
+    margin-top:0px;
+    margin-bottom:0px;
+    padding:0px;}
--- a/browse_by_rating.php
+++ b/browse_by_rating.php
@@ -151,16 +151,16 @@ if (empty($aClean['sRating']))

    /* display page selection links */
    echo "<center>";
-    echo "<b>Page $iCurrentPage of $iTotalPages</b><br />";
+    echo "<b>Page $iCurrentPage of $iTotalPages</b><br>";
        display_page_range($iCurrentPage, $iPageRange, $iTotalPages,
-                  $_SERVER['PHP_SELF']."?sRating=".$aClean['sRating']."&iItemsPerPage=".$iItemsPerPage);
-    echo "<br />";
-    echo "<br />";
+                  $_SERVER['PHP_SELF']."?sRating=".$aClean['sRating']."&amp;iItemsPerPage=".$iItemsPerPage);
+    echo "<br>";
+    echo "<br>";
    
    /* display the option to choose how many applications per-page to display */
    echo '<form method="get" name="message" action="'.$_SERVER['PHP_SELF'].'">';
    echo '<b>Number of Applications per page:</b>';
-    echo "&nbsp<select name='iItemsPerPage'>";
+    echo "&nbsp;<select name='iItemsPerPage'>";

    $iItemsPerPageArray = array(50, 100, 150, 200, 250, 300, 350, 400, 450, 500);
    foreach($iItemsPerPageArray as $i => $value)
@@ -174,7 +174,7 @@ if (empty($aClean['sRating']))

    echo "<input type=hidden name=iPage value=$iCurrentPage>";
    echo "<input type=hidden name=sRating value=".$aClean['sRating'].">";
-    echo "&nbsp<input type=submit value='Refresh'>";
+    echo "&nbsp;<input type=submit value='Refresh'>";
    echo "</form>";
    echo "</center>";

@@ -237,7 +237,7 @@ if (empty($aClean['sRating']))
    echo html_frame_end();
    echo "<center>";
    display_page_range($iCurrentPage, $iPageRange, $iTotalPages,
-                  $_SERVER['PHP_SELF']."?sRating=".$aClean['sRating']."&iItemsPerPage=".$iItemsPerPage);    
+                  $_SERVER['PHP_SELF']."?sRating=".$aClean['sRating']."&amp;iItemsPerPage=".$iItemsPerPage);    
    echo "</center>";
 }

--- a/browse_downloadable.php
+++ b/browse_downloadable.php
@@ -50,11 +50,11 @@ $iLimitLower = ($aClean['iPage'] - 1) * $aClean['iNumVersions'];

 /* Page selection */
 echo "<div align=\"center\">\n";
-echo "<b>Page ".$aClean['iPage']." of $iNumPages</b><br />\n";
+echo "<b>Page ".$aClean['iPage']." of $iNumPages</b><br>\n";
 // $iPageRange is non-existent here? creating it
 $iPageRange = 10;
 display_page_range($aClean['iPage'], $iPageRange, $iNumPages,
-    $_SERVER['PHP_SELF']."?iNumVersions=".$aClean['iNumVersions']."&sLicense=".
+    $_SERVER['PHP_SELF']."?iNumVersions=".$aClean['iNumVersions']."&amp;sLicense=".
    $sLicenseString);

 /* Selector for how many versions to display */
@@ -78,8 +78,8 @@ echo "<b>Filter by license</b>\n";
 $oVersion = new Version();
 echo $oVersion->makeLicenseList($sLicense);

-echo " <input type=\"submit\" value=\"Refresh\" />\n";
-echo "</form></div>\n<br />\n";
+echo " <input type=\"submit\" value=\"Refresh\">\n";
+echo "</form></div>\n<br>\n";

 if(!isset($num))
 {
--- a/contact.php
+++ b/contact.php
@@ -44,8 +44,8 @@ if(!$aClean['sSubmit'])
    if($_SESSION['current']->hasPriv("admin"))
    {
        echo "<p><a href=\"".BASE."preferences.php?iUserId=".
-                $oRecipient->iUserId."&sSearch=Administrator&iLimit".
-                "=100&sOrderBy=email\">User manager</a></p>";
+                $oRecipient->iUserId."&amp;sSearch=Administrator&amp;iLimit".
+                "=100&amp;sOrderBy=email\">User manager</a></p>";
    }

    echo "<p>E-mail $oRecipient->sRealname.</p>";
@@ -60,7 +60,7 @@ if(!$aClean['sSubmit'])
    $oTableRow->SetClass("color4");
    $oTableRow->AddTextCell("Subject");
    $oTableCell = new TableCell("<input type=\"text\" name=\"sSubject\" size=\"71\"".
-                                " value=\"".$aClean['sSubject']."\" />");
+                                " value=\"".$aClean['sSubject']."\">");
    $oTableRow->AddCell($oTableCell);
    $oTable->AddRow($oTableRow);

@@ -76,14 +76,14 @@ if(!$aClean['sSubmit'])

    $oTableRow = new TableRow();
    $oTableRow->AddTextCell("");
-    $oTableRow->AddTextCell("<input type=\"submit\" value=\"Submit\" name=\"sSubmit\" />");
+    $oTableRow->AddTextCell("<input type=\"submit\" value=\"Submit\" name=\"sSubmit\">");
    $oTable->AddRow($oTableRow);

    // output the table
    echo $oTable->GetString();

    echo "<input type=\"hidden\" name=\"iRecipientId\" ".
-    "value=\"$oRecipient->iUserId\" />";
+    "value=\"$oRecipient->iUserId\">";

    echo "</form>\n";

@@ -99,7 +99,7 @@ if(!$aClean['sSubmit'])

    $sMsg = "The following message was sent to you from $oUser->sRealname ";
    $sMsg .= "through the Wine AppDB contact form.\nTo Reply, visit ";
-    $sMsg .= APPDB_ROOT."contact.php?iRecipientId=$oUser->iUserId&sSubject=";
+    $sMsg .= APPDB_ROOT."contact.php?iRecipientId=$oUser->iUserId&amp;sSubject=";
    $sMsg .= $sSubjectRe."\n\n";
    $sMsg .= $aClean['sMessage'];

--- a/help/appdb_faq.help
+++ b/help/appdb_faq.help
@@ -12,7 +12,7 @@ Application Database.</p>
 <p><b>A:</b> The Application Database is a repository for
 Windows application compatibility information with Wine.
 In particular it provides the following information:<br>
-(see the <a href="/objectManager.php?sClass=application&iId=296">Visual FoxPro</a> entry for an
+(see the <a href="/objectManager.php?sClass=application&amp;iId=296">Visual FoxPro</a> entry for an
 example)<p>
 <ul>
  <li>Whether a given application works at all with Wine.</li>
--- a/help/maintainer_guidelines.help
+++ b/help/maintainer_guidelines.help
@@ -25,10 +25,10 @@ You will:
 <li>Be able to modify all aspects of your application(s) and version(s), including the description, screenshots, how-tos, notes, comments, etc.</li>
 </ul>

-<br />
+<br>

 <h4>Application overview page guidlines</h4>
-<p><i>N.B. Only super maintainers can change the general description of an application.</i><br />
+<p><i>N.B. Only super maintainers can change the general description of an application.</i><br>
 You can edit an application overview page by clicking on the "Edit Application" button in the application overview page. You will be then presented with a form whose fields are explained thereafter.
 <ul>
 <li>
@@ -57,7 +57,7 @@ You can edit a version page by clicking on the "Edit Version" button in any vers
 Version name should be checked against official version name. However if you feel that two minor revisions of an application will share the same problems or success, you are encouraged to use wildcards in the version number to avoid cluttering the database with hundreds of versions. For example if you know that Adobe Acrobat 6.0, 6.01 and 6.1 are about the same application, just choose 6.x as a version name. You can however use the full version name in an history table in the description field (see below).
 </li>
 <li>
-Description should describe the application version and not be a repetition of the application description. Please use a short sentence as the first line of your description to describe what this version is, and then add a carriage return after this first sentence as it will be used when showing version summary, in the application page for example. <br />
+Description should describe the application version and not be a repetition of the application description. Please use a short sentence as the first line of your description to describe what this version is, and then add a carriage return after this first sentence as it will be used when showing version summary, in the application page for example. <br>
 </li>
 <li>
 Rating lets you rate how this version ran with the latest Wine version you tested. For rating definitions, please see this <a href="index.php?sTopic=maintainer_ratings">page</a>.
@@ -101,8 +101,8 @@ As a maintainer you are entitled to delete comments. Use this feature wisely and

 <h4>Using the HTML editor</h4>
 <p>
-Here you'll find informations and hints about the HTML editor used when editing informations in the Application Database.<br />
+Here you'll find informations and hints about the HTML editor used when editing informations in the Application Database.<br>
 At this time detailed informations are not available. Please check back later.
 </p>
-<br />
+<br>
 <p>If you have additionnal questions, please do not hesitate to contact us on <a href="mailto:appdb@winehq.org">appdb@winehq.org</a>.</p>
--- a/include/application.php
+++ b/include/application.php
@@ -432,7 +432,7 @@ class Application {
                $sMsg .= "Clicking on the link in this email will allow you to modify and resubmit the application. ";
                $sMsg .= "A link to your queue of applications and versions will also show up on the left hand side of the Appdb site once you have logged in. ";
                $sMsg .= APPDB_ROOT."objectManager.php?sClass=application_queue".
-                        "&bIsQueue=true&bIsRejected=true&iId=".$this->iAppId."&sTitle=".
+                        "&amp;bIsQueue=true&amp;bIsRejected=true&amp;iId=".$this->iAppId."&amp;sTitle=".
                        "Edit+Application\n";
                $sMsg .= "Reason given:\n";
            break;
@@ -521,7 +521,7 @@ class Application {
            case "reject":
                $sSubject = $this->sName." has been rejected by ".$_SESSION['current']->sRealname;
                $sMsg .= APPDB_ROOT."objectManager.php?sClass=application_queue".
-                        "&bIsQueue=true&bIsRejected=true&iId=".$this->iAppId."&sTitle=".
+                        "&amp;bIsQueue=true&amp;bIsRejected=true&amp;iId=".$this->iAppId."&amp;sTitle=".
                        "Edit+Application\n";

                // if sReplyText is set we should report the reason the application was rejected 
@@ -553,7 +553,7 @@ class Application {

        /* Used to distinguish between the first step of entering an application
           name and the full editor displayed here */
-        echo '<input type="hidden" name="bMainAppForm" value="true" />'."\n";
+        echo '<input type="hidden" name="bMainAppForm" value="true">'."\n";

        echo html_frame_start("Application Form", "90%", "", 0);
        echo "<table class='color0' width='100%' border=0 cellpadding=2 cellspacing=0>\n";
@@ -609,14 +609,14 @@ class Application {
        if(!$this->iAppId)
        {
            $sMaintainerOptions = 
-                "<input type=\"radio\" name=\"iMaintainerRequest\" value=\"0\" />".
-                "I would not like to become a maintainer<br />\n".
+                "<input type=\"radio\" name=\"iMaintainerRequest\" value=\"0\">".
+                "I would not like to become a maintainer<br>\n".
                "<input type=\"radio\" name=\"iMaintainerRequest\" ". 
-                "value=\"".MAINTAINER_REQUEST."\" />".
-                "I would like to be a maintainer of the new version only<br />\n".
+                "value=\"".MAINTAINER_REQUEST."\">".
+                "I would like to be a maintainer of the new version only<br>\n".
                "<input type=\"radio\" name=\"iMaintainerRequest\" ". 
-                "value=\"".SUPERMAINTAINER_REQUEST."\" />".
-                "I would like to be a maintainer of the entire application<br />\n";
+                "value=\"".SUPERMAINTAINER_REQUEST."\">".
+                "I would like to be a maintainer of the entire application<br>\n";

            $sMaintainerOptionsSelected = str_replace(
                "value=\"$this->iMaintainerRequest\"",
@@ -796,7 +796,7 @@ class Application {
                echo '        <form method="post" name="sMessage" action="maintainerdelete.php"><input type=submit value="Remove yourself as a super maintainer" class="button">';
            } else /* nope */
            {
-                echo '        <form method="post" name="sMessage" action="objectManager.php?sClass=maintainer&iAppId='.$this->iAppId.'&sAction=add&sTitle='.urlencode("Be a Super Maintainer for ".$this->sName).'&sReturnTo='.urlencode($this->objectMakeUrl()).'"><input type="submit" value="Be a super maintainer of this app" class="button" title="Click here to know more about super maintainers.">';
+                echo '        <form method="post" name="sMessage" action="objectManager.php?sClass=maintainer&amp;iAppId='.$this->iAppId.'&amp;sAction=add&amp;sTitle='.urlencode("Be a Super Maintainer for ".$this->sName).'&sReturnTo='.urlencode($this->objectMakeUrl()).'"><input type="submit" value="Be a super maintainer of this app" class="button" title="Click here to know more about super maintainers.">';
            }

            echo "        <input type=\"hidden\" name=\"iAppId\" value=\"".$this->iAppId."\">";
@@ -810,14 +810,14 @@ class Application {
            if($_SESSION['current']->isLoggedIn())
            {
                echo '<form method="post" name="sMessage" action="'.
-                        'objectManager.php?sClass=version_queue&iAppId='.$this->iAppId
-                        .'&sTitle=Submit+New+Version&sAction=add">';
+                        'objectManager.php?sClass=version_queue&amp;iAppId='.$this->iAppId
+                        .'&amp;sTitle=Submit+New+Version&amp;sAction=add">';
                echo '<input type=submit value="Submit new version" class="button">';
                echo '</form>';
            }
            if($_SESSION['current']->hasPriv("admin"))
            {
-                $url = BASE."objectManager.php?sClass=application&bIsQueue=false&sAction=delete&sTitle=Delete%20".$this->sName."&iId=".$this->iAppId;
+                $url = BASE."objectManager.php?sClass=application&amp;bIsQueue=false&amp;sAction=delete&amp;sTitle=Delete%20".$this->sName."&amp;iId=".$this->iAppId;
                echo "        <form method=\"post\" name=\"sEdit\" action=\"javascript:self.location = '".$url."'\"><input type=\"submit\" value=\"Delete App\" class=\"button\"></form>";
                echo '        <form method="post" name="sEdit" action="admin/editBundle.php"><input type="hidden" name="iBundleId" value="'.$this->iAppId.'"><input type="submit" value="Edit Bundle" class="button"></form>';
            }
@@ -920,7 +920,7 @@ class Application {

    public function objectMakeUrl()
    {
-        $sUrl = APPDB_ROOT."objectManager.php?sClass=application&iId=$this->iAppId";
+        $sUrl = APPDB_ROOT."objectManager.php?sClass=application&amp;iId=$this->iAppId";
        return $sUrl;
    }

--- a/include/application_queue.php
+++ b/include/application_queue.php
@@ -188,10 +188,10 @@ class application_queue
            echo "Application name:\n";
            echo "</div>\n";
            echo "<div style='padding:5px;'>\n";
-            echo "<center><input type=\"text\" name=\"sAppName\" style='width:485px;' /></center>\n";
+            echo "<center><input type=\"text\" name=\"sAppName\" style='width:485px;'></center>\n";
            echo "</div>\n";
-            echo "<input type=\"hidden\" name=\"sSub\" value=\"view\" />\n";
-            echo "<input type=\"hidden\" name=\"sAppType\" value=\"application\" />\n";
+            echo "<input type=\"hidden\" name=\"sSub\" value=\"view\">\n";
+            echo "<input type=\"hidden\" name=\"sAppType\" value=\"application\">\n";
            echo "</div>\n";
        } else
        {
@@ -234,8 +234,8 @@ class application_queue
            else
                $shPreviewApp = ' checked="checked"';

-            echo "<input type=\"radio\" name=\"bPreviewVersion\"$shPreviewApp value=\"false\" /> Preview application<br />\n";
-            echo "<input type=\"radio\" name=\"bPreviewVersion\"$shPreviewVersion value=\"true\" /> Preview version\n";
+            echo "<input type=\"radio\" name=\"bPreviewVersion\"$shPreviewApp value=\"false\"> Preview application<br>\n";
+            echo "<input type=\"radio\" name=\"bPreviewVersion\"$shPreviewVersion value=\"true\"> Preview version\n";
            echo html_frame_end();
        }
    }
@@ -289,7 +289,7 @@ class application_queue
        /* There's no point in displaying an empty table */
        if($hResult === null || (query_num_rows($hResult) == 0))
        {
-            echo "No matches.<br />\n";
+            echo "No matches.<br>\n";
            return;
        }

@@ -324,9 +324,9 @@ class application_queue

            if($bCanMove)
            {
-                $aCells[] = "<a href=\"objectManager.php?sClass=application_queue&".
-                        "bIsQueue=true&sAction=moveChildren&iId=".
-                        $this->oApp->iAppId."&iNewId=".$oApp->iAppId.
+                $aCells[] = "<a href=\"objectManager.php?sClass=application_queue&amp;".
+                        "bIsQueue=true&amp;sAction=moveChildren&amp;iId=".
+                        $this->oApp->iAppId."&amp;iNewId=".$oApp->iAppId.
                        "\">Move data</a>";
            }
            echo html_tr($aCells, ($i % 2) ? "color0" : "color1");
--- a/include/bugs.php
+++ b/include/bugs.php
@@ -522,8 +522,8 @@ class Bug
    function outputEditor()
    {
        $this->display();
-        echo '<input type="hidden" name="iBuglinkId" value="'.$this->iBug_id.'" />';
-        echo '<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'" />';
+        echo '<input type="hidden" name="iBuglinkId" value="'.$this->iBug_id.'">';
+        echo '<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'">';
    }

    function getOutputEditorValues($aClean)
@@ -603,10 +603,10 @@ function view_version_bugs($iVersionId = null, $aBuglinkIds)
            {
                $oM = new objectManager("bug");
                $oM->setReturnTo($oVersion->objectMakeUrl());
-                echo "<td align=center>[<a href='".$oM->makeUrl("delete", $oBuglink->iLinkId)."&sSubmit=delete'>delete</a>]</td>\n";
+                echo "<td align=center>[<a href='".$oM->makeUrl("delete", $oBuglink->iLinkId)."&amp;sSubmit=delete'>delete</a>]</td>\n";
                if ($oBuglink->bQueued)
                {
-                    echo "<td align=center>[<a href='".$oM->makeUrl("edit", $oBuglink->iLinkId)."&sSubmit=Submit&bIsQueue=true'>OK</a>]</td>\n";
+                    echo "<td align=center>[<a href='".$oM->makeUrl("edit", $oBuglink->iLinkId)."&amp;sSubmit=Submit&amp;bIsQueue=true'>OK</a>]</td>\n";
                } else
                {
                    echo "<td align=center>Yes</td>\n";
@@ -626,9 +626,9 @@ function view_version_bugs($iVersionId = null, $aBuglinkIds)
        echo '<tr class=color3><td align=center>',"\n";
        $sBuglinkId = isset($aClean['buglinkId']) ? $aClean['buglinkId'] : '';
        echo '<input type="text" name="iBuglinkId" value="'.$sBuglinkId.'" size="8"></td>',"\n";
-        echo '<input type="hidden" name="sSubmit" value="Submit" />',"\n";
-        echo '<input type="hidden" name="sClass" value="bug" />',"\n";
-        echo '<input type="hidden" name="sReturnTo" value="'.$oVersion->objectMakeUrl().'" />',"\n";
+        echo '<input type="hidden" name="sSubmit" value="Submit">',"\n";
+        echo '<input type="hidden" name="sClass" value="bug">',"\n";
+        echo '<input type="hidden" name="sReturnTo" value="'.$oVersion->objectMakeUrl().'">',"\n";
        echo '<td><input type="submit" name="sSub" value="Submit a new bug link."></td>',"\n";
        echo '<td colspan=6></td></tr></form>',"\n";
    }
@@ -638,13 +638,13 @@ function view_version_bugs($iVersionId = null, $aBuglinkIds)
    if ( isset( $aClean['sAllBugs'] ) )
    {
        $sURL = str_replace( '&sAllBugs', '', $_SERVER['REQUEST_URI'] );
-        $sLink = '<a href="' . $sURL . '">Show Open Bugs</a>';
+        $sLink = '<a href="' . htmlentities($sURL) . '">Show Open Bugs</a>';
    }
    // show all link
    else
    {
        $sURL = $_SERVER['REQUEST_URI'] . '&sAllBugs';
-        $sLink = '<a href="' . $sURL . '">Show All Bugs</a>';
+        $sLink = '<a href="' . htmlentities($sURL) . '">Show All Bugs</a>';
    }
    
    echo '<div style="text-align:right;">' . $sLink .'</div>';
--- a/include/category.php
+++ b/include/category.php
@@ -264,13 +264,13 @@ class Category {
                <tr>
                <td width=\"15%\" class=\"box-label\"><b>Category name</b></td>
                <td class=\"box-body\">
-                <input type=\"text\" size=\"50\" name=\"sName\" value=\"".$this->sName."\" /> 
+                <input type=\"text\" size=\"50\" name=\"sName\" value=\"".$this->sName."\"> 
                </td>
                </tr>
                <tr>
                <td width=\"15%\" class=\"box-label\"><b>Description</b></td>
                <td class=\"box-body\">
-                <input type=\"text\" size=\"50\" name=\"sDescription\" value=\"".$this->sDescription."\" /> 
+                <input type=\"text\" size=\"50\" name=\"sDescription\" value=\"".$this->sDescription."\"> 
                </td>
                </tr>
                <tr>
@@ -311,7 +311,7 @@ class Category {
    {
        $sCatFullPath = Category::make_cat_path($this->getCategoryPath(), $appId, $versionId);
        echo html_frame_start("",'98%','',2);
-        echo "<p><b>Category: ". $sCatFullPath ."</b><br />\n";
+        echo "<p><b>Category: ". $sCatFullPath ."</b><br>\n";
        echo html_frame_end();
    }
 }
--- a/include/comment.php
+++ b/include/comment.php
@@ -239,20 +239,20 @@ class Comment {

        // message header
        echo "<tr bgcolor=\"#E0E0E0\"><td><a name=Comment-".$this->iCommentId."></a>\n";
-        echo " <b>".$this->sSubject."</b><br />\n";
-        echo " by  ".forum_lookup_user($this->oOwner->iUserId)." on ".$this->sDateCreated."<br />\n";
+        echo " <b>".$this->sSubject."</b><br>\n";
+        echo " by  ".forum_lookup_user($this->oOwner->iUserId)." on ".$this->sDateCreated."<br>\n";
        echo "</td></tr><tr><td>\n";
    
        // body
-        echo htmlify_urls($this->sBody), "<br /><br />\n";
+        echo htmlify_urls($this->sBody), "<br><br>\n";
    
        $oVersion = new version($this->iVersionId);
        $oM = new objectManager("comment", "Post new ocmment");
        $oM->setReturnTo($oVersion->objectMakeUrl());
        // reply post buttons
-        echo "	[<a href=\"".$oM->makeUrl("add")."&amp;iVersionId=$this->iVersionId\"><small>post new</small></a>] \n";
-        echo "	[<a href=\"".$oM->makeUrl("add")."&amp;iVersionId=$this->iVersionId".
-                "&amp;iThread=$this->iCommentId\"><small>reply to this</small></a>] \n";
+        echo "	[<a href=\"".$oM->makeUrl("add")."&iVersionId=$this->iVersionId\"><small>post new</small></a>] \n";
+        echo "	[<a href=\"".$oM->makeUrl("add")."&iVersionId=$this->iVersionId".
+                "&iThread=$this->iCommentId\"><small>reply to this</small></a>] \n";

        echo "</td></tr>\n";

@@ -261,12 +261,12 @@ class Comment {
        {
            echo "<tr>";
            echo "<td><form method=\"post\" name=\"sMessage\" action=\"".BASE."objectManager.php\"><input type=\"submit\" value=\"Delete\" class=\"button\">\n";
-            echo "<input type=\"hidden\" name=\"iId\" value=\"$this->iCommentId\" />";
-            echo "<input type=\"hidden\" name=\"sClass\" value=\"comment\" />";
-            echo "<input type=\"hidden\" name=\"bQueued\" value=\"false\" />";
-            echo "<input type=\"hidden\" name=\"sAction\" value=\"delete\" />";
-            echo "<input type=\"hidden\" name=\"sTitle\" value=\"Delete comment\" />";
-            echo "<input type=\"hidden\" name=\"sReturnTo\" value=\"".$oVersion->objectMakeUrl()."\" />";
+            echo "<input type=\"hidden\" name=\"iId\" value=\"$this->iCommentId\">";
+            echo "<input type=\"hidden\" name=\"sClass\" value=\"comment\">";
+            echo "<input type=\"hidden\" name=\"bQueued\" value=\"false\">";
+            echo "<input type=\"hidden\" name=\"sAction\" value=\"delete\">";
+            echo "<input type=\"hidden\" name=\"sTitle\" value=\"Delete comment\">";
+            echo "<input type=\"hidden\" name=\"sReturnTo\" value=\"".$oVersion->objectMakeUrl()."\">";
            echo "</form>\n";
            echo "</td></tr>";
        }
@@ -533,7 +533,7 @@ class Comment {

        // post new message button
        echo '<td><form method="post" name="sMessage" action="objectManager.php">';
-        echo '<input type="hidden" name="sAction" value="add" />';
+        echo '<input type="hidden" name="sAction" value="add">';
        echo $oM->makeUrlFormData();
        echo '<input type="submit" value="Post new comment" class="button"> ',"\n";
        echo '<input type="hidden" name="iVersionId" value="'.$versionId.'"></form></td>',"\n";
@@ -619,7 +619,7 @@ class Comment {
            {
                $sMesTitle = "<b>Replying To ...</b> $oRow->subject\n";
                echo html_frame_start($oRow->subject,500);
-                echo htmlify_urls($oRow->body), "<br /><br />\n";
+                echo htmlify_urls($oRow->body), "<br><br>\n";
                echo html_frame_end();

                /* Set default reply subject */
@@ -644,15 +644,15 @@ class Comment {
        echo "<tr class=\"color0\"><td align=right><b>From:</b>&nbsp;</td>\n";
        echo "	<td>&nbsp;".$_SESSION['current']->sRealname."</td></tr>\n";
        echo "<tr class=\"color0\"><td align=right><b>Subject:</b>&nbsp;</td>\n";
-        echo "	<td>&nbsp;<input type=\"text\" size=\"35\" name=\"sSubject\" value=\"".$this->sSubject."\" /> </td></tr>\n";
+        echo "	<td>&nbsp;<input type=\"text\" size=\"35\" name=\"sSubject\" value=\"".$this->sSubject."\"> </td></tr>\n";
        echo "<tr class=\"color1\"><td colspan=2><textarea name=\"sBody\" cols=\"70\" rows=\"15\" wrap=\"virtual\">".$this->sBody."</textarea></td></tr>\n";

        echo "</table>\n";

        echo html_frame_end();

-        echo "<input type=\"hidden\" name=\"iThread\" value=\"".$aClean['iThread']."\" />\n";
-        echo "<input type=\"hidden\" name=\"iVersionId\" value=\"".$aClean['iVersionId']."\" />\n";
+        echo "<input type=\"hidden\" name=\"iThread\" value=\"".$aClean['iThread']."\">\n";
+        echo "<input type=\"hidden\" name=\"iVersionId\" value=\"".$aClean['iVersionId']."\">\n";
    }

    function objectShowPreview()
--- a/include/distribution.php
+++ b/include/distribution.php
@@ -647,15 +647,15 @@ class distribution {
        if ($this->sUrl) 
        {
            echo " (".$this->sUrl.")";
-            echo "</a> <br />\n";
+            echo "</a> <br>\n";
        } else 
        {
-            echo "<br />\n";
+            echo "<br>\n";
        }

        if($this->aTestingIds)
        {
-            echo '<p><span class="title">Test Results for '.$this->sName.'</span><br />',"\n";
+            echo '<p><span class="title">Test Results for '.$this->sName.'</span><br>',"\n";
            echo '<table width="100%" border="1">',"\n";
            echo '<thead class="historyHeader">',"\n";
            echo '<tr>',"\n";
@@ -683,7 +683,7 @@ class distribution {
                    continue;

                echo '<tr class='.$bgcolor.'>',"\n";
-                echo '<td><a href="'.$oVersion->objectMakeUrl().'&iTestingId='.$oTest->iTestingId.'">',"\n";
+                echo '<td><a href="'.$oVersion->objectMakeUrl().'&amp;iTestingId='.$oTest->iTestingId.'">',"\n";
                echo version::fullName($oVersion->iVersionId).'</a></td>',"\n";
                echo '<td>',"\n";
                if($_SESSION['current']->isLoggedIn())
@@ -696,10 +696,10 @@ class distribution {
                    echo $oSubmitter->sRealname;
                echo '</td>',"\n";
                echo '<td>'.date("M d Y", mysqldatetime_to_unixtimestamp($oTest->sSubmitTime)).'</td>',"\n";
-                echo '<td>'.$oTest->sTestedRelease.'&nbsp</td>',"\n";
-                echo '<td>'.$oTest->sInstalls.'&nbsp</td>',"\n";
-                echo '<td>'.$oTest->sRuns.'&nbsp</td>',"\n";
-                echo '<td>'.$oTest->sTestedRating.'&nbsp</td>',"\n";
+                echo '<td>'.$oTest->sTestedRelease.'&nbsp;</td>',"\n";
+                echo '<td>'.$oTest->sInstalls.'&nbsp;</td>',"\n";
+                echo '<td>'.$oTest->sRuns.'&nbsp;</td>',"\n";
+                echo '<td>'.$oTest->sTestedRating.'&nbsp;</td>',"\n";
                if ($_SESSION['current']->hasAppVersionModifyPermission($oVersion))
                {
                    echo '<td><a href="'.$oTest->objectMakeUrl().'">',"\n";
--- a/include/downloadurl.php
+++ b/include/downloadurl.php
@@ -104,8 +104,8 @@ class downloadurl
            $sReturn .= html_tr(array(
                "&nbsp;",
                "<input type=\"text\" size=\"45\" name=\"".
-                "sDescriptionNew\" />",
-                "<input type=\"text\" size=\"45\" name=\"sUrlNew\" />"),
+                "sDescriptionNew\">",
+                "<input type=\"text\" size=\"45\" name=\"sUrlNew\">"),
                "color4");

        if($hResult)
@@ -114,22 +114,22 @@ class downloadurl
            {
                $sReturn .= html_tr(array(
                    "<input type=\"checkbox\" name=\"bRemove$oRow->id\" ".
-                    "value=\"true\" />",
+                    "value=\"true\">",
                    "<input type=\"text\" size=\"45\" name=\"".
-                    "sDescription$oRow->id\" value=\"$oRow->description\" />",
+                    "sDescription$oRow->id\" value=\"$oRow->description\">",
                    "<input type=\"text\" size=\"45\" name=\"sUrl$oRow->id\" ".
-                    "value=\"$oRow->url\" />"),
+                    "value=\"$oRow->url\">"),
                    ($i % 2) ? "color0" : "color4");
            }
        }

        $sReturn .= html_table_end();
        $sReturn .= "<div align=\"center\"><input type=\"submit\" value=\"".
-                    "Update Download URLs\" name=\"sSubmit\" /></div>\n";
+                    "Update Download URLs\" name=\"sSubmit\"></div>\n";
        $sReturn .= "<input type=\"hidden\" name=\"iVersionId\" ".
-                    "value=\"$oVersion->iVersionId\" />\n";
+                    "value=\"$oVersion->iVersionId\">\n";
        $sReturn .= "<input type=\"hidden\" name=\"iAppId\" ".
-                    "value=\"$oVersion->iAppId\" />\n";
+                    "value=\"$oVersion->iAppId\">\n";
        $sReturn .= "</form>\n";
        $sReturn .= html_frame_end("&nbsp;");

@@ -298,19 +298,19 @@ class downloadurl
        $sReturn .= html_table_begin("width='100%' border=0 cellpadding=2 cellspacing=0");

        $sReturn .= "A place where this version can be downloaded for free".
-                    " (if applicable). You can add more links later.<br />";
+                    " (if applicable). You can add more links later.<br>";

        $sReturn .= html_tr(array(
            array("<b>Download URL:</b>", "align=right"),
            array("<input type=\"text\" name=\"sDownloadUrlUrl\" ".
-            "value=\"$sDownloadUrlUrl\" size=\"60\" />",
+            "value=\"$sDownloadUrlUrl\" size=\"60\">",
            "class=\"color4\"")),
            "color0");

        $sReturn .= html_tr(array(
            array("<b>Download URL Description:</b>", "align=right"),
            array("<input type=\"text\" name=\"sDownloadUrlDescription\" ".
-            "value=\"$sDownloadUrlDescription\" size=\"60\" />",
+            "value=\"$sDownloadUrlDescription\" size=\"60\">",
            "class=\"color4\"")),
            "color0");

--- a/include/form_login.php
+++ b/include/form_login.php
@@ -9,7 +9,7 @@ echo '<form method="post" name="sFlogin" action="account.php">',"\n";
 echo html_frame_start("Login to Application DB","400","",0);
 /* Pass on the URL we should return to after log-in */
 global $aClean;
-echo '<input type="hidden" name="sReturnTo" value="' . (isset($aClean['sReturnTo']) ? $aClean['sReturnTo'] : '') . '" />';
+echo '<input type="hidden" name="sReturnTo" value="' . (isset($aClean['sReturnTo']) ? $aClean['sReturnTo'] : '') . '">';
 ?>

 <!-- start of login form -->
--- a/include/html.php
+++ b/include/html.php
@@ -141,8 +141,8 @@ function html_imagebutton($text, $url, $extra = "")
    static $i = 1;

    $i++;
-    $img1 = apidb_url("util/button.php?text=".urlencode($text)."&pressed=0");
-    $img2 = apidb_url("util/button.php?text=".urlencode($text)."&pressed=1");
+    $img1 = apidb_url("util/button.php?text=".urlencode($text)."&amp;pressed=0");
+    $img2 = apidb_url("util/button.php?text=".urlencode($text)."&amp;pressed=1");

    $java  = "onMouseDown = 'document.img$i.src = \"$img2\"; return true;' ";
    $java .= "onMouseUp = 'document.img$i.src = \"$img1\"; return true;' ";
@@ -238,7 +238,7 @@ function html_back_link($howmany = 1, $url = "")
    {
        $url = 'javascript:history.back('.$howmany.');';
    }
-    return '<p>&nbsp;&nbsp; <a href="'.$url.'">&lt;&lt; Back</a></p>'."\n";
+    return '<p>&nbsp;&nbsp; <a href="'.htmlentities($url).'">&lt;&lt; Back</a></p>'."\n";
 }


--- a/include/incl.php
+++ b/include/incl.php
@@ -21,16 +21,16 @@ require_once(BASE."include/objectManager.php");
 /* to track down */
 if(get_magic_quotes_gpc())
 {
-    echo "<b>Please disable the magic quotes GPC PHP setting. See <a href=\"http://us2.php.net/manual/en/ref.info.php#ini.magic-quotes-gpc\"> this page</a> for more information</b><br/><br/>";
-    echo "AppDB php code assumes magic quotes are disabled.<br/><br/>";
-    echo "Magic quotes are a bad idea for a few reasons.<br/><br/>";
+    echo "<b>Please disable the magic quotes GPC PHP setting. See <a href=\"http://us2.php.net/manual/en/ref.info.php#ini.magic-quotes-gpc\"> this page</a> for more information</b><br><br>";
+    echo "AppDB php code assumes magic quotes are disabled.<br><br>";
+    echo "Magic quotes are a bad idea for a few reasons.<br><br>";
    echo "First is that php calls <b>addslashes()</b> on all \$_POST, \$_REQUEST and cookie variables ";
    echo "if magic quotes is enabled. ";
-    echo "Ooooooh you say.<br/>";
-    echo "<i>\"Aren't magic quotes a convienent way to protect my php code from sql injection attacks?\"</i><br/><br/>";
+    echo "Ooooooh you say.<br>";
+    echo "<i>\"Aren't magic quotes a convienent way to protect my php code from sql injection attacks?\"</i><br><br>";
    echo "No!  <b>addslashes()</b> isn't adequate.  You should use <b>query_escape_string()</b> or some other function";
    echo " that will handle multi-byte characters.  See <a href=\"http://shiflett.org/archive/184\">this article</a>";
-    echo " for a way to exploit <b>addslash()</b>ed parameters.<br/><br/>";
+    echo " for a way to exploit <b>addslash()</b>ed parameters.<br><br>";
    echo "A second reason is that with magic quotes enabled, due to the use of <b>query_escape_string()</b> to";
    echo " protect from sql injection attacks we'll end up with variables that have been addslash()ed and";
    echo " <b>query_escape_string()</b>ed.  So you end up having to call stripslashes() on EVERY variable. ";
--- a/include/mail.php
+++ b/include/mail.php
@@ -28,11 +28,11 @@ function mail_appdb($sEmailList,$sSubject,$sMsg)
       option is set.  Output in purple to distinguish it from other messages */
    if(defined("PRINT_EMAIL"))
    {
-        $sMsg = str_replace("\n", "<br />", $sMsg);
-        addmsg("This mail would have been sent<br /><br />".
-               "To: $sEmailList<br />".
-               "Subject: $sSubject<br /><br />".
-               "Body:<br />$sMsg", "purple");
+        $sMsg = str_replace("\n", "<br>", $sMsg);
+        addmsg("This mail would have been sent<br><br>".
+               "To: $sEmailList<br>".
+               "Subject: $sSubject<br><br>".
+               "Body:<br>$sMsg", "purple");
        return;
    }

--- a/include/maintainer.php
+++ b/include/maintainer.php
@@ -735,9 +735,9 @@ class maintainer
            echo "<input type=hidden name='iSuperMaintainer' value=$iSuperMaintainer>";

            if($iSuperMaintainer)
-                echo '<tr valign=top><td class=color0><b>Why you want to and should<br />be an application super maintainer</b></td><td><textarea name="sMaintainReason" rows=15 cols=70></textarea></td></tr>',"\n";
+                echo '<tr valign=top><td class=color0><b>Why you want to and should<br>be an application super maintainer</b></td><td><textarea name="sMaintainReason" rows=15 cols=70></textarea></td></tr>',"\n";
            else
-                echo '<tr valign=top><td class=color0><b>Why you want to and should<br />be an application maintainer</b></td><td><textarea name="sMaintainReason" rows=15 cols=70></textarea></td></tr>',"\n";
+                echo '<tr valign=top><td class=color0><b>Why you want to and should<br>be an application maintainer</b></td><td><textarea name="sMaintainReason" rows=15 cols=70></textarea></td></tr>',"\n";

            echo '</table>',"\n";
        } else
@@ -747,7 +747,7 @@ class maintainer
            echo html_frame_start("New Maintainer Form",600,"",0);
            echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n";
            echo "<input type=\"hidden\" name=\"iMaintainerId\" ".
-                "value=\"$this->iMaintainerId\" />";
+                "value=\"$this->iMaintainerId\">";

            /* User name */
            $oSubmitter = new user($this->iUserId);
@@ -783,7 +783,7 @@ class maintainer
                    // we need to exclude these from the list of maintainers that we are
                    // building
                    if(!maintainer::isUserSuperMaintainer($oUser, $oVersion->iAppId))
-                        echo "$oUser->sRealname<br />\n";
+                        echo "$oUser->sRealname<br>\n";
                }
            }

@@ -794,7 +794,7 @@ class maintainer
                while(list($index, $iUserId) = each($aOtherSuperMaintainers))
                {
                    $oUser = new User($iUserId);
-                    echo "$oUser->sRealname*<br />\n";
+                    echo "$oUser->sRealname*<br>\n";
                }
            }

@@ -817,9 +817,9 @@ class maintainer
                    $oApp = new Application($iAppIdOther);

                    if($bSuperMaintainerOther)
-                        echo $oApp->objectMakeLink()."*<br />\n";
+                        echo $oApp->objectMakeLink()."*<br>\n";
                    else
-                        echo $oVersion->fullNameLink($iVersionIdOther)."<br />\n";
+                        echo $oVersion->fullNameLink($iVersionIdOther)."<br>\n";
                }
            } else
            {
@@ -831,8 +831,8 @@ class maintainer
            $oApp = new Application($this->iAppId);
            $oVersion = new Version($this->iVersionId);

-            echo "<input type=\"hidden\" name=\"iAppId\" value=\"".$oApp->iAppId."\" />\n";
-            echo "<input type=\"hidden\" name=\"iVersionId\" value=\"".$oVersion->iVersionId."\" />\n";
+            echo "<input type=\"hidden\" name=\"iAppId\" value=\"".$oApp->iAppId."\">\n";
+            echo "<input type=\"hidden\" name=\"iVersionId\" value=\"".$oVersion->iVersionId."\">\n";

            //app name
            echo '<tr valign=top><td class=color0 style=\'text-align:right\'><b>App Name:</b></td>',"\n";
@@ -1119,7 +1119,7 @@ class maintainer
      {
        // FIXME: should use a function to generate these urls and use it here and
        // in sidebar_maintainer.php and sidebar_admin.php
-        $sMsg = 'Please visit the version queue ('.APPDB_ROOT."objectManager.php?sClass=version_queue&bIsQueue=true&sTitle=".
+        $sMsg = 'Please visit the version queue ('.APPDB_ROOT."objectManager.php?sClass=version_queue&amp;bIsQueue=true&amp;sTitle=".
          'Version%20Queue) to process queued versions for applications you maintain.'."\n";
      }

@@ -1160,8 +1160,8 @@ class maintainer
        // FIXME: should use a function to generate these urls and use it here and
        // in sidebar_maintainer.php and sidebar_admin.php
        $sMsg .= 'Please visit the AppDB Test Data Queue'.
-          '('.APPDB_ROOT.'objectManager.php?sClass=testData_queue&'.
-          'bIsQueue=true&sTitle=Test%20Results%20Queue)'.
+          '('.APPDB_ROOT.'objectManager.php?sClass=testData_queue&amp;'.
+          'bIsQueue=true&amp;sTitle=Test%20Results%20Queue)'.
          ' to process queued test data for versions you maintain.'."\n";
      }
      // queued testdata
@@ -1202,7 +1202,7 @@ class maintainer
        // FIXME: should use a function to generate these urls and use it here and
        // in sidebar_maintainer.php and sidebar_admin.php
        $sMsg.= 'Please visit the screenshot queue(';
-        $sMsg.= APPDB_ROOT.'objectManager.php?sClass=screenshot&bIsQueue=true&sTitle=Screenshot%20Queue) ';
+        $sMsg.= APPDB_ROOT.'objectManager.php?sClass=screenshot&amp;bIsQueue=true&amp;sTitle=Screenshot%20Queue) ';
        $sMsg.= 'to process queued screenshots for versions you maintain.'."\n";
      }

--- a/include/note.php
+++ b/include/note.php
@@ -232,7 +232,7 @@ class Note {
        if((!$aVars || $aVars['bEditing'] != "true") && $this->canEdit())
        {
            $shOutput .= "<tr class=\"color1\" align=\"center\" valign=\"top\"><td>";
-            $shOutput .= "<form method=\"post\" name=\"message\" action=\"objectManager.php?sClass=note&sAction=edit&iId=".$this->iNoteId."&sReturnTo=".urlencode($oVersion->objectMakeUrl())."\">";
+            $shOutput .= "<form method=\"post\" name=\"message\" action=\"objectManager.php?sClass=note&amp;sAction=edit&amp;iId=".$this->iNoteId."&amp;sReturnTo=".urlencode($oVersion->objectMakeUrl())."\">";
            $shOutput .= '<input type="submit" value="Edit Note" class="button">';
            $shOutput .= '</form></td></tr>';
        }
@@ -274,9 +274,9 @@ class Note {
        echo html_frame_start("Edit Application Note {$aClean['noteId']}", "90%","",0);
        echo html_table_begin("width='100%' border=0 align=left cellpadding=6 cellspacing=0 class='box-body'");

-        echo '<input type="hidden" name="bEditing" value="true" />';
-        echo '<input type="hidden" name="iNoteId" value="'.$this->iNoteId.'" />';
-        echo '<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'" />';
+        echo '<input type="hidden" name="bEditing" value="true">';
+        echo '<input type="hidden" name="iNoteId" value="'.$this->iNoteId.'">';
+        echo '<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'">';

        echo '<tr><td class=color1>Title</td>'."\n";
        echo '    <td class=color0><input size=80% type="text" name="sNoteTitle" type="text" value="'.$this->sTitle.'"></td></tr>',"\n";
--- a/include/objectManager.php
+++ b/include/objectManager.php
@@ -102,7 +102,7 @@ class ObjectManager
            return;

        $this->oSortInfo = null;
-        $this->oSortInfo = new TableSortInfo($this->makeUrl().'&');
+        $this->oSortInfo = new TableSortInfo($this->makeUrl().'&amp;');

        if($aClean)
            $this->oSortInfo->ParseArray($aClean, $this->getObject()->objectGetSortableFields());
@@ -327,7 +327,7 @@ class ObjectManager

            if($this->GetOptionalSetting("objectShowAddEntry", FALSE))
            {
-                echo "<br /><center><a href=\"".
+                echo "<br><center><a href=\"".
                     $this->makeUrl("add", false,
                     "Add $this->sClass entry").
                     "\">Add an entry?</a></center>";
@@ -340,7 +340,7 @@ class ObjectManager
        {
            echo '<div align="center">';
            $oM = new objectManager($this->sClass, 'Purge Rejected Entries');
-            echo '<a href="'.$oM->makeUrl('purgeRejected').'">Purge rejected entries</a><br /><br />';
+            echo '<a href="'.$oM->makeUrl('purgeRejected').'">Purge rejected entries</a><br><br>';
            echo '</div>';
        }

@@ -356,7 +356,7 @@ class ObjectManager
        $oObject = new $this->sClass();
        if($oObject->canEdit() && $this->GetOptionalSetting("objectShowAddEntry", FALSE))
        {
-            echo "<br /><br /><a href=\"".$this->makeUrl("add", false,
+            echo "<br><br><a href=\"".$this->makeUrl("add", false,
                    "Add $this->sClass")."\">Add entry</a>\n";
        }

@@ -437,7 +437,7 @@ class ObjectManager
                /////////////////////////////////////////////////
                // output radio buttons for some common responses
                echo '<tr valign=top><td class="color0"></td><td class="color0">'.
-                '<b>Common replies</b><br/> Email <a href="mailto:'.APPDB_OWNER_EMAIL.'">'.
+                '<b>Common replies</b><br> Email <a href="mailto:'.APPDB_OWNER_EMAIL.'">'.
                APPDB_OWNER_EMAIL.'</a> if you want to suggest a new common reply.</td></tr>',"\n";

                // NOTE: We use the label tag so the user can click anywhere in
@@ -448,7 +448,7 @@ class ObjectManager
                {
                echo '<tr valign=top><td class="color0"></td>',"\n";
                echo '<td class="color0"><label for="'.$iIndex.'"><input'.
-                    ' type="radio" name="sOMCommonReply" id="'.$iIndex.'" value="'.$sReply.'"/>'.
+                    ' type="radio" name="sOMCommonReply" id="'.$iIndex.'" value="'.$sReply.'">'.
                    $sReply.'</label></td>',"\n";
                echo '</tr>',"\n";
                }
@@ -460,21 +460,21 @@ class ObjectManager
            /* buttons for operations we can perform on this entry */
            echo '<tr valign=top><td class=color3 align=center colspan=2>' ,"\n";
            echo '<input name="sSubmit" type="submit" value="Submit" class="button" '. 
-                 '/>',"\n";
+                 '>',"\n";
            if(!$this->getOptionalSetting("objectHideDelete", FALSE))
            {
                echo '<input name="sSubmit" type="submit" value="Delete" '.
-                     'class="button" />',"\n";
+                     'class="button">',"\n";
            }

            if($this->sState != 'rejected' && !$this->getOptionalSetting("objectHideReject", FALSE))
            {
                echo '<input name="sSubmit" type="submit" value="Reject" class="button" '.
-                    '/>',"\n";
+                    '>',"\n";
            }

            echo '<input name="sSubmit" type="submit" value="Cancel" class="button" '.
-                 '/>',"\n";
+                 '>',"\n";
            echo '</td></tr>',"\n";
            echo '</table>';
            echo html_frame_end();
@@ -485,8 +485,8 @@ class ObjectManager

            echo '<tr valign=top><td class=color3 align=center colspan=2>',"\n";
            echo '<input name="sSubmit" type="submit" value="Submit" class="button">'.
-                 '&nbsp',"\n";
-            echo '<input name="sSubmit" type="submit" value="Delete" class="button" />'."\n";
+                 '&nbsp;',"\n";
+            echo '<input name="sSubmit" type="submit" value="Delete" class="button">'."\n";
            $this->handle_preview_button();
            echo "</td></tr>\n";
        }
@@ -545,16 +545,16 @@ class ObjectManager
        "Confirm deletion".
        "</div>".
        '<div class="info_contents">'.
-        "Are you sure you wish to delete this entry".$sSubmitter."?<br />".
+        "Are you sure you wish to delete this entry".$sSubmitter."?<br>".
        $shWhyComment.
        "</div>".
        "</div>".

        '<form method="post" action="'.$this->makeUrl().'">'.
        $this->makeUrlFormData().
-        '<input type="hidden" name="iId" value="'.$this->iId.'" />'.
-        '<textarea rows="15" cols="50" name="sReplyText"></textarea><br /><br />'.
-        '<input type="submit" value="Delete" name="sSubmit" class="button" />'.
+        '<input type="hidden" name="iId" value="'.$this->iId.'">'.
+        '<textarea rows="15" cols="50" name="sReplyText"></textarea><br><br>'.
+        '<input type="submit" value="Delete" name="sSubmit" class="button">'.
        "</form>".
        "</div>");
        echo $oTable->getString();
@@ -844,13 +844,13 @@ class ObjectManager
        }

        echo '<form action="objectManager.php" action="post" />';
-        echo 'Purge rejected entries of this type<br />';
-        echo '<input type="checkbox" value="true" name="bTimeLimit" /> ';
+        echo 'Purge rejected entries of this type<br>';
+        echo '<input type="checkbox" value="true" name="bTimeLimit"> ';
        echo 'Only entries submitted before ';
-        echo '<input type="text" name="sSubmittedBefore" size="25" value="'.date('Y-m-d H:i:s').'" /><br /><br />';
-        echo '<input type="hidden" name="sAction" value="doPurgeRejected" />';
+        echo '<input type="text" name="sSubmittedBefore" size="25" value="'.date('Y-m-d H:i:s').'"><br><br>';
+        echo '<input type="hidden" name="sAction" value="doPurgeRejected">';
        echo $this->makeUrlFormData();
-        echo '<input type="submit" value="Purge" />';
+        echo '<input type="submit" value="Purge">';
        echo '</form>';
    }

@@ -894,14 +894,14 @@ class ObjectManager
        $oObject = new $this->sClass($this->iId);
        if(!$oObject->canEdit())
        {
-            echo "Insufficient privileges.<br />\n";
+            echo "Insufficient privileges.<br>\n";
            return FALSE;
        }

        /* We only allow moving to non-queued objects */
        if(!$hResult = $oObject->objectGetEntries('accepted'))
        {
-            echo "Failed to get list of objects.<br />\n";
+            echo "Failed to get list of objects.<br>\n";
            return FALSE;
        }

@@ -927,7 +927,7 @@ class ObjectManager
            echo html_tr(array(
                    $oCandidate->objectMakeLink(),
                    "<a href=\"".$this->makeUrl("moveChildren", $this->iId).
-                    "&iNewId=".$oCandidate->objectGetId()."\">Move here</a>"),
+                    "&amp;iNewId=".$oCandidate->objectGetId()."\">Move here</a>"),
                        ($i % 2) ? "color0" : "color1");
        }
        echo "</table>\n";
@@ -993,7 +993,7 @@ class ObjectManager
        $this->oObject = $oObject;
        echo "<div align=\"center\">";
        echo "<input type=\"submit\" class=\"button\" value=\"Submit\" ". 
-        "name=\"sSubmit\" />\n";
+        "name=\"sSubmit\">\n";
        $this->handle_preview_button();
        echo "</div></form>\n";
        echo html_back_link(1);
@@ -1011,7 +1011,7 @@ class ObjectManager
        if(!$oObject->objectShowPreview())
            return;

-        echo '<input type="submit" name="sSubmit" class="button" value="Preview" />';
+        echo '<input type="submit" name="sSubmit" class="button" value="Preview">';
    }

    public function handle_anonymous_submission()
@@ -1230,36 +1230,36 @@ class ObjectManager
        $sIsQueue = $this->getIsQueue() ? "true" : "false";
        $sUrl .= "bIsQueue=$sIsQueue";
        $sIsRejected = $this->sState == 'rejected' ? "true" : "false";
-        $sUrl .= "&bIsRejected=$sIsRejected";
+        $sUrl .= "&amp;bIsRejected=$sIsRejected";

-        $sUrl .= "&sClass=".$this->sClass;
+        $sUrl .= "&amp;sClass=".$this->sClass;
        if($iId)
-            $sUrl .= "&iId=$iId";
+            $sUrl .= "&amp;iId=$iId";

        if($sAction)
-            $sUrl .= "&sAction=$sAction";
+            $sUrl .= "&amp;sAction=$sAction";

        if($this->sReturnTo)
-            $sUrl .= "&sReturnTo=".urlencode($this->sReturnTo);
+            $sUrl .= "&amp;sReturnTo=".urlencode($this->sReturnTo);

        if(!$sTitle)
            $sTitle = $this->sTitle;

        if($this->sReturnToTitle)
-            $sUrl .= "&sReturnToTitle=".$this->sReturnToTitle;
+            $sUrl .= "&amp;sReturnToTitle=".$this->sReturnToTitle;

-        $sUrl .= "&sTitle=".urlencode($sTitle);
+        $sUrl .= "&amp;sTitle=".urlencode($sTitle);

        if($this->oMultiPage->bEnabled)
        {
-            $sUrl .= "&iItemsPerPage=".$this->oMultiPage->iItemsPerPage;
-            $sUrl .= "&iPage=".$this->oMultiPage->iPage;
+            $sUrl .= "&amp;iItemsPerPage=".$this->oMultiPage->iItemsPerPage;
+            $sUrl .= "&amp;iPage=".$this->oMultiPage->iPage;
        }

        if($this->oSortInfo && $this->oSortInfo->sCurrentSort)
        {
-            $sUrl .= "&sOrderBy={$this->oSortInfo->sCurrentSort}";
-            $sUrl .= '&bAscending='.($this->oSortInfo->bAscending ? 'true' : 'false');
+            $sUrl .= "&amp;sOrderBy={$this->oSortInfo->sCurrentSort}";
+            $sUrl .= '&amp;bAscending='.($this->oSortInfo->bAscending ? 'true' : 'false');
        }

        return $sUrl;
@@ -1272,28 +1272,28 @@ class ObjectManager
        $sIsQueue = $this->getIsQueue() ? "true" : "false";
        $sIsRejected = $this->sState == 'rejected' ? "true" : "false";

-        $sReturn = "<input type=\"hidden\" name=\"bIsQueue\" value=\"$sIsQueue\" />\n";
-        $sReturn .= "<input type=\"hidden\" name=\"bIsRejected\" value=\"$sIsRejected\" />\n";
-        $sReturn .= "<input type=\"hidden\" name=\"sClass\" value=\"".$this->sClass."\" />\n";
-        $sReturn .= "<input type=\"hidden\" name=\"sTitle\" value=\"".$this->sTitle."\" />\n";
-        $sReturn .= "<input type=\"hidden\" name=\"sReturnTo\" value=\"".$this->sReturnTo."\" />\n";
-        $sReturn .= "<input type=\"hidden\" name=\"iId\" value=\"".$this->iId."\" />\n";
+        $sReturn = "<input type=\"hidden\" name=\"bIsQueue\" value=\"$sIsQueue\">\n";
+        $sReturn .= "<input type=\"hidden\" name=\"bIsRejected\" value=\"$sIsRejected\">\n";
+        $sReturn .= "<input type=\"hidden\" name=\"sClass\" value=\"".$this->sClass."\">\n";
+        $sReturn .= "<input type=\"hidden\" name=\"sTitle\" value=\"".$this->sTitle."\">\n";
+        $sReturn .= "<input type=\"hidden\" name=\"sReturnTo\" value=\"".$this->sReturnTo."\">\n";
+        $sReturn .= "<input type=\"hidden\" name=\"iId\" value=\"".$this->iId."\">\n";

        if($this->oMultiPage->bEnabled)
        {
            $sReturn .= "<input type=\"hidden\" name=\"iItemsPerPage\" value=\"".
-                    $this->oMultiPage->iItemsPerPage."\" />\n";
+                    $this->oMultiPage->iItemsPerPage."\">\n";
            $sReturn .= "<input type=\"hidden\" name=\"iPage\" value=\"".
-                    $this->oMultiPage->iPage."\" />\n";
+                    $this->oMultiPage->iPage."\">\n";
        }

        if($this->sReturnToTitle)
-            $sReturn .= "<input type=\"hidden\" name=\"sReturnToTitle\" value=\"".$this->sReturnToTitle."\" />\n";
+            $sReturn .= "<input type=\"hidden\" name=\"sReturnToTitle\" value=\"".$this->sReturnToTitle."\">\n";

        if($this->oSortInfo && $this->oSortInfo->sCurrentSort)
        {
-            $sReturn .= "<input type=\"hidden\" name=\"sOrderBy\" value=\"{$this->oSortInfo->sCurrentSort}\" />";
-            $sReturn .= "<input type=\"hidden\" name=\"bAscending\" value=\"".($this->oSortInfo->bAscending ? 'true' : 'false')."\" />";
+            $sReturn .= "<input type=\"hidden\" name=\"sOrderBy\" value=\"{$this->oSortInfo->sCurrentSort}\">";
+            $sReturn .= "<input type=\"hidden\" name=\"bAscending\" value=\"".($this->oSortInfo->bAscending ? 'true' : 'false')."\">";
        }

        return $sReturn;
@@ -1369,7 +1369,7 @@ class ObjectManager
            /* Fill in form data for the objectManager URL */
            $sControls .= $this->makeUrlFormData();
            $sControls .= "<p><b>&nbsp;Items per page</b>";
-            $sControls .= "<select name=\"iItemsPerPage\" />";
+            $sControls .= "<select name=\"iItemsPerPage\">";

            foreach($aItemsPerPage as $iNum)
            {
@@ -1377,8 +1377,8 @@ class ObjectManager
                $sControls .= "<option$sSelected>$iNum</option>";
            }
            $sControls .= "</select>";
-            $sControls .= " &nbsp; <input type=\"submit\" value=\"Update\" />";
-            $sControls .= "</form></p>";
+            $sControls .= " &nbsp; <input type=\"submit\" value=\"Update\">";
+            $sControls .= "</form>";
        }

        $iTotalEntries = $oObject->objectGetEntriesCount($this->sState);
@@ -1397,12 +1397,12 @@ class ObjectManager

        /* Display selectors and info */
        echo '<div align="center">';
-        echo "<b>Page $iPage of $iNumPages</b><br />";
+        echo "<b>Page $iPage of $iNumPages</b><br>";

        /* Page controls */
        $iPageRange = 7; // the number of page links we want to display
        display_page_range($iPage, $iPageRange, $iNumPages,
-                           $this->makeUrl()."&iItemsPerPage=$iItemsPerPage");
+                           $this->makeUrl()."&amp;iItemsPerPage=$iItemsPerPage");

        echo $sControls;
        echo "</div>\n";
@@ -1457,9 +1457,9 @@ class ObjectManager
                return TRUE;

            echo "<font color=\"red\">\n";
-            echo "The following errors were found<br />\n";
+            echo "The following errors were found<br>\n";
            echo "<ul>$sErrors</ul>\n";
-            echo "</font><br />";
+            echo "</font><br>";
            return TRUE;
        } else
        {
--- a/include/parsedate.php
+++ b/include/parsedate.php
@@ -15,7 +15,7 @@ function parsedate($datestr)
    $dp = explode(' ', $datestr);
    while(list($idx, $part) = each($dp))
    {
-        //echo "PART($part)<br />";
+        //echo "PART($part)<br>";

        /* 23:59:59 */
        if(ereg("^([0-9]+):([0-9]+):([0-9]+)$", $part, $arr))
@@ -74,7 +74,7 @@ function parsedate($datestr)
            continue;
        }
 	    
-        //echo "Unparsed: '$part'<br />\n";
+        //echo "Unparsed: '$part'<br>\n";

    }

--- a/include/screenshot.php
+++ b/include/screenshot.php
@@ -450,7 +450,7 @@ class screenshot
        /* skip it for IE */
        if(strpos($_SERVER['HTTP_USER_AGENT'], "MSIE") === false)
        {
-            $sZoomIcon = '<img class="zoom_overlay" src="'.BASE.'images/xmag_32.png" alt="" />';
+            $sZoomIcon = '<img class="zoom_overlay" src="'.BASE.'images/xmag_32.png" alt="">';
        }
        else
            $sZoomIcon = "";
@@ -496,11 +496,11 @@ class screenshot

        if(!$hResult || !query_num_rows($hResult))
        {
-            $sImgFile.= '<img src="images/no_screenshot.png" alt="No Screenshot" />';
+            $sImgFile.= '<img src="images/no_screenshot.png" alt="No Screenshot">';
        } else
        {
            $oRow = query_fetch_object($hResult);
-            $sImgFile.= '<img src="appimage.php?bThumbnail=true&amp;iId='.$oRow->id.'" alt="'.$oRow->description.'" />';
+            $sImgFile.= '<img src="appimage.php?bThumbnail=true&amp;iId='.$oRow->id.'" alt="'.$oRow->description.'">';
        }

        if($bFormatting)
@@ -516,19 +516,19 @@ class screenshot
        if($hResult && query_num_rows($hResult))
        {
            if($iVersionId)
-                $sImg .= "<a href='screenshots.php?iAppId=$iAppId&amp;iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."<center>View/Submit&nbsp;Screenshot</center></a>";
+                $sImg .= "<div class=\"imgarea\"><a href='screenshots.php?iAppId=$iAppId&amp;iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."View/Submit&nbsp;Screenshot</a></div>";
            else
-                $sImg .= "<a href='screenshots.php?iAppId=$iAppId&amp;iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."<center>View&nbsp;Screenshot</center></a>";
+                $sImg .= "<div class=\"imgarea\"><a href='screenshots.php?iAppId=$iAppId&amp;iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."View&nbsp;Screenshot</a></div>";
        } else if($iVersionId) /* we are asking for a specific app version but it has no screenshots */
        {
-            $sImg .= "<a href='screenshots.php?iAppId=$iAppId&amp;iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."<center>Submit&nbsp;Screenshot</center></a>";
+            $sImg .= "<div class=\"imgarea\"><a href='screenshots.php?iAppId=$iAppId&amp;iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."<br>Submit&nbsp;Screenshot</a></div>";
        } else /* we have no screenshots and we aren't a specific version, we don't allow adding screenshots for an app */
        {
            $sImg .= $sImgFile.$sZoomIcon; 
        }

        if($bFormatting)
-            $sImg .= html_frame_end()."<br />";
+            $sImg .= html_frame_end()."<br>";

        return $sImg;
    }
@@ -572,7 +572,7 @@ class screenshot
        $sRandName = User::generate_passwd(5);
        // set img tag        
        $shImgSRC  = '<img src="'.apidb_fullurl("appimage.php").
-            '?bThumbnail=true&iId='.$this->iScreenshotId.'" alt="'.$this->sDescription.
+            '?bThumbnail=true&amp;iId='.$this->iScreenshotId.'" alt="'.$this->sDescription.
            '" width="'.$this->get_thumbnail_width().
            '" height="'.$this->get_thumbnail_height().'">';
        $shImg = '<a href="'.apidb_fullurl("appimage.php").
@@ -636,9 +636,9 @@ class screenshot
            echo $shImg;
            echo "<div align=center>". substr($oRow->description,0,20). "\n";

-            echo "<br />[".$oApp->objectMakeLink()."]";
+            echo "<br>[".$oApp->objectMakeLink()."]";

-            echo "<br />[".$oVersion->objectMakeLink()."]";
+            echo "<br>[".$oVersion->objectMakeLink()."]";

            echo "</div></td>\n";
            // end row if counter of 3
@@ -646,7 +646,7 @@ class screenshot
                echo "</tr><tr>\n";
        }

-        echo "</tr></table></div><br />\n";
+        echo "</tr></table></div><br>\n";
    }

    function objectGetEntries($sState, $iRows = 0, $iStart = 0)
@@ -712,18 +712,18 @@ class screenshot
        echo '<td>';
        $imgSRC = '<img width="'.$this->get_thumbnail_width().'" height="'.
                $this->get_thumbnail_height().'" src="'.BASE.
-                'appimage.php?bQueued=true&iId='.$this->iScreenshotId.'" />';
+                'appimage.php?bQueued=true&amp;iId='.$this->iScreenshotId.'" />';
        // generate random tag for popup window
        $randName = User::generate_passwd(5);
        // set image link based on user pref
-        $img = '<a href="javascript:openWin(\''.BASE.'appimage.php?bQueued=true&iId='.
+        $img = '<a href="javascript:openWin(\''.BASE.'appimage.php?bQueued=true&amp;iId='.
                $this->iScreenshotId.'\',\''.$randName.'\','.$this->get_screenshot_width()
                .','.($this->get_screenshot_height()+4).');">'.$imgSRC.'</a>';
        if ($_SESSION['current']->isLoggedIn())
        {
            if ($_SESSION['current']->getpref("window:screenshot") == "no")
            {
-                $img = '<a href="'.BASE.'appimage.php?bQueued=true&iId='.
+                $img = '<a href="'.BASE.'appimage.php?bQueued=true&amp;iId='.
                        $this->iScreenshotId.'">'.$imgSRC.'</a>';
            }
        }
--- a/include/sidebar.php
+++ b/include/sidebar.php
@@ -18,19 +18,19 @@ function global_sidebar_menu()
    $g->done();

    $g = new htmlmenu("AppDB");
-    $g->add("Screenshots", BASE."objectManager.php?sClass=screenshot&sTitle=View+Screenshots");
+    $g->add("Screenshots", BASE."objectManager.php?sClass=screenshot&amp;sTitle=View+Screenshots");
    $g->add("Browse Apps", BASE."appbrowse.php");
-    $g->add("Browse Newest Apps", BASE."objectManager.php?sClass=application&".
-            'sTitle=Newest%20apps&sOrderBy=appId&bAscending=false');
+    $g->add("Browse Newest Apps", BASE."objectManager.php?sClass=application&amp;".
+            'sTitle=Newest%20apps&amp;sOrderBy=appId&amp;bAscending=false');
    $g->add("Downloadable Apps", BASE."browse_downloadable.php");
    $g->add("Browse Apps by Rating", BASE."browse_by_rating.php");
    $g->add("Top 25", BASE."votestats.php");
-    $g->add("Submit Application", BASE."objectManager.php?sClass=application_queue&".
-            "sTitle=Submit+Application&sAction=add");
+    $g->add("Submit Application", BASE."objectManager.php?sClass=application_queue&amp;".
+            "sTitle=Submit+Application&amp;sAction=add");
    $g->add("Help &amp; Documentation", BASE."help/");
    $g->add("Statistics", BASE."appdbStats.php");
-    $g->add('Distributions ('.distribution::objectGetEntriesCount('accepted').')', BASE.'objectManager.php?sClass=distribution&sTitle=View%20Distributions');
-    $g->add('Vendors ('.vendor::objectGetEntriesCount('accepted').')', BASE.'objectManager.php?sClass=vendor&sTitle=View%20Vendors');
+    $g->add('Distributions ('.distribution::objectGetEntriesCount('accepted').')', BASE.'objectManager.php?sClass=distribution&amp;sTitle=View%20Distributions');
+    $g->add('Vendors ('.vendor::objectGetEntriesCount('accepted').')', BASE.'objectManager.php?sClass=vendor&amp;sTitle=View%20Vendors');
    $g->add("Email your suggestions for improving the AppDB", "mailto:appdb@winehq.org");
    $g->done();

@@ -51,11 +51,11 @@ function app_search_box($q = '')
 <!-- Google CSE Search Box Begins -->
  <script type="text/javascript">
  document.write(\'<form id=\"searchbox_013271970634691685804:bc-56dvxydi\" action=\"http://appdb.winehq.org/search_results.php\">\')
-    document.write(\'<input type="hidden" name="cx" value="013271970634691685804:bc-56dvxydi" />\')
-    document.write(\'<input type=\"hidden\" name=\"cof" value=\"FORID:11\" />\')
-    document.write(\'<input name=\"q\" type=\"text\" size=\"20\" />\')
-    document.write(\'<input type=\"submit\" name=\"sa\" value=\"Search\" />\')
-  document.write(\'</form>\')
+    document.write(\'<input type="hidden" name="cx" value="013271970634691685804:bc-56dvxydi" >\')
+    document.write(\'<input type=\"hidden\" name=\"cof" value=\"FORID:11\" >\')
+    document.write(\'<input name=\"q\" type=\"text\" size=\"20\" >\')
+    document.write(\'<input type=\"submit\" name=\"sa\" value=\"Search\" >\')
+  document.write(\'<\/form>\')
  </script>
  <script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=searchbox_013271970634691685804%3Abc-56dvxydi"></script>
 <!-- Google CSE Search Box Ends -->
@@ -65,8 +65,8 @@ function app_search_box($q = '')
    $shSearchStr .= '
  <noscript>
    <form method="post" action="search.php">
-    <input type="text" size="20" name="sSearchQuery" />
-    <input type="submit" value="Search" />
+    <input type="text" size="20" name="sSearchQuery">
+    <input type="submit" value="Search">
    </form>
  </noscript>
 ';
--- a/include/sidebar_admin.php
+++ b/include/sidebar_admin.php
@@ -10,22 +10,22 @@ function global_admin_menu() {
    $g = new htmlmenu("Global Admin");

    $g->add("App Queue (".application::objectGetEntriesCount('queued').")",
-            BASE.'objectManager.php?sClass=application_queue&sState=queued&sTitle='.
+            BASE.'objectManager.php?sClass=application_queue&amp;sState=queued&amp;sTitle='.
            'Application%20Queue');
    $g->add("Version Queue (".version::objectGetEntriesCount('queued').")",
-            BASE.'objectManager.php?sClass=version_queue&sState=queued&sTitle='.
+            BASE.'objectManager.php?sClass=version_queue&amp;sState=queued&amp;sTitle='.
            'Version%20Queue');
    $g->add("Screenshot Queue (".appData::objectGetEntriesCount('queued', "screenshot").")",
-            BASE.'objectManager.php?sClass=screenshot&sState=queued&sTitle='.
+            BASE.'objectManager.php?sClass=screenshot&amp;sState=queued&amp;sTitle='.
            'Screenshot%20Queue');
    $g->add("Maintainer Queue (".Maintainer::objectGetEntriesCount('queued').")",
-            BASE.'objectManager.php?sClass=maintainer&sState=queued&sTitle='.
+            BASE.'objectManager.php?sClass=maintainer&amp;sState=queued&amp;sTitle='.
            'Maintainer%20Queue');
    $g->add("Test Results Queue (".testData::objectGetEntriesCount('queued').")",
-            BASE.'objectManager.php?sClass=testData_queue&sState=queued&sTitle='.
+            BASE.'objectManager.php?sClass=testData_queue&amp;sState=queued&amp;sTitle='.
            'Test%20Results%20Queue');
    $g->add("Bug Link Queue (".bug::objectGetEntriesCount('queued').")",
-            BASE.'objectManager.php?sClass=bug&sState=queued&sTitle='.
+            BASE.'objectManager.php?sClass=bug&amp;sState=queued&amp;sTitle='.
            'Bug%20Link%20Queue');

    $g->addmisc("&nbsp;");
@@ -33,10 +33,10 @@ function global_admin_menu() {
    $g->add("Maintainer Entries (".Maintainer::objectGetEntriesCount('accepted').")",
            BASE."admin/adminMaintainers.php");
    $g->add("Bug Links (".bug::objectGetEntriesCount('accepted').")",
-            BASE."objectManager.php?sClass=bug&sTitle=".
+            BASE."objectManager.php?sClass=bug&amp;sTitle=".
            "Bug%20Links");
    $g->add("Test Results (".testData::objectGetEntriesCount('accepted').")",
-            BASE."objectManager.php?sClass=testData&sTitle=".
+            BASE."objectManager.php?sClass=testData&amp;sTitle=".
            "View%20Test%20Results");
    $g->add("Users Management", BASE."admin/adminUsers.php");
    $g->add("Comments Management", BASE."admin/adminCommentView.php");
@@ -45,20 +45,20 @@ function global_admin_menu() {
    $g->addmisc("&nbsp;");

    $g->add("Rejected Applications (".application::objectGetEntriesCount('rejected').")",
-            BASE.'objectManager.php?sClass=application_queue&sState=rejected&'.
+            BASE.'objectManager.php?sClass=application_queue&amp;sState=rejected&amp;'.
            'sTitle=Rejected%20Applications');
    $g->add("Rejected Versions (".version::objectGetEntriesCount('rejected').")",
-            BASE.'objectManager.php?sClass=version_queue&sState=rejected&'.
+            BASE.'objectManager.php?sClass=version_queue&amp;sState=rejected&amp;'.
            'sTitle=Rejected%20Versions');
    $g->add("Rejected Test Results (".testData::objectGetEntriesCount('rejected').")",
-            BASE.'objectManager.php?sClass=testData_queue&sState=rejected&'.
+            BASE.'objectManager.php?sClass=testData_queue&amp;sState=rejected&amp;'.
            'sTitle=Rejected%20Test%20Results');

    $g->addmisc("&nbsp;");

-    $g->add("Add Category", BASE."objectManager.php?sClass=category&sAction=add&sTitle=Add+Category");
-    $g->add("Add Vendor", BASE."objectManager.php?sClass=vendor&bQueue=".
-    "false&sAction=add&sTitle=Add%20Vendor");
+    $g->add("Add Category", BASE."objectManager.php?sClass=category&amp;sAction=add&amp;sTitle=Add+Category");
+    $g->add("Add Vendor", BASE."objectManager.php?sClass=vendor&amp;bQueue=".
+    "false&amp;sAction=add&amp;sTitle=Add%20Vendor");

    $g->done();
 }
--- a/include/sidebar_login.php
+++ b/include/sidebar_login.php
@@ -44,7 +44,7 @@ function global_sidebar_login() {
        if($iAppsRejected && !$_SESSION['current']->hasPriv("admin"))
        {
          $g->add("Review Rejected Apps ($iAppsRejected)", BASE."objectManager.php?".
-                  "sClass=application_queue&bIsQueue=true&bIsRejected=true&sTitle=".
+                  "sClass=application_queue&amp;bIsQueue=true&amp;bIsRejected=true&amp;sTitle=".
                  "Rejected+Applications", "center");
        }

@@ -53,16 +53,16 @@ function global_sidebar_login() {
        if($iVersionsRejected && !$_SESSION['current']->hasPriv("admin"))
        {
            $g->add("Review Rejected Versions ($iVersionsRejected)",
-                    BASE."objectManager.php?sClass=version_queue&bIsRejected=true".
-                    "&bIsQueue=true&sTitle=Rejected+Versions", "center");
+                    BASE."objectManager.php?sClass=version_queue&amp;bIsRejected=true".
+                    "&amp;bIsQueue=true&amp;sTitle=Rejected+Versions", "center");
        }

        /* Display the user's rejected test results */
        $iTestDataRejected = testData::objectGetEntriesCount('rejected');
        if($iTestDataRejected && !$_SESSION['current']->hasPriv("admin"))
            $g->add("Review Rejected Test Results ($iTestDataRejected)",
-                    BASE."objectManager.php?sClass=testData_queue&".
-                    "sAction=view&bIsQueue=true&bIsRejected=true&sTitle=".
+                    BASE."objectManager.php?sClass=testData_queue&amp;".
+                    "sAction=view&amp;bIsQueue=true&amp;bIsRejected=true&amp;sTitle=".
                    "Rejected+Test+Results", "center");

        $aMonitored = Monitor::getVersionsMonitored($_SESSION['current']);
--- a/include/sidebar_maintainer_admin.php
+++ b/include/sidebar_maintainer_admin.php
@@ -8,13 +8,13 @@ function global_maintainer_admin_menu() {
    $g = new htmlmenu("Maintainer Admin");

    $g->add('View Version Queue ('.version::objectGetEntriesCount('queued').')',
-            BASE.'objectManager.php?sClass=version_queue&sState=queued&sTitle='.
+            BASE.'objectManager.php?sClass=version_queue&amp;sState=queued&amp;sTitle='.
            'Version%20Queue');
    $g->add('View Screenshot Queue ('.screenshot::objectGetEntriesCount('queued').')',
-            BASE.'objectManager.php?sClass=screenshot&sState=queued&sTitle='.
+            BASE.'objectManager.php?sClass=screenshot&amp;sState=queued&amp;sTitle='.
            'Screenshot%20Queue');
    $g->add('View Test Results Queue ('.testData::objectGetEntriesCount('queued').')',
-            BASE.'objectManager.php?sClass=testData_queue&sState=queued&sTitle='.
+            BASE.'objectManager.php?sClass=testData_queue&amp;sState=queued&amp;sTitle='.
            'Test%20Results%20Queue');
    $g->done();
 }
--- a/include/table.php
+++ b/include/table.php
@@ -159,19 +159,19 @@ class TableCell
    $sStr = "<td";

    if($this->sClass)
-      $sStr.=" class=\"".$this->sClass."\";";
+      $sStr.=" class=\"".$this->sClass."\"";

    if($this->sStyle)
-      $sStr.=" style=\"".$this->sStyle."\";";
+      $sStr.=" style=\"".$this->sStyle."\"";

    if($this->sAlign)
-      $sStr.=" align=\"".$this->sAlign."\";";
+      $sStr.=" align=\"".$this->sAlign."\"";

    if($this->sValign)
-      $sStr.=" valign=\"".$this->sValign."\";";
+      $sStr.=" valign=\"".$this->sValign."\"";

    if($this->sWidth)
-      $sStr.=" width=\"".$this->sWidth."\";";
+      $sStr.=" width=\"".$this->sWidth."\"";

    $sStr.=">";

@@ -355,7 +355,7 @@ class TableRowSortable extends TableRow
                }

                $sAscending = $bAscending == TRUE ? 'true': 'false';
-                $this->aTableCells[$i]->SetCellLink($oSortInfo->shUrl."sOrderBy=$sSortVar&bAscending=$sAscending");
+                $this->aTableCells[$i]->SetCellLink($oSortInfo->shUrl."sOrderBy=$sSortVar&amp;bAscending=$sAscending");
            }
        }
    }
--- a/include/testData.php
+++ b/include/testData.php
@@ -439,7 +439,7 @@ class testData{
                $sSubject =  "Submitted testing data accepted";
                $sMsg  = "The testing data you submitted for '$sName' has been ".
                        "accepted by ".$_SESSION['current']->sRealname.".\n";
-                $sMsg .= $oVersion->objectMakeUrl()."&iTestingId=".$this->iTestingId."\n";
+                $sMsg .= $oVersion->objectMakeUrl()."&amp;iTestingId=".$this->iTestingId."\n";
                $sMsg .= "Administrators response:\n";
            break;
            case "reject":
@@ -465,7 +465,7 @@ class testData{

        $oVersion = new Version($this->iVersionId);
        $oApp = new Application($oVersion->iAppId);
-        $sBacklink = $oVersion->objectMakeUrl()."&iTestingId=".$this->iTestingId."\n";
+        $sBacklink = $oVersion->objectMakeUrl()."&amp;iTestingId=".$this->iTestingId."\n";

        switch($sAction)
        {
@@ -519,13 +519,13 @@ class testData{
 
    function ShowTestResult()
    {
-        echo '<p><b>What works</b><br />',"\n";
+        echo '<p><b>What works</b><br>',"\n";
        echo $this->shWhatWorks,"\n";
-        echo '<p><br /><b>What does not</b><br />',"\n";
+        echo '<p><br><b>What does not</b><br>',"\n";
        echo $this->shWhatDoesnt,"\n";
-        echo '<p><br /><b>What was not tested</b><br />',"\n";
+        echo '<p><br><b>What was not tested</b><br>',"\n";
        echo $this->shWhatNotTested,"\n";
-        echo '<p><br /><b>Additional Comments</b><br />',"\n";
+        echo '<p><br><b>Additional Comments</b><br>',"\n";
        echo $this->sComments,"\n";
    }

@@ -606,19 +606,19 @@ class testData{

        $oTableRow->AddTextCell($oDistribution->objectMakeLink());
        $oTableRow->AddTextCell(date("M d Y", mysqldatetime_to_unixtimestamp($this->sTestedDate)));
-        $oTableRow->AddTextCell($this->sTestedRelease.'&nbsp');
-        $oTableRow->AddTextCell($this->sInstalls.'&nbsp');
-        $oTableRow->AddTextCell($this->sRuns.'&nbsp');
-        $oTableRow->AddTextCell($this->sTestedRating.'&nbsp');
-        $oTableRow->AddTextCell($oSubmitter->objectMakeLink().'&nbsp');
+        $oTableRow->AddTextCell($this->sTestedRelease.'&nbsp;');
+        $oTableRow->AddTextCell($this->sInstalls.'&nbsp;');
+        $oTableRow->AddTextCell($this->sRuns.'&nbsp;');
+        $oTableRow->AddTextCell($this->sTestedRating.'&nbsp;');
+        $oTableRow->AddTextCell($oSubmitter->objectMakeLink().'&nbsp;');
        if ($this->iTestingId && $_SESSION['current']->hasAppVersionModifyPermission($oVersion))
        {
            $oObject = new objectManager('testData');
            $oTableRow->AddTextCell('<a href="'.$oObject->makeUrl('edit', $this->iTestingId,
-                                    'Edit Test Results').'&sReturnTo='.urlencode($_SERVER['REQUEST_URI']).'">'.
+                                    'Edit Test Results').'&amp;sReturnTo='.urlencode($_SERVER['REQUEST_URI']).'">'.
                                    'Edit</a> &nbsp; '."\n".
                                    '<a href="'.$oObject->makeUrl('delete', $this->iTestingId, 'Delete+Test+Results').
-                                    '&sReturnTo='.urlencode($_SERVER['REQUEST_URI']).'">Delete</a></td>'."\n");
+                                    '&amp;sReturnTo='.urlencode($_SERVER['REQUEST_URI']).'">Delete</a></td>'."\n");
        }

        // if this is a clickable row, set the appropriate property
@@ -677,7 +677,7 @@ class testData{

        echo $oTable->GetString();

-        echo '<br />',"\n"; // put a space after the test results table and the button
+        echo '<br>',"\n"; // put a space after the test results table and the button

        echo '<form method=get action="objectManager.php">'."\n";

@@ -687,14 +687,14 @@ class testData{
        } else
        {
            $sShowButtonText = "Show All Tests";
-            echo '<input type="hidden" name="bShowAll" value="true" />';
+            echo '<input type="hidden" name="bShowAll" value="true">';
        }

        $oManager = new objectManager("version", null, $this->iVersionId);

        echo $oManager->makeUrlFormData();

-        echo "\t".'<input class="button" type=submit value="'.$sShowButtonText.'" />'."\n";
+        echo "\t".'<input class="button" type=submit value="'.$sShowButtonText.'">'."\n";

        echo '</form>'."\n";

@@ -889,7 +889,7 @@ class testData{
                                     "review it in the form below or replace ".
                                     "it with one from the list.";
            }
-            $sDistributionHelp .= "<br />\n";
+            $sDistributionHelp .= "<br>\n";
        }

        echo '<tr valign=top><td class="color0"><b>Distribution</b></td class="color0">',"\n";
@@ -909,7 +909,7 @@ class testData{
        echo "<li>If you are testing with an older release than listed please";
        echo " upgrade and test with a newer release.</li>\n";
        echo "<li><b>NOTE: 'CVS' was recently removed as a version because we simply can't track";
-        echo " exactly which CVS version was used.<br/> If you haven't tested with one of the";
+        echo " exactly which CVS version was used.<br> If you haven't tested with one of the";
        echo " listed versions please retest with a recent release and resubmit.</li>\n";
        echo "</ul>\n";
        echo '</td></tr>',"\n";
@@ -942,13 +942,13 @@ class testData{
            if(getInput('bConfirmTestedVersionChange', $aClean) != 'true')
            {
                echo '<tr><td class="color1">&nbsp;</td><td class="color0">';
-                echo 'You have changed the Wine version of the report.  Are you sure you want to do this?  Please submit a new test report for every Wine version you test; this is useful for tracking Wine&#8217;s progress.<br />';
-                echo '<input type="checkbox" name="bConfirmTestedVersionChange" value="true" /> ';
+                echo 'You have changed the Wine version of the report.  Are you sure you want to do this?  Please submit a new test report for every Wine version you test; this is useful for tracking Wine&#8217;s progress.<br>';
+                echo '<input type="checkbox" name="bConfirmTestedVersionChange" value="true"> ';
                echo 'Yes, I want to change the Wine version';
                echo '</td></tr>';
            } else
            {
-                echo '<input type="hidden" name="bConfirmTestedVersionChange" value="true" />';
+                echo '<input type="hidden" name="bConfirmTestedVersionChange" value="true">';
            }
        }

--- a/include/url.php
+++ b/include/url.php
@@ -283,8 +283,8 @@ class Url {
            $sReturn .= html_tr(array(
                "&nbsp;",
                "<input type=\"text\" size=\"45\" name=\"".
-                "sDescriptionNew\" />",
-                "<input type=\"text\" size=\"45\" name=\"sUrlNew\" />"),
+                "sDescriptionNew\">",
+                "<input type=\"text\" size=\"45\" name=\"sUrlNew\">"),
                "color4");

        if($hResult)
@@ -293,11 +293,11 @@ class Url {
            {
                $sReturn .= html_tr(array(
                    "<input type=\"checkbox\" name=\"bRemove$oRow->id\" ".
-                    "value=\"true\" />",
+                    "value=\"true\">",
                    "<input type=\"text\" size=\"45\" name=\"".
-                    "sDescription$oRow->id\" value=\"$oRow->description\" />",
+                    "sDescription$oRow->id\" value=\"$oRow->description\">",
                    "<input type=\"text\" size=\"45\" name=\"sUrl$oRow->id\" ".
-                    "value=\"$oRow->url\" />"),
+                    "value=\"$oRow->url\">"),
                    ($i % 2) ? "color0" : "color4");
            }
        }
@@ -309,14 +309,14 @@ class Url {

        $sReturn .= html_table_end();
        $sReturn .= "<div align=\"center\"><input type=\"submit\" value=\"".
-                    "Update URLs\" name=\"sSubmit\" /></div>\n";
+                    "Update URLs\" name=\"sSubmit\"></div>\n";

        if($oVersion)
            $sReturn .=" <input type=\"hidden\" name=\"iVersionId\" ".
-                    "value=\"$oVersion->iVersionId\" />\n";
+                    "value=\"$oVersion->iVersionId\">\n";

        $sReturn .= "<input type=\"hidden\" name=\"iAppId\" ".
-                    "value=\"$iAppId\" />\n";
+                    "value=\"$iAppId\">\n";
        $sReturn .= "</form>\n";
        $sReturn .= html_frame_end("&nbsp;");

--- a/include/util.php
+++ b/include/util.php
@@ -554,9 +554,9 @@ function display_page_range($iCurrentPage=1, $iPageRange=1, $iTotalPages=1, $sLi

    if($iCurrentPage != 1)
    {
-        echo "<a href='".$sLinkurl."&iPage=1'>|&lt</a>&nbsp;";
+        echo "<a href='".$sLinkurl."&amp;iPage=1'>|&lt</a>&nbsp;";
        $iPreviousPage = $iCurrentPage - 1;
-        echo "<a href='".$sLinkurl."&iPage=$iPreviousPage'>&lt</a>&nbsp;";
+        echo "<a href='".$sLinkurl."&amp;iPage=$iPreviousPage'>&lt</a>&nbsp;";
    } else
    {
        echo "|&lt &lt ";
@@ -565,7 +565,7 @@ function display_page_range($iCurrentPage=1, $iPageRange=1, $iTotalPages=1, $sLi
    for($iPg = $iStartPage; $iPg <= $iEndPage; $iPg++)
    {
        if($iPg != $iCurrentPage)
-            echo "<a href='".$sLinkurl."&iPage=".$iPg."'>$iPg</a> ";
+            echo "<a href='".$sLinkurl."&amp;iPage=".$iPg."'>$iPg</a> ";
        else
            echo "$iPg ";
    }
@@ -573,8 +573,8 @@ function display_page_range($iCurrentPage=1, $iPageRange=1, $iTotalPages=1, $sLi
    if($iCurrentPage < $iTotalPages)
    {
        $iNextPage = $iCurrentPage + 1;
-        echo "<a href='".$sLinkurl."&iPage=$iNextPage'>&gt</a> ";
-        echo "<a href='".$sLinkurl."&iPage=$iTotalPages'>&gt|</a> ";
+        echo "<a href='".$sLinkurl."&amp;iPage=$iNextPage'>&gt</a> ";
+        echo "<a href='".$sLinkurl."&amp;iPage=$iTotalPages'>&gt|</a> ";
    } else
    {
        echo "&gt &gt|";
@@ -847,7 +847,7 @@ function login_url()
       and we don't want two.  Besides, there is little point in redirecting to the login page
       after login. */
    if(!strpos($sCurrentUrl, "sReturnTo") && !strpos($sCurrentUrl, "account.php"))
-        $sLoginUrl .= "&sReturnTo=".$sCurrentUrl;
+        $sLoginUrl .= "&amp;sReturnTo=".$sCurrentUrl;

    return $sLoginUrl;
 }
--- a/include/vendor.php
+++ b/include/vendor.php
@@ -357,21 +357,21 @@ class Vendor {
        echo 'Vendor Name: '.$this->sName,"\n";
        if($this->canEdit())
        {
-            echo "[<a href=\"".$_SERVER['PHP_SELF']."?sClass=vendor&sAction=edit&".
-                 "iId=$this->iVendorId&sTitle=Edit%20Vendor\">edit</a>]";
+            echo "[<a href=\"".$_SERVER['PHP_SELF']."?sClass=vendor&amp;sAction=edit&amp;".
+                 "iId=$this->iVendorId&amp;sTitle=Edit%20Vendor\">edit</a>]";
        }

-        echo '<br />',"\n";
+        echo '<br>',"\n";
        if ($this->sWebpage)
        {
            echo 'Vendor URL:  <a href="'.$this->sWebpage.'">'.
-                 $this->sWebpage.'</a> <br />',"\n";
+                 $this->sWebpage.'</a> <br>',"\n";
        }


        if($this->aApplicationsIds)
        {
-            echo '<br />Applications by '.$this->sName.'<br /><ol>',"\n";
+            echo '<br>Applications by '.$this->sName.'<br><ol>',"\n";
            foreach($this->aApplicationsIds as $iAppId)
            {
                $oApp  = new Application($iAppId);
--- a/include/version.php
+++ b/include/version.php
@@ -457,7 +457,7 @@ class version {
                $sMsg .= "Clicking on the link in this email will allow you to modify and resubmit the version. ";
                $sMsg .= "A link to your queue of applications and versions will also show up on the left hand side of the Appdb site once you have logged in. ";
                $sMsg .= APPDB_ROOT."objectManager.php?sClass=version_queue".
-                        "&bIsQueue=true&bIsRejected=true&iId=".$this->iVersionId."&".
+                        "&amp;bIsQueue=true&amp;bIsRejected=true&amp;iId=".$this->iVersionId."&amp;".
                        "sTitle=Edit+Version\n";
            break;
            }
@@ -524,7 +524,7 @@ class version {
            case "reject":
                $sSubject = "Version '".$this->sName."' of '".$oApp->sName."' has been rejected by ".$_SESSION['current']->sRealname;
                $sMsg .= APPDB_ROOT."objectManager.php?sClass=version_queue".
-                        "&bIsQueue=true&bIsRejected=true&iId=".$this->iVersionId."&".
+                        "&amp;bIsQueue=true&amp;bIsRejected=true&amp;iId=".$this->iVersionId."&amp;".
                        "sTitle=Edit+Version\n";

                // if sReplyText is set we should report the reason the version was rejected 
@@ -574,7 +574,7 @@ class version {
        $sMsg .= "to be running a version compatible with the server. ";
        $sMsg .= "If this is such an application, and this version is no longer usable, ";
        $sMsg .= "you can mark it as obsolete and move its current votes to a usable ";
-        $sMsg .= "version instead.<br /><br />";
+        $sMsg .= "version instead.<br><br>";

        $sMsg .= $sContent;

@@ -592,7 +592,7 @@ class version {
        HtmlAreaLoaderScript(array("version_editor"));
        echo html_frame_start("Version Form", "90%", "", 0);

-        echo '<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'" />';
+        echo '<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'">';

        $oTable = new Table();
        $oTable->SetClass("color0");
@@ -627,7 +627,7 @@ class version {
            $oTable->AddRow($oTableRow);
        } else
        {
-            echo '<input type="hidden" name="iAppId" value="'.$this->iAppId.'" />';
+            echo '<input type="hidden" name="iAppId" value="'.$this->iAppId.'">';
        }

        // version name
@@ -681,12 +681,12 @@ class version {

            if($oVersionInDB->iObsoleteBy)
            {
-                $sObsoleteTxt = "<input type=\"checkbox\" name=\"bObsolete\" value=\"true\" checked=\"checked\" />";
+                $sObsoleteTxt = "<input type=\"checkbox\" name=\"bObsolete\" value=\"true\" checked=\"checked\">";
                $sObsoleteTxt .= " This version is obsolete";
                echo $this->makeObsoleteFrame($sObsoleteTxt);

                echo "<input type=\"hidden\" name=\"iObsoleteBy\" value=\"".
-                     $oVersionInDB->iObsoleteBy."\" type=\"hidden\" />\n";
+                     $oVersionInDB->iObsoleteBy."\" type=\"hidden\" >\n";
            } else if(sizeof($oApp->getVersions(FALSE)) > 1)
            {
                if($this->iObsoleteBy)
@@ -694,7 +694,7 @@ class version {
                else
                    $sObsolete = "";

-                $sObsoleteTxt = "<input type=\"checkbox\" name=\"bObsolete\" value=\"true\"$sObsolete />";
+                $sObsoleteTxt = "<input type=\"checkbox\" name=\"bObsolete\" value=\"true\"$sObsolete >";
                $sObsoleteTxt .= "Mark as obsolete and move votes to \n";
                $sObsoleteTxt .= $oApp->makeVersionDropDownList("iObsoleteBy", $this->iObsoleteBy, $this->iVersionId, FALSE);

@@ -702,8 +702,8 @@ class version {
            }
        } else
        {
-            echo '<input type="hidden" name="sMaintainerRating" value="'.$this->sTestedRating.'" />';
-            echo '<input type="hidden" name="sMaintainerRelease" value="'.$this->sTestedRelease.'" />';
+            echo '<input type="hidden" name="sMaintainerRating" value="'.$this->sTestedRating.'">';
+            echo '<input type="hidden" name="sMaintainerRelease" value="'.$this->sTestedRelease.'">';
        }
    }

@@ -843,7 +843,7 @@ class version {
            $oM->setReturnTo($this->objectMakeUrl());

            if($_SESSION['current']->isLoggedIn())
-                $shVoteLink = ' &nbsp; <a href="'.$oM->makeUrl("edit", $_SESSION['current']->iUserId).'&iVersionId='.$this->iVersionId.'">Vote</a>';
+                $shVoteLink = ' &nbsp; <a href="'.$oM->makeUrl("edit", $_SESSION['current']->iUserId).'&amp;iVersionId='.$this->iVersionId.'">Vote</a>';
            else
                $shVoteLink = '';

@@ -927,7 +927,7 @@ class version {
                    echo "</form>\n";
                } else /* nope */
                {
-                    echo '<form method="post" name="sMessage" action="objectManager.php?sClass=maintainer&sAction=add&iVersionId='.$this->iVersionId.'&sTitle='.urlencode("Be a Maintainer for ".version::fullName($this->iVersionId)).'&sReturnTo='.urlencode($this->objectMakeUrl()).'">'."\n";
+                    echo '<form method="post" name="sMessage" action="objectManager.php?sClass=maintainer&amp;sAction=add&amp;iVersionId='.$this->iVersionId.'&amp;sTitle='.urlencode("Be a Maintainer for ".version::fullName($this->iVersionId)).'&amp;sReturnTo='.urlencode($this->objectMakeUrl()).'">'."\n";
                    echo "\t".'<input type="submit" value="Be a Maintainer for This Version" class="button" title="Click here to know more about maintainers.">'."\n";
                    echo "\t"."<input type=hidden name=\"iAppId\" value=\"".$oApp->iAppId."\">\n";
                    echo "\t"."<input type=hidden name=\"iVersionId\" value=\"".$this->iVersionId."\">\n";
@@ -939,14 +939,14 @@ class version {
                        echo '<form method="post" name="sMessage" action="'.
                                 APPDB_ROOT."objectManager.php\">\n";
                        echo "\t<input type=\"hidden\" name=\"iAppId\" value=\"".
-                                $this->iAppId."\" />\n";
+                                $this->iAppId."\" >\n";
                        echo "\t<input type=\"hidden\" name=\"iVersionId\" value=\"".
-                                $this->iVersionId."\" />\n";
-                        echo "\t<input type=\"hidden\" name=\"sSubmit\" value=\"Submit\" />\n";
-                        echo "\t<input type=\"hidden\" name=\"sClass\" value=\"monitor\" />\n";
+                                $this->iVersionId."\" >\n";
+                        echo "\t<input type=\"hidden\" name=\"sSubmit\" value=\"Submit\" >\n";
+                        echo "\t<input type=\"hidden\" name=\"sClass\" value=\"monitor\" >\n";
                        echo "\t<input type=\"hidden\" name=\"sReturnTo\" value=\"".
-                                $this->objectMakeUrl()."\" />\n";
-                        echo "\t".'<input type=submit value="Monitor Changes" class="button" />'."\n";
+                                $this->objectMakeUrl()."\" >\n";
+                        echo "\t".'<input type=submit value="Monitor Changes" class="button">'."\n";
                        echo "</form>\n";
                    }
                }
@@ -964,25 +964,25 @@ class version {

        if ($_SESSION['current']->hasPriv("admin") || $_SESSION['current']->isMaintainer($this->iVersionId) || $_SESSION['current']->isSuperMaintainer($this->iAppId))
        {
-            $shAdd = '<form method="post" name="sMessage" action="objectManager.php?sClass=note&sAction=add&iVersionId='.$this->iVersionId.'&sReturnTo='.urlencode($this->objectMakeUrl());
+            $shAdd = '<form method="post" name="sMessage" action="objectManager.php?sClass=note&amp;sAction=add&amp;iVersionId='.$this->iVersionId.'&amp;sReturnTo='.urlencode($this->objectMakeUrl());
            echo '<tr><td colspan="2" align="center">'."\n";
            echo '<form method="post" name="sMessage" action="admin/editAppVersion.php">'."\n";
-            echo "\t".'<input type="hidden" name="iAppId" value="'.$oApp->iAppId.'" />'."\n";
-            echo "\t".'<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'" />'."\n";
-            echo "\t".'<input type=submit value="Edit Version" class="button" />'."\n";
+            echo "\t".'<input type="hidden" name="iAppId" value="'.$oApp->iAppId.'">'."\n";
+            echo "\t".'<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'">'."\n";
+            echo "\t".'<input type=submit value="Edit Version" class="button">'."\n";
            echo '</form>'."\n";
-            $url = BASE."objectManager.php?sClass=version&sAction=delete&bQueued=false&sTitle=Delete%20".version::fullName($this->iVersionId)."&iId=".$this->iVersionId;
+            $url = BASE."objectManager.php?sClass=version&amp;sAction=delete&amp;bQueued=false&amp;sTitle=Delete%20".version::fullName($this->iVersionId)."&amp;iId=".$this->iVersionId;
            echo "<form method=\"post\" name=\"sDelete\" action=\"javascript:self.location = '".$url."'\">\n";
-            echo "\t".'<input type=submit value="Delete Version" class="button" />'."\n";
+            echo "\t".'<input type=submit value="Delete Version" class="button">'."\n";
            echo '</form>'."\n";
            echo $shAdd.'" />';
-            echo "\t".'<input type="submit" value="Add Note" class="button" />'."\n";
+            echo "\t".'<input type="submit" value="Add Note" class="button">'."\n";
            echo '</form>'."\n";
-            echo $shAdd.'&sNoteTitle=HOWTO" />';
-            echo "\t".'<input type=submit value="Add How To" class="button" />'."\n";
+            echo $shAdd.'&amp;sNoteTitle=HOWTO" />';
+            echo "\t".'<input type=submit value="Add How To" class="button">'."\n";
            echo '</form>'."\n";
-            echo $shAdd.'&sNoteTitle=WARNING" />';
-            echo "\t".'<input type=submit value="Add Warning" class="button" />'."\n";
+            echo $shAdd.'&amp;sNoteTitle=WARNING" />';
+            echo "\t".'<input type=submit value="Add Warning" class="button">'."\n";
            echo '</form>';
            echo "</td></tr>";
        }
@@ -995,12 +995,12 @@ class version {
            echo '<form method="post" name="sMessage" action="'.
                    APPDB_ROOT."objectManager.php\">\n";
            echo "\t<input type=\"hidden\" name=\"iId\" value=\"".
-                    $oMonitor->iMonitorId."\" />\n";
-            echo "\t<input type=\"hidden\" name=\"sSubmit\" value=\"Delete\" />\n";
-            echo "\t<input type=\"hidden\" name=\"sClass\" value=\"monitor\" />\n";
+                    $oMonitor->iMonitorId."\">\n";
+            echo "\t<input type=\"hidden\" name=\"sSubmit\" value=\"Delete\">\n";
+            echo "\t<input type=\"hidden\" name=\"sClass\" value=\"monitor\">\n";
            echo "\t<input type=\"hidden\" name=\"sReturnTo\" value=\"".
-                    $this->objectMakeUrl()."\" />\n";
-            echo '<input type=submit value="Stop Monitoring Version" class="button" />'."\n";
+                    $this->objectMakeUrl()."\">\n";
+            echo '<input type=submit value="Stop Monitoring Version" class="button" >'."\n";
            echo "</form>\n";
            echo "</td></tr>\n";
        } 
@@ -1085,7 +1085,7 @@ class version {
                  and encourage the user to take action */
        {
            echo html_note('No Test Results',
-                           'This version has no test results, please consider submitting some.<br />'.
+                           'This version has no test results, please consider submitting some.<br>'.
                           'They may be part of the '.
                           'version or application description. If they are, please '.
                           'consider becoming a maintainer and remove them, submitting '.
@@ -1101,7 +1101,7 @@ class version {
        // show the test results table
        if($oTest->iTestingId)
        {
-            $oTest->ShowVersionsTestingTable($this->objectMakeUrl()."&iTestingId=", 5);
+            $oTest->ShowVersionsTestingTable($this->objectMakeUrl()."&amp;iTestingId=", 5);
        } else if($oTest) /* We are previewing the version */
        {
            $oTable = $oTest->CreateTestTable();
@@ -1112,10 +1112,10 @@ class version {
        if($_SESSION['current']->isLoggedIn())
        {
            echo '<form method=post name=sMessage action=objectManager.php?'.
-                    'sClass=testData_queue&sAction=add&iVersionId='.$this->iVersionId.
-                    '&sTitle=Add+Test+Data&sReturnTo='.
+                    'sClass=testData_queue&amp;sAction=add&amp;iVersionId='.$this->iVersionId.
+                    '&amp;sTitle=Add+Test+Data&amp;sReturnTo='.
                    urlencode($this->objectMakeUrl()).'>'."\n";
-            echo "\t".'<input type=submit value="Add Test Data" class="button" />'."\n";
+            echo "\t".'<input type=submit value="Add Test Data" class="button" >'."\n";
            echo '</form>'."\n";
        } else
        {
@@ -1411,7 +1411,7 @@ class version {

    public function objectMakeUrl()
    {
-        return APPDB_ROOT."objectManager.php?sClass=version&iId=$this->iVersionId";
+      return APPDB_ROOT."objectManager.php?sClass=version&amp;iId=$this->iVersionId";
    }

    public function objectMakeLink()
--- a/include/version_queue.php
+++ b/include/version_queue.php
@@ -164,18 +164,18 @@ class version_queue
            $oTableRow = new TableRow();
            $oTableRow->AddTextCell('&nbsp;');
            $oTableRow->AddTextCell("<input type=\"radio\" $sRequestMaintainerChecked".
-                                     "name=\"iMaintainerRequest\" value=\"".MAINTAINER_REQUEST."\" /> ".
+                                     "name=\"iMaintainerRequest\" value=\"".MAINTAINER_REQUEST."\"> ".
                                     "Request being a maintainer for this version, allowing you to edit it later");
            $oTable->AddRow($oTableRow);
            $oTableRow = new TableRow();
            $oTableRow->AddTextCell('&nbsp;');
            $oTableRow->AddTextCell("<input type=\"radio\" $sRequestMonitorChecked".
-                                     "name=\"iMaintainerRequest\" value=\"".MONITOR_REQUEST."\" /> ".
+                                     "name=\"iMaintainerRequest\" value=\"".MONITOR_REQUEST."\"> ".
                                     "Monitor changes to this version, also after it has been accepted");
            $oTable->AddRow($oTableRow);
            $oTableRow = new TableRow();
            $oTableRow->AddTextCell('&nbsp;');
-            $oTableRow->AddTextCell('<input type="radio" name="iMaintainerRequest" value="0" /> '.
+            $oTableRow->AddTextCell('<input type="radio" name="iMaintainerRequest" value="0"> '.
                                    'None of the above');
            $oTable->AddRow($oTableRow);

@@ -306,10 +306,10 @@ class version_queue
                        array(Comment::get_comment_count_for_versionid(
                            $oVersion->iVersionId), 'align="center"'),
                        html_ahref("Move here",
-                          "objectManager.php?sClass=version_queue&bIsQueue=true&".
-                          "sAction=moveChildren&iId=".
-                          $this->oVersion->iVersionId."&iNewId=".
-                          $oVersion->iVersionId."&sTitle=Version+Queue"),
+                          "objectManager.php?sClass=version_queue&amp;bIsQueue=true&amp;".
+                          "sAction=moveChildren&amp;iId=".
+                          $this->oVersion->iVersionId."&amp;iNewId=".
+                          $oVersion->iVersionId."&amp;sTitle=Version+Queue"),
                                  ),
                            ($i % 2) ? "color0" : "color1");

--- a/include/vote.php
+++ b/include/vote.php
@@ -106,7 +106,7 @@ class voteManager
        {
            $sVersionText = $this->aVotes[$i]->iVersionId ? version::fullNameLink($this->aVotes[$i]->iVersionId) : "No app selected";
            $oTableRow = new tableRow();
-            $oTableRow->addTextCell('<input type="checkbox" name="iSlot'.$i.'" value="'.$aClean['iVersionId'].'" />');
+            $oTableRow->addTextCell('<input type="checkbox" name="iSlot'.$i.'" value="'.$aClean['iVersionId'].'">');
            $oTableRow->addTextCell($sVersionText);
            $oTable->addRow($oTableRow);
        }
--- a/index.php
+++ b/index.php
@@ -84,7 +84,7 @@ if(!$_SESSION['current']->isLoggedIn())
    }
 ?>

-<br /><br />
+<br><br>

 <div class="topx_style platinum">
  <div class="rating_header">
@@ -104,7 +104,7 @@ if(!$_SESSION['current']->isLoggedIn())
    </table>
  </div>
 </div>
-<br />
+<br>

 <div class="topx_style gold">
  <div class="rating_header">
@@ -124,7 +124,7 @@ if(!$_SESSION['current']->isLoggedIn())
    </table>
  </div>
 </div>
-<br />
+<br>

 <div class="topx_style silver">
  <div class="rating_header">
@@ -145,12 +145,12 @@ if(!$_SESSION['current']->isLoggedIn())
  </div>
 </div>

-<br /><br />
+<br><br>

 <h2>Other Wine Application Compatibility Sites</h2>
 <p>
 <a href="http://frankscorner.org"><b>Frank's Corner</b></a>:  Frank has a fantastic Wine
-application site, with tips and how-to's on getting listed apps to run.<br />
+application site, with tips and how-to's on getting listed apps to run.<br>
 <a href="http://wine-review.blogspot.com/"><b>Wine-Review</b></a>: Is a Wine application and game 
 Blog, with tips and how-to's on getting listed applications and games to run. 
 </p>
--- a/preferences.php
+++ b/preferences.php
@@ -84,7 +84,7 @@ function show_user_fields($oUser)
      $oTableRow->AddTextCell("&nbsp; Administrator");
      $oTableRow->AddTextCell("<input type=\"checkbox\"".
                              " name=\"bIsAdmin\" value=\"true\" ".
-                              "$sAdminChecked />");
+                              "$sAdminChecked>");

      $aTableRows[] = $oTableRow;
    }
@@ -166,8 +166,8 @@ if(isset($aClean['sSubmit']) && $aClean['sSubmit'] == "Update")
            else 
                $oUser->delPriv("admin");
            util_redirect_and_exit(BASE."admin/adminUsers.php?iUserId=".$oUser->iUserId.
-                    "&sSearch=".$aClean['sSearch']."&iLimit=".$aClean['iLimit'].
-                    "&sOrderBy=".$aClean['sOrderBy']."&sSubmit=true");
+                    "&amp;sSearch=".$aClean['sSearch']."&amp;iLimit=".$aClean['iLimit'].
+                    "&amp;sOrderBy=".$aClean['sOrderBy']."&amp;sSubmit=true");
        }
    }
    else
@@ -222,7 +222,7 @@ if( !isset($aClean['iUserId']) || $oUser->iUserId != $aClean['iUserId'])
 echo $oTable->GetString();

 echo html_frame_end();
-echo "<br /> <div align=center> <input type=\"submit\" name='sSubmit' value=\"Update\" /> </div> <br />\n";
+echo "<br> <div align=center> <input type=\"submit\" name='sSubmit' value=\"Update\"> </div> <br>\n";
 echo "</form>\n";

 echo "</div>\n";
--- a/queueditems.php
+++ b/queueditems.php
@@ -26,7 +26,7 @@ if($sResult = testData::listSubmittedBy($oUser->iUserId))
    echo html_frame_end("&nbsp;");
 }
 else
-    echo "You have no queued test results.<br /><br />\n";
+    echo "You have no queued test results.<br><br>\n";

 /* Applications */
 if($sResult = Application::listSubmittedBy($oUser->iUserId))
@@ -35,7 +35,7 @@ if($sResult = Application::listSubmittedBy($oUser->iUserId))
    echo $sResult;
    echo html_frame_end("&nbsp;");
 } else
-    echo "You have no queued applications.<br /><br />\n";
+    echo "You have no queued applications.<br><br>\n";

 /* Versions */
 if($sResult = Version::listSubmittedBy($oUser->iUserId))
@@ -44,7 +44,7 @@ if($sResult = Version::listSubmittedBy($oUser->iUserId))
    echo $sResult;
    echo html_frame_end("&nbsp;");
 } else
-    echo "You have no queued versions.<br /><br />\n";
+    echo "You have no queued versions.<br><br>\n";

 /* Bug links */
 if($sResult = bug::listSubmittedBy($oUser->iUserId))
@@ -53,7 +53,7 @@ if($sResult = bug::listSubmittedBy($oUser->iUserId))
    echo $sResult;
    echo html_frame_end("&nbsp;");
 } else
-    echo "You have no queued bugs.<br /><br />\n";
+    echo "You have no queued bugs.<br><br>\n";

 /* Application data */
 if($sResult = appData::listSubmittedBy($oUser->iUserId))
@@ -62,7 +62,7 @@ if($sResult = appData::listSubmittedBy($oUser->iUserId))
    echo $sResult;
    echo html_frame_end("&nbsp;");
 } else
-    echo "You have no queued application data.<br /><br />\n";
+    echo "You have no queued application data.<br><br>\n";

 apidb_footer();

--- a/screenshots.php
+++ b/screenshots.php
@@ -108,8 +108,8 @@ if($hResult && query_num_rows($hResult))
          )
        {
            $oM = new objectManager("screenshot");
-            $oM->setReturnTo("screenshots.php?iAppId=".$oScreenshot->iAppId."&iVersionId=".$oScreenshot->iVersionId);
-            echo '<br />[<a href="'.$oM->makeUrl("delete", $oScreenshot->iScreenshotId, "Delete Screenshot").'">Delete</a>]';
+            $oM->setReturnTo("screenshots.php?iAppId=".$oScreenshot->iAppId."&amp;iVersionId=".$oScreenshot->iVersionId);
+            echo '<br>[<a href="'.$oM->makeUrl("delete", $oScreenshot->iScreenshotId, "Delete Screenshot").'">Delete</a>]';
        }

        echo "</div></td>\n";
@@ -119,14 +119,14 @@ if($hResult && query_num_rows($hResult))

        $c++;
    }
-    echo "</tr></table></div><br />\n";
+    echo "</tr></table></div><br>\n";

    echo html_frame_end(); // close the current version we are displaying
    echo html_frame_end(); // close the "Screenshot Gallary..." html frame
 } else
 {
 echo "<p align=\"center\">There are currently no screenshots for the selected version of this application.";
- echo "<br />Please consider submitting a screenshot for the selected version yourself.</p>";
+ echo "<br>Please consider submitting a screenshot for the selected version yourself.</p>";
 }

 // let's show the screenshot uploading box, but only
@@ -134,8 +134,8 @@ if($hResult && query_num_rows($hResult))
 if($aClean['iVersionId'] && $_SESSION['current']->isLoggedIn())
 {
    echo "<p align=\"center\">When submitting screenshots please ensure that the focus is on the application running inside Wine.";
-    echo "<br />This means if the application is running in a window then please crop the image so that only the application is shown and not your desktop.";
-    echo "<br />Do not upload screenshots of error messages, installers, game menus etc.</p>";
+    echo "<br>This means if the application is running in a window then please crop the image so that only the application is shown and not your desktop.";
+    echo "<br>Do not upload screenshots of error messages, installers, game menus etc.</p>";

    echo '<form enctype="multipart/form-data" action="screenshots.php" name="sImageForm" method="post">',"\n";
    echo html_frame_start("Upload Screenshot","400","",0);
@@ -147,9 +147,9 @@ if($aClean['iVersionId'] && $_SESSION['current']->isLoggedIn())
    echo '<tr><td colspan=2 align=center class=color3><input type="submit" value="Send File"></td></tr>',"\n";
    echo '</table>',"\n";
    echo html_frame_end();
-    echo '<input type="hidden" name="MAX_FILE_SIZE" value="4000000" />',"\n";
-    echo '<input type="hidden" name="sCmd" value="screenshot_upload" />',"\n";
-    echo '<input type="hidden" name="iVersionId" value="'.$aClean['iVersionId'].'"></form />',"\n";
+    echo '<input type="hidden" name="MAX_FILE_SIZE" value="4000000">',"\n";
+    echo '<input type="hidden" name="sCmd" value="screenshot_upload">',"\n";
+    echo '<input type="hidden" name="iVersionId" value="'.$aClean['iVersionId'].'"></form>',"\n";
 } else if(!$_SESSION['current']->isLoggedIn()) // else let the person know that if they log in they can submit screenshots
 {
  echo '<div align="center"><a href="'.login_url().'">';
@@ -157,7 +157,7 @@ if($aClean['iVersionId'] && $_SESSION['current']->isLoggedIn())
 } else
 {
    echo html_frame_start("Upload Screenshot", "30%");
-    echo 'If you would like to submit screenshots, please select an application version below.<br />';
+    echo 'If you would like to submit screenshots, please select an application version below.<br>';
    echo '<ul>';
    foreach($oApp->getVersions() as $oVersion)
        echo '<li><a href="'.BASE.'screenshots.php?iVersionId='.$oVersion->objectGetId().'">'.$oVersion->sName.'</a></li>';
--- a/viewbugs.php
+++ b/viewbugs.php
@@ -51,7 +51,7 @@ if(!is_numeric($aClean['iBugId']))
            {
                while($oDownloadUrl = query_fetch_object($hDownloadUrls))
                    $sDownloadUrls .= "<a href=\"$oDownloadUrl->url\">".
-                            "$oDownloadUrl->description</a><br />";
+                            "$oDownloadUrl->description</a><br>";
            }

            // set row color
@@ -71,11 +71,11 @@ if(!is_numeric($aClean['iBugId']))

    // allow users to search for other apps
    echo '<tr class=color2>',"\n";
-    echo '    <td align=center colspan=5>&nbsp</td>',"\n";
+    echo '    <td align=center colspan=5>&nbsp;</td>',"\n";
    echo '</tr>',"\n";

    echo '<tr class=color4>',"\n";
-    echo '    <td colspan=4 >&nbsp Bug #</td>',"\n";
+    echo '    <td colspan=4 >&nbsp; Bug #</td>',"\n";
    echo '</tr>',"\n";

    echo '<tr class=color3>',"\n";
--- a/votestats.php
+++ b/votestats.php
@@ -117,10 +117,10 @@ if($subs)
    }
 }
 echo '</select>';
-echo '<input type="submit" value="Refresh" />';
+echo '<input type="submit" value="Refresh">';
 echo '</form>';
-echo '<br />';
-echo '<br />';
+echo '<br>';
+echo '<br>';

 /***************************************************/
 /* build a list of the apps in the chosen category */