summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2008-03-21 04:43:48 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2008-03-21 04:43:48 +0000
commit260b62361e031b3a0d4261e892170f294825ed61 (patch)
tree9ba79b0c5ac498c4cfd1caf896baa1d1caab7a84 /server
parent06652fe0406b45732ad80a3ab08c7d97bae4b47c (diff)
downloadampache-260b62361e031b3a0d4261e892170f294825ed61.tar.gz
ampache-260b62361e031b3a0d4261e892170f294825ed61.tar.bz2
ampache-260b62361e031b3a0d4261e892170f294825ed61.zip
fixed recently played, removed a bunch of useless files, added new methods to api as requested by dev, fixed some minor issues with enabling of localplay methods
Diffstat (limited to 'server')
-rw-r--r--server/ajax.server.php2
-rw-r--r--server/xml.server.php13
2 files changed, 13 insertions, 2 deletions
diff --git a/server/ajax.server.php b/server/ajax.server.php
index bda613c5..2cca5c5a 100644
--- a/server/ajax.server.php
+++ b/server/ajax.server.php
@@ -289,7 +289,7 @@ switch ($_REQUEST['action']) {
show_now_playing();
$results['now_playing'] = ob_get_contents();
ob_clean();
- $data = get_recently_played();
+ $data = Song::get_recently_played();
if (count($data)) {
show_box_top(_('Recently Played'));
require_once Config::get('prefix') . '/templates/show_recently_played.inc.php';
diff --git a/server/xml.server.php b/server/xml.server.php
index 5bb3ead3..b6deeec1 100644
--- a/server/xml.server.php
+++ b/server/xml.server.php
@@ -1,7 +1,7 @@
<?php
/*
- Copyright (c) 2001 - 2008 Ampache.org
+ Copyright (c) Ampache.org
All rights reserved.
This program is free software; you can redistribute it and/or
@@ -174,6 +174,11 @@ switch ($_REQUEST['action']) {
ob_end_clean();
echo xmlData::genres($genres);
break;
+ case 'genre':
+ $uid = scrub_in($_REQUEST['filter']);
+ ob_end_clean();
+ echo xmlData::genres(array($uid));
+ break;
case 'genre_artists':
$genre = new Genre($_REQUEST['filter']);
$artists = $genre->get_artists();
@@ -244,6 +249,12 @@ switch ($_REQUEST['action']) {
ob_end_clean();
echo xmlData::playlists($playlist_ids);
break;
+ case 'playlist':
+ $uid = scrub_in($_REQUEST['filter']);
+
+ ob_end_clean();
+ echo xmlData::playlists(array($uid));
+ break;
case 'playlist_songs':
$playlist = new Playlist($_REQUEST['filter']);
$items = $playlist->get_items();