Set filter to empty if not set by Ampache client
Conflicts: apps/media/lib_ampache.php
This commit is contained in:
parent
d07b8448d1
commit
3e183b2eea
|
@ -71,7 +71,6 @@ class OC_MEDIA_AMPACHE{
|
||||||
$pass=$users[0]['user_password_sha256'];
|
$pass=$users[0]['user_password_sha256'];
|
||||||
$key=hash('sha256',$time.$pass);
|
$key=hash('sha256',$time.$pass);
|
||||||
if($key==$auth){
|
if($key==$auth){
|
||||||
|
|
||||||
$token=hash('sha256','oc_media_'.$key);
|
$token=hash('sha256','oc_media_'.$key);
|
||||||
OC_MEDIA_COLLECTION::$uid=$users[0]['user_id'];
|
OC_MEDIA_COLLECTION::$uid=$users[0]['user_id'];
|
||||||
$date=date('c');//todo proper update/add/clean dates
|
$date=date('c');//todo proper update/add/clean dates
|
||||||
|
@ -268,7 +267,7 @@ class OC_MEDIA_AMPACHE{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
global $SITEROOT;
|
global $SITEROOT;
|
||||||
$filter=$params['filter'];
|
$filter = isset($params['filter']) ? $params['filter'] : '';
|
||||||
$albums=OC_MEDIA_COLLECTION::getAlbums($filter);
|
$albums=OC_MEDIA_COLLECTION::getAlbums($filter);
|
||||||
$artist=OC_MEDIA_COLLECTION::getArtistName($filter);
|
$artist=OC_MEDIA_COLLECTION::getArtistName($filter);
|
||||||
echo('<?xml version="1.0" encoding="UTF-8"?>');
|
echo('<?xml version="1.0" encoding="UTF-8"?>');
|
||||||
|
@ -397,7 +396,7 @@ class OC_MEDIA_AMPACHE{
|
||||||
</root>");
|
</root>");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$filter=$params['filter'];
|
$filter = isset($params['filter']) ? $params['filter'] : '';
|
||||||
$artists=OC_MEDIA_COLLECTION::getArtists($filter);
|
$artists=OC_MEDIA_COLLECTION::getArtists($filter);
|
||||||
$albums=OC_MEDIA_COLLECTION::getAlbums(0,$filter);
|
$albums=OC_MEDIA_COLLECTION::getAlbums(0,$filter);
|
||||||
$songs=OC_MEDIA_COLLECTION::getSongs(0,0,$filter);
|
$songs=OC_MEDIA_COLLECTION::getSongs(0,0,$filter);
|
||||||
|
|
Loading…
Reference in New Issue