[Librefm-commits] [1174] see if rawurldecode() handles plus signs better

[Clint Adams]

Revision: 1174
          http://svn.sv.gnu.org/viewvc/?view=rev&root=librefm&revision=1174
Author:   clint
Date:     2009-05-04 01:23:23 +0000 (Mon, 04 May 2009)
Log Message:
-----------
see if rawurldecode() handles plus signs better

Modified Paths:
--------------
    trunk/gnukebox/fix-album-art.php
    trunk/nixtape/data/Artist.php
    trunk/nixtape/data/Group.php
    trunk/nixtape/data/Server.php
    trunk/nixtape/utils/linkeddata.php

Modified: trunk/gnukebox/fix-album-art.php
===================================================================
--- trunk/gnukebox/fix-album-art.php    2009-05-04 00:23:03 UTC (rev 1173)
+++ trunk/gnukebox/fix-album-art.php    2009-05-04 01:23:23 UTC (rev 1174)
@@ -101,4 +101,4 @@
        return $image;
        }
 }
-?>
\ No newline at end of file
+?>

Modified: trunk/nixtape/data/Artist.php
===================================================================
--- trunk/nixtape/data/Artist.php       2009-05-04 00:23:03 UTC (rev 1173)
+++ trunk/nixtape/data/Artist.php       2009-05-04 01:23:23 UTC (rev 1174)
@@ -130,9 +130,9 @@
        function getURL() {
                global $friendly_urls, $base_url;
                if($friendly_urls) {
-                       return $base_url . "/artist/" . 
urlencode(stripslashes($this->name));
+                       return $base_url . "/artist/" . 
rawurlencode(stripslashes($this->name));
                } else {
-                       return $base_url . "/artist.php?artist=" . 
urlencode(stripslashes($this->name));
+                       return $base_url . "/artist.php?artist=" . 
rawurlencode(stripslashes($this->name));
                }
        }
 

Modified: trunk/nixtape/data/Group.php
===================================================================
--- trunk/nixtape/data/Group.php        2009-05-04 00:23:03 UTC (rev 1173)
+++ trunk/nixtape/data/Group.php        2009-05-04 01:23:23 UTC (rev 1174)
@@ -75,7 +75,7 @@
                        $this->users        = array();
 
                        if (! preg_match('/\:/', $this->id))
-                               $this->id = $base.'/group/' . 
urlencode($this->name) . '#group';
+                               $this->id = $base.'/group/' . 
rawurlencode($this->name) . '#group';
                }               
        }
        
