whoops removed test code. sorry

5 files changed, 6 insertions, 12 deletions

diff --git a/amp-mpd.php b/amp-mpd.php
index c13b6b3a..f49151cc 100644
--- a/amp-mpd.php
+++ b/amp-mpd.php
@@ -23,6 +23,7 @@
  */ 
 
 require_once("modules/init.php");
+
 /* We need to create a MPD object here */
 $myMpd = init_mpd();
 
@@ -205,6 +206,7 @@ if (is_object($myMpd)) {
 			mpd_redirect();
 			break;
 	} // end switch
+
 	// We're done let's disconnect
 	$myMpd->Disconnect();
 } // end else
diff --git a/config/ampache.cfg.php.dist b/config/ampache.cfg.php.dist
index 2bae21c2..bf727079 100644
--- a/config/ampache.cfg.php.dist
+++ b/config/ampache.cfg.php.dist
@@ -463,7 +463,7 @@ rss_song_description = <![CDATA[$song->f_title @ $album played by  $user->fullna
 # it will control all "LOCAL" style play methods including localplay
 # and the slimserver
 # DEFAULT: false
-localplay_menu = true
+#localplay_menu = true
 
 
 #####################################################
diff --git a/index.php b/index.php
index af213dd9..abf7d4fb 100644
--- a/index.php
+++ b/index.php
@@ -74,19 +74,14 @@ if (conf('refresh_limit') > 0) { show_template('javascript_refresh'); }
 		</td>	
 	</tr>
 	<tr><td colspan="2">&nbsp;</td></tr>
-
 	<tr> 
                 <?php 
-// if ($user->prefs['play_type'] == 'mpd' && !conf('localplay_menu')) { show_mpd_pl();}
-//			else { echo "<td>&nbsp;<//td>"; }
-
 			if ($user->prefs['play_type'] == 'mpd') { 
 		    		show_mpd_pl(); 
 				$myMpd = init_mpd(); 
 			} 
 		?>
 	</tr>
-
 	<tr><td colspan="2">&nbsp;</td></tr>
 	<tr>
 	        <td valign="top" align="right">
diff --git a/mpd.php b/mpd.php
index 3c767c42..83a7eb0f 100644
--- a/mpd.php
+++ b/mpd.php
@@ -30,12 +30,9 @@ show_template('header');
 if (conf('refresh_limit') > 0) { show_template('javascript_refresh'); }
 show_menu_items('Local Play');
 show_clear();
-DebugBreak();
+
 if ($user->prefs['play_type'] == 'mpd') {
 	show_mpd_control();
-	echo "<div align='center'> <table border='0'> <tr>";
-	show_mpd_pl();
-	echo "</tr> </table> </div>";
 }
 
 show_clear();
diff --git a/register.php b/register.php
index cc2fc075..010fb380 100644
--- a/register.php
+++ b/register.php
@@ -56,8 +56,8 @@ switch ($action) {
 		break;
 	}
 // INSERTED BY TERRY FOR MAIL ADDRESS CHECK
-    // require("../templates/validateEmailFormat.php");
-    // require("../templates/validateEmail.php");
+	require("../templates/validateEmailFormat.php");
+        require("../templates/validateEmail.php");
     // get the address from wherever you get it ... form input, etc.
     // $email = "info@xs4all.nl";
     // $email = $_GET['email'];