summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdocs/CHANGELOG2
-rw-r--r--play/index.php3
-rw-r--r--playlist.php2
-rw-r--r--server/xmlrpc.server.php4
4 files changed, 7 insertions, 4 deletions
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index f0230a68..972dd500 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,8 @@
--------------------------------------------------------------------------
v.3.3.2-Beta2
+ - Fixed a few typos in the xmlrpc code and playlists and fixed the
+ weird skipping when seeking using some players (Thx Sven)
- Fixed a problem with the Image Resize code which wasn't correctly
detecting the lack of GD causing no art to be displayed
- Fixed Remember Me button (part of the vauth)
diff --git a/play/index.php b/play/index.php
index 01e37db7..c6414357 100644
--- a/play/index.php
+++ b/play/index.php
@@ -216,9 +216,10 @@ else {
elseif ($start) {
$browser->downloadHeaders($song_name, $song->mime, false, $song->size);
fseek( $fp, $start );
- $range = $start ."-". $song->size . "/" . $song->size;
+ $range = $start ."-". ($song->size-1) . "/" . $song->size;
header("HTTP/1.1 206 Partial Content");
header("Content-Range: bytes=$range");
+ header("Content-Length: ".($song->size-$start));
}
/* Last but not least pump em out */
else {
diff --git a/playlist.php b/playlist.php
index 5537867e..dbe46757 100644
--- a/playlist.php
+++ b/playlist.php
@@ -120,7 +120,7 @@ switch ($action) {
case 'remove_song':
case _('Remote Selected Tracks'):
/* Check em for rights */
- if (!$playlist->has_access) {
+ if (!$playlist->has_access()) {
access_denied();
break;
}
diff --git a/server/xmlrpc.server.php b/server/xmlrpc.server.php
index 3ef233bd..9208205f 100644
--- a/server/xmlrpc.server.php
+++ b/server/xmlrpc.server.php
@@ -1,7 +1,7 @@
<?php
/*
- Copyright 2001 - 2005 Ampache.org
+ Copyright 2001 - 2006 Ampache.org
All Rights Reserved
This program is free software; you can redistribute it and/or
@@ -21,7 +21,7 @@
*/
$no_session = true;
-require_once('modules/init.php');
+require_once('../modules/init.php');
if (conf('xml_rpc')) {