Add Search Advanced Playlists and artist slideshow photos plugin from Flickr

docs/PLUGINS

@@ -31,4 +31,5 @@ should be implemented as a public method:
     get_lyrics(Song $song)
     process_wanted(Wanted $wanted)
     shortener(string $url)
+    get_photos(string $search)
 

lib/class/slideshow.class.php

@@ -50,6 +50,13 @@ class Slideshow
                 debug_event('echonest', 'EchoNest artist images error: ' . $e->getMessage(), '1');
             }
         }
+        
+        foreach (Plugin::get_plugins('get_photos') as $plugin_name) {
+            $plugin = new Plugin($plugin_name);
+            if ($plugin->load($GLOBALS['user'])) {
+                $images += $plugin->_plugin->get_photos($artist_name);
+            }
+        }
 
         return $images;
     }

modules/plugins/Flickr.plugin.php

@@ -0,0 +1,109 @@
+<?php
+/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
+/**
+ *
+ * LICENSE: GNU General Public License, version 2 (GPLv2)
+ * Copyright 2001 - 2013 Ampache.org
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License v2
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ */
+
+class AmpacheFlickr {
+
+    public $name        = 'Flickr';
+    public $description = 'Artist photos from Flickr';
+    public $url         = 'http://www.flickr.com';
+    public $version     = '000001';
+    public $min_ampache = '360045';
+    public $max_ampache = '999999';
+
+    /**
+     * Constructor
+     * This function does nothing...
+     */
+    public function __construct() {
+
+        return true;
+
+    } // constructor
+
+    /**
+     * install
+     * This is a required plugin function. It inserts our preferences
+     * into Ampache
+     */
+    public function install() {
+        Preference::insert('flickr_api_key','Flickr api key','','25','string','plugins');
+        return true;
+    } // install
+
+    /**
+     * uninstall
+     * This is a required plugin function. It removes our preferences from
+     * the database returning it to its original form
+     */
+    public function uninstall() {
+        Preference::delete('flickr_api_key');
+        return true;
+    } // uninstall
+
+    /**
+     * upgrade
+     * This is a recommended plugin function
+     */
+    public function upgrade() {
+        return true;
+    } // upgrade
+
+    public function get_photos($search) {
+        $photos = array();
+        $url = "https://api.flickr.com/services/rest/?&method=flickr.photos.search&api_key=" . $this->api_key . "&per_page=30&text=" . rawurlencode($search);
+        $request = Requests::get($url);
+        if ($request->status_code == 200) {
+            $xml = simplexml_load_string($request->body);
+            if ($xml) {
+                foreach ($xml->photos->photo as $photo) {
+                    $photos[] = array(
+                        'title' => $photo->title,
+                        'url' => "http://farm" . $photo['farm'] . ".static.flickr.com/" . $photo['server'] . "/" . $photo['id'] . "_" . $photo['secret'] . "_m.jpg",
+                    );
+                }
+            }
+        }
+        
+        return $photos;
+    }
+    
+    /**
+     * load
+     * This loads up the data we need into this object, this stuff comes 
+     * from the preferences.
+     */
+    public function load($user) {
+        $user->set_preferences();
+        $data = $user->prefs;
+        
+        if (strlen(trim($data['flickr_api_key']))) {
+            $this->api_key = trim($data['flickr_api_key']);
+        }
+        else {
+            debug_event($this->name,'No Flickr api key, photo plugin skipped','3');
+            return false;
+        }
+        return true;
+    } // load
+
+} // end AmpacheFlickr
+?>

modules/plugins/Headphones.plugin.php

@@ -70,7 +70,8 @@ class AmpacheHeadphones {
 
         Preference::delete('headphones_api_url');
         Preference::delete('headphones_api_key');
-
+        
+        return true;
     } // uninstall
 
     /**

templates/show_html5_player.inc.php

@@ -564,7 +564,7 @@ if ($isVideo) {
             <?php echo Broadcast::get_broadcast_link(); ?>
         </div>
 <?php } ?>
-<?php if (AmpConfig::get('echonest_api_key') == 0 && $iframed) { ?>
+<?php if ($iframed) { ?>
         <div id="slideshow" class="slideshow">
             <a href="javascript:ShowSlideshow();"><?php echo UI::get_icon('image', T_('Slideshow')); ?></a>
         </div>

templates/sidebar_home.inc.php

@@ -97,6 +97,7 @@
       <li id="sb_home_search_song"><a href="<?php echo $web_path; ?>/search.php?type=song"><?php echo T_('Songs'); ?></a></li>
       <li id="sb_home_search_album"><a href="<?php echo $web_path; ?>/search.php?type=album"><?php echo T_('Albums'); ?></a></li>
       <li id="sb_home_search_artist"><a href="<?php echo $web_path; ?>/search.php?type=artist"><?php echo T_('Artists'); ?></a></li>
+      <li id="sb_home_search_playlist"><a href="<?php echo $web_path; ?>/search.php?type=playlist"><?php echo T_('Playlists'); ?></a></li>
       <li id="sb_home_search_video"><a href="<?php echo $web_path; ?>/search.php?type=video"><?php echo T_('Videos'); ?></a></li>
     </ul>
   </li>