summaryrefslogtreecommitdiffstats
path: root/play/index.php
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-09-30 20:32:11 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-09-30 20:32:11 +0000
commit8eab507038dc3d844229051cf3f7dbcaee4897d4 (patch)
tree045dbc09132129a2d13da0a2a51d66cf982eeb68 /play/index.php
parent6eeea6fbcdd9a8a40bbcb94c767572e12a845551 (diff)
downloadampache-8eab507038dc3d844229051cf3f7dbcaee4897d4.tar.gz
ampache-8eab507038dc3d844229051cf3f7dbcaee4897d4.tar.bz2
ampache-8eab507038dc3d844229051cf3f7dbcaee4897d4.zip
slight format fix on now playing and xmlrpc key fixes
Diffstat (limited to 'play/index.php')
-rw-r--r--play/index.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/play/index.php b/play/index.php
index c84545b1..9878af0b 100644
--- a/play/index.php
+++ b/play/index.php
@@ -129,8 +129,12 @@ if ($catalog->catalog_type == 'remote') {
preg_match("/http:\/\/([^\/]+)\/*(.*)/", conf('web_path'), $match);
$server = rawurlencode($match[1]);
$path = rawurlencode($match[2]);
+ $port = $_SERVER['SERVER_PORT'];
+ if ($_SERVER['HTTPS'] == 'on') { $ssl='1'; }
+ else { $ssl = '0'; }
+ $catalog = $catalog->id;
- $extra_info = "&xml_rpc=1&xml_path=$path&xml_server=$server&xml_port=80&sid=$sid";
+ $extra_info = "&xml_rpc=1&xml_path=$path&xml_server=$server&xml_port=$port&ssl=$ssl&catalog=$catalog&sid=$sid";
header("Location: " . $song->file . $extra_info);
debug_event('xmlrpc-stream',"Start XML-RPC Stream - " . $song->file . $extra_info,'5');
exit;