mother of all commits...

4 files changed, 9 insertions, 8 deletions

diff --git a/lib/artist.php b/lib/artist.php
index 5ccd200a..38a93c75 100644
--- a/lib/artist.php
+++ b/lib/artist.php
@@ -50,7 +50,7 @@ function get_artists($sql, $action=0) {
 function format_artist($artist) {
 
         $web_path = conf('web_path');
-        $artist['name'] = "<a href=\"$web_path/artists.php?action=show&amp;artist=" . $artist['id'] . "\">" . $artist['prefix'] . " " . $artist['name'] . "</a>";
+        $artist['name'] = "<a href=\"$web_path/artists.php?action=show&amp;artist=" . $artist['id'] . "\">" . htmlspecialchars($artist['prefix']) . " " . htmlspecialchars($artist['name']) . "</a>";
 
 	return $artist;
 
diff --git a/lib/batch.php b/lib/batch.php
index a3a3aba3..508564c1 100644
--- a/lib/batch.php
+++ b/lib/batch.php
@@ -32,7 +32,7 @@ function get_song_files( $song_ids ) {
 		/* Don't archive disabled songs */
 		if ($song->status != 'disabled') { 
 	                $user->update_stats( $song_id );
-	                $total_size += sprintf("%.2f",($song->size/1048576));;
+	                $total_size += sprintf("%.2f",($song->size/1048576));
 	                array_push( $song_files, $song->file );
 		} // if song isn't disabled
         }
diff --git a/lib/duplicates.php b/lib/duplicates.php
index 94f3deda..202f1185 100644
--- a/lib/duplicates.php
+++ b/lib/duplicates.php
@@ -88,30 +88,31 @@ function show_duplicate_searchbox($search_type) {
 				$checked = "checked=\"checked\"";
 			else
 				$checked = "";
-			echo "<input type=\"radio\" name=\"search_type\" value=\"title\" ".$checked." >" . _("Title") . "<br />";
+			echo "<input type=\"radio\" name=\"search_type\" value=\"title\" ".$checked." />" . _("Title") . "<br />";
 
 			if ($search_type=="artist_title")
 						$checked = "checked=\"checked\"";
 			else
 				$checked = "";
-			echo "<input type=\"radio\" name=\"search_type\" value=\"artist_title\" ".$checked." >" . _("Artist and Title") . "<br />";
+			echo "<input type=\"radio\" name=\"search_type\" value=\"artist_title\" ".$checked." />" . _("Artist and Title") . "<br />";
 			if ($search_type=="artist_album_title"OR $search_type=="")
 						$checked = "checked=\"checked\"";
 			else
 				$checked = "";
-			echo "<input type=\"radio\" name=\"search_type\" value=\"artist_album_title\"".$checked." >" . _("Artist, Album and Title") . "<br />";
+			echo "<input type=\"radio\" name=\"search_type\" value=\"artist_album_title\"".$checked." />" . _("Artist, Album and Title") . "<br />";
 			?>
 		</td>
 	</tr>
 	<tr class="odd">
 		<td></td>
 		<td>
-			<input type="hidden" name="action" value="search">
+			<input type="hidden" name="action" value="search" />
 			<input type="submit" value="<?php echo _("Search"); ?>" />
 		</td>
 	</tr>
 </table>
-<br>
+</form>
+<br />
 <?
 } // show_duplicate_searchbox
 ?>
diff --git a/lib/ui.php b/lib/ui.php
index 4d1e7671..fbbdcf8b 100644
--- a/lib/ui.php
+++ b/lib/ui.php
@@ -334,7 +334,7 @@ function truncate_with_ellipse($text, $max=27) {
 */
 function show_footer() {
         $class = "table-header";
-        echo "<br /><br /><br /><div class=\"$class\" style=\"border: solid thin black;\">&nbsp</div>";
+        echo "<br /><br /><br /><div class=\"$class\" style=\"border: solid thin black;\">&nbsp;</div>";
 } // show_footer
 
 /*!