diff options
| -rw-r--r-- | albums.php | 2 | ||||
| -rw-r--r-- | config/ampache.cfg.php.dist | 12 | ||||
| -rwxr-xr-x | docs/CHANGELOG | 1 | ||||
| -rw-r--r-- | modules/localplay/httpq.controller.php | 12 | ||||
| -rw-r--r-- | modules/localplay/mpd.controller.php | 2 | ||||
| -rw-r--r-- | templates/show_user_recommendations.inc.php | 2 |
6 files changed, 21 insertions, 10 deletions
@@ -133,7 +133,7 @@ switch ($action) { // Attempt to find the art. $images = $album->find_art($options,'6'); - if (isset($_REQUEST['cover'])) { + if (!empty($_REQUEST['cover'])) { $path_info = pathinfo($_REQUEST['cover']); $cover_url[0]['url'] = scrub_in($_REQUEST['cover']); $cover_url[0]['mime'] = 'image/' . $path_info['extension']; diff --git a/config/ampache.cfg.php.dist b/config/ampache.cfg.php.dist index b95fc5a6..12cf5c5b 100644 --- a/config/ampache.cfg.php.dist +++ b/config/ampache.cfg.php.dist @@ -92,7 +92,7 @@ require_session = "true" # Downsample Remote # If this is set to true and access control is on any users who are not -# comming from a defined localnet will be automatically downsampled +# coming from a defined localnet will be automatically downsampled # regardless of their preferences # DEFAULT: false #downsample_remote = "false" @@ -159,7 +159,7 @@ tag_order = ape use_auth = "yes" # 5 Star Ratings -# This allows rattings for almost any object in ampache +# This allows ratings for almost any object in ampache # POSSIBLE VALUES: false true # DEFAULT: true ratings = "true" @@ -267,7 +267,7 @@ debug_level = 5 #log_path = "/var/log/ampache" # Charset of generated HTML pages -# Default of UTF-8 should work for most poeple +# Default of UTF-8 should work for most people # DEFAULT: UTF-8 site_charset = UTF-8 @@ -316,7 +316,7 @@ refresh_limit = "60" #ldap_username = "" #ldap_password = "" -# NOT YET IMPLIMENTED!! +# NOT YET IMPLEMENTED!! # This option checks to see if the specified user is in # a specific ldap group, allowing you to give access based # on group membership @@ -367,7 +367,7 @@ refresh_limit = "60" #mail_domain = "domain.tld" # This setting will be used as mail from address. -# It will also be used to notify if a registration occured. +# It will also be used to notify if a registration occurred. # You need to change this when you activate public_registration. #mail_from = "info@domain.tld" @@ -464,7 +464,7 @@ downsample_cmd = mp3splt -qnf %FILE% %OFFSET% %EOF% -o - | lame --mp3input -q 3 # formats to the target file type for streaming. Any # file types defined here will automatically be transcoded # using the stream_cmd_??? regardless of personal preferences -# This can be usefull in re-encoding file types that don't stream +# This can be useful in re-encoding file types that don't stream # very well, or if the player doesn't support some file types. # REQUIRED variables # transcode_TYPE = true diff --git a/docs/CHANGELOG b/docs/CHANGELOG index c1af8279..3ad9c7ef 100755 --- a/docs/CHANGELOG +++ b/docs/CHANGELOG @@ -4,6 +4,7 @@ -------------------------------------------------------------------------- v.3.3.3 + - Fixed some minor issues in HttpQ and MPD localplay controllers - Fixed Album Art search on Catalog add so that it only searches albums that currently don't have art - Fixed a long outstanding issue with Windows Shared drives and diff --git a/modules/localplay/httpq.controller.php b/modules/localplay/httpq.controller.php index 9c391bc6..b6d26445 100644 --- a/modules/localplay/httpq.controller.php +++ b/modules/localplay/httpq.controller.php @@ -174,6 +174,9 @@ class AmpacheHttpq { if (is_null($this->_httpq->clear())) { return false; } + // If the clear worked we should stop it! + $this->stop(); + return true; } // clear_playlist @@ -185,6 +188,13 @@ class AmpacheHttpq { */ function play() { + /* A play when it's already playing causes a track restart + * which we don't want to doublecheck its state + */ + if ($this->_httpq->state() == 'play') { + return true; + } + if (is_null($this->_httpq->play())) { return false; } return true; @@ -331,7 +341,7 @@ class AmpacheHttpq { /* If we don't know it, look up by filename */ if (!$song->title) { $filename = sql_escape($entry); - $sql = "SELECT id FROM song WHERE file = '$filename'"; + $sql = "SELECT id FROM song WHERE file LIKE '%$filename'"; $db_results = mysql_query($sql, dbh()); if ($r = mysql_fetch_assoc($db_results)) { $song = new Song($r['id']); diff --git a/modules/localplay/mpd.controller.php b/modules/localplay/mpd.controller.php index c31a020b..c002d299 100644 --- a/modules/localplay/mpd.controller.php +++ b/modules/localplay/mpd.controller.php @@ -345,7 +345,7 @@ class AmpacheMpd { /* If we don't know it, look up by filename */ if (!$song->title) { $filename = sql_escape($entry['file']); - $sql = "SELECT id FROM song WHERE file = '$filename'"; + $sql = "SELECT id FROM song WHERE file LIKE '%$filename'"; $db_results = mysql_query($sql, dbh()); if ($r = mysql_fetch_assoc($db_results)) { $song = new Song($r['id']); diff --git a/templates/show_user_recommendations.inc.php b/templates/show_user_recommendations.inc.php index a89be09e..51d40c8c 100644 --- a/templates/show_user_recommendations.inc.php +++ b/templates/show_user_recommendations.inc.php @@ -26,7 +26,7 @@ <?php if (count($recommended_artists)) { $items = $working_user->format_recommendations($recommended_artists,'artist'); - show_info_box(_('Recommended Aritsts'),'artist',$items); + show_info_box(_('Recommended Artists'),'artist',$items); } else { echo "<span class=\"error\">" . _('Not Enough Data') . "</span>"; |