mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Set filter to empty if not set by Ampache client 

Conflicts:
	apps/media/lib_ampache.php
This commit is contained in:
Michael Gapczynski 2012-07-27 18:10:40 -04:00
parent d07b8448d1
commit 3e183b2eea
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/media/lib_ampache.php
View File

@ -71,7 +71,6 @@ class OC_MEDIA_AMPACHE{
$pass=$users[0]['user_password_sha256'];
$key=hash('sha256',$time.$pass);
if($key==$auth){
$token=hash('sha256','oc_media_'.$key);
OC_MEDIA_COLLECTION::$uid=$users[0]['user_id'];
$date=date('c');//todo proper update/add/clean dates
@ -268,7 +267,7 @@ class OC_MEDIA_AMPACHE{
return;
}
global $SITEROOT;
$filter=$params['filter'];
$filter = isset($params['filter']) ? $params['filter'] : '';
$albums=OC_MEDIA_COLLECTION::getAlbums($filter);
$artist=OC_MEDIA_COLLECTION::getArtistName($filter);
echo('<?xml version="1.0" encoding="UTF-8"?>');
@ -397,7 +396,7 @@ class OC_MEDIA_AMPACHE{
</root>");
return;
}
$filter=$params['filter'];
$filter = isset($params['filter']) ? $params['filter'] : '';
$artists=OC_MEDIA_COLLECTION::getArtists($filter);
$albums=OC_MEDIA_COLLECTION::getAlbums(0,$filter);
$songs=OC_MEDIA_COLLECTION::getSongs(0,0,$filter);