[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Librefm-commits] [1764] fix nowplaying
|
From: |
Clint Adams |
|
Subject: |
[Librefm-commits] [1764] fix nowplaying |
|
Date: |
Sat, 23 May 2009 22:01:26 +0000 |
Revision: 1764
http://svn.sv.gnu.org/viewvc/?view=rev&root=librefm&revision=1764
Author: clint
Date: 2009-05-23 22:01:26 +0000 (Sat, 23 May 2009)
Log Message:
-----------
fix nowplaying
Modified Paths:
--------------
branches/stable/gnukebox/display.php
branches/stable/nixtape/data/Server.php
Modified: branches/stable/gnukebox/display.php
===================================================================
--- branches/stable/gnukebox/display.php 2009-05-23 22:00:32 UTC (rev
1763)
+++ branches/stable/gnukebox/display.php 2009-05-23 22:01:26 UTC (rev
1764)
@@ -21,6 +21,7 @@
header('Content-type: text/html; charset=utf-8');
require_once('database.php');
require_once('utils/human-time.php');
+require_once('temp-utils.php');
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
@@ -150,7 +151,7 @@
<?php
$adodb->SetFetchMode(ADODB_FETCH_ASSOC);
- $res = $adodb->GetAll('SELECT username, artist, track,
client, ClientCodes.name, ClientCodes.url from Now_Playing LEFT OUTER JOIN
Scrobble_Sessions ON Now_Playing.sessionid=Scrobble_Sessions.sessionid LEFT
OUTER JOIN ClientCodes ON Scrobble_Sessions.client=ClientCodes.code ORDER BY
Now_Playing.expires DESC LIMIT 10');
+ $res = $adodb->GetAll('SELECT userid, artist, track,
client, ClientCodes.name, ClientCodes.url from Now_Playing LEFT OUTER JOIN
Scrobble_Sessions ON Now_Playing.sessionid=Scrobble_Sessions.sessionid LEFT
OUTER JOIN ClientCodes ON Scrobble_Sessions.client=ClientCodes.code ORDER BY
Now_Playing.expires DESC LIMIT 10');
if(!$res) {
die("sql error");
}
@@ -160,7 +161,7 @@
} else {
$client = "<a href=\"" .
strip_tags(stripslashes($row["url"])) . "\">" .
strip_tags(stripslashes($row["name"])) . "</a>";
}
- echo "<p>" .
strip_tags(stripslashes($row["username"])) . " is listening to " .
strip_tags(stripslashes($row["track"])) . " by " .
strip_tags(stripslashes($row["artist"])) . " with " . $client . "</p>";
+ echo "<p>" .
strip_tags(stripslashes(userid_to_username($row["userid"]))) . " is listening
to " . strip_tags(stripslashes($row["track"])) . " by " .
strip_tags(stripslashes($row["artist"])) . " with " . $client . "</p>";
}
?>
Modified: branches/stable/nixtape/data/Server.php
===================================================================
--- branches/stable/nixtape/data/Server.php 2009-05-23 22:00:32 UTC (rev
1763)
+++ branches/stable/nixtape/data/Server.php 2009-05-23 22:01:26 UTC (rev
1764)
@@ -185,7 +185,7 @@
try {
if($username) {
$data = $adodb->CacheGetAll(60, 'SELECT
- username,
+ ss.userid,
n.artist,
n.track,
n.album,
@@ -196,7 +196,7 @@
n.mbid,
t.license
FROM Now_Playing n
- LEFT OUTER JOIN Scrobble_Sessions
+ LEFT OUTER JOIN Scrobble_Sessions ss
ON
n.sessionid=Scrobble_Sessions.sessionid
LEFT OUTER JOIN ClientCodes
ON
Scrobble_Sessions.client=ClientCodes.code
@@ -209,7 +209,7 @@
ORDER BY t.streamable DESC, n.expires
DESC LIMIT ' . (int)($number));
} else {
$data = $adodb->CacheGetAll(60, 'SELECT
- username,
+ ss.userid,
n.artist,
n.track,
n.album,
@@ -220,7 +220,7 @@
n.mbid,
t.license
FROM Now_Playing n
- LEFT OUTER JOIN Scrobble_Sessions
+ LEFT OUTER JOIN Scrobble_Sessions ss
ON
n.sessionid=Scrobble_Sessions.sessionid
LEFT OUTER JOIN ClientCodes
ON
Scrobble_Sessions.client=ClientCodes.code
@@ -247,7 +247,8 @@
$clientstr = '<a
href="http://en.wikipedia.org/wiki/Category:Free_media_players";>' .
strip_tags(stripslashes($row['name'])) . '</a>';
}
$row['clientstr'] = $clientstr;
- $row['userurl'] = Server::getUserURL($row['username']);
+ $username = uniqueid_to_username($row['userid']);
+ $row['userurl'] = Server::getUserURL($username);
$row['artisturl'] =
Server::getArtistURL($row['artist']);
$row['trackurl'] = Server::getTrackURL($row['artist'],
$row['album'], $row['track']);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Librefm-commits] [1764] fix nowplaying,
Clint Adams <=