diff options
| -rw-r--r-- | amp-mpd.php | 2 | ||||
| -rw-r--r-- | config/ampache.cfg.php.dist | 2 | ||||
| -rw-r--r-- | index.php | 5 | ||||
| -rw-r--r-- | mpd.php | 5 | ||||
| -rw-r--r-- | register.php | 4 | ||||
| -rw-r--r-- | templates/show_login_form.inc | 4 | ||||
| -rw-r--r-- | templates/show_mpdpl.inc | 11 | ||||
| -rw-r--r-- | templates/show_now_playing.inc | 2 |
8 files changed, 22 insertions, 13 deletions
diff --git a/amp-mpd.php b/amp-mpd.php index f49151cc..c13b6b3a 100644 --- a/amp-mpd.php +++ b/amp-mpd.php @@ -23,7 +23,6 @@ */ require_once("modules/init.php"); - /* We need to create a MPD object here */ $myMpd = init_mpd(); @@ -206,7 +205,6 @@ 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 bf727079..2bae21c2 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 ##################################################### @@ -74,14 +74,19 @@ if (conf('refresh_limit') > 0) { show_template('javascript_refresh'); } </td> </tr> <tr><td colspan="2"> </td></tr> + <tr> <?php +// if ($user->prefs['play_type'] == 'mpd' && !conf('localplay_menu')) { show_mpd_pl();} +// else { echo "<td> <//td>"; } + if ($user->prefs['play_type'] == 'mpd') { show_mpd_pl(); $myMpd = init_mpd(); } ?> </tr> + <tr><td colspan="2"> </td></tr> <tr> <td valign="top" align="right"> @@ -30,9 +30,12 @@ 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 010fb380..cc2fc075 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']; diff --git a/templates/show_login_form.inc b/templates/show_login_form.inc index f75b0d4d..769f9f19 100644 --- a/templates/show_login_form.inc +++ b/templates/show_login_form.inc @@ -36,8 +36,8 @@ if (preg_match($subject,$_SERVER['HTTP_HOST'])) { ?> <br /><br /> <p align="center"> - <a href="http://www.ampache.org"><img src="<?php echo conf('web_path'); ?> - <?php echo conf('theme_path'); ?>/images/ampache.gif" title="<?php echo conf('site_title'); ?>" border="0" alt="Ampache" /> + <a href="http://www.ampache.org"><img src="<?php echo conf('web_path'); + ?><?php echo conf('theme_path'); ?>/images/ampache.gif" title="<?php echo conf('site_title'); ?>" border="0" alt="Ampache" /> </a> </p> <form name="login" method="post" enctype="multipart/form-data" action="<?php echo conf('web_path'); ; ?>/login.php" style="Display:inline"> diff --git a/templates/show_mpdpl.inc b/templates/show_mpdpl.inc index ff8cede1..5648b444 100644 --- a/templates/show_mpdpl.inc +++ b/templates/show_mpdpl.inc @@ -56,7 +56,7 @@ $minpad = "style='padding: 0px 2px 0px 2px'"; <form action="<?php echo conf('web_path')."/amp-mpd.php"; ?>" method="post" enctype="multipart/form-data"> -<table class="border" border="0" cellpadding="0" cellspacing="1" width="100%" class="tabledata"> +<table border="0" cellpadding="0" cellspacing="1" width="100%" class="tabledata"> <tr><td align="center" class="table-header"><b>MPD Server Playlist</b><br /> <i>[<a title="<?php echo _("Refresh the Playlist Window"); ?>" href="<?php echo conf('web_path'); ?>">refresh</a>] <?php if ( $myMpd->playlist_count > 0 ) { @@ -87,7 +87,10 @@ $minpad = "style='padding: 0px 2px 0px 2px'"; { echo "<tr class=\"".flip_class()."\"><td colspan=\"8\" align=\"center\" style=\"padding: 3px 0px 3px 0px\">... Condensed Playlist ...</td></tr>"; } - + else + { + echo "<tr><td> </td></tr>"; + } foreach ($pl as $id=>$entry) { if ( ($condPL) and (($id < $myMpd->current_track_id-1) or ($id > $myMpd->current_track_id + 10)) ) @@ -136,7 +139,7 @@ $count=0; // Didn't move this because I wasn't sure what it was for... <td align="center" <?php echo $tdstyle ?>> <?php echo $r->name ?></td> <td <?php echo $tdstyle ?>> - <a href="<?php echo $web_path;?>/flag.php?song=<?php echo $r->id;?>&action=flag" title="Flag '<?php echo $entry['file'];?>' by <?php echo htmlspecialchars($entry['Artist']);?>"<?php echo $text_class;?>>f</a> + <a href="<?php echo $web_path;?>/flag.php?song=<?php echo $r->id;?>&action=flag" title="Flag '<?php echo htmlspecialchars($entry['file']);?>' by <?php echo htmlspecialchars($entry['Artist']);?>"<?php echo $text_class;?>>f</a> <a href="<?php echo $web_path;?>/amp-mpd.php?action=movenext&val=<?php echo $entry['Pos'];?>" title="Move '<?php echo htmlspecialchars($entry['Title']);?>' to play next "<?php echo $text_class;?>>n</a> <a href="<?php echo $web_path;?>/amp-mpd.php?action=rem&id=<?php echo $entry['Pos'];?>" title="Remove '<?php echo htmlspecialchars($entry['Title']);?>' from playlist "<?php echo $text_class;?>>x</a> </td> @@ -152,7 +155,7 @@ $count=0; // Didn't move this because I wasn't sure what it was for... $time = floor($totaltime/60) . ":" . sprintf("%02d", ($totaltime%60) ); $num = count($pl); ?> - + <tr><td> </td></tr> <tr class="table-header" valign="middle"> <td><input type="hidden" name="action" value="plact" /> <button name="submit" value="submit" type="submit" style = "font-family: <?php echo conf('font')?>; font-size: <?php echo conf('font_size')?>px" title="Take Action on the checked songs">Do</button></td> <td valign="middle"> diff --git a/templates/show_now_playing.inc b/templates/show_now_playing.inc index c4c39be2..62f04c72 100644 --- a/templates/show_now_playing.inc +++ b/templates/show_now_playing.inc @@ -41,7 +41,7 @@ if (!$np_user->fullname) { $np_user->fullname = "Unknown User"; } echo "<tr class=\"even\">\n"; if (conf('use_auth')) { - echo "\t<td valign=\"center\">$np_user->fullname</td>\n"; + echo "\t<td valign=\"middle\">$np_user->fullname</td>\n"; } echo "\t<td><a title=\"" . htmlspecialchars($song->title) . "\" href=\"$web_path/song.php?action=m3u&song=$song->id\">$text</a></td>\n"; echo "\t<td><a title=\"" . htmlspecialchars($song->f_artist) . "\" href=\"$web_path/artists.php?action=show&artist=$song->artist\">$song->f_artist</a> / "; |