[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Librefm-commits] [1477] Update more string quoting to match the code st
From: |
Michael Sheldon |
Subject: |
[Librefm-commits] [1477] Update more string quoting to match the code standards |
Date: |
Sun, 10 May 2009 21:55:46 +0000 |
Revision: 1477
http://svn.sv.gnu.org/viewvc/?view=rev&root=librefm&revision=1477
Author: elleo
Date: 2009-05-10 21:55:45 +0000 (Sun, 10 May 2009)
Log Message:
-----------
Update more string quoting to match the code standards
Modified Paths:
--------------
trunk/nixtape/radio/adjust.php
trunk/nixtape/radio/handshake.php
trunk/nixtape/radio/radio-utils.php
trunk/nixtape/radio/xspf.php
Modified: trunk/nixtape/radio/adjust.php
===================================================================
--- trunk/nixtape/radio/adjust.php 2009-05-10 21:44:24 UTC (rev 1476)
+++ trunk/nixtape/radio/adjust.php 2009-05-10 21:55:45 UTC (rev 1477)
@@ -18,24 +18,24 @@
*/
-require_once("../database.php");
-require_once("radio-utils.php");
+require_once('../database.php');
+require_once('radio-utils.php');
if(!isset($_GET['session']) || !isset($_GET['url'])) {
die("FAILED\n");
}
-$session = $_GET["session"];
-$url = $_GET["url"];
+$session = $_GET['session'];
+$url = $_GET['url'];
-$res = $mdb2->query("SELECT username FROM Radio_Sessions WHERE session = " .
$mdb2->quote($session, "text"));
+$res = $mdb2->query('SELECT username FROM Radio_Sessions WHERE session = ' .
$mdb2->quote($session, 'text'));
if(!$res->numRows()) {
die("BADSESSION\n");
}
-if(ereg("^(globaltags|artist)/[^:]+$", $url, $regs)) {
- $url = "librefm://" . $url; // compensate for shell-fm sending
incomplete urls
+if(ereg('^(globaltags|artist)/[^:]+$', $url, $regs)) {
+ $url = 'librefm://' . $url; // compensate for shell-fm sending
incomplete urls
}
$stationname=radio_title_from_url($url);
@@ -43,7 +43,7 @@
die("FAILED Unavailable station\n");
}
-$mdb2->exec("UPDATE Radio_Sessions SET url = " . $mdb2->quote($url, "text") .
" WHERE session = " . $mdb2->quote($session, "text"));
+$mdb2->exec('UPDATE Radio_Sessions SET url = ' . $mdb2->quote($url, 'text') .
' WHERE session = ' . $mdb2->quote($session, 'text'));
echo "response=OK\n";
echo "url=http://libre.fm\n"; // Need to parse the station request and give a
real URL
Modified: trunk/nixtape/radio/handshake.php
===================================================================
--- trunk/nixtape/radio/handshake.php 2009-05-10 21:44:24 UTC (rev 1476)
+++ trunk/nixtape/radio/handshake.php 2009-05-10 21:55:45 UTC (rev 1477)
@@ -18,7 +18,7 @@
*/
-require_once("../database.php");
+require_once('../database.php');
if(!isset($_GET['username']) || !isset($_GET['passwordmd5'])) {
die("BADAUTH\n");
@@ -27,20 +27,20 @@
$username = $_GET['username'];
$passmd5 = $_GET['passwordmd5'];
-$res = $mdb2->query("SELECT username FROM Users WHERE username = " .
$mdb2->quote($username, "text") . " AND password = " . $mdb2->quote($passmd5,
"text"));
+$res = $mdb2->query('SELECT username FROM Users WHERE username = ' .
$mdb2->quote($username, 'text') . ' AND password = ' . $mdb2->quote($passmd5,
'text'));
if (!$res->numRows()) {
die("BADAUTH\n");
}
$session = md5($passmd5 . time());
-$mdb2->exec("DELETE FROM Radio_Sessions WHERE expires < " .
$mdb2->quote(time(), "integer"));
+$mdb2->exec('DELETE FROM Radio_Sessions WHERE expires < ' .
$mdb2->quote(time(), 'integer'));
-$mdb2->query("INSERT INTO Radio_Sessions (username, session, expires) VALUES (
" . $mdb2->quote($username, "text") . ", " . $mdb2->quote($session, "text") .
", " . $mdb2->quote(time() + 259200,"integer") . ")");
+$mdb2->query('INSERT INTO Radio_Sessions (username, session, expires) VALUES (
' . $mdb2->quote($username, 'text"' . ', ' . $mdb2->quote($session, "text") .
', ' . $mdb2->quote(time() + 259200,'integer') . ')');
-echo "session=" . $session . "\n";
-echo "stream_url=this.is.broken.$username.example.com\n";
+echo 'session=' . $session . "\n";
+echo "stream_url=this.is.broken.{$username}.example.com\n";
echo "subscriber=0\n";
echo "framehack=0..\n";
echo "base_url=alpha.libre.fm\n";
Modified: trunk/nixtape/radio/radio-utils.php
===================================================================
--- trunk/nixtape/radio/radio-utils.php 2009-05-10 21:44:24 UTC (rev 1476)
+++ trunk/nixtape/radio/radio-utils.php 2009-05-10 21:55:45 UTC (rev 1477)
@@ -20,16 +20,16 @@
function radio_title_from_url($url) {
- if(ereg("l(ast|ibre)fm://globaltags/(.*)", $url, $regs)) {
+ if(ereg('l(ast|ibre)fm://globaltags/(.*)', $url, $regs)) {
$tag = $regs[2];
- return "Libre.fm " . ucwords($tag) . " Tag Radio";
+ return 'Libre.fm ' . ucwords($tag) . ' Tag Radio';
}
- if(ereg("l(ast|ibre)fm://artist/(.*)/similarartists", $url, $regs)) {
+ if(ereg('l(ast|ibre)fm://artist/(.*)/similarartists', $url, $regs)) {
$artist = $regs[2];
- return "Libre.fm " . $artist . " Artist Radio";
+ return 'Libre.fm ' . $artist . ' Artist Radio';
}
- return "FAILED";
+ return 'FAILED';
}
?>
Modified: trunk/nixtape/radio/xspf.php
===================================================================
--- trunk/nixtape/radio/xspf.php 2009-05-10 21:44:24 UTC (rev 1476)
+++ trunk/nixtape/radio/xspf.php 2009-05-10 21:55:45 UTC (rev 1477)
@@ -21,7 +21,7 @@
require_once('../database.php');
require_once('../templating.php');
require_once('../data/Track.php');
-require_once("radio-utils.php");
+require_once('radio-utils.php');
// These deaths should probably just return an empty playlist
@@ -29,9 +29,9 @@
die("BADSESSION\n"); // this should return a blank dummy playlist
instead
}
-$session = $_GET["sk"];
+$session = $_GET['sk'];
-$res = $mdb2->query("SELECT url FROM Radio_Sessions WHERE session = " .
$mdb2->quote($session, "text"));
+$res = $mdb2->query('SELECT url FROM Radio_Sessions WHERE session = ' .
$mdb2->quote($session, 'text'));
if(!$res->numRows()) {
die("BADSESSION\n"); // this should return a blank dummy playlist
instead
@@ -42,12 +42,12 @@
$title = radio_title_from_url($url);
$smarty->assign('title', $title);
-if(ereg("l(ast|ibre)fm://globaltags/(.*)", $url, $regs)) {
+if(ereg('l(ast|ibre)fm://globaltags/(.*)', $url, $regs)) {
$tag = $regs[2];
- $res = $mdb2->query("SELECT Track.name, Track.artist_name,
Track.album_name FROM Track INNER JOIN Tags ON Track.name=Tags.track AND
Track.artist_name=Tags.artist AND Track.album_name=Tags.album WHERE
streamurl<>'' AND streamable=1 AND lower(tag) = " .
$mdb2->quote(mb_strtolower($tag, "UTF-8"), "text"));
-} elseif(ereg("l(ast|ibre)fm://artist/(.*)/similarartists", $url, $regs)) {
+ $res = $mdb2->query('SELECT Track.name, Track.artist_name,
Track.album_name FROM Track INNER JOIN Tags ON Track.name=Tags.track AND
Track.artist_name=Tags.artist AND Track.album_name=Tags.album WHERE
streamurl<>\'\' AND streamable=1 AND lower(tag) = ' .
$mdb2->quote(mb_strtolower($tag, 'UTF-8'), 'text'));
+} elseif(ereg('l(ast|ibre)fm://artist/(.*)/similarartists', $url, $regs)) {
$artist = $regs[2];
- $res = $mdb2->query("SELECT name, artist_name, album_name FROM Track
WHERE streamurl<>'' AND streamable=1 AND lower(artist_name) = " .
$mdb2->quote(mb_strtolower($artist, "UTF-8"), "text"));
+ $res = $mdb2->query('SELECT name, artist_name, album_name FROM Track
WHERE streamurl<>\'\' AND streamable=1 AND lower(artist_name) = ' .
$mdb2->quote(mb_strtolower($artist, 'UTF-8'), 'text'));
} else {
die("FAILED\n"); // this should return a blank dummy playlist instead
}
@@ -70,9 +70,9 @@
$res->seek($tr[$i]);
$row = $res->fetchRow(MDB2_FETCHMODE_ASSOC);
- $track = new Track($row["name"], $row["artist_name"]);
- $album = new Album($row["album_name"], $row["artist_name"]);
- $artist = new Artist($row["artist_name"]);
+ $track = new Track($row['name'], $row['artist_name']);
+ $album = new Album($row['album_name'], $row['artist_name']);
+ $artist = new Artist($row['artist_name']);
if($track->duration == 0) {
$duration = 180000;
@@ -80,17 +80,17 @@
$duration = $track->duration * 1000;
}
- $radiotracks[$i]["location"] = $track->streamurl;
- $radiotracks[$i]["title"] = $track->name;
- $radiotracks[$i]["id"] = "0000";
- $radiotracks[$i]["album"] = $album->name;
- $radiotracks[$i]["creator"] = $artist->name;
- $radiotracks[$i]["duration"] = $duration;
- $radiotracks[$i]["image"] = $album->image;
- $radiotracks[$i]["artisturl"] = $artist->getURL();
- $radiotracks[$i]["albumurl"] = $album->getURL();
- $radiotracks[$i]["trackurl"] = $track->getURL();
- $radiotracks[$i]["downloadurl"] = $track->getURL();
+ $radiotracks[$i]['location'] = $track->streamurl;
+ $radiotracks[$i]['title'] = $track->name;
+ $radiotracks[$i]['id'] = "0000";
+ $radiotracks[$i]['album'] = $album->name;
+ $radiotracks[$i]['creator'] = $artist->name;
+ $radiotracks[$i]['duration'] = $duration;
+ $radiotracks[$i]['image'] = $album->image;
+ $radiotracks[$i]['artisturl'] = $artist->getURL();
+ $radiotracks[$i]['albumurl'] = $album->getURL();
+ $radiotracks[$i]['trackurl'] = $track->getURL();
+ $radiotracks[$i]['downloadurl'] = $track->getURL();
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Librefm-commits] [1477] Update more string quoting to match the code standards,
Michael Sheldon <=