Set filter to empty if not set by Ampache client

Conflicts:
	apps/media/lib_ampache.php

diff --git a/apps/media/lib_ampache.php b/apps/media/lib_ampache.php
index 7c4e1dac3f65a99824029566d213a5703c3f66ba..63682100d4ca5ff884188f9e5a7ddc61133d8c06 100644 (file)
--- 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
@@ -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);