From dc1c777a3ab98e35a6f65f32e1dc632a709f6f73 Mon Sep 17 00:00:00 2001
From: Mike Sheldon <mike@mikeasoft.com>
Date: Sun, 4 Apr 2010 22:12:13 +0100
Subject: [PATCH] Add function for creating tag urls based on url rewritting
 availability

---
 nixtape/api/ArtistXML.php | 4 ++--
 nixtape/api/TrackXML.php  | 6 +++---
 nixtape/api/UserXML.php   | 2 +-
 nixtape/data/Server.php   | 9 +++++++++
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/nixtape/api/ArtistXML.php b/nixtape/api/ArtistXML.php
index 2f04d5eb..d50e39b9 100755
--- a/nixtape/api/ArtistXML.php
+++ b/nixtape/api/ArtistXML.php
@@ -105,8 +105,8 @@ class ArtistXML {
 		$tags = $artist->getTopTags();
 		foreach($tags as $tag) {
 			$tag_node = $root->addChild('tag', null);
-			$tag_node->addChild('name', $tag);
-			$tag_node->addChild('url', repamp($base_url . '/tag/' . $tag));
+			$tag_node->addChild('name', repamp($tag));
+			$tag_node->addChild('url', Server::getTagURL($tag));
 		}
 
 		return $xml;
diff --git a/nixtape/api/TrackXML.php b/nixtape/api/TrackXML.php
index 8e9a673c..96e2a078 100644
--- a/nixtape/api/TrackXML.php
+++ b/nixtape/api/TrackXML.php
@@ -39,8 +39,8 @@ class TrackXML {
 		foreach($tags as &$tag) {
 			$tag_node = $root->addChild('tag', null);
 			$tag_node->addChild('name', repamp($tag['tag']));
-			$tag_node->addChild('count', repamp($tag['freq']));
-			$tag_node->addChild('url', repamp($base_url . '/tag/' . $tag['tag']));
+			$tag_node->addChild('count', $tag['freq']);
+			$tag_node->addChild('url', Server::getTagURL($row['tag']));
 		}
 
 		return $xml;
@@ -61,7 +61,7 @@ class TrackXML {
 		foreach($tags as $tag) {
 			$tag_node = $root->addChild('tag', null);
 			$tag_node->addChild('name', repamp($tag));
-			$tag_node->addChild('url', repamp($base_url . '/tag/' . $tag['tag']));
+			$tag_node->addChild('url', Server::getTagURL($row['tag']));
 		}
 
 		return $xml;
diff --git a/nixtape/api/UserXML.php b/nixtape/api/UserXML.php
index 3d1a71ac..ca4b97f8 100755
--- a/nixtape/api/UserXML.php
+++ b/nixtape/api/UserXML.php
@@ -157,7 +157,7 @@ class UserXML {
 			$tag = $root->addChild('tag', null);
 			$tag->addChild('name', repamp($row['tag']));
 			$tag->addChild('count', repamp($row['freq']));
-			$tag->addChild('url', repamp($base_url . '/tag/' . $row['tag']));
+			$tag->addChild('url', Server::getTagURL($row['tag']));
 		}
 
 		return $xml;
diff --git a/nixtape/data/Server.php b/nixtape/data/Server.php
index fa4e6f0d..9658a7bc 100644
--- a/nixtape/data/Server.php
+++ b/nixtape/data/Server.php
@@ -349,6 +349,15 @@ class Server {
 		}
 	}
 
+	static function getTagURL($tag) {
+		global $friendly_urls, $base_url;
+		if ($friendly_urls) {
+			return $base_url . '/tag/' . rawurlencode($tag);
+		} else {
+			return $base_url . '/tag.php?tag=' . rawurlencode($tag);
+		}
+	}
+
 	static function getLocationDetails($name) {
 		global $adodb;
 
-- 
GitLab