Fix UTF-8 support in config (bug reported by Eloi Rivard).

[patchfork.git] / player / metadata.php

diff --git a/player/metadata.php b/player/metadata.php
index 41e3e9c399d6b6726ef389774b259bd04b127c27..9de3be3f3b5b0a0bc5d79f62fdcdd30691d540b3 100644 (file)
--- a/player/metadata.php
+++ b/player/metadata.php
@@ -28,7 +28,9 @@
        function amazonlink($params)
        {
                $params["SubscriptionId"] = "15BH771NY941TX2NKC02";
-               $res = aws_signed_request("com", $params, "Access Key ID", "Secret Access Key");
+               if (strlen(get_config("aws_secret")) == 0)
+                       return False;
+               $res = aws_signed_request("com", $params, get_config("aws_keyid"), get_config("aws_secret"));
                
                return $res;
        }
@@ -100,16 +102,18 @@
        /* Queries amazon with the specified url, strict serach first and then a more careless one, 
         * will urlencode artist and albumname 
         * returns xml document or false upon failure */
-       function amazon_album_query($params) {
+       function amazon_album_query($params, $album) {
                $stype = array("Title", "Keywords");
                $artist = urlencode($artist);
                $album = urlencode($album);
                foreach($stype as $st) {
                        if(!amazon_wait())
                                return false;
+                       $params[$st] = $album;
                        $xml = amazonlink($params);
                        if($xml&&isset($xml->Items[0])&&isset($xml->Items[0]->Item[0]))
                                return $xml;
+                        unset($params[$st]);
                }
                return false;
        }
@@ -328,7 +332,7 @@
                                $asin = false;
                        }
                        else {
-                               $res = @amazon_album_query(array("Operation"=>"ItemSearch", "SearchIndex"=>"Music", "Artist"=>"$artist", "Album"=>"$album"));
+                               $res = @amazon_album_query(array("Operation"=>"ItemSearch", "SearchIndex"=>"Music", "Artist"=>"$artist"), $album);
                        }
                        if($res) {
                                if($res&&isset($res->Items[0])&&isset($res->Items[0]->Item[0])) {