@@ -205,9 +205,9 @@
        function getURLAction ($action) {
                $url = $this->getURL();
                if (strstr($url, '?'))
-                       return $url . '&action=' . urlencode($action);
+                       return $url . '&action=' . rawurlencode($action);
                else
-                       return $url . '?action=' . urlencode($action);
+                       return $url . '?action=' . rawurlencode($action);
        }
        
        function getUsers () {

Modified: trunk/nixtape/data/Server.php
===================================================================
--- trunk/nixtape/data/Server.php       2009-05-04 00:23:03 UTC (rev 1173)
+++ trunk/nixtape/data/Server.php       2009-05-04 01:23:23 UTC (rev 1174)
@@ -281,49 +281,49 @@
                                $component = '';
                        else
                                $component = "/{$component}";
-                       return $base_url . "/user/" . urlencode($username) . 
$component;
+                       return $base_url . "/user/" . rawurlencode($username) . 
$component;
                }
                else
                {
-                       return $base_url . "/user-{$component}.php?user=" . 
urlencode($username);
+                       return $base_url . "/user-{$component}.php?user=" . 
rawurlencode($username);
                }
        }
 
        static function getGroupURL($groupname) {
                global $friendly_urls, $base_url;
                if($friendly_urls) {
-                       return $base_url . "/group/" . urlencode($groupname);
+                       return $base_url . "/group/" . rawurlencode($groupname);
                } else {
-                       return $base_url . "/group.php?group=" . 
urlencode($groupname);
+                       return $base_url . "/group.php?group=" . 
rawurlencode($groupname);
                }
        }
 
        static function getArtistURL($artist) {
                global $friendly_urls, $base_url;
                if($friendly_urls) {
-                       return $base_url . "/artist/" . urlencode($artist);
+                       return $base_url . "/artist/" . rawurlencode($artist);
                } else {
-                       return $base_url . "/artist.php?artist=" . 
urlencode($artist);
+                       return $base_url . "/artist.php?artist=" . 
rawurlencode($artist);
                }
        }
 
        static function getAlbumURL($artist, $album) {
                global $friendly_urls, $base_url;
                if($friendly_urls) {
-                       return $base_url . "/artist/" . urlencode($artist) . 
"/album/" . urlencode($album);
+                       return $base_url . "/artist/" . rawurlencode($artist) . 
"/album/" . rawurlencode($album);
                } else {
-                       return $base_url . "/album.php?artist=" . 
urlencode($artist) . "&album=" . urlencode($album);
+                       return $base_url . "/album.php?artist=" . 
rawurlencode($artist) . "&album=" . rawurlencode($album);
                }
        }
 
        static function getTrackURL($artist, $album, $track) {
                global $friendly_urls, $base_url;
                if ($friendly_urls && $album) {
-                       return $base_url . "/artist/" . urlencode($artist) . 
"/album/" . urlencode($album) . "/track/" . urlencode($track);
+                       return $base_url . "/artist/" . rawurlencode($artist) . 
"/album/" . rawurlencode($album) . "/track/" . rawurlencode($track);
                } elseif ($friendly_urls) {
-                       return $base_url . "/artist/" . urlencode($artist) . 
"/track/" . urlencode($track);
+                       return $base_url . "/artist/" . rawurlencode($artist) . 
"/track/" . rawurlencode($track);
                } else {
-                       return $base_url . "/track.php?artist=" . 
urlencode($artist) .   "&album=" . urlencode($album) . "&track=" . 
urlencode($track);
+                       return $base_url . "/track.php?artist=" . 
rawurlencode($artist) .   "&album=" . rawurlencode($album) . "&track=" . 
rawurlencode($track);
                }
        }
 

Modified: trunk/nixtape/utils/linkeddata.php
===================================================================
--- trunk/nixtape/utils/linkeddata.php  2009-05-04 00:23:03 UTC (rev 1173)
+++ trunk/nixtape/utils/linkeddata.php  2009-05-04 01:23:23 UTC (rev 1174)
@@ -8,7 +8,7 @@
                return null;
 
        $microhash = substr(md5($artist . '//' . $track), 0, 4);
-       return $base_url . sprintf('/user/%s#%s.%s', urlencode($username), 
urlencode($time), urlencode($microhash));
+       return $base_url . sprintf('/user/%s#%s.%s', rawurlencode($username), 
rawurlencode($time), rawurlencode($microhash));
 }
 
 function identifierTrack ($username, $artist, $track, $album, $time, 
$mbid=NULL, $ambid=NULL, $lmbid=NULL)
@@ -35,7 +35,7 @@
        if ($u != '.artist') return $u;
 
        global $base_url;
-       return $base_url . sprintf('/artist/%s#artist', urlencode($artist));
+       return $base_url . sprintf('/artist/%s#artist', rawurlencode($artist));
 }
 
 function identifierAlbum ($username, $artist, $track, $album, $time, 
$mbid=NULL, $ambid=NULL, $lmbid=NULL)
@@ -50,6 +50,6 @@
        if ($u != '.album') return $u;
 
        global $base_url;
-       return $base_url . sprintf('/artist/%s/album/%s#this', 
urlencode($artist), urlencode($album));
+       return $base_url . sprintf('/artist/%s/album/%s#this', 
rawurlencode($artist), rawurlencode($album));
 }