XHTML clean up and fixed a few typos

9 files changed, 31 insertions, 20 deletions

diff --git a/admin/catalog.php b/admin/catalog.php
index e820a6dd..63c59a96 100644
--- a/admin/catalog.php
+++ b/admin/catalog.php
@@ -215,14 +215,14 @@ switch ($_REQUEST['action']) {
         if (conf('demo_mode')) { break; }
         show_confirm_action(_("Do you really want to clear your catalog?"),
 			"/admin/catalog.php", "action=really_clear_catalog");
-	print("<hr>\n");
+	print("<hr />\n");
 	break;
 
     case 'clear_stats':
         if (conf('demo_mode')) { break; }
 	show_confirm_action(_("Do you really want to clear the statistics for this catalog?"),
 			"/admin/catalog.php", "action=really_clear_stats");
-	print("<hr>\n");
+	print("<hr />\n");
 	break;
 
     case 'show_disabled':
diff --git a/albums.php b/albums.php
index 3d1b85f2..185cc3af 100644
--- a/albums.php
+++ b/albums.php
@@ -108,7 +108,7 @@ elseif ($_REQUEST['action'] === 'update_from_tags') {
 	$catalog->update_single_item('album',$_REQUEST['album_id']);
 
 	echo "<br /><b>" . _("Update From Tags Complete") . "</b> &nbsp;&nbsp;";
-	echo "<a href=\"" . conf('web_path') . "/albums.php?action=show&album=" . $_REQUEST['album_id'] . "\">[" . _("Return") . "]</a>";
+	echo "<a href=\"" . conf('web_path') . "/albums.php?action=show&amp;album=" . $_REQUEST['album_id'] . "\">[" . _("Return") . "]</a>";
 
 } // update_from_tags
 
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index 1c6ffe15..090dc005 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -769,16 +769,16 @@ class Catalog {
 			$info = $this->update_song_from_tags($song);
 
                         if ($info['change']) {
-                                echo "<dl>\n\t<li>";
+                                echo "<dl>\n\t<dd>";
                                 echo "<b>$song->file " . _("Updated") . "</b>\n";
                                 echo $info['text'];
-                                echo "\t</li>\n</dl><hr align=\"left\" width=\"50%\" />";
+                                echo "\t</dd>\n</dl><hr align=\"left\" width=\"50%\" />";
                         	flush();
 	                } // if change
 			else {
-				echo"<dl>\n\t<li>";
+				echo"<dl>\n\t<dd>";
 				echo "<b>$song->file</b><br />" . _("No Update Needed") . "\n";
-				echo "\t</li>\n</dl><hr align=\"left\" width=\"50%\" />";
+				echo "\t</dd>\n</dl><hr align=\"left\" width=\"50%\" />";
 				flush();
 			}
 		} // foreach songs
diff --git a/lib/class/update.class.php b/lib/class/update.class.php
index be64f699..eb84c07b 100644
--- a/lib/class/update.class.php
+++ b/lib/class/update.class.php
@@ -258,10 +258,10 @@ class Update {
 		
 			if ($version['version'] > $current_version) {
 				$updated = true;
-				echo "<b>Version: " . $this->format_version($version['version']) . "</b><br />";
-				echo $version['description'] . "<br />\n"; 
+				echo "<li><b>Version: " . $this->format_version($version['version']) . "</b><br />";
+				echo $version['description'] . "<br /></li>\n"; 
 			} // if newer
-
+		
 		} // foreach versions
 
 		echo "</ul>\n";
diff --git a/lib/mpd.php b/lib/mpd.php
index 232fc892..895b40ac 100644
--- a/lib/mpd.php
+++ b/lib/mpd.php
@@ -67,7 +67,7 @@ function addToPlaylist( $myMpd, $song_ids=array()) {
 function show_mpd_control() { 
 
 	$_REQUEST['action'] = 'show_control';
-	require ('amp-mpd.php');
+	require (conf('prefix').'/amp-mpd.php');
 
 
 } // show_mpd_control
diff --git a/templates/show_mpdplay.inc b/templates/show_mpdplay.inc
index 099dd080..0bc93027 100644
--- a/templates/show_mpdplay.inc
+++ b/templates/show_mpdplay.inc
@@ -58,8 +58,12 @@ global $condPL;
 </td></tr>
 
      <tr><td class="content" align="center"> 
-         [<a href="<?php echo $web_path; ?>/amp-mpd.php?action=setvol&amp;val=0">mute</a>/<a href="<?php echo $web_path; ?>/amp-mpd.php?action=adjvol&amp;val=-25">-25</a>/<a href="<?php echo $web_path; ?>/amp-mpd.php?action=adjvol&amp;val=-10">-10</a>/<a href="<?php echo $web_path; ?>/amp-mpd.php?action=adjvol&amp;val=+10">+10</a>/<a href="<?php echo $web_path; ?>/amp-mpd.php?action=adjvol&amp;val=+25">+25</a>] 
-      </td></tr> 
+         [<a href="<?php echo $web_path; ?>/amp-mpd.php?action=setvol&amp;val=0">mute</a>
+	  <a href="<?php echo $web_path; ?>/amp-mpd.php?action=adjvol&amp;val=-25">-25</a>
+	  <a href="<?php echo $web_path; ?>/amp-mpd.php?action=adjvol&amp;val=-10">-10</a>
+	  <a href="<?php echo $web_path; ?>/amp-mpd.php?action=adjvol&amp;val=+10">+10</a>
+	  <a href="<?php echo $web_path; ?>/amp-mpd.php?action=adjvol&amp;val=+25">+25</a>] 
+     </td></tr> 
 <tr><td>
 </td></tr>
 <tr>
diff --git a/templates/show_user.inc.php b/templates/show_user.inc.php
index f0b1a834..4117c128 100644
--- a/templates/show_user.inc.php
+++ b/templates/show_user.inc.php
@@ -22,7 +22,7 @@
 ?>
 <br /><br />
 <div class="text-box">
-<form name="change_password" method="post" action="<?php echo conf('web_path'); ?>/user.php?action=update_user" enctype="multipart/form-data" >
+<form name="update_user" method="post" action="<?php echo conf('web_path'); ?>/user.php?action=update_user" enctype="multipart/form-data" >
 <p class="header2"><?php echo _("Changing User Information for") . " " . $this_user->fullname; ?></p>
 <table>
 
@@ -88,6 +88,6 @@
 <form name="clear_statistics" method="post" action="<?php echo conf('web_path'); ?>/user.php?action=clear_stats" enctype="multipart/form-data">
 <span class="header2"><?php echo _("Delete Your Personal Statistics"); ?></span><br />
 <input type="hidden" name="user_id" value="<?php echo $this_user->username; ?>" />
-<input type="submit" value="<?php echo _("Clear Stats"); ?>">
+<input type="submit" value="<?php echo _("Clear Stats"); ?>" />
 </form>
 </div>
diff --git a/update.php b/update.php
index 72b71e69..2736f99d 100644
--- a/update.php
+++ b/update.php
@@ -57,20 +57,27 @@ if ($_REQUEST['action'] == 'update') {
 	$version = $update->get_version();
 
 } 
+$htmllang = str_replace("_","-",conf('lang'));
+
 ?>
-<html>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $htmllang; ?>" lang="<?php echo $htmllang; ?>">
 <head>
+<link rel="shortcut icon" href="<?php echo conf('web_path'); ?>/favicon.ico" />
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo conf('site_charset'); ?>" />
+<?php  show_template('style'); ?>
 <title>Ampache - Update</title>
 </head>
 <body>
-<?php  show_template('style'); ?>
+
 <p class="header1">Ampache - Update</p>
 <p>
 This page handles all database updates to Ampache starting with 3.2. According to your database your current version is: <?php echo  $update->format_version($version); ; ?>. 
 the following updates need to be performed<br /><br />
-<?php  $update->display_update(); ?>
 </p>
-<p>
+<?php  $update->display_update(); ?>
+
 <form method="post" enctype="multipart/form-data" action="<?php echo  conf('web_path'); ; ?>/update.php?action=update">
 <?php  if ($update->need_update()) { ?><input type="submit" value="Update Now!" /> <?php  } ?>
 </form>
diff --git a/upload.php b/upload.php
index f6cbf3ce..7ce96850 100644
--- a/upload.php
+++ b/upload.php
@@ -319,5 +319,5 @@ if ( $handle = @opendir($user->prefs['upload_dir'] ) ){
 <br />

 <br />

 <br />

-<?php> show_page_footer ('Upload', '',$user->prefs['display_menu']); ?>

+<?php show_page_footer ('Upload', '',$user->prefs['display_menu']); ?>