From dd4765ad1654f1fb52585a093ab3438b0810c88b Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 27 Jul 2012 18:10:40 -0400
Subject: [PATCH] Set filter to empty if not set by Ampache client
---
apps/media/lib_ampache.php | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/apps/media/lib_ampache.php b/apps/media/lib_ampache.php
index a041e9a884..4951399fa1 100644
--- a/apps/media/lib_ampache.php
+++ b/apps/media/lib_ampache.php
@@ -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
@@ -273,7 +272,7 @@ class OC_MEDIA_AMPACHE{
</root>");
return;
}
- $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"?>');
@@ -402,7 +401,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);
--
GitLab