From 2bb142eeb839e5851ff7b76e1c029371788af226 Mon Sep 17 00:00:00 2001
From: "Phyks (Lucas Verney)" <phyks@phyks.me>
Date: Fri, 17 Jun 2016 12:20:43 +0200
Subject: [PATCH 1/4] Fix issue #1260

Fix coding guidelines incoherences. Code should match PSR1/2 now, and
php-cs is set to check it on each commit.

Also fixed the Git hook to take into account only added, modified,
copied and renamed files (preventing errors when trying to check deleted
files).

Closes #1260.
---
 .gitignore                                    |  1 +
 .php_cs                                       |  2 +
 admin/access.php                              | 10 +--
 admin/catalog.php                             | 14 +--
 admin/duplicates.php                          |  2 +-
 admin/export.php                              |  4 +-
 admin/index.php                               |  2 +-
 admin/license.php                             |  6 +-
 admin/mail.php                                |  4 +-
 admin/modules.php                             | 38 ++++----
 admin/shout.php                               |  8 +-
 admin/system.php                              |  4 +-
 admin/users.php                               | 22 ++---
 albums.php                                    |  4 +-
 artists.php                                   |  4 +-
 arts.php                                      |  4 +-
 batch.php                                     |  4 +-
 browse.php                                    | 38 ++++----
 channel.php                                   |  2 +-
 channel/index.php                             |  8 +-
 daap/index.php                                |  2 +-
 democratic.php                                | 10 +--
 graph.php                                     |  2 +-
 image.php                                     |  4 +-
 install.php                                   |  6 +-
 labels.php                                    |  6 +-
 lib/batch.lib.php                             |  4 +-
 lib/class/Repository.php                      |  4 +-
 lib/class/ajax.class.php                      |  4 +-
 lib/class/album.class.php                     |  8 +-
 lib/class/ampache_rss.class.php               |  8 +-
 lib/class/amperror.class.php                  |  4 +-
 lib/class/api.class.php                       | 90 +++++++++----------
 lib/class/art.class.php                       | 38 ++++----
 lib/class/artist.class.php                    | 20 ++---
 lib/class/bookmark.class.php                  |  2 +-
 lib/class/catalog.class.php                   |  6 +-
 lib/class/channel.class.php                   |  6 +-
 lib/class/core.class.php                      |  4 +-
 lib/class/database_object.abstract.php        | 10 +--
 lib/class/dba.class.php                       |  4 +-
 lib/class/democratic.class.php                | 16 ++--
 lib/class/graph.class.php                     | 36 ++++----
 lib/class/ldap.class.php                      | 68 +++++++-------
 lib/class/live_stream.class.php               |  4 +-
 lib/class/localplay.class.php                 | 52 +++++------
 lib/class/localplay_controller.abstract.php   |  8 +-
 lib/class/playlist.class.php                  | 14 +--
 lib/class/plex_api.class.php                  | 10 +--
 lib/class/plugin.class.php                    |  8 +-
 lib/class/podcast.class.php                   |  4 +-
 lib/class/podcast_episode.class.php           |  4 +-
 lib/class/preference.class.php                | 18 ++--
 lib/class/query.class.php                     | 38 ++++----
 lib/class/random.class.php                    |  2 +-
 lib/class/registration.class.php              |  4 +-
 lib/class/scrobbler.class.php                 |  8 +-
 lib/class/session.class.php                   |  2 +-
 lib/class/shoutbox.class.php                  | 10 +--
 lib/class/song.class.php                      | 22 ++---
 lib/class/stats.class.php                     |  8 +-
 lib/class/stream.class.php                    |  6 +-
 lib/class/subsonic_api.class.php              |  6 +-
 lib/class/tag.class.php                       | 20 ++---
 lib/class/tmp_playlist.class.php              |  2 +-
 lib/class/tvshow.class.php                    |  4 +-
 lib/class/tvshow_season.class.php             |  4 +-
 lib/class/update.class.php                    | 10 +--
 lib/class/upnp_api.class.php                  | 10 +--
 lib/class/user.class.php                      | 36 ++++----
 lib/class/useractivity.class.php              |  2 +-
 lib/class/vainfo.class.php                    | 26 +++---
 lib/class/video.class.php                     | 10 +--
 lib/class/wanted.class.php                    |  8 +-
 lib/class/waveform.class.php                  |  4 +-
 lib/class/xml_data.class.php                  | 30 +++----
 lib/debug.lib.php                             |  8 +-
 lib/general.lib.php                           | 22 ++---
 lib/init-tiny.php                             |  2 +-
 lib/init.php                                  | 10 +--
 lib/install.lib.php                           |  6 +-
 lib/login.php                                 |  4 +-
 lib/preferences.php                           | 14 +--
 lib/rating.lib.php                            |  4 +-
 lib/ui.lib.php                                | 16 ++--
 localplay.php                                 | 16 ++--
 logout.php                                    |  2 +-
 lostpassword.php                              |  4 +-
 modules/catalog/local/local.catalog.php       | 30 +++----
 modules/catalog/remote/remote.catalog.php     |  6 +-
 modules/catalog/subsonic/subsonic.catalog.php |  4 +-
 modules/catalog/subsonic/subsonic.client.php  |  2 -
 modules/localplay/httpq/httpq.controller.php  | 10 +--
 modules/localplay/httpq/httpqplayer.class.php | 40 ++++-----
 modules/localplay/mpd/mpd.class.php           | 45 +++++-----
 modules/localplay/mpd/mpd.controller.php      |  8 +-
 modules/localplay/upnp/upnp.controller.php    |  2 +-
 modules/localplay/upnp/upnpdevice.php         | 22 ++---
 modules/localplay/upnp/upnpplayer.class.php   | 16 ++--
 modules/localplay/upnp/upnpplaylist.php       |  2 -
 modules/localplay/vlc/vlc.controller.php      | 16 ++--
 modules/localplay/vlc/vlcplayer.class.php     | 38 ++++----
 modules/localplay/xbmc/xbmc.controller.php    |  6 +-
 modules/plugins/7Digital/7Digital.plugin.php  | 10 +--
 modules/plugins/Amazon/Amazon.plugin.php      | 26 +++---
 modules/plugins/Bitly/Bitly.plugin.php        | 10 +--
 .../CatalogFavorites.plugin.php               | 12 +--
 .../ChartLyrics/ChartLyrics.plugin.php        |  2 +-
 modules/plugins/Discogs/Discogs.plugin.php    |  8 +-
 modules/plugins/Flattr/Flattr.plugin.php      |  4 +-
 modules/plugins/Flickr/Flickr.plugin.php      |  6 +-
 .../FriendsTimeline.plugin.php                |  2 +-
 .../GoogleAnalytics.plugin.php                |  4 +-
 .../plugins/GoogleMaps/GoogleMaps.plugin.php  |  2 +-
 modules/plugins/Gravatar/Gravatar.plugin.php  |  2 +-
 .../plugins/Headphones/Headphones.plugin.php  | 10 +--
 modules/plugins/Lastfm/Lastfm.plugin.php      | 36 ++++----
 .../plugins/Libravatar/Libravatar.plugin.php  |  2 +-
 modules/plugins/Librefm/Librefm.plugin.php    | 36 ++++----
 .../plugins/LyricWiki/LyricWiki.plugin.php    |  2 +-
 .../MusicBrainz/MusicBrainz.plugin.php        |  2 +-
 modules/plugins/Omdb/Omdb.plugin.php          |  2 +-
 modules/plugins/Paypal/Paypal.plugin.php      |  6 +-
 modules/plugins/Piwik/Piwik.plugin.php        |  8 +-
 modules/plugins/RSSView/RSSView.plugin.php    |  6 +-
 .../plugins/ShoutHome/ShoutHome.plugin.php    |  2 +-
 .../StreamBandwidth.plugin.php                |  4 +-
 .../plugins/StreamHits/StreamHits.plugin.php  |  4 +-
 .../plugins/StreamTime/StreamTime.plugin.php  |  4 +-
 .../plugins/TheAudioDb/TheAudioDb.plugin.php  |  6 +-
 modules/plugins/Tmdb/Tmdb.plugin.php          |  6 +-
 modules/plugins/Tvdb/Tvdb.plugin.php          | 10 +--
 modules/plugins/Yourls/Yourls.plugin.php      | 12 +--
 play/index.php                                | 28 +++---
 playlist.php                                  |  4 +-
 plex/index.php                                |  2 +-
 plex/web/index.php                            | 20 ++---
 plex/web/login.php                            |  2 +-
 podcast.php                                   |  4 +-
 preferences.php                               | 20 ++---
 pvmsg.php                                     |  2 +-
 radio.php                                     |  4 +-
 register.php                                  | 12 +--
 rest/index.php                                | 12 +--
 rss.php                                       |  2 +-
 scripts/hooks/pre-commit                      |  8 +-
 scripts/tests/codestyle.sh                    |  8 +-
 search.php                                    |  2 +-
 server/ajax.server.php                        |  8 +-
 server/browse.ajax.php                        |  2 +-
 server/democratic.ajax.php                    |  4 +-
 server/edit.server.php                        |  4 +-
 server/fs.ajax.php                            |  2 +-
 server/index.ajax.php                         |  6 +-
 server/localplay.ajax.php                     | 26 +++---
 server/playlist.ajax.php                      |  8 +-
 server/podcast.ajax.php                       |  2 +-
 server/random.ajax.php                        |  2 +-
 server/refresh_reordered.server.php           |  2 +-
 server/song.ajax.php                          |  8 +-
 server/sse.server.php                         |  2 +-
 server/stream.ajax.php                        |  6 +-
 server/tag.ajax.php                           |  4 +-
 server/xml.server.php                         | 12 +--
 share.php                                     |  2 +-
 shout.php                                     |  6 +-
 smartplaylist.php                             |  2 +-
 stats.php                                     |  2 +-
 stream.php                                    | 10 +--
 templates/browse_filters.inc.php              | 30 +++----
 templates/error_page.inc.php                  |  2 +-
 templates/footer.inc.php                      |  2 +-
 templates/header.inc.php                      |  6 +-
 templates/list_header.inc.php                 | 18 ++--
 templates/rightbar.inc.php                    | 12 +--
 templates/show_add_live_stream.inc.php        |  2 +-
 templates/show_add_shout.inc.php              |  4 +-
 templates/show_album.inc.php                  | 26 +++---
 templates/show_album_group_disks.inc.php      |  4 +-
 templates/show_album_row.inc.php              |  8 +-
 templates/show_albums.inc.php                 | 16 ++--
 templates/show_artist.inc.php                 | 30 +++----
 templates/show_artist_row.inc.php             | 14 +--
 templates/show_artists.inc.php                |  8 +-
 templates/show_big_art.inc.php                |  2 +-
 templates/show_broadcast_row.inc.php          |  4 +-
 templates/show_broadcasts.inc.php             |  6 +-
 templates/show_catalog_row.inc.php            |  2 +-
 templates/show_channel_row.inc.php            |  6 +-
 templates/show_channels.inc.php               | 10 +--
 templates/show_democratic.inc.php             | 16 ++--
 templates/show_democratic_playlist.inc.php    | 14 +--
 templates/show_disabled_songs.inc.php         |  2 +-
 templates/show_duplicates.inc.php             |  2 +-
 templates/show_dynamic.inc.php                |  8 +-
 templates/show_edit_access.inc.php            |  2 +-
 templates/show_edit_catalog.inc.php           |  2 +-
 templates/show_edit_song_row.inc.php          |  2 +-
 templates/show_html5_player.inc.php           |  4 +-
 templates/show_install_check.inc.php          |  2 +-
 templates/show_ip_history.inc.php             |  2 +-
 templates/show_label.inc.php                  |  4 +-
 templates/show_label_row.inc.php              |  2 +-
 templates/show_labels.inc.php                 | 10 +--
 templates/show_live_stream.inc.php            |  6 +-
 templates/show_live_stream_row.inc.php        |  8 +-
 templates/show_live_streams.inc.php           | 10 +--
 templates/show_localplay_control.inc.php      | 10 +--
 templates/show_localplay_instances.inc.php    |  2 +-
 templates/show_localplay_playlist.inc.php     |  4 +-
 templates/show_localplay_status.inc.php       |  8 +-
 templates/show_login_form.inc.php             |  2 +-
 templates/show_lostpassword_form.inc.php      |  2 +-
 templates/show_lyrics.inc.php                 |  2 +-
 templates/show_manage_catalogs.inc.php        |  4 +-
 templates/show_manage_democratic.inc.php      |  2 +-
 templates/show_missing_album.inc.php          |  2 +-
 templates/show_now_playing_row.inc.php        |  4 +-
 templates/show_now_playing_video_row.inc.php  |  2 +-
 templates/show_partial_clips.inc.php          |  2 +-
 templates/show_partial_movies.inc.php         |  2 +-
 .../show_partial_personal_videos.inc.php      |  2 +-
 .../show_partial_tvshow_episodes.inc.php      |  6 +-
 templates/show_playlist.inc.php               | 38 ++++----
 templates/show_playlist_media_row.inc.php     | 14 +--
 templates/show_playlist_row.inc.php           |  8 +-
 templates/show_playlists.inc.php              | 14 +--
 templates/show_playtype_switch.inc.php        |  2 +-
 templates/show_podcast.inc.php                | 18 ++--
 templates/show_podcast_episode.inc.php        | 18 ++--
 templates/show_podcast_episode_row.inc.php    | 12 +--
 templates/show_podcast_episodes.inc.php       |  8 +-
 templates/show_podcast_row.inc.php            | 14 +--
 templates/show_podcasts.inc.php               |  8 +-
 templates/show_preference_admin.inc.php       |  2 +-
 templates/show_preference_box.inc.php         |  2 +-
 templates/show_preferences.inc.php            |  4 +-
 templates/show_pvmsgs.inc.php                 | 16 ++--
 templates/show_random.inc.php                 |  2 +-
 templates/show_random_albums.inc.php          |  8 +-
 templates/show_random_videos.inc.php          |  6 +-
 templates/show_recently_played.inc.php        |  4 +-
 templates/show_recommended_artists.inc.php    |  6 +-
 .../show_registration_confirmation.inc.php    |  2 +-
 templates/show_search.inc.php                 |  4 +-
 templates/show_search_options.inc.php         |  4 +-
 templates/show_search_row.inc.php             | 12 +--
 templates/show_searches.inc.php               |  8 +-
 templates/show_shared_objects.inc.php         | 20 ++---
 templates/show_song.inc.php                   | 30 +++----
 templates/show_song_preview_row.inc.php       |  6 +-
 templates/show_song_row.inc.php               | 18 ++--
 templates/show_tvshow.inc.php                 | 12 +--
 templates/show_tvshow_row.inc.php             | 10 +--
 templates/show_tvshow_season.inc.php          | 12 +--
 templates/show_tvshow_season_row.inc.php      | 10 +--
 templates/show_tvshow_seasons.inc.php         | 12 +--
 templates/show_tvshows.inc.php                |  8 +-
 templates/show_update_items.inc.php           |  2 +-
 templates/show_user.inc.php                   | 10 +--
 templates/show_user_activate.inc.php          |  2 +-
 templates/show_user_preferences.inc.php       |  2 +-
 templates/show_user_registration.inc.php      |  2 +-
 templates/show_users.inc.php                  | 16 ++--
 templates/show_video.inc.php                  | 22 ++---
 templates/show_video_row.inc.php              | 12 +--
 templates/show_videos.inc.php                 | 20 ++---
 templates/show_wanted_albums.inc.php          |  8 +-
 templates/sidebar_admin.inc.php               |  2 +-
 templates/sidebar_home.inc.php                | 12 +--
 templates/sidebar_localplay.inc.php           | 10 +--
 tvshows.php                                   |  4 +-
 update.php                                    |  2 +-
 upnp/MediaServerServiceDesc.php               |  4 +-
 upnp/cm-control-reply.php                     |  6 +-
 upnp/cm-event-reply.php                       |  1 -
 upnp/control-reply.php                        |  5 +-
 upnp/event-reply.php                          |  3 +-
 upnp/find.php                                 |  2 +-
 upnp/index.php                                |  2 +-
 upnp/playstatus.php                           |  2 -
 util.php                                      |  2 +-
 webdav/index.php                              |  2 +-
 283 files changed, 1332 insertions(+), 1347 deletions(-)

diff --git a/.gitignore b/.gitignore
index 96abb964..bc5253dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ web.config
 robots.txt
 php-cs-fixer.phar
 .php_cs.cache
+cs_fixer_tmp_*
diff --git a/.php_cs b/.php_cs
index a1e9ae08..c91f8f79 100644
--- a/.php_cs
+++ b/.php_cs
@@ -14,6 +14,8 @@ $finder = Symfony\CS\Finder\DefaultFinder::create()
 ;
 
 return Symfony\CS\Config\Config::create()
+    ->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
+    ->fixers(array('-psr0'))
     ->finder($finder)
     ->setUsingCache(true)
 ;
diff --git a/admin/access.php b/admin/access.php
index ee661493..e2076dfa 100644
--- a/admin/access.php
+++ b/admin/access.php
@@ -22,7 +22,7 @@
 
 require_once '../lib/init.php';
 
-if (!Access::check('interface','100')) {
+if (!Access::check('interface', '100')) {
     UI::access_denied();
     exit();
 }
@@ -37,7 +37,7 @@ switch ($_REQUEST['action']) {
         }
         Access::delete($_REQUEST['access_id']);
         $url = AmpConfig::get('web_path') . '/admin/access.php';
-        show_confirmation(T_('Deleted'), T_('Your Access List Entry has been removed'),$url);
+        show_confirmation(T_('Deleted'), T_('Your Access List Entry has been removed'), $url);
     break;
     case 'show_delete_record':
         if (AmpConfig::get('demo_mode')) {
@@ -45,12 +45,12 @@ switch ($_REQUEST['action']) {
         }
         $access = new Access($_GET['access_id']);
         show_confirmation(T_('Deletion Request'), T_('Are you sure you want to permanently delete') . ' ' . $access->name,
-                'admin/access.php?action=delete_record&amp;access_id=' . $access->id,1,'delete_access');
+                'admin/access.php?action=delete_record&amp;access_id=' . $access->id, 1, 'delete_access');
     break;
     case 'add_host':
 
         // Make sure we've got a valid form submission
-        if (!Core::form_verify('add_acl','post')) {
+        if (!Core::form_verify('add_acl', 'post')) {
             UI::access_denied();
             exit;
         }
@@ -71,7 +71,7 @@ switch ($_REQUEST['action']) {
 
         if (!AmpError::occurred()) {
             $url = AmpConfig::get('web_path') . '/admin/access.php';
-            show_confirmation(T_('Added'), T_('Your new Access Control List(s) have been created'),$url);
+            show_confirmation(T_('Added'), T_('Your new Access Control List(s) have been created'), $url);
         } else {
             $action = 'show_add_' . $_POST['type'];
             require_once AmpConfig::get('prefix') . UI::find_template('show_add_access.inc.php');
diff --git a/admin/catalog.php b/admin/catalog.php
index ab3586c4..1127594c 100644
--- a/admin/catalog.php
+++ b/admin/catalog.php
@@ -23,7 +23,7 @@
 require_once '../lib/init.php';
 require_once AmpConfig::get('prefix') . '/modules/catalog/local/local.catalog.php';
 
-if (!Access::check('interface','100')) {
+if (!Access::check('interface', '100')) {
     UI::access_denied();
     exit;
 }
@@ -109,7 +109,7 @@ switch ($_REQUEST['action']) {
     break;
     case 'show_delete_catalog':
         $next_url = AmpConfig::get('web_path') . '/admin/catalog.php?action=delete_catalog&catalogs[]=' . implode(',', $catalogs);
-        show_confirmation(T_('Catalog Delete'), T_('Confirm Deletion Request'),$next_url,1,'delete_catalog');
+        show_confirmation(T_('Catalog Delete'), T_('Confirm Deletion Request'), $next_url, 1, 'delete_catalog');
     break;
     case 'enable_disabled':
         if (AmpConfig::get('demo_mode')) {
@@ -128,7 +128,7 @@ switch ($_REQUEST['action']) {
         }
         $url      = AmpConfig::get('web_path') . '/admin/catalog.php';
         $title    = count($songs) . nT_(' Disabled Song Processed', ' Disabled Songs Processed', count($songs));
-        show_confirmation($title,$body,$url);
+        show_confirmation($title, $body, $url);
     break;
     case 'clean_all_catalogs':
         catalog_worker('clean_all_catalogs');
@@ -150,7 +150,7 @@ switch ($_REQUEST['action']) {
         $url       = AmpConfig::get('web_path') . '/admin/catalog.php';
         $title     = T_('Catalog Updated');
         $body      = '';
-        show_confirmation($title,$body,$url);
+        show_confirmation($title, $body, $url);
     break;
     case 'update_from':
         if (AmpConfig::get('demo_mode')) {
@@ -176,7 +176,7 @@ switch ($_REQUEST['action']) {
             AmpError::add('general', T_('Error: Name not specified'));
         }
 
-        if (!Core::form_verify('add_catalog','post')) {
+        if (!Core::form_verify('add_catalog', 'post')) {
             UI::access_denied();
             exit;
         }
@@ -217,7 +217,7 @@ switch ($_REQUEST['action']) {
             break;
         }
         Stream::clear_now_playing();
-        show_confirmation(T_('Now Playing Cleared'), T_('All now playing data has been cleared'),AmpConfig::get('web_path') . '/admin/catalog.php');
+        show_confirmation(T_('Now Playing Cleared'), T_('All now playing data has been cleared'), AmpConfig::get('web_path') . '/admin/catalog.php');
     break;
     case 'show_disabled':
         /* Stop the demo hippies */
@@ -241,7 +241,7 @@ switch ($_REQUEST['action']) {
 
         $catalog = Catalog::create_from_id($_REQUEST['catalog_id']);
         $nexturl = AmpConfig::get('web_path') . '/admin/catalog.php?action=delete_catalog&amp;catalog_id=' . scrub_out($_REQUEST['catalog_id']);
-        show_confirmation(T_('Delete Catalog'), T_('Do you really want to delete this catalog?') . " -- $catalog->name ($catalog->path)",$nexturl,1);
+        show_confirmation(T_('Delete Catalog'), T_('Do you really want to delete this catalog?') . " -- $catalog->name ($catalog->path)", $nexturl, 1);
     break;
     case 'show_customize_catalog':
         $catalog = Catalog::create_from_id($_REQUEST['catalog_id']);
diff --git a/admin/duplicates.php b/admin/duplicates.php
index d38e67d1..2dcda13b 100644
--- a/admin/duplicates.php
+++ b/admin/duplicates.php
@@ -22,7 +22,7 @@
 
 require_once '../lib/init.php';
 
-if (!Access::check('interface','100')) {
+if (!Access::check('interface', '100')) {
     UI::access_denied();
     exit;
 }
diff --git a/admin/export.php b/admin/export.php
index 9080c85d..4d940cd5 100644
--- a/admin/export.php
+++ b/admin/export.php
@@ -22,7 +22,7 @@
 
 require_once '../lib/init.php';
 
-if (!Access::check('interface','100')) {
+if (!Access::check('interface', '100')) {
     UI::access_denied();
     exit;
 }
@@ -47,7 +47,7 @@ switch ($_REQUEST['action']) {
         header("Content-Transfer-Encoding: binary");
         header("Cache-control: public");
 
-        $date = date("d/m/Y",time());
+        $date = date("d/m/Y", time());
 
         switch ($_REQUEST['export_format']) {
             case 'itunes':
diff --git a/admin/index.php b/admin/index.php
index 42e5ea15..b121d651 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -22,7 +22,7 @@
 
 require_once '../lib/init.php';
 
-if (!Access::check('interface',100)) {
+if (!Access::check('interface', 100)) {
     UI::access_denied();
     exit();
 }
diff --git a/admin/license.php b/admin/license.php
index fa888b0b..398c8e0f 100644
--- a/admin/license.php
+++ b/admin/license.php
@@ -22,7 +22,7 @@
 
 require_once '../lib/init.php';
 
-if (!Access::check('interface','100')) {
+if (!Access::check('interface', '100')) {
     UI::access_denied();
     exit;
 }
@@ -41,7 +41,7 @@ switch ($_REQUEST['action']) {
             License::create($_POST);
             $text = T_('License Created');
         }
-        show_confirmation($text,'',AmpConfig::get('web_path') . '/admin/license.php');
+        show_confirmation($text, '', AmpConfig::get('web_path') . '/admin/license.php');
     break;
     case 'show_edit':
         $license = new License($_REQUEST['license_id']);
@@ -50,7 +50,7 @@ switch ($_REQUEST['action']) {
         break;
     case 'delete':
         License::delete($_REQUEST['license_id']);
-        show_confirmation(T_('License Deleted'),'',AmpConfig::get('web_path') . '/admin/license.php');
+        show_confirmation(T_('License Deleted'), '', AmpConfig::get('web_path') . '/admin/license.php');
     break;
     default:
         $browse = new Browse();
diff --git a/admin/mail.php b/admin/mail.php
index 46ac1158..7ade04ec 100644
--- a/admin/mail.php
+++ b/admin/mail.php
@@ -22,7 +22,7 @@
 
 require_once '../lib/init.php';
 
-if (!Access::check('interface','75')) {
+if (!Access::check('interface', '75')) {
     UI::access_denied();
     exit();
 }
@@ -67,7 +67,7 @@ switch ($_REQUEST['action']) {
             $body      = T_('Your E-mail was not sent.');
         }
         $url = AmpConfig::get('web_path') . '/admin/mail.php';
-        show_confirmation($title,$body,$url);
+        show_confirmation($title, $body, $url);
 
     break;
     default:
diff --git a/admin/modules.php b/admin/modules.php
index 3e0edcbe..dfe540d0 100644
--- a/admin/modules.php
+++ b/admin/modules.php
@@ -44,15 +44,15 @@ switch ($_REQUEST['action']) {
 
         // Go ahead and enable Localplay (Admin->System) as we assume they want to do that
         // if they are enabling this
-        Preference::update('allow_localplay_playback','-1','1');
-        Preference::update('localplay_level',$GLOBALS['user']->id,'100');
-        Preference::update('localplay_controller',$GLOBALS['user']->id,$localplay->type);
+        Preference::update('allow_localplay_playback', '-1', '1');
+        Preference::update('localplay_level', $GLOBALS['user']->id, '100');
+        Preference::update('localplay_controller', $GLOBALS['user']->id, $localplay->type);
 
         /* Show Confirmation */
         $url    = AmpConfig::get('web_path') . '/admin/modules.php?action=show_localplay';
         $title  = T_('localplay enabled');
         $body   = '';
-        show_confirmation($title ,$body, $url);
+        show_confirmation($title, $body, $url);
     break;
     case 'install_catalog_type':
         $type    = (string) scrub_in($_REQUEST['type']);
@@ -69,21 +69,21 @@ switch ($_REQUEST['action']) {
         $url    = AmpConfig::get('web_path') . '/admin/modules.php?action=show_catalog_types';
         $title  = T_('Module enabled');
         $body   = '';
-        show_confirmation($title ,$body, $url);
+        show_confirmation($title, $body, $url);
     break;
     case 'confirm_uninstall_localplay':
         $type  = (string) scrub_in($_REQUEST['type']);
         $url   = AmpConfig::get('web_path') . '/admin/modules.php?action=uninstall_localplay&amp;type=' . $type;
         $title = T_('Are you sure you want to disable this module?');
         $body  = '';
-        show_confirmation($title,$body,$url,1);
+        show_confirmation($title, $body, $url, 1);
     break;
     case 'confirm_uninstall_catalog_type':
         $type  = (string) scrub_in($_REQUEST['type']);
         $url   = AmpConfig::get('web_path') . '/admin/modules.php?action=uninstall_catalog_type&amp;type=' . $type;
         $title = T_('Are you sure you want to disable this module?');
         $body  = '';
-        show_confirmation($title,$body,$url,1);
+        show_confirmation($title, $body, $url, 1);
     break;
     case 'uninstall_localplay':
         $type = (string) scrub_in($_REQUEST['type']);
@@ -95,7 +95,7 @@ switch ($_REQUEST['action']) {
         $url    = AmpConfig::get('web_path') . '/admin/modules.php?action=show_localplay';
         $title  = T_('Module disabled');
         $body   = '';
-        show_confirmation($title,$body,$url);
+        show_confirmation($title, $body, $url);
     break;
     case 'uninstall_catalog_type':
         $type = (string) scrub_in($_REQUEST['type']);
@@ -117,17 +117,17 @@ switch ($_REQUEST['action']) {
     case 'install_plugin':
         /* Verify that this plugin exists */
         $plugins = Plugin::get_plugins();
-        if (!array_key_exists($_REQUEST['plugin'],$plugins)) {
-            debug_event('plugins','Error: Invalid Plugin: ' . $_REQUEST['plugin'] . ' selected','1');
+        if (!array_key_exists($_REQUEST['plugin'], $plugins)) {
+            debug_event('plugins', 'Error: Invalid Plugin: ' . $_REQUEST['plugin'] . ' selected', '1');
             break;
         }
         $plugin = new Plugin($_REQUEST['plugin']);
         if (!$plugin->install()) {
-            debug_event('plugins','Error: Plugin Install Failed, ' . $_REQUEST['plugin'],'1');
+            debug_event('plugins', 'Error: Plugin Install Failed, ' . $_REQUEST['plugin'], '1');
             $url    = AmpConfig::get('web_path') . '/admin/modules.php?action=show_plugins';
             $title  = T_('Unable to Install Plugin');
             $body   = '';
-            show_confirmation($title,$body,$url);
+            show_confirmation($title, $body, $url);
             break;
         }
 
@@ -138,20 +138,20 @@ switch ($_REQUEST['action']) {
         $url      = AmpConfig::get('web_path') . '/admin/modules.php?action=show_plugins';
         $title    = T_('Plugin enabled');
         $body     = '';
-        show_confirmation($title,$body,$url);
+        show_confirmation($title, $body, $url);
     break;
     case 'confirm_uninstall_plugin':
         $plugin   = scrub_in($_REQUEST['plugin']);
         $url      = AmpConfig::get('web_path') . '/admin/modules.php?action=uninstall_plugin&amp;plugin=' . $plugin;
         $title    = T_('Are you sure you want to disable this plugin?');
         $body     = '';
-        show_confirmation($title,$body,$url,1);
+        show_confirmation($title, $body, $url, 1);
     break;
     case 'uninstall_plugin':
         /* Verify that this plugin exists */
         $plugins = Plugin::get_plugins();
-        if (!array_key_exists($_REQUEST['plugin'],$plugins)) {
-            debug_event('plugins','Error: Invalid Plugin: ' . $_REQUEST['plugin'] . ' selected','1');
+        if (!array_key_exists($_REQUEST['plugin'], $plugins)) {
+            debug_event('plugins', 'Error: Invalid Plugin: ' . $_REQUEST['plugin'] . ' selected', '1');
             break;
         }
         $plugin = new Plugin($_REQUEST['plugin']);
@@ -164,13 +164,13 @@ switch ($_REQUEST['action']) {
         $url    = AmpConfig::get('web_path') . '/admin/modules.php?action=show_plugins';
         $title  = T_('Plugin disabled');
         $body   = '';
-        show_confirmation($title,$body,$url);
+        show_confirmation($title, $body, $url);
     break;
     case 'upgrade_plugin':
         /* Verify that this plugin exists */
         $plugins = Plugin::get_plugins();
-        if (!array_key_exists($_REQUEST['plugin'],$plugins)) {
-            debug_event('plugins','Error: Invalid Plugin: ' . $_REQUEST['plugin'] . ' selected','1');
+        if (!array_key_exists($_REQUEST['plugin'], $plugins)) {
+            debug_event('plugins', 'Error: Invalid Plugin: ' . $_REQUEST['plugin'] . ' selected', '1');
             break;
         }
         $plugin = new Plugin($_REQUEST['plugin']);
diff --git a/admin/shout.php b/admin/shout.php
index e89b7e23..a5e717fa 100644
--- a/admin/shout.php
+++ b/admin/shout.php
@@ -22,7 +22,7 @@
 
 require_once '../lib/init.php';
 
-if (!Access::check('interface','100')) {
+if (!Access::check('interface', '100')) {
     UI::access_denied();
     exit;
 }
@@ -36,11 +36,11 @@ switch ($_REQUEST['action']) {
         if ($shout->id) {
             $shout->update($_POST);
         }
-        show_confirmation(T_('Shoutbox Post Updated'),'',AmpConfig::get('web_path') . '/admin/shout.php');
+        show_confirmation(T_('Shoutbox Post Updated'), '', AmpConfig::get('web_path') . '/admin/shout.php');
     break;
     case 'show_edit':
         $shout  = new Shoutbox($_REQUEST['shout_id']);
-        $object = Shoutbox::get_object($shout->object_type,$shout->object_id);
+        $object = Shoutbox::get_object($shout->object_type, $shout->object_id);
         $object->format();
         $client = new User($shout->user);
         $client->format();
@@ -48,7 +48,7 @@ switch ($_REQUEST['action']) {
         break;
     case 'delete':
         Shoutbox::delete($_REQUEST['shout_id']);
-        show_confirmation(T_('Shoutbox Post Deleted'),'',AmpConfig::get('web_path') . '/admin/shout.php');
+        show_confirmation(T_('Shoutbox Post Deleted'), '', AmpConfig::get('web_path') . '/admin/shout.php');
     break;
     default:
         $browse = new Browse();
diff --git a/admin/system.php b/admin/system.php
index 18caf650..7d213ee6 100644
--- a/admin/system.php
+++ b/admin/system.php
@@ -22,7 +22,7 @@
 
 require_once '../lib/init.php';
 
-if (!Access::check('interface',100) or AmpConfig::get('demo_mode')) {
+if (!Access::check('interface', 100) or AmpConfig::get('demo_mode')) {
     UI::access_denied();
     exit();
 }
@@ -39,7 +39,7 @@ switch ($_REQUEST['action']) {
         $current = parse_ini_file(AmpConfig::get('prefix') . '/config/ampache.cfg.php');
         $final   = generate_config($current);
         $browser = new Horde_Browser();
-        $browser->downloadHeaders('ampache.cfg.php', 'text/plain',false,filesize(AmpConfig::get('prefix') . '/config/ampache.cfg.php.dist'));
+        $browser->downloadHeaders('ampache.cfg.php', 'text/plain', false, filesize(AmpConfig::get('prefix') . '/config/ampache.cfg.php.dist'));
         echo $final;
         exit;
     case 'write_config':
diff --git a/admin/users.php b/admin/users.php
index d54b6ec7..b5a7aa05 100644
--- a/admin/users.php
+++ b/admin/users.php
@@ -22,7 +22,7 @@
 
 require_once '../lib/init.php';
 
-if (!Access::check('interface','100')) {
+if (!Access::check('interface', '100')) {
     UI::access_denied();
     exit();
 }
@@ -36,7 +36,7 @@ switch ($_REQUEST['action']) {
             break;
         }
 
-        if (!Core::form_verify('edit_user','post')) {
+        if (!Core::form_verify('edit_user', 'post')) {
             UI::access_denied();
             exit;
         }
@@ -118,7 +118,7 @@ switch ($_REQUEST['action']) {
             break;
         }
 
-        if (!Core::form_verify('add_user','post')) {
+        if (!Core::form_verify('add_user', 'post')) {
             UI::access_denied();
             exit;
         }
@@ -174,7 +174,7 @@ switch ($_REQUEST['action']) {
         }
 
         /* HINT: %1 Username, %2 Access num */
-        show_confirmation(T_('New User Added'),sprintf(T_('%1$s has been created with an access level of %2$s'), $username, $access), AmpConfig::get('web_path') . '/admin/users.php');
+        show_confirmation(T_('New User Added'), sprintf(T_('%1$s has been created with an access level of %2$s'), $username, $access), AmpConfig::get('web_path') . '/admin/users.php');
     break;
     case 'enable':
         $client = new User($_REQUEST['user_id']);
@@ -182,12 +182,12 @@ switch ($_REQUEST['action']) {
         if (!AmpConfig::get('user_no_email_confirm')) {
             Registration::send_account_enabled($client->username, $client->fullname, $client->email);
         }
-        show_confirmation(T_('User Enabled'),$client->fullname . ' (' . $client->username . ')', AmpConfig::get('web_path') . '/admin/users.php');
+        show_confirmation(T_('User Enabled'), $client->fullname . ' (' . $client->username . ')', AmpConfig::get('web_path') . '/admin/users.php');
     break;
     case 'disable':
         $client = new User($_REQUEST['user_id']);
         if ($client->disable()) {
-            show_confirmation(T_('User Disabled'),$client->fullname . ' (' . $client->username . ')', AmpConfig::get('web_path') . '/admin/users.php');
+            show_confirmation(T_('User Disabled'), $client->fullname . ' (' . $client->username . ')', AmpConfig::get('web_path') . '/admin/users.php');
         } else {
             show_confirmation(T_('Error'), T_('Unable to Disabled last Administrator'), AmpConfig::get('web_path') . '/admin/users.php');
         }
@@ -221,7 +221,7 @@ switch ($_REQUEST['action']) {
         $client = new User($_REQUEST['user_id']);
         show_confirmation(T_('Deletion Request'),
             sprintf(T_('Are you sure you want to permanently delete %s?'), $client->fullname),
-            AmpConfig::get('web_path') . "/admin/users.php?action=confirm_delete&amp;user_id=" . $_REQUEST['user_id'],1,'delete_user');
+            AmpConfig::get('web_path') . "/admin/users.php?action=confirm_delete&amp;user_id=" . $_REQUEST['user_id'], 1, 'delete_user');
     break;
     case 'show_delete_avatar':
         $user_id = $_REQUEST['user_id'];
@@ -234,7 +234,7 @@ switch ($_REQUEST['action']) {
             break;
         }
 
-        if (!Core::form_verify('delete_avatar','post')) {
+        if (!Core::form_verify('delete_avatar', 'post')) {
             UI::access_denied();
             exit;
         }
@@ -256,7 +256,7 @@ switch ($_REQUEST['action']) {
             break;
         }
 
-        if (!Core::form_verify('generate_apikey','post')) {
+        if (!Core::form_verify('generate_apikey', 'post')) {
             UI::access_denied();
             exit;
         }
@@ -273,7 +273,7 @@ switch ($_REQUEST['action']) {
         $working_user    = new User($_REQUEST['user_id']);
 
         if (!isset($_REQUEST['all'])) {
-            $history    = $working_user->get_ip_history(0,1);
+            $history    = $working_user->get_ip_history(0, 1);
         } else {
             $history    = $working_user->get_ip_history();
         }
@@ -295,7 +295,7 @@ switch ($_REQUEST['action']) {
         $browse->reset_filters();
         $browse->set_type('user');
         $browse->set_simple_browse(true);
-        $browse->set_sort('name','ASC');
+        $browse->set_sort('name', 'ASC');
         $user_ids = $browse->get_objects();
         $browse->show_objects($user_ids);
         $browse->store();
diff --git a/albums.php b/albums.php
index a6dc35c6..3a345527 100644
--- a/albums.php
+++ b/albums.php
@@ -60,7 +60,7 @@ switch ($_REQUEST['action']) {
     break;
     case 'update_from_tags':
         // Make sure they are a 'power' user at least
-        if (!Access::check('interface','75')) {
+        if (!Access::check('interface', '75')) {
             UI::access_denied();
             exit;
         }
@@ -73,7 +73,7 @@ switch ($_REQUEST['action']) {
     case 'set_track_numbers':
         debug_event('albums', 'Set track numbers called.', '5');
 
-        if (!Access::check('interface','75')) {
+        if (!Access::check('interface', '75')) {
             UI::access_denied();
             exit;
         }
diff --git a/artists.php b/artists.php
index 3726e9ad..0c546d72 100644
--- a/artists.php
+++ b/artists.php
@@ -94,8 +94,8 @@ switch ($_REQUEST['action']) {
         }
         /* Enclose this in the purty box! */
         require AmpConfig::get('prefix') . UI::find_template('show_box_top.inc.php');
-        show_alphabet_list('artists','artists.php',$match);
-        show_alphabet_form($chr, T_('Show Artists starting with'),"artists.php?action=match");
+        show_alphabet_list('artists', 'artists.php', $match);
+        show_alphabet_form($chr, T_('Show Artists starting with'), "artists.php?action=match");
         require AmpConfig::get('prefix') . UI::find_template('show_box_bottom.inc.php');
 
         if ($match === "Browse") {
diff --git a/arts.php b/arts.php
index a638527d..b9f41712 100644
--- a/arts.php
+++ b/arts.php
@@ -64,7 +64,7 @@ switch ($_REQUEST['action']) {
         // If we got something back insert it
         if ($image_data) {
             $art = new Art($object_id, $object_type);
-            $art->insert($image_data,$_FILES['file']['type']);
+            $art->insert($image_data, $_FILES['file']['type']);
             show_confirmation(T_('Art Inserted'), '', $burl);
         }
         // Else it failed
@@ -90,7 +90,7 @@ switch ($_REQUEST['action']) {
             $image_data     = Art::get_from_source($upload, $object_type);
 
             if ($image_data) {
-                $art->insert($image_data,$upload['0']['mime']);
+                $art->insert($image_data, $upload['0']['mime']);
                 show_confirmation(T_('Art Inserted'), '', $burl);
                 break;
             } // if image data
diff --git a/batch.php b/batch.php
index 9940d641..b30ae637 100644
--- a/batch.php
+++ b/batch.php
@@ -96,7 +96,7 @@ if (Core::is_playable_item($_REQUEST['action'])) {
                     break;
                 } // switch on type
             } // foreach media_id
-            $name = 'Batch-' . date("dmY",time());
+            $name = 'Batch-' . date("dmY", time());
         default:
             // Rien a faire
         break;
@@ -118,6 +118,6 @@ session_write_close();
 $song_files = get_media_files($media_ids);
 if (is_array($song_files['0'])) {
     set_memory_limit($song_files['1']+32);
-    send_zip($name,$song_files['0']);
+    send_zip($name, $song_files['0']);
 }
 exit;
diff --git a/browse.php b/browse.php
index d818997f..c12d8fee 100644
--- a/browse.php
+++ b/browse.php
@@ -73,17 +73,17 @@ switch ($_REQUEST['action']) {
     case 'file':
     break;
     case 'album':
-        $browse->set_filter('catalog',$_SESSION['catalog']);
+        $browse->set_filter('catalog', $_SESSION['catalog']);
         if (AmpConfig::get('catalog_disable')) {
             $browse->set_filter('catalog_enabled', '1');
         }
-        $browse->set_sort('name','ASC');
+        $browse->set_sort('name', 'ASC');
         $browse->update_browse_from_session();  // Update current index depending on what is in session.
         $browse->show_objects();
     break;
     case 'tag':
         //FIXME: This whole thing is ugly, even though it works.
-        $browse->set_sort('count','ASC');
+        $browse->set_sort('count', 'ASC');
         // This one's a doozy
         $browse_type = isset($_REQUEST['type']) ? $_REQUEST['type'] : 'artist';
         $browse->set_simple_browse(false);
@@ -101,20 +101,20 @@ switch ($_REQUEST['action']) {
         require_once AmpConfig::get('prefix') . UI::find_template('browse_content.inc.php');
     break;
     case 'artist':
-        $browse->set_filter('catalog',$_SESSION['catalog']);
+        $browse->set_filter('catalog', $_SESSION['catalog']);
         if (AmpConfig::get('catalog_disable')) {
             $browse->set_filter('catalog_enabled', '1');
         }
-        $browse->set_sort('name','ASC');
+        $browse->set_sort('name', 'ASC');
         $browse->update_browse_from_session();
         $browse->show_objects();
     break;
     case 'song':
-        $browse->set_filter('catalog',$_SESSION['catalog']);
+        $browse->set_filter('catalog', $_SESSION['catalog']);
         if (AmpConfig::get('catalog_disable')) {
             $browse->set_filter('catalog_enabled', '1');
         }
-        $browse->set_sort('title','ASC');
+        $browse->set_sort('title', 'ASC');
         $browse->update_browse_from_session();
         $browse->show_objects();
     break;
@@ -122,7 +122,7 @@ switch ($_REQUEST['action']) {
         if (AmpConfig::get('catalog_disable')) {
             $browse->set_filter('catalog_enabled', '1');
         }
-        $browse->set_sort('name','ASC');
+        $browse->set_sort('name', 'ASC');
         $browse->update_browse_from_session();
         $browse->show_objects();
     break;
@@ -130,15 +130,15 @@ switch ($_REQUEST['action']) {
 
     break;
     case 'playlist':
-        $browse->set_sort('type','ASC');
-        $browse->set_sort('last_update','DESC');
-        $browse->set_filter('playlist_type','1');
+        $browse->set_sort('type', 'ASC');
+        $browse->set_sort('last_update', 'DESC');
+        $browse->set_filter('playlist_type', '1');
         $browse->update_browse_from_session();
         $browse->show_objects();
     break;
     case 'smartplaylist':
         $browse->set_sort('type', 'ASC');
-        $browse->set_filter('playlist_type','1');
+        $browse->set_filter('playlist_type', '1');
         $browse->update_browse_from_session();
         $browse->show_objects();
     break;
@@ -156,7 +156,7 @@ switch ($_REQUEST['action']) {
         if (AmpConfig::get('catalog_disable')) {
             $browse->set_filter('catalog_enabled', '1');
         }
-        $browse->set_sort('title','ASC');
+        $browse->set_sort('title', 'ASC');
         $browse->update_browse_from_session();
         $browse->show_objects();
     break;
@@ -164,7 +164,7 @@ switch ($_REQUEST['action']) {
         if (AmpConfig::get('catalog_disable')) {
             $browse->set_filter('catalog_enabled', '1');
         }
-        $browse->set_sort('name','ASC');
+        $browse->set_sort('name', 'ASC');
         $browse->update_browse_from_session();
         $browse->show_objects();
     break;
@@ -172,7 +172,7 @@ switch ($_REQUEST['action']) {
         if (AmpConfig::get('catalog_disable')) {
             $browse->set_filter('catalog_enabled', '1');
         }
-        $browse->set_sort('season_number','ASC');
+        $browse->set_sort('season_number', 'ASC');
         $browse->update_browse_from_session();
         $browse->show_objects();
     break;
@@ -190,12 +190,12 @@ switch ($_REQUEST['action']) {
         if (AmpConfig::get('catalog_disable')) {
             $browse->set_filter('catalog_enabled', '1');
         }
-        $browse->set_sort('name','ASC');
+        $browse->set_sort('name', 'ASC');
         $browse->update_browse_from_session();
         $browse->show_objects();
         break;
     case 'pvmsg':
-        $browse->set_sort('creation_date','DESC');
+        $browse->set_sort('creation_date', 'DESC');
         $folder = $_REQUEST['folder'];
         if ($folder === "sent") {
             $browse->set_filter('user', $GLOBALS['user']->id);
@@ -209,7 +209,7 @@ switch ($_REQUEST['action']) {
         if (AmpConfig::get('catalog_disable')) {
             $browse->set_filter('catalog_enabled', '1');
         }
-        $browse->set_sort('title','ASC');
+        $browse->set_sort('title', 'ASC');
         $browse->update_browse_from_session();
         $browse->show_objects();
         break;
@@ -217,7 +217,7 @@ switch ($_REQUEST['action']) {
         if (AmpConfig::get('catalog_disable')) {
             $browse->set_filter('catalog_enabled', '1');
         }
-        $browse->set_sort('pubdate','DESC');
+        $browse->set_sort('pubdate', 'DESC');
         $browse->update_browse_from_session();
         $browse->show_objects();
         break;
diff --git a/channel.php b/channel.php
index bae36ae0..7cc9fbad 100644
--- a/channel.php
+++ b/channel.php
@@ -48,7 +48,7 @@ switch ($_REQUEST['action']) {
             exit;
         }
 
-        if (!Core::form_verify('add_channel','post')) {
+        if (!Core::form_verify('add_channel', 'post')) {
             UI::access_denied();
             exit;
         }
diff --git a/channel/index.php b/channel/index.php
index 0d2adcb9..33889820 100644
--- a/channel/index.php
+++ b/channel/index.php
@@ -27,7 +27,7 @@
    the case.  Also this will update local statistics for songs as well.
    This is also where it decides if you need to be downsampled.
 */
-define('NO_SESSION','1');
+define('NO_SESSION', '1');
 require_once '../lib/init.php';
 ob_end_clean();
 
@@ -59,9 +59,9 @@ if ($channel->is_private) {
             Preference::init();
 
             if (AmpConfig::get('access_control')) {
-                if (!Access::check_network('stream',$GLOBALS['user']->id,'25') and
-                    !Access::check_network('network',$GLOBALS['user']->id,'25')) {
-                    debug_event('UI::access_denied', "Streaming Access Denied: " . $_SERVER['REMOTE_ADDR'] . " does not have stream level access",'3');
+                if (!Access::check_network('stream', $GLOBALS['user']->id, '25') and
+                    !Access::check_network('network', $GLOBALS['user']->id, '25')) {
+                    debug_event('UI::access_denied', "Streaming Access Denied: " . $_SERVER['REMOTE_ADDR'] . " does not have stream level access", '3');
                     UI::access_denied();
                     exit;
                 }
diff --git a/daap/index.php b/daap/index.php
index dfd454f2..ad0c170d 100644
--- a/daap/index.php
+++ b/daap/index.php
@@ -20,7 +20,7 @@
  *
  */
 
-define('NO_SESSION','1');
+define('NO_SESSION', '1');
 require_once '../lib/init.php';
 
 if (!AmpConfig::get('daap_backend')) {
diff --git a/democratic.php b/democratic.php
index 3caa9d1a..5ea51c8c 100644
--- a/democratic.php
+++ b/democratic.php
@@ -37,7 +37,7 @@ switch ($_REQUEST['action']) {
                 $democratic->set_parent();
                 $democratic->format();
     case 'show_create':
-        if (!Access::check('interface','75')) {
+        if (!Access::check('interface', '75')) {
             UI::access_denied();
             break;
         }
@@ -46,7 +46,7 @@ switch ($_REQUEST['action']) {
         require_once AmpConfig::get('prefix') . UI::find_template('show_create_democratic.inc.php');
     break;
     case 'delete':
-        if (!Access::check('interface','75')) {
+        if (!Access::check('interface', '75')) {
             UI::access_denied();
             break;
         }
@@ -56,11 +56,11 @@ switch ($_REQUEST['action']) {
         $title = '';
         $text  = T_('The Requested Playlist has been deleted.');
         $url   = AmpConfig::get('web_path') . '/democratic.php?action=manage_playlists';
-        show_confirmation($title,$text,$url);
+        show_confirmation($title, $text, $url);
     break;
     case 'create':
         // Only power users here
-        if (!Access::check('interface','75')) {
+        if (!Access::check('interface', '75')) {
             UI::access_denied();
             break;
         }
@@ -89,7 +89,7 @@ switch ($_REQUEST['action']) {
         header("Location: " . AmpConfig::get('web_path') . "/democratic.php?action=show");
     break;
     case 'manage_playlists':
-        if (!Access::check('interface','75')) {
+        if (!Access::check('interface', '75')) {
             UI::access_denied();
             break;
         }
diff --git a/graph.php b/graph.php
index 1068914c..fe61e657 100644
--- a/graph.php
+++ b/graph.php
@@ -22,7 +22,7 @@
 
 // This file is a little weird it needs to allow API session
 // this needs to be done a little better, but for now... eah
-define('NO_SESSION','1');
+define('NO_SESSION', '1');
 require_once 'lib/init.php';
 
 // Check to see if they've got an interface session or a valid API session, if not GTFO
diff --git a/image.php b/image.php
index 530d05bd..1b9e8ace 100644
--- a/image.php
+++ b/image.php
@@ -29,13 +29,13 @@
 
 // This file is a little weird it needs to allow API session
 // this needs to be done a little better, but for now... eah
-define('NO_SESSION','1');
+define('NO_SESSION', '1');
 require_once 'lib/init.php';
 
 if (AmpConfig::get('use_auth') && AmpConfig::get('require_session')) {
     // Check to see if they've got an interface session or a valid API session, if not GTFO
     if (!Session::exists('interface', $_COOKIE[AmpConfig::get('session_name')]) && !Session::exists('api', $_REQUEST['auth'])) {
-        debug_event('image','Access denied, checked cookie session:' . $_COOKIE[AmpConfig::get('session_name')] . ' and auth:' . $_REQUEST['auth'], 1);
+        debug_event('image', 'Access denied, checked cookie session:' . $_COOKIE[AmpConfig::get('session_name')] . ' and auth:' . $_REQUEST['auth'], 1);
         exit;
     }
 }
diff --git a/install.php b/install.php
index 6a7f33ab..0b22a5f6 100644
--- a/install.php
+++ b/install.php
@@ -101,7 +101,7 @@ if (!$htmllang) {
 AmpConfig::set('lang', $htmllang, true);
 AmpConfig::set('site_charset', $charset ?: 'UTF-8', true);
 load_gettext();
-header ('Content-Type: text/html; charset=' . AmpConfig::get('site_charset'));
+header('Content-Type: text/html; charset=' . AmpConfig::get('site_charset'));
 
 // Correct potential \ or / in the dirname
 $safe_dirname = get_web_path();
@@ -182,7 +182,7 @@ switch ($_REQUEST['action']) {
         if (install_check_status($configfile)) {
             require_once AmpConfig::get('prefix') . UI::find_template('show_install_account.inc.php');
         } else {
-            header ("Location: " . $web_path . '/login.php');
+            header("Location: " . $web_path . '/login.php');
         }
     break;
     case 'create_account':
@@ -196,7 +196,7 @@ switch ($_REQUEST['action']) {
             break;
         }
 
-        header ("Location: " . $web_path . '/index.php');
+        header("Location: " . $web_path . '/index.php');
     break;
     case 'init':
         require_once 'templates/show_install.inc.php';
diff --git a/labels.php b/labels.php
index 9aa95456..6a47f9f3 100644
--- a/labels.php
+++ b/labels.php
@@ -60,12 +60,12 @@ switch ($_REQUEST['action']) {
     break;
     case 'add_label':
         // Must be at least a content manager or edit upload enabled
-        if (!Access::check('interface','50') && !AmpConfig::get('upload_allow_edit')) {
+        if (!Access::check('interface', '50') && !AmpConfig::get('upload_allow_edit')) {
             UI::access_denied();
             exit;
         }
 
-        if (!Core::form_verify('add_label','post')) {
+        if (!Core::form_verify('add_label', 'post')) {
             UI::access_denied();
             exit;
         }
@@ -104,7 +104,7 @@ switch ($_REQUEST['action']) {
             exit;
         }
     case 'show_add_label':
-        if (Access::check('interface','50') || AmpConfig::get('upload_allow_edit')) {
+        if (Access::check('interface', '50') || AmpConfig::get('upload_allow_edit')) {
             require_once AmpConfig::get('prefix') . UI::find_template('show_add_label.inc.php');
         } else {
             echo T_('Label cannot be found.');
diff --git a/lib/batch.lib.php b/lib/batch.lib.php
index 12e26114..62f389ee 100644
--- a/lib/batch.lib.php
+++ b/lib/batch.lib.php
@@ -47,7 +47,7 @@ function get_media_files($media_ids)
         }
         if ($media->enabled) {
             $media->format();
-            $total_size += sprintf("%.2f",($media->size/1048576));
+            $total_size += sprintf("%.2f", ($media->size/1048576));
             $dirname = '';
             $parent  = $media->get_parent();
             if ($parent != null) {
@@ -81,7 +81,7 @@ function send_zip($name, $media_files)
         throw new Exception('Missing ZipStream dependency.');
     }
     
-    $arc     = new ZipStream\ZipStream($name . ".zip" );
+    $arc     = new ZipStream\ZipStream($name . ".zip");
     $options = array(
         'comment'       => AmpConfig::get('file_zip_comment'),
     );
diff --git a/lib/class/Repository.php b/lib/class/Repository.php
index 80bfdbba..23c3553f 100644
--- a/lib/class/Repository.php
+++ b/lib/class/Repository.php
@@ -102,7 +102,7 @@ class Repository
         $nameParts = explode('\\', $className);
         $tableName = preg_replace_callback(
                 '/(?<=.)([A-Z])/',
-                function($m) {
+                function ($m) {
                     return '_' . strtolower($m[0]);
                 }, end($nameParts));
         return lcfirst($tableName);
@@ -225,6 +225,6 @@ class Repository
 
     public function camelCaseToUnderscore($string)
     {
-        return strtolower(preg_replace('/(?<=\\w)(?=[A-Z])/','_$1', $string));
+        return strtolower(preg_replace('/(?<=\\w)(?=[A-Z])/', '_$1', $string));
     }
 }
diff --git a/lib/class/ajax.class.php b/lib/class/ajax.class.php
index 3c7263dd..7e709185 100644
--- a/lib/class/ajax.class.php
+++ b/lib/class/ajax.class.php
@@ -56,7 +56,7 @@ class Ajax
     {
         $non_quoted = array('document', 'window');
 
-        if (in_array($source,$non_quoted)) {
+        if (in_array($source, $non_quoted)) {
             $source_txt = $source;
         } else {
             $source_txt = "'#$source'";
@@ -105,7 +105,7 @@ class Ajax
 
         $non_quoted = array('document','window');
 
-        if (in_array($source,$non_quoted)) {
+        if (in_array($source, $non_quoted)) {
             $source_txt = $source;
         } else {
             $source_txt = "'$source'";
diff --git a/lib/class/album.class.php b/lib/class/album.class.php
index 532576de..839db478 100644
--- a/lib/class/album.class.php
+++ b/lib/class/album.class.php
@@ -475,7 +475,7 @@ class Album extends database_object implements library_item
      * @param string $artist
      * @return int[]
      */
-    public function get_songs($limit = 0,$artist='')
+    public function get_songs($limit = 0, $artist='')
     {
         $results = array();
 
@@ -881,7 +881,7 @@ class Album extends database_object implements library_item
             // Update every song
             $songs = $this->get_songs();
             foreach ($songs as $song_id) {
-                Song::update_artist($artist,$song_id);
+                Song::update_artist($artist, $song_id);
             }
             $updated = true;
             Artist::gc();
@@ -898,8 +898,8 @@ class Album extends database_object implements library_item
                 $songs = $this->get_songs();
             }
             foreach ($songs as $song_id) {
-                Song::update_album($album_id,$song_id);
-                Song::update_year($year,$song_id);
+                Song::update_album($album_id, $song_id);
+                Song::update_year($year, $song_id);
                 Song::write_id3_for_song($song_id);
             }
             $current_id = $album_id;
diff --git a/lib/class/ampache_rss.class.php b/lib/class/ampache_rss.class.php
index 7f5b036a..77c1bc77 100644
--- a/lib/class/ampache_rss.class.php
+++ b/lib/class/ampache_rss.class.php
@@ -66,7 +66,7 @@ class Ampache_RSS
             $data_function     = 'load_' . $this->type;
             $pub_date_function = 'pubdate_' . $this->type;
 
-            $data     = call_user_func(array('Ampache_RSS',$data_function));
+            $data     = call_user_func(array('Ampache_RSS', $data_function));
             $pub_date = null;
             if (method_exists('Ampache_RSS', $pub_date_function)) {
                 $pub_date = call_user_func(array('Ampache_RSS', $pub_date_function));
@@ -119,7 +119,7 @@ class Ampache_RSS
     {
         $valid_types = array('now_playing','recently_played','latest_album','latest_artist','latest_shout','podcast');
 
-        if (!in_array($type,$valid_types)) {
+        if (!in_array($type, $valid_types)) {
             return 'now_playing';
         }
 
@@ -252,7 +252,7 @@ class Ampache_RSS
                         $amount = floor($amount/4);
                     }
                     if ($time_place == '6') {
-                        $amount = floor ($amount/12);
+                        $amount = floor($amount/12);
                     }
                     if ($time_place > '6') {
                         $final = $amount . '+';
@@ -266,7 +266,7 @@ class Ampache_RSS
                             'link'=>str_replace('&amp;', '&', $song->link),
                             'description'=>$song->title . ' - ' . $song->f_artist_full . ' - ' . $song->f_album_full . ' - ' . $time_string,
                             'comments'=>$client->username,
-                            'pubDate'=>date("r",$item['date']));
+                            'pubDate'=>date("r", $item['date']));
                 $results[] = $xml_array;
             }
         } // end foreach
diff --git a/lib/class/amperror.class.php b/lib/class/amperror.class.php
index ce7e20de..948692fe 100644
--- a/lib/class/amperror.class.php
+++ b/lib/class/amperror.class.php
@@ -57,7 +57,7 @@ class AmpError
      * This is a public static function it adds a new error message to the array
      * It can optionally clobber rather then adding to the error message
      */
-    public static function add($name,$message,$clobber=0)
+    public static function add($name, $message, $clobber=0)
     {
         // Make sure its set first
         if (!isset(AmpError::$errors[$name])) {
@@ -139,7 +139,7 @@ class AmpError
 
         // Re-insert them
         foreach ($_SESSION['errors'] as $key=>$error) {
-            self::add($key,$error);
+            self::add($key, $error);
         }
     } // auto_init
 } // Error
diff --git a/lib/class/api.class.php b/lib/class/api.class.php
index 93503e86..ca3f20f5 100644
--- a/lib/class/api.class.php
+++ b/lib/class/api.class.php
@@ -74,7 +74,7 @@ class Api
      * @param int|string|boolean|null $value
      * @return boolean
      */
-    public static function set_filter($filter,$value)
+    public static function set_filter($filter, $value)
     {
         if (!strlen($value)) {
             return false;
@@ -83,32 +83,32 @@ class Api
         switch ($filter) {
             case 'add':
                 // Check for a range, if no range default to gt
-                if (strpos($value,'/')) {
-                    $elements = explode('/',$value);
-                    self::$browse->set_filter('add_lt',strtotime($elements['1']));
-                    self::$browse->set_filter('add_gt',strtotime($elements['0']));
+                if (strpos($value, '/')) {
+                    $elements = explode('/', $value);
+                    self::$browse->set_filter('add_lt', strtotime($elements['1']));
+                    self::$browse->set_filter('add_gt', strtotime($elements['0']));
                 } else {
-                    self::$browse->set_filter('add_gt',strtotime($value));
+                    self::$browse->set_filter('add_gt', strtotime($value));
                 }
             break;
             case 'update':
                 // Check for a range, if no range default to gt
-                if (strpos($value,'/')) {
-                    $elements = explode('/',$value);
-                    self::$browse->set_filter('update_lt',strtotime($elements['1']));
-                    self::$browse->set_filter('update_gt',strtotime($elements['0']));
+                if (strpos($value, '/')) {
+                    $elements = explode('/', $value);
+                    self::$browse->set_filter('update_lt', strtotime($elements['1']));
+                    self::$browse->set_filter('update_gt', strtotime($elements['0']));
                 } else {
-                    self::$browse->set_filter('update_gt',strtotime($value));
+                    self::$browse->set_filter('update_gt', strtotime($value));
                 }
             break;
             case 'alpha_match':
-                self::$browse->set_filter('alpha_match',$value);
+                self::$browse->set_filter('alpha_match', $value);
             break;
             case 'exact_match':
-                self::$browse->set_filter('exact_match',$value);
+                self::$browse->set_filter('exact_match', $value);
             break;
             case 'enabled':
-                self::$browse->set_filter('enabled',$value);
+                self::$browse->set_filter('enabled', $value);
             break;
             default:
                 // Rien a faire
@@ -259,10 +259,10 @@ class Api
 
                 echo XML_Data::keyed_array(array('auth'=>$token,
                     'api'=>self::$version,
-                    'session_expire'=>date("c",time()+AmpConfig::get('session_length')-60),
-                    'update'=>date("c",$row['update']),
-                    'add'=>date("c",$row['add']),
-                    'clean'=>date("c",$row['clean']),
+                    'session_expire'=>date("c", time()+AmpConfig::get('session_length')-60),
+                    'update'=>date("c", $row['update']),
+                    'add'=>date("c", $row['add']),
+                    'clean'=>date("c", $row['clean']),
                     'songs'=>$song['song'],
                     'albums'=>$album['album'],
                     'artists'=>$artist['artist'],
@@ -273,7 +273,7 @@ class Api
             } // match
         } // end while
 
-        debug_event('API','Login Failed, unable to match passphrase','1');
+        debug_event('API', 'Login Failed, unable to match passphrase', '1');
         echo XML_Data::error('401', T_('Error Invalid Handshake - ') . T_('Invalid Username/Password'));
 
         return false;
@@ -292,10 +292,10 @@ class Api
         // Check and see if we should extend the api sessions (done if valid sess is passed)
         if (Session::exists('api', $input['auth'])) {
             Session::extend($input['auth']);
-            $xmldata = array_merge(array('session_expire'=>date("c",time()+AmpConfig::get('session_length')-60)),$xmldata);
+            $xmldata = array_merge(array('session_expire'=>date("c", time()+AmpConfig::get('session_length')-60)), $xmldata);
         }
 
-        debug_event('API','Ping Received from ' . $_SERVER['REMOTE_ADDR'] . ' :: ' . $input['auth'],'5');
+        debug_event('API', 'Ping Received from ' . $_SERVER['REMOTE_ADDR'] . ' :: ' . $input['auth'], '5');
 
         ob_end_clean();
         echo XML_Data::keyed_array($xmldata);
@@ -312,12 +312,12 @@ class Api
     {
         self::$browse->reset_filters();
         self::$browse->set_type('artist');
-        self::$browse->set_sort('name','ASC');
+        self::$browse->set_sort('name', 'ASC');
 
         $method = $input['exact'] ? 'exact_match' : 'alpha_match';
-        Api::set_filter($method,$input['filter']);
-        Api::set_filter('add',$input['add']);
-        Api::set_filter('update',$input['update']);
+        Api::set_filter($method, $input['filter']);
+        Api::set_filter('add', $input['add']);
+        Api::set_filter('update', $input['update']);
 
         // Set the offset
         XML_Data::set_offset($input['offset']);
@@ -385,11 +385,11 @@ class Api
     {
         self::$browse->reset_filters();
         self::$browse->set_type('album');
-        self::$browse->set_sort('name','ASC');
+        self::$browse->set_sort('name', 'ASC');
         $method = $input['exact'] ? 'exact_match' : 'alpha_match';
-        Api::set_filter($method,$input['filter']);
-        Api::set_filter('add',$input['add']);
-        Api::set_filter('update',$input['update']);
+        Api::set_filter($method, $input['filter']);
+        Api::set_filter('add', $input['add']);
+        Api::set_filter('update', $input['update']);
 
         $albums = self::$browse->get_objects();
 
@@ -438,10 +438,10 @@ class Api
     {
         self::$browse->reset_filters();
         self::$browse->set_type('tag');
-        self::$browse->set_sort('name','ASC');
+        self::$browse->set_sort('name', 'ASC');
 
         $method = $input['exact'] ? 'exact_match' : 'alpha_match';
-        Api::set_filter($method,$input['filter']);
+        Api::set_filter($method, $input['filter']);
         $tags = self::$browse->get_objects();
 
         // Set the offset
@@ -471,7 +471,7 @@ class Api
      */
     public static function tag_artists($input)
     {
-        $artists = Tag::get_tag_objects('artist',$input['filter']);
+        $artists = Tag::get_tag_objects('artist', $input['filter']);
         if ($artists) {
             XML_Data::set_offset($input['offset']);
             XML_Data::set_limit($input['limit']);
@@ -488,7 +488,7 @@ class Api
      */
     public static function tag_albums($input)
     {
-        $albums = Tag::get_tag_objects('album',$input['filter']);
+        $albums = Tag::get_tag_objects('album', $input['filter']);
         if ($albums) {
             XML_Data::set_offset($input['offset']);
             XML_Data::set_limit($input['limit']);
@@ -505,7 +505,7 @@ class Api
      */
     public static function tag_songs($input)
     {
-        $songs = Tag::get_tag_objects('song',$input['filter']);
+        $songs = Tag::get_tag_objects('song', $input['filter']);
 
         XML_Data::set_offset($input['offset']);
         XML_Data::set_limit($input['limit']);
@@ -523,14 +523,14 @@ class Api
     {
         self::$browse->reset_filters();
         self::$browse->set_type('song');
-        self::$browse->set_sort('title','ASC');
+        self::$browse->set_sort('title', 'ASC');
 
         $method = $input['exact'] ? 'exact_match' : 'alpha_match';
-        Api::set_filter($method,$input['filter']);
-        Api::set_filter('add',$input['add']);
-        Api::set_filter('update',$input['update']);
+        Api::set_filter($method, $input['filter']);
+        Api::set_filter('add', $input['add']);
+        Api::set_filter('update', $input['update']);
         // Filter out disabled songs
-        Api::set_filter('enabled','1');
+        Api::set_filter('enabled', '1');
 
         $songs = self::$browse->get_objects();
 
@@ -578,10 +578,10 @@ class Api
     {
         self::$browse->reset_filters();
         self::$browse->set_type('playlist');
-        self::$browse->set_sort('name','ASC');
+        self::$browse->set_sort('name', 'ASC');
 
         $method = $input['exact'] ? 'exact_match' : 'alpha_match';
-        Api::set_filter($method,$input['filter']);
+        Api::set_filter($method, $input['filter']);
         self::$browse->set_filter('playlist_type', '1');
 
         $playlist_ids = self::$browse->get_objects();
@@ -625,7 +625,7 @@ class Api
         XML_Data::set_offset($input['offset']);
         XML_Data::set_limit($input['limit']);
         ob_end_clean();
-        echo XML_Data::songs($songs,$items);
+        echo XML_Data::songs($songs, $items);
     } // playlist_songs
 
     /**
@@ -762,10 +762,10 @@ class Api
     {
         self::$browse->reset_filters();
         self::$browse->set_type('video');
-        self::$browse->set_sort('title','ASC');
+        self::$browse->set_sort('title', 'ASC');
 
         $method = $input['exact'] ? 'exact_match' : 'alpha_match';
-        Api::set_filter($method,$input['filter']);
+        Api::set_filter($method, $input['filter']);
 
         $video_ids = self::$browse->get_objects();
 
@@ -851,7 +851,7 @@ class Api
                     echo XML_Data::error('400', T_('Media Object Invalid or Not Specified'));
                 }
 
-                $uid = $democratic->get_uid_from_object_id($media->id,$type);
+                $uid = $democratic->get_uid_from_object_id($media->id, $type);
                 $democratic->remove_vote($uid);
 
                 // Everything was ok
diff --git a/lib/class/art.class.php b/lib/class/art.class.php
index f1f77bc4..566ac6e9 100644
--- a/lib/class/art.class.php
+++ b/lib/class/art.class.php
@@ -211,7 +211,7 @@ class Art extends database_object
         if (function_exists('ImageCreateFromString')) {
             $image = @ImageCreateFromString($source);
             if (!$image || imagesx($image) < 5 || imagesy($image) < 5) {
-                debug_event('Art', 'Image failed PHP-GD test',1);
+                debug_event('Art', 'Image failed PHP-GD test', 1);
                 $test = false;
             }
             @imagedestroy($image);
@@ -291,7 +291,7 @@ class Art extends database_object
                 $this->thumb      = $data['thumb'];
                 $this->thumb_mime = $data['thumb_mime'];
             } else {
-                debug_event('Art','Unable to retrieve or generate thumbnail for ' . $this->type . '::' . $this->id,1);
+                debug_event('Art', 'Unable to retrieve or generate thumbnail for ' . $this->type . '::' . $this->id, 1);
             }
         } // if no thumb, but art and we want to resize
 
@@ -514,7 +514,7 @@ class Art extends database_object
         }
         $fp = fopen($path, "wb");
         fwrite($fp, $source);
-        fclose ($fp);
+        fclose($fp);
 
         return true;
     }
@@ -662,7 +662,7 @@ class Art extends database_object
      */
     public function generate_thumb($image, $size, $mime)
     {
-        $data = explode("/",$mime);
+        $data = explode("/", $mime);
         $type = strtolower($data['1']);
 
         if (!self::test_image($image)) {
@@ -671,32 +671,32 @@ class Art extends database_object
         }
 
         if (!function_exists('gd_info')) {
-            debug_event('Art','PHP-GD Not found - unable to resize art',1);
+            debug_event('Art', 'PHP-GD Not found - unable to resize art', 1);
             return false;
         }
 
         // Check and make sure we can resize what you've asked us to
         if (($type == 'jpg' or $type == 'jpeg') and !(imagetypes() & IMG_JPG)) {
-            debug_event('Art','PHP-GD Does not support JPGs - unable to resize',1);
+            debug_event('Art', 'PHP-GD Does not support JPGs - unable to resize', 1);
             return false;
         }
         if ($type == 'png' and !imagetypes() & IMG_PNG) {
-            debug_event('Art','PHP-GD Does not support PNGs - unable to resize',1);
+            debug_event('Art', 'PHP-GD Does not support PNGs - unable to resize', 1);
             return false;
         }
         if ($type == 'gif' and !imagetypes() & IMG_GIF) {
-            debug_event('Art','PHP-GD Does not support GIFs - unable to resize',1);
+            debug_event('Art', 'PHP-GD Does not support GIFs - unable to resize', 1);
             return false;
         }
         if ($type == 'bmp' and !imagetypes() & IMG_WBMP) {
-            debug_event('Art','PHP-GD Does not support BMPs - unable to resize',1);
+            debug_event('Art', 'PHP-GD Does not support BMPs - unable to resize', 1);
             return false;
         }
 
         $source = imagecreatefromstring($image);
 
         if (!$source) {
-            debug_event('Art','Failed to create Image from string - Source Image is damaged / malformed',1);
+            debug_event('Art', 'Failed to create Image from string - Source Image is damaged / malformed', 1);
             return false;
         }
 
@@ -706,7 +706,7 @@ class Art extends database_object
         $thumbnail = imagecreatetruecolor($size['width'], $size['height']);
 
         if (!imagecopyresampled($thumbnail, $source, 0, 0, 0, 0, $size['width'], $size['height'], $source_size['width'], $source_size['height'])) {
-            debug_event('Art','Unable to create resized image',1);
+            debug_event('Art', 'Unable to create resized image', 1);
             imagedestroy($source);
             imagedestroy($thumbnail);
             return false;
@@ -796,8 +796,8 @@ class Art extends database_object
 
         // Check to see if it's a FILE
         if (isset($data['file'])) {
-            $handle     = fopen($data['file'],'rb');
-            $image_data = fread($handle,Core::get_filesize($data['file']));
+            $handle     = fopen($data['file'], 'rb');
+            $image_data = fread($handle, Core::get_filesize($data['file']));
             fclose($handle);
             return $image_data;
         }
@@ -830,7 +830,7 @@ class Art extends database_object
      * @param int|null $thumb
      * @return string
      */
-    public static function url($uid,$type,$sid=null,$thumb=null)
+    public static function url($uid, $type, $sid=null, $thumb=null)
     {
         if (!self::is_valid_type($type)) {
             return null;
@@ -1006,7 +1006,7 @@ class Art extends database_object
             $config = array($config);
         }
 
-        debug_event('Art','Searching using:' . json_encode($config), 3);
+        debug_event('Art', 'Searching using:' . json_encode($config), 3);
 
         $plugin_names = Plugin::get_plugins('gather_arts');
         foreach ($config as $method) {
@@ -1044,7 +1044,7 @@ class Art extends database_object
             // Add the results we got to the current set
             $results = array_merge($results, (array) $data);
         
-            debug_event('Art','results:' . json_encode($results), 3);
+            debug_event('Art', 'results:' . json_encode($results), 3);
 
             if ($limit && count($results) >= $limit) {
                 return array_slice($results, 0, $limit);
@@ -1200,7 +1200,7 @@ class Art extends database_object
         );
         foreach ($release->relations as $ar) {
             $arurl = $ar->url->resource;
-            debug_event('mbz-gatherart', "Found URL AR: " . $arurl , '5');
+            debug_event('mbz-gatherart', "Found URL AR: " . $arurl, '5');
             foreach ($coverartsites as $casite) {
                 if (strpos($arurl, $casite['domain']) !== false) {
                     debug_event('mbz-gatherart', "Matched coverart site: " . $casite['name'], '5');
@@ -1263,12 +1263,12 @@ class Art extends database_object
             $songs = $media->get_songs();
             foreach ($songs as $song_id) {
                 $song   = new Song($song_id);
-                $dirs[] = Core::conv_lc_file( dirname($song->file) );
+                $dirs[] = Core::conv_lc_file(dirname($song->file));
             }
         } else {
             if ($this->type == 'video') {
                 $media  = new Video($this->uid);
-                $dirs[] = Core::conv_lc_file( dirname($media->file) );
+                $dirs[] = Core::conv_lc_file(dirname($media->file));
             }
         }
 
diff --git a/lib/class/artist.class.php b/lib/class/artist.class.php
index 9f7a19b0..cb2c2c2e 100644
--- a/lib/class/artist.class.php
+++ b/lib/class/artist.class.php
@@ -140,7 +140,7 @@ class Artist extends database_object implements library_item
      * @param int|null $id
      * @param int $catalog_init
      */
-    public function __construct($id=null,$catalog_init=0)
+    public function __construct($id=null, $catalog_init=0)
     {
         /* If they failed to pass in an id, just run for it */
         if (!$id) {
@@ -210,7 +210,7 @@ class Artist extends database_object implements library_item
         $db_results = Dba::read($sql);
 
         while ($row = Dba::fetch_assoc($db_results)) {
-            parent::add_to_cache('artist',$row['id'],$row);
+            parent::add_to_cache('artist', $row['id'], $row);
         }
 
         // If we need to also pull the extra information, this is normally only used when we are doing the human display
@@ -224,7 +224,7 @@ class Artist extends database_object implements library_item
                 if (AmpConfig::get('show_played_times')) {
                     $row['object_cnt'] = Stats::get_object_count('artist', $row['artist'], $limit_threshold);
                 }
-                parent::add_to_cache('artist_extra',$row['artist'],$row);
+                parent::add_to_cache('artist_extra', $row['artist'], $row);
             }
         } // end if extra
 
@@ -391,8 +391,8 @@ class Artist extends database_object implements library_item
     private function _get_extra_info($catalog=0, $limit_threshold ='')
     {
         // Try to find it in the cache and save ourselves the trouble
-        if (parent::is_cached('artist_extra',$this->id) ) {
-            $row = parent::get_from_cache('artist_extra',$this->id);
+        if (parent::is_cached('artist_extra', $this->id)) {
+            $row = parent::get_from_cache('artist_extra', $this->id);
         } else {
             $params = array($this->id);
             // Calculation
@@ -421,7 +421,7 @@ class Artist extends database_object implements library_item
             if (AmpConfig::get('show_played_times')) {
                 $row['object_cnt'] = Stats::get_object_count('artist', $row['artist'], $limit_threshold);
             }
-            parent::add_to_cache('artist_extra',$row['artist'],$row);
+            parent::add_to_cache('artist_extra', $row['artist'], $row);
         }
 
         /* Set Object Vars */
@@ -466,12 +466,12 @@ class Artist extends database_object implements library_item
             $extra_info = $this->_get_extra_info($this->catalog_id, $limit_threshold);
 
             //Format the new time thingy that we just got
-            $min = sprintf("%02d",(floor($extra_info['time']/60)%60));
+            $min = sprintf("%02d", (floor($extra_info['time']/60)%60));
 
-            $sec   = sprintf("%02d",($extra_info['time']%60));
+            $sec   = sprintf("%02d", ($extra_info['time']%60));
             $hours = floor($extra_info['time']/3600);
 
-            $this->f_time = ltrim($hours . ':' . $min . ':' . $sec,'0:');
+            $this->f_time = ltrim($hours . ':' . $min . ':' . $sec, '0:');
 
             $this->tags   = Tag::get_top_tags('artist', $this->id);
             $this->f_tags = Tag::get_display($this->tags, true, 'artist');
@@ -775,7 +775,7 @@ class Artist extends database_object implements library_item
             if ($artist_id != null && $artist_id != $this->id) {
                 $songs = $this->get_songs();
                 foreach ($songs as $song_id) {
-                    Song::update_artist($artist_id,$song_id);
+                    Song::update_artist($artist_id, $song_id);
                 }
                 $updated    = true;
                 $current_id = $artist_id;
diff --git a/lib/class/bookmark.class.php b/lib/class/bookmark.class.php
index 36cad891..7ca12d2a 100644
--- a/lib/class/bookmark.class.php
+++ b/lib/class/bookmark.class.php
@@ -45,7 +45,7 @@ class Bookmark extends database_object
      * This is run every time a new object is created, and requires
      * the id and type of object that we need to pull for
      */
-    public function __construct ($object_id, $object_type = null, $user_id = null)
+    public function __construct($object_id, $object_type = null, $user_id = null)
     {
         if (!$object_id) {
             return false;
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index 59136958..34f1473b 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -1225,7 +1225,7 @@ abstract class Catalog extends database_object
                 // If they've enabled resizing of images generate a thumbnail
                 if (AmpConfig::get('resize_images')) {
                     $size  = array('width' => 275, 'height' => 275);
-                    $thumb = $art->generate_thumb($image,$size ,$result['mime']);
+                    $thumb = $art->generate_thumb($image, $size, $result['mime']);
                     if (is_array($thumb)) {
                         $art->save_thumb($thumb['thumb'], $thumb['thumb_mime'], $size);
                     }
@@ -2293,7 +2293,7 @@ abstract class Catalog extends database_object
             return false;
         }
 
-        return (Access::check('interface','75') || ($libitem->get_user_owner() == $user && AmpConfig::get('upload_allow_remove')));
+        return (Access::check('interface', '75') || ($libitem->get_user_owner() == $user && AmpConfig::get('upload_allow_remove')));
     }
 
     public static function process_action($action, $catalogs, $options = null)
@@ -2377,7 +2377,7 @@ abstract class Catalog extends database_object
                     if ($catalog_id = Catalog_local::get_from_path($options['update_path'])) {
                         $songs = Song::get_from_path($options['update_path']);
                         foreach ($songs as $song_id) {
-                            Catalog::update_single_item('song',$song_id);
+                            Catalog::update_single_item('song', $song_id);
                         }
                     }
                 } // end if update
diff --git a/lib/class/channel.class.php b/lib/class/channel.class.php
index 33840e88..59bd6a27 100644
--- a/lib/class/channel.class.php
+++ b/lib/class/channel.class.php
@@ -181,8 +181,8 @@ class Channel extends database_object implements media, library_item
     {
         if ($this->id) {
             if ($GLOBALS['user']->has_access('75')) {
-                echo Ajax::button('?page=index&action=start_channel&id=' . $this->id,'run', T_('Start Channel'),'channel_start_' . $this->id);
-                echo " " . Ajax::button('?page=index&action=stop_channel&id=' . $this->id,'stop', T_('Stop Channel'),'channel_stop_' . $this->id);
+                echo Ajax::button('?page=index&action=start_channel&id=' . $this->id, 'run', T_('Start Channel'), 'channel_start_' . $this->id);
+                echo " " . Ajax::button('?page=index&action=stop_channel&id=' . $this->id, 'stop', T_('Stop Channel'), 'channel_stop_' . $this->id);
                 echo " <a id=\"edit_channel_ " . $this->id . "\" onclick=\"showEditDialog('channel_row', '" . $this->id . "', 'edit_channel_" . $this->id . "', '" . T_('Channel edit') . "', 'channel_row_', 'refresh_channel')\">" . UI::get_icon('edit', T_('Edit')) . "</a>";
                 echo " <a href=\"" . AmpConfig::get('web_path') . "/channel.php?action=show_delete&id=" . $this->id . "\">" . UI::get_icon('delete', T_('Delete')) . "</a>";
             }
@@ -542,7 +542,7 @@ class Channel extends database_object implements media, library_item
     {
         $s='';
         foreach (str_split($x) as $c) {
-            $s.=sprintf("%02X",ord($c));
+            $s.=sprintf("%02X", ord($c));
         }
         return($s);
     }
diff --git a/lib/class/core.class.php b/lib/class/core.class.php
index a6ab15ac..630ebd96 100644
--- a/lib/class/core.class.php
+++ b/lib/class/core.class.php
@@ -338,8 +338,8 @@ class Core
      */
     public static function is_session_started()
     {
-        if (php_sapi_name() !== 'cli' ) {
-            if (version_compare(phpversion(), '5.4.0', '>=') ) {
+        if (php_sapi_name() !== 'cli') {
+            if (version_compare(phpversion(), '5.4.0', '>=')) {
                 return session_status() === PHP_SESSION_ACTIVE ? true : false;
             } else {
                 return session_id() === '' ? false : true;
diff --git a/lib/class/database_object.abstract.php b/lib/class/database_object.abstract.php
index 7a9b91bb..17f4724b 100644
--- a/lib/class/database_object.abstract.php
+++ b/lib/class/database_object.abstract.php
@@ -40,7 +40,7 @@ abstract class database_object
      * get_info
      * retrieves the info from the database and puts it in the cache
      */
-    public function get_info($id,$table_name='')
+    public function get_info($id, $table_name='')
     {
         $table_name = $table_name ? Dba::escape($table_name) : Dba::escape(strtolower(get_class($this)));
 
@@ -49,8 +49,8 @@ abstract class database_object
             return array();
         }
 
-        if (self::is_cached($table_name,$id)) {
-            return self::get_from_cache($table_name,$id);
+        if (self::is_cached($table_name, $id)) {
+            return self::get_from_cache($table_name, $id);
         }
 
         $sql        = "SELECT * FROM `$table_name` WHERE `id`='$id'";
@@ -62,7 +62,7 @@ abstract class database_object
 
         $row = Dba::fetch_assoc($db_results);
 
-        self::add_to_cache($table_name,$id,$row);
+        self::add_to_cache($table_name, $id, $row);
 
         return $row;
     } // get_info
@@ -123,7 +123,7 @@ abstract class database_object
      * This function clears something from the cache, there are a few places we need to do this
      * in order to have things display correctly
      */
-    public static function remove_from_cache($index,$id)
+    public static function remove_from_cache($index, $id)
     {
         if (isset(self::$object_cache[$index]) && isset(self::$object_cache[$index][$id])) {
             unset(self::$object_cache[$index][$id]);
diff --git a/lib/class/dba.class.php b/lib/class/dba.class.php
index 8ccca8f3..3c18e19c 100644
--- a/lib/class/dba.class.php
+++ b/lib/class/dba.class.php
@@ -532,11 +532,11 @@ class Dba
                 if (
                 (strpos($table['Type'], 'varchar') !== false) ||
                 (strpos($table['Type'], 'enum') !== false) ||
-                (strpos($table['Table'],'text') !== false)) {
+                (strpos($table['Table'], 'text') !== false)) {
                     $sql             = "ALTER TABLE `" . $row['0'] . "` MODIFY `" . $table['Field'] . "` " . $table['Type'] . " CHARACTER SET " . $target_charset;
                     $charset_results = Dba::write($sql);
                     if (!$charset_results) {
-                        debug_event('CHARSET','Unable to update the charset of ' . $table['Field'] . '.' . $table['Type'] . ' to ' . $target_charset,'3');
+                        debug_event('CHARSET', 'Unable to update the charset of ' . $table['Field'] . '.' . $table['Type'] . ' to ' . $target_charset, '3');
                     } // if it fails
                 }
             }
diff --git a/lib/class/democratic.class.php b/lib/class/democratic.class.php
index cadecaae..10f5db0f 100644
--- a/lib/class/democratic.class.php
+++ b/lib/class/democratic.class.php
@@ -132,14 +132,14 @@ class Democratic extends Tmp_Playlist
         //FIXME: Code in single user stuff
 
         $preference_id = Preference::id_from_name('play_type');
-        Preference::update_level($preference_id,'75');
-        Preference::update_all($preference_id,'democratic');
+        Preference::update_level($preference_id, '75');
+        Preference::update_all($preference_id, 'democratic');
 
         $allow_demo = Preference::id_from_name('allow_democratic_playback');
-        Preference::update_all($allow_demo,'1');
+        Preference::update_all($allow_demo, '1');
 
         $play_method = Preference::id_from_name('playlist_method');
-        Preference::update_all($play_method,'clear');
+        Preference::update_all($play_method, 'clear');
 
         return true;
     } // set_user_preferences
@@ -470,14 +470,14 @@ class Democratic extends Tmp_Playlist
      * delete_from_oid
      * This takes an OID and type and removes the object from the democratic playlist
      */
-    public function delete_from_oid($oid,$object_type)
+    public function delete_from_oid($oid, $object_type)
     {
-        $row_id = $this->get_uid_from_object_id($oid,$object_type);
+        $row_id = $this->get_uid_from_object_id($oid, $object_type);
         if ($row_id) {
-            debug_event('Democratic','Removing Votes for ' . $oid . ' of type ' . $object_type,'5');
+            debug_event('Democratic', 'Removing Votes for ' . $oid . ' of type ' . $object_type, '5');
             $this->delete_votes($row_id);
         } else {
-            debug_event('Democratic','Unable to find Votes for ' . $oid . ' of type ' . $object_type,'3');
+            debug_event('Democratic', 'Unable to find Votes for ' . $oid . ' of type ' . $object_type, '3');
         }
 
         return true;
diff --git a/lib/class/graph.class.php b/lib/class/graph.class.php
index 63940659..3916ceef 100644
--- a/lib/class/graph.class.php
+++ b/lib/class/graph.class.php
@@ -300,51 +300,51 @@ class Graph
             $height = 260;
         }
 
-        $MyData->setSerieDescription("TimeStamp","time");
+        $MyData->setSerieDescription("TimeStamp", "time");
         $MyData->setAbscissa("TimeStamp");
         switch ($zoom) {
             case 'hour':
-                $MyData->setXAxisDisplay(AXIS_FORMAT_TIME,"H:00");
+                $MyData->setXAxisDisplay(AXIS_FORMAT_TIME, "H:00");
                 break;
             case 'year':
-                $MyData->setXAxisDisplay(AXIS_FORMAT_DATE,"Y");
+                $MyData->setXAxisDisplay(AXIS_FORMAT_DATE, "Y");
                 break;
             case 'month':
-                $MyData->setXAxisDisplay(AXIS_FORMAT_DATE,"Y-m");
+                $MyData->setXAxisDisplay(AXIS_FORMAT_DATE, "Y-m");
                 break;
             case 'day':
-                $MyData->setXAxisDisplay(AXIS_FORMAT_DATE,"Y-m-d");
+                $MyData->setXAxisDisplay(AXIS_FORMAT_DATE, "Y-m-d");
                 break;
         }
 
         /* Create the pChart object */
-        $myPicture = new CpChart\Classes\pImage($width,$height,$MyData);
+        $myPicture = new CpChart\Classes\pImage($width, $height, $MyData);
 
         /* Turn of Antialiasing */
         $myPicture->Antialias = false;
 
         /* Draw a background */
         $Settings = array("R"=>90, "G"=>90, "B"=>90, "Dash"=>1, "DashR"=>120, "DashG"=>120, "DashB"=>120);
-        $myPicture->drawFilledRectangle(0,0,$width,$height,$Settings);
+        $myPicture->drawFilledRectangle(0, 0, $width, $height, $Settings);
 
         /* Overlay with a gradient */
         $Settings = array("StartR"=>200, "StartG"=>200, "StartB"=>200, "EndR"=>50, "EndG"=>50, "EndB"=>50, "Alpha"=>50);
-        $myPicture->drawGradientArea(0,0,$width,$height,DIRECTION_VERTICAL,$Settings);
-        $myPicture->drawGradientArea(0,0,$width,$height,DIRECTION_HORIZONTAL,$Settings);
+        $myPicture->drawGradientArea(0, 0, $width, $height, DIRECTION_VERTICAL, $Settings);
+        $myPicture->drawGradientArea(0, 0, $width, $height, DIRECTION_HORIZONTAL, $Settings);
 
         /* Add a border to the picture */
-        $myPicture->drawRectangle(0,0,$width-1,$height-1,array("R"=>0,"G"=>0,"B"=>0));
+        $myPicture->drawRectangle(0, 0, $width-1, $height-1, array("R"=>0, "G"=>0, "B"=>0));
 
         $font_path = AmpConfig::get('prefix') . "/lib/vendor/szymach/c-pchart/src/Resources/fonts";
         /* Write the chart title */
-        $myPicture->setFontProperties(array("FontName"=>$font_path . "/Forgotte.ttf","FontSize"=>11));
-        $myPicture->drawText(150,35,$title,array("FontSize"=>20,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+        $myPicture->setFontProperties(array("FontName"=>$font_path . "/Forgotte.ttf", "FontSize"=>11));
+        $myPicture->drawText(150, 35, $title, array("FontSize"=>20, "Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
 
         /* Set the default font */
-        $myPicture->setFontProperties(array("FontName"=>$font_path . "/pf_arma_five.ttf","FontSize"=>6));
+        $myPicture->setFontProperties(array("FontName"=>$font_path . "/pf_arma_five.ttf", "FontSize"=>6));
 
         /* Define the chart area */
-        $myPicture->setGraphArea(60,40,$width-20,$height-50);
+        $myPicture->setGraphArea(60, 40, $width-20, $height-50);
 
         /* Draw the scale */
         $scaleSettings = array("XMargin"=>10,"YMargin"=>10,"Floating"=>true,"GridR"=>200,"GridG"=>200,"GridB"=>200,"RemoveSkippedAxis"=>true,"DrawSubTicks"=>false,"Mode"=>SCALE_MODE_START0,"LabelRotation"=>45,"LabelingMethod"=>LABELING_DIFFERENT);
@@ -354,14 +354,14 @@ class Graph
         $myPicture->Antialias = true;
 
         /* Draw the line chart */
-        $myPicture->setShadow(true,array("X"=>1,"Y"=>1,"R"=>0,"G"=>0,"B"=>0,"Alpha"=>10));
+        $myPicture->setShadow(true, array("X"=>1, "Y"=>1, "R"=>0, "G"=>0, "B"=>0, "Alpha"=>10));
         $myPicture->drawLineChart();
 
         /* Write a label over the chart */
-        $myPicture->writeLabel("Inbound",720);
+        $myPicture->writeLabel("Inbound", 720);
 
         /* Write the chart legend */
-        $myPicture->drawLegend(280,20,array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HORIZONTAL));
+        $myPicture->drawLegend(280, 20, array("Style"=>LEGEND_NOBORDER, "Mode"=>LEGEND_HORIZONTAL));
 
         header("Content-Disposition: filename=\"ampache-graph.png\"");
         /* Render the picture (choose the best way) */
@@ -474,7 +474,7 @@ class Graph
             }
         }
         
-        if (($owner_id <= 0 || $owner_id != $GLOBALS['user']->id) && !Access::check('interface','50')) {
+        if (($owner_id <= 0 || $owner_id != $GLOBALS['user']->id) && !Access::check('interface', '50')) {
             UI::access_denied();
         } else {
             $user_id      = $_REQUEST['user_id'];
diff --git a/lib/class/ldap.class.php b/lib/class/ldap.class.php
index 27419ac6..9988fa62 100644
--- a/lib/class/ldap.class.php
+++ b/lib/class/ldap.class.php
@@ -27,11 +27,11 @@
  * This function is here for retrocompatibility with PHP < 5.6.
  * For PHP >= 5.6, one can use array_filter with flag ARRAY_FILTER_USE_KEY.
  */
-function array_filter_key ($array, $callback)
+function array_filter_key($array, $callback)
 {
     foreach ($array as $key => $value) {
-        if (! call_user_func ($callback, $key)) {
-            unset ($array[$key]);
+        if (! call_user_func($callback, $key)) {
+            unset($array[$key]);
         }
     }
     return $array;
@@ -60,14 +60,14 @@ class LDAPException extends Exception
      *
      * @param mixed $message
      */
-    public function __construct ($message)
+    public function __construct($message)
     {
-        if (is_int ($message)) {
+        if (is_int($message)) {
             $message = 'LDAP error: [' . $message . '] ' . ldap_err2str($message);
         }
 
         debug_event('LDAP', 'Exception: ' . $message, 6);
-        parent::__construct ($message);
+        parent::__construct($message);
     }
 }
 
@@ -98,7 +98,7 @@ class LDAP
      * This function is here to return a real array {number} => {field} => {value array}
      * instead of the custom LDAP search results provided by the ldap_* library.
      */
-    private static function clean_search_results ($sr)
+    private static function clean_search_results($sr)
     {
         $sr_clean = [];
         
@@ -106,7 +106,7 @@ class LDAP
             $sr_clean[$i] = [];
             
             foreach ($result as $field => $values) {
-                if ($field == 'count' || is_int ($field)) {
+                if ($field == 'count' || is_int($field)) {
                     continue;
                 } elseif ($field == 'dn') {
                     $sr_clean[$i][$field] = $values;
@@ -129,23 +129,23 @@ class LDAP
      * the given parameters are plausibe and can be used to open a
      * connection as soon as one is needed.
      */
-    private static function connect ()
+    private static function connect()
     {
         if (! $url = AmpConfig::get('ldap_url')) {
             throw new LDAPException('Required configuration value missing: ldap_url');
         }
 
-        if (! $link = ldap_connect ($url)) {
+        if (! $link = ldap_connect($url)) {
             throw new LDAPException('Could not connect to ' . $url);
         }
 
         $protocol_version = AmpConfig::get('ldap_protocol_version', 3);
-        if (! ldap_set_option ($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version)) {
+        if (! ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version)) {
             throw new LDAPException('Could not set option PROTOCOL_VERSION to ' . $protocol_version);
         }
 
         if (AmpConfig::get('ldap_start_tls', "false") != "false") {
-            if (! ldap_start_tls ($link)) {
+            if (! ldap_start_tls($link)) {
                 throw new LDAPException('Could not use StartTLS');
             }
         }
@@ -157,7 +157,7 @@ class LDAP
     /**
      * Binds to the LDAP
      */
-    private static function bind ($link, $username = null, $password = null)
+    private static function bind($link, $username = null, $password = null)
     {
         debug_event('LDAP', "binding with username `$username`", 5);
         
@@ -166,7 +166,7 @@ class LDAP
             $password = AmpConfig::get('ldap_password', '');
         }
 
-        if (! ldap_bind ($link, $username, $password)) {
+        if (! ldap_bind($link, $username, $password)) {
             throw new LDAPException("Could not bind to server using username `$username`");
         }
     }
@@ -175,25 +175,25 @@ class LDAP
     /**
      * Unbinds from the LDAP
      */
-    private static function unbind ($link)
+    private static function unbind($link)
     {
-        ldap_unbind ($link);
+        ldap_unbind($link);
     }
 
 
     /**
      * Read attributes for a DN from the LDAP
      */
-    private static function read ($link, $dn, $attrs = [], $filter='objectClass=*')
+    private static function read($link, $dn, $attrs = [], $filter='objectClass=*')
     {
-        $attrs_json = json_encode ($attrs);
+        $attrs_json = json_encode($attrs);
         debug_event('LDAP', "reading attributes $attrs_json in `$dn`", 5);
         
-        if (! $result = ldap_read ($link, $dn, $filter, $attrs)) {
+        if (! $result = ldap_read($link, $dn, $filter, $attrs)) {
             throw new LDAPException("Could not read attributes `$attrs_json` for dn `$dn`");
         }
 
-        if (! $infos = ldap_get_entries ($link, $result)) {
+        if (! $infos = ldap_get_entries($link, $result)) {
             throw new LDAPException("Empty search result for dn `$dn`");
         }
 
@@ -204,24 +204,24 @@ class LDAP
     /**
      * Search for a DN in the LDAP
      */
-    private static function search ($link, $base_dn, $filter, $only_one_result = true)
+    private static function search($link, $base_dn, $filter, $only_one_result = true)
     {
         debug_event('LDAP', "searching in `$base_dn` for `$filter`", 5);
         
-        if (! $result = ldap_search ($link, $base_dn, $filter)) {
+        if (! $result = ldap_search($link, $base_dn, $filter)) {
             throw new LDAPException(ldap_errno($link));
         }
 
-        $entries = ldap_get_entries ($link, $result);
+        $entries = ldap_get_entries($link, $result);
 
         $entries = self::clean_search_results($entries);
 
         if ($only_one_result) {
-            if (count ($entries) < 1) {
+            if (count($entries) < 1) {
                 throw new LDAPException("Empty search results for filter `$filter`");
             }
 
-            if (count ($entries) > 1) {
+            if (count($entries) > 1) {
                 throw new LDAPException("Too many search results for filter `$filter`");
             }
 
@@ -243,10 +243,10 @@ class LDAP
      * @param string $password
      * @return array
      */
-    public static function auth ($username, $password)
+    public static function auth($username, $password)
     {
         try {
-            $link = self::connect ();
+            $link = self::connect();
             self::bind($link);
 
             /* Search for the user with given base_dn, filter, objectclass and username */
@@ -255,7 +255,7 @@ class LDAP
                 throw new LDAPException('Required configuration value missing: ldap_filter');
             }
 
-            if (strpos ($filter, '%v') !== false) {
+            if (strpos($filter, '%v') !== false) {
                 $filter = str_replace('%v', $username, $filter);
             } else {
                 $filter = "($filter=$username)"; // Backward compatibility
@@ -266,23 +266,23 @@ class LDAP
             }
 
             $search = "(&(objectclass=$objectclass)$filter)";
-            debug_event ('LDAP', 'search: ' . $search, 5);
+            debug_event('LDAP', 'search: ' . $search, 5);
 
             if (! $base_dn = AmpConfig::get('ldap_search_dn')) {
                 throw new LDAPException('Required configuration value missing: ldap_search_dn');
             }
 
-            $user_entry = self::search ($link, $base_dn, $search, true);
+            $user_entry = self::search($link, $base_dn, $search, true);
             $user_dn    = $user_entry['dn'];
             
-            self::bind ($link, $user_dn, $password);
+            self::bind($link, $user_dn, $password);
 
             /* Test if the user is in the required group (optional) */
 
             if ($group_dn = AmpConfig::get('ldap_require_group')) {
                 $member_attribute = AmpConfig::get('ldap_member_attribute', 'member');
 
-                $group_infos = self::read ($link, $group_dn, [$member_attribute]);
+                $group_infos = self::read($link, $group_dn, [$member_attribute]);
 
                 if (! preg_grep("/^$user_dn\$/i", $group_infos[$member_attribute])) {
                     throw new LDAPException("`$user_dn` is not member of the group `$group_dn`");
@@ -331,8 +331,8 @@ class LDAP
             ];
         }
 
-        if (isset ($link)) {
-            self::unbind ($link);
+        if (isset($link)) {
+            self::unbind($link);
         }
 
         debug_event('LDAP', 'Return value of authentication: ' . json_encode($return_value), 5);
diff --git a/lib/class/live_stream.class.php b/lib/class/live_stream.class.php
index 9baab0cb..800e681a 100644
--- a/lib/class/live_stream.class.php
+++ b/lib/class/live_stream.class.php
@@ -193,9 +193,9 @@ class Live_Stream extends database_object implements media, library_item
 
         $allowed_array = array('https','http','mms','mmsh','mmsu','mmst','rtsp','rtmp');
 
-        $elements = explode(":",$data['url']);
+        $elements = explode(":", $data['url']);
 
-        if (!in_array($elements['0'],$allowed_array)) {
+        if (!in_array($elements['0'], $allowed_array)) {
             AmpError::add('general', T_('Invalid URL must be mms:// , https:// or http://'));
         }
         
diff --git a/lib/class/localplay.class.php b/lib/class/localplay.class.php
index 6fb564e4..198a3901 100644
--- a/lib/class/localplay.class.php
+++ b/lib/class/localplay.class.php
@@ -104,14 +104,14 @@ class Localplay
 
         if (!$include) {
             /* Throw Error Here */
-            debug_event('localplay','Unable to load ' . $this->type . ' controller','2');
+            debug_event('localplay', 'Unable to load ' . $this->type . ' controller', '2');
             return false;
         } // include
         else {
             $class_name    = "Ampache" . $this->type;
             $this->_player = new $class_name();
             if (!($this->_player instanceof localplay_controller)) {
-                debug_event('Localplay',$this->type . ' not an instance of controller abstract, unable to load','1');
+                debug_event('Localplay', $this->type . ' not an instance of controller abstract, unable to load', '1');
                 unset($this->_player);
                 return false;
             }
@@ -124,10 +124,10 @@ class Localplay
      * is supported in the current player, if so it returns a 'skip to'
      * link, otherwise it returns just the text
      */
-    public function format_name($name,$id)
+    public function format_name($name, $id)
     {
         $name = scrub_out($name);
-        $name = Ajax::text('?page=localplay&action=command&command=skip&id=' . $id,$name,'localplay_skip_' . $id);
+        $name = Ajax::text('?page=localplay&action=command&command=skip&id=' . $id, $name, 'localplay_skip_' . $id);
         return $name;
     } // format_name
 
@@ -142,7 +142,7 @@ class Localplay
         $handle  = opendir($basedir);
 
         if (!is_resource($handle)) {
-            debug_event('Localplay','Error: Unable to read localplay controller directory','1');
+            debug_event('Localplay', 'Error: Unable to read localplay controller directory', '1');
             return array();
         }
 
@@ -212,7 +212,7 @@ class Localplay
 
         // If its our current player, reset player to nothing
         if (AmpConfig::get('localplay_controller') == $this->type) {
-            Preference::update('localplay_controller',$GLOBALS['user']->id,'');
+            Preference::update('localplay_controller', $GLOBALS['user']->id, '');
         }
 
         return true;
@@ -226,7 +226,7 @@ class Localplay
     public function connect()
     {
         if (!$this->_player->connect()) {
-            debug_event('localplay','Error Unable to connect, check ' . $this->type . ' controller','1');
+            debug_event('localplay', 'Error Unable to connect, check ' . $this->type . ' controller', '1');
             return false;
         }
 
@@ -241,7 +241,7 @@ class Localplay
     public function play()
     {
         if (!$this->_player->play()) {
-            debug_event('localplay','Error Unable to start playback, check ' . $this->type . ' controller','1');
+            debug_event('localplay', 'Error Unable to start playback, check ' . $this->type . ' controller', '1');
             return false;
         }
 
@@ -256,7 +256,7 @@ class Localplay
     public function stop()
     {
         if (!$this->_player->stop()) {
-            debug_event('localplay','Error Unable to stop playback, check ' . $this->type . ' controller','1');
+            debug_event('localplay', 'Error Unable to stop playback, check ' . $this->type . ' controller', '1');
             return false;
         }
 
@@ -296,7 +296,7 @@ class Localplay
         $data = $this->_player->repeat($state);
 
         if (!$data) {
-            debug_event('localplay',"Error Unable to set Repeat to $state",'1');
+            debug_event('localplay', "Error Unable to set Repeat to $state", '1');
         }
 
         return $data;
@@ -312,7 +312,7 @@ class Localplay
         $data = $this->_player->random($state);
 
         if (!$data) {
-            debug_event('localplay',"Error Unable to set Random to $state",'1');
+            debug_event('localplay', "Error Unable to set Random to $state", '1');
         }
 
         return $data;
@@ -328,7 +328,7 @@ class Localplay
         $data = $this->_player->status();
 
         if (!count($data)) {
-            debug_event('localplay','Error Unable to get status, check ' . $this->type . ' controller','1');
+            debug_event('localplay', 'Error Unable to get status, check ' . $this->type . ' controller', '1');
             return false;
         }
 
@@ -346,7 +346,7 @@ class Localplay
         $data = $this->_player->get();
 
         if (!count($data) or !is_array($data)) {
-            debug_event('localplay','Error Unable to get song info, check ' . $this->type . ' controller','1');
+            debug_event('localplay', 'Error Unable to get song info, check ' . $this->type . ' controller', '1');
             return array();
         }
 
@@ -370,7 +370,7 @@ class Localplay
         }
 
         if (!$this->_player->volume($value)) {
-            debug_event('localplay','Error: Unable to set volume, check ' . $this->type . ' controller','1');
+            debug_event('localplay', 'Error: Unable to set volume, check ' . $this->type . ' controller', '1');
             return false;
         }
 
@@ -385,7 +385,7 @@ class Localplay
     public function volume_up()
     {
         if (!$this->_player->volume_up()) {
-            debug_event('localplay','Error: Unable to increase volume, check ' . $this->type . ' controller','1');
+            debug_event('localplay', 'Error: Unable to increase volume, check ' . $this->type . ' controller', '1');
             return false;
         }
 
@@ -400,7 +400,7 @@ class Localplay
     public function volume_down()
     {
         if (!$this->_player->volume_down()) {
-            debug_event('localplay','Error: Unable to decrese volume, check ' . $this->type . ' controller','1');
+            debug_event('localplay', 'Error: Unable to decrese volume, check ' . $this->type . ' controller', '1');
             return false;
         }
 
@@ -415,7 +415,7 @@ class Localplay
     public function volume_mute()
     {
         if (!$this->_player->volume(0)) {
-            debug_event('localplay','Error: Unable to mute volume, check ' . $this->type . ' controller','1');
+            debug_event('localplay', 'Error: Unable to mute volume, check ' . $this->type . ' controller', '1');
             return false;
         }
 
@@ -429,7 +429,7 @@ class Localplay
     public function skip($track_id)
     {
         if (!$this->_player->skip($track_id)) {
-            debug_event('localplay','Error: Unable to skip to next song, check ' . $this->type . ' controller','1');
+            debug_event('localplay', 'Error: Unable to skip to next song, check ' . $this->type . ' controller', '1');
             return false;
         }
 
@@ -444,7 +444,7 @@ class Localplay
     public function next()
     {
         if (!$this->_player->next()) {
-            debug_event('localplay','Error: Unable to skip to next song, check ' . $this->type . ' controller','1');
+            debug_event('localplay', 'Error: Unable to skip to next song, check ' . $this->type . ' controller', '1');
             return false;
         }
 
@@ -459,7 +459,7 @@ class Localplay
     public function prev()
     {
         if (!$this->_player->prev()) {
-            debug_event('localplay','Error: Unable to skip to previous song, check ' . $this->type . ' controller','1');
+            debug_event('localplay', 'Error: Unable to skip to previous song, check ' . $this->type . ' controller', '1');
             return false;
         }
 
@@ -474,7 +474,7 @@ class Localplay
     public function pause()
     {
         if (!$this->_player->pause()) {
-            debug_event('localplay','Error: Unable to pause song, check ' . $this->type . ' controller','1');
+            debug_event('localplay', 'Error: Unable to pause song, check ' . $this->type . ' controller', '1');
             return false;
         }
 
@@ -518,9 +518,9 @@ class Localplay
      * update_instance
      * This updates the specified instance with a named array of data (_POST most likely)
      */
-    public function update_instance($uid,$data)
+    public function update_instance($uid, $data)
     {
-        $data = $this->_player->update_instance($uid,$data);
+        $data = $this->_player->update_instance($uid, $data);
 
         return $data;
     } // update_instance
@@ -560,7 +560,7 @@ class Localplay
     public function delete_track($object_id)
     {
         if (!$this->_player->delete_track($object_id)) {
-            debug_event('localplay','Error: Unable to remove songs, check ' . $this->type . ' controller','1');
+            debug_event('localplay', 'Error: Unable to remove songs, check ' . $this->type . ' controller', '1');
             return false;
         }
 
@@ -576,7 +576,7 @@ class Localplay
     public function delete_all()
     {
         if (!$this->_player->clear_playlist()) {
-            debug_event('localplay','Error: Unable to delete entire playlist, check ' . $this->type . ' controller','1');
+            debug_event('localplay', 'Error: Unable to delete entire playlist, check ' . $this->type . ' controller', '1');
             return false;
         }
 
@@ -629,7 +629,7 @@ class Localplay
         /* This is a cheezball fix for when we were unable to find a
          * artist/album (or one wasn't provided)
          */
-        $track_name = ltrim(ltrim($track_name,' - '),' - ');
+        $track_name = ltrim(ltrim($track_name, ' - '), ' - ');
 
         $track_name = "[" . $status['track'] . "] - " . $track_name;
 
diff --git a/lib/class/localplay_controller.abstract.php b/lib/class/localplay_controller.abstract.php
index ae9ed670..aad5b822 100644
--- a/lib/class/localplay_controller.abstract.php
+++ b/lib/class/localplay_controller.abstract.php
@@ -45,7 +45,7 @@ abstract class localplay_controller
     // For display we need the following 'instance' functions
     abstract public function add_instance($data);
     abstract public function delete_instance($id);
-    abstract public function update_instance($id,$post);
+    abstract public function update_instance($id, $post);
     abstract public function get_instances();
     abstract public function instance_fields();
     abstract public function set_active_instance($uid);
@@ -65,7 +65,7 @@ abstract class localplay_controller
 
         $class = get_class($object);
 
-        $url = call_user_func(array($class,'play_url'),$object->id);
+        $url = call_user_func(array($class, 'play_url'), $object->id);
 
         return $url;
     } // get_url
@@ -92,9 +92,9 @@ abstract class localplay_controller
         $primary_array = array('oid','demo_id','random');
         $data          = array();
 
-        $variables = parse_url($url,PHP_URL_QUERY);
+        $variables = parse_url($url, PHP_URL_QUERY);
         if ($variables) {
-            parse_str($variables,$data);
+            parse_str($variables, $data);
 
             foreach ($primary_array as $pkey) {
                 if ($data[$pkey]) {
diff --git a/lib/class/playlist.class.php b/lib/class/playlist.class.php
index 556cdf7b..8014a732 100644
--- a/lib/class/playlist.class.php
+++ b/lib/class/playlist.class.php
@@ -78,13 +78,13 @@ class Playlist extends playlist_object
             return false;
         }
 
-        $idlist = '(' . implode(',',$ids) . ')';
+        $idlist = '(' . implode(',', $ids) . ')';
 
         $sql        = "SELECT * FROM `playlist` WHERE `id` IN $idlist";
         $db_results = Dba::read($sql);
 
         while ($row = Dba::fetch_assoc($db_results)) {
-            parent::add_to_cache('playlist',$row['id'],$row);
+            parent::add_to_cache('playlist', $row['id'], $row);
         }
     } // build_cache
 
@@ -300,7 +300,7 @@ class Playlist extends playlist_object
      */
     private function update_type($new_type)
     {
-        if ($this->_update_item('type',$new_type,50)) {
+        if ($this->_update_item('type', $new_type, 50)) {
             $this->type = $new_type;
         }
     } // update_type
@@ -311,7 +311,7 @@ class Playlist extends playlist_object
      */
     private function update_name($new_name)
     {
-        if ($this->_update_item('name',$new_name,50)) {
+        if ($this->_update_item('name', $new_name, 50)) {
             $this->name = $new_name;
         }
     } // update_name
@@ -323,7 +323,7 @@ class Playlist extends playlist_object
     private function update_last_update()
     {
         $last_update = time();
-        if ($this->_update_item('last_update',$last_update,50)) {
+        if ($this->_update_item('last_update', $last_update, 50)) {
             $this->last_update = $last_update;
         }
     } // update_last_update
@@ -332,9 +332,9 @@ class Playlist extends playlist_object
      * _update_item
      * This is the generic update function, it does the escaping and error checking
      */
-    private function _update_item($field,$value,$level)
+    private function _update_item($field, $value, $level)
     {
-        if ($GLOBALS['user']->id != $this->user && !Access::check('interface',$level)) {
+        if ($GLOBALS['user']->id != $this->user && !Access::check('interface', $level)) {
             return false;
         }
 
diff --git a/lib/class/plex_api.class.php b/lib/class/plex_api.class.php
index 9f3c4358..25ce720b 100644
--- a/lib/class/plex_api.class.php
+++ b/lib/class/plex_api.class.php
@@ -119,7 +119,7 @@ class Plex_Api
             // Need to get a match between Plex and Ampache users
             if ($match_users) {
                 if (!AmpConfig::get('access_control')) {
-                    debug_event('Access Control', 'Error Attempted to use Plex with Access Control turned off and plex/ampache link enabled.','3');
+                    debug_event('Access Control', 'Error Attempted to use Plex with Access Control turned off and plex/ampache link enabled.', '3');
                     self::createError(401);
                 }
 
@@ -333,7 +333,7 @@ class Plex_Api
 
     public static function registerMyPlex($authtoken)
     {
-        $headers = array (
+        $headers = array(
             'Content-Type: text/xml'
         );
         $action = 'servers.xml?auth_token=' . $authtoken;
@@ -352,7 +352,7 @@ class Plex_Api
 
     public static function publishDeviceConnection($authtoken)
     {
-        $headers  = array ();
+        $headers  = array();
         $action   = 'devices/' . Plex_XML_Data::getMachineIdentifier() . '?Connection[][uri]=' . Plex_XML_Data::getServerUri() . '&X-Plex-Token=' . $authtoken;
         $curlopts = array(
             CURLOPT_CUSTOMREQUEST => "PUT"
@@ -363,7 +363,7 @@ class Plex_Api
 
     public static function unregisterMyPlex($authtoken)
     {
-        $headers = array (
+        $headers = array(
             'Content-Type: text/xml'
         );
         $action   = 'servers/' . Plex_XML_Data::getMachineIdentifier() . '.xml?auth_token=' . $authtoken;
@@ -1092,7 +1092,7 @@ class Plex_Api
             CURLOPT_TIMEOUT => 0
         ));
         if (curl_exec($ch) === false) {
-            debug_event('plex-api', 'Curl error: ' . curl_error($ch),1);
+            debug_event('plex-api', 'Curl error: ' . curl_error($ch), 1);
         }
         curl_close($ch);
     }
diff --git a/lib/class/plugin.class.php b/lib/class/plugin.class.php
index 39da576c..46ad8e95 100644
--- a/lib/class/plugin.class.php
+++ b/lib/class/plugin.class.php
@@ -98,7 +98,7 @@ class Plugin
         $handle  = opendir($basedir);
 
         if (!is_resource($handle)) {
-            debug_event('Plugins','Unable to read plugins directory','1');
+            debug_event('Plugins', 'Unable to read plugins directory', '1');
         }
 
         // Recurse the directory
@@ -172,15 +172,15 @@ class Plugin
         }
 
         /* Make sure we've got the required methods */
-        if (!method_exists($this->_plugin,'install')) {
+        if (!method_exists($this->_plugin, 'install')) {
             return false;
         }
 
-        if (!method_exists($this->_plugin,'uninstall')) {
+        if (!method_exists($this->_plugin, 'uninstall')) {
             return false;
         }
 
-        if (!method_exists($this->_plugin,'load')) {
+        if (!method_exists($this->_plugin, 'load')) {
             return false;
         }
 
diff --git a/lib/class/podcast.class.php b/lib/class/podcast.class.php
index 5f84e4e0..682f4cbe 100644
--- a/lib/class/podcast.class.php
+++ b/lib/class/podcast.class.php
@@ -125,7 +125,7 @@ class Podcast extends database_object implements library_item
     private function _get_extra_info()
     {
         // Try to find it in the cache and save ourselves the trouble
-        if (parent::is_cached('podcast_extra', $this->id) ) {
+        if (parent::is_cached('podcast_extra', $this->id)) {
             $row = parent::get_from_cache('podcast_extra', $this->id);
         } else {
             $sql = "SELECT COUNT(`podcast_episode`.`id`) AS `episode_count` FROM `podcast_episode` " .
@@ -133,7 +133,7 @@ class Podcast extends database_object implements library_item
             $db_results = Dba::read($sql, array($this->id));
             $row        = Dba::fetch_assoc($db_results);
 
-            parent::add_to_cache('podcast_extra',$this->id,$row);
+            parent::add_to_cache('podcast_extra', $this->id, $row);
         }
 
         /* Set Object Vars */
diff --git a/lib/class/podcast_episode.class.php b/lib/class/podcast_episode.class.php
index 44af5bde..7ac3b559 100644
--- a/lib/class/podcast_episode.class.php
+++ b/lib/class/podcast_episode.class.php
@@ -282,7 +282,7 @@ class Podcast_Episode extends database_object implements media, library_item
      */
     public static function update_played($new_played, $id)
     {
-        self::_update_item('played', ($new_played ? 1 : 0),$id,'25');
+        self::_update_item('played', ($new_played ? 1 : 0), $id, '25');
     } // update_played
 
     /**
@@ -300,7 +300,7 @@ class Podcast_Episode extends database_object implements media, library_item
     private static function _update_item($field, $value, $song_id, $level)
     {
         /* Check them Rights! */
-        if (!Access::check('interface',$level)) {
+        if (!Access::check('interface', $level)) {
             return false;
         }
 
diff --git a/lib/class/preference.class.php b/lib/class/preference.class.php
index 8abef319..50d17e70 100644
--- a/lib/class/preference.class.php
+++ b/lib/class/preference.class.php
@@ -70,7 +70,7 @@ class Preference extends database_object
      * update
      * This updates a single preference from the given name or id
      */
-    public static function update($preference,$user_id,$value,$applytoall=false,$applytodefault=false)
+    public static function update($preference, $user_id, $value, $applytoall=false, $applytodefault=false)
     {
         // First prepare
         if (!is_numeric($preference)) {
@@ -80,7 +80,7 @@ class Preference extends database_object
             $name = self::name_from_id($preference);
             $id   = $preference;
         }
-        if ($applytoall and Access::check('interface','100')) {
+        if ($applytoall and Access::check('interface', '100')) {
             $user_check = "";
         } else {
             $user_check = " AND `user`='$user_id'";
@@ -117,7 +117,7 @@ class Preference extends database_object
      * update_level
      * This takes a preference ID and updates the level required to update it (performed by an admin)
      */
-    public static function update_level($preference,$level)
+    public static function update_level($preference, $level)
     {
         // First prepare
         if (!is_numeric($preference)) {
@@ -139,7 +139,7 @@ class Preference extends database_object
      * update_all
      * This takes a preference id and a value and updates all users with the new info
      */
-    public static function update_all($preference_id,$value)
+    public static function update_all($preference_id, $value)
     {
         $preference_id = Dba::escape($preference_id);
         $value         = Dba::escape($value);
@@ -184,7 +184,7 @@ class Preference extends database_object
         $db_results = Dba::read($sql);
         $data       = Dba::fetch_assoc($db_results);
 
-        if (Access::check('interface',$data['level'])) {
+        if (Access::check('interface', $data['level'])) {
             return true;
         }
 
@@ -283,7 +283,7 @@ class Preference extends database_object
      * This inserts a new preference into the preference table
      * it does NOT sync up the users, that should be done independently
      */
-    public static function insert($name,$description,$default,$level,$type,$catagory,$subcatagory=null)
+    public static function insert($name, $description, $default, $level, $type, $catagory, $subcatagory=null)
     {
         if ($subcatagory !== null) {
             $subcatagory = strtolower($subcatagory);
@@ -374,10 +374,10 @@ class Preference extends database_object
 
         foreach ($results as $key=>$data) {
             if (!is_array($data)) {
-                if (strcasecmp($data,"true") == "0") {
+                if (strcasecmp($data, "true") == "0") {
                     $results[$key] = 1;
                 }
-                if (strcasecmp($data,"false") == "0") {
+                if (strcasecmp($data, "false") == "0") {
                     $results[$key] = 0;
                 }
             }
@@ -431,7 +431,7 @@ class Preference extends database_object
                     'transcode_m4a','transcode_mp3','transcode_ogg','transcode_flac',
                     'shoutcast_active','httpq_active','show_lyrics');
 
-        if (in_array($key,$boolean_array)) {
+        if (in_array($key, $boolean_array)) {
             return true;
         }
 
diff --git a/lib/class/query.class.php b/lib/class/query.class.php
index 83a930f0..d3573348 100644
--- a/lib/class/query.class.php
+++ b/lib/class/query.class.php
@@ -246,7 +246,7 @@ class Query
             )
         );
 
-        if (Access::check('interface','50')) {
+        if (Access::check('interface', '50')) {
             array_push(self::$allowed_filters['playlist'], 'playlist_type');
         }
 
@@ -514,7 +514,7 @@ class Query
             break;
             case 'playlist_type':
                 // Must be a content manager to turn this off
-                if (Access::check('interface','100')) {
+                if (Access::check('interface', '100')) {
                     unset($this->_state['filter'][$key]);
                 } else {
                     $this->_state['filter'][$key] = '1';
@@ -760,7 +760,7 @@ class Query
      * @param string $sort
      * @param string $order
      */
-    public function set_sort($sort,$order='')
+    public function set_sort($sort, $order='')
     {
         // If it's not in our list, smeg off!
         if (!in_array($sort, self::$allowed_sorts[$this->get_type()])) {
@@ -800,7 +800,7 @@ class Query
      *
      * @param int $catalog_number
      */
-    public function set_catalog( $catalog_number )
+    public function set_catalog($catalog_number)
     {
         $this->catalog = $catalog_number;
         debug_event("Catalog", "set catalog id: " . $this->catalog, "5");
@@ -1160,7 +1160,7 @@ class Query
             $sql .= $dis . " AND ";
         }
 
-        $sql = rtrim($sql,'AND ') . ' ';
+        $sql = rtrim($sql, 'AND ') . ' ';
 
         return $sql;
     } // get_filter_sql
@@ -1183,8 +1183,8 @@ class Query
             $sql .= $this->sql_sort($key, $value);
         }
 
-        $sql = rtrim($sql,'ORDER BY ');
-        $sql = rtrim($sql,',');
+        $sql = rtrim($sql, 'ORDER BY ');
+        $sql = rtrim($sql, ',');
 
         return $sql;
     } // get_sort_sql
@@ -1264,7 +1264,7 @@ class Query
         $limit_sql = $limit ? $this->get_limit_sql() : '';
         $final_sql = $sql . $join_sql . $filter_sql . $having_sql;
 
-        if ( ($this->get_type() == 'artist' || $this->get_type() == 'album') && !$this->_state['custom'] ) {
+        if (($this->get_type() == 'artist' || $this->get_type() == 'album') && !$this->_state['custom']) {
             $final_sql .= " GROUP BY `" . $this->get_type() . "`.`name`, `" . $this->get_type() . "`.`id` ";
         }
         $final_sql .= $order_sql . $limit_sql;
@@ -1328,7 +1328,7 @@ class Query
                     foreach ($value as $tag_id) {
                         $filter_sql .= "  `tag_map`.`tag_id`='" . Dba::escape($tag_id) . "' AND";
                     }
-                    $filter_sql = rtrim($filter_sql,'AND') . ') AND ';
+                    $filter_sql = rtrim($filter_sql, 'AND') . ') AND ';
                 break;
                 case 'exact_match':
                     $filter_sql = " `song`.`title` = '" . Dba::escape($value) . "' AND ";
@@ -1399,7 +1399,7 @@ class Query
                     foreach ($value as $tag_id) {
                         $filter_sql .= "  `tag_map`.`tag_id`='" . Dba::escape($tag_id) . "' AND";
                     }
-                    $filter_sql = rtrim($filter_sql,'AND') . ') AND ';
+                    $filter_sql = rtrim($filter_sql, 'AND') . ') AND ';
                 break;
                 case 'exact_match':
                     $filter_sql = " `album`.`name` = '" . Dba::escape($value) . "' AND ";
@@ -1437,8 +1437,8 @@ class Query
                 break;
                 case 'catalog':
                     if ($value != 0) {
-                        $this->set_join('left','`song`','`album`.`id`','`song`.`album`', 100);
-                        $this->set_join('left','`catalog`','`song`.`catalog`','`catalog`.`id`', 100);
+                        $this->set_join('left', '`song`', '`album`.`id`', '`song`.`album`', 100);
+                        $this->set_join('left', '`catalog`', '`song`.`catalog`', '`catalog`.`id`', 100);
                         $filter_sql = " (`song`.`catalog` = '$value') AND ";
                     }
                 break;
@@ -1469,12 +1469,12 @@ class Query
                     foreach ($value as $tag_id) {
                         $filter_sql .= "  `tag_map`.`tag_id`='" . Dba::escape($tag_id) . "' AND";
                     }
-                    $filter_sql = rtrim($filter_sql,'AND') . ') AND ';
+                    $filter_sql = rtrim($filter_sql, 'AND') . ') AND ';
                 break;
                 case 'catalog':
                 if ($value != 0) {
-                    $this->set_join('left','`song`','`artist`.`id`','`song`.`artist`', 100);
-                    $this->set_join('left','`catalog`','`song`.`catalog`','`catalog`.`id`', 100);
+                    $this->set_join('left', '`song`', '`artist`.`id`', '`song`.`artist`', 100);
+                    $this->set_join('left', '`catalog`', '`song`.`catalog`', '`catalog`.`id`', 100);
                     $filter_sql = "  (`catalog`.`id` = '$value') AND ";
                 }
                 break;
@@ -1640,7 +1640,7 @@ class Query
                     foreach ($value as $tag_id) {
                         $filter_sql .= "  `tag_map`.`tag_id`='" . Dba::escape($tag_id) . "' AND";
                     }
-                    $filter_sql = rtrim($filter_sql,'AND') . ') AND ';
+                    $filter_sql = rtrim($filter_sql, 'AND') . ') AND ';
                 break;
                 case 'alpha_match':
                     $filter_sql = " `video`.`title` LIKE '%" . Dba::escape($value) . "%' AND ";
@@ -2331,7 +2331,7 @@ class Query
                 $object_id = Dba::escape($object_id);
                 $where_sql .= "'$object_id',";
             }
-            $where_sql = rtrim($where_sql,',');
+            $where_sql = rtrim($where_sql, ',');
 
             $where_sql .= ")";
 
@@ -2343,8 +2343,8 @@ class Query
                 $order_sql .= $this->sql_sort($key, $value);
             }
             // Clean her up
-            $order_sql = rtrim($order_sql,"ORDER BY ");
-            $order_sql = rtrim($order_sql,",");
+            $order_sql = rtrim($order_sql, "ORDER BY ");
+            $order_sql = rtrim($order_sql, ",");
 
             $sql = $sql . $this->get_join_sql() . $where_sql . $order_sql;
         } // if not simple
diff --git a/lib/class/random.class.php b/lib/class/random.class.php
index bc9045b7..3035c4da 100644
--- a/lib/class/random.class.php
+++ b/lib/class/random.class.php
@@ -152,7 +152,7 @@ class Random
     {
         $results = array();
 
-        $data      = $GLOBALS['user']->get_recently_played('1','artist');
+        $data      = $GLOBALS['user']->get_recently_played('1', 'artist');
         $where_sql = "";
         if ($data[0]) {
             $where_sql = " AND `song`.`artist`='" . $data[0] . "' ";
diff --git a/lib/class/registration.class.php b/lib/class/registration.class.php
index f69a4a73..42735ae9 100644
--- a/lib/class/registration.class.php
+++ b/lib/class/registration.class.php
@@ -124,13 +124,13 @@ Website: %s
         }
 
         /* Check for existance */
-        $fp = fopen($filename,'r');
+        $fp = fopen($filename, 'r');
 
         if (!$fp) {
             return false;
         }
 
-        $data = fread($fp,filesize($filename));
+        $data = fread($fp, filesize($filename));
 
         /* Scrub and show */
         echo $data;
diff --git a/lib/class/scrobbler.class.php b/lib/class/scrobbler.class.php
index a815ec15..7ef18cc9 100644
--- a/lib/class/scrobbler.class.php
+++ b/lib/class/scrobbler.class.php
@@ -34,7 +34,7 @@ class scrobbler
      * Constructor
      * This is the constructer it takes a username and password
      */
-    public function __construct($api_key, $scheme='https',$host='',$challenge='', $secret='')
+    public function __construct($api_key, $scheme='https', $host='', $challenge='', $secret='')
     {
         $this->error_msg     = '';
         $this->challenge     = $challenge;
@@ -127,7 +127,7 @@ class scrobbler
      * This is a generic caller for HTTP requests
      * It need the method (GET/POST), the url and the parameters
      */
-    public function get_session_key ($token=null)
+    public function get_session_key($token=null)
     {
         if (!is_null($token)) {
             $vars = array(
@@ -169,10 +169,10 @@ class scrobbler
      * submit the track or talk to LastFM / Libre in anyway, kind of useless for our uses but its
      * here, and that's how it is.
      */
-    public function queue_track($artist, $album, $title, $timestamp, $length,$track)
+    public function queue_track($artist, $album, $title, $timestamp, $length, $track)
     {
         if ($length < 30) {
-            debug_event('Scrobbler',"Not queuing track, too short",'5');
+            debug_event('Scrobbler', "Not queuing track, too short", '5');
             return false;
         }
 
diff --git a/lib/class/session.class.php b/lib/class/session.class.php
index d81dcc1a..d0e3b1f3 100644
--- a/lib/class/session.class.php
+++ b/lib/class/session.class.php
@@ -512,7 +512,7 @@ class Session
         $auth  = false;
         $cname = AmpConfig::get('session_name') . '_remember';
         if (isset($_COOKIE[$cname])) {
-            list ($username, $token, $mac) = explode(':', $_COOKIE[$cname]);
+            list($username, $token, $mac) = explode(':', $_COOKIE[$cname]);
             if ($mac === hash_hmac('sha256', $username . ':' . $token, AmpConfig::get('secret_key'))) {
                 $sql        = "SELECT * FROM `session_remember` WHERE `username` = ? AND `token` = ? AND `expire` >= ?";
                 $db_results = Dba::read($sql, array($username, $token, time()));
diff --git a/lib/class/shoutbox.class.php b/lib/class/shoutbox.class.php
index 4d22b2ca..88ab0288 100644
--- a/lib/class/shoutbox.class.php
+++ b/lib/class/shoutbox.class.php
@@ -100,7 +100,7 @@ class Shoutbox
 
         // If we've already got too many stop here
         if (count($shouts) > $limit) {
-            $shouts = array_slice($shouts,0,$limit);
+            $shouts = array_slice($shouts, 0, $limit);
             return $shouts;
         }
 
@@ -157,7 +157,7 @@ class Shoutbox
      * get_object
      * This takes a type and an ID and returns a created object
      */
-    public static function get_object($type,$object_id)
+    public static function get_object($type, $object_id)
     {
         if (!Core::is_library_item($type)) {
             return false;
@@ -306,10 +306,10 @@ class Shoutbox
         if ($details) {
             $html .= "<div class='shoutbox-actions'>";
             if ($jsbuttons) {
-                $html .= Ajax::button('?page=stream&action=directplay&playtype=' . $this->object_type . '&' . $this->object_type . '_id=' . $this->object_id,'play', T_('Play'),'play_' . $this->object_type . '_' . $this->object_id);
-                $html .= Ajax::button('?action=basket&type=' . $this->object_type . '&id=' . $this->object_id,'add', T_('Add'),'add_' . $this->object_type . '_' . $this->object_id);
+                $html .= Ajax::button('?page=stream&action=directplay&playtype=' . $this->object_type . '&' . $this->object_type . '_id=' . $this->object_id, 'play', T_('Play'), 'play_' . $this->object_type . '_' . $this->object_id);
+                $html .= Ajax::button('?action=basket&type=' . $this->object_type . '&id=' . $this->object_id, 'add', T_('Add'), 'add_' . $this->object_type . '_' . $this->object_id);
             }
-            if (Access::check('interface','25')) {
+            if (Access::check('interface', '25')) {
                 $html .= "<a href=\"" . AmpConfig::get('web_path') . "/shout.php?action=show_add_shout&type=" . $this->object_type . "&id=" . $this->object_id . "\">" . UI::get_icon('comment', T_('Post Shout')) . "</a>";
             }
             $html .= "</div>";
diff --git a/lib/class/song.class.php b/lib/class/song.class.php
index 00470d28..7980d766 100644
--- a/lib/class/song.class.php
+++ b/lib/class/song.class.php
@@ -593,8 +593,8 @@ class Song extends database_object implements media, library_item
     {
         $id = intval($this->id);
 
-        if (parent::is_cached('song_data',$id)) {
-            return parent::get_from_cache('song_data',$id);
+        if (parent::is_cached('song_data', $id)) {
+            return parent::get_from_cache('song_data', $id);
         }
 
         $sql        = "SELECT * FROM song_data WHERE `song_id` = ?";
@@ -602,7 +602,7 @@ class Song extends database_object implements media, library_item
 
         $results = Dba::fetch_assoc($db_results);
 
-        parent::add_to_cache('song_data',$id,$results);
+        parent::add_to_cache('song_data', $id, $results);
 
         return $results;
     } // _get_ext_info
@@ -902,7 +902,7 @@ class Song extends database_object implements media, library_item
     public static function compare_song_information(Song $song, Song $new_song)
     {
         // Remove some stuff we don't care about
-        unset($song->catalog,$song->played,$song->enabled,$song->addition_time,$song->update_time,$song->type);
+        unset($song->catalog, $song->played, $song->enabled, $song->addition_time, $song->update_time, $song->type);
         $string_array = array('title','comment','lyrics','composer','tags');
         $skip_array   = array('id','tag_id','mime','artist_mbid','album_mbid','albumartist_mbid','albumartist','mbid','mb_albumid_group','waveform','object_cnt');
 
@@ -919,7 +919,7 @@ class Song extends database_object implements media, library_item
         // Foreach them
         foreach ($fields as $key=>$value) {
             $key = trim($key);
-            if (empty($key) || in_array($key,$skip_array)) {
+            if (empty($key) || in_array($key, $skip_array)) {
                 continue;
             }
 
@@ -1171,7 +1171,7 @@ class Song extends database_object implements media, library_item
      * @param string $new_title
      * @param int $song_id
      */
-    public static function update_title($new_title,$song_id)
+    public static function update_title($new_title, $song_id)
     {
         self::_update_item('title', $new_title, $song_id, 50, true);
     } // update_title
@@ -1401,7 +1401,7 @@ class Song extends database_object implements media, library_item
         }
 
         /* Check them rights boy! */
-        if (!Access::check('interface',$level)) {
+        if (!Access::check('interface', $level)) {
             return false;
         }
 
@@ -1637,7 +1637,7 @@ class Song extends database_object implements media, library_item
     {
         $fields = get_class_vars('Song');
 
-        unset($fields['id'],$fields['_transcoded'],$fields['_fake'],$fields['cache_hit'],$fields['mime'],$fields['type']);
+        unset($fields['id'], $fields['_transcoded'], $fields['_fake'], $fields['cache_hit'], $fields['mime'], $fields['type']);
 
         // Some additional fields
         $fields['tag']     = true;
@@ -1679,7 +1679,7 @@ class Song extends database_object implements media, library_item
      * @param int $catalog_id
      * @return string
      */
-    public function get_rel_path($file_path=null,$catalog_id=0)
+    public function get_rel_path($file_path=null, $catalog_id=0)
     {
         $info = null;
         if (!$file_path) {
@@ -1692,7 +1692,7 @@ class Song extends database_object implements media, library_item
             }
             $catalog_id = $info['catalog'];
         }
-        $catalog = Catalog::create_from_id( $catalog_id );
+        $catalog = Catalog::create_from_id($catalog_id);
         return $catalog->get_rel_path($file_path);
     } // get_rel_path
 
@@ -1785,7 +1785,7 @@ class Song extends database_object implements media, library_item
             // If user is not empty, we're looking directly to user personal info (admin view)
             $sql .= "AND `user`='$user_id' ";
         } else {
-            if (!Access::check('interface','100')) {
+            if (!Access::check('interface', '100')) {
                 // If user identifier is empty, we need to retrieve only users which have allowed view of personnal info
             $personal_info_id = Preference::id_from_name('allow_personal_info_recent');
                 if ($personal_info_id) {
diff --git a/lib/class/stats.class.php b/lib/class/stats.class.php
index b257f0da..e9a173f9 100644
--- a/lib/class/stats.class.php
+++ b/lib/class/stats.class.php
@@ -217,7 +217,7 @@ class Stats
      * This returns the objects that have happened for $user_id sometime after $time
      * used primarly by the democratic cooldown code
      */
-    public static function get_object_history($user_id='',$time)
+    public static function get_object_history($user_id='', $time)
     {
         $user_id = $user_id ? $user_id : $GLOBALS['user']->id;
 
@@ -271,7 +271,7 @@ class Stats
      * This returns the top X for type Y from the
      * last stats_threshold days
      */
-    public static function get_top($type,$count='',$threshold = '',$offset='')
+    public static function get_top($type, $count='', $threshold = '', $offset='')
     {
         if (!$count) {
             $count = AmpConfig::get('popular_threshold');
@@ -323,7 +323,7 @@ class Stats
      * get_recent
      * This returns the recent X for type Y
     */
-    public static function get_recent($type, $count='',$offset='')
+    public static function get_recent($type, $count='', $offset='')
     {
         if (!$count) {
             $count = AmpConfig::get('popular_threshold');
@@ -354,7 +354,7 @@ class Stats
      * This gets all stats for atype based on user with thresholds and all
      * If full is passed, doesn't limit based on date
      */
-    public static function get_user($count,$type,$user,$full='')
+    public static function get_user($count, $type, $user, $full='')
     {
         $count = intval($count);
         $type  = self::validate_type($type);
diff --git a/lib/class/stream.class.php b/lib/class/stream.class.php
index 5dad1d8a..b61068b7 100644
--- a/lib/class/stream.class.php
+++ b/lib/class/stream.class.php
@@ -378,7 +378,7 @@ class Stream
                 'AND `np`.`insertion` = `np2`.`max_insertion` ';
         }
 
-        if (!Access::check('interface','100')) {
+        if (!Access::check('interface', '100')) {
             // We need to check only for users which have allowed view of personnal info
             $personal_info_id = Preference::id_from_name('allow_personal_info_now');
             if ($personal_info_id) {
@@ -481,12 +481,12 @@ class Stream
         }
 
         if (AmpConfig::get('force_http_play')) {
-            $web_path = str_replace("https://", "http://",$web_path);
+            $web_path = str_replace("https://", "http://", $web_path);
         }
 
         $http_port = AmpConfig::get('http_port');
         if (!empty($http_port) && $http_port != 80 && $http_port != 443) {
-            if (preg_match("/:(\d+)/",$web_path,$matches)) {
+            if (preg_match("/:(\d+)/", $web_path, $matches)) {
                 $web_path = str_replace(':' . $matches['1'], ':' . $http_port, $web_path);
             } else {
                 $web_path = str_replace(AmpConfig::get('http_host'), AmpConfig::get('http_host') . ':' . $http_port, $web_path);
diff --git a/lib/class/subsonic_api.class.php b/lib/class/subsonic_api.class.php
index 158964f2..59034827 100644
--- a/lib/class/subsonic_api.class.php
+++ b/lib/class/subsonic_api.class.php
@@ -71,7 +71,7 @@ class Subsonic_Api
             $hex    = substr($password, 4);
             $decpwd = '';
             for ($i=0; $i<strlen($hex); $i+=2) {
-                $decpwd .= chr(hexdec(substr($hex,$i,2)));
+                $decpwd .= chr(hexdec(substr($hex, $i, 2)));
             }
             $password = $decpwd;
         }
@@ -97,7 +97,7 @@ class Subsonic_Api
         } else {
             if (substr($header, 0, 5) === "HTTP/") {
                 // if $header starts with HTTP/ assume it's the status line
-                http_response_code(curl_getinfo($ch,CURLINFO_HTTP_CODE));
+                http_response_code(curl_getinfo($ch, CURLINFO_HTTP_CODE));
             }
         }
         return strlen($header);
@@ -1181,7 +1181,7 @@ class Subsonic_Api
         self::check_version($input, "1.7.0");
 
         $r = Subsonic_XML_Data::createSuccessResponse();
-        Subsonic_XML_Data::addStarred($r, Userflag::get_latest('artist',null,99999), Userflag::get_latest('album',null,99999), Userflag::get_latest('song',null,99999), $elementName);
+        Subsonic_XML_Data::addStarred($r, Userflag::get_latest('artist', null, 99999), Userflag::get_latest('album', null, 99999), Userflag::get_latest('song', null, 99999), $elementName);
         self::apiOutput($input, $r);
     }
 
diff --git a/lib/class/tag.class.php b/lib/class/tag.class.php
index 8fc61b95..286749ed 100644
--- a/lib/class/tag.class.php
+++ b/lib/class/tag.class.php
@@ -99,7 +99,7 @@ class Tag extends database_object implements library_item
             return false;
         }
 
-        $idlist = '(' . implode(',',$ids) . ')';
+        $idlist = '(' . implode(',', $ids) . ')';
 
         $sql = "SELECT `tag_map`.`id`,`tag_map`.`tag_id`, `tag`.`name`,`tag_map`.`object_id`,`tag_map`.`user` FROM `tag` " .
             "LEFT JOIN `tag_map` ON `tag_map`.`tag_id`=`tag`.`id` " .
@@ -163,13 +163,13 @@ class Tag extends database_object implements library_item
         }
 
         if (!$tag_id) {
-            debug_event('Error','Error unable to create tag value:' . $cleaned_value . ' unknown error','1');
+            debug_event('Error', 'Error unable to create tag value:' . $cleaned_value . ' unknown error', '1');
             return false;
         }
 
         // We've got the tag id, let's see if it's already got a map, if not then create the map and return the value
-        if (!$map_id = self::tag_map_exists($type,$id,$tag_id,$uid)) {
-            $map_id = self::add_tag_map($type,$id,$tag_id,$uid);
+        if (!$map_id = self::tag_map_exists($type, $id, $tag_id, $uid)) {
+            $map_id = self::add_tag_map($type, $id, $tag_id, $uid);
         }
 
         return $map_id;
@@ -285,7 +285,7 @@ class Tag extends database_object implements library_item
      * add_tag_map
      * This adds a specific tag to the map for specified object
      */
-    public static function add_tag_map($type,$object_id,$tag_id,$user=true)
+    public static function add_tag_map($type, $object_id, $tag_id, $user=true)
     {
         if ($user === true) {
             $uid = intval($GLOBALS['user']->id);
@@ -319,7 +319,7 @@ class Tag extends database_object implements library_item
         }
         $insert_id = Dba::insert_id();
 
-        parent::add_to_cache('tag_map_' . $type,$insert_id,array('tag_id'=>$tag_id,'user'=>$uid,'object_type'=>$type,'object_id'=>$id));
+        parent::add_to_cache('tag_map_' . $type, $insert_id, array('tag_id'=>$tag_id, 'user'=>$uid, 'object_type'=>$type, 'object_id'=>$id));
 
         return $insert_id;
     } // add_tag_map
@@ -392,8 +392,8 @@ class Tag extends database_object implements library_item
      */
     public static function tag_exists($value)
     {
-        if (parent::is_cached('tag_name',$value)) {
-            return parent::get_from_cache('tag_name',$value);
+        if (parent::is_cached('tag_name', $value)) {
+            return parent::get_from_cache('tag_name', $value);
         }
 
         $sql        = "SELECT * FROM `tag` WHERE `name` = ?";
@@ -401,7 +401,7 @@ class Tag extends database_object implements library_item
 
         $results = Dba::fetch_assoc($db_results);
 
-        parent::add_to_cache('tag_name',$results['name'],$results['id']);
+        parent::add_to_cache('tag_name', $results['name'], $results['id']);
 
         return $results['id'];
     } // tag_exists
@@ -485,7 +485,7 @@ class Tag extends database_object implements library_item
      * get_tag_objects
      * This gets the objects from a specified tag and returns an array of object ids, nothing more
      */
-    public static function get_tag_objects($type,$tag_id,$count='',$offset='')
+    public static function get_tag_objects($type, $tag_id, $count='', $offset='')
     {
         if (!Core::is_library_item($type)) {
             return false;
diff --git a/lib/class/tmp_playlist.class.php b/lib/class/tmp_playlist.class.php
index 74a0b689..3f9805c9 100644
--- a/lib/class/tmp_playlist.class.php
+++ b/lib/class/tmp_playlist.class.php
@@ -302,7 +302,7 @@ class Tmp_Playlist extends database_object
      * This adds the object of $this->object_type to this tmp playlist
      * it takes an optional type, default is song
      */
-    public function add_object($object_id,$object_type)
+    public function add_object($object_id, $object_type)
     {
         $sql = "INSERT INTO `tmp_playlist_data` " .
             "(`object_id`,`tmp_playlist`,`object_type`) " .
diff --git a/lib/class/tvshow.class.php b/lib/class/tvshow.class.php
index c7a0b242..6cd56828 100644
--- a/lib/class/tvshow.class.php
+++ b/lib/class/tvshow.class.php
@@ -141,7 +141,7 @@ class TVShow extends database_object implements library_item
     private function _get_extra_info()
     {
         // Try to find it in the cache and save ourselves the trouble
-        if (parent::is_cached('tvshow_extra', $this->id) ) {
+        if (parent::is_cached('tvshow_extra', $this->id)) {
             $row = parent::get_from_cache('tvshow_extra', $this->id);
         } else {
             $sql = "SELECT COUNT(`tvshow_episode`.`id`) AS `episode_count`, `video`.`catalog` as `catalog_id` FROM `tvshow_season` " .
@@ -157,7 +157,7 @@ class TVShow extends database_object implements library_item
             $row2                = Dba::fetch_assoc($db_results);
             $row['season_count'] = $row2['season_count'];
 
-            parent::add_to_cache('tvshow_extra',$this->id,$row);
+            parent::add_to_cache('tvshow_extra', $this->id, $row);
         }
 
         /* Set Object Vars */
diff --git a/lib/class/tvshow_season.class.php b/lib/class/tvshow_season.class.php
index a1755ed9..d26ef0ef 100644
--- a/lib/class/tvshow_season.class.php
+++ b/lib/class/tvshow_season.class.php
@@ -105,7 +105,7 @@ class TVShow_Season extends database_object implements library_item
     private function _get_extra_info()
     {
         // Try to find it in the cache and save ourselves the trouble
-        if (parent::is_cached('tvshow_extra', $this->id) ) {
+        if (parent::is_cached('tvshow_extra', $this->id)) {
             $row = parent::get_from_cache('tvshow_extra', $this->id);
         } else {
             $sql = "SELECT COUNT(`tvshow_episode`.`id`) AS `episode_count`, `video`.`catalog` as `catalog_id` FROM `tvshow_episode` " .
@@ -114,7 +114,7 @@ class TVShow_Season extends database_object implements library_item
 
             $db_results = Dba::read($sql, array($this->id));
             $row        = Dba::fetch_assoc($db_results);
-            parent::add_to_cache('tvshow_extra',$this->id,$row);
+            parent::add_to_cache('tvshow_extra', $this->id, $row);
         }
 
         /* Set Object Vars */
diff --git a/lib/class/update.class.php b/lib/class/update.class.php
index 3d9e4000..420c8151 100644
--- a/lib/class/update.class.php
+++ b/lib/class/update.class.php
@@ -646,8 +646,8 @@ class Update
             // exists and run the bugger.
             if ($version['version'] > $current_version) {
                 $update_function = "update_" . $version['version'];
-                if (in_array($update_function,$methods)) {
-                    $success = call_user_func(array('Update',$update_function));
+                if (in_array($update_function, $methods)) {
+                    $success = call_user_func(array('Update', $update_function));
 
                     // If the update fails drop out
                     if ($success) {
@@ -2196,9 +2196,9 @@ class Update
         $sql    = "INSERT INTO `user_preference` VALUES (-1,?,'1')";
         $retval &= Dba::write($sql, array($id));
 
-        Preference::insert('autoupdate_lastcheck','AutoUpdate last check time','','25','string','internal');
-        Preference::insert('autoupdate_lastversion','AutoUpdate last version from last check','','25','string','internal');
-        Preference::insert('autoupdate_lastversion_new','AutoUpdate last version from last check is newer','','25','boolean','internal');
+        Preference::insert('autoupdate_lastcheck', 'AutoUpdate last check time', '', '25', 'string', 'internal');
+        Preference::insert('autoupdate_lastversion', 'AutoUpdate last version from last check', '', '25', 'string', 'internal');
+        Preference::insert('autoupdate_lastversion_new', 'AutoUpdate last version from last check is newer', '', '25', 'boolean', 'internal');
 
         return $retval;
     }
diff --git a/lib/class/upnp_api.class.php b/lib/class/upnp_api.class.php
index 79620cc4..8bff9ad3 100644
--- a/lib/class/upnp_api.class.php
+++ b/lib/class/upnp_api.class.php
@@ -178,12 +178,12 @@ class Upnp_Api
         $xmlDoc->appendChild($ndDIDL);
 
         # Return empty DIDL if no items present:
-        if ( (!isset($prmItems)) || (!is_array($prmItems)) ) {
+        if ((!isset($prmItems)) || (!is_array($prmItems))) {
             return $xmlDoc;
         }
 
         # sometimes here comes only one single item, not an array. Convert it to array. (TODO - UGLY)
-        if ( (count($prmItems) > 0) && (!is_array($prmItems[0])) ) {
+        if ((count($prmItems) > 0) && (!is_array($prmItems[0]))) {
             $prmItems = array($prmItems);
         }
 
@@ -259,7 +259,7 @@ class Upnp_Api
                         $ndTag = $xmlDoc->createElement($key);
                         $ndItem->appendChild($ndTag);
                         # check if string is already utf-8 encoded
-                        $ndTag_text = $xmlDoc->createTextNode((mb_detect_encoding($value,'auto')=='UTF-8')?$value:utf8_encode($value));
+                        $ndTag_text = $xmlDoc->createTextNode((mb_detect_encoding($value, 'auto')=='UTF-8')?$value:utf8_encode($value));
                         $ndTag->appendChild($ndTag_text);
                 }
                 if ($useRes) {
@@ -294,7 +294,7 @@ class Upnp_Api
         $ndEnvelope->appendChild($ndBody);
         $ndBrowseResp = $doc->createElementNS('urn:schemas-upnp-org:service:ContentDirectory:1', $prmResponseType);
         $ndBody->appendChild($ndBrowseResp);
-        $ndResult = $doc->createElement('Result',$prmDIDL);
+        $ndResult = $doc->createElement('Result', $prmDIDL);
         $ndBrowseResp->appendChild($ndResult);
         $ndNumRet = $doc->createElement('NumberReturned', $prmNumRet);
         $ndBrowseResp->appendChild($ndNumRet);
@@ -761,7 +761,7 @@ class Upnp_Api
                         $video = new TVShow_Episode($pathreq[3]);
                         if ($video->id) {
                             $video->format();
-                            $meta = self::_itemVideo($video, $root . '/tvshows/' . $pathreq[1] . '/' . $pathreq[2] );
+                            $meta = self::_itemVideo($video, $root . '/tvshows/' . $pathreq[1] . '/' . $pathreq[2]);
                         }
                     break;
                 }
diff --git a/lib/class/user.class.php b/lib/class/user.class.php
index 80502787..63aa7ccc 100644
--- a/lib/class/user.class.php
+++ b/lib/class/user.class.php
@@ -201,8 +201,8 @@ class User extends database_object
     {
         $id = intval($this->id);
 
-        if (parent::is_cached('user',$id)) {
-            return parent::get_from_cache('user',$id);
+        if (parent::is_cached('user', $id)) {
+            return parent::get_from_cache('user', $id);
         }
 
         $data = array();
@@ -219,7 +219,7 @@ class User extends database_object
 
         $data = Dba::fetch_assoc($db_results);
 
-        parent::add_to_cache('user',$id,$data);
+        parent::add_to_cache('user', $id, $data);
 
         return $data;
     } // _get_info
@@ -331,8 +331,8 @@ class User extends database_object
      */
     public function get_catalogs()
     {
-        if (parent::is_cached('user_catalog',$this->id)) {
-            return parent::get_from_cache('user_catalog',$this->id);
+        if (parent::is_cached('user_catalog', $this->id)) {
+            return parent::get_from_cache('user_catalog', $this->id);
         }
 
         $sql        = "SELECT * FROM `user_catalog` WHERE `user` = ?";
@@ -343,7 +343,7 @@ class User extends database_object
             $catalogs[] = $row['catalog'];
         }
 
-        parent::add_to_cache('user_catalog',$this->id,$catalogs);
+        parent::add_to_cache('user_catalog', $this->id, $catalogs);
 
         return $catalogs;
     } // get_catalogs
@@ -388,7 +388,7 @@ class User extends database_object
                 $admin = true;
             }
             $type_array[$type][$r['name']] = array('name'=>$r['name'],'level'=>$r['level'],'description'=>$r['description'],'value'=>$r['value'],'subcategory'=>$r['subcatagory']);
-            $results[$type]                = array ('title'=>ucwords($type),'admin'=>$admin,'prefs'=>$type_array[$type]);
+            $results[$type]                = array('title'=>ucwords($type),'admin'=>$admin,'prefs'=>$type_array[$type]);
         } // end while
 
         return $results;
@@ -418,7 +418,7 @@ class User extends database_object
      */
     public function get_favorites($type)
     {
-        $results = Stats::get_user(AmpConfig::get('popular_threshold'),$type,$this->id,1);
+        $results = Stats::get_user(AmpConfig::get('popular_threshold'), $type, $this->id, 1);
 
         $items = array();
 
@@ -888,10 +888,10 @@ class User extends database_object
     {
         if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
             $sip = $_SERVER['HTTP_X_FORWARDED_FOR'];
-            debug_event('User Ip', 'Login from ip adress: ' . $sip,'3');
+            debug_event('User Ip', 'Login from ip adress: ' . $sip, '3');
         } else {
             $sip = $_SERVER['REMOTE_ADDR'];
-            debug_event('User Ip', 'Login from ip adress: ' . $sip,'3');
+            debug_event('User Ip', 'Login from ip adress: ' . $sip, '3');
         }
         
         // Remove port information if any
@@ -910,7 +910,7 @@ class User extends database_object
         Dba::write($sql);
 
         /* Clean up old records... sometimes  */
-        if (rand(1,100) > 60) {
+        if (rand(1, 100) > 60) {
             $date = time() - (86400*AmpConfig::get('user_ip_cardinality'));
             $sql  = "DELETE FROM `ip_history` WHERE `date` < $date";
             Dba::write($sql);
@@ -981,7 +981,7 @@ class User extends database_object
      */
     public function update_password($new_password)
     {
-        $new_password = hash('sha256',$new_password);
+        $new_password = hash('sha256', $new_password);
 
         $new_password = Dba::escape($new_password);
         $sql          = "UPDATE `user` SET `password` = ? WHERE `id` = ?";
@@ -1005,14 +1005,14 @@ class User extends database_object
         if (!$this->last_seen) {
             $this->f_last_seen = T_('Never');
         } else {
-            $this->f_last_seen = date("m\/d\/Y - H:i",$this->last_seen);
+            $this->f_last_seen = date("m\/d\/Y - H:i", $this->last_seen);
         }
 
         /* If they have a create date */
         if (!$this->create_date) {
             $this->f_create_date = T_('Unknown');
         } else {
-            $this->f_create_date = date("m\/d\/Y - H:i",$this->create_date);
+            $this->f_create_date = date("m\/d\/Y - H:i", $this->create_date);
         }
 
         $this->f_name = ($this->fullname_public ? $this->fullname : $this->username);
@@ -1232,7 +1232,7 @@ class User extends database_object
      * calcs difference between now and last_seen
      * if less than delay, we consider them still online
      */
-    public function is_online( $delay = 1200 )
+    public function is_online($delay = 1200)
     {
         return time() - $this->last_seen <= $delay;
     } // is_online
@@ -1256,7 +1256,7 @@ class User extends database_object
      * This gets the recently played items for this user respecting
      * the limit passed
      */
-    public function get_recently_played($limit,$type='')
+    public function get_recently_played($limit, $type='')
     {
         if (!$type) {
             $type = 'song';
@@ -1279,7 +1279,7 @@ class User extends database_object
      * This returns the ip_history from the
      * last AmpConfig::get('user_ip_cardinality') days
      */
-    public function get_ip_history($count='',$distinct='')
+    public function get_ip_history($count='', $distinct='')
     {
         $username     = Dba::escape($this->id);
         $count        = $count ? intval($count) : intval(AmpConfig::get('user_ip_cardinality'));
@@ -1354,7 +1354,7 @@ class User extends database_object
         return $avatar;
     } // get_avatar
 
-    public function update_avatar ($data, $mime = '')
+    public function update_avatar($data, $mime = '')
     {
         $art = new Art($this->id, 'user');
         $art->insert($data, $mime);
diff --git a/lib/class/useractivity.class.php b/lib/class/useractivity.class.php
index 4b84c020..980d9522 100644
--- a/lib/class/useractivity.class.php
+++ b/lib/class/useractivity.class.php
@@ -74,7 +74,7 @@ class Useractivity extends database_object
         $db_results = Dba::read($sql);
 
         while ($row = Dba::fetch_assoc($db_results)) {
-            parent::add_to_cache('user_activity',$row['id'],$row);
+            parent::add_to_cache('user_activity', $row['id'], $row);
         }
     }
     /**
diff --git a/lib/class/vainfo.class.php b/lib/class/vainfo.class.php
index 73b5a4bb..9a6647c9 100644
--- a/lib/class/vainfo.class.php
+++ b/lib/class/vainfo.class.php
@@ -269,10 +269,10 @@ class vainfo
 
             if ($tagWriter->WriteTags()) {
                 if (!empty($tagWriter->warnings)) {
-                    debug_event('vainfo' , 'FWarnings ' . implode("\n", $tagWriter->warnings), 5);
+                    debug_event('vainfo', 'FWarnings ' . implode("\n", $tagWriter->warnings), 5);
                 }
             } else {
-                debug_event('vainfo' , 'Failed to write tags! ' . implode("\n", $tagWriter->errors), 5);
+                debug_event('vainfo', 'Failed to write tags! ' . implode("\n", $tagWriter->errors), 5);
             }
         }
     } // write_id3
@@ -691,7 +691,7 @@ class vainfo
                 return $type;
             default:
                 /* Log the fact that we couldn't figure it out */
-                debug_event('vainfo','Unable to determine file type from ' . $type . ' on file ' . $this->filename,'5');
+                debug_event('vainfo', 'Unable to determine file type from ' . $type . ' on file ' . $this->filename, '5');
 
                 return $type;
         }
@@ -1049,29 +1049,29 @@ class vainfo
             $episode = array();
             $tvyear  = array();
             $temp    = array();
-            preg_match("~(?<=\(\[\<\{)[1|2][0-9]{3}|[1|2][0-9]{3}~", $filepath,$tvyear);
+            preg_match("~(?<=\(\[\<\{)[1|2][0-9]{3}|[1|2][0-9]{3}~", $filepath, $tvyear);
             $results['year'] = !empty($tvyear) ? intval($tvyear[0]) : null;
         
             if (preg_match("~[Ss](\d+)[Ee](\d+)~", $file, $seasonEpisode)) {
-                $temp = preg_split("~(((\.|_|\s)[Ss]\d+(\.|_)*[Ee]\d+))~",$file,2);
+                $temp = preg_split("~(((\.|_|\s)[Ss]\d+(\.|_)*[Ee]\d+))~", $file, 2);
                 preg_match("~(?<=[Ss])\d+~", $file, $season);
                 preg_match("~(?<=[Ee])\d+~", $file, $episode);
             } else {
                 if (preg_match("~[\_\-\.\s](\d{1,2})[xX](\d{1,2})~", $file, $seasonEpisode)) {
-                    $temp = preg_split("~[\.\_\s\-\_]\d+[xX]\d{2}[\.\s\-\_]*|$~",$file);
+                    $temp = preg_split("~[\.\_\s\-\_]\d+[xX]\d{2}[\.\s\-\_]*|$~", $file);
                     preg_match("~\d+(?=[Xx])~", $file, $season);
                     preg_match("~(?<=[Xx])\d+~", $file, $episode);
                 } else {
                     if (preg_match("~[S|s]eason[\_\-\.\s](\d+)[\.\-\s\_]?\s?[e|E]pisode[\s\-\.\_]?(\d+)[\.\s\-\_]?~", $file, $seasonEpisode)) {
-                        $temp = preg_split("~[\.\s\-\_][S|s]eason[\s\-\.\_](\d+)[\.\s\-\_]?\s?[e|E]pisode[\s\-\.\_](\d+)([\s\-\.\_])*~",$file,3);
+                        $temp = preg_split("~[\.\s\-\_][S|s]eason[\s\-\.\_](\d+)[\.\s\-\_]?\s?[e|E]pisode[\s\-\.\_](\d+)([\s\-\.\_])*~", $file, 3);
                         preg_match("~(?<=[Ss]eason[\.\s\-\_])\d+~", $file, $season);
                         preg_match("~(?<=[Ee]pisode[\.\s\-\_])\d+~", $file, $episode);
                     } else {
                         if (preg_match("~[\_\-\.\s](\d)(\d\d)[\_\-\.\s]*~", $file, $seasonEpisode)) {
-                            $temp       = preg_split("~[\.\s\-\_](\d)(\d\d)[\.\s\-\_]~",$file);
+                            $temp       = preg_split("~[\.\s\-\_](\d)(\d\d)[\.\s\-\_]~", $file);
                             $season[0]  = $seasonEpisode[1];
                             if (preg_match("~[\_\-\.\s](\d)(\d\d)[\_\-\.\s]~", $file, $seasonEpisode)) {
-                                $temp       = preg_split("~[\.\s\-\_](\d)(\d\d)[\.\s\-\_]~",$file);
+                                $temp       = preg_split("~[\.\s\-\_](\d)(\d\d)[\.\s\-\_]~", $file);
                                 $season[0]  = $seasonEpisode[1];
                                 $episode[0] = $seasonEpisode[2];
                             }
@@ -1182,21 +1182,21 @@ class vainfo
     
     private function removeCommonAbbreviations($name)
     {
-        $abbr         = explode(",",AmpConfig::get('common_abbr'));
-        $commonabbr   = preg_replace("~\n~", '',$abbr);
+        $abbr         = explode(",", AmpConfig::get('common_abbr'));
+        $commonabbr   = preg_replace("~\n~", '', $abbr);
         $commonabbr[] = '[1|2][0-9]{3}';   //Remove release year
 
        //scan for brackets, braces, etc and ignore case.
        for ($i=0; $i< count($commonabbr);$i++) {
            $commonabbr[$i] = "~\[*|\(*|\<*|\{*\b(?i)" . trim($commonabbr[$i]) . "\b\]*|\)*|\>*|\}*~";
        }
-        $string = preg_replace($commonabbr,'',$name);
+        $string = preg_replace($commonabbr, '', $name);
         return $string;
     }
     
     private function formatVideoName($name)
     {
-        return ucwords(trim($this->removeCommonAbbreviations(str_replace(['.','_','-'], ' ', $name), "\s\t\n\r\0\x0B\.\_\-")));
+        return ucwords(trim($this->removeCommonAbbreviations(str_replace(['.', '_', '-'], ' ', $name), "\s\t\n\r\0\x0B\.\_\-")));
     }
 
 
diff --git a/lib/class/video.class.php b/lib/class/video.class.php
index 8c6dfa53..f20aef96 100644
--- a/lib/class/video.class.php
+++ b/lib/class/video.class.php
@@ -235,13 +235,13 @@ class Video extends database_object implements media, library_item
             return false;
         }
 
-        $idlist = '(' . implode(',',$ids) . ')';
+        $idlist = '(' . implode(',', $ids) . ')';
 
         $sql        = "SELECT * FROM `video` WHERE `video`.`id` IN $idlist";
         $db_results = Dba::read($sql);
 
         while ($row = Dba::fetch_assoc($db_results)) {
-            parent::add_to_cache('video',$row['id'],$row);
+            parent::add_to_cache('video', $row['id'], $row);
         }
     } // build_cache
 
@@ -746,7 +746,7 @@ class Video extends database_object implements media, library_item
     public static function compare_video_information(Video $video, Video $new_video)
     {
         // Remove some stuff we don't care about
-        unset($video->catalog,$video->played,$video->enabled,$video->addition_time,$video->update_time,$video->type);
+        unset($video->catalog, $video->played, $video->enabled, $video->addition_time, $video->update_time, $video->type);
         $string_array = array('title','tags');
         $skip_array   = array('id','tag_id','mime','object_cnt');
 
@@ -1036,7 +1036,7 @@ class Video extends database_object implements media, library_item
      */
     public static function update_played($new_played, $song_id)
     {
-        self::_update_item('played', ($new_played ? 1 : 0),$song_id,'25');
+        self::_update_item('played', ($new_played ? 1 : 0), $song_id, '25');
     } // update_played
 
     /**
@@ -1054,7 +1054,7 @@ class Video extends database_object implements media, library_item
     private static function _update_item($field, $value, $song_id, $level)
     {
         /* Check them Rights! */
-        if (!Access::check('interface',$level)) {
+        if (!Access::check('interface', $level)) {
             return false;
         }
 
diff --git a/lib/class/wanted.class.php b/lib/class/wanted.class.php
index fee8cd5d..cdbe5184 100644
--- a/lib/class/wanted.class.php
+++ b/lib/class/wanted.class.php
@@ -214,7 +214,7 @@ class Wanted extends database_object
     {
         $wartist = array();
 
-        if (parent::is_cached('missing_artist', $mbid) ) {
+        if (parent::is_cached('missing_artist', $mbid)) {
             $wartist = parent::get_from_cache('missing_artist', $mbid);
         } else {
             $mb              = new MusicBrainz(new RequestsHttpAdapter());
@@ -408,14 +408,14 @@ class Wanted extends database_object
         if ($this->id) {
             if (!$this->accepted) {
                 if ($GLOBALS['user']->has_access('75')) {
-                    echo Ajax::button('?page=index&action=accept_wanted&mbid=' . $this->mbid,'enable', T_('Accept'),'wanted_accept_' . $this->mbid);
+                    echo Ajax::button('?page=index&action=accept_wanted&mbid=' . $this->mbid, 'enable', T_('Accept'), 'wanted_accept_' . $this->mbid);
                 }
             }
             if ($GLOBALS['user']->has_access('75') || (Wanted::has_wanted($this->mbid) && $this->accepted != '1')) {
-                echo " " . Ajax::button('?page=index&action=remove_wanted&mbid=' . $this->mbid,'disable', T_('Remove'),'wanted_remove_' . $this->mbid);
+                echo " " . Ajax::button('?page=index&action=remove_wanted&mbid=' . $this->mbid, 'disable', T_('Remove'), 'wanted_remove_' . $this->mbid);
             }
         } else {
-            echo Ajax::button('?page=index&action=add_wanted&mbid=' . $this->mbid . ($this->artist ? '&artist=' . $this->artist : '&artist_mbid=' . $this->artist_mbid) . '&name=' . urlencode($this->name) . '&year=' . $this->year,'add_wanted', T_('Add to wanted list'),'wanted_add_' . $this->mbid);
+            echo Ajax::button('?page=index&action=add_wanted&mbid=' . $this->mbid . ($this->artist ? '&artist=' . $this->artist : '&artist_mbid=' . $this->artist_mbid) . '&name=' . urlencode($this->name) . '&year=' . $this->year, 'add_wanted', T_('Add to wanted list'), 'wanted_add_' . $this->mbid);
         }
     }
 
diff --git a/lib/class/waveform.class.php b/lib/class/waveform.class.php
index e1ae19c6..77d5a772 100644
--- a/lib/class/waveform.class.php
+++ b/lib/class/waveform.class.php
@@ -154,7 +154,7 @@ class Waveform
      */
     protected static function html2rgb($input)
     {
-        $input=($input[0]=="#")?substr($input, 1,6):substr($input, 0,6);
+        $input=($input[0]=="#")?substr($input, 1, 6):substr($input, 0, 6);
         return array(
             hexdec(substr($input, 0, 2)),
             hexdec(substr($input, 2, 2)),
@@ -319,7 +319,7 @@ class Waveform
         imagedestroy($img);
 
         $imgdata = ob_get_contents();
-        ob_clean ();
+        ob_clean();
         return $imgdata;
     }
 
diff --git a/lib/class/xml_data.class.php b/lib/class/xml_data.class.php
index 238e1947..e58fbefd 100644
--- a/lib/class/xml_data.class.php
+++ b/lib/class/xml_data.class.php
@@ -86,7 +86,7 @@ class XML_Data
      */
     public static function set_type($type)
     {
-        if (!in_array($type,array('rss','xspf','itunes'))) {
+        if (!in_array($type, array('rss', 'xspf', 'itunes'))) {
             return false;
         }
 
@@ -103,7 +103,7 @@ class XML_Data
      * @param    string    $string    Error message
      * @return    string    return error message xml
      */
-    public static function error($code,$string)
+    public static function error($code, $string)
     {
         $string = "\t<error code=\"$code\"><![CDATA[$string]]></error>";
         return self::output_xml($string);
@@ -218,7 +218,7 @@ class XML_Data
      * @param    boolean    $callback    (description here...)
      * @return    string    return xml
      */
-    public static function keyed_array($array,$callback='')
+    public static function keyed_array($array, $callback='')
     {
         $string = '';
 
@@ -233,7 +233,7 @@ class XML_Data
 
             // If it's an array, run again
             if (is_array($value)) {
-                $value = self::keyed_array($value,1);
+                $value = self::keyed_array($value, 1);
                 $string .= "<$key$attribute>\n$value\n</$key>\n";
             } else {
                 $string .= "\t<$key$attribute><![CDATA[$value]]></$key>\n";
@@ -258,7 +258,7 @@ class XML_Data
     public static function tags($tags)
     {
         if (count($tags) > self::$limit or self::$offset > 0) {
-            $tags = array_splice($tags,self::$offset,self::$limit);
+            $tags = array_splice($tags, self::$offset, self::$limit);
         }
 
         $string = '';
@@ -294,18 +294,18 @@ class XML_Data
     public static function artists($artists, $include=[], $full_xml=true)
     {
         if (count($artists) > self::$limit or self::$offset > 0) {
-            $artists = array_splice($artists,self::$offset,self::$limit);
+            $artists = array_splice($artists, self::$offset, self::$limit);
         }
 
         $string = '';
 
-        Rating::build_cache('artist',$artists);
+        Rating::build_cache('artist', $artists);
 
         foreach ($artists as $artist_id) {
             $artist = new Artist($artist_id);
             $artist->format();
 
-            $rating     = new Rating($artist_id,'artist');
+            $rating     = new Rating($artist_id, 'artist');
             $tag_string = self::tags_string($artist->tags);
 
             // Build the Art URL, include session
@@ -355,17 +355,17 @@ class XML_Data
     public static function albums($albums, $include=[], $full_xml=true)
     {
         if (count($albums) > self::$limit or self::$offset > 0) {
-            $albums = array_splice($albums,self::$offset,self::$limit);
+            $albums = array_splice($albums, self::$offset, self::$limit);
         }
 
-        Rating::build_cache('album',$albums);
+        Rating::build_cache('album', $albums);
 
         $string = "";
         foreach ($albums as $album_id) {
             $album = new Album($album_id);
             $album->format();
 
-            $rating = new Rating($album_id,'album');
+            $rating = new Rating($album_id, 'album');
 
             // Build the Art URL, include session
             $art_url = AmpConfig::get('web_path') . '/image.php?object_id=' . $album->id . '&object_type=album&auth=' . scrub_out($_REQUEST['auth']);
@@ -413,7 +413,7 @@ class XML_Data
     public static function playlists($playlists)
     {
         if (count($playlists) > self::$limit or self::$offset > 0) {
-            $playlists = array_slice($playlists,self::$offset,self::$limit);
+            $playlists = array_slice($playlists, self::$offset, self::$limit);
         }
 
         $string = '';
@@ -532,7 +532,7 @@ class XML_Data
     public static function videos($videos)
     {
         if (count($videos) > self::$limit or self::$offset > 0) {
-            $videos = array_slice($videos,self::$offset,self::$limit);
+            $videos = array_slice($videos, self::$offset, self::$limit);
         }
 
         $string = '';
@@ -585,7 +585,7 @@ class XML_Data
 
             $tag_string = self::tags_string($song->tags);
 
-            $rating = new Rating($song->id,'song');
+            $rating = new Rating($song->id, 'song');
 
             $art_url = Art::url($song->album, 'album', $_REQUEST['auth']);
 
@@ -800,7 +800,7 @@ class XML_Data
             break;
             case 'rss':
                 $header = "<?xml version=\"1.0\" encoding=\"" . AmpConfig::get('site_charset') . "\" ?>\n " .
-                    "<!-- RSS Generated by Ampache v." . AmpConfig::get('version') . " on " . date("r",time()) . "-->\n" .
+                    "<!-- RSS Generated by Ampache v." . AmpConfig::get('version') . " on " . date("r", time()) . "-->\n" .
                     "<rss version=\"2.0\">\n<channel>\n";
             break;
             default:
diff --git a/lib/debug.lib.php b/lib/debug.lib.php
index dcc472c9..beebb236 100644
--- a/lib/debug.lib.php
+++ b/lib/debug.lib.php
@@ -83,7 +83,7 @@ function check_php_pdo_mysql()
 
 function check_mbstring_func_overload()
 {
-    if ( ini_get('mbstring.func_overload') > 0) {
+    if (ini_get('mbstring.func_overload') > 0) {
         return false;
     }
     return true;
@@ -138,7 +138,7 @@ function check_config_values($conf)
 function check_php_memory()
 {
     $current_memory = ini_get('memory_limit');
-    $current_memory = substr($current_memory,0,strlen($current_memory)-1);
+    $current_memory = substr($current_memory, 0, strlen($current_memory)-1);
 
     if (intval($current_memory) < 48) {
         return false;
@@ -178,11 +178,11 @@ function check_override_memory()
 {
     /* Check memory */
     $current_memory = ini_get('memory_limit');
-    $current_memory = substr($current_memory,0,strlen($current_memory)-1);
+    $current_memory = substr($current_memory, 0, strlen($current_memory)-1);
     $new_limit      = ($current_memory+16) . "M";
 
     /* Bump it by 16 megs (for getid3)*/
-    if (!ini_set('memory_limit',$new_limit)) {
+    if (!ini_set('memory_limit', $new_limit)) {
         return false;
     }
 
diff --git a/lib/general.lib.php b/lib/general.lib.php
index 463723f8..aa4a88d4 100644
--- a/lib/general.lib.php
+++ b/lib/general.lib.php
@@ -36,7 +36,7 @@ function set_memory_limit($new_limit)
     $new_limit     = UI::unformat_bytes($new_limit);
 
     if ($current_limit < $new_limit) {
-        ini_set (memory_limit, $new_limit);
+        ini_set(memory_limit, $new_limit);
     }
 } // set_memory_limit
 
@@ -54,10 +54,10 @@ function generate_password($length)
 
     for ($i = 0; $i < $length; $i++) {
         if ($alt == 1) {
-            $password .= $consonants[(rand(0,strlen($consonants)-1))];
+            $password .= $consonants[(rand(0, strlen($consonants)-1))];
             $alt = 0;
         } else {
-            $password .= $vowels[(rand(0,strlen($vowels)-1))];
+            $password .= $vowels[(rand(0, strlen($vowels)-1))];
             $alt = 1;
         }
     }
@@ -123,7 +123,7 @@ function scrub_arg($arg)
  */
 function make_bool($string)
 {
-    if (strcasecmp($string,'false') == 0 || $string == '0') {
+    if (strcasecmp($string, 'false') == 0 || $string == '0') {
         return false;
     }
 
@@ -152,7 +152,7 @@ function get_languages()
     $handle    = @opendir(AmpConfig::get('prefix') . '/locale');
 
     if (!is_resource($handle)) {
-        debug_event('language','Error unable to open locale directory','1');
+        debug_event('language', 'Error unable to open locale directory', '1');
     }
 
     $results = array();
@@ -161,7 +161,7 @@ function get_languages()
         $full_file = AmpConfig::get('prefix') . '/locale/' . $file;
 
         /* Check to see if it's a directory */
-        if (is_dir($full_file) and substr($file,0,1) != '.' and $file != 'base') {
+        if (is_dir($full_file) and substr($file, 0, 1) != '.' and $file != 'base') {
             switch ($file) {
                 case 'af_ZA'; $name = 'Afrikaans'; break; /* Afrikaans */
                 case 'bg_BG'; $name = '&#x0411;&#x044a;&#x043b;&#x0433;&#x0430;&#x0440;&#x0441;&#x043a;&#x0438;'; break; /* Bulgarian */
@@ -269,17 +269,17 @@ function generate_config($current)
 {
     // Start building the new config file
     $distfile = AmpConfig::get('prefix') . '/config/ampache.cfg.php.dist';
-    $handle   = fopen($distfile,'r');
-    $dist     = fread($handle,filesize($distfile));
+    $handle   = fopen($distfile, 'r');
+    $dist     = fread($handle, filesize($distfile));
     fclose($handle);
 
-    $data = explode("\n",$dist);
+    $data = explode("\n", $dist);
 
     $final = "";
     foreach ($data as $line) {
-        if (preg_match("/^;?([\w\d]+)\s+=\s+[\"]{1}(.*?)[\"]{1}$/",$line,$matches)
+        if (preg_match("/^;?([\w\d]+)\s+=\s+[\"]{1}(.*?)[\"]{1}$/", $line, $matches)
             || preg_match("/^;?([\w\d]+)\s+=\s+[\']{1}(.*?)[\']{1}$/", $line, $matches)
-            || preg_match("/^;?([\w\d]+)\s+=\s+[\'\"]{0}(.*)[\'\"]{0}$/",$line,$matches)) {
+            || preg_match("/^;?([\w\d]+)\s+=\s+[\'\"]{0}(.*)[\'\"]{0}$/", $line, $matches)) {
             $key    = $matches[1];
             $value  = $matches[2];
 
diff --git a/lib/init-tiny.php b/lib/init-tiny.php
index 8a544f3b..78965b81 100644
--- a/lib/init-tiny.php
+++ b/lib/init-tiny.php
@@ -60,7 +60,7 @@ if (file_exists($composer_autoload)) {
 }
 
 // Check to see if this is http or https
-if ((isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' )
+if ((isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https')
     || (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on')) {
     $http_type = 'https://';
 } else {
diff --git a/lib/init.php b/lib/init.php
index 4e1bf417..98a4c185 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -61,7 +61,7 @@ if (!check_php() || !check_dependencies_folder()) {
 
 // Do the redirect if we can't continue
 if (!empty($link)) {
-    header ("Location: $link");
+    header("Location: $link");
     exit();
 }
 
@@ -129,13 +129,13 @@ $old_error_handler = set_error_handler('ampache_error_handler');
 
 /* Check their PHP Vars to make sure we're cool here */
 $post_size = @ini_get('post_max_size');
-if (substr($post_size,strlen($post_size)-1,strlen($post_size)) != 'M') {
+if (substr($post_size, strlen($post_size)-1, strlen($post_size)) != 'M') {
     /* Sane value time */
-    ini_set('post_max_size','8M');
+    ini_set('post_max_size', '8M');
 }
 
 // In case the local setting is 0
-ini_set('session.gc_probability','5');
+ini_set('session.gc_probability', '5');
 
 if (!isset($results['memory_limit']) ||
     (UI::unformat_bytes($results['memory_limit']) < UI::unformat_bytes('32M'))
@@ -235,7 +235,7 @@ AmpConfig::set('ajax_url', AmpConfig::get('web_path') . '/server/ajax.server.php
 AmpConfig::set('ajax_server', AmpConfig::get('web_path') . '/server', true);
 
 /* Set CHARSET */
-header ("Content-Type: text/html; charset=" . AmpConfig::get('site_charset'));
+header("Content-Type: text/html; charset=" . AmpConfig::get('site_charset'));
 
 /* Clean up a bit */
 unset($array);
diff --git a/lib/install.lib.php b/lib/install.lib.php
index 5c1f015d..5196988d 100644
--- a/lib/install.lib.php
+++ b/lib/install.lib.php
@@ -228,7 +228,7 @@ function install_insert_db($db_user = null, $db_pass = null, $create_db = true,
             $pieces[$i] = trim($pieces[$i]);
             if (!empty($pieces[$i]) && $pieces[$i] != '#') {
                 if (!$result = Dba::write($pieces[$i])) {
-                    $errors[] = array ( Dba::error(), $pieces[$i] );
+                    $errors[] = array( Dba::error(), $pieces[$i] );
                 }
             }
         }
@@ -328,7 +328,7 @@ function install_create_account($username, $password, $password2)
     $username = Dba::escape($username);
     $password = Dba::escape($password);
 
-    $insert_id = User::create($username,'Administrator','','',$password,'100');
+    $insert_id = User::create($username, 'Administrator', '', '', $password, '100');
 
     if (!$insert_id) {
         AmpError::add('general', sprintf(T_('Administrative user creation failed: %s'), Dba::error()));
@@ -478,7 +478,7 @@ function install_config_use_case($case)
     }
 }
 
-function install_config_backends(Array $backends)
+function install_config_backends(array $backends)
 {
     $dbconfig = array(
         'subsonic_backend' => '0',
diff --git a/lib/login.php b/lib/login.php
index 2e952fb4..a90a3826 100644
--- a/lib/login.php
+++ b/lib/login.php
@@ -189,7 +189,7 @@ if (isset($auth) && $auth['success'] && isset($user)) {
 
     $GLOBALS['user'] = $user;
     // If an admin, check for update
-    if (AmpConfig::get('autoupdate') && Access::check('interface','100')) {
+    if (AmpConfig::get('autoupdate') && Access::check('interface', '100')) {
         AutoUpdate::is_update_available(true);
     }
 
@@ -203,7 +203,7 @@ if (isset($auth) && $auth['success'] && isset($user)) {
         strpos($_POST['referrer'], 'logout.php')    === false &&
         strpos($_POST['referrer'], 'update.php')    === false &&
         strpos($_POST['referrer'], 'activate.php')    === false &&
-        strpos($_POST['referrer'], 'admin')        === false ) {
+        strpos($_POST['referrer'], 'admin')        === false) {
         header('Location: ' . $_POST['referrer']);
         exit();
     } // if we've got a referrer
diff --git a/lib/preferences.php b/lib/preferences.php
index 1b64f75a..cd6d42f0 100644
--- a/lib/preferences.php
+++ b/lib/preferences.php
@@ -74,11 +74,11 @@ function update_preferences($pref_id=0)
 
         /* Run the update for this preference only if it's set */
         if (isset($_REQUEST[$name])) {
-            Preference::update($id,$pref_id,$value,$_REQUEST[$apply_to_all]);
+            Preference::update($id, $pref_id, $value, $_REQUEST[$apply_to_all]);
         }
 
-        if (Access::check('interface','100') && $_REQUEST[$new_level]) {
-            Preference::update_level($id,$_REQUEST[$new_level]);
+        if (Access::check('interface', '100') && $_REQUEST[$new_level]) {
+            Preference::update_level($id, $_REQUEST[$new_level]);
         }
     } // end foreach preferences
 
@@ -90,20 +90,20 @@ function update_preferences($pref_id=0)
  * update_preference
  * This function updates a single preference and is called by the update_preferences function
  */
-function update_preference($user_id,$name,$pref_id,$value)
+function update_preference($user_id, $name, $pref_id, $value)
 {
     $apply_check = "check_" . $name;
     $level_check = "level_" . $name;
 
     /* First see if they are an administrator and we are applying this to everything */
     if ($GLOBALS['user']->has_access(100) and make_bool($_REQUEST[$apply_check])) {
-        Preference::update_all($pref_id,$value);
+        Preference::update_all($pref_id, $value);
         return true;
     }
 
     /* Check and see if they are an admin and the level def is set */
     if ($GLOBALS['user']->has_access(100) and make_bool($_REQUEST[$level_check])) {
-        Preference::update_level($pref_id,$_REQUEST[$level_check]);
+        Preference::update_level($pref_id, $_REQUEST[$level_check]);
     }
 
     /* Else make sure that the current users has the right to do this */
@@ -120,7 +120,7 @@ function update_preference($user_id,$name,$pref_id,$value)
  * create_preference_input
  * takes the key and then creates the correct type of input for updating it
  */
-function create_preference_input($name,$value)
+function create_preference_input($name, $value)
 {
     if (!Preference::has_access($name)) {
         if ($value == '1') {
diff --git a/lib/rating.lib.php b/lib/rating.lib.php
index 33a9253f..c5ba8074 100644
--- a/lib/rating.lib.php
+++ b/lib/rating.lib.php
@@ -24,9 +24,9 @@
  * show_rating
  * This takes an artist id and includes the right file
  */
-function show_rating($object_id,$type)
+function show_rating($object_id, $type)
 {
-    $rating = new Rating($object_id,$type);
+    $rating = new Rating($object_id, $type);
 
     require AmpConfig::get('prefix') . UI::find_template('show_object_rating.inc.php');
 } // show_rating
diff --git a/lib/ui.lib.php b/lib/ui.lib.php
index ab184eb3..6877d1ed 100644
--- a/lib/ui.lib.php
+++ b/lib/ui.lib.php
@@ -38,9 +38,9 @@
  * @param    integer    $cancel    T/F show a cancel button that uses return_referrer()
  * @return    void
  */
-function show_confirmation($title,$text,$next_url,$cancel=0,$form_name='confirmation',$visible=true)
+function show_confirmation($title, $text, $next_url, $cancel=0, $form_name='confirmation', $visible=true)
 {
-    if (substr_count($next_url,AmpConfig::get('web_path'))) {
+    if (substr_count($next_url, AmpConfig::get('web_path'))) {
         $path = $next_url;
     } else {
         $path = AmpConfig::get('web_path') . "/$next_url";
@@ -83,10 +83,10 @@ function return_referer()
     } else {
         $file = basename($referer);
         /* Strip off the filename */
-        $referer = substr($referer,0,strlen($referer)-strlen($file));
+        $referer = substr($referer, 0, strlen($referer)-strlen($file));
     }
 
-    if (substr($referer,strlen($referer)-6,6) == 'admin/') {
+    if (substr($referer, strlen($referer)-6, 6) == 'admin/') {
         $file = 'admin/' . $file;
     }
 
@@ -116,7 +116,7 @@ function get_location()
 
     /* Sanatize the $_SERVER['PHP_SELF'] variable */
     $source           = str_replace(AmpConfig::get('raw_web_path'), "", $source);
-    $location['page'] = preg_replace("/^\/(.+\.php)\/?.*/","$1",$source);
+    $location['page'] = preg_replace("/^\/(.+\.php)\/?.*/", "$1", $source);
 
     switch ($location['page']) {
         case 'index.php':
@@ -432,7 +432,7 @@ function show_catalog_select($name='catalog', $catalog_id=0, $style='', $allow_n
  * This displays a select of every album that we've got in Ampache (which can be
  * hella long). It's used by the Edit page and takes a $name and a $album_id
  */
-function show_license_select($name='license',$license_id=0,$song_id=0)
+function show_license_select($name='license', $license_id=0, $song_id=0)
 {
     static $license_id_cnt = 0;
 
@@ -474,7 +474,7 @@ function show_license_select($name='license',$license_id=0,$song_id=0)
  * This one is for users! shows a select/option statement so you can pick a user
  * to blame
  */
-function show_user_select($name,$selected='',$style='')
+function show_user_select($name, $selected='', $style='')
 {
     echo "<select name=\"$name\" style=\"$style\">\n";
     echo "\t<option value=\"\">" . T_('All') . "</option>\n";
@@ -500,7 +500,7 @@ function show_user_select($name,$selected='',$style='')
  * show_playlist_select
  * This one is for playlists!
  */
-function show_playlist_select($name,$selected='',$style='')
+function show_playlist_select($name, $selected='', $style='')
 {
     echo "<select name=\"$name\" style=\"$style\">\n";
     echo "\t<option value=\"\">" . T_('None') . "</option>\n";
diff --git a/localplay.php b/localplay.php
index a39b285b..7ecefc98 100644
--- a/localplay.php
+++ b/localplay.php
@@ -25,7 +25,7 @@ require_once 'lib/init.php';
 UI::show_header();
 
 // Check to see if we've got the rights to be here
-if (!AmpConfig::get('allow_localplay_playback') || !Access::check('interface','25')) {
+if (!AmpConfig::get('allow_localplay_playback') || !Access::check('interface', '25')) {
     UI::access_denied();
     exit;
 }
@@ -33,7 +33,7 @@ if (!AmpConfig::get('allow_localplay_playback') || !Access::check('interface','2
 switch ($_REQUEST['action']) {
     case 'show_add_instance':
         // This requires 50 or better
-        if (!Access::check('localplay','75')) {
+        if (!Access::check('localplay', '75')) {
             UI::access_denied();
             break;
         }
@@ -45,7 +45,7 @@ switch ($_REQUEST['action']) {
     break;
     case 'add_instance':
         // This requires 50 or better!
-        if (!Access::check('localplay','75')) {
+        if (!Access::check('localplay', '75')) {
             UI::access_denied();
             break;
         }
@@ -57,17 +57,17 @@ switch ($_REQUEST['action']) {
     break;
     case 'update_instance':
         // Make sure they gots them rights
-        if (!Access::check('localplay','75')) {
+        if (!Access::check('localplay', '75')) {
             UI::access_denied();
             break;
         }
         $localplay = new Localplay(AmpConfig::get('localplay_controller'));
-        $localplay->update_instance($_REQUEST['instance'],$_POST);
+        $localplay->update_instance($_REQUEST['instance'], $_POST);
         header("Location:" . AmpConfig::get('web_path') . "/localplay.php?action=show_instances");
     break;
     case 'edit_instance':
         // Check to make sure they've got the access
-        if (!Access::check('localplay','75')) {
+        if (!Access::check('localplay', '75')) {
             UI::access_denied();
             break;
         }
@@ -78,7 +78,7 @@ switch ($_REQUEST['action']) {
     break;
     case 'show_instances':
         // First build the localplay object and then get the instances
-        if (!Access::check('localplay','5')) {
+        if (!Access::check('localplay', '5')) {
             UI::access_denied();
             break;
         }
@@ -89,7 +89,7 @@ switch ($_REQUEST['action']) {
     break;
     case 'show_playlist':
     default:
-        if (!Access::check('localplay','5')) {
+        if (!Access::check('localplay', '5')) {
             UI::access_denied();
             break;
         }
diff --git a/logout.php b/logout.php
index 88e8478e..fe35c259 100644
--- a/logout.php
+++ b/logout.php
@@ -28,4 +28,4 @@ require_once 'lib/init.php';
 
 // To end a legitimate session, just call logout.
 setcookie(AmpConfig::get('session_name') . '_remember', null, -1);
-Auth::logout('',false);
+Auth::logout('', false);
diff --git a/lostpassword.php b/lostpassword.php
index ebb103f7..94362192 100644
--- a/lostpassword.php
+++ b/lostpassword.php
@@ -20,7 +20,7 @@
  *
  */
 
-define('NO_SESSION','1');
+define('NO_SESSION', '1');
 require_once 'lib/init.php';
 
 $action = (isset($_POST['action'])) ? $_POST['action'] : "";
@@ -47,7 +47,7 @@ switch ($action) {
         require AmpConfig::get('prefix') . UI::find_template('show_lostpassword_form.inc.php');
 }
 
-function send_newpassword($email,$current_ip)
+function send_newpassword($email, $current_ip)
 {
     /* get the Client and set the new password */
     $client = User::get_from_email($email);
diff --git a/modules/catalog/local/local.catalog.php b/modules/catalog/local/local.catalog.php
index a28035a7..7079981d 100644
--- a/modules/catalog/local/local.catalog.php
+++ b/modules/catalog/local/local.catalog.php
@@ -154,7 +154,7 @@ class Catalog_local extends Catalog
             // Keep going until the path stops changing
             $old_path       = $component_path;
             $component_path = realpath($component_path . '/../');
-        } while (strcmp($component_path,$old_path) != 0);
+        } while (strcmp($component_path, $old_path) != 0);
 
         return false;
     }
@@ -169,7 +169,7 @@ class Catalog_local extends Catalog
     public static function create_type($catalog_id, $data)
     {
         // Clean up the path just in case
-        $path = rtrim(rtrim(trim($data['path']),'/'),'\\');
+        $path = rtrim(rtrim(trim($data['path']), '/'), '\\');
 
         if (!strlen($path)) {
             AmpError::add('general', T_('Error: Path not specified'));
@@ -248,9 +248,9 @@ class Catalog_local extends Catalog
         debug_event('Memory', UI::format_bytes(memory_get_usage(true)), 5);
 
         /* Recurse through this dir and create the files array */
-        while ( false !== ( $file = readdir($handle) ) ) {
+        while (false !== ($file = readdir($handle))) {
             /* Skip to next if we've got . or .. */
-            if (substr($file,0,1) == '.') {
+            if (substr($file, 0, 1) == '.') {
                 continue;
             }
 
@@ -298,7 +298,7 @@ class Catalog_local extends Catalog
 
         /* If it's a dir run this function again! */
         if (is_dir($full_file)) {
-            $this->add_files($full_file,$options);
+            $this->add_files($full_file, $options);
 
             /* Change the dir so is_dir works correctly */
             if (!chdir($full_file)) {
@@ -429,8 +429,8 @@ class Catalog_local extends Catalog
         $start_time = time();
 
         // Make sure the path doesn't end in a / or \
-        $this->path = rtrim($this->path,'/');
-        $this->path = rtrim($this->path,'\\');
+        $this->path = rtrim($this->path, '/');
+        $this->path = rtrim($this->path, '\\');
 
         // Prevent the script from timing out and flush what we've got
         set_time_limit(0);
@@ -549,7 +549,7 @@ class Catalog_local extends Catalog
         while ($row = Dba::fetch_assoc($db_results)) {
             $count++;
             if (UI::check_ticker()) {
-                $file = str_replace(array('(',')','\''), '', $row['file']);
+                $file = str_replace(array('(', ')', '\''), '', $row['file']);
                 UI::update_text('verify_count_' . $this->id, $count);
                 UI::update_text('verify_dir_' . $this->id, scrub_out($file));
             }
@@ -561,7 +561,7 @@ class Catalog_local extends Catalog
             }
 
             $media = new $media_type($row['id']);
-            $info  = self::update_media_from_tags($media, $this->get_gather_types(), $this->sort_pattern,$this->rename_pattern);
+            $info  = self::update_media_from_tags($media, $this->get_gather_types(), $this->sort_pattern, $this->rename_pattern);
             if ($info['change']) {
                 $changed++;
             }
@@ -613,7 +613,7 @@ class Catalog_local extends Catalog
             if ($dead_count) {
                 $dead_total += $dead_count;
                 $sql = "DELETE FROM `$media_type` WHERE `id` IN " .
-                    '(' . implode(',',$dead) . ')';
+                    '(' . implode(',', $dead) . ')';
                 $db_results = Dba::write($sql);
             }
         }
@@ -642,7 +642,7 @@ class Catalog_local extends Catalog
             debug_event('clean', 'Starting work on ' . $results['file'] . '(' . $results['id'] . ')', 5);
             $count++;
             if (UI::check_ticker()) {
-                $file = str_replace(array('(',')', '\''), '', $results['file']);
+                $file = str_replace(array('(', ')', '\''), '', $results['file']);
                 UI::update_text('clean_count_' . $this->id, $count);
                 UI::update_text('clean_dir_' . $this->id, scrub_out($file));
             }
@@ -784,11 +784,11 @@ class Catalog_local extends Catalog
     {
         /* Create the vainfo object and get info */
         $gtypes     = $this->get_gather_types('video');
-        $vainfo     = new vainfo($file, $gtypes,'','','',$this->sort_pattern,$this->rename_pattern);
+        $vainfo     = new vainfo($file, $gtypes, '', '', '', $this->sort_pattern, $this->rename_pattern);
         $vainfo->get_info();
 
         $tag_name           = vainfo::get_tag_type($vainfo->tags, 'metadata_order_video');
-        $results            = vainfo::clean_tag_info($vainfo->tags,$tag_name,$file);
+        $results            = vainfo::clean_tag_info($vainfo->tags, $tag_name, $file);
         $results['catalog'] = $this->id;
 
         $id = Video::insert($results, $gtypes, $options);
@@ -830,7 +830,7 @@ class Catalog_local extends Catalog
     {
         $file_date = filemtime($full_file);
         if ($file_date < $this->last_add) {
-            debug_event('Check','Skipping ' . $full_file . ' File modify time before last add run','3');
+            debug_event('Check', 'Skipping ' . $full_file . ' File modify time before last add run', '3');
             return true;
         }
 
@@ -848,7 +848,7 @@ class Catalog_local extends Catalog
     public function get_rel_path($file_path)
     {
         $catalog_path = rtrim($this->path, "/");
-        return( str_replace( $catalog_path . "/", "", $file_path ) );
+        return(str_replace($catalog_path . "/", "", $file_path));
     }
 
     /**
diff --git a/modules/catalog/remote/remote.catalog.php b/modules/catalog/remote/remote.catalog.php
index 26554318..621fd544 100644
--- a/modules/catalog/remote/remote.catalog.php
+++ b/modules/catalog/remote/remote.catalog.php
@@ -140,7 +140,7 @@ class Catalog_remote extends Catalog
         $username = $data['username'];
         $password = $data['password'];
 
-        if (substr($uri,0,7) != 'http://' && substr($uri,0,8) != 'https://') {
+        if (substr($uri, 0, 7) != 'http://' && substr($uri, 0, 8) != 'https://') {
             AmpError::add('general', T_('Error: Remote selected, but path is not a URL'));
             return false;
         }
@@ -250,7 +250,7 @@ class Catalog_remote extends Catalog
                 $songs = $remote_handle->send_command('songs', array('offset' => $start, 'limit' => $step));
             } catch (Exception $e) {
                 debug_event('catalog', 'Songs parsing error: ' . $e->getMessage(), 1);
-                AmpError::add('general',$e->getMessage());
+                AmpError::add('general', $e->getMessage());
                 AmpError::display('general');
                 flush();
             }
@@ -346,7 +346,7 @@ class Catalog_remote extends Catalog
     public function get_rel_path($file_path)
     {
         $catalog_path = rtrim($this->uri, "/");
-        return( str_replace( $catalog_path . "/", "", $file_path ) );
+        return(str_replace($catalog_path . "/", "", $file_path));
     }
 
     /**
diff --git a/modules/catalog/subsonic/subsonic.catalog.php b/modules/catalog/subsonic/subsonic.catalog.php
index 2410f71b..662d50a8 100644
--- a/modules/catalog/subsonic/subsonic.catalog.php
+++ b/modules/catalog/subsonic/subsonic.catalog.php
@@ -142,7 +142,7 @@ class Catalog_subsonic extends Catalog
         $username = $data['username'];
         $password = $data['password'];
 
-        if (substr($uri,0,7) != 'http://' && substr($uri,0,8) != 'https://') {
+        if (substr($uri, 0, 7) != 'http://' && substr($uri, 0, 8) != 'https://') {
             AmpError::add('general', T_('Error: Subsonic selected, but path is not a URL'));
             return false;
         }
@@ -340,7 +340,7 @@ class Catalog_subsonic extends Catalog
     public function get_rel_path($file_path)
     {
         $catalog_path = rtrim($this->uri, "/");
-        return( str_replace( $catalog_path . "/", "", $file_path ) );
+        return(str_replace($catalog_path . "/", "", $file_path));
     }
 
     public function url_to_songid($url)
diff --git a/modules/catalog/subsonic/subsonic.client.php b/modules/catalog/subsonic/subsonic.client.php
index 20cad224..74f046e8 100644
--- a/modules/catalog/subsonic/subsonic.client.php
+++ b/modules/catalog/subsonic/subsonic.client.php
@@ -181,5 +181,3 @@ class SubsonicClient
         return $this->_querySubsonic($action, $o);
     }
 }
-
-?>
\ No newline at end of file
diff --git a/modules/localplay/httpq/httpq.controller.php b/modules/localplay/httpq/httpq.controller.php
index c2ff3736..c8bd8325 100644
--- a/modules/localplay/httpq/httpq.controller.php
+++ b/modules/localplay/httpq/httpq.controller.php
@@ -95,7 +95,7 @@ class AmpacheHttpq extends localplay_controller
             $db_results = Dba::write($sql);
 
         // Add an internal preference for the users current active instance
-        Preference::insert('httpq_active','HTTPQ Active Instance','0','25','integer','internal','httpq');
+        Preference::insert('httpq_active', 'HTTPQ Active Instance', '0', '25', 'integer', 'internal', 'httpq');
 
             return true;
         } // install
@@ -222,7 +222,7 @@ class AmpacheHttpq extends localplay_controller
          * set_active_instance
          * This sets the specified instance as the 'active' one
          */
-        public function set_active_instance($uid,$user_id='')
+        public function set_active_instance($uid, $user_id='')
         {
             // Not an admin? bubkiss!
         if (!$GLOBALS['user']->has_access('100')) {
@@ -231,7 +231,7 @@ class AmpacheHttpq extends localplay_controller
 
             $user_id = $user_id ? $user_id : $GLOBALS['user']->id;
 
-            Preference::update('httpq_active',$user_id,intval($uid));
+            Preference::update('httpq_active', $user_id, intval($uid));
             AmpConfig::set('httpq_active', intval($uid), true);
 
             return true;
@@ -448,7 +448,7 @@ class AmpacheHttpq extends localplay_controller
             return array();
         }
 
-        $songs = explode("::",$list);
+        $songs = explode("::", $list);
 
         foreach ($songs as $key=>$entry) {
             $data = array();
@@ -551,7 +551,7 @@ class AmpacheHttpq extends localplay_controller
     public function connect()
     {
         $options      = self::get_instance();
-        $this->_httpq = new HttpQPlayer($options['host'],$options['password'],$options['port']);
+        $this->_httpq = new HttpQPlayer($options['host'], $options['password'], $options['port']);
 
         // Test our connection by retriving the version
         if (!is_null($this->_httpq->version())) {
diff --git a/modules/localplay/httpq/httpqplayer.class.php b/modules/localplay/httpq/httpqplayer.class.php
index f35fef30..2ae928ad 100644
--- a/modules/localplay/httpq/httpqplayer.class.php
+++ b/modules/localplay/httpq/httpqplayer.class.php
@@ -72,7 +72,7 @@ class HttpQPlayer
     public function version()
     {
         $args    = array();
-        $results = $this->sendCommand('getversion',$args);
+        $results = $this->sendCommand('getversion', $args);
         
         // a return of 0 is a bad value
         if ($results == '0') {
@@ -138,7 +138,7 @@ class HttpQPlayer
     public function skip($pos)
     {
         $args    = array('index'=>$pos);
-        $results = $this->sendCommand('setplaylistpos',$args);
+        $results = $this->sendCommand('setplaylistpos', $args);
 
         if ($results == '0') {
             return null;
@@ -206,7 +206,7 @@ class HttpQPlayer
     public function repeat($value)
     {
         $args    = array('enable'=>$value);
-        $results = $this->sendCommand('repeat',$args);
+        $results = $this->sendCommand('repeat', $args);
         
         if ($results == '0') {
             $results = null;
@@ -222,7 +222,7 @@ class HttpQPlayer
     public function random($value)
     {
         $args    = array('enable'=>$value);
-        $results = $this->sendCommand('shuffle',$args);
+        $results = $this->sendCommand('shuffle', $args);
 
         if ($results == '0') {
             $results = null;
@@ -238,7 +238,7 @@ class HttpQPlayer
     public function delete_pos($track)
     {
         $args    = array('index'=>$track);
-        $results = $this->sendCommand('deletepos',$args);
+        $results = $this->sendCommand('deletepos', $args);
         
         if ($results == '0') {
             $results = null;
@@ -254,7 +254,7 @@ class HttpQPlayer
     public function state()
     {
         $args    = array();
-        $results = $this->sendCommand('isplaying',$args);
+        $results = $this->sendCommand('isplaying', $args);
 
         if ($results == '1') {
             $state = 'play';
@@ -276,13 +276,13 @@ class HttpQPlayer
     public function get_volume()
     {
         $args    = array();
-        $results = $this->sendCommand('getvolume',$args);
+        $results = $this->sendCommand('getvolume', $args);
 
         if ($results == '0') {
             $results = null;
         } else {
             /* Need to make this out of 100 */
-            $results = round((($results / 255) * 100),2);
+            $results = round((($results / 255) * 100), 2);
         }
 
         return $results;
@@ -295,7 +295,7 @@ class HttpQPlayer
     public function volume_up()
     {
         $args    = array();
-        $results = $this->sendCommand('volumeup',$args);
+        $results = $this->sendCommand('volumeup', $args);
         
         if ($results == '0') {
             return null;
@@ -311,7 +311,7 @@ class HttpQPlayer
     public function volume_down()
     {
         $args    = array();
-        $results = $this->sendCommand('volumedown',$args);
+        $results = $this->sendCommand('volumedown', $args);
         
         if ($results == '0') {
             return null;
@@ -331,7 +331,7 @@ class HttpQPlayer
         // Convert it to base 255
         $value   = $value*2.55;
         $args    = array('level'=>$value);
-        $results = $this->sendCommand('setvolume',$args);
+        $results = $this->sendCommand('setvolume', $args);
 
         if ($results == '0') {
             return null;
@@ -347,7 +347,7 @@ class HttpQPlayer
     public function clear_playlist()
     {
         $args    = array();
-        $results = $this->sendcommand('flushplaylist',$args);
+        $results = $this->sendcommand('flushplaylist', $args);
         
         if ($results == '0') {
             return null;
@@ -363,7 +363,7 @@ class HttpQPlayer
     public function get_repeat()
     {
         $args    = array();
-        $results = $this->sendCommand('repeat_status',$args);
+        $results = $this->sendCommand('repeat_status', $args);
 
         return $results;
     } // get_repeat
@@ -375,7 +375,7 @@ class HttpQPlayer
     public function get_random()
     {
         $args    = array();
-        $results = $this->sendCommand('shuffle_status',$args);
+        $results = $this->sendCommand('shuffle_status', $args);
         
         return $results;
     } // get_random
@@ -389,10 +389,10 @@ class HttpQPlayer
     {
 
         // First get the current POS
-        $pos = $this->sendCommand('getlistpos',array());
+        $pos = $this->sendCommand('getlistpos', array());
         
         // Now get the filename
-        $file = $this->sendCommand('getplaylistfile',array('index'=>$pos));
+        $file = $this->sendCommand('getplaylistfile', array('index'=>$pos));
 
         return $file;
     } // get_now_playing
@@ -406,7 +406,7 @@ class HttpQPlayer
     {
 
         // Pull a delimited list of all tracks
-        $results = $this->sendCommand('getplaylistfile',array('delim'=>'::'));
+        $results = $this->sendCommand('getplaylistfile', array('delim'=>'::'));
         
         if ($results == '0') {
             $results = null;
@@ -425,7 +425,7 @@ class HttpQPlayer
         $fp = fsockopen($this->host, $this->port, $errno, $errstr);
 
         if (!$fp) {
-            debug_event('httpq',"HttpQPlayer: $errstr ($errno)",'1');
+            debug_event('httpq', "HttpQPlayer: $errstr ($errno)", '1');
             return null;
         }
 
@@ -447,11 +447,11 @@ class HttpQPlayer
         fclose($fp);
 
         // Explode the results by line break and take 4th line (results)
-        $data = explode("\n",$data);
+        $data = explode("\n", $data);
         
         $result = $data['4'];
         
         return $result;
     } // sendCommand
 } // End HttpQPlayer Class
-?>
+;
diff --git a/modules/localplay/mpd/mpd.class.php b/modules/localplay/mpd/mpd.class.php
index ee1685f4..8a9b7983 100644
--- a/modules/localplay/mpd/mpd.class.php
+++ b/modules/localplay/mpd/mpd.class.php
@@ -244,7 +244,7 @@ class mpd
         /* We want blocking, cause otherwise it doesn't
          * timeout, and feof just keeps on spinning
          */
-        stream_set_blocking($this->_mpd_sock,true);
+        stream_set_blocking($this->_mpd_sock, true);
         $status = socket_get_status($this->_mpd_sock);
 
         if (!$this->_mpd_sock) {
@@ -252,7 +252,7 @@ class mpd
             return false;
         } else {
             while (!feof($this->_mpd_sock) && !$status['timed_out']) {
-                $response =  fgets($this->_mpd_sock,1024);
+                $response =  fgets($this->_mpd_sock, 1024);
                 if (function_exists('socket_get_status')) {
                     $status = socket_get_status($this->_mpd_sock);
                 }
@@ -261,7 +261,7 @@ class mpd
                     return $response;
                     break;
                 }
-                if (strncmp(self::RESPONSE_ERR,$response,strlen(self::RESPONSE_ERR)) == 0) {
+                if (strncmp(self::RESPONSE_ERR, $response, strlen(self::RESPONSE_ERR)) == 0) {
                     $this->_error('Connect', "Server responded with: $response");
                     return false;
                 }
@@ -281,14 +281,14 @@ class mpd
     public function SendCommand($command, $arguments = null, $refresh_info = true)
     {
         $this->_debug('SendCommand', "cmd: $command, args: " . json_encode($arguments), 5);
-        if ( ! $this->connected ) {
+        if (! $this->connected) {
             $this->_error('SendCommand', 'Not connected', 1);
             return false;
         } else {
             $response_string = '';
 
             // Check the command compatibility:
-            if ( ! self::_checkCompatibility($command, $this->mpd_version) ) {
+            if (! self::_checkCompatibility($command, $this->mpd_version)) {
                 return false;
             }
 
@@ -302,7 +302,7 @@ class mpd
                 }
             }
 
-            fputs($this->_mpd_sock,"$command\n");
+            fputs($this->_mpd_sock, "$command\n");
             while (!feof($this->_mpd_sock)) {
                 $response = fgets($this->_mpd_sock, 1024);
 
@@ -320,7 +320,7 @@ class mpd
                 // Build the response string
                 $response_string .= $response;
             }
-            $this->_debug('SendCommand', "response: $response_string" , 5);
+            $this->_debug('SendCommand', "response: $response_string", 5);
         }
 
         if ($refresh_info) {
@@ -340,7 +340,7 @@ class mpd
     public function QueueCommand($command, $arguments = '')
     {
         $this->_debug('QueueCommand', "start; cmd: $command args: " . json_encode($arguments), 5);
-        if ( ! $this->connected ) {
+        if (! $this->connected) {
             $this->_error('QueueCommand', 'Not connected');
             return false;
         }
@@ -372,7 +372,7 @@ class mpd
     public function SendCommandQueue()
     {
         $this->_debug('SendCommandQueue', 'start', 5);
-        if ( ! $this->connected ) {
+        if (! $this->connected) {
             _error('SendCommandQueue', 'Not connected');
             return false;
         }
@@ -424,7 +424,7 @@ class mpd
     public function AdjustVolume($value)
     {
         $this->_debug('AdjustVolume', 'start', 5);
-        if ( ! is_numeric($value) ) {
+        if (! is_numeric($value)) {
             $this->_error('AdjustVolume', "argument must be numeric: $value");
             return false;
         }
@@ -498,7 +498,7 @@ class mpd
     {
         $this->_debug('PLAddBulk', 'start', 5);
         $num_files = count($trackArray);
-        for ( $i = 0; $i < $num_files; $i++ ) {
+        for ($i = 0; $i < $num_files; $i++) {
             $this->QueueCommand(self::COMMAND_ADD, $trackArray[$i]);
         }
         $response = $this->SendCommandQueue();
@@ -602,7 +602,7 @@ class mpd
      */
     public function PLRemove($id)
     {
-        if ( ! is_numeric($id) ) {
+        if (! is_numeric($id)) {
             $this->_error('PLRemove', "id must be numeric: $id");
             return false;
         }
@@ -716,7 +716,7 @@ class mpd
     public function SkipTo($idx)
     {
         $this->_debug('SkipTo', 'start', 5);
-        if ( ! is_numeric($idx) ) {
+        if (! is_numeric($idx)) {
             $this->_error('SkipTo', "argument must be numeric: $idx");
             return false;
         }
@@ -736,15 +736,15 @@ class mpd
     public function SeekTo($pos, $track = -1)
     {
         $this->_debug('SeekTo', 'start', 5);
-        if ( ! is_numeric($pos) ) {
+        if (! is_numeric($pos)) {
             $this->_error('SeekTo', "pos must be numeric: $pos");
             return false;
         }
-        if ( ! is_numeric($track) ) {
+        if (! is_numeric($track)) {
             $this->_error('SeekTo', "track must be numeric: $track");
             return false;
         }
-        if ( $track == -1 ) {
+        if ($track == -1) {
             $track = $this->current_track_id;
         }
 
@@ -787,13 +787,13 @@ class mpd
      * The search <string> is a case-insensitive locator string. Anything
      * that contains <string> will be returned in the results.
      */
-    public function Search($type,$string)
+    public function Search($type, $string)
     {
         $this->_debug('Search', 'start', 5);
 
-        if ( $type != self::SEARCH_ARTIST &&
+        if ($type != self::SEARCH_ARTIST &&
             $type != self::SEARCH_ALBUM &&
-            $type != self::SEARCH_TITLE ) {
+            $type != self::SEARCH_TITLE) {
             $this->_error('Search', 'invalid search type');
             return false;
         }
@@ -820,9 +820,9 @@ class mpd
     public function Find($type, $string)
     {
         $this->_debug('Find', 'start', 5);
-        if ( $type != self::SEARCH_ARTIST &&
+        if ($type != self::SEARCH_ARTIST &&
             $type != self::SEARCH_ALBUM &&
-            $type != self::SEARCH_TITLE ) {
+            $type != self::SEARCH_TITLE) {
             $this->_error('Find', 'invalid find type');
             return false;
         }
@@ -1025,5 +1025,4 @@ class mpd
         }
     }
 }   // end class mpd
-
-?>
+;
diff --git a/modules/localplay/mpd/mpd.controller.php b/modules/localplay/mpd/mpd.controller.php
index 455aaddf..52154703 100644
--- a/modules/localplay/mpd/mpd.controller.php
+++ b/modules/localplay/mpd/mpd.controller.php
@@ -97,7 +97,7 @@ class AmpacheMpd extends localplay_controller
         $db_results = Dba::write($sql);
 
         // Add an internal preference for the users current active instance
-        Preference::insert('mpd_active','MPD Active Instance','0','25','integer','internal','mpd');
+        Preference::insert('mpd_active', 'MPD Active Instance', '0', '25', 'integer', 'internal', 'mpd');
 
         return true;
     } // install
@@ -201,7 +201,7 @@ class AmpacheMpd extends localplay_controller
      * update_instance
      * This takes an ID and an array of data and updates the instance specified
      */
-    public function update_instance($uid,$data)
+    public function update_instance($uid, $data)
     {
         $uid     = Dba::escape($uid);
         $host    = $data['host'] ? Dba::escape($data['host']) : '127.0.0.1';
@@ -234,7 +234,7 @@ class AmpacheMpd extends localplay_controller
      * set_active_instance
      * This sets the specified instance as the 'active' one
      */
-    public function set_active_instance($uid,$user_id='')
+    public function set_active_instance($uid, $user_id='')
     {
         // Not an admin? bubkiss!
         if (!$GLOBALS['user']->has_access('100')) {
@@ -243,7 +243,7 @@ class AmpacheMpd extends localplay_controller
 
         $user_id = $user_id ? $user_id : $GLOBALS['user']->id;
 
-        Preference::update('mpd_active',$user_id,intval($uid));
+        Preference::update('mpd_active', $user_id, intval($uid));
         AmpConfig::set('mpd_active', intval($uid), true);
 
         return true;
diff --git a/modules/localplay/upnp/upnp.controller.php b/modules/localplay/upnp/upnp.controller.php
index 08bbe5a1..888d3ba8 100644
--- a/modules/localplay/upnp/upnp.controller.php
+++ b/modules/localplay/upnp/upnp.controller.php
@@ -93,7 +93,7 @@ class AmpacheUPnP extends localplay_controller
         $db_results = Dba::query($sql);
 
         // Add an internal preference for the users current active instance
-        Preference::insert('upnp_active', 'UPnP Active Instance', '0', '25', 'integer', 'internal','upnp');
+        Preference::insert('upnp_active', 'UPnP Active Instance', '0', '25', 'integer', 'internal', 'upnp');
 
         return true;
     }
diff --git a/modules/localplay/upnp/upnpdevice.php b/modules/localplay/upnp/upnpdevice.php
index cab88fe3..0279b5ca 100644
--- a/modules/localplay/upnp/upnpdevice.php
+++ b/modules/localplay/upnp/upnpdevice.php
@@ -71,12 +71,12 @@ class UPnPDevice
     * @param string $method     Method name
     * @param array  $arguments  Key-Value array
     */
-    public function sendRequestToDevice( $method, $arguments, $type = 'RenderingControl')
+    public function sendRequestToDevice($method, $arguments, $type = 'RenderingControl')
     {
         $body  ='<?xml version="1.0" encoding="utf-8"?>';
         $body .='<s:Envelope s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:s="http://schemas.xmlsoap.org/soap/envelope/"><s:Body>';
         $body .='  <u:' . $method . ' xmlns:u="urn:schemas-upnp-org:service:' . $type . ':1">';
-        foreach ( $arguments as $arg=>$value ) {
+        foreach ($arguments as $arg=>$value) {
             $body .=' <' . $arg . '>' . $value . '</' . $arg . '>';
         }
         $body .='  </u:' . $method . '>';
@@ -97,16 +97,16 @@ class UPnPDevice
         //debug_event('upnpdevice', 'sendRequestToDevice Hdr: ' . print_r($header, true), 5);
 
         $ch = curl_init();
-        curl_setopt( $ch, CURLOPT_URL, $controlUrl );
-        curl_setopt( $ch, CURLOPT_POST, 1 );
-        curl_setopt( $ch, CURLOPT_POSTFIELDS, $body );
-        curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true );
-        curl_setopt( $ch, CURLOPT_HEADER, true );
-        curl_setopt( $ch, CURLOPT_HTTPHEADER, $header );
-        curl_setopt( $ch, CURLOPT_FOLLOWLOCATION, true );
+        curl_setopt($ch, CURLOPT_URL, $controlUrl);
+        curl_setopt($ch, CURLOPT_POST, 1);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_HEADER, true);
+        curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
+        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
 
-        $response = curl_exec( $ch );
-        curl_close( $ch );
+        $response = curl_exec($ch);
+        curl_close($ch);
         //debug_event('upnpdevice', 'sendRequestToDevice response: ' . $response, 5);
 
         $headers = array();
diff --git a/modules/localplay/upnp/upnpplayer.class.php b/modules/localplay/upnp/upnpplayer.class.php
index 9bcdc8d8..102fc4ec 100644
--- a/modules/localplay/upnp/upnpplayer.class.php
+++ b/modules/localplay/upnp/upnpplayer.class.php
@@ -200,11 +200,11 @@ class UPnPPlayer
     private function CallAsyncURL($url)
     {
         $ch = curl_init();
-        curl_setopt( $ch, CURLOPT_URL, $url );
-        curl_setopt( $ch, CURLOPT_FRESH_CONNECT, true );
-        curl_setopt( $ch, CURLOPT_HEADER, false );
-        curl_exec( $ch );
-        curl_close( $ch );
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_FRESH_CONNECT, true);
+        curl_setopt($ch, CURLOPT_HEADER, false);
+        curl_exec($ch);
+        curl_close($ch);
     }
 
     /**
@@ -332,7 +332,7 @@ class UPnPPlayer
         $instanceId    = 0;
         $channel       = 'Master';
 
-        $response = $this->Device()->sendRequestToDevice( 'SetVolume', array(
+        $response = $this->Device()->sendRequestToDevice('SetVolume', array(
             'InstanceID' => $instanceId,
             'Channel' => $channel,
             'DesiredVolume' => $desiredVolume
@@ -349,7 +349,7 @@ class UPnPPlayer
         $instanceId = 0;
         $channel    = 'Master';
 
-        $response = $this->Device()->sendRequestToDevice( 'GetVolume', array(
+        $response = $this->Device()->sendRequestToDevice('GetVolume', array(
             'InstanceID' => $instanceId,
             'Channel' => $channel
         ));
@@ -385,4 +385,4 @@ class UPnPPlayer
         debug_event('upnpPlayer', 'ReadIndState:' . $this->_intState, 5);
     }
 } // End UPnPPlayer Class
-?>
+;
diff --git a/modules/localplay/upnp/upnpplaylist.php b/modules/localplay/upnp/upnpplaylist.php
index dd902439..8865136c 100644
--- a/modules/localplay/upnp/upnpplaylist.php
+++ b/modules/localplay/upnp/upnpplaylist.php
@@ -138,5 +138,3 @@ class UPnPPlaylist
         }
     }
 }
-
-?>
\ No newline at end of file
diff --git a/modules/localplay/vlc/vlc.controller.php b/modules/localplay/vlc/vlc.controller.php
index b8017db6..afc5a034 100644
--- a/modules/localplay/vlc/vlc.controller.php
+++ b/modules/localplay/vlc/vlc.controller.php
@@ -95,7 +95,7 @@ class AmpacheVlc extends localplay_controller
             $db_results = Dba::query($sql);
 
             // Add an internal preference for the users current active instance
-            Preference::insert('vlc_active','VLC Active Instance','0','25','integer','internal','vlc');
+            Preference::insert('vlc_active', 'VLC Active Instance', '0', '25', 'integer', 'internal', 'vlc');
 
             return true;
         } // install
@@ -162,7 +162,7 @@ class AmpacheVlc extends localplay_controller
          * update_instance
          * This takes an ID and an array of data and updates the instance specified
          */
-        public function update_instance($uid,$data)
+        public function update_instance($uid, $data)
         {
             $sql        = "UPDATE `localplay_vlc` SET `host` = ?, `port` = ?, `name` = ?, `password` = ? WHERE `id` = ?";
             $db_results = Dba::query($sql, array($data['host'], $data['port'], $data['name'], $data['password'], $uid));
@@ -205,7 +205,7 @@ class AmpacheVlc extends localplay_controller
      * set_active_instance
      * This sets the specified instance as the 'active' one
      */
-    public function set_active_instance($uid,$user_id='')
+    public function set_active_instance($uid, $user_id='')
     {
         // Not an admin? bubkiss!
         if (!$GLOBALS['user']->has_access('100')) {
@@ -214,7 +214,7 @@ class AmpacheVlc extends localplay_controller
 
         $user_id = $user_id ? $user_id : $GLOBALS['user']->id;
 
-        Preference::update('vlc_active',$user_id,intval($uid));
+        Preference::update('vlc_active', $user_id, intval($uid));
         AmpConfig::set('vlc_active', intval($uid), true);
 
         return true;
@@ -247,7 +247,7 @@ class AmpacheVlc extends localplay_controller
     public function delete_track($object_id)
     {
         if ($this->_vlc->delete_pos($object_id) === null) {
-            debug_event('vlc_del','ERROR Unable to delete ' . $object_id . ' from Vlc','1');
+            debug_event('vlc_del', 'ERROR Unable to delete ' . $object_id . ' from Vlc', '1');
             return false;
         }
 
@@ -495,12 +495,12 @@ class AmpacheVlc extends localplay_controller
                                            $data['name'] = htmlspecialchars(substr($row['name'], 0, 50));
                                         }
                                             //if it's a http stream not in ampacha's database just show the url'
-                                          elseif ( strncmp($entry, 'http', 4)== 0) {
+                                          elseif (strncmp($entry, 'http', 4)== 0) {
                                               $data['name'] = htmlspecialchars("(VLC stream) " . substr($entry, 0, 50));
                                           }
                                           //if it's a file get the last output after  and show that, hard to take every output possible in account
                                           else {
-                                              $getlast      = explode("/",$entry);
+                                              $getlast      = explode("/", $entry);
                                               $lastis       = count($getlast) - 1;
                                               $data['name'] = htmlspecialchars("(VLC local) " . substr($getlast[$lastis], 0, 50));
                                           } // end if loop
@@ -567,7 +567,7 @@ class AmpacheVlc extends localplay_controller
     public function connect()
     {
         $options    = self::get_instance();
-        $this->_vlc = new VlcPlayer($options['host'],$options['password'],$options['port']);
+        $this->_vlc = new VlcPlayer($options['host'], $options['password'], $options['port']);
 
         // Test our connection by retriving the version, no version in status file, just need to see if returned
         //Not yet working all values returned are true for beta testing purpose
diff --git a/modules/localplay/vlc/vlcplayer.class.php b/modules/localplay/vlc/vlcplayer.class.php
index bd9b02fd..c8fa16ea 100644
--- a/modules/localplay/vlc/vlcplayer.class.php
+++ b/modules/localplay/vlc/vlcplayer.class.php
@@ -75,7 +75,7 @@ class VlcPlayer
     public function version()
     {
         $args    = array();
-        $results = $this->sendCommand('status.xml',$args);
+        $results = $this->sendCommand('status.xml', $args);
         if ($results === null) {
             return null;
         }
@@ -136,7 +136,7 @@ class VlcPlayer
     public function skip($pos)
     {
         $args    = array('command'=>'pl_play','&id'=>$pos);
-        $results = $this->sendCommand('status.xml?',$args);
+        $results = $this->sendCommand('status.xml?', $args);
         if ($results === null) {
             return null;
         }
@@ -198,7 +198,7 @@ class VlcPlayer
     public function repeat($value)
     {
         $args    = array('command'=>'pl_repeat');
-        $results = $this->sendCommand('status.xml?',$args);
+        $results = $this->sendCommand('status.xml?', $args);
         if ($results === null) {
             return null;
         }
@@ -213,7 +213,7 @@ class VlcPlayer
     public function random($value)
     {
         $args    = array('command'=>'pl_random');
-        $results = $this->sendCommand('status.xml?',$args);
+        $results = $this->sendCommand('status.xml?', $args);
         if ($results === null) {
             return null;
         }
@@ -228,7 +228,7 @@ class VlcPlayer
     public function delete_pos($track)
     {
         $args    = array('command'=>'pl_delete','&id'=>$track);
-        $results = $this->sendCommand('status.xml?',$args);
+        $results = $this->sendCommand('status.xml?', $args);
         if ($results === null) {
             return null;
         }
@@ -244,7 +244,7 @@ class VlcPlayer
     {
         $args = array();
         
-        $results     = $this->sendCommand('status.xml',$args);
+        $results     = $this->sendCommand('status.xml', $args);
         $currentstat = $results['root']['state']['value'];
 
         if ($currentstat == 'playing') {
@@ -268,7 +268,7 @@ class VlcPlayer
     {
         $args = array();
         
-        $results = $this->sendCommand('status.xml',$args);
+        $results = $this->sendCommand('status.xml', $args);
         if ($results === null) {
             return null;
         }
@@ -283,7 +283,7 @@ class VlcPlayer
     public function volume_up()
     {
         $args    = array('command'=>'volume','&val'=>'%2B20');
-        $results = $this->sendCommand('status.xml?',$args);
+        $results = $this->sendCommand('status.xml?', $args);
         if ($results === null) {
             return null;
         }
@@ -298,7 +298,7 @@ class VlcPlayer
     public function volume_down()
     {
         $args    = array('command'=>'volume','&val'=>'-20');
-        $results = $this->sendCommand('status.xml?',$args);
+        $results = $this->sendCommand('status.xml?', $args);
         if ($results === null) {
             return null;
         }
@@ -316,7 +316,7 @@ class VlcPlayer
         // Convert it to base 400
         $value   = $value*4;
         $args    = array('command'=>'volume','&val'=>$value);
-        $results = $this->sendCommand('status.xml?',$args);
+        $results = $this->sendCommand('status.xml?', $args);
         if ($results === null) {
             return null;
         }
@@ -331,7 +331,7 @@ class VlcPlayer
     public function clear_playlist()
     {
         $args    = array('command'=>'pl_empty');
-        $results = $this->sendcommand('status.xml?',$args);
+        $results = $this->sendcommand('status.xml?', $args);
         if ($results === null) {
             return null;
         }
@@ -350,7 +350,7 @@ class VlcPlayer
         // Gets complete playlist + medialib in vlc's case, needs to be looked at
         $args = array();
         
-        $results = $this->sendCommand('playlist.xml',$args);
+        $results = $this->sendCommand('playlist.xml', $args);
         if ($results === null) {
             return null;
         }
@@ -368,7 +368,7 @@ class VlcPlayer
         $fp = fsockopen($this->host, $this->port, $errno, $errstr);
 
         if (!$fp) {
-            debug_event('vlc',"VlcPlayer: $errstr ($errno)",'1');
+            debug_event('vlc', "VlcPlayer: $errstr ($errno)", '1');
             return null;
         }
 
@@ -397,12 +397,12 @@ class VlcPlayer
         do {
             // loop until the end of the header
 
-            $header .= fgets ( $fp );
-        } while ( strpos ( $header, "\r\n\r\n" ) === false );
+            $header .= fgets($fp);
+        } while (strpos($header, "\r\n\r\n") === false);
 
         // now put the body in variable $data
-        while ( ! feof ( $fp ) ) {
-            $data .= fgets ( $fp );
+        while (! feof($fp)) {
+            $data .= fgets($fp);
         }
         
         fclose($fp);
@@ -449,7 +449,7 @@ class VlcPlayer
     //Go through the tags.
     $repeated_tag_index = array();//Multiple tags with same name will be turned into an array
     foreach ($xml_values as $data) {
-        unset($attributes,$value);//Remove existing values, or there will be trouble
+        unset($attributes, $value);//Remove existing values, or there will be trouble
 
            //This command will extract these variables into the foreach scope
            // tag(string), type(string), level(int), attributes(array).
@@ -552,4 +552,4 @@ class VlcPlayer
        return($bigxml_array);
    }   //end xml parser
 } // End VlcPlayer Class
-?>
+;
diff --git a/modules/localplay/xbmc/xbmc.controller.php b/modules/localplay/xbmc/xbmc.controller.php
index cba2a24c..27fb4e7a 100644
--- a/modules/localplay/xbmc/xbmc.controller.php
+++ b/modules/localplay/xbmc/xbmc.controller.php
@@ -101,7 +101,7 @@ class AmpacheXbmc extends localplay_controller
         $db_results = Dba::query($sql);
 
         // Add an internal preference for the users current active instance
-        Preference::insert('xbmc_active','XBMC Active Instance','0','25','integer','internal','xbmc');
+        Preference::insert('xbmc_active', 'XBMC Active Instance', '0', '25', 'integer', 'internal', 'xbmc');
 
         return true;
     } // install
@@ -169,7 +169,7 @@ class AmpacheXbmc extends localplay_controller
      * update_instance
      * This takes an ID and an array of data and updates the instance specified
      */
-    public function update_instance($uid,$data)
+    public function update_instance($uid, $data)
     {
         $sql        = "UPDATE `localplay_xbmc` SET `host` = ?, `port` = ?, `name` = ?, `user` = ?, `pass` = ? WHERE `id` = ?";
         $db_results = Dba::query($sql, array($data['host'], $data['port'], $data['name'], $data['user'], $data['pass'], $uid));
@@ -213,7 +213,7 @@ class AmpacheXbmc extends localplay_controller
      * set_active_instance
      * This sets the specified instance as the 'active' one
      */
-    public function set_active_instance($uid,$user_id='')
+    public function set_active_instance($uid, $user_id='')
     {
         // Not an admin? bubkiss!
         if (!$GLOBALS['user']->has_access('100')) {
diff --git a/modules/plugins/7Digital/7Digital.plugin.php b/modules/plugins/7Digital/7Digital.plugin.php
index c42c0a5f..a7a7261b 100644
--- a/modules/plugins/7Digital/7Digital.plugin.php
+++ b/modules/plugins/7Digital/7Digital.plugin.php
@@ -54,8 +54,8 @@ class Ampache7digital
         if (Preference::exists('7digital_api_key')) {
             return false;
         }
-        Preference::insert('7digital_api_key','7digital consumer key','','75','string','plugins',$this->name);
-        Preference::insert('7digital_secret_api_key','7digital secret','','75','string','plugins',$this->name);
+        Preference::insert('7digital_api_key', '7digital consumer key', '', '75', 'string', 'plugins', $this->name);
+        Preference::insert('7digital_secret_api_key', '7digital secret', '', '75', 'string', 'plugins', $this->name);
         return true;
     } // install
 
@@ -151,17 +151,17 @@ class Ampache7digital
         if (strlen(trim($data['7digital_api_key']))) {
             $this->api_key = trim($data['7digital_api_key']);
         } else {
-            debug_event($this->name,'No 7digital api key, song preview plugin skipped','3');
+            debug_event($this->name, 'No 7digital api key, song preview plugin skipped', '3');
             return false;
         }
         if (strlen(trim($data['7digital_secret_api_key']))) {
             $this->secret = trim($data['7digital_secret_api_key']);
         } else {
-            debug_event($this->name,'No 7digital secret, song preview plugin skipped','3');
+            debug_event($this->name, 'No 7digital secret, song preview plugin skipped', '3');
             return false;
         }
         
         return true;
     } // load
 } // end Ampache7digital
-?>
+;
diff --git a/modules/plugins/Amazon/Amazon.plugin.php b/modules/plugins/Amazon/Amazon.plugin.php
index 4e99a2cc..23234079 100644
--- a/modules/plugins/Amazon/Amazon.plugin.php
+++ b/modules/plugins/Amazon/Amazon.plugin.php
@@ -55,11 +55,11 @@ class AmpacheAmazon
             return false;
         }
 
-        Preference::insert('amazon_base_url', 'Amazon base url', 'http://webservices.amazon.com', '75', 'string', 'plugins',$this->name);
-        Preference::insert('amazon_max_results_pages', 'Amazon max results pages', '1', '75', 'integer', 'plugins',$this->name);
-        Preference::insert('amazon_developer_public_key', 'Amazon Access Key ID', '', '75', 'string', 'plugins',$this->name);
-        Preference::insert('amazon_developer_private_api_key', 'Amazon Secret Access Key', '', '75', 'string', 'plugins',$this->name);
-        Preference::insert('amazon_developer_associate_tag', 'Amazon associate tag', '', '75', 'string', 'plugins',$this->name);
+        Preference::insert('amazon_base_url', 'Amazon base url', 'http://webservices.amazon.com', '75', 'string', 'plugins', $this->name);
+        Preference::insert('amazon_max_results_pages', 'Amazon max results pages', '1', '75', 'integer', 'plugins', $this->name);
+        Preference::insert('amazon_developer_public_key', 'Amazon Access Key ID', '', '75', 'string', 'plugins', $this->name);
+        Preference::insert('amazon_developer_private_api_key', 'Amazon Secret Access Key', '', '75', 'string', 'plugins', $this->name);
+        Preference::insert('amazon_developer_associate_tag', 'Amazon associate tag', '', '75', 'string', 'plugins', $this->name);
         
         return true;
     } // install
@@ -92,21 +92,21 @@ class AmpacheAmazon
         if (strlen(trim($data['amazon_base_url']))) {
             $this->amazon_base_url = trim($data['amazon_base_url']);
         } else {
-            debug_event($this->name,'No amazon base url, plugin skipped','3');
+            debug_event($this->name, 'No amazon base url, plugin skipped', '3');
             return false;
         }
         
         if (strlen(trim($data['amazon_developer_public_key']))) {
             $this->amazon_developer_public_key = trim($data['amazon_developer_public_key']);
         } else {
-            debug_event($this->name,'No amazon developer public key, plugin skipped','3');
+            debug_event($this->name, 'No amazon developer public key, plugin skipped', '3');
             return false;
         }
         
         if (strlen(trim($data['amazon_developer_private_api_key']))) {
             $this->amazon_developer_private_api_key = trim($data['amazon_developer_private_api_key']);
         } else {
-            debug_event($this->name,'No amazon developer private key, plugin skipped','3');
+            debug_event($this->name, 'No amazon developer private key, plugin skipped', '3');
             return false;
         }
         
@@ -170,13 +170,13 @@ class AmpacheAmazon
 
                 debug_event('amazon-xml', "Found $total, limit $limit; reducing and breaking from loop", 5);
                 // Merge the results and BREAK!
-                $search_results = array_merge($search_results,$raw_results);
+                $search_results = array_merge($search_results, $raw_results);
                 break;
             } // if limit defined
 
-            $search_results  = array_merge($search_results,$raw_results);
+            $search_results  = array_merge($search_results, $raw_results);
             $pages_to_search = min($max_pages_to_search, $amazon->_maxPage);
-            debug_event('amazon-xml', "Searched results page " . ($amazon->_currentPage+1) . "/" . $pages_to_search,'5');
+            debug_event('amazon-xml', "Searched results page " . ($amazon->_currentPage+1) . "/" . $pages_to_search, '5');
             $amazon->_currentPage++;
         } while ($amazon->_currentPage < $pages_to_search);
 
@@ -187,7 +187,7 @@ class AmpacheAmazon
         }
 
         /* Log this if we're doin debug */
-        debug_event('amazon-xml',"Searched using " . $options['keyword'] . ", results: " . count($final_results), 5);
+        debug_event('amazon-xml', "Searched using " . $options['keyword'] . ", results: " . count($final_results), 5);
 
         /* Foreach through what we've found */
         foreach ($final_results as $result) {
@@ -231,4 +231,4 @@ class AmpacheAmazon
         return $images;
     } // gather_arts
 } // end AmpacheAmazon
-?>
+;
diff --git a/modules/plugins/Bitly/Bitly.plugin.php b/modules/plugins/Bitly/Bitly.plugin.php
index 74732ecd..46e84195 100644
--- a/modules/plugins/Bitly/Bitly.plugin.php
+++ b/modules/plugins/Bitly/Bitly.plugin.php
@@ -57,8 +57,8 @@ class AmpacheBitly
             return false;
         }
 
-        Preference::insert('bitly_username','Bit.ly username','','75','string','plugins',$this->name);
-        Preference::insert('bitly_api_key','Bit.ly api key','','75','string','plugins',$this->name);
+        Preference::insert('bitly_username', 'Bit.ly username', '', '75', 'string', 'plugins', $this->name);
+        Preference::insert('bitly_api_key', 'Bit.ly api key', '', '75', 'string', 'plugins', $this->name);
 
         return true;
     } // install
@@ -118,17 +118,17 @@ class AmpacheBitly
         if (strlen(trim($data['bitly_username']))) {
             $this->bitly_username = trim($data['bitly_username']);
         } else {
-            debug_event($this->name,'No Bit.ly username, shortener skipped','3');
+            debug_event($this->name, 'No Bit.ly username, shortener skipped', '3');
             return false;
         }
         if (strlen(trim($data['bitly_api_key']))) {
             $this->bitly_api_key = trim($data['bitly_api_key']);
         } else {
-            debug_event($this->name,'No Bit.ly api key, shortener skipped','3');
+            debug_event($this->name, 'No Bit.ly api key, shortener skipped', '3');
             return false;
         }
 
         return true;
     } // load
 } // end AmpacheBitly
-?>
+;
diff --git a/modules/plugins/CatalogFavorites/CatalogFavorites.plugin.php b/modules/plugins/CatalogFavorites/CatalogFavorites.plugin.php
index 758d7a0b..081e59d1 100644
--- a/modules/plugins/CatalogFavorites/CatalogFavorites.plugin.php
+++ b/modules/plugins/CatalogFavorites/CatalogFavorites.plugin.php
@@ -56,8 +56,8 @@ class AmpacheCatalogFavorites
             return false;
         }
 
-        Preference::insert('catalogfav_max_items','Catalog favorites max items','5','25','integer','plugins',$this->name);
-        Preference::insert('catalogfav_gridview','Catalog favorites grid view display','1','25','boolean','plugins',$this->name);
+        Preference::insert('catalogfav_max_items', 'Catalog favorites max items', '5', '25', 'integer', 'plugins', $this->name);
+        Preference::insert('catalogfav_gridview', 'Catalog favorites grid view display', '1', '25', 'boolean', 'plugins', $this->name);
 
         return true;
     }
@@ -83,7 +83,7 @@ class AmpacheCatalogFavorites
     {
         $from_version = Plugin::get_plugin_version($this->name);
         if ($from_version < 2) {
-            Preference::insert('catalogfav_gridview','Catalog favorites grid view display','1','25','boolean','plugins');
+            Preference::insert('catalogfav_gridview', 'Catalog favorites grid view display', '1', '25', 'boolean', 'plugins');
         }
         return true;
     }
@@ -117,12 +117,12 @@ class AmpacheCatalogFavorites
                         echo '<span style="font-weight: bold;">' . $item->f_link . '</span> ';
                         echo '<span style="margin-right: 10px;">';
                         if (AmpConfig::get('directplay')) {
-                            echo Ajax::button('?page=stream&action=directplay&object_type=' . $userflag['type'] . '&object_id=' . $userflag['id'],'play', T_('Play'),'play_' . $userflag['type'] . '_' . $userflag['id']);
+                            echo Ajax::button('?page=stream&action=directplay&object_type=' . $userflag['type'] . '&object_id=' . $userflag['id'], 'play', T_('Play'), 'play_' . $userflag['type'] . '_' . $userflag['id']);
                             if (Stream_Playlist::check_autoplay_append()) {
-                                echo Ajax::button('?page=stream&action=directplay&object_type=' . $userflag['type'] . '&object_id=' . $userflag['id'] . '&append=true','play_add', T_('Play last'),'addplay_' . $userflag['type'] . '_' . $userflag['id']);
+                                echo Ajax::button('?page=stream&action=directplay&object_type=' . $userflag['type'] . '&object_id=' . $userflag['id'] . '&append=true', 'play_add', T_('Play last'), 'addplay_' . $userflag['type'] . '_' . $userflag['id']);
                             }
                         }
-                        echo Ajax::button('?action=basket&type=' . $userflag['type'] . '&id=' . $userflag['id'],'add', T_('Add to temporary playlist'),'play_full_' . $userflag['id']);
+                        echo Ajax::button('?action=basket&type=' . $userflag['type'] . '&id=' . $userflag['id'], 'add', T_('Add to temporary playlist'), 'play_full_' . $userflag['id']);
                         echo '</span>';
                     }
 
diff --git a/modules/plugins/ChartLyrics/ChartLyrics.plugin.php b/modules/plugins/ChartLyrics/ChartLyrics.plugin.php
index 870c025f..eb9f4d22 100644
--- a/modules/plugins/ChartLyrics/ChartLyrics.plugin.php
+++ b/modules/plugins/ChartLyrics/ChartLyrics.plugin.php
@@ -88,4 +88,4 @@ class Ampachechartlyrics
         return false;
     } // get_lyrics
 } // end Ampachelyricwiki
-?>
+;
diff --git a/modules/plugins/Discogs/Discogs.plugin.php b/modules/plugins/Discogs/Discogs.plugin.php
index 5115195f..8f14efba 100644
--- a/modules/plugins/Discogs/Discogs.plugin.php
+++ b/modules/plugins/Discogs/Discogs.plugin.php
@@ -51,8 +51,8 @@ class AmpacheDiscogs
         if (Preference::exists('discogs_api_key')) {
             return false;
         }
-        Preference::insert('discogs_api_key','Discogs consumer key','','75','string','plugins',$this->name);
-        Preference::insert('discogs_secret_api_key','Discogs secret','','75','string','plugins',$this->name);
+        Preference::insert('discogs_api_key', 'Discogs consumer key', '', '75', 'string', 'plugins', $this->name);
+        Preference::insert('discogs_secret_api_key', 'Discogs secret', '', '75', 'string', 'plugins', $this->name);
         return true;
     } // install
 
@@ -80,13 +80,13 @@ class AmpacheDiscogs
         if (strlen(trim($data['discogs_api_key']))) {
             $this->api_key = trim($data['discogs_api_key']);
         } else {
-            debug_event($this->name,'No Discogs api key, metadata plugin skipped','3');
+            debug_event($this->name, 'No Discogs api key, metadata plugin skipped', '3');
             return false;
         }
         if (strlen(trim($data['discogs_secret_api_key']))) {
             $this->secret = trim($data['discogs_secret_api_key']);
         } else {
-            debug_event($this->name,'No Discogs secret, metadata plugin skipped','3');
+            debug_event($this->name, 'No Discogs secret, metadata plugin skipped', '3');
             return false;
         }
         
diff --git a/modules/plugins/Flattr/Flattr.plugin.php b/modules/plugins/Flattr/Flattr.plugin.php
index 3f606e0e..82c096b4 100644
--- a/modules/plugins/Flattr/Flattr.plugin.php
+++ b/modules/plugins/Flattr/Flattr.plugin.php
@@ -56,7 +56,7 @@ class AmpacheFlattr
             return false;
         }
 
-        Preference::insert('flattr_user_id','Flattr User ID','',25,'string','plugins',$this->name);
+        Preference::insert('flattr_user_id', 'Flattr User ID', '', 25, 'string', 'plugins', $this->name);
 
         return true;
     }
@@ -107,7 +107,7 @@ class AmpacheFlattr
 
         $this->user_id = trim($data['flattr_user_id']);
         if (!strlen($this->user_id)) {
-            debug_event($this->name,'No Flattr User ID, user field plugin skipped','3');
+            debug_event($this->name, 'No Flattr User ID, user field plugin skipped', '3');
             return false;
         }
 
diff --git a/modules/plugins/Flickr/Flickr.plugin.php b/modules/plugins/Flickr/Flickr.plugin.php
index 8ea6943c..b5f4cee1 100644
--- a/modules/plugins/Flickr/Flickr.plugin.php
+++ b/modules/plugins/Flickr/Flickr.plugin.php
@@ -51,7 +51,7 @@ class Ampacheflickr
         if (Preference::exists('flickr_api_key')) {
             return false;
         }
-        Preference::insert('flickr_api_key','Flickr api key','','75','string','plugins',$this->name);
+        Preference::insert('flickr_api_key', 'Flickr api key', '', '75', 'string', 'plugins', $this->name);
         return true;
     } // install
 
@@ -136,10 +136,10 @@ class Ampacheflickr
         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');
+            debug_event($this->name, 'No Flickr api key, photo plugin skipped', '3');
             return false;
         }
         return true;
     } // load
 } // end Ampacheflickr
-?>
+;
diff --git a/modules/plugins/FriendsTimeline/FriendsTimeline.plugin.php b/modules/plugins/FriendsTimeline/FriendsTimeline.plugin.php
index f154c022..949be065 100644
--- a/modules/plugins/FriendsTimeline/FriendsTimeline.plugin.php
+++ b/modules/plugins/FriendsTimeline/FriendsTimeline.plugin.php
@@ -55,7 +55,7 @@ class AmpacheFriendsTimeline
             return false;
         }
 
-        Preference::insert('ftl_max_items','Friends timeline max items','5','25','integer','plugins',$this->name);
+        Preference::insert('ftl_max_items', 'Friends timeline max items', '5', '25', 'integer', 'plugins', $this->name);
 
         return true;
     }
diff --git a/modules/plugins/GoogleAnalytics/GoogleAnalytics.plugin.php b/modules/plugins/GoogleAnalytics/GoogleAnalytics.plugin.php
index 0419cd2a..d1fb80c5 100644
--- a/modules/plugins/GoogleAnalytics/GoogleAnalytics.plugin.php
+++ b/modules/plugins/GoogleAnalytics/GoogleAnalytics.plugin.php
@@ -55,7 +55,7 @@ class AmpacheGoogleAnalytics
             return false;
         }
 
-        Preference::insert('googleanalytics_tracking_id','Google Analytics Tracking ID','',100,'string','plugins',$this->name);
+        Preference::insert('googleanalytics_tracking_id', 'Google Analytics Tracking ID', '', 100, 'string', 'plugins', $this->name);
 
         return true;
     }
@@ -111,7 +111,7 @@ class AmpacheGoogleAnalytics
 
         $this->tracking_id = trim($data['googleanalytics_tracking_id']);
         if (!strlen($this->tracking_id)) {
-            debug_event($this->name,'No Tracking ID, user field plugin skipped','3');
+            debug_event($this->name, 'No Tracking ID, user field plugin skipped', '3');
             return false;
         }
 
diff --git a/modules/plugins/GoogleMaps/GoogleMaps.plugin.php b/modules/plugins/GoogleMaps/GoogleMaps.plugin.php
index 2808a2a6..6b2d8fb6 100644
--- a/modules/plugins/GoogleMaps/GoogleMaps.plugin.php
+++ b/modules/plugins/GoogleMaps/GoogleMaps.plugin.php
@@ -51,7 +51,7 @@ class AmpacheGoogleMaps
         if (Preference::exists('gmaps_api_key')) {
             return false;
         }
-        Preference::insert('gmaps_api_key','GoogleMaps api key','','75','string','plugins',$this->name);
+        Preference::insert('gmaps_api_key', 'GoogleMaps api key', '', '75', 'string', 'plugins', $this->name);
         return true;
     } // install
 
diff --git a/modules/plugins/Gravatar/Gravatar.plugin.php b/modules/plugins/Gravatar/Gravatar.plugin.php
index 943b9809..cf8d87dd 100644
--- a/modules/plugins/Gravatar/Gravatar.plugin.php
+++ b/modules/plugins/Gravatar/Gravatar.plugin.php
@@ -96,4 +96,4 @@ class AmpacheGravatar
         return true;
     } // load
 } // end AmpacheGravatar
-?>
+;
diff --git a/modules/plugins/Headphones/Headphones.plugin.php b/modules/plugins/Headphones/Headphones.plugin.php
index 24d67548..cd7b8bb6 100644
--- a/modules/plugins/Headphones/Headphones.plugin.php
+++ b/modules/plugins/Headphones/Headphones.plugin.php
@@ -57,8 +57,8 @@ class AmpacheHeadphones
             return false;
         }
 
-        Preference::insert('headphones_api_url','Headphones url','','25','string','plugins',$this->name);
-        Preference::insert('headphones_api_key','Headphones api key','','25','string','plugins',$this->name);
+        Preference::insert('headphones_api_url', 'Headphones url', '', '25', 'string', 'plugins', $this->name);
+        Preference::insert('headphones_api_key', 'Headphones api key', '', '25', 'string', 'plugins', $this->name);
 
         return true;
     } // install
@@ -154,17 +154,17 @@ class AmpacheHeadphones
         if (strlen(trim($data['headphones_api_url']))) {
             $this->api_url = trim($data['headphones_api_url']);
         } else {
-            debug_event($this->name,'No Headphones url, auto download skipped','3');
+            debug_event($this->name, 'No Headphones url, auto download skipped', '3');
             return false;
         }
         if (strlen(trim($data['headphones_api_key']))) {
             $this->api_key = trim($data['headphones_api_key']);
         } else {
-            debug_event($this->name,'No Headphones api key, auto download skipped','3');
+            debug_event($this->name, 'No Headphones api key, auto download skipped', '3');
             return false;
         }
 
         return true;
     } // load
 } // end AmpacheHeadphones
-?>
+;
diff --git a/modules/plugins/Lastfm/Lastfm.plugin.php b/modules/plugins/Lastfm/Lastfm.plugin.php
index b27a8a2d..9d639e30 100644
--- a/modules/plugins/Lastfm/Lastfm.plugin.php
+++ b/modules/plugins/Lastfm/Lastfm.plugin.php
@@ -63,8 +63,8 @@ class AmpacheLastfm
             return false;
         }
 
-        Preference::insert('lastfm_challenge','Last.FM Submit Challenge','','25','string','internal',$this->name);
-        Preference::insert('lastfm_grant_link','Last.FM Grant URL','','25','string','plugins',$this->name);
+        Preference::insert('lastfm_challenge', 'Last.FM Submit Challenge', '', '25', 'string', 'internal', $this->name);
+        Preference::insert('lastfm_grant_link', 'Last.FM Grant URL', '', '25', 'string', 'plugins', $this->name);
 
         return true;
     } // install
@@ -96,7 +96,7 @@ class AmpacheLastfm
             Preference::delete('lastfm_url');
             Preference::delete('lastfm_host');
             Preference::delete('lastfm_port');
-            Preference::insert('lastfm_grant_link','Last.FM Grant URL','','25','string','plugins');
+            Preference::insert('lastfm_grant_link', 'Last.FM Grant URL', '', '25', 'string', 'plugins');
         }
         return true;
     } // upgrade
@@ -113,7 +113,7 @@ class AmpacheLastfm
         }
         // Make sure there's actually a session before we keep going
         if (!$this->challenge) {
-            debug_event($this->name,'Session key missing','5');
+            debug_event($this->name, 'Session key missing', '5');
             return false;
         }
 
@@ -124,12 +124,12 @@ class AmpacheLastfm
 
         // Make sure it wasn't within the last min
         if ($diff < 60) {
-            debug_event($this->name,'Last song played within ' . $diff . ' seconds, not recording stats','3');
+            debug_event($this->name, 'Last song played within ' . $diff . ' seconds, not recording stats', '3');
             return false;
         }
 
         if ($song->time < 30) {
-            debug_event($this->name,'Song less then 30 seconds not queueing','3');
+            debug_event($this->name, 'Song less then 30 seconds not queueing', '3');
             return false;
         }
 
@@ -137,17 +137,17 @@ class AmpacheLastfm
         $scrobbler = new scrobbler($this->api_key, $this->scheme, $this->api_host, $this->challenge, $this->secret);
 
         // Check to see if the scrobbling works by queueing song
-        if (!$scrobbler->queue_track($song->f_artist_full,$song->f_album_full,$song->title,time(),$song->time,$song->track)) {
+        if (!$scrobbler->queue_track($song->f_artist_full, $song->f_album_full, $song->title, time(), $song->time, $song->track)) {
             return false;
         }
 
         // Go ahead and submit it now
         if (!$scrobbler->submit_tracks()) {
-            debug_event($this->name,'Error Submit Failed: ' . $scrobbler->error_msg,'3');
+            debug_event($this->name, 'Error Submit Failed: ' . $scrobbler->error_msg, '3');
             return false;
         }
 
-        debug_event($this->name,'Submission Successful','5');
+        debug_event($this->name, 'Submission Successful', '5');
 
         return true;
     } // submit
@@ -160,16 +160,16 @@ class AmpacheLastfm
     {
         // Make sure there's actually a session before we keep going
         if (!$this->challenge) {
-            debug_event($this->name,'Session key missing','5');
+            debug_event($this->name, 'Session key missing', '5');
             return false;
         }
         // Create our scrobbler and then queue it
         $scrobbler = new scrobbler($this->api_key, $this->scheme, $this->api_host, $this->challenge, $this->secret);
         if (!$scrobbler->love($flagged, 'song', $song->f_artist_full, $song->title, $song->f_album_full)) {
-            debug_event($this->name,'Error Love Failed: ' . $scrobbler->error_msg,'3');
+            debug_event($this->name, 'Error Love Failed: ' . $scrobbler->error_msg, '3');
             return false;
         }
-        debug_event($this->name,'Sent Love Successfully','5');
+        debug_event($this->name, 'Sent Love Successfully', '5');
         return true;
     } // set_flag
 
@@ -180,17 +180,17 @@ class AmpacheLastfm
      */
     public function get_session($user_id, $token)
     {
-        $scrobbler   = new scrobbler($this->api_key, $this->scheme, $this->api_host,'', $this->secret);
+        $scrobbler   = new scrobbler($this->api_key, $this->scheme, $this->api_host, '', $this->secret);
         $session_key = $scrobbler->get_session_key($token);
         if (!$session_key) {
-            debug_event($this->name,'getSession Failed: ' . $scrobbler->error_msg,'3');
+            debug_event($this->name, 'getSession Failed: ' . $scrobbler->error_msg, '3');
             return false;
         }
         $this->challenge = $session_key;
 
         // Update the preferences
-        Preference::update('lastfm_challenge',$user_id,$session_key);
-        debug_event($this->name,'getSession Successful','3');
+        Preference::update('lastfm_challenge', $user_id, $session_key);
+        debug_event($this->name, 'getSession Successful', '3');
 
         return true;
     } // get_session
@@ -211,11 +211,11 @@ class AmpacheLastfm
         if (strlen(trim($data['lastfm_challenge']))) {
             $this->challenge= trim($data['lastfm_challenge']);
         } else {
-            debug_event($this->name,'No session key, not scrobbling (need to grant Ampache to last.fm)','5');
+            debug_event($this->name, 'No session key, not scrobbling (need to grant Ampache to last.fm)', '5');
             return false;
         }
 
         return true;
     } // load
 } // end AmpacheLastfm
-?>
+;
diff --git a/modules/plugins/Libravatar/Libravatar.plugin.php b/modules/plugins/Libravatar/Libravatar.plugin.php
index 9617b23b..4ca12268 100644
--- a/modules/plugins/Libravatar/Libravatar.plugin.php
+++ b/modules/plugins/Libravatar/Libravatar.plugin.php
@@ -97,4 +97,4 @@ class AmpacheLibravatar
         return true;
     } // load
 } // end AmpacheLibravatar
-?>
+;
diff --git a/modules/plugins/Librefm/Librefm.plugin.php b/modules/plugins/Librefm/Librefm.plugin.php
index 5ca28008..210a1ae9 100644
--- a/modules/plugins/Librefm/Librefm.plugin.php
+++ b/modules/plugins/Librefm/Librefm.plugin.php
@@ -63,8 +63,8 @@ class Ampachelibrefm
             return false;
         }
 
-        Preference::insert('librefm_challenge','Libre.FM Submit Challenge','','25','string','internal',$this->name);
-        Preference::insert('librefm_grant_link','Libre.FM Grant URL','','25','string','plugins',$this->name);
+        Preference::insert('librefm_challenge', 'Libre.FM Submit Challenge', '', '25', 'string', 'internal', $this->name);
+        Preference::insert('librefm_grant_link', 'Libre.FM Grant URL', '', '25', 'string', 'plugins', $this->name);
 
         return true;
     } // install
@@ -96,7 +96,7 @@ class Ampachelibrefm
             Preference::delete('librefm_url');
             Preference::delete('librefm_host');
             Preference::delete('librefm_port');
-            Preference::insert('librefm_grant_link','Libre.FM Grant URL','','25','string','plugins');
+            Preference::insert('librefm_grant_link', 'Libre.FM Grant URL', '', '25', 'string', 'plugins');
         }
         return true;
     } // upgrade
@@ -114,7 +114,7 @@ class Ampachelibrefm
         
         // Make sure there's actually a session before we keep going
         if (!$this->challenge) {
-            debug_event($this->name,'Session key missing','5');
+            debug_event($this->name, 'Session key missing', '5');
             return false;
         }
 
@@ -125,12 +125,12 @@ class Ampachelibrefm
 
         // Make sure it wasn't within the last min
         if ($diff < 60) {
-            debug_event($this->name,'Last song played within ' . $diff . ' seconds, not recording stats','3');
+            debug_event($this->name, 'Last song played within ' . $diff . ' seconds, not recording stats', '3');
             return false;
         }
 
         if ($song->time < 30) {
-            debug_event($this->name,'Song less then 30 seconds not queueing','3');
+            debug_event($this->name, 'Song less then 30 seconds not queueing', '3');
             return false;
         }
 
@@ -138,17 +138,17 @@ class Ampachelibrefm
         $scrobbler = new scrobbler($this->api_key, $this->scheme, $this->api_host, $this->challenge, $this->secret);
 
         // Check to see if the scrobbling works by queueing song
-        if (!$scrobbler->queue_track($song->f_artist_full,$song->f_album_full,$song->title,time(),$song->time,$song->track)) {
+        if (!$scrobbler->queue_track($song->f_artist_full, $song->f_album_full, $song->title, time(), $song->time, $song->track)) {
             return false;
         }
 
         // Go ahead and submit it now
         if (!$scrobbler->submit_tracks()) {
-            debug_event($this->name,'Error Submit Failed: ' . $scrobbler->error_msg,'3');
+            debug_event($this->name, 'Error Submit Failed: ' . $scrobbler->error_msg, '3');
             return false;
         }
 
-        debug_event($this->name,'Submission Successful','5');
+        debug_event($this->name, 'Submission Successful', '5');
 
         return true;
     } // submit
@@ -161,16 +161,16 @@ class Ampachelibrefm
     {
         // Make sure there's actually a session before we keep going
         if (!$this->challenge) {
-            debug_event($this->name,'Session key missing','5');
+            debug_event($this->name, 'Session key missing', '5');
             return false;
         }
         // Create our scrobbler and then queue it
         $scrobbler = new scrobbler($this->api_key, $this->scheme, $this->api_host, $this->challenge, $this->secret);
         if (!$scrobbler->love($flagged, 'song', $song->f_artist_full, $song->title, $song->f_album_full)) {
-            debug_event($this->name,'Error Love Failed: ' . $scrobbler->error_msg,'3');
+            debug_event($this->name, 'Error Love Failed: ' . $scrobbler->error_msg, '3');
             return false;
         }
-        debug_event($this->name,'Sent Love Successfully','5');
+        debug_event($this->name, 'Sent Love Successfully', '5');
         return true;
     } // set_flag
 
@@ -181,17 +181,17 @@ class Ampachelibrefm
      */
     public function get_session($user_id, $token)
     {
-        $scrobbler   = new scrobbler($this->api_key, $this->scheme, $this->api_host,'', $this->secret);
+        $scrobbler   = new scrobbler($this->api_key, $this->scheme, $this->api_host, '', $this->secret);
         $session_key = $scrobbler->get_session_key($token);
         if (!$session_key) {
-            debug_event($this->name,'getSession Failed: ' . $scrobbler->error_msg,'3');
+            debug_event($this->name, 'getSession Failed: ' . $scrobbler->error_msg, '3');
             return false;
         }
         $this->challenge = $session_key;
 
         // Update the preferences
-        Preference::update('librefm_challenge',$user_id,$session_key);
-        debug_event($this->name,'getSession Successful','3');
+        Preference::update('librefm_challenge', $user_id, $session_key);
+        debug_event($this->name, 'getSession Successful', '3');
 
         return true;
     } // get_session
@@ -212,11 +212,11 @@ class Ampachelibrefm
         if (strlen(trim($data['librefm_challenge']))) {
             $this->challenge= trim($data['librefm_challenge']);
         } else {
-            debug_event($this->name,'No session key, not scrobbling (need to grant Ampache to libre.fm)','5');
+            debug_event($this->name, 'No session key, not scrobbling (need to grant Ampache to libre.fm)', '5');
             return false;
         }
 
         return true;
     } // load
 } // end Ampachelibrefm
-?>
+;
diff --git a/modules/plugins/LyricWiki/LyricWiki.plugin.php b/modules/plugins/LyricWiki/LyricWiki.plugin.php
index 7b596891..5b182382 100644
--- a/modules/plugins/LyricWiki/LyricWiki.plugin.php
+++ b/modules/plugins/LyricWiki/LyricWiki.plugin.php
@@ -87,4 +87,4 @@ class Ampachelyricwiki
         return false;
     } // get_lyrics
 } // end Ampachelyricwiki
-?>
+;
diff --git a/modules/plugins/MusicBrainz/MusicBrainz.plugin.php b/modules/plugins/MusicBrainz/MusicBrainz.plugin.php
index 302f5d9e..4a50653d 100644
--- a/modules/plugins/MusicBrainz/MusicBrainz.plugin.php
+++ b/modules/plugins/MusicBrainz/MusicBrainz.plugin.php
@@ -112,4 +112,4 @@ class AmpacheMusicBrainz
         return $results;
     } // get_metadata
 } // end AmpacheMusicBrainz
-?>
+;
diff --git a/modules/plugins/Omdb/Omdb.plugin.php b/modules/plugins/Omdb/Omdb.plugin.php
index 1580c9b3..f321890d 100644
--- a/modules/plugins/Omdb/Omdb.plugin.php
+++ b/modules/plugins/Omdb/Omdb.plugin.php
@@ -164,4 +164,4 @@ class AmpacheOmdb
         return Art::gather_metadata_plugin($this, $type, $options);
     }
 } // end AmpacheOmdb
-?>
+;
diff --git a/modules/plugins/Paypal/Paypal.plugin.php b/modules/plugins/Paypal/Paypal.plugin.php
index 1a9c3873..6f037b02 100644
--- a/modules/plugins/Paypal/Paypal.plugin.php
+++ b/modules/plugins/Paypal/Paypal.plugin.php
@@ -57,8 +57,8 @@ class AmpachePaypal
             return false;
         }
 
-        Preference::insert('paypal_business','Paypal ID','',25,'string','plugins',$this->name);
-        Preference::insert('paypal_currency_code','Paypal Currency Code','USD',25,'string','plugins',$this->name);
+        Preference::insert('paypal_business', 'Paypal ID', '', 25, 'string', 'plugins', $this->name);
+        Preference::insert('paypal_currency_code', 'Paypal Currency Code', 'USD', 25, 'string', 'plugins', $this->name);
 
         return true;
     }
@@ -123,7 +123,7 @@ class AmpachePaypal
 
         $this->business = trim($data['paypal_business']);
         if (!strlen($this->business)) {
-            debug_event($this->name,'No Paypal ID, user field plugin skipped','3');
+            debug_event($this->name, 'No Paypal ID, user field plugin skipped', '3');
             return false;
         }
 
diff --git a/modules/plugins/Piwik/Piwik.plugin.php b/modules/plugins/Piwik/Piwik.plugin.php
index 9596c212..d3eb0de0 100644
--- a/modules/plugins/Piwik/Piwik.plugin.php
+++ b/modules/plugins/Piwik/Piwik.plugin.php
@@ -56,8 +56,8 @@ class AmpachePiwik
             return false;
         }
 
-        Preference::insert('piwik_site_id','Piwik Site ID','1',100,'string','plugins','piwik');
-        Preference::insert('piwik_url','Piwik URL', AmpConfig::get('web_path') . '/piwik/',100,'string','plugins',$this->name);
+        Preference::insert('piwik_site_id', 'Piwik Site ID', '1', 100, 'string', 'plugins', 'piwik');
+        Preference::insert('piwik_url', 'Piwik URL', AmpConfig::get('web_path') . '/piwik/', 100, 'string', 'plugins', $this->name);
 
         return true;
     }
@@ -125,13 +125,13 @@ class AmpachePiwik
 
         $this->site_id = trim($data['piwik_site_id']);
         if (!strlen($this->site_id)) {
-            debug_event($this->name,'No Piwik Site ID, user field plugin skipped','3');
+            debug_event($this->name, 'No Piwik Site ID, user field plugin skipped', '3');
             return false;
         }
 
         $this->piwik_url = trim($data['piwik_url']);
         if (!strlen($this->piwik_url)) {
-            debug_event($this->name,'No Piwik URL, user field plugin skipped','3');
+            debug_event($this->name, 'No Piwik URL, user field plugin skipped', '3');
             return false;
         }
 
diff --git a/modules/plugins/RSSView/RSSView.plugin.php b/modules/plugins/RSSView/RSSView.plugin.php
index b7ce5ba5..af304d8f 100644
--- a/modules/plugins/RSSView/RSSView.plugin.php
+++ b/modules/plugins/RSSView/RSSView.plugin.php
@@ -56,8 +56,8 @@ class AmpacheRSSView
             return false;
         }
 
-        Preference::insert('rssview_feed_url','RSS Feed url','','25','string','plugins',$this->name);
-        Preference::insert('rssview_max_items','RSS Feed max items','5','25','integer','plugins',$this->name);
+        Preference::insert('rssview_feed_url', 'RSS Feed url', '', '25', 'string', 'plugins', $this->name);
+        Preference::insert('rssview_max_items', 'RSS Feed max items', '5', '25', 'integer', 'plugins', $this->name);
 
         return true;
     }
@@ -133,7 +133,7 @@ class AmpacheRSSView
         if (strlen(trim($data['rssview_feed_url']))) {
             $this->feed_url = trim($data['rssview_feed_url']);
         } else {
-            debug_event($this->name,'No rss feed url, home plugin skipped','3');
+            debug_event($this->name, 'No rss feed url, home plugin skipped', '3');
             return false;
         }
         $this->maxitems = intval($data['rssview_max_items']);
diff --git a/modules/plugins/ShoutHome/ShoutHome.plugin.php b/modules/plugins/ShoutHome/ShoutHome.plugin.php
index 5acd04ee..9773c550 100644
--- a/modules/plugins/ShoutHome/ShoutHome.plugin.php
+++ b/modules/plugins/ShoutHome/ShoutHome.plugin.php
@@ -55,7 +55,7 @@ class AmpacheShoutHome
             return false;
         }
 
-        Preference::insert('shouthome_max_items','Shoutbox on homepage max items','5','25','integer','plugins',$this->name);
+        Preference::insert('shouthome_max_items', 'Shoutbox on homepage max items', '5', '25', 'integer', 'plugins', $this->name);
 
         return true;
     }
diff --git a/modules/plugins/StreamBandwidth/StreamBandwidth.plugin.php b/modules/plugins/StreamBandwidth/StreamBandwidth.plugin.php
index ad04c3f6..ba462762 100644
--- a/modules/plugins/StreamBandwidth/StreamBandwidth.plugin.php
+++ b/modules/plugins/StreamBandwidth/StreamBandwidth.plugin.php
@@ -53,8 +53,8 @@ class AmpacheStreamBandwidth
         if (Preference::exists('stream_control_bandwidth_max')) {
             return false;
         }
-        Preference::insert('stream_control_bandwidth_max','Stream control maximal bandwidth (Mo)','1024','50','integer','plugins',$this->name);
-        Preference::insert('stream_control_bandwidth_days','Stream control bandwidth history (days)','30','50','integer','plugins',$this->name);
+        Preference::insert('stream_control_bandwidth_max', 'Stream control maximal bandwidth (Mo)', '1024', '50', 'integer', 'plugins', $this->name);
+        Preference::insert('stream_control_bandwidth_days', 'Stream control bandwidth history (days)', '30', '50', 'integer', 'plugins', $this->name);
         return true;
     } // install
 
diff --git a/modules/plugins/StreamHits/StreamHits.plugin.php b/modules/plugins/StreamHits/StreamHits.plugin.php
index d878f906..0bfce5b3 100644
--- a/modules/plugins/StreamHits/StreamHits.plugin.php
+++ b/modules/plugins/StreamHits/StreamHits.plugin.php
@@ -53,8 +53,8 @@ class AmpacheStreamHits
         if (Preference::exists('stream_control_hits_max')) {
             return false;
         }
-        Preference::insert('stream_control_hits_max','Stream control maximal hits','-1','50','integer','plugins',$this->name);
-        Preference::insert('stream_control_hits_days','Stream control hits history (days)','30','50','integer','plugins',$this->name);
+        Preference::insert('stream_control_hits_max', 'Stream control maximal hits', '-1', '50', 'integer', 'plugins', $this->name);
+        Preference::insert('stream_control_hits_days', 'Stream control hits history (days)', '30', '50', 'integer', 'plugins', $this->name);
         return true;
     } // install
 
diff --git a/modules/plugins/StreamTime/StreamTime.plugin.php b/modules/plugins/StreamTime/StreamTime.plugin.php
index e2e3d519..42b4e594 100644
--- a/modules/plugins/StreamTime/StreamTime.plugin.php
+++ b/modules/plugins/StreamTime/StreamTime.plugin.php
@@ -53,8 +53,8 @@ class AmpacheStreamTime
         if (Preference::exists('stream_control_time_max')) {
             return false;
         }
-        Preference::insert('stream_control_time_max','Stream control maximal time (Minutes)','-1','50','integer','plugins',$this->name);
-        Preference::insert('stream_control_time_days','Stream control time history (days)','30','50','integer','plugins',$this->name);
+        Preference::insert('stream_control_time_max', 'Stream control maximal time (Minutes)', '-1', '50', 'integer', 'plugins', $this->name);
+        Preference::insert('stream_control_time_days', 'Stream control time history (days)', '30', '50', 'integer', 'plugins', $this->name);
         return true;
     } // install
 
diff --git a/modules/plugins/TheAudioDb/TheAudioDb.plugin.php b/modules/plugins/TheAudioDb/TheAudioDb.plugin.php
index c54ce381..dbbeef39 100644
--- a/modules/plugins/TheAudioDb/TheAudioDb.plugin.php
+++ b/modules/plugins/TheAudioDb/TheAudioDb.plugin.php
@@ -54,7 +54,7 @@ class AmpacheTheaudiodb
         }
 
         // API Key requested in TheAudioDB forum, see http://www.theaudiodb.com/forum/viewtopic.php?f=6&t=8&start=140
-        Preference::insert('tadb_api_key','TheAudioDb api key','41214789306c4690752dfb','75','string','plugins',$this->name);
+        Preference::insert('tadb_api_key', 'TheAudioDb api key', '41214789306c4690752dfb', '75', 'string', 'plugins', $this->name);
         
         return true;
     } // install
@@ -83,7 +83,7 @@ class AmpacheTheaudiodb
         if (strlen(trim($data['tadb_api_key']))) {
             $this->api_key = trim($data['tadb_api_key']);
         } else {
-            debug_event($this->name,'No TheAudioDb api key, metadata plugin skipped','3');
+            debug_event($this->name, 'No TheAudioDb api key, metadata plugin skipped', '3');
             return false;
         }
         
@@ -209,4 +209,4 @@ class AmpacheTheaudiodb
         return $this->api_call('track-mb.php?i=' . $mbid);
     }
 } // end AmpacheTheaudiodb
-?>
+;
diff --git a/modules/plugins/Tmdb/Tmdb.plugin.php b/modules/plugins/Tmdb/Tmdb.plugin.php
index fa2f80f2..9bfa6965 100644
--- a/modules/plugins/Tmdb/Tmdb.plugin.php
+++ b/modules/plugins/Tmdb/Tmdb.plugin.php
@@ -53,7 +53,7 @@ class AmpacheTmdb
             return false;
         }
 
-        Preference::insert('tmdb_api_key','Tmdb api key','','75','string','plugins',$this->name);
+        Preference::insert('tmdb_api_key', 'Tmdb api key', '', '75', 'string', 'plugins', $this->name);
         
         return true;
     } // install
@@ -82,7 +82,7 @@ class AmpacheTmdb
         if (strlen(trim($data['tmdb_api_key']))) {
             $this->api_key = trim($data['tmdb_api_key']);
         } else {
-            debug_event($this->name,'No Tmdb api key, metadata plugin skipped','3');
+            debug_event($this->name, 'No Tmdb api key, metadata plugin skipped', '3');
             return false;
         }
         
@@ -210,4 +210,4 @@ class AmpacheTmdb
         return $genres;
     }
 } // end AmpacheTmdb
-?>
+;
diff --git a/modules/plugins/Tvdb/Tvdb.plugin.php b/modules/plugins/Tvdb/Tvdb.plugin.php
index 12ac257b..7d050429 100644
--- a/modules/plugins/Tvdb/Tvdb.plugin.php
+++ b/modules/plugins/Tvdb/Tvdb.plugin.php
@@ -53,7 +53,7 @@ class AmpacheTvdb
             return false;
         }
 
-        Preference::insert('tvdb_api_key','Tvdb api key','','75','string','plugins',$this->name);
+        Preference::insert('tvdb_api_key', 'Tvdb api key', '', '75', 'string', 'plugins', $this->name);
         
         return true;
     } // install
@@ -82,7 +82,7 @@ class AmpacheTvdb
         if (strlen(trim($data['tvdb_api_key']))) {
             $this->api_key = trim($data['tvdb_api_key']);
         } else {
-            debug_event($this->name,'No Tvdb api key, metadata plugin skipped','3');
+            debug_event($this->name, 'No Tvdb api key, metadata plugin skipped', '3');
             return false;
         }
         
@@ -117,7 +117,7 @@ class AmpacheTvdb
                     $release               = $this->getReleaseByTitle($releases, $media_info['tvshow'], $media_info['year']);
                 $results['tvdb_tvshow_id'] = $release->id;
                 $results['tvshow_imdb_id'] = $release->imdbId ;
-                $results['tvshow_summary'] = substr($release->overview,0,255);   //Summary column in db is only 256 characters.
+                $results['tvshow_summary'] = substr($release->overview, 0, 255);   //Summary column in db is only 256 characters.
                 $results['tvshow']         = $release->name;
                 
                 if ($release->FirstAired) {
@@ -161,7 +161,7 @@ class AmpacheTvdb
                             $results['release_date'] = $release->firstAired->getTimestamp();
                             $results['year']         = $release->firstAired->format('Y');
                         }
-                        $results['summary'] = substr($release->overview,0,255);
+                        $results['summary'] = substr($release->overview, 0, 255);
                         if ($release->thumbnail) {
                             $results['art'] = $tvdburl . '/banners/' . $release->thumbnail;
                         }
@@ -202,4 +202,4 @@ class AmpacheTvdb
         return count($titles) > 0 ? $titles[0] : $results[0];
     }
 } // end AmpacheTvdb
-?>
+;
diff --git a/modules/plugins/Yourls/Yourls.plugin.php b/modules/plugins/Yourls/Yourls.plugin.php
index e700d6c5..ae7b5dcd 100644
--- a/modules/plugins/Yourls/Yourls.plugin.php
+++ b/modules/plugins/Yourls/Yourls.plugin.php
@@ -58,9 +58,9 @@ class AmpacheYourls
             return false;
         }
 
-        Preference::insert('yourls_domain','YOURLS domain name','','75','string','plugins',$this->name);
-        Preference::insert('yourls_use_idn','YOURLS use IDN','0','75','boolean','plugins',$this->name);
-        Preference::insert('yourls_api_key','YOURLS api key','','75','string','plugins',$this->name);
+        Preference::insert('yourls_domain', 'YOURLS domain name', '', '75', 'string', 'plugins', $this->name);
+        Preference::insert('yourls_use_idn', 'YOURLS use IDN', '0', '75', 'boolean', 'plugins', $this->name);
+        Preference::insert('yourls_api_key', 'YOURLS api key', '', '75', 'string', 'plugins', $this->name);
 
         return true;
     } // install
@@ -128,13 +128,13 @@ class AmpacheYourls
         if (strlen(trim($data['yourls_domain']))) {
             $this->yourls_domain = trim($data['yourls_domain']);
         } else {
-            debug_event($this->name,'No YOURLS domain, shortener skipped','3');
+            debug_event($this->name, 'No YOURLS domain, shortener skipped', '3');
             return false;
         }
         if (strlen(trim($data['yourls_api_key']))) {
             $this->yourls_api_key = trim($data['yourls_api_key']);
         } else {
-            debug_event($this->name,'No YOURLS api key, shortener skipped','3');
+            debug_event($this->name, 'No YOURLS api key, shortener skipped', '3');
             return false;
         }
         
@@ -143,4 +143,4 @@ class AmpacheYourls
         return true;
     } // load
 } // end AmpacheYourls
-?>
+;
diff --git a/play/index.php b/play/index.php
index e109d0d9..1020ae03 100644
--- a/play/index.php
+++ b/play/index.php
@@ -27,7 +27,7 @@
    the case.  Also this will update local statistics for songs as well.
    This is also where it decides if you need to be downsampled.
 */
-define('NO_SESSION','1');
+define('NO_SESSION', '1');
 require_once '../lib/init.php';
 ob_end_clean();
 
@@ -159,8 +159,8 @@ if (!$share_id) {
 
         // If require session is set then we need to make sure we're legit
         if (AmpConfig::get('use_auth') && AmpConfig::get('require_session')) {
-            if (!AmpConfig::get('require_localnet_session') and Access::check_network('network',$GLOBALS['user']->id,'5')) {
-                debug_event('play', 'Streaming access allowed for local network IP ' . $_SERVER['REMOTE_ADDR'],'5');
+            if (!AmpConfig::get('require_localnet_session') and Access::check_network('network', $GLOBALS['user']->id, '5')) {
+                debug_event('play', 'Streaming access allowed for local network IP ' . $_SERVER['REMOTE_ADDR'], '5');
             } else {
                 if (!Session::exists('stream', $sid)) {
                     // No valid session id given, try with cookie session from web interface
@@ -200,8 +200,8 @@ if (!$share_id) {
 }
 
 /* If we are in demo mode.. die here */
-if (AmpConfig::get('demo_mode') || (!Access::check('interface','25') )) {
-    debug_event('UI::access_denied', "Streaming Access Denied:" . AmpConfig::get('demo_mode') . "is the value of demo_mode. Current user level is " . $GLOBALS['user']->access,'3');
+if (AmpConfig::get('demo_mode') || (!Access::check('interface', '25'))) {
+    debug_event('UI::access_denied', "Streaming Access Denied:" . AmpConfig::get('demo_mode') . "is the value of demo_mode. Current user level is " . $GLOBALS['user']->access, '3');
     UI::access_denied();
     exit;
 }
@@ -211,9 +211,9 @@ if (AmpConfig::get('demo_mode') || (!Access::check('interface','25') )) {
    that they have enough access to play this mojo
 */
 if (AmpConfig::get('access_control')) {
-    if (!Access::check_network('stream',$GLOBALS['user']->id,'25') and
-        !Access::check_network('network',$GLOBALS['user']->id,'25')) {
-        debug_event('UI::access_denied', "Streaming Access Denied: " . $_SERVER['REMOTE_ADDR'] . " does not have stream level access",'3');
+    if (!Access::check_network('stream', $GLOBALS['user']->id, '25') and
+        !Access::check_network('network', $GLOBALS['user']->id, '25')) {
+        debug_event('UI::access_denied', "Streaming Access Denied: " . $_SERVER['REMOTE_ADDR'] . " does not have stream level access", '3');
         UI::access_denied();
         exit;
     }
@@ -249,7 +249,7 @@ if ($demo_id) {
         $song_cool_check = 0;
         $oid             = $democratic->get_next_object($song_cool_check);
         $oids            = $democratic->get_cool_songs();
-        while (in_array($oid,$oids)) {
+        while (in_array($oid, $oids)) {
             $song_cool_check++;
             $oid = $democratic->get_next_object($song_cool_check);
             if ($song_cool_check >= '5') {
@@ -381,14 +381,14 @@ $browser = new Horde_Browser();
 if ($_GET['action'] == 'download' and AmpConfig::get('download')) {
     debug_event('play', 'Downloading file...', 5);
     // STUPID IE
-    $media_name = str_replace(array('?','/','\\'),"_",$media->f_file);
+    $media_name = str_replace(array('?', '/', '\\'), "_", $media->f_file);
 
-    $browser->downloadHeaders($media_name,$media->mime,false,$media->size);
+    $browser->downloadHeaders($media_name, $media->mime, false, $media->size);
     $fp            = fopen(Core::conv_lc_file($media->file), 'rb');
     $bytesStreamed = 0;
 
     if (!is_resource($fp)) {
-        debug_event('Play',"Error: Unable to open $media->file for downloading",'2');
+        debug_event('Play', "Error: Unable to open $media->file for downloading", '2');
         exit();
     }
 
@@ -405,7 +405,7 @@ if ($_GET['action'] == 'download' and AmpConfig::get('download')) {
     // Check to see if we should be throttling because we can get away with it
     if (AmpConfig::get('rate_limit') > 0) {
         while (!feof($fp)) {
-            echo fread($fp,round(AmpConfig::get('rate_limit')*1024));
+            echo fread($fp, round(AmpConfig::get('rate_limit')*1024));
             $bytesStreamed += round(AmpConfig::get('rate_limit')*1024);
             flush();
             sleep(1);
@@ -597,7 +597,7 @@ if ($range_values > 0 && ($start > 0 || $end > 0)) {
         }
     }
 } else {
-    debug_event('play','Starting stream of ' . $media->file . ' with size ' . $media->size, 5);
+    debug_event('play', 'Starting stream of ' . $media->file . ' with size ' . $media->size, 5);
 }
 
 if (!isset($_REQUEST['segment'])) {
diff --git a/playlist.php b/playlist.php
index 0d084da7..4794221f 100644
--- a/playlist.php
+++ b/playlist.php
@@ -71,7 +71,7 @@ switch ($_REQUEST['action']) {
         Otherwise the playlist name will have the $_FILES['filename']['tmp_name'] which doesn't look right... */
         $dir      = dirname($_FILES['filename']['tmp_name']) . "/";
         $filename = $dir . basename($_FILES['filename']['name']);
-        move_uploaded_file($_FILES['filename']['tmp_name'], $filename );
+        move_uploaded_file($_FILES['filename']['tmp_name'], $filename);
 
         $result = Catalog::import_playlist($filename);
 
@@ -134,7 +134,7 @@ switch ($_REQUEST['action']) {
         $url   = AmpConfig::get('web_path') . '/playlist.php';
         $title = T_('Empty Playlists Deleted');
         $body  = '';
-        show_confirmation($title,$body,$url);
+        show_confirmation($title, $body, $url);
     break;
     case 'remove_duplicates':
         debug_event('playlist', 'Remove duplicates called.', '5');
diff --git a/plex/index.php b/plex/index.php
index 128ca740..9f91b6be 100644
--- a/plex/index.php
+++ b/plex/index.php
@@ -20,7 +20,7 @@
  *
  */
 
-define('NO_SESSION','1');
+define('NO_SESSION', '1');
 require_once '../lib/init.php';
 
 if (!AmpConfig::get('plex_backend')) {
diff --git a/plex/web/index.php b/plex/web/index.php
index 390779c4..ebc8bd83 100644
--- a/plex/web/index.php
+++ b/plex/web/index.php
@@ -44,15 +44,15 @@ function changeUniqid()
 function init_db()
 {
     if (!Preference::exists('myplex_username')) {
-        Preference::insert('myplex_username','myPlex Username','','25','string','internal');
-        Preference::insert('myplex_authtoken','myPlex Auth Token','','25','string','internal');
-        Preference::insert('myplex_published','Plex Server is published to myPlex','0','25','boolean','internal');
-        Preference::insert('plex_uniqid','Plex Server Unique Id', uniqid(),'25','string','internal');
-        Preference::insert('plex_servername','Plex Server Name','Ampache','25','string','internal');
-        Preference::insert('plex_public_address','Plex Public Address','','25','string','internal');
-        Preference::insert('plex_public_port','Plex Public Port','32400','25','string','internal');
-        Preference::insert('plex_local_auth','myPlex authentication required on local network','0','25','boolean','internal');
-        Preference::insert('plex_match_email','Link myPlex users to Ampache based on e-mail address','1','25','boolean','internal');
+        Preference::insert('myplex_username', 'myPlex Username', '', '25', 'string', 'internal');
+        Preference::insert('myplex_authtoken', 'myPlex Auth Token', '', '25', 'string', 'internal');
+        Preference::insert('myplex_published', 'Plex Server is published to myPlex', '0', '25', 'boolean', 'internal');
+        Preference::insert('plex_uniqid', 'Plex Server Unique Id', uniqid(), '25', 'string', 'internal');
+        Preference::insert('plex_servername', 'Plex Server Name', 'Ampache', '25', 'string', 'internal');
+        Preference::insert('plex_public_address', 'Plex Public Address', '', '25', 'string', 'internal');
+        Preference::insert('plex_public_port', 'Plex Public Port', '32400', '25', 'string', 'internal');
+        Preference::insert('plex_local_auth', 'myPlex authentication required on local network', '0', '25', 'boolean', 'internal');
+        Preference::insert('plex_match_email', 'Link myPlex users to Ampache based on e-mail address', '1', '25', 'boolean', 'internal');
 
         User::rebuild_all_preferences();
     }
@@ -131,7 +131,7 @@ switch ($plexact) {
     break;
 
     case 'change_uniqid':
-        Preference::update('plex_uniqid', -1,uniqid(), true, true);
+        Preference::update('plex_uniqid', -1, uniqid(), true, true);
         echo T_('Server UUID changed.') . "<br />\r\n";
     break;
 }
diff --git a/plex/web/login.php b/plex/web/login.php
index bd413bae..0c8ff5e0 100644
--- a/plex/web/login.php
+++ b/plex/web/login.php
@@ -20,7 +20,7 @@
  *
  */
 
-define('NO_SESSION','1');
+define('NO_SESSION', '1');
 require_once 'init.php';
 require_once '../../lib/login.php';
 
diff --git a/podcast.php b/podcast.php
index cc97fc73..39386367 100644
--- a/podcast.php
+++ b/podcast.php
@@ -46,7 +46,7 @@ switch ($_REQUEST['action']) {
             exit;
         }
 
-        if (!Core::form_verify('add_podcast','post')) {
+        if (!Core::form_verify('add_podcast', 'post')) {
             UI::access_denied();
             exit;
         }
@@ -59,7 +59,7 @@ switch ($_REQUEST['action']) {
         } else {
             $title  = T_('Subscribed to Podcast');
             $body   = '';
-            show_confirmation($title,$body,AmpConfig::get('web_path') . '/browse.php?action=podcast');
+            show_confirmation($title, $body, AmpConfig::get('web_path') . '/browse.php?action=podcast');
         }
     break;
     case 'delete':
diff --git a/preferences.php b/preferences.php
index 287c7371..ff0b7833 100644
--- a/preferences.php
+++ b/preferences.php
@@ -30,12 +30,12 @@ $notification_text = "";
 // Switch on the action
 switch ($_REQUEST['action']) {
     case 'update_preferences':
-        if ($_POST['method'] == 'admin' && !Access::check('interface','100')) {
+        if ($_POST['method'] == 'admin' && !Access::check('interface', '100')) {
             UI::access_denied();
             exit;
         }
 
-        if (!Core::form_verify('update_preference','post')) {
+        if (!Core::form_verify('update_preference', 'post')) {
             UI::access_denied();
             exit;
         }
@@ -70,12 +70,12 @@ switch ($_REQUEST['action']) {
     break;
     case 'admin_update_preferences':
         // Make sure only admins here
-        if (!Access::check('interface','100')) {
+        if (!Access::check('interface', '100')) {
             UI::access_denied();
             exit;
         }
 
-        if (!Core::form_verify('update_preference','post')) {
+        if (!Core::form_verify('update_preference', 'post')) {
             UI::access_denied();
             exit;
         }
@@ -86,7 +86,7 @@ switch ($_REQUEST['action']) {
     break;
     case 'admin':
         // Make sure only admins here
-        if (!Access::check('interface','100')) {
+        if (!Access::check('interface', '100')) {
             UI::access_denied();
             exit;
         }
@@ -94,7 +94,7 @@ switch ($_REQUEST['action']) {
         $preferences = $GLOBALS['user']->get_preferences($_REQUEST['tab'], true);
     break;
     case 'user':
-        if (!Access::check('interface','100')) {
+        if (!Access::check('interface', '100')) {
             UI::access_denied();
             exit;
         }
@@ -104,12 +104,12 @@ switch ($_REQUEST['action']) {
     break;
     case 'update_user':
         // Make sure we're a user and they came from the form
-        if (!Access::check('interface','25') && $GLOBALS['user']->id > 0) {
+        if (!Access::check('interface', '25') && $GLOBALS['user']->id > 0) {
             UI::access_denied();
             exit;
         }
 
-        if (!Core::form_verify('update_user','post')) {
+        if (!Core::form_verify('update_user', 'post')) {
             UI::access_denied();
             exit;
         }
@@ -150,7 +150,7 @@ switch ($_REQUEST['action']) {
     break;
     case 'grant':
         // Make sure we're a user and they came from the form
-        if (!Access::check('interface','25') && $GLOBALS['user']->id > 0) {
+        if (!Access::check('interface', '25') && $GLOBALS['user']->id > 0) {
             UI::access_denied();
             exit;
         }
@@ -186,7 +186,7 @@ UI::show_header();
 switch ($_REQUEST['action']) {
     case 'confirm':
     case 'grant':
-        show_confirmation($title,$text,$next_url,$cancel);
+        show_confirmation($title, $text, $next_url, $cancel);
     break;
     default:
         if (!empty($notification_text)) {
diff --git a/pvmsg.php b/pvmsg.php
index 36888cec..9299d79c 100644
--- a/pvmsg.php
+++ b/pvmsg.php
@@ -22,7 +22,7 @@
 
 require_once 'lib/init.php';
 
-if (!Access::check('interface','25') || !AmpConfig::get('sociable')) {
+if (!Access::check('interface', '25') || !AmpConfig::get('sociable')) {
     debug_event('UI::access_denied', 'Access Denied: sociable features are not enabled.', '3');
     UI::access_denied();
     exit();
diff --git a/radio.php b/radio.php
index 70d52576..0ad679e0 100644
--- a/radio.php
+++ b/radio.php
@@ -46,7 +46,7 @@ switch ($_REQUEST['action']) {
             exit;
         }
 
-        if (!Core::form_verify('add_radio','post')) {
+        if (!Core::form_verify('add_radio', 'post')) {
             UI::access_denied();
             exit;
         }
@@ -59,7 +59,7 @@ switch ($_REQUEST['action']) {
         } else {
             $body  = T_('Radio Station Added');
             $title = '';
-            show_confirmation($title,$body,AmpConfig::get('web_path') . '/browse.php?action=live_stream');
+            show_confirmation($title, $body, AmpConfig::get('web_path') . '/browse.php?action=live_stream');
         }
     break;
     case 'show':
diff --git a/register.php b/register.php
index 1cd6dd39..81d2c6d4 100644
--- a/register.php
+++ b/register.php
@@ -20,21 +20,21 @@
  *
  */
 
-define('NO_SESSION','1');
+define('NO_SESSION', '1');
 $_SESSION['login'] = true;
 require_once 'lib/init.php';
 
 /* Check Perms */
 if (!AmpConfig::get('allow_public_registration') || AmpConfig::get('demo_mode')) {
-    debug_event('DENIED','Error Attempted registration','1');
+    debug_event('DENIED', 'Error Attempted registration', '1');
     UI::access_denied();
     exit();
 }
 
 /* Don't even include it if we aren't going to use it */
 if (AmpConfig::get('captcha_public_reg')) {
-    define ("CAPTCHA_INVERSE", 1);
-    define ("CAPTCHA_BASE_URL", AmpConfig::get('web_path') . '/modules/captcha/captcha.php');
+    define("CAPTCHA_INVERSE", 1);
+    define("CAPTCHA_BASE_URL", AmpConfig::get('web_path') . '/modules/captcha/captcha.php');
     require_once AmpConfig::get('prefix') . '/modules/captcha/captcha.php';
 }
 
@@ -68,10 +68,10 @@ switch ($_REQUEST['action']) {
         /* If we're using the captcha stuff */
         if (AmpConfig::get('captcha_public_reg')) {
             $captcha         = captcha::solved();
-            if (!isset ($captcha)) {
+            if (!isset($captcha)) {
                 AmpError::add('captcha', T_('Error Captcha Required'));
             }
-            if (isset ($captcha)) {
+            if (isset($captcha)) {
                 if ($captcha) {
                     $msg="SUCCESS";
                 } else {
diff --git a/rest/index.php b/rest/index.php
index 29cc0826..5ba1be70 100644
--- a/rest/index.php
+++ b/rest/index.php
@@ -20,7 +20,7 @@
  *
  */
 
-define('NO_SESSION','1');
+define('NO_SESSION', '1');
 require_once '../lib/init.php';
 
 if (!AmpConfig::get('subsonic_backend')) {
@@ -42,7 +42,7 @@ if ($action != "getcoverart" && $action != "hls" && $action != "stream" && $acti
 
 // If we don't even have access control on then we can't use this!
 if (!AmpConfig::get('access_control')) {
-    debug_event('Access Control','Error Attempted to use Subsonic API with Access Control turned off','3');
+    debug_event('Access Control', 'Error Attempted to use Subsonic API with Access Control turned off', '3');
     ob_end_clean();
     Subsonic_Api::apiOutput2($f, Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_UNAUTHORIZED, T_('Access Control not Enabled')), $callback);
     exit;
@@ -76,14 +76,14 @@ $password = Subsonic_Api::decrypt_password($password);
 // Check user authentication
 $auth = Auth::login($user, $password, true);
 if (!$auth['success']) {
-    debug_event('Access Denied','Invalid authentication attempt to Subsonic API for user [' . $user . ']','3');
+    debug_event('Access Denied', 'Invalid authentication attempt to Subsonic API for user [' . $user . ']', '3');
     ob_end_clean();
     Subsonic_Api::apiOutput2($f, Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_BADAUTH), $callback);
     exit();
 }
 
 if (!Access::check_network('init-api', $user, 5)) {
-    debug_event('Access Denied','Unauthorized access attempt to Subsonic API [' . $_SERVER['REMOTE_ADDR'] . ']', '3');
+    debug_event('Access Denied', 'Unauthorized access attempt to Subsonic API [' . $_SERVER['REMOTE_ADDR'] . ']', '3');
     ob_end_clean();
     Subsonic_Api::apiOutput2($f, Subsonic_XML_Data::createError(Subsonic_XML_Data::SSERROR_UNAUTHORIZED, 'Unauthorized access attempt to Subsonic API - ACL Error'), $callback);
     exit();
@@ -134,14 +134,14 @@ foreach ($query as $param) {
 
 // Recurse through them and see if we're calling one of them
 foreach ($methods as $method) {
-    if (in_array($method,$internal_functions)) {
+    if (in_array($method, $internal_functions)) {
         continue;
     }
 
     // If the method is the same as the action being called
     // Then let's call this function!
     if ($action == $method) {
-        call_user_func(array('subsonic_api',$method),$params);
+        call_user_func(array('subsonic_api', $method), $params);
         // We only allow a single function to be called, and we assume it's cleaned up!
         exit();
     }
diff --git a/rss.php b/rss.php
index 69553826..89437a2a 100644
--- a/rss.php
+++ b/rss.php
@@ -20,7 +20,7 @@
  *
  */
 
-define('NO_SESSION','1');
+define('NO_SESSION', '1');
 require_once 'lib/init.php';
 
 /* Check Perms */
diff --git a/scripts/hooks/pre-commit b/scripts/hooks/pre-commit
index a03b4196..36225468 100755
--- a/scripts/hooks/pre-commit
+++ b/scripts/hooks/pre-commit
@@ -24,15 +24,13 @@ else
 	against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
 fi
 
-FIXERS='indentation,linefeed,trailing_spaces,short_tag,braces,controls_spaces,eof_ending,visibility,align_equals,concat_with_spaces,elseif,line_after_namespace,lowercase_constants,encoding'
-
 ST=0 # Global exit status
 
 # Loop through all committed files
-for file in $(git diff-index --name-only $against); do
+for file in $(git diff-index --name-only --diff-filter=AMCRT $against); do
 	echo -n "testing $file..."
 
-	FIXEROUT=$($PHPCSFIXER fix --dry-run --diff -v --fixers=$FIXERS "$file" | grep -P '\d\)' | sed -r "s~^.*?${file} ~~"; exit ${PIPESTATUS[0]})
+	FIXEROUT=$($PHPCSFIXER fix --config-file=.php_cs --dry-run --diff -v "$file" | grep -P '\d\)' | sed -r "s~^.*?${file} ~~"; exit ${PIPESTATUS[0]})
 	FIXERST=$?
 
 	PARSEROUT=$(php --syntax-check "$file" 2>&1 | egrep -v 'No syntax errors|Errors parsing'; exit ${PIPESTATUS[0]})
@@ -50,7 +48,7 @@ for file in $(git diff-index --name-only $against); do
 done
 
 if [ $ST != 0 ]; then
-	echo "Use 'php-cs-fixer fix -v --fixers=$FIXERS <file>' to correct"
+	echo "Use 'php-cs-fixer fix --config-file=.php_cs -v <file>' to correct"
 fi
 
 exit $ST
diff --git a/scripts/tests/codestyle.sh b/scripts/tests/codestyle.sh
index 7e73a6d5..c5aa1b2d 100644
--- a/scripts/tests/codestyle.sh
+++ b/scripts/tests/codestyle.sh
@@ -12,16 +12,12 @@ else
     exit 1
 fi
 
-PHPCSFIXERARGS="fix -v --fixers="
-# Mandatory fix
-FIXERS1="indentation,linefeed,trailing_spaces,short_tag,braces,controls_spaces,eof_ending,visibility,align_equals,concat_with_spaces,elseif,line_after_namespace,lowercase_constants,encoding"
-# Optionnal fix & false positive
-#FIXERS2="visibility"
+PHPCSFIXERARGS="fix -v --config-file=.php_cs"
 
 EXIT=0
 
 echo -e "\e[1;34mChecking mandatory formatting/coding standards\e[00m"
-$PHPCSFIXER $PHPCSFIXERARGS$FIXERS1 --dry-run --diff .
+$PHPCSFIXER $PHPCSFIXERARGS --dry-run --diff .
 rc=$?
 if [[ $rc == 0 ]]
 then
diff --git a/search.php b/search.php
index 15eac65f..ab271d04 100644
--- a/search.php
+++ b/search.php
@@ -51,7 +51,7 @@ switch ($_REQUEST['action']) {
         $playlist = new Search();
         $playlist->parse_rules(Search::clean_request($_REQUEST));
         $playlist->save();
-        show_confirmation(T_('Search Saved'),sprintf(T_('Your Search has been saved as a Smart Playlist with name %s'), $playlist->name), AmpConfig::get('web_path') . "/browse.php?action=smartplaylist");
+        show_confirmation(T_('Search Saved'), sprintf(T_('Your Search has been saved as a Smart Playlist with name %s'), $playlist->name), AmpConfig::get('web_path') . "/browse.php?action=smartplaylist");
     break;
     case 'descriptor':
         // This is a little special we don't want header/footers so trash what we've got in the OB
diff --git a/server/ajax.server.php b/server/ajax.server.php
index 2d95fea1..90a81e75 100644
--- a/server/ajax.server.php
+++ b/server/ajax.server.php
@@ -25,7 +25,7 @@
  */
 
 // Set that this is an ajax include
-define('AJAX_INCLUDE','1');
+define('AJAX_INCLUDE', '1');
 require_once '../lib/init.php';
 
 xoutput_headers();
@@ -122,7 +122,7 @@ switch ($_REQUEST['action']) {
                     }
                 break;
                 case 'album_random':
-                    $data = explode('_',$_REQUEST['type']);
+                    $data = explode('_', $_REQUEST['type']);
                     $type = $data['0'];
                     foreach ($_REQUEST['id'] as $i) {
                         $object = new $type($i);
@@ -134,12 +134,12 @@ switch ($_REQUEST['action']) {
                 break;
                 case 'artist_random':
                 case 'tag_random':
-                    $data   = explode('_',$_REQUEST['type']);
+                    $data   = explode('_', $_REQUEST['type']);
                     $type   = $data['0'];
                     $object = new $type($_REQUEST['id']);
                     $songs  = $object->get_random_songs();
                     foreach ($songs as $song_id) {
-                        $GLOBALS['user']->playlist->add_object($song_id,'song');
+                        $GLOBALS['user']->playlist->add_object($song_id, 'song');
                     }
                 break;
                 case 'playlist_random':
diff --git a/server/browse.ajax.php b/server/browse.ajax.php
index 1babab27..a0415c05 100644
--- a/server/browse.ajax.php
+++ b/server/browse.ajax.php
@@ -71,7 +71,7 @@ switch ($_REQUEST['action']) {
         }
 
         if ($_REQUEST['catalog_key'] || $_SESSION['catalog'] != 0) {
-            $browse->set_filter('catalog',$_REQUEST['catalog_key']);
+            $browse->set_filter('catalog', $_REQUEST['catalog_key']);
             $_SESSION['catalog'] = $_REQUEST['catalog_key'];
         } elseif ($_REQUEST['catalog_key'] == 0) {
             $browse->set_filter('catalog', null);
diff --git a/server/democratic.ajax.php b/server/democratic.ajax.php
index 455b22be..0d26795a 100644
--- a/server/democratic.ajax.php
+++ b/server/democratic.ajax.php
@@ -56,7 +56,7 @@ switch ($_REQUEST['action']) {
         $show_browse = true;
     break;
     case 'send_playlist':
-        if (!Access::check('interface','75')) {
+        if (!Access::check('interface', '75')) {
             echo xoutput_from_array(array('rfc3514' => '0x1'));
             exit;
         }
@@ -65,7 +65,7 @@ switch ($_REQUEST['action']) {
         $results['rfc3514']           = '<script type="text/javascript">' . Core::get_reloadutil() . '("' . $_SESSION['iframe']['target'] . '")</script>';
     break;
     case 'clear_playlist':
-        if (!Access::check('interface','100')) {
+        if (!Access::check('interface', '100')) {
             echo xoutput_from_array(array('rfc3514' => '0x1'));
             exit;
         }
diff --git a/server/edit.server.php b/server/edit.server.php
index 864236a3..d97d126d 100644
--- a/server/edit.server.php
+++ b/server/edit.server.php
@@ -25,7 +25,7 @@
  */
 
 // Set that this is an ajax include
-define('AJAX_INCLUDE','1');
+define('AJAX_INCLUDE', '1');
 
 require_once '../lib/init.php';
 
@@ -86,7 +86,7 @@ switch ($_REQUEST['action']) {
     break;
     case 'edit_object':
         // Scrub the data, walk recursive through array
-        $entities = function(&$data) use (&$entities) {
+        $entities = function (&$data) use (&$entities) {
             foreach ($data as $key => $value) {
                 $data[$key] = is_array($value) ? $entities($value) : unhtmlentities(scrub_in($value));
             }
diff --git a/server/fs.ajax.php b/server/fs.ajax.php
index 21759bcc..cd54b082 100644
--- a/server/fs.ajax.php
+++ b/server/fs.ajax.php
@@ -22,7 +22,7 @@
 
  // jsTree file system browser
 
-define('AJAX_INCLUDE','1');
+define('AJAX_INCLUDE', '1');
 
 require_once '../lib/init.php';
 $rootdir = Upload::get_root();
diff --git a/server/index.ajax.php b/server/index.ajax.php
index a67c1229..c1cdd411 100644
--- a/server/index.ajax.php
+++ b/server/index.ajax.php
@@ -236,7 +236,7 @@ switch ($_REQUEST['action']) {
                 $button = $_REQUEST['button'];
             break;
             case 'admin':
-                if (Access::check('interface','100')) {
+                if (Access::check('interface', '100')) {
                     $button = $_REQUEST['button'];
                 } else {
                     exit;
@@ -254,7 +254,7 @@ switch ($_REQUEST['action']) {
         ob_end_clean();
     break;
     case 'start_channel':
-        if (Access::check('interface','75')) {
+        if (Access::check('interface', '75')) {
             ob_start();
             $channel = new Channel($_REQUEST['id']);
             if ($channel->id) {
@@ -269,7 +269,7 @@ switch ($_REQUEST['action']) {
         }
     break;
     case 'stop_channel':
-        if (Access::check('interface','75')) {
+        if (Access::check('interface', '75')) {
             ob_start();
             $channel = new Channel($_REQUEST['id']);
             if ($channel->id) {
diff --git a/server/localplay.ajax.php b/server/localplay.ajax.php
index a060260e..dc5bc452 100644
--- a/server/localplay.ajax.php
+++ b/server/localplay.ajax.php
@@ -31,8 +31,8 @@ $results = array();
 switch ($_REQUEST['action']) {
     case 'set_instance':
         // Make sure they they are allowed to do this
-        if (!Access::check('localplay','5')) {
-            debug_event('DENIED','Error attempted to set instance without required level','1');
+        if (!Access::check('localplay', '5')) {
+            debug_event('DENIED', 'Error attempted to set instance without required level', '1');
             exit;
         }
 
@@ -40,7 +40,7 @@ switch ($_REQUEST['action']) {
 
         $localplay = new Localplay(AmpConfig::get('localplay_controller'));
         $localplay->set_active_instance($_REQUEST['instance']);
-        Preference::update('play_type',$GLOBALS['user']->id,$type);
+        Preference::update('play_type', $GLOBALS['user']->id, $type);
 
         // We should also refesh the sidebar
         ob_start();
@@ -50,8 +50,8 @@ switch ($_REQUEST['action']) {
     break;
     case 'command':
         // Make sure they are allowed to do this
-        if (!Access::check('localplay','50')) {
-            debug_event('DENIED','Attempted to control Localplay without sufficient access','1');
+        if (!Access::check('localplay', '50')) {
+            debug_event('DENIED', 'Attempted to control Localplay without sufficient access', '1');
             exit;
         }
 
@@ -114,8 +114,8 @@ switch ($_REQUEST['action']) {
     break;
     case 'delete_track':
         // Load Connect... yada yada
-        if (!Access::check('localplay','50')) {
-            debug_event('DENIED','Attempted to delete track without access','1');
+        if (!Access::check('localplay', '50')) {
+            debug_event('DENIED', 'Attempted to delete track without access', '1');
             exit;
         }
         $localplay = new Localplay(AmpConfig::get('localplay_controller'));
@@ -144,8 +144,8 @@ switch ($_REQUEST['action']) {
     break;
     case 'delete_instance':
         // Make sure that you have access to do this...
-        if (!Access::check('localplay','75')) {
-            debug_event('DENIED','Attempted to delete instance without access','1');
+        if (!Access::check('localplay', '75')) {
+            debug_event('DENIED', 'Attempted to delete instance without access', '1');
             exit;
         }
 
@@ -158,8 +158,8 @@ switch ($_REQUEST['action']) {
     break;
     case 'repeat':
         // Make sure that they have access to do this again no clue
-        if (!Access::check('localplay','50')) {
-            debug_event('DENIED','Attempted to set repeat without access','1');
+        if (!Access::check('localplay', '50')) {
+            debug_event('DENIED', 'Attempted to set repeat without access', '1');
             exit;
         }
 
@@ -177,8 +177,8 @@ switch ($_REQUEST['action']) {
     break;
     case 'random':
         // Make sure that they have access to do this
-        if (!Access::check('localplay','50')) {
-            debug_event('DENIED','Attempted to set random without access','1');
+        if (!Access::check('localplay', '50')) {
+            debug_event('DENIED', 'Attempted to set random without access', '1');
             exit;
         }
 
diff --git a/server/playlist.ajax.php b/server/playlist.ajax.php
index c89f46ae..d0f6c523 100644
--- a/server/playlist.ajax.php
+++ b/server/playlist.ajax.php
@@ -43,7 +43,7 @@ switch ($_REQUEST['action']) {
         ob_start();
         $browse = new Browse();
         $browse->set_type('playlist_media');
-        $browse->add_supplemental_object('playlist',$playlist->id);
+        $browse->add_supplemental_object('playlist', $playlist->id);
         $browse->save_objects($object_ids);
         $browse->show_objects($object_ids);
         $browse->store();
@@ -56,14 +56,14 @@ switch ($_REQUEST['action']) {
         debug_event('playlist', 'Appending items to playlist {' . $_REQUEST['playlist_id'] . '}...', '5');
 
         if (!isset($_REQUEST['playlist_id']) || empty($_REQUEST['playlist_id'])) {
-            if (!Access::check('interface','25')) {
-                debug_event('DENIED','Error:' . $GLOBALS['user']->username . ' does not have user access, unable to create playlist','1');
+            if (!Access::check('interface', '25')) {
+                debug_event('DENIED', 'Error:' . $GLOBALS['user']->username . ' does not have user access, unable to create playlist', '1');
                 break;
             }
 
             $name        = $_REQUEST['name'];
             if (empty($name)) {
-                $name = $GLOBALS['user']->username . ' - ' . date("Y-m-d H:i:s",time());
+                $name = $GLOBALS['user']->username . ' - ' . date("Y-m-d H:i:s", time());
             }
             $playlist_id = Playlist::create($name, 'private');
             if (!$playlist_id) {
diff --git a/server/podcast.ajax.php b/server/podcast.ajax.php
index 7257c57c..727a45e9 100644
--- a/server/podcast.ajax.php
+++ b/server/podcast.ajax.php
@@ -29,7 +29,7 @@ if (!defined('AJAX_INCLUDE')) {
 
 switch ($_REQUEST['action']) {
     case 'sync':
-        if (!Access::check('interface','75')) {
+        if (!Access::check('interface', '75')) {
             debug_event('DENIED', $GLOBALS['user']->username . ' attempted to sync podcast', 1);
             exit;
         }
diff --git a/server/random.ajax.php b/server/random.ajax.php
index 6d976163..6ea6d03d 100644
--- a/server/random.ajax.php
+++ b/server/random.ajax.php
@@ -93,7 +93,7 @@ switch ($_REQUEST['action']) {
         // First add them to the active playlist
         if (is_array($object_ids)) {
             foreach ($object_ids as $object_id) {
-                $GLOBALS['user']->playlist->add_object($object_id,'song');
+                $GLOBALS['user']->playlist->add_object($object_id, 'song');
             }
         }
         $results['rightbar'] = UI::ajax_include('rightbar.inc.php');
diff --git a/server/refresh_reordered.server.php b/server/refresh_reordered.server.php
index 98848665..56f7f849 100644
--- a/server/refresh_reordered.server.php
+++ b/server/refresh_reordered.server.php
@@ -20,7 +20,7 @@
  *
  */
 
-define('AJAX_INCLUDE','1');
+define('AJAX_INCLUDE', '1');
 
 require_once '../lib/init.php';
 
diff --git a/server/song.ajax.php b/server/song.ajax.php
index 68b89c8a..e6545fb9 100644
--- a/server/song.ajax.php
+++ b/server/song.ajax.php
@@ -29,21 +29,21 @@ if (!defined('AJAX_INCLUDE')) {
 
 switch ($_REQUEST['action']) {
     case 'flip_state':
-        if (!Access::check('interface','75')) {
-            debug_event('DENIED',$GLOBALS['user']->username . ' attempted to change the state of a song','1');
+        if (!Access::check('interface', '75')) {
+            debug_event('DENIED', $GLOBALS['user']->username . ' attempted to change the state of a song', '1');
             exit;
         }
 
         $song        = new Song($_REQUEST['song_id']);
         $new_enabled = $song->enabled ? false : true;
-        $song->update_enabled($new_enabled,$song->id);
+        $song->update_enabled($new_enabled, $song->id);
         $song->enabled = $new_enabled;
         $song->format();
 
         //Return the new Ajax::button
         $id           = 'button_flip_state_' . $song->id;
         $button       = $song->enabled ? 'disable' : 'enable';
-        $results[$id] = Ajax::button('?page=song&action=flip_state&song_id=' . $song->id,$button, T_(ucfirst($button)),'flip_state_' . $song->id);
+        $results[$id] = Ajax::button('?page=song&action=flip_state&song_id=' . $song->id, $button, T_(ucfirst($button)), 'flip_state_' . $song->id);
     break;
     case 'shouts':
         ob_start();
diff --git a/server/sse.server.php b/server/sse.server.php
index 700f30de..7ba43e73 100644
--- a/server/sse.server.php
+++ b/server/sse.server.php
@@ -23,7 +23,7 @@
 require_once '../lib/init.php';
 require_once AmpConfig::get('prefix') . '/modules/catalog/local/local.catalog.php';
 
-if (!Access::check('interface','100')) {
+if (!Access::check('interface', '100')) {
     UI::access_denied();
     exit;
 }
diff --git a/server/stream.ajax.php b/server/stream.ajax.php
index 18402131..fc5f8315 100644
--- a/server/stream.ajax.php
+++ b/server/stream.ajax.php
@@ -63,7 +63,7 @@ switch ($_REQUEST['action']) {
         $current = AmpConfig::get('play_type');
 
         // Go ahead and update their preference
-        if (Preference::update('play_type',$GLOBALS['user']->id,$new)) {
+        if (Preference::update('play_type', $GLOBALS['user']->id, $new)) {
             AmpConfig::set('play_type', $new, true);
         }
 
@@ -106,8 +106,8 @@ switch ($_REQUEST['action']) {
     case 'basket':
         // Go ahead and see if we should clear the playlist here or not,
         // we might not actually clear it in the session.
-        if ( ($_REQUEST['playlist_method'] == 'clear' || AmpConfig::get('playlist_method') == 'clear')) {
-            define('NO_SONGS','1');
+        if (($_REQUEST['playlist_method'] == 'clear' || AmpConfig::get('playlist_method') == 'clear')) {
+            define('NO_SONGS', '1');
             ob_start();
             require_once AmpConfig::get('prefix') . UI::find_template('rightbar.inc.php');
             $results['rightbar'] = ob_get_clean();
diff --git a/server/tag.ajax.php b/server/tag.ajax.php
index f97dd6ed..9e617c5b 100644
--- a/server/tag.ajax.php
+++ b/server/tag.ajax.php
@@ -49,7 +49,7 @@ switch ($_REQUEST['action']) {
         Tag::add_tag_map($_GET['type'], $_GET['object_id'], $_GET['tag_id'], false);
     break;
     case 'add_tag_by_name':
-        if (!Access::check('interface','75')) {
+        if (!Access::check('interface', '75')) {
             debug_event('DENIED', $GLOBALS['user']->username . ' attempted to add new tag', 1);
             exit;
         }
@@ -57,7 +57,7 @@ switch ($_REQUEST['action']) {
         Tag::add($_GET['type'], $_GET['object_id'], $_GET['tag_name'], false);
     break;
     case 'delete':
-        if (!Access::check('interface','75')) {
+        if (!Access::check('interface', '75')) {
             debug_event('DENIED', $GLOBALS['user']->username . ' attempted to delete tag', 1);
             exit;
         }
diff --git a/server/xml.server.php b/server/xml.server.php
index eadc8ac6..9f1b0989 100644
--- a/server/xml.server.php
+++ b/server/xml.server.php
@@ -24,7 +24,7 @@
  * This is accessed remotly to allow outside scripts access to ampache information
  * as such it needs to verify the session id that is passed
  */
-define('NO_SESSION','1');
+define('NO_SESSION', '1');
 require_once '../lib/init.php';
 
 // If it's not a handshake then we can allow it to take up lots of time
@@ -39,7 +39,7 @@ header("Content-Disposition: attachment; filename=information.xml");
 // If we don't even have access control on then we can't use this!
 if (!AmpConfig::get('access_control')) {
     ob_end_clean();
-    debug_event('Access Control','Error Attempted to use XML API with Access Control turned off','3');
+    debug_event('Access Control', 'Error Attempted to use XML API with Access Control turned off', '3');
     echo XML_Data::error('501', T_('Access Control not Enabled'));
     exit;
 }
@@ -49,7 +49,7 @@ if (!AmpConfig::get('access_control')) {
  * login via this interface so we do have an exception for action=login
  */
 if (!Session::exists('api', $_REQUEST['auth']) and $_REQUEST['action'] != 'handshake' and $_REQUEST['action'] != 'ping') {
-    debug_event('Access Denied','Invalid Session attempt to API [' . $_REQUEST['action'] . ']','3');
+    debug_event('Access Denied', 'Invalid Session attempt to API [' . $_REQUEST['action'] . ']', '3');
     ob_end_clean();
     echo XML_Data::error('401', T_('Session Expired'));
     exit();
@@ -62,7 +62,7 @@ $username =
     : Session::username($_REQUEST['auth']);
 
 if (!Access::check_network('init-api', $username, 5)) {
-    debug_event('Access Denied','Unauthorized access attempt to API [' . $_SERVER['REMOTE_ADDR'] . ']', '3');
+    debug_event('Access Denied', 'Unauthorized access attempt to API [' . $_SERVER['REMOTE_ADDR'] . ']', '3');
     ob_end_clean();
     echo XML_Data::error('403', T_('Unauthorized access attempt to API - ACL Error'));
     exit();
@@ -84,14 +84,14 @@ $internal_functions = array('set_filter');
 
 // Recurse through them and see if we're calling one of them
 foreach ($methods as $method) {
-    if (in_array($method,$internal_functions)) {
+    if (in_array($method, $internal_functions)) {
         continue;
     }
 
     // If the method is the same as the action being called
     // Then let's call this function!
     if ($_GET['action'] == $method) {
-        call_user_func(array('api',$method),$_GET);
+        call_user_func(array('api', $method), $_GET);
         // We only allow a single function to be called, and we assume it's cleaned up!
         exit;
     }
diff --git a/share.php b/share.php
index 1a367782..24de0d0d 100644
--- a/share.php
+++ b/share.php
@@ -60,7 +60,7 @@ switch ($action) {
             exit;
         }
 
-        if (!Core::form_verify('add_share','post')) {
+        if (!Core::form_verify('add_share', 'post')) {
             UI::access_denied();
             exit;
         }
diff --git a/shout.php b/shout.php
index 5849fd46..5a29e8c3 100644
--- a/shout.php
+++ b/shout.php
@@ -28,12 +28,12 @@ UI::show_header();
 switch ($_REQUEST['action']) {
     case 'add_shout':
         // Must be at least a user to do this
-        if (!Access::check('interface','25')) {
+        if (!Access::check('interface', '25')) {
             UI::access_denied();
             exit;
         }
 
-        if (!Core::form_verify('add_shout','post')) {
+        if (!Core::form_verify('add_shout', 'post')) {
             UI::access_denied();
             exit;
         }
@@ -57,7 +57,7 @@ switch ($_REQUEST['action']) {
     break;
     case 'show_add_shout':
         // Get our object first
-        $object = Shoutbox::get_object($_REQUEST['type'],$_REQUEST['id']);
+        $object = Shoutbox::get_object($_REQUEST['type'], $_REQUEST['id']);
 
         if (!$object || !$object->id) {
             AmpError::add('general', T_('Invalid Object Selected'));
diff --git a/smartplaylist.php b/smartplaylist.php
index b5885285..b56220f8 100644
--- a/smartplaylist.php
+++ b/smartplaylist.php
@@ -40,7 +40,7 @@ UI::show_header();
 switch ($_REQUEST['action']) {
     case 'create_playlist':
         /* Check rights */
-        if (!Access::check('interface','25')) {
+        if (!Access::check('interface', '25')) {
             UI::access_denied();
             break;
         }
diff --git a/stats.php b/stats.php
index 40f3666c..5d3278d4 100644
--- a/stats.php
+++ b/stats.php
@@ -66,7 +66,7 @@ switch ($_REQUEST['action']) {
         break;
     case 'show':
     default:
-        if (Access::check('interface','50')) {
+        if (Access::check('interface', '50')) {
             require_once AmpConfig::get('prefix') . UI::find_template('show_stats.inc.php');
         }
     break;
diff --git a/stream.php b/stream.php
index 79b62315..c2162abb 100644
--- a/stream.php
+++ b/stream.php
@@ -29,7 +29,7 @@ if (!isset($_REQUEST['action']) || empty($_REQUEST['action'])) {
 
 if (!defined('NO_SESSION')) {
     /* If we are running a demo, quick while you still can! */
-    if (AmpConfig::get('demo_mode') || (AmpConfig::get('use_auth')) && !Access::check('interface','25')) {
+    if (AmpConfig::get('demo_mode') || (AmpConfig::get('use_auth')) && !Access::check('interface', '25')) {
         UI::access_denied();
         exit;
     }
@@ -49,7 +49,7 @@ switch ($_REQUEST['action']) {
         $media_ids = $GLOBALS['user']->playlist->get_items();
 
         // Check to see if 'clear' was passed if it was then we need to reset the basket
-        if ( ($_REQUEST['playlist_method'] == 'clear' || AmpConfig::get('playlist_method') == 'clear')) {
+        if (($_REQUEST['playlist_method'] == 'clear' || AmpConfig::get('playlist_method') == 'clear')) {
             $GLOBALS['user']->playlist->clear();
         }
     break;
@@ -66,7 +66,7 @@ switch ($_REQUEST['action']) {
             case 'album':
                 foreach ($data as $value) {
                     $songs     = $value->get_songs();
-                    $media_ids = array_merge($media_ids,$songs);
+                    $media_ids = array_merge($media_ids, $songs);
                 }
             break;
             case 'song':
@@ -165,7 +165,7 @@ switch ($_REQUEST['action']) {
     break;
 }
 
-debug_event('stream.php' , 'Stream Type: ' . $stream_type . ' Media IDs: ' . json_encode($media_ids), 5);
+debug_event('stream.php', 'Stream Type: ' . $stream_type . ' Media IDs: ' . json_encode($media_ids), 5);
 
 if (count($media_ids) || isset($urls)) {
     if ($stream_type != 'democratic') {
@@ -188,5 +188,5 @@ if (count($media_ids) || isset($urls)) {
     // Depending on the stream type, will either generate a redirect or actually do the streaming.
     $playlist->generate_playlist($stream_type, true);
 } else {
-    debug_event('stream.php' , 'No item. Ignoring...', 5);
+    debug_event('stream.php', 'No item. Ignoring...', 5);
 }
diff --git a/templates/browse_filters.inc.php b/templates/browse_filters.inc.php
index a815f146..e27d64d3 100644
--- a/templates/browse_filters.inc.php
+++ b/templates/browse_filters.inc.php
@@ -29,7 +29,7 @@ if (!Core::is_session_started()) {
 <li>
     <h4><?php echo T_('Filters'); ?></h4>
     <div class="sb3">
-    <?php if (in_array('starts_with',$allowed_filters)) {
+    <?php if (in_array('starts_with', $allowed_filters)) {
     ?>
         <form id="multi_alpha_filter_form" action="javascript:void(0);">
             <label id="multi_alpha_filterLabel" for="multi_alpha_filter"><?php echo T_('Starts With');
@@ -41,7 +41,7 @@ if (!Core::is_session_started()) {
         </form>
     <?php 
 } // end if alpha_match ?>
-    <?php if (in_array('minimum_count',$allowed_filters)) {
+    <?php if (in_array('minimum_count', $allowed_filters)) {
     ?>
         <input id="mincountCB" type="checkbox" value="1" />
         <label id="mincountLabel" for="mincountCB"><?php echo T_('Minimum Count');
@@ -50,7 +50,7 @@ if (!Core::is_session_started()) {
     ?>
     <?php 
 } ?>
-    <?php if (in_array('rated',$allowed_filters)) {
+    <?php if (in_array('rated', $allowed_filters)) {
     ?>
         <input id="ratedCB" type="checkbox" value="1" />
         <label id="ratedLabel" for="ratedCB"><?php echo T_('Rated');
@@ -59,7 +59,7 @@ if (!Core::is_session_started()) {
     ?>
     <?php 
 } ?>
-    <?php if (in_array('unplayed',$allowed_filters)) {
+    <?php if (in_array('unplayed', $allowed_filters)) {
     ?>
         <input id="unplayedCB" type="checkbox" <?php echo $string = $browse->get_filter('unplayed') ? 'checked="checked"' : '';
     ?>/>
@@ -67,17 +67,17 @@ if (!Core::is_session_started()) {
     ?></label><br />
     <?php 
 } ?>
-    <?php if (in_array('playlist_type',$allowed_filters)) {
+    <?php if (in_array('playlist_type', $allowed_filters)) {
     ?>
         <input id="show_allplCB" type="checkbox" <?php echo $string = $browse->get_filter('playlist_type') ? 'checked="checked"' : '';
     ?>/>
         <label id="show_allplLabel" for="showallplCB"><?php echo T_('All Playlists');
     ?></label><br />
-        <?php echo Ajax::observe('show_allplCB','click',Ajax::action('?page=browse&action=browse&browse_id=' . $browse->id . '&key=playlist_type&value=1',''));
+        <?php echo Ajax::observe('show_allplCB', 'click', Ajax::action('?page=browse&action=browse&browse_id=' . $browse->id . '&key=playlist_type&value=1', ''));
     ?>
     <?php 
 } // if playlist_type ?>
-    <?php if (in_array('object_type',$allowed_filters)) {
+    <?php if (in_array('object_type', $allowed_filters)) {
     ?>
         <?php $string = 'otype_' . $browse->get_filter('object_type');
     ${$string}        = 'selected="selected"';
@@ -86,22 +86,22 @@ if (!Core::is_session_started()) {
     ?>/>
         <label id="typeSongLabel" for="typeSongRadio"><?php echo T_('Song Title');
     ?></label><br />
-        <?php echo Ajax::observe('typeSongRadio','click',Ajax::action('?page=tag&action=browse_type&browse_id=' . $browse->id . '&type=song',''));
+        <?php echo Ajax::observe('typeSongRadio', 'click', Ajax::action('?page=tag&action=browse_type&browse_id=' . $browse->id . '&type=song', ''));
     ?>
         <input id="typeAlbumRadio" type="radio" name="object_type" value="1" />
         <label id="typeAlbumLabel" for="typeAlbumRadio"><?php echo T_('Albums');
     ?></label><br />
-        <?php echo Ajax::observe('typeAlbumRadio','click',Ajax::action('?page=tag&action=browse_type&browse_id=' . $browse->id . '&type=album',''));
+        <?php echo Ajax::observe('typeAlbumRadio', 'click', Ajax::action('?page=tag&action=browse_type&browse_id=' . $browse->id . '&type=album', ''));
     ?>
         <input id="typeArtistRadio" type="radio" name="object_type" value="1" />
         <label id="typeArtistLabel" for="typeArtistRadio"><?php echo T_('Artist');
     ?></label><br />
-        <?php echo Ajax::observe('typeArtistRadio','click',Ajax::action('?page=tag&action=browse_type&browse_id=' . $browse->id . '&type=artist',''));
+        <?php echo Ajax::observe('typeArtistRadio', 'click', Ajax::action('?page=tag&action=browse_type&browse_id=' . $browse->id . '&type=artist', ''));
     ?>
     <?php 
 } ?>
 
-    <?php if (in_array('catalog',$allowed_filters)) {
+    <?php if (in_array('catalog', $allowed_filters)) {
     ?>
         <form method="post" id="catalog_choice" action="javascript.void(0);">
             <label id="catalogLabel" for="catalog_select"><?php echo T_('Catalog');
@@ -112,7 +112,7 @@ if (!Core::is_session_started()) {
                 <?php
                     $sql = 'SELECT `id`,`name` FROM `catalog`';
     $db_results          = Dba::read($sql);
-    while ( $data = Dba::fetch_assoc($db_results) ) {
+    while ($data = Dba::fetch_assoc($db_results)) {
         $results[] = $data;
     }
 
@@ -126,17 +126,17 @@ if (!Core::is_session_started()) {
     ?>
 
             </select>
-        <?php echo Ajax::observe('catalog_select', 'change', Ajax::action('?page=browse&action=browse&browse_id=' . $browse->id,'catalog_select', 'catalog_choice'));
+        <?php echo Ajax::observe('catalog_select', 'change', Ajax::action('?page=browse&action=browse&browse_id=' . $browse->id, 'catalog_select', 'catalog_choice'));
     ?>
         </form>
     <?php 
 } ?>
-    <?php if (in_array('show_art',$allowed_filters)) {
+    <?php if (in_array('show_art', $allowed_filters)) {
     ?>
         <?php echo T_('Toggle Artwork');
     ?>&nbsp;<input id="show_artCB" type="checkbox" <?php echo Art::is_enabled() ? 'checked="checked"' : '';
     ?>/>
-        <?php echo Ajax::observe('show_artCB','click',Ajax::action('?page=browse&action=show_art&browse_id=' . $browse->id, ''));
+        <?php echo Ajax::observe('show_artCB', 'click', Ajax::action('?page=browse&action=show_art&browse_id=' . $browse->id, ''));
     ?>
     <?php 
 } // if show_art ?>
diff --git a/templates/error_page.inc.php b/templates/error_page.inc.php
index 1e3a71ec..7e2d7965 100644
--- a/templates/error_page.inc.php
+++ b/templates/error_page.inc.php
@@ -29,7 +29,7 @@
 <!-- Propulsed by Ampache | ampache.org -->
 <meta http-equiv="refresh" content="10;URL=<?php echo($redirect_url);?>" />
 <?php UI::show_custom_style(); ?>
-<title><?php echo( T_("Ampache error page"));?></title>
+<title><?php echo(T_("Ampache error page"));?></title>
 <link href="lib/components/bootstrap/css/bootstrap.min.css" rel="stylesheet">
 <link href="lib/components/bootstrap/css/bootstrap-theme.min.css" rel="stylesheet">
 <link rel="stylesheet" href="templates/install-doped.css" type="text/css" media="screen" />
diff --git a/templates/footer.inc.php b/templates/footer.inc.php
index 5c7f2959..a9f29a0b 100644
--- a/templates/footer.inc.php
+++ b/templates/footer.inc.php
@@ -34,7 +34,7 @@
                 }
             }
         ?>
-        <div id="footer" class="<?php echo (($count_temp_playlist || AmpConfig::get('play_type') == 'localplay') ? '' : 'footer-wild'); ?>">
+        <div id="footer" class="<?php echo(($count_temp_playlist || AmpConfig::get('play_type') == 'localplay') ? '' : 'footer-wild'); ?>">
         <?php if (AmpConfig::get('show_donate')) {
     ?>
             <a id="donate" href="//ampache.github.io/donate.html" title="Donate" target="_blank"><?php echo ".:: " . T_('Donate') . " ::.";
diff --git a/templates/header.inc.php b/templates/header.inc.php
index 60d306ee..8a173962 100644
--- a/templates/header.inc.php
+++ b/templates/header.inc.php
@@ -366,7 +366,7 @@ $_SESSION['login'] = false;
                   </a>
                 </h1>
                 <div id="headerbox">
-                    <?php UI::show_box_top('','box box_headerbox'); ?>
+                    <?php UI::show_box_top('', 'box box_headerbox'); ?>
                     <?php require_once AmpConfig::get('prefix') . UI::find_template('show_search_bar.inc.php'); ?>
                     <?php if (User::is_registered()) {
     ?>
@@ -519,10 +519,10 @@ $_SESSION['login'] = false;
             <div id="util_div" style="display:none;"></div>
             <iframe name="util_iframe" id="util_iframe" style="display:none;" src="<?php echo $web_path; ?>/util.php"></iframe>
             
-            <div id="content" class="content-<?php echo AmpConfig::get('ui_fixed') ? (AmpConfig::get('topmenu') ? 'fixed-topmenu' : 'fixed') : 'float'; ?> <?php echo (($count_temp_playlist || AmpConfig::get('play_type') == 'localplay') ? '' : 'content-right-wild'); echo $isCollapsed ? ' content-left-wild' : ''; ?>">
+            <div id="content" class="content-<?php echo AmpConfig::get('ui_fixed') ? (AmpConfig::get('topmenu') ? 'fixed-topmenu' : 'fixed') : 'float'; ?> <?php echo(($count_temp_playlist || AmpConfig::get('play_type') == 'localplay') ? '' : 'content-right-wild'); echo $isCollapsed ? ' content-left-wild' : ''; ?>">
 
                 <?php
-                    if (Access::check('interface','100')) {
+                    if (Access::check('interface', '100')) {
                         echo '<div id=update_notify>';
                         if (AmpConfig::get('autoupdate') && AutoUpdate::is_update_available()) {
                             AutoUpdate::show_new_version();
diff --git a/templates/list_header.inc.php b/templates/list_header.inc.php
index dd2bea47..39c94a0f 100644
--- a/templates/list_header.inc.php
+++ b/templates/list_header.inc.php
@@ -101,7 +101,7 @@ if ($limit > 0 && $total > $limit) {
         if ($browse->get_filter('regex_match') == $filter) {
             $value = '<b>' . $value . '</b>';
         }
-        echo Ajax::text('?page=browse&action=browse&browse_id=' . $browse->id . '&key=regex_match&multi_alpha_filter=' . $filter . $argument_param, $value,'browse_' . $uid . '_alpha_' . $key,'');
+        echo Ajax::text('?page=browse&action=browse&browse_id=' . $browse->id . '&key=regex_match&multi_alpha_filter=' . $filter . $argument_param, $value, 'browse_' . $uid . '_alpha_' . $key, '');
     }
     ?>
     </div>
@@ -116,14 +116,14 @@ if ($limit > 0 && $total > $limit) {
     if ($browse->get_use_pages()) {
         ?>
     <span class="list-header-navmenu-border">
-    <span><?php echo Ajax::text('?page=browse&action=page&browse_id=' . $browse->id . '&start=' . $prev_offset . '&browse_uid=' . $uid . $argument_param, T_('Prev'),'browse_' . $uid . 'prev','','prev');
+    <span><?php echo Ajax::text('?page=browse&action=page&browse_id=' . $browse->id . '&start=' . $prev_offset . '&browse_uid=' . $uid . $argument_param, T_('Prev'), 'browse_' . $uid . 'prev', '', 'prev');
         ?></span>
     &nbsp;
     <?php echo '&nbsp;' . T_('Page') . ':';
         ?>
     <input class="list-header-navmenu-input" type="text" id="browse_<?php echo $browse->id;
         ?>_custom_value_<?php echo $is_header;
-        ?>" class="browse_custom_value" name="value" value="<?php echo ($current_page + 1);
+        ?>" class="browse_custom_value" name="value" value="<?php echo($current_page + 1);
         ?>" onKeyUp="delayRun(this, '750', 'ajaxState', '<?php echo Ajax::url('?page=browse&action=options&browse_id=' . $browse->id . '&option=custom' . $argument_param);
         ?>', 'browse_<?php echo $browse->id;
         ?>_custom_value_<?php echo $is_header;
@@ -131,10 +131,10 @@ if ($limit > 0 && $total > $limit) {
     <?php echo T_('of') . '&nbsp;' . $pages;
         ?>
     &nbsp;
-    <span><?php echo Ajax::text('?page=browse&action=page&browse_id=' . $browse->id . '&start=' . $next_offset . '&browse_uid=' . $uid . $argument_param, T_('Next'),'browse_' . $uid . 'next','','next');
+    <span><?php echo Ajax::text('?page=browse&action=page&browse_id=' . $browse->id . '&start=' . $next_offset . '&browse_uid=' . $uid . $argument_param, T_('Next'), 'browse_' . $uid . 'next', '', 'next');
         ?></span>
     &nbsp;
-    <span><?php echo Ajax::text('?page=browse&action=page&browse_id=' . $browse->id . '&start=-1&browse_uid=' . $uid . $argument_param, T_('All'),'browse_' . $uid . 'all','','all');
+    <span><?php echo Ajax::text('?page=browse&action=page&browse_id=' . $browse->id . '&start=-1&browse_uid=' . $uid . $argument_param, T_('All'), 'browse_' . $uid . 'all', '', 'all');
         ?></span>
     </span>
 <?php
@@ -145,14 +145,14 @@ if ($limit > 0 && $total > $limit) {
     <span class="browse-options">
         <a href="#" onClick="showFilters(this);" class="browse-options-link"><?php echo T_("View"); ?></a>
         <span class="browse-options-content">
-            <span><input type="checkbox" id="browse_<?php echo $browse->id; ?>_use_pages_<?php echo $is_header; ?>" value="true" <?php echo (($browse->get_use_pages()) ? 'checked' : ''); ?> onClick="javascript:<?php echo Ajax::action("?page=browse&action=options&browse_id=" . $browse->id . "&option=use_pages&value=' + $('#browse_" . $browse->id . "_use_pages_" . $is_header . "').is(':checked') + '" . $argument_param, "browse_" . $browse->id . "_use_pages_" . $is_header); ?>"><?php echo T_('Pages'); ?></span>
-            <span><input type="checkbox" id="browse_<?php echo $browse->id; ?>_use_scroll_<?php echo $is_header; ?>" value="true" <?php echo ((!$browse->get_use_pages()) ? 'checked' : ''); ?> onClick="javascript:<?php echo Ajax::action("?page=browse&action=options&browse_id=" . $browse->id . "&option=use_pages&value=' + !($('#browse_" . $browse->id . "_use_scroll_" . $is_header . "').is(':checked')) + '" . $argument_param, "browse_" . $browse->id . "_use_scroll_" . $is_header); ?>"><?php echo T_('Infinite Scroll'); ?></span>
-            <span><input type="checkbox" id="browse_<?php echo $browse->id; ?>_grid_view_<?php echo $is_header; ?>" value="true" <?php echo (($browse->get_grid_view()) ? 'checked' : ''); ?> onClick="javascript:<?php echo Ajax::action("?page=browse&action=options&browse_id=" . $browse->id . "&option=grid_view&value=' + ($('#browse_" . $browse->id . "_grid_view_" . $is_header . "').is(':checked')) + '" . $argument_param, "browse_" . $browse->id . "_grid_view_" . $is_header); ?>"><?php echo T_('Grid View'); ?></span>
+            <span><input type="checkbox" id="browse_<?php echo $browse->id; ?>_use_pages_<?php echo $is_header; ?>" value="true" <?php echo(($browse->get_use_pages()) ? 'checked' : ''); ?> onClick="javascript:<?php echo Ajax::action("?page=browse&action=options&browse_id=" . $browse->id . "&option=use_pages&value=' + $('#browse_" . $browse->id . "_use_pages_" . $is_header . "').is(':checked') + '" . $argument_param, "browse_" . $browse->id . "_use_pages_" . $is_header); ?>"><?php echo T_('Pages'); ?></span>
+            <span><input type="checkbox" id="browse_<?php echo $browse->id; ?>_use_scroll_<?php echo $is_header; ?>" value="true" <?php echo((!$browse->get_use_pages()) ? 'checked' : ''); ?> onClick="javascript:<?php echo Ajax::action("?page=browse&action=options&browse_id=" . $browse->id . "&option=use_pages&value=' + !($('#browse_" . $browse->id . "_use_scroll_" . $is_header . "').is(':checked')) + '" . $argument_param, "browse_" . $browse->id . "_use_scroll_" . $is_header); ?>"><?php echo T_('Infinite Scroll'); ?></span>
+            <span><input type="checkbox" id="browse_<?php echo $browse->id; ?>_grid_view_<?php echo $is_header; ?>" value="true" <?php echo(($browse->get_grid_view()) ? 'checked' : ''); ?> onClick="javascript:<?php echo Ajax::action("?page=browse&action=options&browse_id=" . $browse->id . "&option=grid_view&value=' + ($('#browse_" . $browse->id . "_grid_view_" . $is_header . "').is(':checked')) + '" . $argument_param, "browse_" . $browse->id . "_grid_view_" . $is_header); ?>"><?php echo T_('Grid View'); ?></span>
             <?php if (!$browse->is_static_content()) {
     ?>
             <span><input type="checkbox" id="browse_<?php echo $browse->id;
     ?>_use_alpha_<?php echo $is_header;
-    ?>" value="true" <?php echo (($browse->get_use_alpha()) ? 'checked' : '');
+    ?>" value="true" <?php echo(($browse->get_use_alpha()) ? 'checked' : '');
     ?> onClick="javascript:<?php echo Ajax::action("?page=browse&action=options&browse_id=" . $browse->id . "&option=use_alpha&value=' + $('#browse_" . $browse->id . "_use_alpha_" . $is_header . "').is(':checked') + '" . $argument_param, "browse_" . $browse->id . "_use_alpha_" . $is_header);
     ?>"><?php echo T_('Alphabet');
     ?></span>
diff --git a/templates/rightbar.inc.php b/templates/rightbar.inc.php
index 6c3be57a..0aaaa1f2 100644
--- a/templates/rightbar.inc.php
+++ b/templates/rightbar.inc.php
@@ -22,7 +22,7 @@
 ?>
 <ul id="rb_action">
     <li>
-        <?php echo Ajax::button('?page=stream&action=basket','all', T_('Play'), 'rightbar_play'); ?>
+        <?php echo Ajax::button('?page=stream&action=basket', 'all', T_('Play'), 'rightbar_play'); ?>
     </li>
     <?php if (Access::check('interface', '25')) {
     ?>
@@ -65,7 +65,7 @@
 <?php 
 } ?>
     <li>
-    <?php echo Ajax::button('?action=basket&type=clear_all','delete', T_('Clear Playlist'),'rb_clear_playlist'); ?>
+    <?php echo Ajax::button('?action=basket&type=clear_all', 'delete', T_('Clear Playlist'), 'rb_clear_playlist'); ?>
     </li>
     <li id="rb_add">
       <?php echo UI::get_icon('add', T_('Add Dynamic Items')); ?>
@@ -74,13 +74,13 @@
                 <?php echo Ajax::text('?page=random&action=song', T_('Random Song'), 'rb_add_random_song'); ?>
             </li>
             <li>
-                <?php echo Ajax::text('?page=random&action=artist', T_('Random Artist'),'rb_add_random_artist'); ?>
+                <?php echo Ajax::text('?page=random&action=artist', T_('Random Artist'), 'rb_add_random_artist'); ?>
             </li>
             <li>
                 <?php echo Ajax::text('?page=random&action=album', T_('Random Album'), 'rb_add_random_album'); ?>
             </li>
             <li>
-                <?php echo Ajax::text('?page=random&action=playlist', T_('Random Playlist'),'rb_add_random_playlist'); ?>
+                <?php echo Ajax::text('?page=random&action=playlist', T_('Random Playlist'), 'rb_add_random_playlist'); ?>
             </li>
         </ul>
     </li>
@@ -128,7 +128,7 @@
     foreach ($objects as $object_data) {
         $uid  = $object_data['track_id'];
         $type = array_shift($object_data);
-        if (in_array($type,$normal_array)) {
+        if (in_array($type, $normal_array)) {
             $object = new $type(array_shift($object_data));
             $object->format();
         }
@@ -137,7 +137,7 @@
         ?>" >
       <?php echo $object->f_link;
         ?>
-        <?php echo Ajax::button('?action=current_playlist&type=delete&id=' . $uid,'delete', T_('Delete'),'rightbar_delete_' . $uid,'','delitem');
+        <?php echo Ajax::button('?action=current_playlist&type=delete&id=' . $uid, 'delete', T_('Delete'), 'rightbar_delete_' . $uid, '', 'delitem');
         ?>
     </li>
 <?php 
diff --git a/templates/show_add_live_stream.inc.php b/templates/show_add_live_stream.inc.php
index e716227d..129db554 100644
--- a/templates/show_add_live_stream.inc.php
+++ b/templates/show_add_live_stream.inc.php
@@ -54,7 +54,7 @@
 <tr>
     <td><?php echo T_('Catalog'); ?></td>
     <td>
-        <?php echo show_catalog_select('catalog',intval($_REQUEST['catalog'])); ?>
+        <?php echo show_catalog_select('catalog', intval($_REQUEST['catalog'])); ?>
     </td>
 </tr>
 </table>
diff --git a/templates/show_add_shout.inc.php b/templates/show_add_shout.inc.php
index c83b251d..1ee979e4 100644
--- a/templates/show_add_shout.inc.php
+++ b/templates/show_add_shout.inc.php
@@ -23,7 +23,7 @@
 $object_type = strtolower(get_class($object));
 ?>
 <div>
-<?php if (Access::check('interface','25')) {
+<?php if (Access::check('interface', '25')) {
     ?>
 <div style="float: right">
 <?php
@@ -43,7 +43,7 @@ $boxtitle = T_('Post to Shoutbox');
 <tr>
     <td><textarea rows="5" cols="35" maxlength="140" name="comment"></textarea></td>
 </tr>
-<?php if (Access::check('interface','50')) {
+<?php if (Access::check('interface', '50')) {
     ?>
 <tr>
     <td><input type="checkbox" name="sticky" /> <strong><?php echo T_('Stick this comment');
diff --git a/templates/show_album.inc.php b/templates/show_album.inc.php
index a0b485ba..24a9da45 100644
--- a/templates/show_album.inc.php
+++ b/templates/show_album.inc.php
@@ -43,7 +43,7 @@ if ($directplay_limit > 0) {
     }
 }
 ?>
-<?php UI::show_box_top($title,'info-box'); ?>
+<?php UI::show_box_top($title, 'info-box'); ?>
 
 <div class="item_right_info">
     <div class="external_links">
@@ -64,7 +64,7 @@ if ($directplay_limit > 0) {
     ?>
     <div style="display:table-cell;" id="rating_<?php echo $album->id;
     ?>_album">
-            <?php Rating::show($album->id,'album');
+            <?php Rating::show($album->id, 'album');
     ?>
     </div>
     <?php 
@@ -74,7 +74,7 @@ if ($directplay_limit > 0) {
     ?>
     <div style="display:table-cell;" id="userflag_<?php echo $album->id;
     ?>_album">
-            <?php Userflag::show($album->id,'album');
+            <?php Userflag::show($album->id, 'album');
     ?>
     </div>
     <?php 
@@ -113,17 +113,17 @@ if (AmpConfig::get('sociable') && $owner_id > 0) {
         <?php if ($show_direct_play) {
     ?>
         <li>
-            <?php echo Ajax::button('?page=stream&action=directplay&object_type=album&' . $album->get_http_album_query_ids('object_id'),'play', T_('Play'),'directplay_full_' . $album->id);
+            <?php echo Ajax::button('?page=stream&action=directplay&object_type=album&' . $album->get_http_album_query_ids('object_id'), 'play', T_('Play'), 'directplay_full_' . $album->id);
     ?>
-            <?php echo Ajax::text('?page=stream&action=directplay&object_type=album&' . $album->get_http_album_query_ids('object_id'), T_('Play'),'directplay_full_text_' . $album->id);
+            <?php echo Ajax::text('?page=stream&action=directplay&object_type=album&' . $album->get_http_album_query_ids('object_id'), T_('Play'), 'directplay_full_text_' . $album->id);
     ?>
         </li>
             <?php if (Stream_Playlist::check_autoplay_append()) {
     ?>
         <li>
-            <?php echo Ajax::button('?page=stream&action=directplay&object_type=album&' . $album->get_http_album_query_ids('object_id') . '&append=true','play_add', T_('Play last'),'addplay_album_' . $album->id);
+            <?php echo Ajax::button('?page=stream&action=directplay&object_type=album&' . $album->get_http_album_query_ids('object_id') . '&append=true', 'play_add', T_('Play last'), 'addplay_album_' . $album->id);
     ?>
-            <?php echo Ajax::text('?page=stream&action=directplay&object_type=album&' . $album->get_http_album_query_ids('object_id') . '&append=true', T_('Play last'),'addplay_album_text_' . $album->id);
+            <?php echo Ajax::text('?page=stream&action=directplay&object_type=album&' . $album->get_http_album_query_ids('object_id') . '&append=true', T_('Play last'), 'addplay_album_text_' . $album->id);
     ?>
         </li>
             <?php 
@@ -135,13 +135,13 @@ if (AmpConfig::get('sociable') && $owner_id > 0) {
         <?php if ($show_playlist_add) {
     ?>
         <li>
-            <?php echo Ajax::button('?action=basket&type=album&' . $album->get_http_album_query_ids('id'),'add', T_('Add to temporary playlist'),'play_full_' . $album->id);
+            <?php echo Ajax::button('?action=basket&type=album&' . $album->get_http_album_query_ids('id'), 'add', T_('Add to temporary playlist'), 'play_full_' . $album->id);
     ?>
             <?php echo Ajax::text('?action=basket&type=album&' . $album->get_http_album_query_ids('id'), T_('Add to temporary playlist'), 'play_full_text_' . $album->id);
     ?>
         </li>
         <li>
-            <?php echo Ajax::button('?action=basket&type=album_random&' . $album->get_http_album_query_ids('id'),'random', T_('Random to temporary playlist'),'play_random_' . $album->id);
+            <?php echo Ajax::button('?action=basket&type=album_random&' . $album->get_http_album_query_ids('id'), 'random', T_('Random to temporary playlist'), 'play_random_' . $album->id);
     ?>
             <?php echo Ajax::text('?action=basket&type=album_random&' . $album->get_http_album_query_ids('id'), T_('Random to temporary playlist'), 'play_random_text_' . $album->id);
     ?>
@@ -165,7 +165,7 @@ if (AmpConfig::get('sociable') && $owner_id > 0) {
         </li>
         <?php 
 } ?>
-        <?php if (!AmpConfig::get('use_auth') || Access::check('interface','25')) {
+        <?php if (!AmpConfig::get('use_auth') || Access::check('interface', '25')) {
     ?>
             <?php if (AmpConfig::get('sociable')) {
     ?>
@@ -183,7 +183,7 @@ if (AmpConfig::get('sociable') && $owner_id > 0) {
         <?php 
 }
     ?>
-    <?php if (Access::check('interface','25')) {
+    <?php if (Access::check('interface', '25')) {
     ?>
             <?php if (AmpConfig::get('share')) {
     ?>
@@ -196,7 +196,7 @@ if (AmpConfig::get('sociable') && $owner_id > 0) {
     ?>
         <?php 
 } ?>
-        <?php if (($owner_id > 0 && $owner_id == $GLOBALS['user']->id) || Access::check('interface','50')) {
+        <?php if (($owner_id > 0 && $owner_id == $GLOBALS['user']->id) || Access::check('interface', '50')) {
     ?>
         <?php if (AmpConfig::get('statistical_graphs')) {
     ?>
@@ -241,7 +241,7 @@ if (AmpConfig::get('sociable') && $owner_id > 0) {
     ?>
                 <li>
                     <a href="<?php echo $web_path;
-    ?>/upload.php?artist=<?php echo ($album->album_artist ? $album->album_artist : $album->artist_id);
+    ?>/upload.php?artist=<?php echo($album->album_artist ? $album->album_artist : $album->artist_id);
     ?>&album=<?php echo $album->id ?>">
                         <?php echo UI::get_icon('upload', T_('Upload'));
     ?>
diff --git a/templates/show_album_group_disks.inc.php b/templates/show_album_group_disks.inc.php
index 4fd81735..2cdfb284 100644
--- a/templates/show_album_group_disks.inc.php
+++ b/templates/show_album_group_disks.inc.php
@@ -146,7 +146,7 @@ if ($directplay_limit > 0) {
             echo Ajax::button('?action=basket&type=album_random&' . $c_album->get_http_album_query_ids('id'), 'random', T_('Random to temporary playlist'), 'play_random_' . $c_album->id);
         }
         ?>
-        <?php if (Access::check('interface','25')) {
+        <?php if (Access::check('interface', '25')) {
     ?>
             <?php if (AmpConfig::get('sociable')) {
     ?>
@@ -173,7 +173,7 @@ if ($directplay_limit > 0) {
         <?php 
 }
         ?>
-        <?php if (Access::check('interface','50')) {
+        <?php if (Access::check('interface', '50')) {
     ?>
             <a onclick="submitNewItemsOrder('<?php echo $c_album->id ?>', 'reorder_songs_table_<?php echo $c_album->id ?>', 'song_',
                                             '<?php echo AmpConfig::get('web_path') ?>/albums.php?action=set_track_numbers', 'refresh_album_songs')">
diff --git a/templates/show_album_row.inc.php b/templates/show_album_row.inc.php
index 6d439c40..8abac547 100644
--- a/templates/show_album_row.inc.php
+++ b/templates/show_album_row.inc.php
@@ -69,7 +69,7 @@ if (Art::is_enabled()) {
             } ?>
     </span>
 </td>
-<td class="cel_artist"><?php echo (!empty($libitem->f_album_artist_link) ? $libitem->f_album_artist_link : $libitem->f_artist_link); ?></td>
+<td class="cel_artist"><?php echo(!empty($libitem->f_album_artist_link) ? $libitem->f_album_artist_link : $libitem->f_artist_link); ?></td>
 <td class="cel_songs"><?php echo $libitem->song_count; ?></td>
 <td class="cel_year"><?php if ($libitem->year > 0) {
     echo $libitem->year;
@@ -103,7 +103,7 @@ if (Art::is_enabled()) {
     }
 ?>
 <td class="cel_action">
-    <?php if (!AmpConfig::get('use_auth') || Access::check('interface','25')) {
+    <?php if (!AmpConfig::get('use_auth') || Access::check('interface', '25')) {
     if (AmpConfig::get('sociable') && (!$libitem->allow_group_disks || ($libitem->allow_group_disks && !count($libitem->album_suite)))) {
         ?>
         <a href="<?php echo AmpConfig::get('web_path');
@@ -114,7 +114,7 @@ if (Art::is_enabled()) {
         </a>
     <?php 
     }
-    if (Access::check('interface','25')) {
+    if (Access::check('interface', '25')) {
         if (AmpConfig::get('share') && (!$libitem->allow_group_disks || ($libitem->allow_group_disks && !count($libitem->album_suite)))) {
             Share::display_ui('album', $libitem->id, false);
         }
@@ -127,7 +127,7 @@ if (Art::is_enabled()) {
             </a>
     <?php 
     }
-    if (Access::check('interface','50') && (!$libitem->allow_group_disks || ($libitem->allow_group_disks && !count($libitem->album_suite)))) {
+    if (Access::check('interface', '50') && (!$libitem->allow_group_disks || ($libitem->allow_group_disks && !count($libitem->album_suite)))) {
         ?>
             <a id="<?php echo 'edit_album_' . $libitem->id ?>" onclick="showEditDialog('album_row', '<?php echo $libitem->id ?>', '<?php echo 'edit_album_' . $libitem->id ?>', '<?php echo T_('Album edit') ?>', 'album_')">
                 <?php echo UI::get_icon('edit', T_('Edit'));
diff --git a/templates/show_albums.inc.php b/templates/show_albums.inc.php
index ad6f1d74..e862adfa 100644
--- a/templates/show_albums.inc.php
+++ b/templates/show_albums.inc.php
@@ -37,11 +37,11 @@ $thcount  = 8;
     ?></th>
         <?php 
 } ?>
-            <th class="cel_album essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=name', T_('Album'),'album_sort_name'); ?></th>
+            <th class="cel_album essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=name', T_('Album'), 'album_sort_name'); ?></th>
             <th class="cel_add essential"></th>
-            <th class="cel_artist essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=generic_artist', T_('Artist'),'album_sort_artist'); ?></th>
+            <th class="cel_artist essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=generic_artist', T_('Artist'), 'album_sort_artist'); ?></th>
             <th class="cel_songs optional"><?php echo T_('Songs'); ?></th>
-            <th class="cel_year essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=year', T_('Year'),'album_sort_year'); ?></th>
+            <th class="cel_year essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=year', T_('Year'), 'album_sort_year'); ?></th>
             <?php if (AmpConfig::get('show_played_times')) {
     ?>
             <th class="cel_counter optional"><?php echo T_('# Played');
@@ -75,10 +75,10 @@ $thcount  = 8;
     <tbody>
         <?php
         if (AmpConfig::get('ratings')) {
-            Rating::build_cache('album',$object_ids);
+            Rating::build_cache('album', $object_ids);
         }
         if (AmpConfig::get('userflags')) {
-            Userflag::build_cache('album',$object_ids);
+            Userflag::build_cache('album', $object_ids);
         }
 
         $show_direct_play_cfg = AmpConfig::get('directplay');
@@ -124,11 +124,11 @@ $thcount  = 8;
     ?></th>
             <?php 
 } ?>
-            <th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=name', T_('Album'),'album_sort_name_bottom'); ?></th>
+            <th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=name', T_('Album'), 'album_sort_name_bottom'); ?></th>
             <th class="cel_add"></th>
-            <th class="cel_artist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=generic_artist', T_('Artist'),'album_sort_artist_bottom'); ?></th>
+            <th class="cel_artist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=generic_artist', T_('Artist'), 'album_sort_artist_bottom'); ?></th>
             <th class="cel_songs"><?php echo T_('Songs'); ?></th>
-            <th class="cel_year"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=year', T_('Year'),'album_sort_year_bottom'); ?></th>
+            <th class="cel_year"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=year', T_('Year'), 'album_sort_year_bottom'); ?></th>
             <?php if (AmpConfig::get('show_played_times')) {
     ?>
             <th class="cel_counter optional"><?php echo T_('# Played');
diff --git a/templates/show_artist.inc.php b/templates/show_artist.inc.php
index 4c2dd36b..8b56ea23 100644
--- a/templates/show_artist.inc.php
+++ b/templates/show_artist.inc.php
@@ -79,7 +79,7 @@ if (AmpConfig::get('lastfm_api_key')) {
     ?>
     <div style="display:table-cell;" id="userflag_<?php echo $artist->id;
     ?>_artist">
-            <?php Userflag::show($artist->id,'artist');
+            <?php Userflag::show($artist->id, 'artist');
     ?>
     </div>
     <?php 
@@ -148,17 +148,17 @@ if (AmpConfig::get('sociable') && $owner_id > 0) {
         <?php if ($show_direct_play) {
     ?>
         <li>
-            <?php echo Ajax::button('?page=stream&action=directplay&object_type=artist&object_id=' . $artist->id,'play', T_('Play all'),'directplay_full_' . $artist->id);
+            <?php echo Ajax::button('?page=stream&action=directplay&object_type=artist&object_id=' . $artist->id, 'play', T_('Play all'), 'directplay_full_' . $artist->id);
     ?>
-            <?php echo Ajax::text('?page=stream&action=directplay&object_type=artist&object_id=' . $artist->id, T_('Play all'),'directplay_full_text_' . $artist->id);
+            <?php echo Ajax::text('?page=stream&action=directplay&object_type=artist&object_id=' . $artist->id, T_('Play all'), 'directplay_full_text_' . $artist->id);
     ?>
         </li>
             <?php if (Stream_Playlist::check_autoplay_append()) {
     ?>
         <li>
-            <?php echo Ajax::button('?page=stream&action=directplay&object_type=artist&object_id=' . $artist->id . '&append=true','play_add', T_('Play all last'),'addplay_artist_' . $artist->id);
+            <?php echo Ajax::button('?page=stream&action=directplay&object_type=artist&object_id=' . $artist->id . '&append=true', 'play_add', T_('Play all last'), 'addplay_artist_' . $artist->id);
     ?>
-            <?php echo Ajax::text('?page=stream&action=directplay&object_type=artist&object_id=' . $artist->id . '&append=true', T_('Play all last'),'addplay_artist_text_' . $artist->id);
+            <?php echo Ajax::text('?page=stream&action=directplay&object_type=artist&object_id=' . $artist->id . '&append=true', T_('Play all last'), 'addplay_artist_text_' . $artist->id);
     ?>
         </li>
             <?php 
@@ -170,16 +170,16 @@ if (AmpConfig::get('sociable') && $owner_id > 0) {
     ?>
         <li>
             <?php /* HINT: Artist Fullname */ ?>
-            <?php echo Ajax::button('?action=basket&type=artist&id=' . $artist->id,'add', T_('Add all to temporary playlist'),'add_' . $artist->id);
+            <?php echo Ajax::button('?action=basket&type=artist&id=' . $artist->id, 'add', T_('Add all to temporary playlist'), 'add_' . $artist->id);
     ?>
-            <?php echo Ajax::text('?action=basket&type=artist&id=' . $artist->id, T_('Add all to temporary playlist'),'add_text_' . $artist->id);
+            <?php echo Ajax::text('?action=basket&type=artist&id=' . $artist->id, T_('Add all to temporary playlist'), 'add_text_' . $artist->id);
     ?>
         </li>
         <li>
             <?php /* HINT: Artist Fullname */ ?>
-            <?php echo Ajax::button('?action=basket&type=artist_random&id=' . $artist->id,'random', T_('Random all to temporary playlist'),'random_' . $artist->id);
+            <?php echo Ajax::button('?action=basket&type=artist_random&id=' . $artist->id, 'random', T_('Random all to temporary playlist'), 'random_' . $artist->id);
     ?>
-            <?php echo Ajax::text('?action=basket&type=artist_random&id=' . $artist->id, T_('Random all to temporary playlist'),'random_text_' . $artist->id);
+            <?php echo Ajax::text('?action=basket&type=artist_random&id=' . $artist->id, T_('Random all to temporary playlist'), 'random_text_' . $artist->id);
     ?>
         </li>
         <?php 
@@ -192,7 +192,7 @@ if (AmpConfig::get('sociable') && $owner_id > 0) {
         </li>
         <?php 
 } ?>
-        <?php if (!AmpConfig::get('use_auth') || Access::check('interface','25')) {
+        <?php if (!AmpConfig::get('use_auth') || Access::check('interface', '25')) {
     ?>
             <?php if (AmpConfig::get('sociable')) {
     ?>
@@ -224,7 +224,7 @@ if (AmpConfig::get('sociable') && $owner_id > 0) {
         <?php
 
 } ?>
-        <?php if (($owner_id > 0 && $owner_id == $GLOBALS['user']->id) || Access::check('interface','50')) {
+        <?php if (($owner_id > 0 && $owner_id == $GLOBALS['user']->id) || Access::check('interface', '50')) {
     ?>
             <?php if (AmpConfig::get('statistical_graphs')) {
     ?>
@@ -342,7 +342,7 @@ if (AmpConfig::get('sociable') && $owner_id > 0) {
         </div>
 <?php
 if (AmpConfig::get('wanted')) {
-    echo Ajax::observe('missing_albums_link','click', Ajax::action('?page=index&action=wanted_missing_albums&artist=' . $artist->id, 'missing_albums'));
+    echo Ajax::observe('missing_albums_link', 'click', Ajax::action('?page=index&action=wanted_missing_albums&artist=' . $artist->id, 'missing_albums'));
     ?>
         <div id="missing_albums" class="tab_content">
         <?php UI::show_box_top(T_('Missing Albums'), 'info-box');
@@ -354,7 +354,7 @@ if (AmpConfig::get('wanted')) {
 } ?>
 <?php
 if (AmpConfig::get('show_similar')) {
-    echo Ajax::observe('similar_artist_link','click', Ajax::action('?page=index&action=similar_artist&artist=' . $artist->id, 'similar_artist'));
+    echo Ajax::observe('similar_artist_link', 'click', Ajax::action('?page=index&action=similar_artist&artist=' . $artist->id, 'similar_artist'));
     ?>
         <div id="similar_artist" class="tab_content">
         <?php UI::show_box_top(T_('Similar Artists'), 'info-box');
@@ -366,7 +366,7 @@ if (AmpConfig::get('show_similar')) {
 } ?>
 <?php
 if (AmpConfig::get('show_concerts')) {
-    echo Ajax::observe('concerts_link','click', Ajax::action('?page=index&action=concerts&artist=' . $artist->id, 'concerts'));
+    echo Ajax::observe('concerts_link', 'click', Ajax::action('?page=index&action=concerts&artist=' . $artist->id, 'concerts'));
     ?>
         <div id="concerts" class="tab_content">
         <?php UI::show_box_top(T_('Events'), 'info-box');
@@ -378,7 +378,7 @@ if (AmpConfig::get('show_concerts')) {
 } ?>
 <?php
 if (AmpConfig::get('label')) {
-    echo Ajax::observe('labels_link','click', Ajax::action('?page=index&action=labels&artist=' . $artist->id, 'labels'));
+    echo Ajax::observe('labels_link', 'click', Ajax::action('?page=index&action=labels&artist=' . $artist->id, 'labels'));
     ?>
         <div id="labels" class="tab_content">
         <?php UI::show_box_top(T_('Labels'), 'info-box');
diff --git a/templates/show_artist_row.inc.php b/templates/show_artist_row.inc.php
index 02fe002e..d7167e12 100644
--- a/templates/show_artist_row.inc.php
+++ b/templates/show_artist_row.inc.php
@@ -25,9 +25,9 @@
     <div class="cel_play_hover">
     <?php
         if ($show_direct_play) {
-            echo Ajax::button('?page=stream&action=directplay&object_type=artist&object_id=' . $libitem->id,'play', T_('Play'),'play_artist_' . $libitem->id);
+            echo Ajax::button('?page=stream&action=directplay&object_type=artist&object_id=' . $libitem->id, 'play', T_('Play'), 'play_artist_' . $libitem->id);
             if (Stream_Playlist::check_autoplay_append()) {
-                echo Ajax::button('?page=stream&action=directplay&object_type=artist&object_id=' . $libitem->id . '&append=true','play_add', T_('Play last'),'addplay_artist_' . $libitem->id);
+                echo Ajax::button('?page=stream&action=directplay&object_type=artist&object_id=' . $libitem->id . '&append=true', 'play_add', T_('Play last'), 'addplay_artist_' . $libitem->id);
                 if (Stream_Playlist::check_autoplay_next()) {
                     echo Ajax::button('?page=stream&action=directplay&object_type=artist&object_id=' . $libitem->id . '&playnext=true', 'play_next', T_('Play next'), 'nextplay_artist_' . $libitem->id);
                 }
@@ -53,8 +53,8 @@ if (Art::is_enabled()) {
     <span class="cel_item_add">
     <?php
         if ($show_playlist_add) {
-            echo Ajax::button('?action=basket&type=artist&id=' . $libitem->id,'add', T_('Add to temporary playlist'),'add_artist_' . $libitem->id);
-            echo Ajax::button('?action=basket&type=artist_random&id=' . $libitem->id,'random', T_('Random to temporary playlist'),'random_artist_' . $libitem->id);
+            echo Ajax::button('?action=basket&type=artist&id=' . $libitem->id, 'add', T_('Add to temporary playlist'), 'add_artist_' . $libitem->id);
+            echo Ajax::button('?action=basket&type=artist_random&id=' . $libitem->id, 'random', T_('Random to temporary playlist'), 'random_artist_' . $libitem->id);
             ?>
             <a id="<?php echo 'add_playlist_' . $libitem->id ?>" onclick="showPlaylistDialog(event, 'artist', '<?php echo $libitem->id ?>')">
                 <?php echo UI::get_icon('playlist_add', T_('Add to existing playlist'));
@@ -80,21 +80,21 @@ if (Art::is_enabled()) {
         if (AmpConfig::get('ratings')) {
             ?>
             <td class="cel_rating" id="rating_<?php echo $libitem->id;
-            ?>_artist"><?php Rating::show($libitem->id,'artist');
+            ?>_artist"><?php Rating::show($libitem->id, 'artist');
             ?></td>
         <?php 
         }
         if (AmpConfig::get('userflags')) {
             ?>
             <td class="cel_userflag" id="userflag_<?php echo $libitem->id;
-            ?>_artist"><?php Userflag::show($libitem->id,'artist');
+            ?>_artist"><?php Userflag::show($libitem->id, 'artist');
             ?></td>
         <?php 
         }
     }
 ?>
 <td class="cel_action">
-<?php if (!AmpConfig::get('use_auth') || Access::check('interface','25')) {
+<?php if (!AmpConfig::get('use_auth') || Access::check('interface', '25')) {
     if (AmpConfig::get('sociable') && (!$libitem->allow_group_disks || ($libitem->allow_group_disks && !count($libitem->album_suite)))) {
         ?>
     <a href="<?php echo AmpConfig::get('web_path');
diff --git a/templates/show_artists.inc.php b/templates/show_artists.inc.php
index 1e9639d3..d19e278d 100644
--- a/templates/show_artists.inc.php
+++ b/templates/show_artists.inc.php
@@ -39,7 +39,7 @@ $thcount  = 8;
     ?></th>
             <?php 
 } ?>
-            <th class="cel_artist essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=artist&sort=name', T_('Artist'),'artist_sort_name'); ?></th>
+            <th class="cel_artist essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=artist&sort=name', T_('Artist'), 'artist_sort_name'); ?></th>
             <th class="cel_add essential"></th>
             <th class="cel_songs optional"><?php echo T_('Songs');  ?></th>
             <th class="cel_albums optional"><?php echo T_('Albums'); ?></th>
@@ -78,10 +78,10 @@ $thcount  = 8;
         <?php
         // Cache the ratings we are going to use
         if (AmpConfig::get('ratings')) {
-            Rating::build_cache('artist',$object_ids);
+            Rating::build_cache('artist', $object_ids);
         }
         if (AmpConfig::get('userflags')) {
-            Userflag::build_cache('artist',$object_ids);
+            Userflag::build_cache('artist', $object_ids);
         }
 
         $show_direct_play_cfg = AmpConfig::get('directplay');
@@ -126,7 +126,7 @@ $thcount  = 8;
     ?></th>
             <?php 
 } ?>
-            <th class="cel_artist essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=artist&sort=name', T_('Artist'),'artist_sort_name'); ?></th>
+            <th class="cel_artist essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=artist&sort=name', T_('Artist'), 'artist_sort_name'); ?></th>
             <th class="cel_add essential"></th>
             <th class="cel_songs optional"><?php echo T_('Songs');  ?></th>
             <th class="cel_albums optional"><?php echo T_('Albums'); ?></th>
diff --git a/templates/show_big_art.inc.php b/templates/show_big_art.inc.php
index ebbf842c..ed660699 100644
--- a/templates/show_big_art.inc.php
+++ b/templates/show_big_art.inc.php
@@ -20,7 +20,7 @@
  *
  */
 
-$htmllang = str_replace("_","-",AmpConfig::get('lang'));
+$htmllang = str_replace("_", "-", AmpConfig::get('lang'));
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $htmllang; ?>" lang="<?php echo $htmllang; ?>">
diff --git a/templates/show_broadcast_row.inc.php b/templates/show_broadcast_row.inc.php
index b5a9a12f..35dbac2b 100644
--- a/templates/show_broadcast_row.inc.php
+++ b/templates/show_broadcast_row.inc.php
@@ -24,12 +24,12 @@
     <span class="cel_play_content">&nbsp;</span>
     <div class="cel_play_hover">
     <?php if (AmpConfig::get('directplay')) {
-    echo Ajax::button('?page=stream&action=directplay&object_type=broadcast&object_id=' . $libitem->id,'play', T_('Play'),'play_broadcast_' . $libitem->id);
+    echo Ajax::button('?page=stream&action=directplay&object_type=broadcast&object_id=' . $libitem->id, 'play', T_('Play'), 'play_broadcast_' . $libitem->id);
 } ?>
     </div>
 </td>
 <td class="cel_name"><?php echo $libitem->name; ?></td>
 <td class="cel_genre"><?php echo $libitem->f_tags; ?></td>
-<td class="cel_started"><?php echo ($libitem->started ? T_('Yes') : T_('No')); ?></td>
+<td class="cel_started"><?php echo($libitem->started ? T_('Yes') : T_('No')); ?></td>
 <td class="cel_listeners"><?php echo $libitem->listeners; ?></td>
 <td class="cel_action"><?php $libitem->show_action_buttons(); ?></td>
diff --git a/templates/show_broadcasts.inc.php b/templates/show_broadcasts.inc.php
index 31408ea5..56447214 100644
--- a/templates/show_broadcasts.inc.php
+++ b/templates/show_broadcasts.inc.php
@@ -28,10 +28,10 @@
     <thead>
         <tr class="th-top">
             <th class="cel_play essential"></th>
-            <th class="cel_name essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=broadcast&sort=name', T_('Name'),'broadcast_sort_name'); ?></th>
+            <th class="cel_name essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=broadcast&sort=name', T_('Name'), 'broadcast_sort_name'); ?></th>
             <th class="cel_genre optional"><?php echo T_('Genre'); ?></th>
-            <th class="cel_started optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=broadcast&sort=started', T_('Started'),'broadcast_sort_started'); ?></th>
-            <th class="cel_listeners optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=broadcast&sort=listeners', T_('Listeners'),'broadcast_sort_listeners'); ?></th>
+            <th class="cel_started optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=broadcast&sort=started', T_('Started'), 'broadcast_sort_started'); ?></th>
+            <th class="cel_listeners optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=broadcast&sort=listeners', T_('Listeners'), 'broadcast_sort_listeners'); ?></th>
             <th class="cel_action essential"><?php echo T_('Actions'); ?></th>
         </tr>
     </thead>
diff --git a/templates/show_catalog_row.inc.php b/templates/show_catalog_row.inc.php
index 1bf2eafe..bd01301c 100644
--- a/templates/show_catalog_row.inc.php
+++ b/templates/show_catalog_row.inc.php
@@ -62,7 +62,7 @@ $button_flip_state_id = 'button_flip_state_' . $libitem->id;
     ?>
         <span id="<?php echo($button_flip_state_id);
     ?>">
-            <?php echo Ajax::button('?page=catalog&action=flip_state&catalog_id=' . $libitem->id, $icon, T_(ucfirst($icon)),'flip_state_' . $libitem->id);
+            <?php echo Ajax::button('?page=catalog&action=flip_state&catalog_id=' . $libitem->id, $icon, T_(ucfirst($icon)), 'flip_state_' . $libitem->id);
     ?>
         </span>
     <?php 
diff --git a/templates/show_channel_row.inc.php b/templates/show_channel_row.inc.php
index a13ec23b..474091cb 100644
--- a/templates/show_channel_row.inc.php
+++ b/templates/show_channel_row.inc.php
@@ -24,7 +24,7 @@
     <span class="cel_play_content">&nbsp;</span>
     <div class="cel_play_hover">
     <?php if (AmpConfig::get('directplay')) {
-    echo Ajax::button('?page=stream&action=directplay&object_type=channel&object_id=' . $libitem->id,'play', T_('Play'),'play_channel_' . $libitem->id);
+    echo Ajax::button('?page=stream&action=directplay&object_type=channel&object_id=' . $libitem->id, 'play', T_('Play'), 'play_channel_' . $libitem->id);
 } ?>
     </div>
 </td>
@@ -33,8 +33,8 @@
 <td class="cel_interface"><?php echo $libitem->interface; ?></td>
 <td class="cel_port"><?php echo $libitem->port; ?></td>
 <td class="cel_data"><?php echo $libitem->get_target_object()->f_link; ?></td>
-<!--<td class="cel_random"><?php echo ($libitem->random ? T_('Yes') : T_('No')); ?></td>
-<td class="cel_loop"><?php echo ($libitem->loop ? T_('Yes') : T_('No')); ?></td>-->
+<!--<td class="cel_random"><?php echo($libitem->random ? T_('Yes') : T_('No')); ?></td>
+<td class="cel_loop"><?php echo($libitem->loop ? T_('Yes') : T_('No')); ?></td>-->
 <td class="cel_streamtype"><?php echo $libitem->stream_type; ?></td>
 <td class="cel_bitrate"><?php echo $libitem->bitrate; ?></td>
 <td class="cel_startdate"><?php echo date("c", $libitem->start_date); ?></td>
diff --git a/templates/show_channels.inc.php b/templates/show_channels.inc.php
index 195ce28a..5d45b3b4 100644
--- a/templates/show_channels.inc.php
+++ b/templates/show_channels.inc.php
@@ -28,17 +28,17 @@
     <thead>
         <tr class="th-top">
             <th class="cel_play essential"></th>
-            <th class="cel_id essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=channel&sort=id', T_('#'),'channel_sort_id'); ?></th>
-            <th class="cel_name essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=channel&sort=name', T_('Name'),'channel_sort_name'); ?></th>
-            <th class="cel_interface essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=channel&sort=interface', T_('Interface'),'channel_sort_interface'); ?></th>
-            <th class="cel_port essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=channel&sort=port', T_('Port'),'channel_sort_port'); ?></th>
+            <th class="cel_id essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=channel&sort=id', T_('#'), 'channel_sort_id'); ?></th>
+            <th class="cel_name essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=channel&sort=name', T_('Name'), 'channel_sort_name'); ?></th>
+            <th class="cel_interface essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=channel&sort=interface', T_('Interface'), 'channel_sort_interface'); ?></th>
+            <th class="cel_port essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=channel&sort=port', T_('Port'), 'channel_sort_port'); ?></th>
             <th class="cel_data optional"><?php echo T_('Stream Source'); ?></th>
             <!--<th class="cel_random"><?php echo T_('Random'); ?></th>
             <th class="cel_loop"><?php echo T_('Loop'); ?></th>-->
             <th class="cel_streamtype optional"><?php echo T_('Stream Type'); ?></th>
             <th class="cel_bitrate optional"><?php echo T_('Bitrate'); ?></th>
             <th class="cel_startdate optional"><?php echo T_('Start Date'); ?></th>
-            <th class="cel_listeners optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=channel&sort=listeners', T_('Listeners'),'channel_sort_listeners'); ?></th>
+            <th class="cel_listeners optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=channel&sort=listeners', T_('Listeners'), 'channel_sort_listeners'); ?></th>
             <th class="cel_streamurl essential"><?php echo T_('Stream Url'); ?></th>
             <th class="cel_state optional"><?php echo T_('State'); ?></th>
             <th class="cel_action essential"><?php echo T_('Actions'); ?></th>
diff --git a/templates/show_democratic.inc.php b/templates/show_democratic.inc.php
index 544a3cf5..229f5a53 100644
--- a/templates/show_democratic.inc.php
+++ b/templates/show_democratic.inc.php
@@ -20,8 +20,8 @@
  *
  */
 
-$string = $democratic->is_enabled() ? sprintf(T_('%s Playlist') ,$democratic->name) : T_('Democratic Playlist');
-UI::show_box_top($string , 'info-box');
+$string = $democratic->is_enabled() ? sprintf(T_('%s Playlist'), $democratic->name) : T_('Democratic Playlist');
+UI::show_box_top($string, 'info-box');
 ?>
 <div id="information_actions">
 <ul>
@@ -34,7 +34,7 @@ UI::show_box_top($string , 'info-box');
 </li>
 <?php 
 } ?>
-<?php if (Access::check('interface','75')) {
+<?php if (Access::check('interface', '75')) {
     ?>
 <li>
     <a href="<?php echo AmpConfig::get('web_path');
@@ -47,15 +47,15 @@ UI::show_box_top($string , 'info-box');
 <?php if ($democratic->is_enabled()) {
     ?>
 <li>
-    <?php echo Ajax::button('?page=democratic&action=send_playlist&democratic_id=' . $democratic->id,'all', T_('Play'),'play_democratic');
+    <?php echo Ajax::button('?page=democratic&action=send_playlist&democratic_id=' . $democratic->id, 'all', T_('Play'), 'play_democratic');
     ?>
-    <?php echo Ajax::text('?page=democratic&action=send_playlist&democratic_id=' . $democratic->id, T_('Play Democratic Playlist'),'play_democratic_full_text');
+    <?php echo Ajax::text('?page=democratic&action=send_playlist&democratic_id=' . $democratic->id, T_('Play Democratic Playlist'), 'play_democratic_full_text');
     ?>
 </li>
 <li>
-    <?php echo Ajax::button('?page=democratic&action=clear_playlist&democratic_id=' . $democratic->id,'delete', T_('Clear Playlist'),'clear_democratic');
+    <?php echo Ajax::button('?page=democratic&action=clear_playlist&democratic_id=' . $democratic->id, 'delete', T_('Clear Playlist'), 'clear_democratic');
     ?>
-    <?php echo Ajax::text('?page=democratic&action=clear_playlist&democratic_id=' . $democratic->id, T_('Clear Playlist'),'clear_democratic_full_text');
+    <?php echo Ajax::text('?page=democratic&action=clear_playlist&democratic_id=' . $democratic->id, T_('Clear Playlist'), 'clear_democratic_full_text');
     ?>
 </li>
 <?php 
@@ -76,7 +76,7 @@ UI::show_box_top($string , 'info-box');
      echo " + '&reloadpage=1'";
  } ?>;
                     }
-                }, <?php echo (AmpConfig::get('refresh_limit') * 1000); ?>);
+                }, <?php echo(AmpConfig::get('refresh_limit') * 1000); ?>);
             }
         }
         <?php if (isset($_GET['reloadpage'])) {
diff --git a/templates/show_democratic_playlist.inc.php b/templates/show_democratic_playlist.inc.php
index dd80fa3e..041d019b 100644
--- a/templates/show_democratic_playlist.inc.php
+++ b/templates/show_democratic_playlist.inc.php
@@ -33,7 +33,7 @@ $web_path = AmpConfig::get('web_path');
   <col id="col_album" />
   <col id="col_artist" />
   <col id="col_time" />
-  <?php if (Access::check('interface','100')) {
+  <?php if (Access::check('interface', '100')) {
     ?>
   <col id="col_admin" />
   <?php 
@@ -70,7 +70,7 @@ else {
     ?></th>
         <th class="cel_time"><?php echo T_('Time');
     ?></th>
-        <?php if (Access::check('interface','100')) {
+        <?php if (Access::check('interface', '100')) {
     ?>
         <th class="cel_admin"><?php echo T_('Admin');
     ?></th>
@@ -95,12 +95,12 @@ $democratic = Democratic::get_current_playlist();
     <td class="cel_action">
     <?php if ($democratic->has_vote($item['object_id'], $item['object_type'])) {
     ?>
-    <?php echo Ajax::button('?page=democratic&action=delete_vote&row_id=' . $item['id'],'delete', T_('Remove Vote'),'remove_vote_' . $item['id']);
+    <?php echo Ajax::button('?page=democratic&action=delete_vote&row_id=' . $item['id'], 'delete', T_('Remove Vote'), 'remove_vote_' . $item['id']);
     ?>
     <?php 
 } else {
     ?>
-    <?php echo Ajax::button('?page=democratic&action=add_vote&object_id=' . $media->id . '&type=' . scrub_out($item['object_type']),'tick', T_('Add Vote'),'remove_vote_' . $item['id']);
+    <?php echo Ajax::button('?page=democratic&action=add_vote&object_id=' . $media->id . '&type=' . scrub_out($item['object_type']), 'tick', T_('Add Vote'), 'remove_vote_' . $item['id']);
     ?>
     <?php 
 }
@@ -116,10 +116,10 @@ $democratic = Democratic::get_current_playlist();
         ?></td>
     <td class="cel_time"><?php echo $media->f_time;
         ?></td>
-    <?php if (Access::check('interface','100')) {
+    <?php if (Access::check('interface', '100')) {
     ?>
     <td class="cel_admin">
-    <?php echo Ajax::button('?page=democratic&action=delete&row_id=' . $item['id'],'disable', T_('Delete'),'delete_row_' . $item['id']);
+    <?php echo Ajax::button('?page=democratic&action=delete&row_id=' . $item['id'], 'disable', T_('Delete'), 'delete_row_' . $item['id']);
     ?>
     </td>
     <?php 
@@ -145,7 +145,7 @@ $democratic = Democratic::get_current_playlist();
     ?></th>
         <th class="cel_time"><?php echo T_('Time');
     ?></th>
-        <?php if (Access::check('interface','100')) {
+        <?php if (Access::check('interface', '100')) {
     ?>
         <th class="cel_admin"><?php echo T_('Admin');
     ?></th>
diff --git a/templates/show_disabled_songs.inc.php b/templates/show_disabled_songs.inc.php
index 71ef0925..34d7507f 100644
--- a/templates/show_disabled_songs.inc.php
+++ b/templates/show_disabled_songs.inc.php
@@ -48,7 +48,7 @@
     ?></td>
                     <td class="cel_filename"><?php echo $song->file;
     ?></td>
-                    <td class="cel_additiontime"><?php echo date("h:i:s, m/d/y",$song->addition_time);
+                    <td class="cel_additiontime"><?php echo date("h:i:s, m/d/y", $song->addition_time);
     ?></td>
                 </tr>
             <?php 
diff --git a/templates/show_duplicates.inc.php b/templates/show_duplicates.inc.php
index ee7cf881..b3de8b66 100644
--- a/templates/show_duplicates.inc.php
+++ b/templates/show_duplicates.inc.php
@@ -51,7 +51,7 @@
                     ?>">
             <td class="cel_disable" id="<?php echo($button_flip_state_id);
                     ?>">
-                <?php echo Ajax::button('?page=song&action=flip_state&song_id=' . $song_id,$button, T_(ucfirst($button)),'flip_state_' . $song_id);
+                <?php echo Ajax::button('?page=song&action=flip_state&song_id=' . $song_id, $button, T_(ucfirst($button)), 'flip_state_' . $song_id);
                     ?>
             </td>
             <td class="cel_song"><?php echo $song->f_link;
diff --git a/templates/show_dynamic.inc.php b/templates/show_dynamic.inc.php
index 76fa77e8..d0e33b8c 100644
--- a/templates/show_dynamic.inc.php
+++ b/templates/show_dynamic.inc.php
@@ -34,7 +34,7 @@
             <?php
                 $fields = Song::get_fields();
                 foreach ($fields as $key=>$value) {
-                    $name = ucfirst(str_replace('_',' ',$key));
+                    $name = ucfirst(str_replace('_', ' ', $key));
                     ?>
                 <option value="<?php echo scrub_out($key);
                     ?>"><?php echo scrub_out($name);
@@ -66,13 +66,13 @@
     </tr>
     <tr>
         <td>
-            <?php echo Ajax::button('?page=random&action=add_rule','add', T_('Add Rule'),'add_random_rule'); ?><?php echo T_('Add Rule'); ?>
+            <?php echo Ajax::button('?page=random&action=add_rule', 'add', T_('Add Rule'), 'add_random_rule'); ?><?php echo T_('Add Rule'); ?>
         </td>
         <td>
-            <?php echo Ajax::button('?page=random&action=save_rules','download', T_('Save Rules As'),'save_random_rules'); ?><?php echo T_('Save Rules As'); ?>
+            <?php echo Ajax::button('?page=random&action=save_rules', 'download', T_('Save Rules As'), 'save_random_rules'); ?><?php echo T_('Save Rules As'); ?>
         </td>
         <td colspan="2">
-            <?php echo Ajax::button('?page=random&action=load_rules','cog', T_('Load Saved Rules'),'load_random_rules'); ?><?php echo T_('Load Saved Rules'); ?>
+            <?php echo Ajax::button('?page=random&action=load_rules', 'cog', T_('Load Saved Rules'), 'load_random_rules'); ?><?php echo T_('Load Saved Rules'); ?>
         </td>
     </tr>
     <tr>
diff --git a/templates/show_edit_access.inc.php b/templates/show_edit_access.inc.php
index 50a47792..c5f9fb54 100644
--- a/templates/show_edit_access.inc.php
+++ b/templates/show_edit_access.inc.php
@@ -59,7 +59,7 @@
         <tr>
             <td><?php echo T_('User'); ?>:</td>
             <td colspan="3">
-                <?php show_user_select('user',$access->user); ?>
+                <?php show_user_select('user', $access->user); ?>
             </td>
         </tr>
         <tr>
diff --git a/templates/show_edit_catalog.inc.php b/templates/show_edit_catalog.inc.php
index 8c84096f..a55a7204 100644
--- a/templates/show_edit_catalog.inc.php
+++ b/templates/show_edit_catalog.inc.php
@@ -20,7 +20,7 @@
  *
  */
 
-UI::show_box_top(sprintf(T_('Settings for %s') , $catalog->name . ' (' . $catalog->f_info . ')'), 'box box_edit_catalog');
+UI::show_box_top(sprintf(T_('Settings for %s'), $catalog->name . ' (' . $catalog->f_info . ')'), 'box box_edit_catalog');
 ?>
 <form method="post" action="<?php echo AmpConfig::get('web_path'); ?>/admin/catalog.php" enctype="multipart/form-data">
     <table class="tabledata" cellspacing="0" cellpadding="0">
diff --git a/templates/show_edit_song_row.inc.php b/templates/show_edit_song_row.inc.php
index 8f20013b..89d93a2e 100644
--- a/templates/show_edit_song_row.inc.php
+++ b/templates/show_edit_song_row.inc.php
@@ -28,7 +28,7 @@
                 <td><input type="text" name="title" value="<?php echo scrub_out($libitem->title); ?>" autofocus /></td>
             </tr>
             <?php
-                if (Access::check('interface','75')) {
+                if (Access::check('interface', '75')) {
                     ?>
                 <tr>
                     <td class="edit_dialog_content_header"><?php echo T_('Artist') ?></td>
diff --git a/templates/show_html5_player.inc.php b/templates/show_html5_player.inc.php
index d2c28404..7a4af056 100644
--- a/templates/show_html5_player.inc.php
+++ b/templates/show_html5_player.inc.php
@@ -160,13 +160,13 @@ if (!$isVideo && !$isRadio && !$is_share) {
         echo "var artistobj = (currenti.attr('data-artist_id') !== 'undefined') ?'<a href=\"javascript:NavigateTo(\'" . AmpConfig::get('web_path') . "/artists.php?action=show&artist=' + currenti.attr('data-artist_id') + '\');\" title=\"' + obj.artist + '\">' + obj.artist + '</a>' : obj.artist;";
         echo "var lyricsobj = '<a href=\"javascript:NavigateTo(\'" . AmpConfig::get('web_path') . "/song.php?action=show_lyrics&song_id=' + currenti.attr('data-media_id') + '\');\">" . T_('Show Lyrics') . "</a>';";
         echo "var actionsobj = '|';";
-        if (AmpConfig::get('sociable') && (!AmpConfig::get('use_auth') || Access::check('interface','25'))) {
+        if (AmpConfig::get('sociable') && (!AmpConfig::get('use_auth') || Access::check('interface', '25'))) {
             echo "actionsobj += ' <a href=\"javascript:NavigateTo(\'" . AmpConfig::get('web_path') . "/shout.php?action=show_add_shout&type=song&id=' + currenti.attr('data-media_id') + '\');\">" . UI::get_icon('comment', T_('Post Shout')) . "</a> |';";
         }
         echo "actionsobj += '<div id=\'action_buttons\'></div>';";
         if (AmpConfig::get('waveform') && !$is_share) {
             echo "var waveformobj = '';";
-            if (AmpConfig::get('sociable') && Access::check('interface','25')) {
+            if (AmpConfig::get('sociable') && Access::check('interface', '25')) {
                 echo "waveformobj += '<a href=\"#\" title=\"" . T_('Double click to post a new shout') . "\" onClick=\"javascript:WaveformClick(' + currenti.attr('data-media_id') + ', ClickTimeOffset(event));\">';";
             }
             echo "waveformobj += '<div class=\"waveform-shouts\"></div>';";
diff --git a/templates/show_install_check.inc.php b/templates/show_install_check.inc.php
index b43fc63e..33ffdfd9 100644
--- a/templates/show_install_check.inc.php
+++ b/templates/show_install_check.inc.php
@@ -33,7 +33,7 @@ require $prefix . '/templates/install_header.inc.php';
             </p>
             <ul>
                 <li><?php echo T_('A MySQL server with a username and password that can create/modify databases'); ?></li>
-                <li><?php echo sprintf(T_('Your webserver has read access to the files %s and %s'),$prefix . '/sql/ampache.sql',$prefix . '/config/ampache.cfg.php.dist'); ?></li>
+                <li><?php echo sprintf(T_('Your webserver has read access to the files %s and %s'), $prefix . '/sql/ampache.sql', $prefix . '/config/ampache.cfg.php.dist'); ?></li>
             </ul>
             <p>
                 <?php echo sprintf(T_("Once you have ensured that the above requirements are met please fill out the information below. You will only be asked for the required config values. If you would like to make changes to your Ampache install at a later date simply edit %s"), $prefix . '/config/ampache.cfg.php'); ?>
diff --git a/templates/show_ip_history.inc.php b/templates/show_ip_history.inc.php
index 3dcaadc9..b6ebe4ae 100644
--- a/templates/show_ip_history.inc.php
+++ b/templates/show_ip_history.inc.php
@@ -58,7 +58,7 @@
 <tr class="<?php echo UI::flip_class();
     ?>">
     <td class="cel_date">
-        <?php echo date("d/m/Y H\hi",$data['date']);
+        <?php echo date("d/m/Y H\hi", $data['date']);
     ?>
     </td>
     <td class="cel_ipaddress">
diff --git a/templates/show_label.inc.php b/templates/show_label.inc.php
index 673162dd..aab022a5 100644
--- a/templates/show_label.inc.php
+++ b/templates/show_label.inc.php
@@ -53,7 +53,7 @@ if ($label->website) {
 <div id="information_actions">
     <h3><?php echo T_('Actions'); ?>:</h3>
     <ul>
-        <?php if (!AmpConfig::get('use_auth') || Access::check('interface','25')) {
+        <?php if (!AmpConfig::get('use_auth') || Access::check('interface', '25')) {
     ?>
             <?php if (AmpConfig::get('sociable')) {
     ?>
@@ -130,7 +130,7 @@ if ($label->website) {
 ?>
         </div>
 <?php
-    echo Ajax::observe('songs_link','click', Ajax::action('?page=index&action=songs&label=' . $label->id, 'songs'));
+    echo Ajax::observe('songs_link', 'click', Ajax::action('?page=index&action=songs&label=' . $label->id, 'songs'));
 ?>
         <div id="songs" class="tab_content">
         <?php UI::show_box_top(T_('Songs'), 'info-box'); echo T_('Loading...'); UI::show_box_bottom(); ?>
diff --git a/templates/show_label_row.inc.php b/templates/show_label_row.inc.php
index 0e5e960d..44118738 100644
--- a/templates/show_label_row.inc.php
+++ b/templates/show_label_row.inc.php
@@ -35,7 +35,7 @@ if (Art::is_enabled()) {
 <td class="cel_category"><?php echo $libitem->category; ?></td>
 <td class="cel_artists"><?php echo $libitem->artists; ?></td>
 <td class="cel_action">
-<?php if (!AmpConfig::get('use_auth') || Access::check('interface','25')) {
+<?php if (!AmpConfig::get('use_auth') || Access::check('interface', '25')) {
     if (AmpConfig::get('sociable')) {
         ?>
     <a href="<?php echo AmpConfig::get('web_path') ?>/shout.php?action=show_add_shout&type=label&amp;id=<?php echo $libitem->id ?>">
diff --git a/templates/show_labels.inc.php b/templates/show_labels.inc.php
index a525a9c3..69e9a288 100644
--- a/templates/show_labels.inc.php
+++ b/templates/show_labels.inc.php
@@ -22,7 +22,7 @@
 
 $thcount = 6;
 ?>
-<?php if (Access::check('interface','50') || AmpConfig::get('upload_allow_edit')) {
+<?php if (Access::check('interface', '50') || AmpConfig::get('upload_allow_edit')) {
     ?>
 <div id="information_actions">
     <ul>
@@ -47,8 +47,8 @@ $thcount = 6;
     ?></th>
             <?php 
 } ?>
-            <th class="cel_label essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=label&sort=name', T_('Label'),'label_sort_name'); ?></th>
-            <th class="cel_category essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=label&sort=category', T_('Category'),'label_sort_category'); ?></th>
+            <th class="cel_label essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=label&sort=name', T_('Label'), 'label_sort_name'); ?></th>
+            <th class="cel_category essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=label&sort=category', T_('Category'), 'label_sort_category'); ?></th>
             <th class="cel_artists optional"><?php echo T_('Artists');  ?></th>
             <th class="cel_action essential"><?php echo T_('Action'); ?></th>
         </tr>
@@ -87,8 +87,8 @@ $thcount = 6;
     ?></th>
             <?php 
 } ?>
-            <th class="cel_label essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=label&sort=name', T_('Label'),'label_sort_name'); ?></th>
-            <th class="cel_category essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=label&sort=category', T_('Category'),'label_sort_category'); ?></th>
+            <th class="cel_label essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=label&sort=name', T_('Label'), 'label_sort_name'); ?></th>
+            <th class="cel_category essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=label&sort=category', T_('Category'), 'label_sort_category'); ?></th>
             <th class="cel_artists optional"><?php echo T_('Artists');  ?></th>
             <th class="cel_action essential"> <?php echo T_('Action'); ?> </th>
         </tr>
diff --git a/templates/show_live_stream.inc.php b/templates/show_live_stream.inc.php
index 7bb64c21..fd534bb3 100644
--- a/templates/show_live_stream.inc.php
+++ b/templates/show_live_stream.inc.php
@@ -35,18 +35,18 @@
     <dd class="<?php echo $rowparity; ?>">
         <?php if (AmpConfig::get('directplay')) {
     ?>
-            <?php echo Ajax::button('?page=stream&action=directplay&object_type=live_stream&object_id=' . $radio->id, 'play', T_('Play'),'play_live_stream_' . $radio->id);
+            <?php echo Ajax::button('?page=stream&action=directplay&object_type=live_stream&object_id=' . $radio->id, 'play', T_('Play'), 'play_live_stream_' . $radio->id);
     ?>
             <?php if (Stream_Playlist::check_autoplay_append()) {
     ?>
-                <?php echo Ajax::button('?page=stream&action=directplay&object_type=live_stream&object_id=' . $radio->id . '&append=true','play_add', T_('Play last'),'addplay_live_stream_' . $radio->id);
+                <?php echo Ajax::button('?page=stream&action=directplay&object_type=live_stream&object_id=' . $radio->id . '&append=true', 'play_add', T_('Play last'), 'addplay_live_stream_' . $radio->id);
     ?>
             <?php 
 }
     ?>
         <?php 
 } ?>
-        <?php echo Ajax::button('?action=basket&type=live_stream&id=' . $radio->id,'add', T_('Add to temporary playlist'),'add_live_stream_' . $radio->id); ?>
+        <?php echo Ajax::button('?action=basket&type=live_stream&id=' . $radio->id, 'add', T_('Add to temporary playlist'), 'add_live_stream_' . $radio->id); ?>
     </dd>
 <?php
     $itemprops[gettext_noop('Name')]     = $radio->f_name;
diff --git a/templates/show_live_stream_row.inc.php b/templates/show_live_stream_row.inc.php
index 605b0c6f..0760d93d 100644
--- a/templates/show_live_stream_row.inc.php
+++ b/templates/show_live_stream_row.inc.php
@@ -25,7 +25,7 @@
     <div class="cel_play_hover">
     <?php
         if (AmpConfig::get('directplay')) {
-            echo Ajax::button('?page=stream&action=directplay&object_type=live_stream&object_id=' . $libitem->id, 'play', T_('Play live stream'),'play_live_stream_' . $libitem->id);
+            echo Ajax::button('?page=stream&action=directplay&object_type=live_stream&object_id=' . $libitem->id, 'play', T_('Play live stream'), 'play_live_stream_' . $libitem->id);
         }
     ?>
     </div>
@@ -41,7 +41,7 @@
 <td class="cel_codec"><?php echo $libitem->codec; ?></td>
 <td class="cel_action">
     <?php
-        if (Access::check('interface','50')) {
+        if (Access::check('interface', '50')) {
             ?>
         <a id="<?php echo 'edit_live_stream_' . $libitem->id ?>" onclick="showEditDialog('live_stream_row', '<?php echo $libitem->id ?>', '<?php echo 'edit_live_stream_' . $libitem->id ?>', '<?php echo T_('Live Stream edit') ?>',  'live_stream_')">
             <?php echo UI::get_icon('edit', T_('Edit'));
@@ -49,8 +49,8 @@
         </a>
         <?php 
         }
-        if (Access::check('interface','75')) {
-            echo Ajax::button('?page=browse&action=delete_object&type=live_stream&id=' . $libitem->id,'delete', T_('Delete'),'delete_live_stream_' . $libitem->id);
+        if (Access::check('interface', '75')) {
+            echo Ajax::button('?page=browse&action=delete_object&type=live_stream&id=' . $libitem->id, 'delete', T_('Delete'), 'delete_live_stream_' . $libitem->id);
         }
     ?>
 </td>
diff --git a/templates/show_live_streams.inc.php b/templates/show_live_streams.inc.php
index 75edf45c..db9c4cfc 100644
--- a/templates/show_live_streams.inc.php
+++ b/templates/show_live_streams.inc.php
@@ -22,7 +22,7 @@
 ?>
 <?php if (Access::check('interface', '50')) {
     ?>
-<?php UI::show_box_top(T_('Manage Radio Stations'),'info-box');
+<?php UI::show_box_top(T_('Manage Radio Stations'), 'info-box');
     ?>
 <div id="information_actions">
 <ul>
@@ -46,9 +46,9 @@
         <tr class="th-top">
             <th class="cel_play essential"></th>
             <th class="cel_cover optional"><?php echo T_('Art') ?></th>
-            <th class="cel_streamname essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=name', T_('Name'),'live_stream_sort_name'); ?></th>
+            <th class="cel_streamname essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=name', T_('Name'), 'live_stream_sort_name'); ?></th>
             <th class="cel_streamurl optional"><?php echo T_('Stream URL'); ?></th>
-            <th class="cel_codec optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=codec', T_('Codec'),'live_stream_codec');  ?></th>
+            <th class="cel_codec optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=codec', T_('Codec'), 'live_stream_codec');  ?></th>
             <th class="cel_action essential"><?php echo T_('Action'); ?></th>
         </tr>
     </thead>
@@ -79,9 +79,9 @@
         <tr class="th-bottom">
             <th class="cel_play"></th>
             <th class="cel_cover"><?php echo T_('Art') ?></th>
-            <th class="cel_streamname"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=name', T_('Name'),'live_stream_sort_name'); ?></th>
+            <th class="cel_streamname"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=name', T_('Name'), 'live_stream_sort_name'); ?></th>
             <th class="cel_streamurl"><?php echo T_('Stream URL'); ?></th>
-            <th class="cel_codec"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=codec', T_('Codec'),'live_stream_codec_bottom');  ?></th>
+            <th class="cel_codec"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=codec', T_('Codec'), 'live_stream_codec_bottom');  ?></th>
             <th class="cel_action"><?php echo T_('Action'); ?> </th>
         </tr>
     </tfoot>
diff --git a/templates/show_localplay_control.inc.php b/templates/show_localplay_control.inc.php
index 5b4ea5d5..62397bc6 100644
--- a/templates/show_localplay_control.inc.php
+++ b/templates/show_localplay_control.inc.php
@@ -21,9 +21,9 @@
  */
 ?>
 <div id="localplay-control">
-<?php echo Ajax::button('?page=localplay&action=command&command=prev','prev', T_('Previous'),'localplay_control_previous'); ?>
-<?php echo Ajax::button('?page=localplay&action=command&command=stop','stop', T_('Stop'),'localplay_control_stop'); ?>
-<?php echo Ajax::button('?page=localplay&action=command&command=pause','pause', T_('Pause'),'localplay_control_pause'); ?>
-<?php echo Ajax::button('?page=localplay&action=command&command=play','play', T_('Play'),'localplay_control_play'); ?>
-<?php echo Ajax::button('?page=localplay&action=command&command=next','next', T_('Next'),'localplay_control_next'); ?>
+<?php echo Ajax::button('?page=localplay&action=command&command=prev', 'prev', T_('Previous'), 'localplay_control_previous'); ?>
+<?php echo Ajax::button('?page=localplay&action=command&command=stop', 'stop', T_('Stop'), 'localplay_control_stop'); ?>
+<?php echo Ajax::button('?page=localplay&action=command&command=pause', 'pause', T_('Pause'), 'localplay_control_pause'); ?>
+<?php echo Ajax::button('?page=localplay&action=command&command=play', 'play', T_('Play'), 'localplay_control_play'); ?>
+<?php echo Ajax::button('?page=localplay&action=command&command=next', 'next', T_('Next'), 'localplay_control_next'); ?>
 </div>
diff --git a/templates/show_localplay_instances.inc.php b/templates/show_localplay_instances.inc.php
index 61d9d9cc..c374a4d6 100644
--- a/templates/show_localplay_instances.inc.php
+++ b/templates/show_localplay_instances.inc.php
@@ -56,7 +56,7 @@
     ?>/localplay.php?action=edit_instance&instance=<?php echo $uid;
     ?>"><?php echo UI::get_icon('edit', T_('Edit Instance'));
     ?></a>
-        <?php echo Ajax::button('?page=localplay&action=delete_instance&instance=' . $uid,'delete', T_('Delete'),'delete_instance_' . $uid);
+        <?php echo Ajax::button('?page=localplay&action=delete_instance&instance=' . $uid, 'delete', T_('Delete'), 'delete_instance_' . $uid);
     ?>
     </td>
 </tr>
diff --git a/templates/show_localplay_playlist.inc.php b/templates/show_localplay_playlist.inc.php
index 460de4aa..5700d611 100644
--- a/templates/show_localplay_playlist.inc.php
+++ b/templates/show_localplay_playlist.inc.php
@@ -52,11 +52,11 @@ $status = $localplay->status();
             </td>
             <td<?php echo $class;
             ?>>
-                <?php echo $localplay->format_name($object['name'],$object['id']);
+                <?php echo $localplay->format_name($object['name'], $object['id']);
             ?>
             </td>
             <td class="cel_action">
-            <?php echo Ajax::button('?page=localplay&action=delete_track&id=' . intval($object['id']),'delete', T_('Delete'),'localplay_delete_' . intval($object['id']));
+            <?php echo Ajax::button('?page=localplay&action=delete_track&id=' . intval($object['id']), 'delete', T_('Delete'), 'localplay_delete_' . intval($object['id']));
             ?>
             </td>
         </tr>
diff --git a/templates/show_localplay_status.inc.php b/templates/show_localplay_status.inc.php
index 13c8ecbf..2c731792 100644
--- a/templates/show_localplay_status.inc.php
+++ b/templates/show_localplay_status.inc.php
@@ -32,9 +32,9 @@ if (!empty($status['track_album'])) {
 <div id="information_actions">
     <ul>
         <li>
-        <?php echo Ajax::button('?page=localplay&action=command&command=volume_mute','volumemute', T_('Mute'),'localplay_mute'); ?>
-        <?php echo Ajax::button('?page=localplay&action=command&command=volume_down','volumedn', T_('Decrease Volume'),'localplay_volume_dn'); ?>
-        <?php echo Ajax::button('?page=localplay&action=command&command=volume_up','volumeup', T_('Increase Volume'),'localplay_volume_up'); ?>
+        <?php echo Ajax::button('?page=localplay&action=command&command=volume_mute', 'volumemute', T_('Mute'), 'localplay_mute'); ?>
+        <?php echo Ajax::button('?page=localplay&action=command&command=volume_down', 'volumedn', T_('Decrease Volume'), 'localplay_volume_dn'); ?>
+        <?php echo Ajax::button('?page=localplay&action=command&command=volume_up', 'volumeup', T_('Increase Volume'), 'localplay_volume_up'); ?>
         <?php echo T_('Volume'); ?>:<?php echo $status['volume']; ?>%
         </li>
         <li>
@@ -48,7 +48,7 @@ if (!empty($status['track_album'])) {
             <?php echo T_('Random'); ?>
         </li>
         <li>
-            <?php echo Ajax::button('?page=localplay&action=command&command=delete_all','delete', T_('Clear Playlist'),'localplay_clear_all'); ?><?php echo T_('Clear Playlist'); ?>
+            <?php echo Ajax::button('?page=localplay&action=command&command=delete_all', 'delete', T_('Clear Playlist'), 'localplay_clear_all'); ?><?php echo T_('Clear Playlist'); ?>
         </li>
     </ul>
 </div>
diff --git a/templates/show_login_form.inc.php b/templates/show_login_form.inc.php
index b5d667d6..e28c57b9 100644
--- a/templates/show_login_form.inc.php
+++ b/templates/show_login_form.inc.php
@@ -27,7 +27,7 @@ $remember_disabled = '';
 if (AmpConfig::get('session_length') >= AmpConfig::get('remember_length')) {
     $remember_disabled = 'disabled="disabled"';
 }
-$htmllang                             = str_replace("_","-",AmpConfig::get('lang'));
+$htmllang                             = str_replace("_", "-", AmpConfig::get('lang'));
 is_rtl(AmpConfig::get('lang')) ? $dir = 'rtl' : $dir = 'ltr';
 
 $web_path = AmpConfig::get('web_path');
diff --git a/templates/show_lostpassword_form.inc.php b/templates/show_lostpassword_form.inc.php
index db55945f..d881d667 100644
--- a/templates/show_lostpassword_form.inc.php
+++ b/templates/show_lostpassword_form.inc.php
@@ -26,7 +26,7 @@
 if (AmpConfig::get('session_length') >= AmpConfig::get('remember_length')) {
     $remember_disabled = 'disabled="disabled"';
 }
-$htmllang                             = str_replace("_","-",AmpConfig::get('lang'));
+$htmllang                             = str_replace("_", "-", AmpConfig::get('lang'));
 is_rtl(AmpConfig::get('lang')) ? $dir = 'rtl' : $dir = 'ltr';
 
 $web_path = AmpConfig::get('web_path');
diff --git a/templates/show_lyrics.inc.php b/templates/show_lyrics.inc.php
index 09feff76..3ca6b99b 100644
--- a/templates/show_lyrics.inc.php
+++ b/templates/show_lyrics.inc.php
@@ -21,7 +21,7 @@
  */
 
  $web_path = AmpConfig::get('web_path');
-UI::show_box_top("Song Lyrics" , 'box box_lyrics_song');
+UI::show_box_top("Song Lyrics", 'box box_lyrics_song');
 
 /* Prepare the variables */
 $title  = scrub_out($song->title);
diff --git a/templates/show_manage_catalogs.inc.php b/templates/show_manage_catalogs.inc.php
index 317c6bbc..01279e7c 100644
--- a/templates/show_manage_catalogs.inc.php
+++ b/templates/show_manage_catalogs.inc.php
@@ -48,11 +48,11 @@
     <form style="padding-left: 250px;" method="post" action="<?php echo AmpConfig::get('web_path'); ?>/admin/catalog.php?action=update_from">
         <table class="tabledata2" cellspacing="0" cellpadding="0">
             <tr>
-                <td><?php /* HINT: /data/myNewMusic */ ?><?php printf (T_('Add from [%s]'), '<span class="information">/data/myNewMusic</span>'); ?></td>
+                <td><?php /* HINT: /data/myNewMusic */ ?><?php printf(T_('Add from [%s]'), '<span class="information">/data/myNewMusic</span>'); ?></td>
                 <td><input type="text" name="add_path" value="/" /></td>
             </tr>
             <tr>
-                <td><?php /* HINT: /data/myUpdatedMusic */ ?><?php printf (T_('Update from [%s]'), '<span class="information">/data/myUpdatedMusic</span>'); ?></td>
+                <td><?php /* HINT: /data/myUpdatedMusic */ ?><?php printf(T_('Update from [%s]'), '<span class="information">/data/myUpdatedMusic</span>'); ?></td>
                 <td><input type="text" name="update_path" value="/" /></td>
             </tr>
             <tr>
diff --git a/templates/show_manage_democratic.inc.php b/templates/show_manage_democratic.inc.php
index 8a45de72..c4ab5140 100644
--- a/templates/show_manage_democratic.inc.php
+++ b/templates/show_manage_democratic.inc.php
@@ -53,7 +53,7 @@ UI::show_box_top(T_('Manage Democratic Playlists'));  ?>
         <td><?php echo $democratic->count_items();
             ?></td>
         <td>
-        <?php echo Ajax::button('?page=democratic&action=send_playlist&democratic_id=' . $democratic->id,'all', T_('Play'),'play_democratic');
+        <?php echo Ajax::button('?page=democratic&action=send_playlist&democratic_id=' . $democratic->id, 'all', T_('Play'), 'play_democratic');
             ?>
         <a href="<?php echo AmpConfig::get('web_path');
             ?>/democratic.php?action=delete&amp;democratic_id=<?php echo scrub_out($democratic->id);
diff --git a/templates/show_missing_album.inc.php b/templates/show_missing_album.inc.php
index 144dd36c..73327ac8 100644
--- a/templates/show_missing_album.inc.php
+++ b/templates/show_missing_album.inc.php
@@ -26,7 +26,7 @@ $web_path = AmpConfig::get('web_path');
 $title = scrub_out($walbum->name) . '&nbsp;(' . $walbum->year . ')';
 $title .= '&nbsp;-&nbsp;' . $walbum->f_artist_link;
 ?>
-<?php UI::show_box_top($title,'info-box missing'); ?>
+<?php UI::show_box_top($title, 'info-box missing'); ?>
 <div class="item_art">
 <?php
 // Attempt to find the art.
diff --git a/templates/show_now_playing_row.inc.php b/templates/show_now_playing_row.inc.php
index ab3c76be..5045e535 100644
--- a/templates/show_now_playing_row.inc.php
+++ b/templates/show_now_playing_row.inc.php
@@ -119,7 +119,7 @@ $(document).ready(function(){
             ?></label>
                 <div id="rating_<?php echo $media->id;
             ?>_song">
-                    <?php Rating::show($media->id,'song');
+                    <?php Rating::show($media->id, 'song');
             ?>
                 </div>
             </div>
@@ -132,7 +132,7 @@ $(document).ready(function(){
             ?></label>
                 <div id="userflag_<?php echo $media->id;
             ?>_song">
-                    <?php Userflag::show($media->id,'song');
+                    <?php Userflag::show($media->id, 'song');
             ?>
                 </div>
             </div>
diff --git a/templates/show_now_playing_video_row.inc.php b/templates/show_now_playing_video_row.inc.php
index 0b883598..b8983b42 100644
--- a/templates/show_now_playing_video_row.inc.php
+++ b/templates/show_now_playing_video_row.inc.php
@@ -76,7 +76,7 @@ $media->format();
         ?></label>
             <div id="userflag_<?php echo $media->id;
         ?>_video">
-                <?php Userflag::show($media->id,'video');
+                <?php Userflag::show($media->id, 'video');
         ?>
             </div>
         </div>
diff --git a/templates/show_partial_clips.inc.php b/templates/show_partial_clips.inc.php
index a7d08046..48619c34 100644
--- a/templates/show_partial_clips.inc.php
+++ b/templates/show_partial_clips.inc.php
@@ -20,4 +20,4 @@
  *
  */
 ?>
-<th class="cel_artist optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=clip&sort=artist', T_('Artist'),'sort_video_artist'); ?></th>
+<th class="cel_artist optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=clip&sort=artist', T_('Artist'), 'sort_video_artist'); ?></th>
diff --git a/templates/show_partial_movies.inc.php b/templates/show_partial_movies.inc.php
index 1fc99b03..8644e87a 100644
--- a/templates/show_partial_movies.inc.php
+++ b/templates/show_partial_movies.inc.php
@@ -21,4 +21,4 @@
  */
 
 ?>
-<th class="cel_year optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=movie&sort=year', T_('Year'),'sort_video_year'); ?></th>
+<th class="cel_year optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=movie&sort=year', T_('Year'), 'sort_video_year'); ?></th>
diff --git a/templates/show_partial_personal_videos.inc.php b/templates/show_partial_personal_videos.inc.php
index b8ed9fb8..5bb1d64a 100644
--- a/templates/show_partial_personal_videos.inc.php
+++ b/templates/show_partial_personal_videos.inc.php
@@ -20,4 +20,4 @@
  *
  */
 ?>
-<th class="cel_location optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=personal_video&sort=location', T_('Location'),'sort_video_location'); ?></th>
+<th class="cel_location optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=personal_video&sort=location', T_('Location'), 'sort_video_location'); ?></th>
diff --git a/templates/show_partial_tvshow_episodes.inc.php b/templates/show_partial_tvshow_episodes.inc.php
index 115eb9b9..f4994257 100644
--- a/templates/show_partial_tvshow_episodes.inc.php
+++ b/templates/show_partial_tvshow_episodes.inc.php
@@ -20,6 +20,6 @@
  *
  */
 ?>
-<th class="cel_episode optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=tvshow_episode&sort=episode', T_('Episode'),'sort_video_episode'); ?></th>
-<th class="cel_season optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=tvshow_episode&sort=season', T_('Season'),'sort_video_season'); ?></th>
-<th class="cel_tvshow optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=tvshow_episode&sort=tvshow', T_('TV Show'),'sort_video_tvshow'); ?></th>
+<th class="cel_episode optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=tvshow_episode&sort=episode', T_('Episode'), 'sort_video_episode'); ?></th>
+<th class="cel_season optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=tvshow_episode&sort=season', T_('Season'), 'sort_video_season'); ?></th>
+<th class="cel_tvshow optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=tvshow_episode&sort=tvshow', T_('TV Show'), 'sort_video_tvshow'); ?></th>
diff --git a/templates/show_playlist.inc.php b/templates/show_playlist.inc.php
index 4da88916..9c219fe6 100644
--- a/templates/show_playlist.inc.php
+++ b/templates/show_playlist.inc.php
@@ -39,23 +39,23 @@ UI::show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title . '</d
     ?>
     <div style="display:table-cell;" id="rating_<?php echo $playlist->id;
     ?>_playlist">
-            <?php Rating::show($playlist->id,'playlist');
+            <?php Rating::show($playlist->id, 'playlist');
     ?>
     </div>
-    <?php 
+    <?php
 }
     ?>
     <?php if (AmpConfig::get('userflags')) {
     ?>
     <div style="display:table-cell;" id="userflag_<?php echo $playlist->id;
     ?>_playlist">
-            <?php Userflag::show($playlist->id,'playlist');
+            <?php Userflag::show($playlist->id, 'playlist');
     ?>
     </div>
-    <?php 
+    <?php
 }
     ?>
-<?php 
+<?php
 } ?>
 <div id="information_actions">
     <ul>
@@ -89,7 +89,7 @@ UI::show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title . '</d
             &nbsp;&nbsp;<?php echo T_('Remove duplicates');
     ?></a>
         </li>
-    <?php 
+    <?php
 } ?>
     <?php if (Access::check_function('batch_download') && check_can_zip('playlist')) {
     ?>
@@ -103,35 +103,35 @@ UI::show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title . '</d
     ?>
             </a>
         </li>
-    <?php 
+    <?php
 } ?>
     <?php if (AmpConfig::get('directplay')) {
     ?>
         <li>
-            <?php echo Ajax::button('?page=stream&action=directplay&object_type=playlist&object_id=' . $playlist->id,'play', T_('Play all'),'directplay_full_' . $playlist->id);
+            <?php echo Ajax::button('?page=stream&action=directplay&object_type=playlist&object_id=' . $playlist->id, 'play', T_('Play all'), 'directplay_full_' . $playlist->id);
     ?>
-            <?php echo Ajax::text('?page=stream&action=directplay&object_type=playlist&object_id=' . $playlist->id, T_('Play all'),'directplay_full_text_' . $playlist->id);
+            <?php echo Ajax::text('?page=stream&action=directplay&object_type=playlist&object_id=' . $playlist->id, T_('Play all'), 'directplay_full_text_' . $playlist->id);
     ?>
         </li>
-    <?php 
+    <?php
 } ?>
     <?php if (Stream_Playlist::check_autoplay_append()) {
     ?>
         <li>
-            <?php echo Ajax::button('?page=stream&action=directplay&object_type=playlist&object_id=' . $playlist->id . '&append=true','play_add', T_('Play all last'),'addplay_playlist_' . $playlist->id);
+            <?php echo Ajax::button('?page=stream&action=directplay&object_type=playlist&object_id=' . $playlist->id . '&append=true', 'play_add', T_('Play all last'), 'addplay_playlist_' . $playlist->id);
     ?>
-            <?php echo Ajax::text('?page=stream&action=directplay&object_type=playlist&object_id=' . $playlist->id . '&append=true', T_('Play all last'),'addplay_playlist_text_' . $playlist->id);
+            <?php echo Ajax::text('?page=stream&action=directplay&object_type=playlist&object_id=' . $playlist->id . '&append=true', T_('Play all last'), 'addplay_playlist_text_' . $playlist->id);
     ?>
         </li>
-    <?php 
+    <?php
 } ?>
         <li>
-            <?php echo Ajax::button('?action=basket&type=playlist&id=' . $playlist->id,'add', T_('Add all to temporary playlist'),'play_playlist'); ?>
-            <?php echo Ajax::text('?action=basket&type=playlist&id=' . $playlist->id, T_('Add all to temporary playlist'),'play_playlist_text'); ?>
+            <?php echo Ajax::button('?action=basket&type=playlist&id=' . $playlist->id, 'add', T_('Add all to temporary playlist'), 'play_playlist'); ?>
+            <?php echo Ajax::text('?action=basket&type=playlist&id=' . $playlist->id, T_('Add all to temporary playlist'), 'play_playlist_text'); ?>
         </li>
         <li>
-            <?php echo Ajax::button('?action=basket&type=playlist_random&id=' . $playlist->id,'random', T_('Random all to temporary playlist'),'play_playlist_random'); ?>
-            <?php echo Ajax::text('?action=basket&type=playlist_random&id=' . $playlist->id, T_('Random all to temporary playlist'),'play_playlist_random_text'); ?>
+            <?php echo Ajax::button('?action=basket&type=playlist_random&id=' . $playlist->id, 'random', T_('Random all to temporary playlist'), 'play_playlist_random'); ?>
+            <?php echo Ajax::text('?action=basket&type=playlist_random&id=' . $playlist->id, T_('Random all to temporary playlist'), 'play_playlist_random_text'); ?>
         </li>
     <?php if ($GLOBALS['user']->has_access('50') && AmpConfig::get('channel')) {
     ?>
@@ -145,7 +145,7 @@ UI::show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title . '</d
     ?>
             </a>
         </li>
-    <?php 
+    <?php
 } ?>
     <?php if ($playlist->has_access()) {
     ?>
@@ -160,7 +160,7 @@ UI::show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title . '</d
     ?>
             </a>
         </li>
-    <?php 
+    <?php
 } ?>
     </ul>
 </div>
diff --git a/templates/show_playlist_media_row.inc.php b/templates/show_playlist_media_row.inc.php
index 815c326f..ca8ff58d 100644
--- a/templates/show_playlist_media_row.inc.php
+++ b/templates/show_playlist_media_row.inc.php
@@ -21,16 +21,16 @@
  */
 
 // Don't show disabled medias to normal users
-if (!isset($libitem->enabled) || $libitem->enabled || Access::check('interface','50')) {
+if (!isset($libitem->enabled) || $libitem->enabled || Access::check('interface', '50')) {
     ?>
 <td class="cel_play">
     <span class="cel_play_content"><?php echo '<b>' . $playlist_track . '</b>' ?></span>
     <div class="cel_play_hover">
     <?php
     if (AmpConfig::get('directplay')) {
-        echo Ajax::button('?page=stream&action=directplay&object_type=' . $object_type . '&object_id=' . $libitem->id, 'play', T_('Play'),'play_playlist_' . $object_type . '_' . $libitem->id);
+        echo Ajax::button('?page=stream&action=directplay&object_type=' . $object_type . '&object_id=' . $libitem->id, 'play', T_('Play'), 'play_playlist_' . $object_type . '_' . $libitem->id);
         if (Stream_Playlist::check_autoplay_append()) {
-            echo Ajax::button('?page=stream&action=directplay&object_type=' . $object_type . '&object_id=' . $libitem->id . '&append=true','play_add', T_('Play last'),'addplay_' . $object_type . '_' . $libitem->id);
+            echo Ajax::button('?page=stream&action=directplay&object_type=' . $object_type . '&object_id=' . $libitem->id . '&append=true', 'play_add', T_('Play last'), 'addplay_' . $object_type . '_' . $libitem->id);
         }
     }
     ?>
@@ -50,7 +50,7 @@ if (!isset($libitem->enabled) || $libitem->enabled || Access::check('interface',
 <td class="cel_title"><?php echo $libitem->f_link ?></td>
 <td class="cel_add">
     <span class="cel_item_add">
-        <?php echo Ajax::button('?action=basket&type=' . $object_type . '&id=' . $libitem->id,'add', T_('Add to temporary playlist'),'playlist_add_' . $libitem->id);
+        <?php echo Ajax::button('?action=basket&type=' . $object_type . '&id=' . $libitem->id, 'add', T_('Add to temporary playlist'), 'playlist_add_' . $libitem->id);
     if (Access::check('interface', '25')) {
         ?>
             <a id="<?php echo 'add_playlist_' . $libitem->id ?>" onclick="showPlaylistDialog(event, '<?php echo $object_type ?>', '<?php echo $libitem->id ?>')">
@@ -65,12 +65,12 @@ if (!isset($libitem->enabled) || $libitem->enabled || Access::check('interface',
 <?php if (User::is_registered()) {
     if (AmpConfig::get('ratings')) {
         ?>
-    <td class="cel_rating" id="rating_<?php echo $libitem->id ?>_<?php echo $object_type ?>"><?php Rating::show($libitem->id,$object_type) ?></td>
+    <td class="cel_rating" id="rating_<?php echo $libitem->id ?>_<?php echo $object_type ?>"><?php Rating::show($libitem->id, $object_type) ?></td>
     <?php 
     }
     if (AmpConfig::get('userflags')) {
         ?>
-    <td class="cel_userflag" id="userflag_<?php echo $libitem->id ?>_<?php echo $object_type ?>"><?php Userflag::show($libitem->id,$object_type) ?></td>
+    <td class="cel_userflag" id="userflag_<?php echo $libitem->id ?>_<?php echo $object_type ?>"><?php Userflag::show($libitem->id, $object_type) ?></td>
     <?php 
     }
 }
@@ -89,7 +89,7 @@ if (!isset($libitem->enabled) || $libitem->enabled || Access::check('interface',
         }
     }
     if (get_class($playlist) == "Playlist" && $playlist->has_access()) {
-        echo Ajax::button('?page=playlist&action=delete_track&playlist_id=' . $playlist->id . '&track_id=' . $object['track_id'],'delete', T_('Delete'),'track_del_' . $object['track_id']);
+        echo Ajax::button('?page=playlist&action=delete_track&playlist_id=' . $playlist->id . '&track_id=' . $object['track_id'], 'delete', T_('Delete'), 'track_del_' . $object['track_id']);
     }
     ?>
 </td>
diff --git a/templates/show_playlist_row.inc.php b/templates/show_playlist_row.inc.php
index e3fcf479..f9e3056c 100644
--- a/templates/show_playlist_row.inc.php
+++ b/templates/show_playlist_row.inc.php
@@ -25,11 +25,11 @@
     <div class="cel_play_hover">
     <?php
         if (AmpConfig::get('directplay')) {
-            echo Ajax::button('?page=stream&action=directplay&object_type=playlist&object_id=' . $libitem->id,'play', T_('Play'),'play_playlist_' . $libitem->id);
+            echo Ajax::button('?page=stream&action=directplay&object_type=playlist&object_id=' . $libitem->id, 'play', T_('Play'), 'play_playlist_' . $libitem->id);
             if (Stream_Playlist::check_autoplay_next()) {
                 echo Ajax::button('?page=stream&action=directplay&object_type=playlist&object_id=' . $libitem->id . '&playnext=true', 'play_next', T_('Play next'), 'nextplay_playlist_' . $libitem->id);
                 if (Stream_Playlist::check_autoplay_append()) {
-                    echo Ajax::button('?page=stream&action=directplay&object_type=playlist&object_id=' . $libitem->id . '&append=true','play_add', T_('Play last'),'addplay_playlist_' . $libitem->id);
+                    echo Ajax::button('?page=stream&action=directplay&object_type=playlist&object_id=' . $libitem->id . '&append=true', 'play_add', T_('Play last'), 'addplay_playlist_' . $libitem->id);
                 }
             }
         }
@@ -49,9 +49,9 @@
 <td class="cel_add">
     <span class="cel_item_add">
         <?php
-            echo Ajax::button('?action=basket&type=playlist&id=' . $libitem->id,'add', T_('Add to temporary playlist'),'add_playlist_' . $libitem->id);
+            echo Ajax::button('?action=basket&type=playlist&id=' . $libitem->id, 'add', T_('Add to temporary playlist'), 'add_playlist_' . $libitem->id);
             if (Access::check('interface', '25')) {
-                echo Ajax::button('?action=basket&type=playlist_random&id=' . $libitem->id,'random', T_('Random to temporary playlist'),'random_playlist_' . $libitem->id);
+                echo Ajax::button('?action=basket&type=playlist_random&id=' . $libitem->id, 'random', T_('Random to temporary playlist'), 'random_playlist_' . $libitem->id);
                 ?>
             <a id="<?php echo 'add_playlist_' . $libitem->id ?>" onclick="showPlaylistDialog(event, 'playlist', '<?php echo $libitem->id ?>')">
                 <?php echo UI::get_icon('playlist_add', T_('Add to existing playlist'));
diff --git a/templates/show_playlists.inc.php b/templates/show_playlists.inc.php
index cf01afb8..8218e4f5 100644
--- a/templates/show_playlists.inc.php
+++ b/templates/show_playlists.inc.php
@@ -32,12 +32,12 @@
             <th class="cel_cover optional"><?php echo T_('Art') ?></th>
             <?php 
 } ?>
-            <th class="cel_playlist essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=playlist&sort=name', T_('Playlist Name'),'playlist_sort_name'); ?></th>
+            <th class="cel_playlist essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=playlist&sort=name', T_('Playlist Name'), 'playlist_sort_name'); ?></th>
             <th class="cel_add essential"></th>
-            <th class="cel_last_update optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=playlist&sort=last_update', T_('Last Update'),'playlist_sort_last_update'); ?></th>
+            <th class="cel_last_update optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=playlist&sort=last_update', T_('Last Update'), 'playlist_sort_last_update'); ?></th>
             <th class="cel_type optional"><?php echo T_('Type'); ?></th>
             <th class="cel_medias optional"><?php echo T_('# Medias'); ?></th>
-            <th class="cel_owner optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=playlist&sort=user', T_('Owner'),'playlist_sort_owner'); ?></th>
+            <th class="cel_owner optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=playlist&sort=user', T_('Owner'), 'playlist_sort_owner'); ?></th>
             <?php if (User::is_registered()) {
     ?>
                 <?php if (AmpConfig::get('ratings')) {
@@ -66,7 +66,7 @@
             $libitem->format();
             
             // Don't show empty playlist if not admin or the owner
-            if (Access::check('interface','100') || $libitem->get_user_owner() == $GLOBALS['user']->id || $libitem->get_media_count() > 0) {
+            if (Access::check('interface', '100') || $libitem->get_user_owner() == $GLOBALS['user']->id || $libitem->get_media_count() > 0) {
                 ?>
         <tr class="<?php echo UI::flip_class();
                 ?>" id="playlist_row_<?php echo $libitem->id;
@@ -96,12 +96,12 @@
             <th class="cel_cover"><?php echo T_('Art') ?></th>
             <?php 
 } ?>
-            <th class="cel_playlist essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=playlist&sort=name', T_('Playlist Name'),'playlist_sort_name'); ?></th>
+            <th class="cel_playlist essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=playlist&sort=name', T_('Playlist Name'), 'playlist_sort_name'); ?></th>
             <th class="cel_add essential"></th>
-            <th class="cel_last_update"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=playlist&sort=last_update', T_('Last Update'),'playlist_sort_last_update_bottom'); ?></th>
+            <th class="cel_last_update"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=playlist&sort=last_update', T_('Last Update'), 'playlist_sort_last_update_bottom'); ?></th>
             <th class="cel_type optional"><?php echo T_('Type'); ?></th>
             <th class="cel_medias optional"><?php echo T_('# Medias'); ?></th>
-            <th class="cel_owner optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=playlist&sort=user', T_('Owner'),'playlist_sort_owner_bottom'); ?></th>
+            <th class="cel_owner optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=playlist&sort=user', T_('Owner'), 'playlist_sort_owner_bottom'); ?></th>
             <?php if (User::is_registered()) {
     ?>
                 <?php if (AmpConfig::get('ratings')) {
diff --git a/templates/show_playtype_switch.inc.php b/templates/show_playtype_switch.inc.php
index 83f36897..fecff968 100644
--- a/templates/show_playtype_switch.inc.php
+++ b/templates/show_playtype_switch.inc.php
@@ -63,7 +63,7 @@ if (Preference::has_access('play_type')) {
     ?>><?php echo T_('Web Player');
     ?></option>
         </select>
-        <?php echo Ajax::observe('play_type_select','change',Ajax::action('?page=stream&action=set_play_type','play_type_select','play_type_form'));
+        <?php echo Ajax::observe('play_type_select', 'change', Ajax::action('?page=stream&action=set_play_type', 'play_type_select', 'play_type_form'));
     ?>
     </form>
 <?php
diff --git a/templates/show_podcast.inc.php b/templates/show_podcast.inc.php
index 70152bd9..100f33f9 100644
--- a/templates/show_podcast.inc.php
+++ b/templates/show_podcast.inc.php
@@ -56,7 +56,7 @@ UI::show_box_top($podcast->f_title, 'info-box');
     ?>
     <div style="display:table-cell;" id="userflag_<?php echo $podcast->id;
     ?>_podcast">
-            <?php Userflag::show($podcast->id,'podcast');
+            <?php Userflag::show($podcast->id, 'podcast');
     ?>
     </div>
     <?php 
@@ -70,9 +70,9 @@ UI::show_box_top($podcast->f_title, 'info-box');
         <?php if (AmpConfig::get('directplay')) {
     ?>
         <li>
-            <?php echo Ajax::button('?page=stream&action=directplay&object_type=podcast&object_id=' . $podcast->id,'play', T_('Play all'),'directplay_full_' . $podcast->id);
+            <?php echo Ajax::button('?page=stream&action=directplay&object_type=podcast&object_id=' . $podcast->id, 'play', T_('Play all'), 'directplay_full_' . $podcast->id);
     ?>
-            <?php echo Ajax::text('?page=stream&action=directplay&object_type=podcast&object_id=' . $podcast->id, T_('Play all'),'directplay_full_text_' . $podcast->id);
+            <?php echo Ajax::text('?page=stream&action=directplay&object_type=podcast&object_id=' . $podcast->id, T_('Play all'), 'directplay_full_text_' . $podcast->id);
     ?>
         </li>
         <?php 
@@ -80,14 +80,14 @@ UI::show_box_top($podcast->f_title, 'info-box');
         <?php if (Stream_Playlist::check_autoplay_append()) {
     ?>
         <li>
-            <?php echo Ajax::button('?page=stream&action=directplay&object_type=podcast&object_id=' . $podcast->id . '&append=true','play_add', T_('Play all last'),'addplay_podcast_' . $podcast->id);
+            <?php echo Ajax::button('?page=stream&action=directplay&object_type=podcast&object_id=' . $podcast->id . '&append=true', 'play_add', T_('Play all last'), 'addplay_podcast_' . $podcast->id);
     ?>
-            <?php echo Ajax::text('?page=stream&action=directplay&object_type=podcast&object_id=' . $podcast->id . '&append=true', T_('Play all last'),'addplay_podcast_text_' . $podcast->id);
+            <?php echo Ajax::text('?page=stream&action=directplay&object_type=podcast&object_id=' . $podcast->id . '&append=true', T_('Play all last'), 'addplay_podcast_text_' . $podcast->id);
     ?>
         </li>
         <?php 
 } ?>
-        <?php if (Access::check('interface','50')) {
+        <?php if (Access::check('interface', '50')) {
     ?>
         <?php if (AmpConfig::get('statistical_graphs')) {
     ?>
@@ -124,14 +124,14 @@ UI::show_box_top($podcast->f_title, 'info-box');
             </a>
         </li>
         <li>
-            <?php echo Ajax::button('?page=podcast&action=sync&podcast_id=' . $podcast->id, 'file_refresh', T_('Sync'),'sync_podcast_' . $podcast->id);
+            <?php echo Ajax::button('?page=podcast&action=sync&podcast_id=' . $podcast->id, 'file_refresh', T_('Sync'), 'sync_podcast_' . $podcast->id);
     ?>
-            <?php echo Ajax::text('?page=podcast&action=sync&podcast_id=' . $podcast->id, T_('Sync'),'sync_podcast_text_' . $podcast->id);
+            <?php echo Ajax::text('?page=podcast&action=sync&podcast_id=' . $podcast->id, T_('Sync'), 'sync_podcast_text_' . $podcast->id);
     ?>
         </li>
         <?php 
 } ?>
-        <?php if (Access::check('interface','75')) {
+        <?php if (Access::check('interface', '75')) {
     ?>
         <li>
             <a id="<?php echo 'delete_podcast_' . $podcast->id ?>" href="<?php echo AmpConfig::get('web_path');
diff --git a/templates/show_podcast_episode.inc.php b/templates/show_podcast_episode.inc.php
index 211dc6bc..3a600722 100644
--- a/templates/show_podcast_episode.inc.php
+++ b/templates/show_podcast_episode.inc.php
@@ -35,7 +35,7 @@
         <dd class="<?php echo $rowparity;
     ?>">
             <div id="rating_<?php echo $episode->id;
-    ?>_podcast_episode"><?php Rating::show($episode->id,'podcast_episode');
+    ?>_podcast_episode"><?php Rating::show($episode->id, 'podcast_episode');
     ?>
             </div>
         </dd>
@@ -54,7 +54,7 @@
         <dd class="<?php echo $rowparity;
     ?>">
             <div id="userflag_<?php echo $episode->id;
-    ?>_podcast_episode"><?php Userflag::show($episode->id,'podcast_episode');
+    ?>_podcast_episode"><?php Userflag::show($episode->id, 'podcast_episode');
     ?>
             </div>
         </dd>
@@ -72,11 +72,11 @@
     ?>
         <?php if (AmpConfig::get('directplay')) {
     ?>
-            <?php echo Ajax::button('?page=stream&action=directplay&object_type=podcast_episode&object_id=' . $episode->id, 'play', T_('Play'),'play_podcast_episode_' . $episode->id);
+            <?php echo Ajax::button('?page=stream&action=directplay&object_type=podcast_episode&object_id=' . $episode->id, 'play', T_('Play'), 'play_podcast_episode_' . $episode->id);
     ?>
             <?php if (Stream_Playlist::check_autoplay_append()) {
     ?>
-                <?php echo Ajax::button('?page=stream&action=directplay&object_type=podcast_episode&object_id=' . $episode->id . '&append=true','play_add', T_('Play last'),'addplay_podcast_episode_' . $episode->id);
+                <?php echo Ajax::button('?page=stream&action=directplay&object_type=podcast_episode&object_id=' . $episode->id . '&append=true', 'play_add', T_('Play last'), 'addplay_podcast_episode_' . $episode->id);
     ?>
             <?php
 
@@ -84,7 +84,7 @@
     ?>
             <?php if (Stream_Playlist::check_autoplay_next()) {
     ?>
-                <?php echo Ajax::button('?page=stream&action=directplay&object_type=podcast_episode&object_id=' . $episode->id . '&playnext=true','play_next', T_('Play next'),'nextplay_podcast_episode_' . $episode->id);
+                <?php echo Ajax::button('?page=stream&action=directplay&object_type=podcast_episode&object_id=' . $episode->id . '&playnext=true', 'play_next', T_('Play next'), 'nextplay_podcast_episode_' . $episode->id);
     ?>
             <?php
 
@@ -94,11 +94,11 @@
 
 }
     ?>
-        <?php echo Ajax::button('?action=basket&type=podcast_episode&id=' . $episode->id,'add', T_('Add to temporary playlist'),'add_podcast_episode_' . $episode->id);
+        <?php echo Ajax::button('?action=basket&type=podcast_episode&id=' . $episode->id, 'add', T_('Add to temporary playlist'), 'add_podcast_episode_' . $episode->id);
     ?>
         <?php 
 } ?>
-        <?php if (!AmpConfig::get('use_auth') || Access::check('interface','25')) {
+        <?php if (!AmpConfig::get('use_auth') || Access::check('interface', '25')) {
     ?>
             <?php if (AmpConfig::get('sociable')) {
     ?>
@@ -115,7 +115,7 @@
         <?php 
 }
     ?>
-        <?php if (Access::check('interface','25')) {
+        <?php if (Access::check('interface', '25')) {
     ?>
             <?php if (AmpConfig::get('share')) {
     ?>
@@ -140,7 +140,7 @@
         <?php
 
 } ?>
-        <?php if (Access::check('interface','50')) {
+        <?php if (Access::check('interface', '50')) {
     ?>
             <?php if (AmpConfig::get('statistical_graphs')) {
     ?>
diff --git a/templates/show_podcast_episode_row.inc.php b/templates/show_podcast_episode_row.inc.php
index 47ade4b1..47c0825a 100644
--- a/templates/show_podcast_episode_row.inc.php
+++ b/templates/show_podcast_episode_row.inc.php
@@ -25,7 +25,7 @@
     <div class="cel_play_hover">
     <?php
         if (AmpConfig::get('directplay') && !empty($libitem->file)) {
-            echo Ajax::button('?page=stream&action=directplay&object_type=podcast_episode&object_id=' . $libitem->id,'play', T_('Play'),'play_podcast_episode_' . $libitem->id);
+            echo Ajax::button('?page=stream&action=directplay&object_type=podcast_episode&object_id=' . $libitem->id, 'play', T_('Play'), 'play_podcast_episode_' . $libitem->id);
             if (Stream_Playlist::check_autoplay_next()) {
                 echo Ajax::button('?page=stream&action=directplay&object_type=podcast_episode&object_id=' . $libitem->id . '&playnext=true', 'play_next', T_('Play next'), 'nextplay_podcast_episode_' . $libitem->id);
                 if (Stream_Playlist::check_autoplay_append()) {
@@ -40,7 +40,7 @@
 <td class="cel_add">
     <span class="cel_item_add">
 <?php
-    echo Ajax::button('?action=basket&type=podcast_episode&id=' . $libitem->id,'add', T_('Add to temporary playlist'),'add_' . $libitem->id);
+    echo Ajax::button('?action=basket&type=podcast_episode&id=' . $libitem->id, 'add', T_('Add to temporary playlist'), 'add_' . $libitem->id);
     if (Access::check('interface', '25')) {
         ?>
         <a id="<?php echo 'add_playlist_' . $libitem->id ?>" onclick="showPlaylistDialog(event, 'podcast_episode', '<?php echo $libitem->id ?>')">
@@ -63,7 +63,7 @@
             ?>
     <td class="cel_rating" id="rating_<?php echo $libitem->id;
             ?>_podcast_episode">
-        <?php Rating::show($libitem->id,'podcast_episode');
+        <?php Rating::show($libitem->id, 'podcast_episode');
             ?>
     </td>
     <?php 
@@ -72,7 +72,7 @@
             ?>
     <td class="cel_userflag" id="userflag_<?php echo $libitem->id;
             ?>_podcast_episode">
-        <?php Userflag::show($libitem->id,'podcast_episode');
+        <?php Userflag::show($libitem->id, 'podcast_episode');
             ?>
     </td>
     <?php 
@@ -90,11 +90,11 @@
 
 } ?>
 <?php
-    if (Access::check('interface','50')) {
+    if (Access::check('interface', '50')) {
         ?>
     <span id="button_sync_<?php echo $libitem->id;
         ?>">
-        <?php echo Ajax::button('?page=podcast&action=sync&podcast_episode_id=' . $libitem->id, 'file_refresh', T_('Sync'),'sync_podcast_episode_' . $libitem->id);
+        <?php echo Ajax::button('?page=podcast&action=sync&podcast_episode_id=' . $libitem->id, 'file_refresh', T_('Sync'), 'sync_podcast_episode_' . $libitem->id);
         ?>
     </span>
     <a id="<?php echo 'edit_podcast_episode_' . $libitem->id ?>" onclick="showEditDialog('podcast_episode_row', '<?php echo $libitem->id ?>', '<?php echo 'edit_podcast_episode_' . $libitem->id ?>', '<?php echo T_('Podcast Episode edit') ?>', 'podcast_episode_')">
diff --git a/templates/show_podcast_episodes.inc.php b/templates/show_podcast_episodes.inc.php
index 999a6c26..06afe68a 100644
--- a/templates/show_podcast_episodes.inc.php
+++ b/templates/show_podcast_episodes.inc.php
@@ -28,7 +28,7 @@ $thcount  = 7;
     <thead>
         <tr class="th-top">
             <th class="cel_play essential"></th>
-            <th class="cel_title essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=title', T_('Title'),'podcast_episode_sort_title'); ?></th>
+            <th class="cel_title essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=title', T_('Title'), 'podcast_episode_sort_title'); ?></th>
             <th class="cel_add essential"></th>
             <th class="cel_podcast optional"><?php echo T_('Podcast'); ?></th>
             <th class="cel_time optional"><?php echo T_('Time'); ?></th>
@@ -60,10 +60,10 @@ $thcount  = 7;
     <tbody>
         <?php
         if (AmpConfig::get('ratings')) {
-            Rating::build_cache('podcast_episode',$object_ids);
+            Rating::build_cache('podcast_episode', $object_ids);
         }
         if (AmpConfig::get('userflags')) {
-            Userflag::build_cache('podcast_episode',$object_ids);
+            Userflag::build_cache('podcast_episode', $object_ids);
         }
 
         foreach ($object_ids as $episode_id) {
@@ -98,7 +98,7 @@ $thcount  = 7;
     ?></th>
         <?php 
 } ?>
-            <th class="cel_title"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=title', T_('Title'),'podcast_episode_sort_title_bottom'); ?></th>
+            <th class="cel_title"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=title', T_('Title'), 'podcast_episode_sort_title_bottom'); ?></th>
             <th class="cel_add"></th>
             <th class="cel_podcast"><?php echo T_('Podcast'); ?></th>
             <th class="cel_time"><?php echo T_('Time'); ?></th>
diff --git a/templates/show_podcast_row.inc.php b/templates/show_podcast_row.inc.php
index 301371cb..ea31d807 100644
--- a/templates/show_podcast_row.inc.php
+++ b/templates/show_podcast_row.inc.php
@@ -25,9 +25,9 @@
     <div class="cel_play_hover">
     <?php
         if (AmpConfig::get('directplay')) {
-            echo Ajax::button('?page=stream&action=directplay&object_type=podcast&object_id=' . $libitem->id,'play', T_('Play'),'play_podcast_' . $libitem->id);
+            echo Ajax::button('?page=stream&action=directplay&object_type=podcast&object_id=' . $libitem->id, 'play', T_('Play'), 'play_podcast_' . $libitem->id);
             if (Stream_Playlist::check_autoplay_append()) {
-                echo Ajax::button('?page=stream&action=directplay&object_type=podcast&object_id=' . $libitem->id . '&append=true','play_add', T_('Play last'),'addplay_podcast_' . $libitem->id);
+                echo Ajax::button('?page=stream&action=directplay&object_type=podcast&object_id=' . $libitem->id . '&append=true', 'play_add', T_('Play last'), 'addplay_podcast_' . $libitem->id);
             }
         }
     ?>
@@ -49,7 +49,7 @@
             ?>
     <td class="cel_rating" id="rating_<?php echo $libitem->id;
             ?>_podcast">
-        <?php Rating::show($libitem->id,'podcast');
+        <?php Rating::show($libitem->id, 'podcast');
             ?>
     </td>
     <?php 
@@ -58,7 +58,7 @@
             ?>
     <td class="cel_userflag" id="userflag_<?php echo $libitem->id;
             ?>_podcast">
-        <?php Userflag::show($libitem->id,'podcast');
+        <?php Userflag::show($libitem->id, 'podcast');
             ?>
     </td>
     <?php 
@@ -67,7 +67,7 @@
 ?>
 <td class="cel_action">
 <?php
-    if (Access::check('interface','50')) {
+    if (Access::check('interface', '50')) {
         ?>
     <a id="<?php echo 'edit_podcast_' . $libitem->id ?>" onclick="showEditDialog('podcast_row', '<?php echo $libitem->id ?>', '<?php echo 'edit_podcast_' . $libitem->id ?>', '<?php echo T_('Podcast edit') ?>', 'podcast_')">
         <?php echo UI::get_icon('edit', T_('Edit'));
@@ -75,12 +75,12 @@
     </a>
     <span id="button_sync_<?php echo $libitem->id;
         ?>">
-        <?php echo Ajax::button('?page=podcast&action=sync&podcast_id=' . $libitem->id, 'file_refresh', T_('Sync'),'sync_podcast_' . $libitem->id);
+        <?php echo Ajax::button('?page=podcast&action=sync&podcast_id=' . $libitem->id, 'file_refresh', T_('Sync'), 'sync_podcast_' . $libitem->id);
         ?>
     </span>
     <?php 
     }
-    if (Access::check('interface','75')) {
+    if (Access::check('interface', '75')) {
         ?>
     <a id="<?php echo 'delete_podcast_' . $libitem->id ?>" href="<?php echo AmpConfig::get('web_path');
         ?>/podcast.php?action=delete&podcast_id=<?php echo $libitem->id;
diff --git a/templates/show_podcasts.inc.php b/templates/show_podcasts.inc.php
index c2d5ca86..b853bff4 100644
--- a/templates/show_podcasts.inc.php
+++ b/templates/show_podcasts.inc.php
@@ -49,7 +49,7 @@ $thcount  = 5;
     ?></th>
         <?php 
 } ?>
-            <th class="cel_title essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=title', T_('Title'),'podcast_sort_title'); ?></th>
+            <th class="cel_title essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=title', T_('Title'), 'podcast_sort_title'); ?></th>
             <th class="cel_episodes optional"><?php echo T_('Episodes'); ?></th>
             <?php if (User::is_registered()) {
     ?>
@@ -77,10 +77,10 @@ $thcount  = 5;
     <tbody>
         <?php
         if (AmpConfig::get('ratings')) {
-            Rating::build_cache('podcast',$object_ids);
+            Rating::build_cache('podcast', $object_ids);
         }
         if (AmpConfig::get('userflags')) {
-            Userflag::build_cache('podcast',$object_ids);
+            Userflag::build_cache('podcast', $object_ids);
         }
 
         foreach ($object_ids as $podcast_id) {
@@ -115,7 +115,7 @@ $thcount  = 5;
     ?></th>
         <?php 
 } ?>
-            <th class="cel_title"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=title', T_('Title'),'podcast_sort_title_bottom'); ?></th>
+            <th class="cel_title"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=title', T_('Title'), 'podcast_sort_title_bottom'); ?></th>
             <th class="cel_episodes"><?php echo T_('Episodes'); ?></th>
             <?php if (User::is_registered()) {
     ?>
diff --git a/templates/show_preference_admin.inc.php b/templates/show_preference_admin.inc.php
index 8a1e59df..bdb5f05d 100644
--- a/templates/show_preference_admin.inc.php
+++ b/templates/show_preference_admin.inc.php
@@ -33,7 +33,7 @@ UI::show_box_top(T_('Preference Administration'));
     <th class="cel_level"><?php echo T_('Level'); ?></th>
 </tr>
 <?php foreach ($preferences as $preference) {
-    unset($is_25,$is_5,$is_100);
+    unset($is_25, $is_5, $is_100);
     ?>
 <tr class="<?php echo UI::flip_class();
     ?>">
diff --git a/templates/show_preference_box.inc.php b/templates/show_preference_box.inc.php
index b53c473a..005739e2 100644
--- a/templates/show_preference_box.inc.php
+++ b/templates/show_preference_box.inc.php
@@ -23,7 +23,7 @@
 /* I'm cheating a little here, check to see if we want to show the
  * Apply to All button on this page
  */
-if (Access::check('interface','100') && $_REQUEST['action'] == 'admin') {
+if (Access::check('interface', '100') && $_REQUEST['action'] == 'admin') {
     $is_admin = true;
 }
 ?>
diff --git a/templates/show_preferences.inc.php b/templates/show_preferences.inc.php
index 7ce3ead5..703abc76 100644
--- a/templates/show_preferences.inc.php
+++ b/templates/show_preferences.inc.php
@@ -26,7 +26,7 @@
  */
 
 ?>
-<?php /* HINT: Username */ UI::show_box_top(sprintf(T_('Editing %s preferences'), $fullname),'box box_preferences'); ?>
+<?php /* HINT: Username */ UI::show_box_top(sprintf(T_('Editing %s preferences'), $fullname), 'box box_preferences'); ?>
 <?php  if ($_REQUEST['tab'] != 'account' && $_REQUEST['tab'] != 'modules') {
      ?>
 
@@ -43,7 +43,7 @@
      ?>" />
     <input type="hidden" name="method" value="<?php echo scrub_out($_REQUEST['action']);
      ?>" />
-    <?php if (Access::check('interface','100')) {
+    <?php if (Access::check('interface', '100')) {
     ?>
         <input type="hidden" name="user_id" value="<?php echo scrub_out($_REQUEST['user_id']);
     ?>" />
diff --git a/templates/show_pvmsgs.inc.php b/templates/show_pvmsgs.inc.php
index ab496e83..9c6e40be 100644
--- a/templates/show_pvmsgs.inc.php
+++ b/templates/show_pvmsgs.inc.php
@@ -47,10 +47,10 @@ $thcount = 5;
     <thead>
         <tr class="th-top">
             <th class="cel_select essential persist"></th>
-            <th class="cel_subject essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=pvmsg&sort=subject', T_('Subject'),'pvmsg_sort_subject'); ?></th>
-            <th class="cel_from_user essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=pvmsg&sort=from_user', T_('Sender'),'pvmsg_sort_from_user'); ?></th>
-            <th class="cel_to_user essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=pvmsg&sort=to_user', T_('Recipient'),'pvmsg_sort_to_user'); ?></th>
-            <th class="cel_creation_date essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=pvmsg&sort=creation_date', T_('Date'),'pvmsg_sort_creation_date'); ?></th>
+            <th class="cel_subject essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=pvmsg&sort=subject', T_('Subject'), 'pvmsg_sort_subject'); ?></th>
+            <th class="cel_from_user essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=pvmsg&sort=from_user', T_('Sender'), 'pvmsg_sort_from_user'); ?></th>
+            <th class="cel_to_user essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=pvmsg&sort=to_user', T_('Recipient'), 'pvmsg_sort_to_user'); ?></th>
+            <th class="cel_creation_date essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=pvmsg&sort=creation_date', T_('Date'), 'pvmsg_sort_creation_date'); ?></th>
             <th class="cel_action essential"><?php echo T_('Action'); ?></th>
         </tr>
     </thead>
@@ -83,10 +83,10 @@ $thcount = 5;
     <tfoot>
         <tr class="th-bottom">
             <th class="cel_select essential persist"></th>
-            <th class="cel_subject essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=pvmsg&sort=subject', T_('Subject'),'pvmsg_sort_subject'); ?></th>
-            <th class="cel_from_user essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=pvmsg&sort=from_user', T_('Sender'),'pvmsg_sort_from_user'); ?></th>
-            <th class="cel_to_user essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=pvmsg&sort=to_user', T_('Recipient'),'pvmsg_sort_to_user'); ?></th>
-            <th class="cel_creation_date essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=pvmsg&sort=creation_date', T_('Date'),'pvmsg_sort_creation_date'); ?></th>
+            <th class="cel_subject essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=pvmsg&sort=subject', T_('Subject'), 'pvmsg_sort_subject'); ?></th>
+            <th class="cel_from_user essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=pvmsg&sort=from_user', T_('Sender'), 'pvmsg_sort_from_user'); ?></th>
+            <th class="cel_to_user essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=pvmsg&sort=to_user', T_('Recipient'), 'pvmsg_sort_to_user'); ?></th>
+            <th class="cel_creation_date essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=pvmsg&sort=creation_date', T_('Date'), 'pvmsg_sort_creation_date'); ?></th>
             <th class="cel_action essential"><?php echo T_('Action'); ?></th>
         </tr>
     </tfoot>
diff --git a/templates/show_random.inc.php b/templates/show_random.inc.php
index 2a8028c3..62a8e826 100644
--- a/templates/show_random.inc.php
+++ b/templates/show_random.inc.php
@@ -129,7 +129,7 @@
         $browse->save_objects($object_ids);
         $browse->show_objects();
         $browse->store();
-        echo Ajax::observe('window', 'load',Ajax::action('?action=refresh_rightbar','playlist_refresh_load'));
+        echo Ajax::observe('window', 'load', Ajax::action('?action=refresh_rightbar', 'playlist_refresh_load'));
     }
 ?>
 </div>
diff --git a/templates/show_random_albums.inc.php b/templates/show_random_albums.inc.php
index 98ad47a4..2a73f35a 100644
--- a/templates/show_random_albums.inc.php
+++ b/templates/show_random_albums.inc.php
@@ -21,7 +21,7 @@
  */
 
 $web_path = AmpConfig::get('web_path');
-$button   = Ajax::button('?page=index&action=random_albums','random', T_('Refresh'),'random_refresh');
+$button   = Ajax::button('?page=index&action=random_albums', 'random', T_('Refresh'), 'random_refresh');
 ?>
 <?php UI::show_box_top(T_('Albums of the Moment') . ' ' . $button, 'box box_random_albums'); ?>
 <?php
@@ -57,11 +57,11 @@ if ($albums) {
         <div class="play_album">
         <?php if (AmpConfig::get('directplay')) {
     ?>
-            <?php echo Ajax::button('?page=stream&action=directplay&object_type=album&' . $album->get_http_album_query_ids('object_id'),'play', T_('Play'),'play_album_' . $album->id);
+            <?php echo Ajax::button('?page=stream&action=directplay&object_type=album&' . $album->get_http_album_query_ids('object_id'), 'play', T_('Play'), 'play_album_' . $album->id);
     ?>
             <?php if (Stream_Playlist::check_autoplay_append()) {
     ?>
-                <?php echo Ajax::button('?page=stream&action=directplay&object_type=album&' . $album->get_http_album_query_ids('object_id') . '&append=true','play_add', T_('Play last'),'addplay_album_' . $album->id);
+                <?php echo Ajax::button('?page=stream&action=directplay&object_type=album&' . $album->get_http_album_query_ids('object_id') . '&append=true', 'play_add', T_('Play last'), 'addplay_album_' . $album->id);
     ?>
             <?php 
 }
@@ -69,7 +69,7 @@ if ($albums) {
         <?php 
 }
     ?>
-        <?php echo Ajax::button('?action=basket&type=album&' . $album->get_http_album_query_ids('id'),'add', T_('Add to temporary playlist'),'play_full_' . $album->id);
+        <?php echo Ajax::button('?action=basket&type=album&' . $album->get_http_album_query_ids('id'), 'add', T_('Add to temporary playlist'), 'play_full_' . $album->id);
     ?>
         </div>
         <?php 
diff --git a/templates/show_random_videos.inc.php b/templates/show_random_videos.inc.php
index 8e6ffd12..73a6c688 100644
--- a/templates/show_random_videos.inc.php
+++ b/templates/show_random_videos.inc.php
@@ -21,7 +21,7 @@
  */
 
 $web_path = AmpConfig::get('web_path');
-$button   = Ajax::button('?page=index&action=random_videos','random', T_('Refresh'),'random_video_refresh');
+$button   = Ajax::button('?page=index&action=random_videos', 'random', T_('Refresh'), 'random_video_refresh');
 ?>
 <?php UI::show_box_top(T_('Videos of the Moment') . ' ' . $button, 'box box_random_videos'); ?>
 <?php
@@ -47,11 +47,11 @@ if ($videos) {
         <div class="play_video">
         <?php if (AmpConfig::get('directplay')) {
     ?>
-            <?php echo Ajax::button('?page=stream&action=directplay&object_type=video&object_id=' . $video->id,'play', T_('Play'),'play_album_' . $video->id);
+            <?php echo Ajax::button('?page=stream&action=directplay&object_type=video&object_id=' . $video->id, 'play', T_('Play'), 'play_album_' . $video->id);
     ?>
             <?php if (Stream_Playlist::check_autoplay_append()) {
     ?>
-                <?php echo Ajax::button('?page=stream&action=directplay&object_type=video&object_id=' . $video->id . '&append=true','play_add', T_('Play last'),'addplay_video_' . $video->id);
+                <?php echo Ajax::button('?page=stream&action=directplay&object_type=video&object_id=' . $video->id . '&append=true', 'play_add', T_('Play last'), 'addplay_video_' . $video->id);
     ?>
             <?php 
 }
diff --git a/templates/show_recently_played.inc.php b/templates/show_recently_played.inc.php
index 379cf50b..7518ba58 100644
--- a/templates/show_recently_played.inc.php
+++ b/templates/show_recently_played.inc.php
@@ -103,11 +103,11 @@ foreach ($data as $row) {
             <div class="cel_play_hover">
             <?php if (AmpConfig::get('directplay')) {
     ?>
-                <?php echo Ajax::button('?page=stream&action=directplay&object_type=song&object_id=' . $song->id,'play', T_('Play'),'play_song_' . $nb . '_' . $song->id);
+                <?php echo Ajax::button('?page=stream&action=directplay&object_type=song&object_id=' . $song->id, 'play', T_('Play'), 'play_song_' . $nb . '_' . $song->id);
     ?>
                 <?php if (Stream_Playlist::check_autoplay_append()) {
     ?>
-                    <?php echo Ajax::button('?page=stream&action=directplay&object_type=song&object_id=' . $song->id . '&append=true','play_add', T_('Play last'),'addplay_song_' . $nb . '_' . $song->id);
+                    <?php echo Ajax::button('?page=stream&action=directplay&object_type=song&object_id=' . $song->id . '&append=true', 'play_add', T_('Play last'), 'addplay_song_' . $nb . '_' . $song->id);
     ?>
                 <?php 
 }
diff --git a/templates/show_recommended_artists.inc.php b/templates/show_recommended_artists.inc.php
index 17257d1f..017f4952 100644
--- a/templates/show_recommended_artists.inc.php
+++ b/templates/show_recommended_artists.inc.php
@@ -62,11 +62,11 @@ $thcount = 8;
         <?php
         // Cache the ratings we are going to use
         if (AmpConfig::get('ratings')) {
-            Rating::build_cache('artist',$object_ids);
+            Rating::build_cache('artist', $object_ids);
         }
         // Cache the userflags we are going to use
         if (AmpConfig::get('userflags')) {
-            Userflag::build_cache('artist',$object_ids);
+            Userflag::build_cache('artist', $object_ids);
         }
 
         /* Foreach through every artist that has been passed to us */
@@ -90,7 +90,7 @@ $thcount = 8;
             ?>" class="<?php echo UI::flip_class();
             ?>">
             <td></td>
-            <td colspan="<?php echo ($thcount - 1);
+            <td colspan="<?php echo($thcount - 1);
             ?>"><a class="missing_album" href="<?php echo AmpConfig::get('web_path');
             ?>/artists.php?action=show_missing&mbid=<?php echo $missing['mbid'];
             ?>" title="<?php echo scrub_out($missing['name']);
diff --git a/templates/show_registration_confirmation.inc.php b/templates/show_registration_confirmation.inc.php
index 7c7a08db..a4eaa2fa 100644
--- a/templates/show_registration_confirmation.inc.php
+++ b/templates/show_registration_confirmation.inc.php
@@ -20,7 +20,7 @@
  *
  */
 
-$htmllang = str_replace("_","-",AmpConfig::get('lang'));
+$htmllang = str_replace("_", "-", AmpConfig::get('lang'));
 $web_path = AmpConfig::get('web_path');
 
 $_SESSION['login'] = true;
diff --git a/templates/show_search.inc.php b/templates/show_search.inc.php
index 8ae74297..e6373885 100644
--- a/templates/show_search.inc.php
+++ b/templates/show_search.inc.php
@@ -25,7 +25,7 @@ ob_start();
 require AmpConfig::get('prefix') . UI::find_template('show_search_title.inc.php');
 $title = ob_get_contents();
 ob_end_clean();
-UI::show_box_top('<div id="smartplaylist_row_' . $playlist->id . '">' . $title . '</div>' , 'box box_smartplaylist');
+UI::show_box_top('<div id="smartplaylist_row_' . $playlist->id . '">' . $title . '</div>', 'box box_smartplaylist');
 ?>
 <div id="information_actions">
     <ul>
@@ -42,7 +42,7 @@ UI::show_box_top('<div id="smartplaylist_row_' . $playlist->id . '">' . $title .
             <?php 
 } ?>
         <li>
-            <?php echo Ajax::button('?action=basket&type=search&id=' . $playlist->id,'add', T_('Add All'),'play_playlist'); ?>
+            <?php echo Ajax::button('?action=basket&type=search&id=' . $playlist->id, 'add', T_('Add All'), 'play_playlist'); ?>
             <?php echo T_('Add All'); ?>
         </li>
         <?php if ($playlist->has_access()) {
diff --git a/templates/show_search_options.inc.php b/templates/show_search_options.inc.php
index 1ffa7aa5..7eff38dd 100644
--- a/templates/show_search_options.inc.php
+++ b/templates/show_search_options.inc.php
@@ -20,11 +20,11 @@
  *
  */
 ?>
-<?php UI::show_box_top(T_('Options'),'info-box'); ?>
+<?php UI::show_box_top(T_('Options'), 'info-box'); ?>
 <div id="information_actions">
 <ul>
 <li>
-    <?php echo Ajax::button('?action=basket&type=browse_set&browse_id=' . $browse->id,'add', T_('Add Search Results'),'add_search_results'); ?>
+    <?php echo Ajax::button('?action=basket&type=browse_set&browse_id=' . $browse->id, 'add', T_('Add Search Results'), 'add_search_results'); ?>
     <?php echo T_('Add Search Results'); ?>
 </li>
     <?php if (Access::check_function('batch_download') && check_can_zip($_REQUEST['type'])) {
diff --git a/templates/show_search_row.inc.php b/templates/show_search_row.inc.php
index 7497cbac..3de47157 100644
--- a/templates/show_search_row.inc.php
+++ b/templates/show_search_row.inc.php
@@ -25,9 +25,9 @@
     <div class="cel_play_hover">
     <?php
         if (AmpConfig::get('directplay')) {
-            echo Ajax::button('?page=stream&action=directplay&object_type=search&object_id=' . $libitem->id,'play', T_('Play'),'play_playlist_' . $libitem->id);
+            echo Ajax::button('?page=stream&action=directplay&object_type=search&object_id=' . $libitem->id, 'play', T_('Play'), 'play_playlist_' . $libitem->id);
             if (Stream_Playlist::check_autoplay_append()) {
-                echo Ajax::button('?page=stream&action=directplay&object_type=search&object_id=' . $libitem->id . '&append=true','play_add', T_('Play last'),'addplay_playlist_' . $libitem->id);
+                echo Ajax::button('?page=stream&action=directplay&object_type=search&object_id=' . $libitem->id . '&append=true', 'play_add', T_('Play last'), 'addplay_playlist_' . $libitem->id);
             }
         }
     ?>
@@ -36,15 +36,15 @@
 <td class="cel_playlist"><?php echo $libitem->f_link; ?></td>
 <td class="cel_add">
     <span class="cel_item_add">
-        <?php echo Ajax::button('?action=basket&type=search&id=' . $libitem->id,'add', T_('Add to temporary playlist'),'add_playlist_' . $libitem->id); ?>
+        <?php echo Ajax::button('?action=basket&type=search&id=' . $libitem->id, 'add', T_('Add to temporary playlist'), 'add_playlist_' . $libitem->id); ?>
         <a id="<?php echo 'add_playlist_' . $libitem->id ?>" onclick="showPlaylistDialog(event, 'search', '<?php echo $libitem->id ?>')">
             <?php echo UI::get_icon('playlist_add', T_('Add to existing playlist')); ?>
         </a>
     </span>
 </td>
 <td class="cel_type"><?php echo $libitem->f_type; ?></td>
-<td class="cel_random"><?php echo ($libitem->random ? T_('Yes') : T_('No')); ?></td>
-<td class="cel_limit"><?php echo (($libitem->limit > 0) ? $libitem->limit : T_('None')); ?></td>
+<td class="cel_random"><?php echo($libitem->random ? T_('Yes') : T_('No')); ?></td>
+<td class="cel_limit"><?php echo(($libitem->limit > 0) ? $libitem->limit : T_('None')); ?></td>
 <td class="cel_owner"><?php echo scrub_out($libitem->f_user); ?></td>
 <td class="cel_action">
         <?php
@@ -65,7 +65,7 @@
                 ?>
                 </a>
                 <?php
-                echo Ajax::button('?page=browse&action=delete_object&type=smartplaylist&id=' . $libitem->id,'delete', T_('Delete'),'delete_playlist_' . $libitem->id);
+                echo Ajax::button('?page=browse&action=delete_object&type=smartplaylist&id=' . $libitem->id, 'delete', T_('Delete'), 'delete_playlist_' . $libitem->id);
             }
         ?>
 </td>
diff --git a/templates/show_searches.inc.php b/templates/show_searches.inc.php
index 8b1224c1..1abf8f48 100644
--- a/templates/show_searches.inc.php
+++ b/templates/show_searches.inc.php
@@ -42,12 +42,12 @@
     <thead>
         <tr class="th-top">
             <th class="cel_play essential"></th>
-            <th class="cel_playlist essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=smartplaylist&sort=name', T_('Playlist Name'),'playlist_sort_name'); ?></th>
+            <th class="cel_playlist essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=smartplaylist&sort=name', T_('Playlist Name'), 'playlist_sort_name'); ?></th>
             <th class="cel_add essential"></th>
             <th class="cel_type optional"><?php echo T_('Type'); ?></th>
             <th class="cel_random optional"><?php echo T_('Random'); ?></th>
             <th class="cel_limit optional"><?php echo T_('Item Limit'); ?></th>
-            <th class="cel_owner optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=smartplaylist&sort=user', T_('Owner'),'playlist_sort_owner'); ?></th>
+            <th class="cel_owner optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=smartplaylist&sort=user', T_('Owner'), 'playlist_sort_owner'); ?></th>
             <th class="cel_action essential"><?php echo T_('Actions'); ?></th>
         </tr>
     </thead>
@@ -78,12 +78,12 @@
     <tfoot>
         <tr class="th-bottom">
             <th class="cel_play"></th>
-            <th class="cel_playlist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=playlist&sort=name', T_('Playlist Name'),'playlist_sort_name_bottom'); ?></th>
+            <th class="cel_playlist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=playlist&sort=name', T_('Playlist Name'), 'playlist_sort_name_bottom'); ?></th>
             <th class="cel_add"></th>
             <th class="cel_type"><?php echo T_('Type'); ?></th>
             <th class="cel_random"><?php echo T_('Random'); ?></th>
             <th class="cel_limit"><?php echo T_('Item Limit'); ?></th>
-            <th class="cel_owner"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=playlist&sort=user', T_('Owner'),'playlist_sort_owner_bottom'); ?></th>
+            <th class="cel_owner"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=playlist&sort=user', T_('Owner'), 'playlist_sort_owner_bottom'); ?></th>
             <th class="cel_action"><?php echo T_('Actions'); ?></th>
         </tr>
     </tfoot>
diff --git a/templates/show_shared_objects.inc.php b/templates/show_shared_objects.inc.php
index 83ec8714..4afdaad9 100644
--- a/templates/show_shared_objects.inc.php
+++ b/templates/show_shared_objects.inc.php
@@ -23,16 +23,16 @@
 <table class="tabledata <?php echo $browse->get_css_class() ?>" cellpadding="0" cellspacing="0" data-objecttype="share">
     <thead>
     <tr class="th-top">
-            <th class="cel_object essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=share&sort=object', T_('Object'),'sort_share_object'); ?></th>
-            <th class="cel_object_type optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=share&sort=object_type', T_('Object Type'),'sort_share_object_type'); ?></th>
-            <th class="cel_user optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=share&sort=user', T_('User'),'sort_share_user'); ?></th>
-            <th class="cel_creation_date optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=share&sort=creation_date', T_('Creation Date'),'sort_share_creation_date'); ?></th>
-            <th class="cel_lastvisit_date optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=share&sort=lastvisit_date', T_('Last Visit'),'sort_share_lastvisit_date'); ?></th>
-            <th class="cel_counter optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=share&sort=counter', T_('Counter'),'sort_share_counter'); ?></th>
-            <th class="cel_max_counter optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=share&sort=max_counter', T_('Max Counter'),'sort_share_max_counter'); ?></th>
-            <th class="cel_allow_stream optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=share&sort=allow_stream', T_('Allow Stream'),'sort_share_allow_stream'); ?></th>
-            <th class="cel_allow_download optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=share&sort=allow_download', T_('Allow Download'),'sort_share_allow_download'); ?></th>
-            <th class="cel_expire optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=share&sort=expire', T_('Expiry Days'),'sort_share_expire'); ?></th>
+            <th class="cel_object essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=share&sort=object', T_('Object'), 'sort_share_object'); ?></th>
+            <th class="cel_object_type optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=share&sort=object_type', T_('Object Type'), 'sort_share_object_type'); ?></th>
+            <th class="cel_user optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=share&sort=user', T_('User'), 'sort_share_user'); ?></th>
+            <th class="cel_creation_date optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=share&sort=creation_date', T_('Creation Date'), 'sort_share_creation_date'); ?></th>
+            <th class="cel_lastvisit_date optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=share&sort=lastvisit_date', T_('Last Visit'), 'sort_share_lastvisit_date'); ?></th>
+            <th class="cel_counter optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=share&sort=counter', T_('Counter'), 'sort_share_counter'); ?></th>
+            <th class="cel_max_counter optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=share&sort=max_counter', T_('Max Counter'), 'sort_share_max_counter'); ?></th>
+            <th class="cel_allow_stream optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=share&sort=allow_stream', T_('Allow Stream'), 'sort_share_allow_stream'); ?></th>
+            <th class="cel_allow_download optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=share&sort=allow_download', T_('Allow Download'), 'sort_share_allow_download'); ?></th>
+            <th class="cel_expire optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=share&sort=expire', T_('Expiry Days'), 'sort_share_expire'); ?></th>
             <th class="cel_public_url essential"><?php echo T_('Public Url'); ?></th>
             <th class="cel_action  essential"><?php echo T_('Actions'); ?></th>
         </tr>
diff --git a/templates/show_song.inc.php b/templates/show_song.inc.php
index aa99c5b3..b396ca35 100644
--- a/templates/show_song.inc.php
+++ b/templates/show_song.inc.php
@@ -38,7 +38,7 @@ $button_flip_state_id = 'button_flip_state_' . $song->id;
         <dd class="<?php echo $rowparity;
     ?>">
             <div id="rating_<?php echo $song->id;
-    ?>_song"><?php Rating::show($song->id,'song');
+    ?>_song"><?php Rating::show($song->id, 'song');
     ?>
             </div>
         </dd>
@@ -57,7 +57,7 @@ $button_flip_state_id = 'button_flip_state_' . $song->id;
         <dd class="<?php echo $rowparity;
     ?>">
             <div id="userflag_<?php echo $song->id;
-    ?>_song"><?php Userflag::show($song->id,'song');
+    ?>_song"><?php Userflag::show($song->id, 'song');
     ?>
             </div>
         </dd>
@@ -92,11 +92,11 @@ $button_flip_state_id = 'button_flip_state_' . $song->id;
     <dd class="<?php echo $rowparity; ?>">
         <?php if (AmpConfig::get('directplay')) {
     ?>
-            <?php echo Ajax::button('?page=stream&action=directplay&object_type=song&object_id=' . $song->id, 'play', T_('Play'),'play_song_' . $song->id);
+            <?php echo Ajax::button('?page=stream&action=directplay&object_type=song&object_id=' . $song->id, 'play', T_('Play'), 'play_song_' . $song->id);
     ?>
             <?php if (Stream_Playlist::check_autoplay_append()) {
     ?>
-                <?php echo Ajax::button('?page=stream&action=directplay&object_type=song&object_id=' . $song->id . '&append=true','play_add', T_('Play last'),'addplay_song_' . $song->id);
+                <?php echo Ajax::button('?page=stream&action=directplay&object_type=song&object_id=' . $song->id . '&append=true', 'play_add', T_('Play last'), 'addplay_song_' . $song->id);
     ?>
             <?php
 
@@ -104,7 +104,7 @@ $button_flip_state_id = 'button_flip_state_' . $song->id;
     ?>
             <?php if (Stream_Playlist::check_autoplay_next()) {
     ?>
-                <?php echo Ajax::button('?page=stream&action=directplay&object_type=song&object_id=' . $song->id . '&playnext=true','play_next', T_('Play next'),'nextplay_song_' . $song->id);
+                <?php echo Ajax::button('?page=stream&action=directplay&object_type=song&object_id=' . $song->id . '&playnext=true', 'play_next', T_('Play next'), 'nextplay_song_' . $song->id);
     ?>
             <?php
 
@@ -115,8 +115,8 @@ $button_flip_state_id = 'button_flip_state_' . $song->id;
         <?php
 
 } ?>
-        <?php echo Ajax::button('?action=basket&type=song&id=' . $song->id,'add', T_('Add to temporary playlist'),'add_song_' . $song->id); ?>
-        <?php if (!AmpConfig::get('use_auth') || Access::check('interface','25')) {
+        <?php echo Ajax::button('?action=basket&type=song&id=' . $song->id, 'add', T_('Add to temporary playlist'), 'add_song_' . $song->id); ?>
+        <?php if (!AmpConfig::get('use_auth') || Access::check('interface', '25')) {
     ?>
             <?php if (AmpConfig::get('sociable')) {
     ?>
@@ -133,7 +133,7 @@ $button_flip_state_id = 'button_flip_state_' . $song->id;
         <?php 
 }
     ?>
-        <?php if (Access::check('interface','25')) {
+        <?php if (Access::check('interface', '25')) {
     ?>
             <?php if (AmpConfig::get('share')) {
     ?>
@@ -158,7 +158,7 @@ $button_flip_state_id = 'button_flip_state_' . $song->id;
         <?php
 
 } ?>
-        <?php if (($song->user_upload > 0 && $song->user_upload == $GLOBALS['user']->id) || Access::check('interface','50')) {
+        <?php if (($song->user_upload > 0 && $song->user_upload == $GLOBALS['user']->id) || Access::check('interface', '50')) {
     ?>
             <?php if (AmpConfig::get('statistical_graphs')) {
     ?>
@@ -173,7 +173,7 @@ $button_flip_state_id = 'button_flip_state_' . $song->id;
         <?php
 
 } ?>
-        <?php if (Access::check('interface','50') || ($song->user_upload == $GLOBALS['user']->id && AmpConfig::get('upload_allow_edit'))) {
+        <?php if (Access::check('interface', '50') || ($song->user_upload == $GLOBALS['user']->id && AmpConfig::get('upload_allow_edit'))) {
     ?>
             <a onclick="showEditDialog('song_row', '<?php echo $song->id ?>', '<?php echo 'edit_song_' . $song->id ?>', '<?php echo T_('Edit') ?>', '')">
                 <?php echo UI::get_icon('edit', T_('Edit'));
@@ -182,11 +182,11 @@ $button_flip_state_id = 'button_flip_state_' . $song->id;
         <?php
 
 } ?>
-        <?php if (Access::check('interface','75') || ($song->user_upload == $GLOBALS['user']->id && AmpConfig::get('upload_allow_edit'))) {
+        <?php if (Access::check('interface', '75') || ($song->user_upload == $GLOBALS['user']->id && AmpConfig::get('upload_allow_edit'))) {
     ?>
             <span id="<?php echo($button_flip_state_id);
     ?>">
-            <?php echo Ajax::button('?page=song&action=flip_state&song_id=' . $song->id,$icon, T_(ucfirst($icon)),'flip_song_' . $song->id);
+            <?php echo Ajax::button('?page=song&action=flip_state&song_id=' . $song->id, $icon, T_(ucfirst($icon)), 'flip_song_' . $song->id);
     ?>
             </span>
         <?php
@@ -230,13 +230,13 @@ $button_flip_state_id = 'button_flip_state_' . $song->id;
   if ($song->replaygain_album_gain != 0) {
       $songprops[gettext_noop('ReplayGain Album Gain')]   = scrub_out($song->replaygain_album_gain);
   }
-  if (Access::check('interface','75')) {
+  if (Access::check('interface', '75')) {
       $songprops[gettext_noop('Filename')]   = scrub_out($song->file) . " " . $song->f_size;
   }
   if ($song->update_time) {
-      $songprops[gettext_noop('Last Updated')]   = date("d/m/Y H:i",$song->update_time);
+      $songprops[gettext_noop('Last Updated')]   = date("d/m/Y H:i", $song->update_time);
   }
-  $songprops[gettext_noop('Added')]   = date("d/m/Y H:i",$song->addition_time);
+  $songprops[gettext_noop('Added')]   = date("d/m/Y H:i", $song->addition_time);
   if (AmpConfig::get('show_played_times')) {
       $songprops[gettext_noop('# Played')]   = scrub_out($song->object_cnt);
   }
diff --git a/templates/show_song_preview_row.inc.php b/templates/show_song_preview_row.inc.php
index 0535a256..01deff08 100644
--- a/templates/show_song_preview_row.inc.php
+++ b/templates/show_song_preview_row.inc.php
@@ -25,9 +25,9 @@
 <td class="cel_play">
     <?php
         if (AmpConfig::get('directplay') && $libitem->file) {
-            echo Ajax::button('?page=stream&action=directplay&object_type=song_preview&object_id=' . $libitem->id,'play_preview', T_('Play'),'play_song_' . $libitem->id);
+            echo Ajax::button('?page=stream&action=directplay&object_type=song_preview&object_id=' . $libitem->id, 'play_preview', T_('Play'), 'play_song_' . $libitem->id);
             if (Stream_Playlist::check_autoplay_append()) {
-                echo Ajax::button('?page=stream&action=directplay&object_type=song_preview&object_id=' . $libitem->id . '&append=true','play_add_preview', T_('Play last'),'addplay_song_' . $libitem->id);
+                echo Ajax::button('?page=stream&action=directplay&object_type=song_preview&object_id=' . $libitem->id . '&append=true', 'play_add_preview', T_('Play last'), 'addplay_song_' . $libitem->id);
             }
         }
     ?>
@@ -41,7 +41,7 @@
     <span class="cel_item_add">
         <?php
             if ($libitem->file) {
-                echo Ajax::button('?action=basket&type=song_preview&id=' . $libitem->id,'add', T_('Add to temporary playlist'),'add_' . $libitem->id);
+                echo Ajax::button('?action=basket&type=song_preview&id=' . $libitem->id, 'add', T_('Add to temporary playlist'), 'add_' . $libitem->id);
                 if (Access::check('interface', '25')) {
                     ?>
                     <a id="<?php echo 'add_playlist_' . $libitem->id ?>" onclick="showPlaylistDialog(event, 'song_preview', '<?php echo $libitem->id ?>')">
diff --git a/templates/show_song_row.inc.php b/templates/show_song_row.inc.php
index 1fbcc86a..676919b9 100644
--- a/templates/show_song_row.inc.php
+++ b/templates/show_song_row.inc.php
@@ -21,7 +21,7 @@
  */
 
 // Don't show disabled songs to normal users
-if ($libitem->enabled || Access::check('interface','50')) {
+if ($libitem->enabled || Access::check('interface', '50')) {
     ?>
 <td class="cel_play">
     <span class="cel_play_content">
@@ -49,7 +49,7 @@ if ($libitem->enabled || Access::check('interface','50')) {
 <td class="cel_add">
     <span class="cel_item_add">
 <?php
-    echo Ajax::button('?action=basket&type=song&id=' . $libitem->id,'add', T_('Add to temporary playlist'),'add_' . $libitem->id);
+    echo Ajax::button('?action=basket&type=song&id=' . $libitem->id, 'add', T_('Add to temporary playlist'), 'add_' . $libitem->id);
     if (Access::check('interface', '25')) {
         ?>
         <a id="<?php echo 'add_playlist_' . $libitem->id ?>" onclick="showPlaylistDialog(event, 'song', '<?php echo $libitem->id ?>')">
@@ -85,7 +85,7 @@ if ($libitem->enabled || Access::check('interface','50')) {
             ?>
             <td class="cel_rating" id="rating_<?php echo $libitem->id;
             ?>_song">
-                <?php Rating::show($libitem->id,'song') ?>  
+                <?php Rating::show($libitem->id, 'song') ?>  
             </td>
     <?php 
         }
@@ -93,7 +93,7 @@ if ($libitem->enabled || Access::check('interface','50')) {
             ?>
             <td class="cel_userflag" id="userflag_<?php echo $libitem->id;
             ?>_song">
-                <?php Userflag::show($libitem->id,'song') ?>
+                <?php Userflag::show($libitem->id, 'song') ?>
             </td>
     <?php 
         }
@@ -101,14 +101,14 @@ if ($libitem->enabled || Access::check('interface','50')) {
     ?>
 <td class="cel_action">
     <a href="<?php echo $libitem->link ?>"><?php echo UI::get_icon('preferences', T_('Song Information')) ?></a>
-    <?php if (!AmpConfig::get('use_auth') || Access::check('interface','25')) {
+    <?php if (!AmpConfig::get('use_auth') || Access::check('interface', '25')) {
     if (AmpConfig::get('sociable')) {
         ?>
             <a href="<?php echo AmpConfig::get('web_path') ?>/shout.php?action=show_add_shout&type=song&id=<?php echo $libitem->id ?>"><?php echo UI::get_icon('comment', T_('Post Shout')) ?></a>
         <?php 
     }
 }
-    if (Access::check('interface','25')) {
+    if (Access::check('interface', '25')) {
         if (AmpConfig::get('share')) {
             Share::display_ui('song', $libitem->id, false);
         }
@@ -118,7 +118,7 @@ if ($libitem->enabled || Access::check('interface','50')) {
         <a rel="nohtml" href="<?php echo AmpConfig::get('web_path') ?>/stream.php?action=download&song_id=<?php echo $libitem->id ?>"><?php echo UI::get_icon('download', T_('Download')) ?></a>
 <?php 
     }
-    if (Access::check('interface','50') || ($libitem->user_upload == $GLOBALS['user']->id && AmpConfig::get('upload_allow_edit'))) {
+    if (Access::check('interface', '50') || ($libitem->user_upload == $GLOBALS['user']->id && AmpConfig::get('upload_allow_edit'))) {
         ?>
         <a id="<?php echo 'edit_song_' . $libitem->id ?>" onclick="showEditDialog('song_row', '<?php echo $libitem->id ?>', '<?php echo 'edit_song_' . $libitem->id ?>', '<?php echo T_('Song edit') ?>', 'song_')">
             <?php echo UI::get_icon('edit', T_('Edit'));
@@ -126,13 +126,13 @@ if ($libitem->enabled || Access::check('interface','50')) {
         </a>
 <?php 
     }
-    if (Access::check('interface','75') || ($libitem->user_upload == $GLOBALS['user']->id && AmpConfig::get('upload_allow_edit'))) {
+    if (Access::check('interface', '75') || ($libitem->user_upload == $GLOBALS['user']->id && AmpConfig::get('upload_allow_edit'))) {
         $icon                 = $libitem->enabled ? 'disable' : 'enable';
         $button_flip_state_id = 'button_flip_state_' . $libitem->id;
         ?>
         <span id="<?php echo($button_flip_state_id);
         ?>">
-            <?php echo Ajax::button('?page=song&action=flip_state&song_id=' . $libitem->id,$icon, T_(ucfirst($icon)),'flip_song_' . $libitem->id);
+            <?php echo Ajax::button('?page=song&action=flip_state&song_id=' . $libitem->id, $icon, T_(ucfirst($icon)), 'flip_song_' . $libitem->id);
         ?>
         </span>
 <?php 
diff --git a/templates/show_tvshow.inc.php b/templates/show_tvshow.inc.php
index 1a8f8db6..bb1e5657 100644
--- a/templates/show_tvshow.inc.php
+++ b/templates/show_tvshow.inc.php
@@ -58,7 +58,7 @@ UI::show_box_top($tvshow->f_name, 'info-box');
     ?>
     <div style="display:table-cell;" id="userflag_<?php echo $tvshow->id;
     ?>_tvshow">
-            <?php Userflag::show($tvshow->id,'tvshow');
+            <?php Userflag::show($tvshow->id, 'tvshow');
     ?>
     </div>
     <?php 
@@ -72,9 +72,9 @@ UI::show_box_top($tvshow->f_name, 'info-box');
         <?php if (AmpConfig::get('directplay')) {
     ?>
         <li>
-            <?php echo Ajax::button('?page=stream&action=directplay&object_type=tvshow&object_id=' . $tvshow->id,'play', T_('Play all'),'directplay_full_' . $tvshow->id);
+            <?php echo Ajax::button('?page=stream&action=directplay&object_type=tvshow&object_id=' . $tvshow->id, 'play', T_('Play all'), 'directplay_full_' . $tvshow->id);
     ?>
-            <?php echo Ajax::text('?page=stream&action=directplay&object_type=tvshow&object_id=' . $tvshow->id, T_('Play all'),'directplay_full_text_' . $tvshow->id);
+            <?php echo Ajax::text('?page=stream&action=directplay&object_type=tvshow&object_id=' . $tvshow->id, T_('Play all'), 'directplay_full_text_' . $tvshow->id);
     ?>
         </li>
         <?php 
@@ -82,14 +82,14 @@ UI::show_box_top($tvshow->f_name, 'info-box');
         <?php if (Stream_Playlist::check_autoplay_append()) {
     ?>
         <li>
-            <?php echo Ajax::button('?page=stream&action=directplay&object_type=tvshow&object_id=' . $tvshow->id . '&append=true','play_add', T_('Play all last'),'addplay_tvshow_' . $tvshow->id);
+            <?php echo Ajax::button('?page=stream&action=directplay&object_type=tvshow&object_id=' . $tvshow->id . '&append=true', 'play_add', T_('Play all last'), 'addplay_tvshow_' . $tvshow->id);
     ?>
-            <?php echo Ajax::text('?page=stream&action=directplay&object_type=tvshow&object_id=' . $tvshow->id . '&append=true', T_('Play all last'),'addplay_tvshow_text_' . $tvshow->id);
+            <?php echo Ajax::text('?page=stream&action=directplay&object_type=tvshow&object_id=' . $tvshow->id . '&append=true', T_('Play all last'), 'addplay_tvshow_text_' . $tvshow->id);
     ?>
         </li>
         <?php 
 } ?>
-        <?php if (Access::check('interface','50')) {
+        <?php if (Access::check('interface', '50')) {
     ?>
         <li>
             <a id="<?php echo 'edit_tvshow_' . $tvshow->id ?>" onclick="showEditDialog('tvshow_row', '<?php echo $tvshow->id ?>', '<?php echo 'edit_tvshow_' . $tvshow->id ?>', '<?php echo T_('TV Show edit') ?>', '')">
diff --git a/templates/show_tvshow_row.inc.php b/templates/show_tvshow_row.inc.php
index 00dc0cce..58e1a7ee 100644
--- a/templates/show_tvshow_row.inc.php
+++ b/templates/show_tvshow_row.inc.php
@@ -25,9 +25,9 @@
     <div class="cel_play_hover">
     <?php
         if (AmpConfig::get('directplay')) {
-            echo Ajax::button('?page=stream&action=directplay&object_type=tvshow&object_id=' . $libitem->id,'play', T_('Play'),'play_tvshow_' . $libitem->id);
+            echo Ajax::button('?page=stream&action=directplay&object_type=tvshow&object_id=' . $libitem->id, 'play', T_('Play'), 'play_tvshow_' . $libitem->id);
             if (Stream_Playlist::check_autoplay_append()) {
-                echo Ajax::button('?page=stream&action=directplay&object_type=tvshow&object_id=' . $libitem->id . '&append=true','play_add', T_('Play last'),'addplay_tvshow_' . $libitem->id);
+                echo Ajax::button('?page=stream&action=directplay&object_type=tvshow&object_id=' . $libitem->id . '&append=true', 'play_add', T_('Play last'), 'addplay_tvshow_' . $libitem->id);
             }
         }
     ?>
@@ -52,14 +52,14 @@
         if (AmpConfig::get('ratings')) {
             ?>
     <td class="cel_rating" id="rating_<?php echo $libitem->id;
-            ?>_tvshow"><?php Rating::show($libitem->id,'tvshow');
+            ?>_tvshow"><?php Rating::show($libitem->id, 'tvshow');
             ?></td>
     <?php 
         }
         if (AmpConfig::get('userflags')) {
             ?>
         <td class="cel_userflag" id="userflag_<?php echo $libitem->id;
-            ?>_tvshow"><?php Userflag::show($libitem->id,'tvshow');
+            ?>_tvshow"><?php Userflag::show($libitem->id, 'tvshow');
             ?></td>
     <?php 
         }
@@ -67,7 +67,7 @@
 ?>
 <td class="cel_action">
 <?php
-    if (Access::check('interface','50')) {
+    if (Access::check('interface', '50')) {
         ?>
     <a id="<?php echo 'edit_tvshow_' . $libitem->id ?>" onclick="showEditDialog('tvshow_row', '<?php echo $libitem->id ?>', '<?php echo 'edit_tvshow_' . $libitem->id ?>', '<?php echo T_('TV Show edit') ?>', 'tvshow_')">
         <?php echo UI::get_icon('edit', T_('Edit'));
diff --git a/templates/show_tvshow_season.inc.php b/templates/show_tvshow_season.inc.php
index a82e2b6b..9be8b31c 100644
--- a/templates/show_tvshow_season.inc.php
+++ b/templates/show_tvshow_season.inc.php
@@ -50,7 +50,7 @@ UI::show_box_top($season->f_name . ' - ' . $season->f_tvshow_link, 'info-box');
     ?>
     <div style="display:table-cell;" id="userflag_<?php echo $season->id;
     ?>_tvshow_season">
-            <?php Userflag::show($season->id,'tvshow_season');
+            <?php Userflag::show($season->id, 'tvshow_season');
     ?>
     </div>
     <?php 
@@ -64,9 +64,9 @@ UI::show_box_top($season->f_name . ' - ' . $season->f_tvshow_link, 'info-box');
         <?php if (AmpConfig::get('directplay')) {
     ?>
         <li>
-            <?php echo Ajax::button('?page=stream&action=directplay&object_type=tvshow_season&object_id=' . $season->id,'play', T_('Play all'),'directplay_full_' . $season->id);
+            <?php echo Ajax::button('?page=stream&action=directplay&object_type=tvshow_season&object_id=' . $season->id, 'play', T_('Play all'), 'directplay_full_' . $season->id);
     ?>
-            <?php echo Ajax::text('?page=stream&action=directplay&object_type=tvshow_season&object_id=' . $season->id, T_('Play all'),'directplay_full_text_' . $season->id);
+            <?php echo Ajax::text('?page=stream&action=directplay&object_type=tvshow_season&object_id=' . $season->id, T_('Play all'), 'directplay_full_text_' . $season->id);
     ?>
         </li>
         <?php 
@@ -74,14 +74,14 @@ UI::show_box_top($season->f_name . ' - ' . $season->f_tvshow_link, 'info-box');
         <?php if (Stream_Playlist::check_autoplay_append()) {
     ?>
         <li>
-            <?php echo Ajax::button('?page=stream&action=directplay&object_type=season&object_id=' . $season->id . '&append=true','play_add', T_('Play all last'),'addplay_season_' . $season->id);
+            <?php echo Ajax::button('?page=stream&action=directplay&object_type=season&object_id=' . $season->id . '&append=true', 'play_add', T_('Play all last'), 'addplay_season_' . $season->id);
     ?>
-            <?php echo Ajax::text('?page=stream&action=directplay&object_type=season&object_id=' . $season->id . '&append=true', T_('Play all last'),'addplay_season_text_' . $season->id);
+            <?php echo Ajax::text('?page=stream&action=directplay&object_type=season&object_id=' . $season->id . '&append=true', T_('Play all last'), 'addplay_season_text_' . $season->id);
     ?>
         </li>
         <?php 
 } ?>
-        <?php if (Access::check('interface','50')) {
+        <?php if (Access::check('interface', '50')) {
     ?>
         <li>
             <a id="<?php echo 'edit_tvshow_season_' . $season->id ?>" onclick="showEditDialog('tvshow_season_row', '<?php echo $season->id ?>', '<?php echo 'edit_tvshow_season_' . $season->id ?>', '<?php echo T_('Season edit') ?>', '')">
diff --git a/templates/show_tvshow_season_row.inc.php b/templates/show_tvshow_season_row.inc.php
index 0feaaed9..a2404a42 100644
--- a/templates/show_tvshow_season_row.inc.php
+++ b/templates/show_tvshow_season_row.inc.php
@@ -25,9 +25,9 @@
     <div class="cel_play_hover">
     <?php
         if (AmpConfig::get('directplay')) {
-            echo Ajax::button('?page=stream&action=directplay&object_type=tvshow_season&object_id=' . $libitem->id,'play', T_('Play'),'play_season_' . $libitem->id);
+            echo Ajax::button('?page=stream&action=directplay&object_type=tvshow_season&object_id=' . $libitem->id, 'play', T_('Play'), 'play_season_' . $libitem->id);
             if (Stream_Playlist::check_autoplay_append()) {
-                echo Ajax::button('?page=stream&action=directplay&object_type=tvshow_season&object_id=' . $libitem->id . '&append=true','play_add', T_('Play last'),'addplay_season_' . $libitem->id);
+                echo Ajax::button('?page=stream&action=directplay&object_type=tvshow_season&object_id=' . $libitem->id . '&append=true', 'play_add', T_('Play last'), 'addplay_season_' . $libitem->id);
             }
         }
     ?>
@@ -50,7 +50,7 @@
             ?>
     <td class="cel_rating" id="rating_<?php echo $libitem->id;
             ?>_tvshow_season">
-        <?php Rating::show($libitem->id,'tvshow_season');
+        <?php Rating::show($libitem->id, 'tvshow_season');
             ?>
     </td>
     <?php 
@@ -59,7 +59,7 @@
             ?>
     <td class="cel_userflag" id="userflag_<?php echo $libitem->id;
             ?>_tvshow_season">
-        <?php Userflag::show($libitem->id,'tvshow_season');
+        <?php Userflag::show($libitem->id, 'tvshow_season');
             ?>
     </td>
     <?php 
@@ -68,7 +68,7 @@
 ?>
 <td class="cel_action">
 <?php
-    if (Access::check('interface','50')) {
+    if (Access::check('interface', '50')) {
         ?>
     <a id="<?php echo 'edit_tvshow_season_' . $libitem->id ?>" onclick="showEditDialog('tvshow_season_row', '<?php echo $libitem->id ?>', '<?php echo 'edit_tvshow_season_' . $libitem->id ?>', '<?php echo T_('Season edit') ?>', 'tvshow_season_')">
         <?php echo UI::get_icon('edit', T_('Edit'));
diff --git a/templates/show_tvshow_seasons.inc.php b/templates/show_tvshow_seasons.inc.php
index f9dc4400..044e1324 100644
--- a/templates/show_tvshow_seasons.inc.php
+++ b/templates/show_tvshow_seasons.inc.php
@@ -37,8 +37,8 @@ $thcount  = 6;
     ?></th>
         <?php 
 } ?>
-            <th class="cel_season essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=season', T_('Season'),'season_sort_season'); ?></th>
-            <th class="cel_tvshow essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=tvshow', T_('TV Show'),'season_sort_tvshow'); ?></th>
+            <th class="cel_season essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=season', T_('Season'), 'season_sort_season'); ?></th>
+            <th class="cel_tvshow essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=tvshow', T_('TV Show'), 'season_sort_tvshow'); ?></th>
             <th class="cel_episodes optional"><?php echo T_('Episodes'); ?></th>
             <?php if (User::is_registered()) {
     ?>
@@ -66,10 +66,10 @@ $thcount  = 6;
     <tbody>
         <?php
         if (AmpConfig::get('ratings')) {
-            Rating::build_cache('album',$object_ids);
+            Rating::build_cache('album', $object_ids);
         }
         if (AmpConfig::get('userflags')) {
-            Userflag::build_cache('album',$object_ids);
+            Userflag::build_cache('album', $object_ids);
         }
 
         foreach ($object_ids as $season_id) {
@@ -104,8 +104,8 @@ $thcount  = 6;
     ?></th>
         <?php 
 } ?>
-            <th class="cel_season"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=season', T_('Season'),'season_sort_name_bottom'); ?></th>
-            <th class="cel_tvshow"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=tvshow', T_('TV Show'),'season_sort_artist_bottom'); ?></th>
+            <th class="cel_season"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=season', T_('Season'), 'season_sort_name_bottom'); ?></th>
+            <th class="cel_tvshow"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=tvshow', T_('TV Show'), 'season_sort_artist_bottom'); ?></th>
             <th class="cel_episodes"><?php echo T_('Episodes'); ?></th>
             <?php if (User::is_registered()) {
     ?>
diff --git a/templates/show_tvshows.inc.php b/templates/show_tvshows.inc.php
index b8736295..5dee45a9 100644
--- a/templates/show_tvshows.inc.php
+++ b/templates/show_tvshows.inc.php
@@ -39,7 +39,7 @@ $thcount  = 8;
     ?></th>
         <?php 
 } ?>
-            <th class="cel_tvshow essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=tvshow&sort=name', T_('TV Show'),'tvshow_sort_name'); ?></th>
+            <th class="cel_tvshow essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=tvshow&sort=name', T_('TV Show'), 'tvshow_sort_name'); ?></th>
             <th class="cel_episodes optional"><?php echo T_('Episodes');  ?></th>
             <th class="cel_seasons optional"><?php echo T_('Seasons'); ?></th>
             <th class="cel_tags optional"><?php echo T_('Tags'); ?></th>
@@ -70,10 +70,10 @@ $thcount  = 8;
         <?php
         // Cache the ratings we are going to use
         if (AmpConfig::get('ratings')) {
-            Rating::build_cache('tvshow',$object_ids);
+            Rating::build_cache('tvshow', $object_ids);
         }
         if (AmpConfig::get('userflags')) {
-            Userflag::build_cache('tvshow',$object_ids);
+            Userflag::build_cache('tvshow', $object_ids);
         }
 
         /* Foreach through every tv show that has been passed to us */
@@ -109,7 +109,7 @@ $thcount  = 8;
     ?></th>
         <?php 
 } ?>
-            <th class="cel_tvshow essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=tvshow&sort=name', T_('TV Show'),'tvshow_sort_name'); ?></th>
+            <th class="cel_tvshow essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=tvshow&sort=name', T_('TV Show'), 'tvshow_sort_name'); ?></th>
             <th class="cel_episodes optional"><?php echo T_('Episodes');  ?></th>
             <th class="cel_seasons optional"><?php echo T_('Seasons'); ?></th>
             <th class="cel_tags optional"><?php echo T_('Tags'); ?></th>
diff --git a/templates/show_update_items.inc.php b/templates/show_update_items.inc.php
index 1f5a59ef..bb0343d8 100644
--- a/templates/show_update_items.inc.php
+++ b/templates/show_update_items.inc.php
@@ -21,7 +21,7 @@
  */
 
 UI::show_box_top(T_('Starting Update from Tags'), 'box box_update_items');
-Catalog::update_single_item($type,$object_id);
+Catalog::update_single_item($type, $object_id);
 ?>
 <br />
 <strong><?php echo T_('Update from Tags Complete'); ?></strong>&nbsp;&nbsp;
diff --git a/templates/show_user.inc.php b/templates/show_user.inc.php
index 2aa573da..e6de1c74 100644
--- a/templates/show_user.inc.php
+++ b/templates/show_user.inc.php
@@ -20,8 +20,8 @@
  *
  */
 
-$last_seen   = $client->last_seen ? date("m\/d\/y - H:i",$client->last_seen) : T_('Never');
-$create_date = $client->create_date ? date("m\/d\/y - H:i",$client->create_date) : T_('Unknown');
+$last_seen   = $client->last_seen ? date("m\/d\/y - H:i", $client->last_seen) : T_('Never');
+$create_date = $client->create_date ? date("m\/d\/y - H:i", $client->create_date) : T_('Unknown');
 $client->format();
 ?>
 <?php UI::show_box_top($client->f_name); ?>
@@ -58,7 +58,7 @@ if ($client->f_avatar) {
     <dt class="<?php echo $rowparity; ?>"><?php echo T_('Display Name'); ?></dt>
     <dd class="<?php echo $rowparity; ?>">
         <?php echo $client->f_name; ?>
-        <?php if (Access::check('interface','25') && AmpConfig::get('sociable')) {
+        <?php if (Access::check('interface', '25') && AmpConfig::get('sociable')) {
     ?>
             <a id="<?php echo 'reply_pvmsg_' . $client->id ?>" href="<?php echo AmpConfig::get('web_path');
     ?>/pvmsg.php?action=show_add_message&to_user=<?php echo $client->username;
@@ -68,7 +68,7 @@ if ($client->f_avatar) {
             </a>
         <?php 
 } ?>
-        <?php if (Access::check('interface','100')) {
+        <?php if (Access::check('interface', '100')) {
     ?>
             <a href="<?php echo AmpConfig::get('web_path');
     ?>/admin/users.php?action=show_edit&user_id=<?php echo $client->id;
@@ -94,7 +94,7 @@ if ($client->f_avatar) {
     <dt class="<?php echo $rowparity; ?>"><?php echo T_('Last Seen'); ?></dt>
     <dd class="<?php echo $rowparity; ?>"><?php echo $last_seen; ?></dd>
     <?php $rowparity = UI::flip_class(); ?>
-    <?php if (Access::check('interface','50')) {
+    <?php if (Access::check('interface', '50')) {
     ?>
     <dt class="<?php echo $rowparity;
     ?>"><?php echo T_('Activity');
diff --git a/templates/show_user_activate.inc.php b/templates/show_user_activate.inc.php
index 48b6ca11..369791a5 100644
--- a/templates/show_user_activate.inc.php
+++ b/templates/show_user_activate.inc.php
@@ -20,7 +20,7 @@
  *
  */
 
-$htmllang = str_replace("_","-",AmpConfig::get('lang'));
+$htmllang = str_replace("_", "-", AmpConfig::get('lang'));
 $web_path = AmpConfig::get('web_path');
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
diff --git a/templates/show_user_preferences.inc.php b/templates/show_user_preferences.inc.php
index 89387e29..83de87b3 100644
--- a/templates/show_user_preferences.inc.php
+++ b/templates/show_user_preferences.inc.php
@@ -26,7 +26,7 @@
  */
 
 ?>
-<?php /* HINT: Editing Username preferences */ UI::show_box_top(sprintf(T_('Editing %s preferences'), $client->fullname),'box box_preferences'); ?>
+<?php /* HINT: Editing Username preferences */ UI::show_box_top(sprintf(T_('Editing %s preferences'), $client->fullname), 'box box_preferences'); ?>
 <form method="post" name="preferences" action="<?php echo AmpConfig::get('web_path'); ?>/preferences.php?action=admin_update_preferences" enctype="multipart/form-data">
 <table class="tabledata" cellspacing="0">
 <colgroup>
diff --git a/templates/show_user_registration.inc.php b/templates/show_user_registration.inc.php
index 3dca176a..76c0f945 100644
--- a/templates/show_user_registration.inc.php
+++ b/templates/show_user_registration.inc.php
@@ -20,7 +20,7 @@
  *
  */
 
-$htmllang = str_replace("_","-",AmpConfig::get('lang'));
+$htmllang = str_replace("_", "-", AmpConfig::get('lang'));
 $web_path = AmpConfig::get('web_path');
 
 $display_fields   = (array) AmpConfig::get('registration_display_fields');
diff --git a/templates/show_users.inc.php b/templates/show_users.inc.php
index 3fb5c6b1..93695b23 100644
--- a/templates/show_users.inc.php
+++ b/templates/show_users.inc.php
@@ -47,9 +47,9 @@ $web_path = AmpConfig::get('web_path');
 </colgroup>
 <thead>
     <tr class="th-top">
-      <th class="cel_username essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=user&sort=fullname', T_('Fullname'),'users_sort_fullname'); ?> (<?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=username', T_('Username'),'users_sort_username');?>)</th>
-      <th class="cel_lastseen"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=user&sort=last_seen', T_('Last Seen'),'users_sort_lastseen'); ?></th>
-      <th class="cel_registrationdate"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=user&sort=create_date', T_('Registration Date'),'users_sort_createdate'); ?></th>
+      <th class="cel_username essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=user&sort=fullname', T_('Fullname'), 'users_sort_fullname'); ?> (<?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=username', T_('Username'), 'users_sort_username');?>)</th>
+      <th class="cel_lastseen"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=user&sort=last_seen', T_('Last Seen'), 'users_sort_lastseen'); ?></th>
+      <th class="cel_registrationdate"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=user&sort=create_date', T_('Registration Date'), 'users_sort_createdate'); ?></th>
       <?php if (Access::check('interface', 50)) {
     ?>
       <th class="cel_activity"><?php echo T_('Activity');
@@ -78,8 +78,8 @@ $web_path = AmpConfig::get('web_path');
 foreach ($object_ids as $user_id) {
     $libitem = new User($user_id);
     $libitem->format();
-    $last_seen      = $libitem->last_seen ? date("m\/d\/Y - H:i",$libitem->last_seen) : T_('Never');
-    $create_date    = $libitem->create_date ? date("m\/d\/Y - H:i",$libitem->create_date) : T_('Unknown');
+    $last_seen      = $libitem->last_seen ? date("m\/d\/Y - H:i", $libitem->last_seen) : T_('Never');
+    $create_date    = $libitem->create_date ? date("m\/d\/Y - H:i", $libitem->create_date) : T_('Unknown');
     ?>
 <tr class="<?php echo UI::flip_class();
     ?>" id="admin_user_<?php echo $libitem->id;
@@ -92,9 +92,9 @@ foreach ($object_ids as $user_id) {
 </tbody>
 <tfoot>
     <tr class="th-bottom">
-        <th class="cel_username"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=user&sort=fullname', T_('Fullname'),'users_sort_fullname1'); ?>( <?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=username', T_('Username'),'users_sort_username1');?>)</th>
-      <th class="cel_lastseen"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=user&sort=last_seen', T_('Last Seen'),'users_sort_lastseen1'); ?></th>
-      <th class="cel_registrationdate"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=user&sort=create_date', T_('Registration Date'),'users_sort_createdate1'); ?></th>
+        <th class="cel_username"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=user&sort=fullname', T_('Fullname'), 'users_sort_fullname1'); ?>( <?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=username', T_('Username'), 'users_sort_username1');?>)</th>
+      <th class="cel_lastseen"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=user&sort=last_seen', T_('Last Seen'), 'users_sort_lastseen1'); ?></th>
+      <th class="cel_registrationdate"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=user&sort=create_date', T_('Registration Date'), 'users_sort_createdate1'); ?></th>
       <?php if (Access::check('interface', 50)) {
     ?>
       <th class="cel_activity"><?php echo T_('Activity');
diff --git a/templates/show_video.inc.php b/templates/show_video.inc.php
index 38be2af6..7ea53692 100644
--- a/templates/show_video.inc.php
+++ b/templates/show_video.inc.php
@@ -69,7 +69,7 @@ $subtitles = $video->get_subtitles();
         <dd class="<?php echo $rowparity;
     ?>">
             <div id="rating_<?php echo $video->id;
-    ?>_video"><?php Rating::show($video->id,'video');
+    ?>_video"><?php Rating::show($video->id, 'video');
     ?>
             </div>
         </dd>
@@ -87,7 +87,7 @@ $subtitles = $video->get_subtitles();
         <dd class="<?php echo $rowparity;
     ?>">
             <div id="userflag_<?php echo $video->id;
-    ?>_video"><?php Userflag::show($video->id,'video');
+    ?>_video"><?php Userflag::show($video->id, 'video');
     ?>
             </div>
         </dd>
@@ -101,19 +101,19 @@ $subtitles = $video->get_subtitles();
     <dd class="<?php echo $rowparity; ?>">
         <?php if (AmpConfig::get('directplay')) {
     ?>
-            <?php echo Ajax::button('?page=stream&action=directplay&object_type=video&object_id=' . $video->id, 'play', T_('Play'),'play_video_' . $video->id);
+            <?php echo Ajax::button('?page=stream&action=directplay&object_type=video&object_id=' . $video->id, 'play', T_('Play'), 'play_video_' . $video->id);
     ?>
             <?php if (Stream_Playlist::check_autoplay_append()) {
     ?>
-                <?php echo Ajax::button('?page=stream&action=directplay&object_type=video&object_id=' . $video->id . '&append=true','play_add', T_('Play last'),'addplay_video_' . $video->id);
+                <?php echo Ajax::button('?page=stream&action=directplay&object_type=video&object_id=' . $video->id . '&append=true', 'play_add', T_('Play last'), 'addplay_video_' . $video->id);
     ?>
             <?php 
 }
     ?>
         <?php 
 } ?>
-        <?php echo Ajax::button('?action=basket&type=video&id=' . $video->id,'add', T_('Add to temporary playlist'),'add_video_' . $video->id); ?>
-        <?php if (!AmpConfig::get('use_auth') || Access::check('interface','25')) {
+        <?php echo Ajax::button('?action=basket&type=video&id=' . $video->id, 'add', T_('Add to temporary playlist'), 'add_video_' . $video->id); ?>
+        <?php if (!AmpConfig::get('use_auth') || Access::check('interface', '25')) {
     ?>
             <?php if (AmpConfig::get('sociable')) {
     ?>
@@ -127,7 +127,7 @@ $subtitles = $video->get_subtitles();
         <?php 
 }
     ?>
-    <?php if (Access::check('interface','25')) {
+    <?php if (Access::check('interface', '25')) {
     ?>
             <?php if (AmpConfig::get('share')) {
     ?>
@@ -149,7 +149,7 @@ $subtitles = $video->get_subtitles();
     ?></a>
         <?php 
 } ?>
-        <?php if (Access::check('interface','50')) {
+        <?php if (Access::check('interface', '50')) {
     ?>
             <?php if (AmpConfig::get('statistical_graphs')) {
     ?>
@@ -191,13 +191,13 @@ if (!strtolower(get_class($video)) != 'video') {
   $videoprops[gettext_noop('Video Bitrate')]   = scrub_out($video->f_video_bitrate);
   $videoprops[gettext_noop('Frame Rate')]      = scrub_out($video->f_frame_rate);
   $videoprops[gettext_noop('Channels')]        = scrub_out($video->channels);
-  if (Access::check('interface','75')) {
+  if (Access::check('interface', '75')) {
       $videoprops[gettext_noop('Filename')]   = scrub_out($video->file) . " " . $video->f_size;
   }
   if ($video->update_time) {
-      $videoprops[gettext_noop('Last Updated')]   = date("d/m/Y H:i",$video->update_time);
+      $videoprops[gettext_noop('Last Updated')]   = date("d/m/Y H:i", $video->update_time);
   }
-  $videoprops[gettext_noop('Added')]   = date("d/m/Y H:i",$video->addition_time);
+  $videoprops[gettext_noop('Added')]   = date("d/m/Y H:i", $video->addition_time);
   if (AmpConfig::get('show_played_times')) {
       $videoprops[gettext_noop('# Played')]   = scrub_out($video->object_cnt);
   }
diff --git a/templates/show_video_row.inc.php b/templates/show_video_row.inc.php
index ee9a8dea..7b7b9dd7 100644
--- a/templates/show_video_row.inc.php
+++ b/templates/show_video_row.inc.php
@@ -30,11 +30,11 @@ if (!isset($video_type)) {
     <div class="cel_play_hover">
     <?php
         if (AmpConfig::get('directplay')) {
-            echo Ajax::button('?page=stream&action=directplay&object_type=video&object_id=' . $libitem->id,'play', T_('Play'),'play_video_' . $libitem->id);
+            echo Ajax::button('?page=stream&action=directplay&object_type=video&object_id=' . $libitem->id, 'play', T_('Play'), 'play_video_' . $libitem->id);
             if (Stream_Playlist::check_autoplay_next()) {
                 echo Ajax::button('?page=stream&action=directplay&object_type=video&object_id=' . $libitem->id . '&playnext=true', 'play_next', T_('Play next'), 'nextplay_video_' . $libitem->id);
                 if (Stream_Playlist::check_autoplay_append()) {
-                    echo Ajax::button('?page=stream&action=directplay&object_type=video&object_id=' . $libitem->id . '&append=true','play_add', T_('Play last'),'addplay_video_' . $libitem->id);
+                    echo Ajax::button('?page=stream&action=directplay&object_type=video&object_id=' . $libitem->id . '&append=true', 'play_add', T_('Play last'), 'addplay_video_' . $libitem->id);
                 }
             }
         }
@@ -62,7 +62,7 @@ if (Art::is_enabled()) {
 <td class="cel_add">
     <span class="cel_item_add">
 <?php
-    echo Ajax::button('?action=basket&type=video&id=' . $libitem->id,'add', T_('Add to temporary playlist'),'add_' . $libitem->id);
+    echo Ajax::button('?action=basket&type=video&id=' . $libitem->id, 'add', T_('Add to temporary playlist'), 'add_' . $libitem->id);
     if (Access::check('interface', '25')) {
         ?>
         <a id="<?php echo 'add_playlist_' . $libitem->id ?>" onclick="showPlaylistDialog(event, 'video', '<?php echo $libitem->id ?>')">
@@ -107,14 +107,14 @@ if ($video_type != 'video') {
     ?>
 <td class="cel_action">
 <a href="<?php echo $libitem->link; ?>"><?php echo UI::get_icon('preferences', T_('Video Information')); ?></a>
-<?php if (!AmpConfig::get('use_auth') || Access::check('interface','25')) {
+<?php if (!AmpConfig::get('use_auth') || Access::check('interface', '25')) {
     if (AmpConfig::get('sociable')) {
         ?>
         <a href="<?php echo AmpConfig::get('web_path') ?>/shout.php?action=show_add_shout&type=video&id=<?php echo $libitem->id ?>"><?php echo UI::get_icon('comment', T_('Post Shout')) ?></a>
     <?php 
     }
 }
-     if (Access::check('interface','25')) {
+     if (Access::check('interface', '25')) {
          if (AmpConfig::get('share')) {
              Share::display_ui('video', $libitem->id, false);
          }
@@ -127,7 +127,7 @@ if (Access::check_function('download')) {
     ?></a>
 <?php 
 }
-    if (Access::check('interface','50')) {
+    if (Access::check('interface', '50')) {
         ?>
     <a id="<?php echo 'edit_video_' . $libitem->id ?>" onclick="showEditDialog('video_row', '<?php echo $libitem->id ?>', '<?php echo 'edit_video_' . $libitem->id ?>', '<?php echo T_('Video edit') ?>', 'video_')">
         <?php echo UI::get_icon('edit', T_('Edit'));
diff --git a/templates/show_videos.inc.php b/templates/show_videos.inc.php
index 4e390544..f81228e5 100644
--- a/templates/show_videos.inc.php
+++ b/templates/show_videos.inc.php
@@ -35,17 +35,17 @@ if ($browse->get_show_header()) {
     ?></th>
         <?php 
 } ?>
-            <th class="cel_title essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=title', T_('Title'),'sort_video_title'); ?></th>
+            <th class="cel_title essential persist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=title', T_('Title'), 'sort_video_title'); ?></th>
             <th class="cel_add essential"></th>
 <?php
 if (isset($video_type) && $video_type != 'video') {
     require AmpConfig::get('prefix') . UI::find_template('show_partial_' . $video_type . 's.inc.php');
 }
 ?>
-            <th class="cel_release_date optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=release_date', T_('Release Date'),'sort_video_release_date'); ?></th>
-            <th class="cel_codec optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=codec', T_('Codec'),'sort_video_codec'); ?></th>
-            <th class="cel_resolution optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=resolution', T_('Resolution'),'sort_video_rez'); ?></th>
-            <th class="cel_length optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=length', T_('Time'),'sort_video_length'); ?></th>
+            <th class="cel_release_date optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=release_date', T_('Release Date'), 'sort_video_release_date'); ?></th>
+            <th class="cel_codec optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=codec', T_('Codec'), 'sort_video_codec'); ?></th>
+            <th class="cel_resolution optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=resolution', T_('Resolution'), 'sort_video_rez'); ?></th>
+            <th class="cel_length optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=length', T_('Time'), 'sort_video_length'); ?></th>
             <?php if (AmpConfig::get('show_played_times')) {
     ?>
             <th class="cel_counter optional"><?php echo T_('# Played');
@@ -112,17 +112,17 @@ if (isset($video_type) && $video_type != 'video') {
     ?></th>
         <?php 
 } ?>
-            <th class="cel_title"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=title', T_('Title'),'sort_video_title'); ?></th>
+            <th class="cel_title"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=title', T_('Title'), 'sort_video_title'); ?></th>
             <th class="cel_add"></th>
 <?php
 if (isset($video_type) && $video_type != 'video') {
     require AmpConfig::get('prefix') . UI::find_template('show_partial_' . $video_type . 's.inc.php');
 }
 ?>
-            <th class="cel_release_date"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=release_date', T_('Release Date'),'sort_video_release_date'); ?></th>
-            <th class="cel_codec"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=codec', T_('Codec'),'sort_video_codec'); ?></th>
-            <th class="cel_resolution"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=resolution', T_('Resolution'),'sort_video_rez'); ?></th>
-            <th class="cel_length"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=length', T_('Time'),'sort_video_length'); ?></th>
+            <th class="cel_release_date"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=release_date', T_('Release Date'), 'sort_video_release_date'); ?></th>
+            <th class="cel_codec"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=codec', T_('Codec'), 'sort_video_codec'); ?></th>
+            <th class="cel_resolution"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=resolution', T_('Resolution'), 'sort_video_rez'); ?></th>
+            <th class="cel_length"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=video&sort=length', T_('Time'), 'sort_video_length'); ?></th>
             <?php if (AmpConfig::get('show_played_times')) {
     ?>
             <th class="cel_counter optional"><?php echo T_('# Played');
diff --git a/templates/show_wanted_albums.inc.php b/templates/show_wanted_albums.inc.php
index a8174b13..62be60f4 100644
--- a/templates/show_wanted_albums.inc.php
+++ b/templates/show_wanted_albums.inc.php
@@ -23,10 +23,10 @@
 <table class="tabledata <?php echo $browse->get_css_class() ?>" cellpadding="0" cellspacing="0" data-objecttype="wanted">
     <thead>
         <tr class="th-top">
-            <th class="cel_album essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=wanted&sort=name', T_('Album'),'sort_wanted_album'); ?></th>
-            <th class="cel_artist essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=wanted&sort=artist', T_('Artist'),'sort_wanted_artist'); ?></th>
-            <th class="cel_year optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=wanted&sort=year', T_('Year'),'sort_wanted_year'); ?></th>
-            <th class="cel_user optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=wanted&sort=user', T_('User'),'sort_wanted_user'); ?></th>
+            <th class="cel_album essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=wanted&sort=name', T_('Album'), 'sort_wanted_album'); ?></th>
+            <th class="cel_artist essential"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=wanted&sort=artist', T_('Artist'), 'sort_wanted_artist'); ?></th>
+            <th class="cel_year optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=wanted&sort=year', T_('Year'), 'sort_wanted_year'); ?></th>
+            <th class="cel_user optional"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&type=wanted&sort=user', T_('User'), 'sort_wanted_user'); ?></th>
             <th class="cel_action essential"><?php echo T_('Actions'); ?></th>
         </tr>
     </thead>
diff --git a/templates/sidebar_admin.inc.php b/templates/sidebar_admin.inc.php
index fe87c404..3bf55df8 100644
--- a/templates/sidebar_admin.inc.php
+++ b/templates/sidebar_admin.inc.php
@@ -63,7 +63,7 @@
 } ?>
     </ul>
   </li>
-<?php if (Access::check('interface','100')) {
+<?php if (Access::check('interface', '100')) {
     ?>
   <li><h4 class="header"><span class="sidebar-header-title" title="<?php echo T_('Server Config');
     ?>"><?php echo T_('Server Config');
diff --git a/templates/sidebar_home.inc.php b/templates/sidebar_home.inc.php
index 7ccabff0..1ca17f47 100644
--- a/templates/sidebar_home.inc.php
+++ b/templates/sidebar_home.inc.php
@@ -115,7 +115,7 @@
             <?php 
 }
     ?>
-            <?php if ($server_allow = AmpConfig::get('allow_localplay_playback') and $controller = AmpConfig::get('localplay_controller') and $access_check = Access::check('localplay','5')) {
+            <?php if ($server_allow = AmpConfig::get('allow_localplay_playback') and $controller = AmpConfig::get('localplay_controller') and $access_check = Access::check('localplay', '5')) {
     ?>
             <?php
                 // Little bit of work to be done here
@@ -178,7 +178,7 @@
                 <?php 
 }
     ?>
-                <?php if (Access::check('interface','50')) {
+                <?php if (Access::check('interface', '50')) {
     ?>
                     <li id="sb_home_info_statistic"><a href="<?php echo $web_path ?>/stats.php?action=show"><?php echo T_('Statistics') ?></a></li>
                 <?php 
@@ -193,10 +193,10 @@
         <ul class="sb3" id="sb_home_random" style="<?php if (!isset($_COOKIE['sb_random'])) {
     echo 'display: none;';
 } ?>">
-            <li id="sb_home_random_album"><?php echo Ajax::text('?page=random&action=song', T_('Song'),'home_random_song'); ?></li>
-            <li id="sb_home_random_album"><?php echo Ajax::text('?page=random&action=album', T_('Album'),'home_random_album'); ?></li>
-            <li id="sb_home_random_artist"><?php echo Ajax::text('?page=random&action=artist', T_('Artist'),'home_random_artist'); ?></li>
-            <li id="sb_home_random_playlist"><?php echo Ajax::text('?page=random&action=playlist', T_('Playlist'),'home_random_playlist'); ?></li>
+            <li id="sb_home_random_album"><?php echo Ajax::text('?page=random&action=song', T_('Song'), 'home_random_song'); ?></li>
+            <li id="sb_home_random_album"><?php echo Ajax::text('?page=random&action=album', T_('Album'), 'home_random_album'); ?></li>
+            <li id="sb_home_random_artist"><?php echo Ajax::text('?page=random&action=artist', T_('Artist'), 'home_random_artist'); ?></li>
+            <li id="sb_home_random_playlist"><?php echo Ajax::text('?page=random&action=playlist', T_('Playlist'), 'home_random_playlist'); ?></li>
             <li id="sb_home_random_advanced"><a href="<?php echo $web_path; ?>/random.php?action=advanced&type=song"><?php echo T_('Advanced'); ?></a></li>
         </ul>
     </li>
diff --git a/templates/sidebar_localplay.inc.php b/templates/sidebar_localplay.inc.php
index 6888012a..5ddd5087 100644
--- a/templates/sidebar_localplay.inc.php
+++ b/templates/sidebar_localplay.inc.php
@@ -25,7 +25,7 @@
 <?php
 $server_allow = AmpConfig::get('allow_localplay_playback');
 $controller   = AmpConfig::get('localplay_controller');
-$access_check = Access::check('localplay','5');
+$access_check = Access::check('localplay', '5');
 if ($server_allow && $controller && $access_check) {
     ?>
 <?php
@@ -34,7 +34,7 @@ if ($server_allow && $controller && $access_check) {
     $current_instance = $localplay->current_instance();
     $class            = $current_instance ? '' : ' class="active_instance"';
     ?>
-<?php if (Access::check('localplay','25')) {
+<?php if (Access::check('localplay', '25')) {
     ?>
   <li><h4 class="header"><span class="sidebar-header-title" title="<?php echo T_('Localplay');
     ?>"><?php echo T_('Localplay');
@@ -44,7 +44,7 @@ if ($server_allow && $controller && $access_check) {
     ?>" title="<?php echo T_('Expand/Collapse');
     ?>" /></h4>
     <ul class="sb3" id="sb_localplay_info">
-<?php if (Access::check('localplay','75')) {
+<?php if (Access::check('localplay', '75')) {
     ?>
     <li id="sb_localplay_info_add_instance"><a href="<?php echo $web_path;
     ?>/localplay.php?action=show_add_instance"><?php echo T_('Add Instance');
@@ -72,7 +72,7 @@ if ($server_allow && $controller && $access_check) {
     ?>" /></h4>
     <ul class="sb3" id="sb_localplay_instances">
     <li id="sb_localplay_instances_none"<?php echo $class;
-    ?>><?php echo Ajax::text('?page=localplay&action=set_instance&instance=0', T_('None'),'localplay_instance_none');
+    ?>><?php echo Ajax::text('?page=localplay&action=set_instance&instance=0', T_('None'), 'localplay_instance_none');
     ?></li>
     <?php
         // Requires a little work.. :(
@@ -86,7 +86,7 @@ if ($server_allow && $controller && $access_check) {
         ?>
     <li id="sb_localplay_instances_<?php echo $uid;
         ?>"<?php echo $class;
-        ?>><?php echo Ajax::text('?page=localplay&action=set_instance&instance=' . $uid,$name,'localplay_instance_' . $uid);
+        ?>><?php echo Ajax::text('?page=localplay&action=set_instance&instance=' . $uid, $name, 'localplay_instance_' . $uid);
         ?></li>
     <?php 
     }
diff --git a/tvshows.php b/tvshows.php
index 3fe90457..27032b0a 100644
--- a/tvshows.php
+++ b/tvshows.php
@@ -77,8 +77,8 @@ switch ($_REQUEST['action']) {
         }
         /* Enclose this in the purty box! */
         require AmpConfig::get('prefix') . UI::find_template('show_box_top.inc.php');
-        show_alphabet_list('tvshows','tvshows.php',$match);
-        show_alphabet_form($chr, T_('Show TV Shows starting with'),"tvshows.php?action=match");
+        show_alphabet_list('tvshows', 'tvshows.php', $match);
+        show_alphabet_form($chr, T_('Show TV Shows starting with'), "tvshows.php?action=match");
         require AmpConfig::get('prefix') . UI::find_template('show_box_bottom.inc.php');
 
         if ($match === "Browse") {
diff --git a/update.php b/update.php
index 3abf0c4d..e1dcdc58 100644
--- a/update.php
+++ b/update.php
@@ -50,7 +50,7 @@ if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'update') {
         $version = Update::get_version();
     }
 }
-$htmllang = str_replace("_","-",AmpConfig::get('lang'));
+$htmllang = str_replace("_", "-", AmpConfig::get('lang'));
 
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
diff --git a/upnp/MediaServerServiceDesc.php b/upnp/MediaServerServiceDesc.php
index 76e178f1..6d7a9e0a 100644
--- a/upnp/MediaServerServiceDesc.php
+++ b/upnp/MediaServerServiceDesc.php
@@ -1,5 +1,5 @@
 <?php
-define('NO_SESSION','1');
+define('NO_SESSION', '1');
 require_once '../lib/init.php';
 
 if (!AmpConfig::get('upnp_backend')) {
@@ -7,7 +7,7 @@ if (!AmpConfig::get('upnp_backend')) {
     exit;
 }
 
-header ("Content-Type:text/xml");
+header("Content-Type:text/xml");
 $web_path = AmpConfig::get('local_web_path');
 
 echo '<?xml version="1.0" encoding="UTF-8"?>';
diff --git a/upnp/cm-control-reply.php b/upnp/cm-control-reply.php
index e2fbc85b..df4dbbe9 100644
--- a/upnp/cm-control-reply.php
+++ b/upnp/cm-control-reply.php
@@ -1,5 +1,5 @@
 <?php
-define('NO_SESSION','1');
+define('NO_SESSION', '1');
 require_once '../lib/init.php';
 
 if (!AmpConfig::get('upnp_backend')) {
@@ -9,7 +9,7 @@ if (!AmpConfig::get('upnp_backend')) {
 
 set_time_limit(600);
 
-header ("Content-Type: text/html; charset=UTF-8");
+header("Content-Type: text/html; charset=UTF-8");
 
 // Parse the request from UPnP player
 $requestRaw = file_get_contents('php://input');
@@ -28,5 +28,3 @@ switch ($upnpRequest['action']) {
         //$items = Upnp_Api::cm_getProtocolInfo();
     break;
 }
-
-?>
diff --git a/upnp/cm-event-reply.php b/upnp/cm-event-reply.php
index 99dcd3f4..4090276e 100644
--- a/upnp/cm-event-reply.php
+++ b/upnp/cm-event-reply.php
@@ -1,3 +1,2 @@
 <?php
 require_once 'event-reply.php';
-?>
diff --git a/upnp/control-reply.php b/upnp/control-reply.php
index b84bff4c..ad8184ed 100644
--- a/upnp/control-reply.php
+++ b/upnp/control-reply.php
@@ -1,5 +1,5 @@
 <?php
-define('NO_SESSION','1');
+define('NO_SESSION', '1');
 require_once '../lib/init.php';
 
 if (!AmpConfig::get('upnp_backend')) {
@@ -9,7 +9,7 @@ if (!AmpConfig::get('upnp_backend')) {
 
 set_time_limit(600);
 
-header ("Content-Type: text/html; charset=UTF-8");
+header("Content-Type: text/html; charset=UTF-8");
 $rootMediaItems   = array();
 $rootMediaItems[] = Upnp_Api::_musicMetadata('');
 $rootMediaItems[] = Upnp_Api::_videoMetadata('');
@@ -101,4 +101,3 @@ $rootMediaItems[] = Upnp_Api::_videoMetadata('');
 
     echo $soapXML;
     //!!debug_event('upnp', 'Response: ' . $soapXML, '5');
-?>
diff --git a/upnp/event-reply.php b/upnp/event-reply.php
index 4c91f2c1..2c0271cc 100644
--- a/upnp/event-reply.php
+++ b/upnp/event-reply.php
@@ -1,7 +1,7 @@
 <?php
 // No event subscribe support but avoid few players error (e.g. Windows Media Player).
 
-define('NO_SESSION','1');
+define('NO_SESSION', '1');
 require_once '../lib/init.php';
 
 $headers = getallheaders();
@@ -16,4 +16,3 @@ header("SID: uuid:" . uniqid());
 header("TIMEOUT:" . $timeout);
 header("Connection: close");
 exit;
-?>
diff --git a/upnp/find.php b/upnp/find.php
index fdc7d44a..d91e9b32 100644
--- a/upnp/find.php
+++ b/upnp/find.php
@@ -1,6 +1,6 @@
 <?php
 
-error_reporting( E_ALL );
+error_reporting(E_ALL);
 ini_set('display_errors', 1);
 
 class UPnPFind
diff --git a/upnp/index.php b/upnp/index.php
index 4d78fb1d..f8ef7ca7 100644
--- a/upnp/index.php
+++ b/upnp/index.php
@@ -1,5 +1,5 @@
 <?php
-define('NO_SESSION','1');
+define('NO_SESSION', '1');
 require_once '../lib/init.php';
 
 if (!AmpConfig::get('upnp_backend')) {
diff --git a/upnp/playstatus.php b/upnp/playstatus.php
index 61c06494..e921a382 100644
--- a/upnp/playstatus.php
+++ b/upnp/playstatus.php
@@ -46,5 +46,3 @@ if ($played) {
         echo "Next song FAILED!" . "\n";
     }
 }
-
-?>
diff --git a/util.php b/util.php
index 2c703275..60eff883 100644
--- a/util.php
+++ b/util.php
@@ -36,5 +36,5 @@ if (isset($_SESSION['iframe']['target'])) {
     header("Location: " . $target);
 } else {
     // Prevent the update query as it's pointless
-    define('NO_SESSION_UPDATE','1');
+    define('NO_SESSION_UPDATE', '1');
 }
diff --git a/webdav/index.php b/webdav/index.php
index df659c03..c8a88515 100644
--- a/webdav/index.php
+++ b/webdav/index.php
@@ -20,7 +20,7 @@
  *
  */
 
-define('NO_SESSION','1');
+define('NO_SESSION', '1');
 require_once '../lib/init.php';
 
 if (!AmpConfig::get('webdav_backend')) {

From 3c508686ca5693a0656eadfe74e958049e325d22 Mon Sep 17 00:00:00 2001
From: "Phyks (Lucas Verney)" <phyks@phyks.me>
Date: Fri, 17 Jun 2016 12:39:34 +0200
Subject: [PATCH 2/4] Fix for PSR0 compatibility

Not sure how relevant it is.
---
 .php_cs                                       |  1 -
 .../upnp/{upnpdevice.php => UPnPDevice.php}   | 30 +++++++++----------
 .../{upnpplaylist.php => UPnPPlaylist.php}    |  0
 modules/localplay/upnp/upnpplayer.class.php   |  4 +--
 4 files changed, 17 insertions(+), 18 deletions(-)
 rename modules/localplay/upnp/{upnpdevice.php => UPnPDevice.php} (89%)
 rename modules/localplay/upnp/{upnpplaylist.php => UPnPPlaylist.php} (100%)

diff --git a/.php_cs b/.php_cs
index c91f8f79..5e939703 100644
--- a/.php_cs
+++ b/.php_cs
@@ -15,7 +15,6 @@ $finder = Symfony\CS\Finder\DefaultFinder::create()
 
 return Symfony\CS\Config\Config::create()
     ->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
-    ->fixers(array('-psr0'))
     ->finder($finder)
     ->setUsingCache(true)
 ;
diff --git a/modules/localplay/upnp/upnpdevice.php b/modules/localplay/upnp/UPnPDevice.php
similarity index 89%
rename from modules/localplay/upnp/upnpdevice.php
rename to modules/localplay/upnp/UPnPDevice.php
index 0279b5ca..74b55ee7 100644
--- a/modules/localplay/upnp/upnpdevice.php
+++ b/modules/localplay/upnp/UPnPDevice.php
@@ -22,11 +22,11 @@ class UPnPDevice
      */
     private function restoreDescriptionUrl($descriptionUrl)
     {
-        debug_event('upnpdevice', 'readDescriptionUrl: ' . $descriptionUrl, 5);
+        debug_event('UPnPDevice', 'readDescriptionUrl: ' . $descriptionUrl, 5);
         $this->_settings = json_decode(Session::read('upnp_dev_' . $descriptionUrl), true);
 
         if ($this->_settings['descriptionURL'] == $descriptionUrl) {
-            debug_event('upnpdevice', 'service Urls restored from session.', 5);
+            debug_event('UPnPDevice', 'service Urls restored from session.', 5);
             return true;
         }
         return false;
@@ -34,14 +34,14 @@ class UPnPDevice
 
     private function parseDescriptionUrl($descriptionUrl)
     {
-        debug_event('upnpdevice', 'parseDescriptionUrl: ' . $descriptionUrl, 5);
+        debug_event('UPnPDevice', 'parseDescriptionUrl: ' . $descriptionUrl, 5);
 
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $descriptionUrl);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         $response = curl_exec($ch);
         curl_close($ch);
-        //!!debug_event('upnpdevice', 'parseDescriptionUrl response: ' . $response, 5);
+        //!!debug_event('UPnPDevice', 'parseDescriptionUrl response: ' . $response, 5);
 
         $responseXML = simplexml_load_string($response);
         $services    = $responseXML->device->serviceList->service;
@@ -92,9 +92,9 @@ class UPnPDevice
             'Connection: close',
             'Content-Length: ' . mb_strlen($body),
         );
-        //debug_event('upnpdevice', 'sendRequestToDevice Met: ' . $method . ' | ' . $controlUrl, 5);
-        //debug_event('upnpdevice', 'sendRequestToDevice Body: ' . $body, 5);
-        //debug_event('upnpdevice', 'sendRequestToDevice Hdr: ' . print_r($header, true), 5);
+        //debug_event('UPnPDevice', 'sendRequestToDevice Met: ' . $method . ' | ' . $controlUrl, 5);
+        //debug_event('UPnPDevice', 'sendRequestToDevice Body: ' . $body, 5);
+        //debug_event('UPnPDevice', 'sendRequestToDevice Hdr: ' . print_r($header, true), 5);
 
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $controlUrl);
@@ -107,7 +107,7 @@ class UPnPDevice
 
         $response = curl_exec($ch);
         curl_close($ch);
-        //debug_event('upnpdevice', 'sendRequestToDevice response: ' . $response, 5);
+        //debug_event('UPnPDevice', 'sendRequestToDevice response: ' . $response, 5);
 
         $headers = array();
         $tmp     = explode("\r\n\r\n", $response);
@@ -124,14 +124,14 @@ class UPnPDevice
         /*
         $lastHeaders = $headers[count($headers) - 1];
         $responseCode = $this->getResponseCode($lastHeaders);
-        debug_event('upnpdevice', 'sendRequestToDevice responseCode: ' . $responseCode, 5);
+        debug_event('UPnPDevice', 'sendRequestToDevice responseCode: ' . $responseCode, 5);
         if ($responseCode == 500)
         {
-            debug_event('upnpdevice', 'sendRequestToDevice HTTP-Code 500 - Create error response', 5);
+            debug_event('UPnPDevice', 'sendRequestToDevice HTTP-Code 500 - Create error response', 5);
         }
         else 
         {
-            debug_event('upnpdevice', 'sendRequestToDevice HTTP-Code OK - Create response', 5);
+            debug_event('UPnPDevice', 'sendRequestToDevice HTTP-Code OK - Create response', 5);
         }
         */
         
@@ -189,7 +189,7 @@ class UPnPDevice
             'NT: upnp:event',
             'TIMEOUT: Second-180',
         );
-        debug_event('upnpdevice', 'Subscribe with: ' . print_r($header, true), 5);
+        debug_event('UPnPDevice', 'Subscribe with: ' . print_r($header, true), 5);
 
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $eventUrl);
@@ -201,7 +201,7 @@ class UPnPDevice
 
         $response = curl_exec($ch);
         curl_close( $ch );
-        debug_event('upnpdevice', 'Subscribe response: ' . $response, 5);
+        debug_event('UPnPDevice', 'Subscribe response: ' . $response, 5);
 
         $lines = explode("\r\n", trim($response));
         foreach($lines as $line) {
@@ -211,7 +211,7 @@ class UPnPDevice
 
             if ($key == 'SID')
             {
-                debug_event('upnpdevice', 'Subscribtion SID: ' . $value, 5);
+                debug_event('UPnPDevice', 'Subscribtion SID: ' . $value, 5);
                 return $value;
             }
         }
@@ -239,7 +239,7 @@ class UPnPDevice
             'SID: ' . $sid,
         );
 
-        debug_event('upnpdevice', 'Unsubscribe from SID: ' . $sid . ' with: ' . "\n" . print_r($header, true), 5);
+        debug_event('UPnPDevice', 'Unsubscribe from SID: ' . $sid . ' with: ' . "\n" . print_r($header, true), 5);
 
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $eventUrl);
diff --git a/modules/localplay/upnp/upnpplaylist.php b/modules/localplay/upnp/UPnPPlaylist.php
similarity index 100%
rename from modules/localplay/upnp/upnpplaylist.php
rename to modules/localplay/upnp/UPnPPlaylist.php
diff --git a/modules/localplay/upnp/upnpplayer.class.php b/modules/localplay/upnp/upnpplayer.class.php
index 102fc4ec..b58e9164 100644
--- a/modules/localplay/upnp/upnpplayer.class.php
+++ b/modules/localplay/upnp/upnpplayer.class.php
@@ -69,8 +69,8 @@ class UPnPPlayer
      */
     public function __construct($name = "noname", $description_url = "http://localhost")
     {
-        require_once AmpConfig::get('prefix') . '/modules/localplay/upnp/upnpdevice.php';
-        require_once AmpConfig::get('prefix') . '/modules/localplay/upnp/upnpplaylist.php';
+        require_once AmpConfig::get('prefix') . '/modules/localplay/upnp/UPnPDevice.php';
+        require_once AmpConfig::get('prefix') . '/modules/localplay/upnp/UPnPPlaylist.php';
 
         debug_event('upnpPlayer', 'constructor: ' . $name . ' | ' . $description_url, 5);
         $this->_description_url = $description_url;

From e86ea9a09902bbd177a880c86cedf69627ffff28 Mon Sep 17 00:00:00 2001
From: "Phyks (Lucas Verney)" <phyks@phyks.me>
Date: Mon, 1 Aug 2016 22:02:00 +0200
Subject: [PATCH 3/4] Fix copyright date

---
 admin/access.php                                             | 2 +-
 admin/catalog.php                                            | 2 +-
 admin/duplicates.php                                         | 2 +-
 admin/export.php                                             | 2 +-
 admin/index.php                                              | 2 +-
 admin/license.php                                            | 2 +-
 admin/mail.php                                               | 2 +-
 admin/modules.php                                            | 2 +-
 admin/shout.php                                              | 2 +-
 admin/system.php                                             | 2 +-
 admin/users.php                                              | 2 +-
 albums.php                                                   | 2 +-
 artists.php                                                  | 2 +-
 arts.php                                                     | 2 +-
 batch.php                                                    | 2 +-
 bin/broadcast.inc                                            | 2 +-
 bin/calculate_art_size.inc                                   | 2 +-
 bin/catalog_update.inc                                       | 2 +-
 bin/channel_run.inc                                          | 2 +-
 bin/delete_disabled.inc                                      | 2 +-
 bin/dump_album_art.inc                                       | 2 +-
 bin/fix_filenames.inc                                        | 2 +-
 bin/install/add_user.inc                                     | 2 +-
 bin/install/install_db.inc                                   | 2 +-
 bin/install/update_db.inc                                    | 2 +-
 bin/migrate_config.inc                                       | 2 +-
 bin/print_tags.inc                                           | 2 +-
 bin/sort_files.inc                                           | 2 +-
 bin/websocket_run.inc                                        | 2 +-
 bin/write_playlists.inc                                      | 2 +-
 broadcast.php                                                | 2 +-
 browse.php                                                   | 2 +-
 channel.php                                                  | 2 +-
 channel/index.php                                            | 2 +-
 cookie_disclaimer.php                                        | 2 +-
 daap/index.php                                               | 2 +-
 democratic.php                                               | 2 +-
 graph.php                                                    | 2 +-
 image.php                                                    | 2 +-
 index.php                                                    | 2 +-
 install.php                                                  | 2 +-
 labels.php                                                   | 2 +-
 lib/batch.lib.php                                            | 2 +-
 lib/class/DatabaseObject.php                                 | 2 +-
 lib/class/Interfaces/Model.php                               | 2 +-
 lib/class/Metadata/Metadata.php                              | 2 +-
 lib/class/Metadata/Model/Metadata.php                        | 2 +-
 lib/class/Metadata/Model/MetadataField.php                   | 2 +-
 lib/class/Metadata/Repository/Metadata.php                   | 2 +-
 lib/class/Metadata/Repository/MetadataField.php              | 2 +-
 lib/class/Repository.php                                     | 2 +-
 lib/class/access.class.php                                   | 2 +-
 lib/class/ajax.class.php                                     | 2 +-
 lib/class/album.class.php                                    | 2 +-
 lib/class/ampache_rss.class.php                              | 2 +-
 lib/class/ampconfig.class.php                                | 2 +-
 lib/class/amperror.class.php                                 | 2 +-
 lib/class/api.class.php                                      | 2 +-
 lib/class/art.class.php                                      | 2 +-
 lib/class/artist.class.php                                   | 2 +-
 lib/class/artist_event.class.php                             | 2 +-
 lib/class/auth.class.php                                     | 2 +-
 lib/class/autoupdate.class.php                               | 2 +-
 lib/class/bookmark.class.php                                 | 2 +-
 lib/class/broadcast.class.php                                | 2 +-
 lib/class/broadcast_server.class.php                         | 2 +-
 lib/class/browse.class.php                                   | 2 +-
 lib/class/catalog.class.php                                  | 2 +-
 lib/class/channel.class.php                                  | 2 +-
 lib/class/clip.class.php                                     | 2 +-
 lib/class/core.class.php                                     | 2 +-
 lib/class/daap_api.class.php                                 | 2 +-
 lib/class/database_object.abstract.php                       | 2 +-
 lib/class/dba.class.php                                      | 2 +-
 lib/class/democratic.class.php                               | 2 +-
 lib/class/graph.class.php                                    | 2 +-
 lib/class/label.class.php                                    | 2 +-
 lib/class/ldap.class.php                                     | 2 +-
 lib/class/library_item.interface.php                         | 2 +-
 lib/class/license.class.php                                  | 2 +-
 lib/class/live_stream.class.php                              | 2 +-
 lib/class/localplay.class.php                                | 2 +-
 lib/class/localplay_controller.abstract.php                  | 2 +-
 lib/class/mailer.class.php                                   | 2 +-
 lib/class/media.interface.php                                | 2 +-
 lib/class/memory_object.class.php                            | 2 +-
 lib/class/movie.class.php                                    | 2 +-
 lib/class/openid.class.php                                   | 2 +-
 lib/class/personal_video.class.php                           | 2 +-
 lib/class/playable_item.interface.php                        | 2 +-
 lib/class/playlist.class.php                                 | 2 +-
 lib/class/playlist_object.abstract.php                       | 2 +-
 lib/class/plex_api.class.php                                 | 2 +-
 lib/class/plex_xml_data.class.php                            | 2 +-
 lib/class/plugin.class.php                                   | 2 +-
 lib/class/podcast.class.php                                  | 2 +-
 lib/class/podcast_episode.class.php                          | 2 +-
 lib/class/preference.class.php                               | 2 +-
 lib/class/privatemsg.class.php                               | 2 +-
 lib/class/query.class.php                                    | 2 +-
 lib/class/random.class.php                                   | 2 +-
 lib/class/rating.class.php                                   | 2 +-
 lib/class/recommendation.class.php                           | 2 +-
 lib/class/registration.class.php                             | 2 +-
 lib/class/scrobbler.class.php                                | 2 +-
 lib/class/scrobbler_async.class.php                          | 2 +-
 lib/class/search.class.php                                   | 2 +-
 lib/class/session.class.php                                  | 2 +-
 lib/class/share.class.php                                    | 2 +-
 lib/class/shoutbox.class.php                                 | 2 +-
 lib/class/slideshow.class.php                                | 2 +-
 lib/class/song.class.php                                     | 2 +-
 lib/class/song_preview.class.php                             | 2 +-
 lib/class/stats.class.php                                    | 2 +-
 lib/class/stream.class.php                                   | 2 +-
 lib/class/stream_playlist.class.php                          | 2 +-
 lib/class/stream_url.class.php                               | 2 +-
 lib/class/subsonic_api.class.php                             | 2 +-
 lib/class/subsonic_xml_data.class.php                        | 2 +-
 lib/class/tag.class.php                                      | 2 +-
 lib/class/tmp_playlist.class.php                             | 2 +-
 lib/class/tvshow.class.php                                   | 2 +-
 lib/class/tvshow_episode.class.php                           | 2 +-
 lib/class/tvshow_season.class.php                            | 2 +-
 lib/class/ui.class.php                                       | 2 +-
 lib/class/update.class.php                                   | 2 +-
 lib/class/upload.class.php                                   | 2 +-
 lib/class/upnp_api.class.php                                 | 2 +-
 lib/class/user.class.php                                     | 2 +-
 lib/class/useractivity.class.php                             | 2 +-
 lib/class/userflag.class.php                                 | 2 +-
 lib/class/vainfo.class.php                                   | 2 +-
 lib/class/video.class.php                                    | 2 +-
 lib/class/wanted.class.php                                   | 2 +-
 lib/class/waveform.class.php                                 | 2 +-
 lib/class/webdav_auth.class.php                              | 2 +-
 lib/class/webdav_catalog.class.php                           | 2 +-
 lib/class/webdav_directory.class.php                         | 2 +-
 lib/class/webdav_file.class.php                              | 2 +-
 lib/class/webplayer.class.php                                | 2 +-
 lib/class/xml_data.class.php                                 | 2 +-
 lib/debug.lib.php                                            | 2 +-
 lib/general.lib.php                                          | 2 +-
 lib/i18n.php                                                 | 2 +-
 lib/init-tiny.php                                            | 2 +-
 lib/init.php                                                 | 2 +-
 lib/install.lib.php                                          | 2 +-
 lib/javascript/ajax.js                                       | 2 +-
 lib/javascript/base.js                                       | 2 +-
 lib/javascript/search-data.php                               | 2 +-
 lib/javascript/tabledata.js                                  | 2 +-
 lib/javascript/tools.js                                      | 2 +-
 lib/log.lib.php                                              | 2 +-
 lib/login.php                                                | 2 +-
 lib/preferences.php                                          | 2 +-
 lib/rating.lib.php                                           | 2 +-
 lib/themes.php                                               | 2 +-
 lib/ui.lib.php                                               | 2 +-
 locale/base/gather-messages.sh                               | 4 ++--
 localplay.php                                                | 2 +-
 login.php                                                    | 2 +-
 logout.php                                                   | 2 +-
 lostpassword.php                                             | 2 +-
 mashup.php                                                   | 2 +-
 modules/Beets/Catalog.php                                    | 2 +-
 modules/Beets/CliHandler.php                                 | 2 +-
 modules/Beets/Handler.php                                    | 2 +-
 modules/Beets/JsonHandler.php                                | 2 +-
 modules/catalog/beets/beets.catalog.php                      | 2 +-
 modules/catalog/beetsremote/beetsremote.catalog.php          | 2 +-
 modules/catalog/dropbox/dropbox.catalog.php                  | 2 +-
 modules/catalog/local/local.catalog.php                      | 2 +-
 modules/catalog/remote/remote.catalog.php                    | 2 +-
 modules/catalog/soundcloud/soundcloud.catalog.php            | 2 +-
 modules/catalog/subsonic/subsonic.catalog.php                | 2 +-
 modules/catalog/subsonic/subsonic.client.php                 | 2 +-
 modules/infotools/AmazonSearchEngine.class.php               | 2 +-
 modules/localplay/httpq/httpq.controller.php                 | 2 +-
 modules/localplay/httpq/httpqplayer.class.php                | 2 +-
 modules/localplay/mpd/mpd.controller.php                     | 2 +-
 modules/localplay/upnp/UPnPPlaylist.php                      | 2 +-
 modules/localplay/upnp/upnp.controller.php                   | 2 +-
 modules/localplay/upnp/upnpplayer.class.php                  | 2 +-
 modules/localplay/vlc/vlc.controller.php                     | 2 +-
 modules/localplay/vlc/vlcplayer.class.php                    | 2 +-
 modules/localplay/xbmc/xbmc.controller.php                   | 2 +-
 modules/plugins/7Digital/7Digital.plugin.php                 | 2 +-
 modules/plugins/Amazon/Amazon.plugin.php                     | 2 +-
 modules/plugins/Bitly/Bitly.plugin.php                       | 2 +-
 modules/plugins/CatalogFavorites/CatalogFavorites.plugin.php | 2 +-
 modules/plugins/ChartLyrics/ChartLyrics.plugin.php           | 2 +-
 modules/plugins/Discogs/Discogs.plugin.php                   | 2 +-
 modules/plugins/Facebook/Facebook.plugin.php                 | 2 +-
 modules/plugins/Flattr/Flattr.plugin.php                     | 2 +-
 modules/plugins/Flickr/Flickr.plugin.php                     | 2 +-
 modules/plugins/FriendsTimeline/FriendsTimeline.plugin.php   | 2 +-
 modules/plugins/GoogleAnalytics/GoogleAnalytics.plugin.php   | 2 +-
 modules/plugins/GoogleMaps/GoogleMaps.plugin.php             | 2 +-
 modules/plugins/GooglePlus/GooglePlus.plugin.php             | 2 +-
 modules/plugins/Gravatar/Gravatar.plugin.php                 | 2 +-
 modules/plugins/Headphones/Headphones.plugin.php             | 2 +-
 modules/plugins/Lastfm/Lastfm.plugin.php                     | 2 +-
 modules/plugins/Libravatar/Libravatar.plugin.php             | 2 +-
 modules/plugins/Librefm/Librefm.plugin.php                   | 2 +-
 modules/plugins/LyricWiki/LyricWiki.plugin.php               | 2 +-
 modules/plugins/MusicBrainz/MusicBrainz.plugin.php           | 2 +-
 modules/plugins/Omdb/Omdb.plugin.php                         | 2 +-
 modules/plugins/Paypal/Paypal.plugin.php                     | 2 +-
 modules/plugins/Piwik/Piwik.plugin.php                       | 2 +-
 modules/plugins/RSSView/RSSView.plugin.php                   | 2 +-
 modules/plugins/ShoutHome/ShoutHome.plugin.php               | 2 +-
 modules/plugins/StreamBandwidth/StreamBandwidth.plugin.php   | 2 +-
 modules/plugins/StreamHits/StreamHits.plugin.php             | 2 +-
 modules/plugins/StreamTime/StreamTime.plugin.php             | 2 +-
 modules/plugins/TheAudioDb/TheAudioDb.plugin.php             | 2 +-
 modules/plugins/Tmdb/Tmdb.plugin.php                         | 2 +-
 modules/plugins/Tvdb/Tvdb.plugin.php                         | 2 +-
 modules/plugins/Twitter/Twitter.plugin.php                   | 2 +-
 modules/plugins/Yourls/Yourls.plugin.php                     | 2 +-
 nbproject/licenseheader.txt                                  | 4 ++--
 phpinfo.php                                                  | 2 +-
 play/index.php                                               | 2 +-
 playlist.php                                                 | 2 +-
 plex/index.php                                               | 2 +-
 plex/web/index.php                                           | 2 +-
 plex/web/init.php                                            | 2 +-
 plex/web/login.php                                           | 2 +-
 podcast.php                                                  | 2 +-
 podcast_episode.php                                          | 2 +-
 preferences.php                                              | 2 +-
 pvmsg.php                                                    | 2 +-
 radio.php                                                    | 2 +-
 random.php                                                   | 2 +-
 register.php                                                 | 2 +-
 rest/index.php                                               | 2 +-
 rss.php                                                      | 2 +-
 search.php                                                   | 2 +-
 server/ajax.server.php                                       | 2 +-
 server/browse.ajax.php                                       | 2 +-
 server/catalog.ajax.php                                      | 2 +-
 server/democratic.ajax.php                                   | 2 +-
 server/edit.server.php                                       | 2 +-
 server/fs.ajax.php                                           | 2 +-
 server/index.ajax.php                                        | 2 +-
 server/localplay.ajax.php                                    | 2 +-
 server/player.ajax.php                                       | 2 +-
 server/playlist.ajax.php                                     | 2 +-
 server/podcast.ajax.php                                      | 2 +-
 server/random.ajax.php                                       | 2 +-
 server/refresh_reordered.server.php                          | 2 +-
 server/search.ajax.php                                       | 2 +-
 server/song.ajax.php                                         | 2 +-
 server/sse.server.php                                        | 2 +-
 server/stats.ajax.php                                        | 2 +-
 server/stream.ajax.php                                       | 2 +-
 server/tag.ajax.php                                          | 2 +-
 server/user.ajax.php                                         | 2 +-
 server/xml.server.php                                        | 2 +-
 share.php                                                    | 2 +-
 shout.php                                                    | 2 +-
 show_get.php                                                 | 2 +-
 smartplaylist.php                                            | 2 +-
 song.php                                                     | 2 +-
 sql/ampache.sql                                              | 2 +-
 stats.php                                                    | 2 +-
 stream.php                                                   | 2 +-
 templates/base.css                                           | 2 +-
 templates/browse_content.inc.php                             | 2 +-
 templates/browse_filters.inc.php                             | 2 +-
 templates/create_web_player.inc.php                          | 2 +-
 templates/create_web_player_embedded.inc.php                 | 2 +-
 templates/error_page.inc.php                                 | 2 +-
 templates/footer.inc.php                                     | 2 +-
 templates/header.inc.php                                     | 2 +-
 templates/install.css                                        | 2 +-
 templates/install_header.inc.php                             | 2 +-
 templates/javascript_refresh.inc.php                         | 2 +-
 templates/jquery-ui.custom.css                               | 2 +-
 templates/list_header.inc.php                                | 2 +-
 templates/print.css                                          | 2 +-
 templates/rightbar.inc.php                                   | 2 +-
 templates/show_access_list.inc.php                           | 2 +-
 templates/show_account.inc.php                               | 2 +-
 templates/show_add_access.inc.php                            | 2 +-
 templates/show_add_catalog.inc.php                           | 2 +-
 templates/show_add_channel.inc.php                           | 2 +-
 templates/show_add_label.inc.php                             | 2 +-
 templates/show_add_live_stream.inc.php                       | 2 +-
 templates/show_add_playlist.inc.php                          | 2 +-
 templates/show_add_podcast.inc.php                           | 2 +-
 templates/show_add_pvmsg.inc.php                             | 2 +-
 templates/show_add_share.inc.php                             | 2 +-
 templates/show_add_shout.inc.php                             | 2 +-
 templates/show_add_upload.inc.php                            | 2 +-
 templates/show_add_user.inc.php                              | 2 +-
 templates/show_adds_catalog.inc.php                          | 2 +-
 templates/show_album.inc.php                                 | 2 +-
 templates/show_album_group_disks.inc.php                     | 2 +-
 templates/show_album_row.inc.php                             | 2 +-
 templates/show_albums.inc.php                                | 2 +-
 templates/show_alphabet_form.inc.php                         | 2 +-
 templates/show_artist.inc.php                                | 2 +-
 templates/show_artist_info.inc.php                           | 2 +-
 templates/show_artist_row.inc.php                            | 2 +-
 templates/show_artists.inc.php                               | 2 +-
 templates/show_arts.inc.php                                  | 2 +-
 templates/show_big_art.inc.php                               | 2 +-
 templates/show_box_bottom.inc.php                            | 2 +-
 templates/show_box_top.inc.php                               | 2 +-
 templates/show_broadcast_row.inc.php                         | 2 +-
 templates/show_broadcasts.inc.php                            | 2 +-
 templates/show_broadcasts_dialog.inc.php                     | 2 +-
 templates/show_catalog_row.inc.php                           | 2 +-
 templates/show_catalog_types.inc.php                         | 2 +-
 templates/show_catalogs.inc.php                              | 2 +-
 templates/show_channel_row.inc.php                           | 2 +-
 templates/show_channels.inc.php                              | 2 +-
 templates/show_clean_catalog.inc.php                         | 2 +-
 templates/show_concert_row.inc.php                           | 2 +-
 templates/show_concerts.inc.php                              | 2 +-
 templates/show_confirmation.inc.php                          | 2 +-
 templates/show_create_democratic.inc.php                     | 2 +-
 templates/show_debug.inc.php                                 | 2 +-
 templates/show_democratic.inc.php                            | 2 +-
 templates/show_democratic_playlist.inc.php                   | 2 +-
 templates/show_denied.inc.php                                | 2 +-
 templates/show_disabled_songs.inc.php                        | 2 +-
 templates/show_duplicate.inc.php                             | 2 +-
 templates/show_duplicates.inc.php                            | 2 +-
 templates/show_dynamic.inc.php                               | 2 +-
 templates/show_edit_access.inc.php                           | 2 +-
 templates/show_edit_album_row.inc.php                        | 2 +-
 templates/show_edit_artist_row.inc.php                       | 2 +-
 templates/show_edit_broadcast_row.inc.php                    | 2 +-
 templates/show_edit_catalog.inc.php                          | 2 +-
 templates/show_edit_channel_row.inc.php                      | 2 +-
 templates/show_edit_label_row.inc.php                        | 2 +-
 templates/show_edit_license.inc.php                          | 2 +-
 templates/show_edit_live_stream_row.inc.php                  | 2 +-
 templates/show_edit_playlist_row.inc.php                     | 2 +-
 templates/show_edit_podcast_episode_row.inc.php              | 2 +-
 templates/show_edit_podcast_row.inc.php                      | 2 +-
 templates/show_edit_search_row.inc.php                       | 2 +-
 templates/show_edit_share_row.inc.php                        | 2 +-
 templates/show_edit_shout.inc.php                            | 2 +-
 templates/show_edit_song_row.inc.php                         | 2 +-
 templates/show_edit_tag_row.inc.php                          | 2 +-
 templates/show_edit_tvshow_row.inc.php                       | 2 +-
 templates/show_edit_tvshow_season_row.inc.php                | 2 +-
 templates/show_edit_user.inc.php                             | 2 +-
 templates/show_edit_video_row.inc.php                        | 2 +-
 templates/show_export.inc.php                                | 2 +-
 templates/show_gather_art.inc.php                            | 2 +-
 templates/show_get_art.inc.php                               | 2 +-
 templates/show_graphs.inc.php                                | 2 +-
 templates/show_highest.inc.php                               | 2 +-
 templates/show_import_playlist.inc.php                       | 2 +-
 templates/show_index.inc.php                                 | 2 +-
 templates/show_install.inc.php                               | 2 +-
 templates/show_install_account.inc.php                       | 2 +-
 templates/show_install_check.inc.php                         | 2 +-
 templates/show_install_config.inc.php                        | 2 +-
 templates/show_install_lang.inc.php                          | 2 +-
 templates/show_ip_history.inc.php                            | 2 +-
 templates/show_label.inc.php                                 | 2 +-
 templates/show_label_row.inc.php                             | 2 +-
 templates/show_labels.inc.php                                | 2 +-
 templates/show_license_row.inc.php                           | 2 +-
 templates/show_live_stream.inc.php                           | 2 +-
 templates/show_live_stream_row.inc.php                       | 2 +-
 templates/show_live_streams.inc.php                          | 2 +-
 templates/show_localplay_add_instance.inc.php                | 2 +-
 templates/show_localplay_control.inc.php                     | 2 +-
 templates/show_localplay_controllers.inc.php                 | 2 +-
 templates/show_localplay_edit_instance.inc.php               | 2 +-
 templates/show_localplay_instances.inc.php                   | 2 +-
 templates/show_localplay_playlist.inc.php                    | 2 +-
 templates/show_localplay_status.inc.php                      | 2 +-
 templates/show_login_form.inc.php                            | 2 +-
 templates/show_lostpassword_form.inc.php                     | 2 +-
 templates/show_lyrics.inc.php                                | 2 +-
 templates/show_mail_users.inc.php                            | 2 +-
 templates/show_manage_catalogs.inc.php                       | 2 +-
 templates/show_manage_democratic.inc.php                     | 2 +-
 templates/show_manage_license.inc.php                        | 2 +-
 templates/show_manage_shoutbox.inc.php                       | 2 +-
 templates/show_mashup.inc.php                                | 2 +-
 templates/show_missing_album.inc.php                         | 2 +-
 templates/show_missing_albums.inc.php                        | 2 +-
 templates/show_missing_artist.inc.php                        | 2 +-
 templates/show_missing_artists.inc.php                       | 2 +-
 templates/show_newest.inc.php                                | 2 +-
 templates/show_now_playing.inc.php                           | 2 +-
 templates/show_now_playing_row.inc.php                       | 2 +-
 templates/show_now_playing_similar.inc.php                   | 2 +-
 templates/show_now_playing_video_row.inc.php                 | 2 +-
 templates/show_object_rating.inc.php                         | 2 +-
 templates/show_object_userflag.inc.php                       | 2 +-
 templates/show_partial_clip.inc.php                          | 2 +-
 templates/show_partial_clip_row.inc.php                      | 2 +-
 templates/show_partial_clips.inc.php                         | 2 +-
 templates/show_partial_edit_clip_row.inc.php                 | 2 +-
 templates/show_partial_edit_movie_row.inc.php                | 2 +-
 templates/show_partial_edit_personal_video_row.inc.php       | 2 +-
 templates/show_partial_edit_tvshow_episode_row.inc.php       | 2 +-
 templates/show_partial_movie.inc.php                         | 2 +-
 templates/show_partial_movie_row.inc.php                     | 2 +-
 templates/show_partial_movies.inc.php                        | 2 +-
 templates/show_partial_personal_video.inc.php                | 2 +-
 templates/show_partial_personal_video_row.inc.php            | 2 +-
 templates/show_partial_personal_videos.inc.php               | 2 +-
 templates/show_partial_tvshow_episode.inc.php                | 2 +-
 templates/show_partial_tvshow_episode_row.inc.php            | 2 +-
 templates/show_partial_tvshow_episodes.inc.php               | 2 +-
 templates/show_playlist.inc.php                              | 2 +-
 templates/show_playlist_media_row.inc.php                    | 2 +-
 templates/show_playlist_medias.inc.php                       | 2 +-
 templates/show_playlist_row.inc.php                          | 2 +-
 templates/show_playlist_title.inc.php                        | 2 +-
 templates/show_playlists.inc.php                             | 2 +-
 templates/show_playlists_dialog.inc.php                      | 2 +-
 templates/show_playtype_switch.inc.php                       | 2 +-
 templates/show_plugins.inc.php                               | 2 +-
 templates/show_podcast.inc.php                               | 2 +-
 templates/show_podcast_episode.inc.php                       | 2 +-
 templates/show_podcast_episode_row.inc.php                   | 2 +-
 templates/show_podcast_episodes.inc.php                      | 2 +-
 templates/show_podcast_row.inc.php                           | 2 +-
 templates/show_podcasts.inc.php                              | 2 +-
 templates/show_popular.inc.php                               | 2 +-
 templates/show_preference_admin.inc.php                      | 2 +-
 templates/show_preference_box.inc.php                        | 2 +-
 templates/show_preferences.inc.php                           | 2 +-
 templates/show_pvmsg.inc.php                                 | 2 +-
 templates/show_pvmsg_row.inc.php                             | 2 +-
 templates/show_pvmsgs.inc.php                                | 2 +-
 templates/show_random.inc.php                                | 2 +-
 templates/show_random_albums.inc.php                         | 2 +-
 templates/show_random_videos.inc.php                         | 2 +-
 templates/show_recent.inc.php                                | 2 +-
 templates/show_recently_played.inc.php                       | 2 +-
 templates/show_recommended_artists.inc.php                   | 2 +-
 templates/show_registration_confirmation.inc.php             | 2 +-
 templates/show_rules.inc.php                                 | 2 +-
 templates/show_run_add_catalog.inc.php                       | 2 +-
 templates/show_search.inc.php                                | 2 +-
 templates/show_search_bar.inc.php                            | 2 +-
 templates/show_search_descriptor.inc.php                     | 2 +-
 templates/show_search_form.inc.php                           | 2 +-
 templates/show_search_options.inc.php                        | 2 +-
 templates/show_search_row.inc.php                            | 2 +-
 templates/show_search_title.inc.php                          | 2 +-
 templates/show_searches.inc.php                              | 2 +-
 templates/show_share.inc.php                                 | 2 +-
 templates/show_share_row.inc.php                             | 2 +-
 templates/show_shared_objects.inc.php                        | 2 +-
 templates/show_shares.inc.php                                | 2 +-
 templates/show_shout_row.inc.php                             | 2 +-
 templates/show_shoutbox.inc.php                              | 2 +-
 templates/show_song.inc.php                                  | 2 +-
 templates/show_song_preview_row.inc.php                      | 2 +-
 templates/show_song_previews.inc.php                         | 2 +-
 templates/show_song_row.inc.php                              | 2 +-
 templates/show_songs.inc.php                                 | 2 +-
 templates/show_stats.inc.php                                 | 2 +-
 templates/show_stats_highest.inc.php                         | 2 +-
 templates/show_stats_newest.inc.php                          | 2 +-
 templates/show_stats_popular.inc.php                         | 2 +-
 templates/show_stats_recent.inc.php                          | 2 +-
 templates/show_stats_share.inc.php                           | 2 +-
 templates/show_stats_upload.inc.php                          | 2 +-
 templates/show_stats_userflag.inc.php                        | 2 +-
 templates/show_stats_wanted.inc.php                          | 2 +-
 templates/show_tag_row.inc.php                               | 2 +-
 templates/show_tagcloud.inc.php                              | 2 +-
 templates/show_test.inc.php                                  | 2 +-
 templates/show_test_config.inc.php                           | 2 +-
 templates/show_test_table.inc.php                            | 2 +-
 templates/show_tvshow.inc.php                                | 2 +-
 templates/show_tvshow_row.inc.php                            | 2 +-
 templates/show_tvshow_season.inc.php                         | 2 +-
 templates/show_tvshow_season_row.inc.php                     | 2 +-
 templates/show_tvshow_seasons.inc.php                        | 2 +-
 templates/show_tvshows.inc.php                               | 2 +-
 templates/show_update_items.inc.php                          | 2 +-
 templates/show_uploads.inc.php                               | 2 +-
 templates/show_user.inc.php                                  | 2 +-
 templates/show_user_activate.inc.php                         | 2 +-
 templates/show_user_preferences.inc.php                      | 2 +-
 templates/show_user_registration.inc.php                     | 2 +-
 templates/show_user_row.inc.php                              | 2 +-
 templates/show_userflag.inc.php                              | 2 +-
 templates/show_users.inc.php                                 | 2 +-
 templates/show_verify_catalog.inc.php                        | 2 +-
 templates/show_video.inc.php                                 | 2 +-
 templates/show_video_row.inc.php                             | 2 +-
 templates/show_videos.inc.php                                | 2 +-
 templates/show_wanted.inc.php                                | 2 +-
 templates/show_wanted_album_row.inc.php                      | 2 +-
 templates/show_wanted_albums.inc.php                         | 2 +-
 templates/show_web_player.inc.php                            | 2 +-
 templates/sidebar.inc.php                                    | 2 +-
 templates/sidebar.light.inc.php                              | 2 +-
 templates/sidebar_admin.inc.php                              | 2 +-
 templates/sidebar_home.inc.php                               | 2 +-
 templates/sidebar_localplay.inc.php                          | 2 +-
 templates/sidebar_modules.inc.php                            | 2 +-
 templates/sidebar_preferences.inc.php                        | 2 +-
 templates/stylesheets.inc.php                                | 2 +-
 templates/subnavbar.inc.php                                  | 2 +-
 test.php                                                     | 2 +-
 themes/reborn/templates/dark.css                             | 2 +-
 themes/reborn/templates/default.css                          | 2 +-
 themes/reborn/templates/light.css                            | 2 +-
 themes/reborn/theme.cfg.php                                  | 2 +-
 tvshow_seasons.php                                           | 2 +-
 tvshows.php                                                  | 2 +-
 update.php                                                   | 2 +-
 upload.php                                                   | 2 +-
 util.php                                                     | 2 +-
 video.php                                                    | 2 +-
 waveform.php                                                 | 2 +-
 web_player.php                                               | 2 +-
 web_player_embedded.php                                      | 2 +-
 webdav/index.php                                             | 2 +-
 525 files changed, 527 insertions(+), 527 deletions(-)

diff --git a/admin/access.php b/admin/access.php
index e2076dfa..5f5643bf 100644
--- a/admin/access.php
+++ b/admin/access.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/admin/catalog.php b/admin/catalog.php
index 1127594c..8d2539cc 100644
--- a/admin/catalog.php
+++ b/admin/catalog.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/admin/duplicates.php b/admin/duplicates.php
index 2dcda13b..f2f19b62 100644
--- a/admin/duplicates.php
+++ b/admin/duplicates.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/admin/export.php b/admin/export.php
index 4d940cd5..4962876a 100644
--- a/admin/export.php
+++ b/admin/export.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/admin/index.php b/admin/index.php
index b121d651..11665c49 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/admin/license.php b/admin/license.php
index 398c8e0f..0d3fd4ec 100644
--- a/admin/license.php
+++ b/admin/license.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/admin/mail.php b/admin/mail.php
index 7ade04ec..97a48637 100644
--- a/admin/mail.php
+++ b/admin/mail.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/admin/modules.php b/admin/modules.php
index dfe540d0..f9ac41ac 100644
--- a/admin/modules.php
+++ b/admin/modules.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/admin/shout.php b/admin/shout.php
index a5e717fa..6c9f7f51 100644
--- a/admin/shout.php
+++ b/admin/shout.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/admin/system.php b/admin/system.php
index 7d213ee6..e941600f 100644
--- a/admin/system.php
+++ b/admin/system.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/admin/users.php b/admin/users.php
index b5a7aa05..d990f328 100644
--- a/admin/users.php
+++ b/admin/users.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/albums.php b/albums.php
index 3a345527..015db5a6 100644
--- a/albums.php
+++ b/albums.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/artists.php b/artists.php
index 0c546d72..2e6048f5 100644
--- a/artists.php
+++ b/artists.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/arts.php b/arts.php
index b9f41712..6d27ab5b 100644
--- a/arts.php
+++ b/arts.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/batch.php b/batch.php
index b30ae637..569c810d 100644
--- a/batch.php
+++ b/batch.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/bin/broadcast.inc b/bin/broadcast.inc
index 7098e513..fe52fab2 100644
--- a/bin/broadcast.inc
+++ b/bin/broadcast.inc
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/bin/calculate_art_size.inc b/bin/calculate_art_size.inc
index 6d47c78b..1b93eb64 100644
--- a/bin/calculate_art_size.inc
+++ b/bin/calculate_art_size.inc
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/bin/catalog_update.inc b/bin/catalog_update.inc
index 53387f20..51042dcc 100644
--- a/bin/catalog_update.inc
+++ b/bin/catalog_update.inc
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/bin/channel_run.inc b/bin/channel_run.inc
index dc129f43..41a94f35 100644
--- a/bin/channel_run.inc
+++ b/bin/channel_run.inc
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/bin/delete_disabled.inc b/bin/delete_disabled.inc
index 02efd72b..31bfd7fc 100644
--- a/bin/delete_disabled.inc
+++ b/bin/delete_disabled.inc
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/bin/dump_album_art.inc b/bin/dump_album_art.inc
index 16b9df26..3258534b 100644
--- a/bin/dump_album_art.inc
+++ b/bin/dump_album_art.inc
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/bin/fix_filenames.inc b/bin/fix_filenames.inc
index 9b5ff6c6..078d9673 100644
--- a/bin/fix_filenames.inc
+++ b/bin/fix_filenames.inc
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/bin/install/add_user.inc b/bin/install/add_user.inc
index 00c329e5..7bf45f67 100644
--- a/bin/install/add_user.inc
+++ b/bin/install/add_user.inc
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/bin/install/install_db.inc b/bin/install/install_db.inc
index 77bab7b8..cbe07c49 100644
--- a/bin/install/install_db.inc
+++ b/bin/install/install_db.inc
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/bin/install/update_db.inc b/bin/install/update_db.inc
index 84cf0ba9..d7ed01ca 100644
--- a/bin/install/update_db.inc
+++ b/bin/install/update_db.inc
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/bin/migrate_config.inc b/bin/migrate_config.inc
index 1162f568..32d1d52b 100644
--- a/bin/migrate_config.inc
+++ b/bin/migrate_config.inc
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/bin/print_tags.inc b/bin/print_tags.inc
index 355b5b11..bdaf9245 100644
--- a/bin/print_tags.inc
+++ b/bin/print_tags.inc
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/bin/sort_files.inc b/bin/sort_files.inc
index cd19f0c0..77707d70 100644
--- a/bin/sort_files.inc
+++ b/bin/sort_files.inc
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/bin/websocket_run.inc b/bin/websocket_run.inc
index 397c4703..4428cd81 100644
--- a/bin/websocket_run.inc
+++ b/bin/websocket_run.inc
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/bin/write_playlists.inc b/bin/write_playlists.inc
index de0e3b10..624eb264 100644
--- a/bin/write_playlists.inc
+++ b/bin/write_playlists.inc
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/broadcast.php b/broadcast.php
index f948ab85..98befa44 100644
--- a/broadcast.php
+++ b/broadcast.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/browse.php b/browse.php
index c12d8fee..2882cfcf 100644
--- a/browse.php
+++ b/browse.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/channel.php b/channel.php
index 7cc9fbad..4389d701 100644
--- a/channel.php
+++ b/channel.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/channel/index.php b/channel/index.php
index 33889820..7eabc905 100644
--- a/channel/index.php
+++ b/channel/index.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/cookie_disclaimer.php b/cookie_disclaimer.php
index e1b90d05..66784d8f 100644
--- a/cookie_disclaimer.php
+++ b/cookie_disclaimer.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/daap/index.php b/daap/index.php
index ad0c170d..4755bcf8 100644
--- a/daap/index.php
+++ b/daap/index.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/democratic.php b/democratic.php
index 5ea51c8c..38c3c846 100644
--- a/democratic.php
+++ b/democratic.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/graph.php b/graph.php
index fe61e657..4b4028ea 100644
--- a/graph.php
+++ b/graph.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/image.php b/image.php
index 1b9e8ace..a18fd8a1 100644
--- a/image.php
+++ b/image.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/index.php b/index.php
index 353dd810..0f32b2db 100644
--- a/index.php
+++ b/index.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/install.php b/install.php
index 0b22a5f6..7bb3319f 100644
--- a/install.php
+++ b/install.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/labels.php b/labels.php
index 6a47f9f3..64bcb758 100644
--- a/labels.php
+++ b/labels.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/batch.lib.php b/lib/batch.lib.php
index 62f389ee..74b567d8 100644
--- a/lib/batch.lib.php
+++ b/lib/batch.lib.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/DatabaseObject.php b/lib/class/DatabaseObject.php
index 313a1553..718bb5ad 100644
--- a/lib/class/DatabaseObject.php
+++ b/lib/class/DatabaseObject.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/Interfaces/Model.php b/lib/class/Interfaces/Model.php
index 7785a9c5..2723f1a1 100644
--- a/lib/class/Interfaces/Model.php
+++ b/lib/class/Interfaces/Model.php
@@ -4,7 +4,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/Metadata/Metadata.php b/lib/class/Metadata/Metadata.php
index 39fef177..50821976 100644
--- a/lib/class/Metadata/Metadata.php
+++ b/lib/class/Metadata/Metadata.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/Metadata/Model/Metadata.php b/lib/class/Metadata/Model/Metadata.php
index ef7c1624..36a5ffb4 100644
--- a/lib/class/Metadata/Model/Metadata.php
+++ b/lib/class/Metadata/Model/Metadata.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/Metadata/Model/MetadataField.php b/lib/class/Metadata/Model/MetadataField.php
index afbfa282..8856a079 100644
--- a/lib/class/Metadata/Model/MetadataField.php
+++ b/lib/class/Metadata/Model/MetadataField.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/Metadata/Repository/Metadata.php b/lib/class/Metadata/Repository/Metadata.php
index 15731858..a789029a 100644
--- a/lib/class/Metadata/Repository/Metadata.php
+++ b/lib/class/Metadata/Repository/Metadata.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/Metadata/Repository/MetadataField.php b/lib/class/Metadata/Repository/MetadataField.php
index a59e024c..007303af 100644
--- a/lib/class/Metadata/Repository/MetadataField.php
+++ b/lib/class/Metadata/Repository/MetadataField.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/Repository.php b/lib/class/Repository.php
index 23c3553f..ed9f923d 100644
--- a/lib/class/Repository.php
+++ b/lib/class/Repository.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/access.class.php b/lib/class/access.class.php
index d18b2c47..700ea6c1 100644
--- a/lib/class/access.class.php
+++ b/lib/class/access.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/ajax.class.php b/lib/class/ajax.class.php
index 7e709185..c09166de 100644
--- a/lib/class/ajax.class.php
+++ b/lib/class/ajax.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/album.class.php b/lib/class/album.class.php
index 839db478..eb449cf3 100644
--- a/lib/class/album.class.php
+++ b/lib/class/album.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/ampache_rss.class.php b/lib/class/ampache_rss.class.php
index 77c1bc77..334480ef 100644
--- a/lib/class/ampache_rss.class.php
+++ b/lib/class/ampache_rss.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/ampconfig.class.php b/lib/class/ampconfig.class.php
index 4c80d399..6c172ce3 100644
--- a/lib/class/ampconfig.class.php
+++ b/lib/class/ampconfig.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/amperror.class.php b/lib/class/amperror.class.php
index 948692fe..6e9ab7b7 100644
--- a/lib/class/amperror.class.php
+++ b/lib/class/amperror.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/api.class.php b/lib/class/api.class.php
index ca3f20f5..5c2bbb13 100644
--- a/lib/class/api.class.php
+++ b/lib/class/api.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/art.class.php b/lib/class/art.class.php
index 566ac6e9..575e9390 100644
--- a/lib/class/art.class.php
+++ b/lib/class/art.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/artist.class.php b/lib/class/artist.class.php
index cb2c2c2e..41240c16 100644
--- a/lib/class/artist.class.php
+++ b/lib/class/artist.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/artist_event.class.php b/lib/class/artist_event.class.php
index d2488714..d9f2c72b 100644
--- a/lib/class/artist_event.class.php
+++ b/lib/class/artist_event.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/auth.class.php b/lib/class/auth.class.php
index 2b8c0408..0c51bbb2 100644
--- a/lib/class/auth.class.php
+++ b/lib/class/auth.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/autoupdate.class.php b/lib/class/autoupdate.class.php
index 55c8d0f5..8b87f1d2 100644
--- a/lib/class/autoupdate.class.php
+++ b/lib/class/autoupdate.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/bookmark.class.php b/lib/class/bookmark.class.php
index 7ca12d2a..c09385b3 100644
--- a/lib/class/bookmark.class.php
+++ b/lib/class/bookmark.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/broadcast.class.php b/lib/class/broadcast.class.php
index 480f6234..ea100442 100644
--- a/lib/class/broadcast.class.php
+++ b/lib/class/broadcast.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/broadcast_server.class.php b/lib/class/broadcast_server.class.php
index e9e1529e..59e53517 100644
--- a/lib/class/broadcast_server.class.php
+++ b/lib/class/broadcast_server.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/browse.class.php b/lib/class/browse.class.php
index 2a9f4c65..96f9b70d 100644
--- a/lib/class/browse.class.php
+++ b/lib/class/browse.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index 34f1473b..58b16436 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/channel.class.php b/lib/class/channel.class.php
index 59bd6a27..65b2da08 100644
--- a/lib/class/channel.class.php
+++ b/lib/class/channel.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/clip.class.php b/lib/class/clip.class.php
index 1f06baf7..e0f15879 100644
--- a/lib/class/clip.class.php
+++ b/lib/class/clip.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/core.class.php b/lib/class/core.class.php
index 630ebd96..c9a44966 100644
--- a/lib/class/core.class.php
+++ b/lib/class/core.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/daap_api.class.php b/lib/class/daap_api.class.php
index c88fe88f..78832989 100644
--- a/lib/class/daap_api.class.php
+++ b/lib/class/daap_api.class.php
@@ -4,7 +4,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/database_object.abstract.php b/lib/class/database_object.abstract.php
index 17f4724b..49ecde44 100644
--- a/lib/class/database_object.abstract.php
+++ b/lib/class/database_object.abstract.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/dba.class.php b/lib/class/dba.class.php
index 3c18e19c..194b090f 100644
--- a/lib/class/dba.class.php
+++ b/lib/class/dba.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/democratic.class.php b/lib/class/democratic.class.php
index 10f5db0f..695c1477 100644
--- a/lib/class/democratic.class.php
+++ b/lib/class/democratic.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/graph.class.php b/lib/class/graph.class.php
index 3916ceef..3f976420 100644
--- a/lib/class/graph.class.php
+++ b/lib/class/graph.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/label.class.php b/lib/class/label.class.php
index 23898a7b..f9c3d4ad 100644
--- a/lib/class/label.class.php
+++ b/lib/class/label.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/ldap.class.php b/lib/class/ldap.class.php
index 9988fa62..8b918c1f 100644
--- a/lib/class/ldap.class.php
+++ b/lib/class/ldap.class.php
@@ -2,7 +2,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/library_item.interface.php b/lib/class/library_item.interface.php
index 590adb03..3c52dbac 100644
--- a/lib/class/library_item.interface.php
+++ b/lib/class/library_item.interface.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/license.class.php b/lib/class/license.class.php
index 64d429d3..6597dcf5 100644
--- a/lib/class/license.class.php
+++ b/lib/class/license.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/live_stream.class.php b/lib/class/live_stream.class.php
index 800e681a..101ebe6a 100644
--- a/lib/class/live_stream.class.php
+++ b/lib/class/live_stream.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/localplay.class.php b/lib/class/localplay.class.php
index 198a3901..c418873a 100644
--- a/lib/class/localplay.class.php
+++ b/lib/class/localplay.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/localplay_controller.abstract.php b/lib/class/localplay_controller.abstract.php
index aad5b822..df3137fd 100644
--- a/lib/class/localplay_controller.abstract.php
+++ b/lib/class/localplay_controller.abstract.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/mailer.class.php b/lib/class/mailer.class.php
index 396da46e..def6abaa 100644
--- a/lib/class/mailer.class.php
+++ b/lib/class/mailer.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/media.interface.php b/lib/class/media.interface.php
index 51d84429..2e6b021b 100644
--- a/lib/class/media.interface.php
+++ b/lib/class/media.interface.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/memory_object.class.php b/lib/class/memory_object.class.php
index 6573fad1..703aaee6 100644
--- a/lib/class/memory_object.class.php
+++ b/lib/class/memory_object.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/movie.class.php b/lib/class/movie.class.php
index 355e9f6c..b40e55a7 100644
--- a/lib/class/movie.class.php
+++ b/lib/class/movie.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/openid.class.php b/lib/class/openid.class.php
index 0971e585..49166eef 100644
--- a/lib/class/openid.class.php
+++ b/lib/class/openid.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/personal_video.class.php b/lib/class/personal_video.class.php
index c386d20f..d3adacf4 100644
--- a/lib/class/personal_video.class.php
+++ b/lib/class/personal_video.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/playable_item.interface.php b/lib/class/playable_item.interface.php
index 91243b15..f57f85dc 100644
--- a/lib/class/playable_item.interface.php
+++ b/lib/class/playable_item.interface.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/playlist.class.php b/lib/class/playlist.class.php
index 8014a732..6155856d 100644
--- a/lib/class/playlist.class.php
+++ b/lib/class/playlist.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/playlist_object.abstract.php b/lib/class/playlist_object.abstract.php
index 73b47f01..ef9f31b1 100644
--- a/lib/class/playlist_object.abstract.php
+++ b/lib/class/playlist_object.abstract.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/plex_api.class.php b/lib/class/plex_api.class.php
index 25ce720b..987f1d8b 100644
--- a/lib/class/plex_api.class.php
+++ b/lib/class/plex_api.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/plex_xml_data.class.php b/lib/class/plex_xml_data.class.php
index 5d9c618a..4d5d7b29 100644
--- a/lib/class/plex_xml_data.class.php
+++ b/lib/class/plex_xml_data.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/plugin.class.php b/lib/class/plugin.class.php
index 46ad8e95..6341888f 100644
--- a/lib/class/plugin.class.php
+++ b/lib/class/plugin.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/podcast.class.php b/lib/class/podcast.class.php
index 682f4cbe..57b140d9 100644
--- a/lib/class/podcast.class.php
+++ b/lib/class/podcast.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/podcast_episode.class.php b/lib/class/podcast_episode.class.php
index 7ac3b559..03b19cc4 100644
--- a/lib/class/podcast_episode.class.php
+++ b/lib/class/podcast_episode.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/preference.class.php b/lib/class/preference.class.php
index 50d17e70..9f44669f 100644
--- a/lib/class/preference.class.php
+++ b/lib/class/preference.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/privatemsg.class.php b/lib/class/privatemsg.class.php
index 4fee976b..35db6c26 100644
--- a/lib/class/privatemsg.class.php
+++ b/lib/class/privatemsg.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/query.class.php b/lib/class/query.class.php
index d3573348..bf067cd9 100644
--- a/lib/class/query.class.php
+++ b/lib/class/query.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/random.class.php b/lib/class/random.class.php
index 3035c4da..701e8646 100644
--- a/lib/class/random.class.php
+++ b/lib/class/random.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/rating.class.php b/lib/class/rating.class.php
index 5448c883..c7ab0a3c 100644
--- a/lib/class/rating.class.php
+++ b/lib/class/rating.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/recommendation.class.php b/lib/class/recommendation.class.php
index 47c6549d..bbe386ce 100644
--- a/lib/class/recommendation.class.php
+++ b/lib/class/recommendation.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/registration.class.php b/lib/class/registration.class.php
index 42735ae9..90ae8dd0 100644
--- a/lib/class/registration.class.php
+++ b/lib/class/registration.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/scrobbler.class.php b/lib/class/scrobbler.class.php
index 7ef18cc9..ed438355 100644
--- a/lib/class/scrobbler.class.php
+++ b/lib/class/scrobbler.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/scrobbler_async.class.php b/lib/class/scrobbler_async.class.php
index 88c4015b..e19778b5 100644
--- a/lib/class/scrobbler_async.class.php
+++ b/lib/class/scrobbler_async.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/search.class.php b/lib/class/search.class.php
index 79016f2b..97cc6a33 100644
--- a/lib/class/search.class.php
+++ b/lib/class/search.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/session.class.php b/lib/class/session.class.php
index d0e3b1f3..e83d39d2 100644
--- a/lib/class/session.class.php
+++ b/lib/class/session.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/share.class.php b/lib/class/share.class.php
index fe1fae31..ebdfaf96 100644
--- a/lib/class/share.class.php
+++ b/lib/class/share.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/shoutbox.class.php b/lib/class/shoutbox.class.php
index 88ab0288..dfa5503d 100644
--- a/lib/class/shoutbox.class.php
+++ b/lib/class/shoutbox.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/slideshow.class.php b/lib/class/slideshow.class.php
index 25ac85d2..c48eaf6f 100644
--- a/lib/class/slideshow.class.php
+++ b/lib/class/slideshow.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/song.class.php b/lib/class/song.class.php
index 7980d766..7cf5ff1e 100644
--- a/lib/class/song.class.php
+++ b/lib/class/song.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/song_preview.class.php b/lib/class/song_preview.class.php
index aeef872c..077eb5d2 100644
--- a/lib/class/song_preview.class.php
+++ b/lib/class/song_preview.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/stats.class.php b/lib/class/stats.class.php
index e9a173f9..caebdc6b 100644
--- a/lib/class/stats.class.php
+++ b/lib/class/stats.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/stream.class.php b/lib/class/stream.class.php
index b61068b7..af058aea 100644
--- a/lib/class/stream.class.php
+++ b/lib/class/stream.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/stream_playlist.class.php b/lib/class/stream_playlist.class.php
index 8d0ae6d3..3743ba81 100644
--- a/lib/class/stream_playlist.class.php
+++ b/lib/class/stream_playlist.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/stream_url.class.php b/lib/class/stream_url.class.php
index 4b322c09..a9c742e9 100644
--- a/lib/class/stream_url.class.php
+++ b/lib/class/stream_url.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/subsonic_api.class.php b/lib/class/subsonic_api.class.php
index 59034827..00006559 100644
--- a/lib/class/subsonic_api.class.php
+++ b/lib/class/subsonic_api.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/subsonic_xml_data.class.php b/lib/class/subsonic_xml_data.class.php
index 2775cb8c..93d0c9c7 100644
--- a/lib/class/subsonic_xml_data.class.php
+++ b/lib/class/subsonic_xml_data.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/tag.class.php b/lib/class/tag.class.php
index 286749ed..f1ffe2be 100644
--- a/lib/class/tag.class.php
+++ b/lib/class/tag.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/tmp_playlist.class.php b/lib/class/tmp_playlist.class.php
index 3f9805c9..4d0d0afb 100644
--- a/lib/class/tmp_playlist.class.php
+++ b/lib/class/tmp_playlist.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/tvshow.class.php b/lib/class/tvshow.class.php
index 6cd56828..3d47e686 100644
--- a/lib/class/tvshow.class.php
+++ b/lib/class/tvshow.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/tvshow_episode.class.php b/lib/class/tvshow_episode.class.php
index ce8b5a0c..e7b7b8d2 100644
--- a/lib/class/tvshow_episode.class.php
+++ b/lib/class/tvshow_episode.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/tvshow_season.class.php b/lib/class/tvshow_season.class.php
index d26ef0ef..975cff78 100644
--- a/lib/class/tvshow_season.class.php
+++ b/lib/class/tvshow_season.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/ui.class.php b/lib/class/ui.class.php
index f5d615f4..107ba0cd 100644
--- a/lib/class/ui.class.php
+++ b/lib/class/ui.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/update.class.php b/lib/class/update.class.php
index 420c8151..81bcfc43 100644
--- a/lib/class/update.class.php
+++ b/lib/class/update.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/upload.class.php b/lib/class/upload.class.php
index 8074188c..621dca31 100644
--- a/lib/class/upload.class.php
+++ b/lib/class/upload.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/upnp_api.class.php b/lib/class/upnp_api.class.php
index 8bff9ad3..5d6aabfa 100644
--- a/lib/class/upnp_api.class.php
+++ b/lib/class/upnp_api.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/user.class.php b/lib/class/user.class.php
index 63aa7ccc..047bc9a4 100644
--- a/lib/class/user.class.php
+++ b/lib/class/user.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/useractivity.class.php b/lib/class/useractivity.class.php
index 980d9522..e1d64606 100644
--- a/lib/class/useractivity.class.php
+++ b/lib/class/useractivity.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/userflag.class.php b/lib/class/userflag.class.php
index 536cc3a3..d792fb91 100644
--- a/lib/class/userflag.class.php
+++ b/lib/class/userflag.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/vainfo.class.php b/lib/class/vainfo.class.php
index 9a6647c9..1ce8f96b 100644
--- a/lib/class/vainfo.class.php
+++ b/lib/class/vainfo.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/video.class.php b/lib/class/video.class.php
index f20aef96..6a6741fd 100644
--- a/lib/class/video.class.php
+++ b/lib/class/video.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/wanted.class.php b/lib/class/wanted.class.php
index cdbe5184..3ad70490 100644
--- a/lib/class/wanted.class.php
+++ b/lib/class/wanted.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/waveform.class.php b/lib/class/waveform.class.php
index 77d5a772..5da597d3 100644
--- a/lib/class/waveform.class.php
+++ b/lib/class/waveform.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/webdav_auth.class.php b/lib/class/webdav_auth.class.php
index 13b330f6..a4aae454 100644
--- a/lib/class/webdav_auth.class.php
+++ b/lib/class/webdav_auth.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/webdav_catalog.class.php b/lib/class/webdav_catalog.class.php
index 307bad19..93e2fe31 100644
--- a/lib/class/webdav_catalog.class.php
+++ b/lib/class/webdav_catalog.class.php
@@ -4,7 +4,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/webdav_directory.class.php b/lib/class/webdav_directory.class.php
index 20e8f3c2..dd03f841 100644
--- a/lib/class/webdav_directory.class.php
+++ b/lib/class/webdav_directory.class.php
@@ -4,7 +4,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/webdav_file.class.php b/lib/class/webdav_file.class.php
index 45c0f3df..8d632186 100644
--- a/lib/class/webdav_file.class.php
+++ b/lib/class/webdav_file.class.php
@@ -4,7 +4,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/webplayer.class.php b/lib/class/webplayer.class.php
index 10a7b96d..541f187f 100644
--- a/lib/class/webplayer.class.php
+++ b/lib/class/webplayer.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/class/xml_data.class.php b/lib/class/xml_data.class.php
index e58fbefd..804895dc 100644
--- a/lib/class/xml_data.class.php
+++ b/lib/class/xml_data.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/debug.lib.php b/lib/debug.lib.php
index beebb236..ef64b7ca 100644
--- a/lib/debug.lib.php
+++ b/lib/debug.lib.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/general.lib.php b/lib/general.lib.php
index aa4a88d4..aa3ed81b 100644
--- a/lib/general.lib.php
+++ b/lib/general.lib.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/i18n.php b/lib/i18n.php
index 277ac594..9aaaeb62 100644
--- a/lib/i18n.php
+++ b/lib/i18n.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/init-tiny.php b/lib/init-tiny.php
index 78965b81..bf0784ad 100644
--- a/lib/init-tiny.php
+++ b/lib/init-tiny.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/init.php b/lib/init.php
index 98a4c185..f05d62c4 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/install.lib.php b/lib/install.lib.php
index 5196988d..8600e570 100644
--- a/lib/install.lib.php
+++ b/lib/install.lib.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/javascript/ajax.js b/lib/javascript/ajax.js
index 7f584074..b8c5e5ae 100644
--- a/lib/javascript/ajax.js
+++ b/lib/javascript/ajax.js
@@ -1,6 +1,6 @@
 // vim:set softtabstop=4 shiftwidth=4 expandtab:
 //
-// Copyright 2001 - 2015 Ampache.org
+// Copyright 2001 - 2016 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
diff --git a/lib/javascript/base.js b/lib/javascript/base.js
index b9defd6e..74ff4fc2 100644
--- a/lib/javascript/base.js
+++ b/lib/javascript/base.js
@@ -1,6 +1,6 @@
 // vim:set softtabstop=4 shiftwidth=4 expandtab:
 //
-// Copyright 2001 - 2015 Ampache.org
+// Copyright 2001 - 2016 Ampache.org
 // All rights reserved.
 //
 // This program is free software; you can redistribute it and/or
diff --git a/lib/javascript/search-data.php b/lib/javascript/search-data.php
index 059662d3..8a520116 100644
--- a/lib/javascript/search-data.php
+++ b/lib/javascript/search-data.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/javascript/tabledata.js b/lib/javascript/tabledata.js
index 00b71fd3..fbef097f 100644
--- a/lib/javascript/tabledata.js
+++ b/lib/javascript/tabledata.js
@@ -1,6 +1,6 @@
 // vim:set softtabstop=4 shiftwidth=4 expandtab:
 //
-// Copyright 2001 - 2015 Ampache.org
+// Copyright 2001 - 2016 Ampache.org
 // All rights reserved.
 //
 // This program is free software; you can redistribute it and/or
diff --git a/lib/javascript/tools.js b/lib/javascript/tools.js
index d6d605af..45036335 100644
--- a/lib/javascript/tools.js
+++ b/lib/javascript/tools.js
@@ -1,6 +1,6 @@
 // vim:set softtabstop=4 shiftwidth=4 expandtab:
 //
-// Copyright 2001 - 2015 Ampache.org
+// Copyright 2001 - 2016 Ampache.org
 // All rights reserved.
 //
 // This program is free software; you can redistribute it and/or
diff --git a/lib/log.lib.php b/lib/log.lib.php
index 572d0916..0ab5d0cf 100644
--- a/lib/log.lib.php
+++ b/lib/log.lib.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/login.php b/lib/login.php
index a90a3826..db833fe5 100644
--- a/lib/login.php
+++ b/lib/login.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/preferences.php b/lib/preferences.php
index cd6d42f0..7ad1a422 100644
--- a/lib/preferences.php
+++ b/lib/preferences.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/rating.lib.php b/lib/rating.lib.php
index c5ba8074..614a01bf 100644
--- a/lib/rating.lib.php
+++ b/lib/rating.lib.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/themes.php b/lib/themes.php
index 7fb1a83d..ef122367 100644
--- a/lib/themes.php
+++ b/lib/themes.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/ui.lib.php b/lib/ui.lib.php
index 6877d1ed..781dd0ee 100644
--- a/lib/ui.lib.php
+++ b/lib/ui.lib.php
@@ -10,7 +10,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/locale/base/gather-messages.sh b/locale/base/gather-messages.sh
index cf446460..3ba2583c 100755
--- a/locale/base/gather-messages.sh
+++ b/locale/base/gather-messages.sh
@@ -2,7 +2,7 @@
 #
 # vim:set softtabstop=4 shiftwidth=4 expandtab:
 #
-# Copyright 2001 - 2015 Ampache.org
+# Copyright 2001 - 2016 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
@@ -172,7 +172,7 @@ generate_pot_utds() {
                 "\n\n"\
                 "#######################################################################" >> $tdstxt
 
-        mysql -N --database=$dbname --host=$dbhost --user=$dbuser --password=$dbpass -se "SELECT id FROM preference" | 
+        mysql -N --database=$dbname --host=$dbhost --user=$dbuser --password=$dbpass -se "SELECT id FROM preference" |
         while read dbprefid; do
             dbprefdesc=$(mysql -N --database=$dbname --host=$dbhost --user=$dbuser --password=$dbpass -se "SELECT description FROM preference where id=$dbprefid")
             dbprefdescchk=$(grep "\"$dbprefdesc\"" $potfile)
diff --git a/localplay.php b/localplay.php
index 7ecefc98..ff5ef25b 100644
--- a/localplay.php
+++ b/localplay.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/login.php b/login.php
index 12a14dcd..9601ffd0 100644
--- a/login.php
+++ b/login.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/logout.php b/logout.php
index fe35c259..07e045a8 100644
--- a/logout.php
+++ b/logout.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/lostpassword.php b/lostpassword.php
index 94362192..2ddd0cdb 100644
--- a/lostpassword.php
+++ b/lostpassword.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/mashup.php b/mashup.php
index d86babe0..732920eb 100644
--- a/mashup.php
+++ b/mashup.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/Beets/Catalog.php b/modules/Beets/Catalog.php
index 96a6957d..6338ca45 100644
--- a/modules/Beets/Catalog.php
+++ b/modules/Beets/Catalog.php
@@ -4,7 +4,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/Beets/CliHandler.php b/modules/Beets/CliHandler.php
index e7f27bc8..d19a5991 100644
--- a/modules/Beets/CliHandler.php
+++ b/modules/Beets/CliHandler.php
@@ -4,7 +4,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/Beets/Handler.php b/modules/Beets/Handler.php
index 26ba5682..948e3e70 100644
--- a/modules/Beets/Handler.php
+++ b/modules/Beets/Handler.php
@@ -4,7 +4,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/Beets/JsonHandler.php b/modules/Beets/JsonHandler.php
index 7bc8fa95..7eb0fee1 100644
--- a/modules/Beets/JsonHandler.php
+++ b/modules/Beets/JsonHandler.php
@@ -4,7 +4,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/catalog/beets/beets.catalog.php b/modules/catalog/beets/beets.catalog.php
index e67d57f6..53fce0f7 100644
--- a/modules/catalog/beets/beets.catalog.php
+++ b/modules/catalog/beets/beets.catalog.php
@@ -4,7 +4,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/catalog/beetsremote/beetsremote.catalog.php b/modules/catalog/beetsremote/beetsremote.catalog.php
index e2bf982e..88bfc839 100644
--- a/modules/catalog/beetsremote/beetsremote.catalog.php
+++ b/modules/catalog/beetsremote/beetsremote.catalog.php
@@ -4,7 +4,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/catalog/dropbox/dropbox.catalog.php b/modules/catalog/dropbox/dropbox.catalog.php
index 58fb6952..5245cde5 100644
--- a/modules/catalog/dropbox/dropbox.catalog.php
+++ b/modules/catalog/dropbox/dropbox.catalog.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/catalog/local/local.catalog.php b/modules/catalog/local/local.catalog.php
index 7079981d..d6eb0c52 100644
--- a/modules/catalog/local/local.catalog.php
+++ b/modules/catalog/local/local.catalog.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/catalog/remote/remote.catalog.php b/modules/catalog/remote/remote.catalog.php
index 621fd544..7aba4c0b 100644
--- a/modules/catalog/remote/remote.catalog.php
+++ b/modules/catalog/remote/remote.catalog.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/catalog/soundcloud/soundcloud.catalog.php b/modules/catalog/soundcloud/soundcloud.catalog.php
index e5de4eaa..4b2c611d 100644
--- a/modules/catalog/soundcloud/soundcloud.catalog.php
+++ b/modules/catalog/soundcloud/soundcloud.catalog.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/catalog/subsonic/subsonic.catalog.php b/modules/catalog/subsonic/subsonic.catalog.php
index 662d50a8..2cb0238a 100644
--- a/modules/catalog/subsonic/subsonic.catalog.php
+++ b/modules/catalog/subsonic/subsonic.catalog.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/catalog/subsonic/subsonic.client.php b/modules/catalog/subsonic/subsonic.client.php
index 74f046e8..a2fde9ff 100644
--- a/modules/catalog/subsonic/subsonic.client.php
+++ b/modules/catalog/subsonic/subsonic.client.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/infotools/AmazonSearchEngine.class.php b/modules/infotools/AmazonSearchEngine.class.php
index 1dfd1d2f..be769a93 100644
--- a/modules/infotools/AmazonSearchEngine.class.php
+++ b/modules/infotools/AmazonSearchEngine.class.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/localplay/httpq/httpq.controller.php b/modules/localplay/httpq/httpq.controller.php
index c8bd8325..a9e76fbb 100644
--- a/modules/localplay/httpq/httpq.controller.php
+++ b/modules/localplay/httpq/httpq.controller.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/localplay/httpq/httpqplayer.class.php b/modules/localplay/httpq/httpqplayer.class.php
index 2ae928ad..eebe3c31 100644
--- a/modules/localplay/httpq/httpqplayer.class.php
+++ b/modules/localplay/httpq/httpqplayer.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/localplay/mpd/mpd.controller.php b/modules/localplay/mpd/mpd.controller.php
index 52154703..2ff801b2 100644
--- a/modules/localplay/mpd/mpd.controller.php
+++ b/modules/localplay/mpd/mpd.controller.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/localplay/upnp/UPnPPlaylist.php b/modules/localplay/upnp/UPnPPlaylist.php
index 8865136c..dd647fbf 100644
--- a/modules/localplay/upnp/UPnPPlaylist.php
+++ b/modules/localplay/upnp/UPnPPlaylist.php
@@ -2,7 +2,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/localplay/upnp/upnp.controller.php b/modules/localplay/upnp/upnp.controller.php
index 888d3ba8..2e386ab0 100644
--- a/modules/localplay/upnp/upnp.controller.php
+++ b/modules/localplay/upnp/upnp.controller.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/localplay/upnp/upnpplayer.class.php b/modules/localplay/upnp/upnpplayer.class.php
index b58e9164..e3f7175f 100644
--- a/modules/localplay/upnp/upnpplayer.class.php
+++ b/modules/localplay/upnp/upnpplayer.class.php
@@ -2,7 +2,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/localplay/vlc/vlc.controller.php b/modules/localplay/vlc/vlc.controller.php
index afc5a034..2b7aec19 100644
--- a/modules/localplay/vlc/vlc.controller.php
+++ b/modules/localplay/vlc/vlc.controller.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/localplay/vlc/vlcplayer.class.php b/modules/localplay/vlc/vlcplayer.class.php
index c8fa16ea..087b6443 100644
--- a/modules/localplay/vlc/vlcplayer.class.php
+++ b/modules/localplay/vlc/vlcplayer.class.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/localplay/xbmc/xbmc.controller.php b/modules/localplay/xbmc/xbmc.controller.php
index 27fb4e7a..1799cec0 100644
--- a/modules/localplay/xbmc/xbmc.controller.php
+++ b/modules/localplay/xbmc/xbmc.controller.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/7Digital/7Digital.plugin.php b/modules/plugins/7Digital/7Digital.plugin.php
index a7a7261b..aa74cd8e 100644
--- a/modules/plugins/7Digital/7Digital.plugin.php
+++ b/modules/plugins/7Digital/7Digital.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/Amazon/Amazon.plugin.php b/modules/plugins/Amazon/Amazon.plugin.php
index 23234079..fa917d7e 100644
--- a/modules/plugins/Amazon/Amazon.plugin.php
+++ b/modules/plugins/Amazon/Amazon.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/Bitly/Bitly.plugin.php b/modules/plugins/Bitly/Bitly.plugin.php
index 46e84195..1a435619 100644
--- a/modules/plugins/Bitly/Bitly.plugin.php
+++ b/modules/plugins/Bitly/Bitly.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/CatalogFavorites/CatalogFavorites.plugin.php b/modules/plugins/CatalogFavorites/CatalogFavorites.plugin.php
index 081e59d1..a68eae99 100644
--- a/modules/plugins/CatalogFavorites/CatalogFavorites.plugin.php
+++ b/modules/plugins/CatalogFavorites/CatalogFavorites.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/ChartLyrics/ChartLyrics.plugin.php b/modules/plugins/ChartLyrics/ChartLyrics.plugin.php
index eb9f4d22..ab7b96a4 100644
--- a/modules/plugins/ChartLyrics/ChartLyrics.plugin.php
+++ b/modules/plugins/ChartLyrics/ChartLyrics.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/Discogs/Discogs.plugin.php b/modules/plugins/Discogs/Discogs.plugin.php
index 8f14efba..c5593f5d 100644
--- a/modules/plugins/Discogs/Discogs.plugin.php
+++ b/modules/plugins/Discogs/Discogs.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/Facebook/Facebook.plugin.php b/modules/plugins/Facebook/Facebook.plugin.php
index 0b657a07..f08d4b3e 100644
--- a/modules/plugins/Facebook/Facebook.plugin.php
+++ b/modules/plugins/Facebook/Facebook.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/Flattr/Flattr.plugin.php b/modules/plugins/Flattr/Flattr.plugin.php
index 82c096b4..e0d22fc9 100644
--- a/modules/plugins/Flattr/Flattr.plugin.php
+++ b/modules/plugins/Flattr/Flattr.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/Flickr/Flickr.plugin.php b/modules/plugins/Flickr/Flickr.plugin.php
index b5f4cee1..94764ba2 100644
--- a/modules/plugins/Flickr/Flickr.plugin.php
+++ b/modules/plugins/Flickr/Flickr.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/FriendsTimeline/FriendsTimeline.plugin.php b/modules/plugins/FriendsTimeline/FriendsTimeline.plugin.php
index 949be065..ce219c63 100644
--- a/modules/plugins/FriendsTimeline/FriendsTimeline.plugin.php
+++ b/modules/plugins/FriendsTimeline/FriendsTimeline.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/GoogleAnalytics/GoogleAnalytics.plugin.php b/modules/plugins/GoogleAnalytics/GoogleAnalytics.plugin.php
index d1fb80c5..d9cd8e70 100644
--- a/modules/plugins/GoogleAnalytics/GoogleAnalytics.plugin.php
+++ b/modules/plugins/GoogleAnalytics/GoogleAnalytics.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/GoogleMaps/GoogleMaps.plugin.php b/modules/plugins/GoogleMaps/GoogleMaps.plugin.php
index 6b2d8fb6..6f93e8cf 100644
--- a/modules/plugins/GoogleMaps/GoogleMaps.plugin.php
+++ b/modules/plugins/GoogleMaps/GoogleMaps.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/GooglePlus/GooglePlus.plugin.php b/modules/plugins/GooglePlus/GooglePlus.plugin.php
index 3e71e604..2d743eb2 100644
--- a/modules/plugins/GooglePlus/GooglePlus.plugin.php
+++ b/modules/plugins/GooglePlus/GooglePlus.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/Gravatar/Gravatar.plugin.php b/modules/plugins/Gravatar/Gravatar.plugin.php
index cf8d87dd..73ff4502 100644
--- a/modules/plugins/Gravatar/Gravatar.plugin.php
+++ b/modules/plugins/Gravatar/Gravatar.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/Headphones/Headphones.plugin.php b/modules/plugins/Headphones/Headphones.plugin.php
index cd7b8bb6..516d3497 100644
--- a/modules/plugins/Headphones/Headphones.plugin.php
+++ b/modules/plugins/Headphones/Headphones.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/Lastfm/Lastfm.plugin.php b/modules/plugins/Lastfm/Lastfm.plugin.php
index 9d639e30..e46bc8b5 100644
--- a/modules/plugins/Lastfm/Lastfm.plugin.php
+++ b/modules/plugins/Lastfm/Lastfm.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/Libravatar/Libravatar.plugin.php b/modules/plugins/Libravatar/Libravatar.plugin.php
index 4ca12268..c8d160b7 100644
--- a/modules/plugins/Libravatar/Libravatar.plugin.php
+++ b/modules/plugins/Libravatar/Libravatar.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/Librefm/Librefm.plugin.php b/modules/plugins/Librefm/Librefm.plugin.php
index 210a1ae9..189badb7 100644
--- a/modules/plugins/Librefm/Librefm.plugin.php
+++ b/modules/plugins/Librefm/Librefm.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/LyricWiki/LyricWiki.plugin.php b/modules/plugins/LyricWiki/LyricWiki.plugin.php
index 5b182382..9ec46c66 100644
--- a/modules/plugins/LyricWiki/LyricWiki.plugin.php
+++ b/modules/plugins/LyricWiki/LyricWiki.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/MusicBrainz/MusicBrainz.plugin.php b/modules/plugins/MusicBrainz/MusicBrainz.plugin.php
index 4a50653d..c11c7baa 100644
--- a/modules/plugins/MusicBrainz/MusicBrainz.plugin.php
+++ b/modules/plugins/MusicBrainz/MusicBrainz.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/Omdb/Omdb.plugin.php b/modules/plugins/Omdb/Omdb.plugin.php
index f321890d..74805323 100644
--- a/modules/plugins/Omdb/Omdb.plugin.php
+++ b/modules/plugins/Omdb/Omdb.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/Paypal/Paypal.plugin.php b/modules/plugins/Paypal/Paypal.plugin.php
index 6f037b02..81a89a23 100644
--- a/modules/plugins/Paypal/Paypal.plugin.php
+++ b/modules/plugins/Paypal/Paypal.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/Piwik/Piwik.plugin.php b/modules/plugins/Piwik/Piwik.plugin.php
index d3eb0de0..84dbfb3f 100644
--- a/modules/plugins/Piwik/Piwik.plugin.php
+++ b/modules/plugins/Piwik/Piwik.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/RSSView/RSSView.plugin.php b/modules/plugins/RSSView/RSSView.plugin.php
index af304d8f..940234a0 100644
--- a/modules/plugins/RSSView/RSSView.plugin.php
+++ b/modules/plugins/RSSView/RSSView.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/ShoutHome/ShoutHome.plugin.php b/modules/plugins/ShoutHome/ShoutHome.plugin.php
index 9773c550..e79709ba 100644
--- a/modules/plugins/ShoutHome/ShoutHome.plugin.php
+++ b/modules/plugins/ShoutHome/ShoutHome.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/StreamBandwidth/StreamBandwidth.plugin.php b/modules/plugins/StreamBandwidth/StreamBandwidth.plugin.php
index ba462762..7bdb0a42 100644
--- a/modules/plugins/StreamBandwidth/StreamBandwidth.plugin.php
+++ b/modules/plugins/StreamBandwidth/StreamBandwidth.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/StreamHits/StreamHits.plugin.php b/modules/plugins/StreamHits/StreamHits.plugin.php
index 0bfce5b3..2655648d 100644
--- a/modules/plugins/StreamHits/StreamHits.plugin.php
+++ b/modules/plugins/StreamHits/StreamHits.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/StreamTime/StreamTime.plugin.php b/modules/plugins/StreamTime/StreamTime.plugin.php
index 42b4e594..5d25c12b 100644
--- a/modules/plugins/StreamTime/StreamTime.plugin.php
+++ b/modules/plugins/StreamTime/StreamTime.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/TheAudioDb/TheAudioDb.plugin.php b/modules/plugins/TheAudioDb/TheAudioDb.plugin.php
index dbbeef39..b6bc98c0 100644
--- a/modules/plugins/TheAudioDb/TheAudioDb.plugin.php
+++ b/modules/plugins/TheAudioDb/TheAudioDb.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/Tmdb/Tmdb.plugin.php b/modules/plugins/Tmdb/Tmdb.plugin.php
index 9bfa6965..f2dea3d5 100644
--- a/modules/plugins/Tmdb/Tmdb.plugin.php
+++ b/modules/plugins/Tmdb/Tmdb.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/Tvdb/Tvdb.plugin.php b/modules/plugins/Tvdb/Tvdb.plugin.php
index 7d050429..3991c13e 100644
--- a/modules/plugins/Tvdb/Tvdb.plugin.php
+++ b/modules/plugins/Tvdb/Tvdb.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/Twitter/Twitter.plugin.php b/modules/plugins/Twitter/Twitter.plugin.php
index 62da7c0f..c69f4b45 100644
--- a/modules/plugins/Twitter/Twitter.plugin.php
+++ b/modules/plugins/Twitter/Twitter.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/modules/plugins/Yourls/Yourls.plugin.php b/modules/plugins/Yourls/Yourls.plugin.php
index ae7b5dcd..57cbd518 100644
--- a/modules/plugins/Yourls/Yourls.plugin.php
+++ b/modules/plugins/Yourls/Yourls.plugin.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/nbproject/licenseheader.txt b/nbproject/licenseheader.txt
index 8c524603..30de9d2d 100644
--- a/nbproject/licenseheader.txt
+++ b/nbproject/licenseheader.txt
@@ -2,7 +2,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -17,4 +17,4 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- */
\ No newline at end of file
+ */
diff --git a/phpinfo.php b/phpinfo.php
index bb3d1180..8afa871c 100644
--- a/phpinfo.php
+++ b/phpinfo.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/play/index.php b/play/index.php
index 1020ae03..00f0040b 100644
--- a/play/index.php
+++ b/play/index.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/playlist.php b/playlist.php
index 4794221f..92ac348b 100644
--- a/playlist.php
+++ b/playlist.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/plex/index.php b/plex/index.php
index 9f91b6be..1ae2bd72 100644
--- a/plex/index.php
+++ b/plex/index.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/plex/web/index.php b/plex/web/index.php
index ebc8bd83..0001c00e 100644
--- a/plex/web/index.php
+++ b/plex/web/index.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/plex/web/init.php b/plex/web/init.php
index 13eba1ed..69038bba 100644
--- a/plex/web/init.php
+++ b/plex/web/init.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/plex/web/login.php b/plex/web/login.php
index 0c8ff5e0..68dffaef 100644
--- a/plex/web/login.php
+++ b/plex/web/login.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/podcast.php b/podcast.php
index 39386367..2b1095be 100644
--- a/podcast.php
+++ b/podcast.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/podcast_episode.php b/podcast_episode.php
index f8090f6f..384b5249 100644
--- a/podcast_episode.php
+++ b/podcast_episode.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/preferences.php b/preferences.php
index ff0b7833..0ab7168f 100644
--- a/preferences.php
+++ b/preferences.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/pvmsg.php b/pvmsg.php
index 9299d79c..0156e36c 100644
--- a/pvmsg.php
+++ b/pvmsg.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/radio.php b/radio.php
index 0ad679e0..4f2d9acf 100644
--- a/radio.php
+++ b/radio.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/random.php b/random.php
index 64219611..a0018dd8 100644
--- a/random.php
+++ b/random.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/register.php b/register.php
index 81d2c6d4..e95ca072 100644
--- a/register.php
+++ b/register.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/rest/index.php b/rest/index.php
index 5ba1be70..85ff6e4a 100644
--- a/rest/index.php
+++ b/rest/index.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/rss.php b/rss.php
index 89437a2a..6c416c2c 100644
--- a/rss.php
+++ b/rss.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/search.php b/search.php
index ab271d04..37906266 100644
--- a/search.php
+++ b/search.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/server/ajax.server.php b/server/ajax.server.php
index 90a81e75..f064f6d6 100644
--- a/server/ajax.server.php
+++ b/server/ajax.server.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/server/browse.ajax.php b/server/browse.ajax.php
index a0415c05..cfa86bc6 100644
--- a/server/browse.ajax.php
+++ b/server/browse.ajax.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/server/catalog.ajax.php b/server/catalog.ajax.php
index 17dff6b9..34bee581 100644
--- a/server/catalog.ajax.php
+++ b/server/catalog.ajax.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/server/democratic.ajax.php b/server/democratic.ajax.php
index 0d26795a..827b3c23 100644
--- a/server/democratic.ajax.php
+++ b/server/democratic.ajax.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/server/edit.server.php b/server/edit.server.php
index d97d126d..00149c21 100644
--- a/server/edit.server.php
+++ b/server/edit.server.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/server/fs.ajax.php b/server/fs.ajax.php
index cd54b082..ccfbb6c2 100644
--- a/server/fs.ajax.php
+++ b/server/fs.ajax.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/server/index.ajax.php b/server/index.ajax.php
index c1cdd411..336eff97 100644
--- a/server/index.ajax.php
+++ b/server/index.ajax.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/server/localplay.ajax.php b/server/localplay.ajax.php
index dc5bc452..e4e4e137 100644
--- a/server/localplay.ajax.php
+++ b/server/localplay.ajax.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/server/player.ajax.php b/server/player.ajax.php
index e175e2aa..87b1315d 100644
--- a/server/player.ajax.php
+++ b/server/player.ajax.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/server/playlist.ajax.php b/server/playlist.ajax.php
index d0f6c523..1c84fdac 100644
--- a/server/playlist.ajax.php
+++ b/server/playlist.ajax.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/server/podcast.ajax.php b/server/podcast.ajax.php
index 727a45e9..54e24eb3 100644
--- a/server/podcast.ajax.php
+++ b/server/podcast.ajax.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/server/random.ajax.php b/server/random.ajax.php
index 6ea6d03d..ff39634e 100644
--- a/server/random.ajax.php
+++ b/server/random.ajax.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/server/refresh_reordered.server.php b/server/refresh_reordered.server.php
index 56f7f849..f0bca72c 100644
--- a/server/refresh_reordered.server.php
+++ b/server/refresh_reordered.server.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/server/search.ajax.php b/server/search.ajax.php
index 8a617f0f..1d2331b5 100644
--- a/server/search.ajax.php
+++ b/server/search.ajax.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/server/song.ajax.php b/server/song.ajax.php
index e6545fb9..0765a95e 100644
--- a/server/song.ajax.php
+++ b/server/song.ajax.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/server/sse.server.php b/server/sse.server.php
index 7ba43e73..9a47bdb4 100644
--- a/server/sse.server.php
+++ b/server/sse.server.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/server/stats.ajax.php b/server/stats.ajax.php
index 4d73bc4a..4d70770e 100644
--- a/server/stats.ajax.php
+++ b/server/stats.ajax.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/server/stream.ajax.php b/server/stream.ajax.php
index fc5f8315..c119b06a 100644
--- a/server/stream.ajax.php
+++ b/server/stream.ajax.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/server/tag.ajax.php b/server/tag.ajax.php
index 9e617c5b..35a05319 100644
--- a/server/tag.ajax.php
+++ b/server/tag.ajax.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/server/user.ajax.php b/server/user.ajax.php
index dac83d04..0bd326b1 100644
--- a/server/user.ajax.php
+++ b/server/user.ajax.php
@@ -4,7 +4,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/server/xml.server.php b/server/xml.server.php
index 9f1b0989..49dd3f83 100644
--- a/server/xml.server.php
+++ b/server/xml.server.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/share.php b/share.php
index 24de0d0d..64cc1384 100644
--- a/share.php
+++ b/share.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/shout.php b/shout.php
index 5a29e8c3..9853f1d8 100644
--- a/shout.php
+++ b/shout.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/show_get.php b/show_get.php
index 051275ab..3cdd8e67 100644
--- a/show_get.php
+++ b/show_get.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/smartplaylist.php b/smartplaylist.php
index b56220f8..9994d942 100644
--- a/smartplaylist.php
+++ b/smartplaylist.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/song.php b/song.php
index 0e548ee7..9fee547e 100644
--- a/song.php
+++ b/song.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/sql/ampache.sql b/sql/ampache.sql
index 48180450..acfa6dd0 100644
--- a/sql/ampache.sql
+++ b/sql/ampache.sql
@@ -1,4 +1,4 @@
--- Copyright 2001 - 2015 Ampache.org
+-- Copyright 2001 - 2016 Ampache.org
 -- All rights reserved.
 --
 -- This program is free software; you can redistribute it and/or
diff --git a/stats.php b/stats.php
index 5d3278d4..8a85fe7a 100644
--- a/stats.php
+++ b/stats.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/stream.php b/stream.php
index c2162abb..aff4d2b4 100644
--- a/stream.php
+++ b/stream.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/base.css b/templates/base.css
index 19429913..6815e2d7 100644
--- a/templates/base.css
+++ b/templates/base.css
@@ -2,7 +2,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/browse_content.inc.php b/templates/browse_content.inc.php
index e8cba467..3ff43969 100644
--- a/templates/browse_content.inc.php
+++ b/templates/browse_content.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/browse_filters.inc.php b/templates/browse_filters.inc.php
index e27d64d3..d48c2b58 100644
--- a/templates/browse_filters.inc.php
+++ b/templates/browse_filters.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/create_web_player.inc.php b/templates/create_web_player.inc.php
index e2113246..be4fe6d5 100644
--- a/templates/create_web_player.inc.php
+++ b/templates/create_web_player.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/create_web_player_embedded.inc.php b/templates/create_web_player_embedded.inc.php
index 64c047a2..ec96999e 100644
--- a/templates/create_web_player_embedded.inc.php
+++ b/templates/create_web_player_embedded.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/error_page.inc.php b/templates/error_page.inc.php
index 7e2d7965..29d1f9b5 100644
--- a/templates/error_page.inc.php
+++ b/templates/error_page.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/footer.inc.php b/templates/footer.inc.php
index a9f29a0b..ab8369ee 100644
--- a/templates/footer.inc.php
+++ b/templates/footer.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/header.inc.php b/templates/header.inc.php
index 8a173962..f1263523 100644
--- a/templates/header.inc.php
+++ b/templates/header.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/install.css b/templates/install.css
index 65a945f5..b501b5fa 100644
--- a/templates/install.css
+++ b/templates/install.css
@@ -2,7 +2,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/install_header.inc.php b/templates/install_header.inc.php
index b27e2b0f..fe80bb1f 100644
--- a/templates/install_header.inc.php
+++ b/templates/install_header.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/javascript_refresh.inc.php b/templates/javascript_refresh.inc.php
index 2fc19b0d..331e2206 100644
--- a/templates/javascript_refresh.inc.php
+++ b/templates/javascript_refresh.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/jquery-ui.custom.css b/templates/jquery-ui.custom.css
index a597aff3..2e41d393 100644
--- a/templates/jquery-ui.custom.css
+++ b/templates/jquery-ui.custom.css
@@ -2,7 +2,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/list_header.inc.php b/templates/list_header.inc.php
index 39c94a0f..a22f3df4 100644
--- a/templates/list_header.inc.php
+++ b/templates/list_header.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/print.css b/templates/print.css
index 00a03fad..cf5e9652 100644
--- a/templates/print.css
+++ b/templates/print.css
@@ -1,7 +1,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/rightbar.inc.php b/templates/rightbar.inc.php
index 0aaaa1f2..5bc24737 100644
--- a/templates/rightbar.inc.php
+++ b/templates/rightbar.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_access_list.inc.php b/templates/show_access_list.inc.php
index 55b5dbdc..d291a83c 100644
--- a/templates/show_access_list.inc.php
+++ b/templates/show_access_list.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_account.inc.php b/templates/show_account.inc.php
index 5260c418..a06968ce 100644
--- a/templates/show_account.inc.php
+++ b/templates/show_account.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_add_access.inc.php b/templates/show_add_access.inc.php
index 35eb764e..5e0f709f 100644
--- a/templates/show_add_access.inc.php
+++ b/templates/show_add_access.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_add_catalog.inc.php b/templates/show_add_catalog.inc.php
index 8fbdb368..eb0d61aa 100644
--- a/templates/show_add_catalog.inc.php
+++ b/templates/show_add_catalog.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_add_channel.inc.php b/templates/show_add_channel.inc.php
index e2680b05..e713136c 100644
--- a/templates/show_add_channel.inc.php
+++ b/templates/show_add_channel.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_add_label.inc.php b/templates/show_add_label.inc.php
index d1e6af2c..a0ac61b6 100644
--- a/templates/show_add_label.inc.php
+++ b/templates/show_add_label.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_add_live_stream.inc.php b/templates/show_add_live_stream.inc.php
index 129db554..055a9f36 100644
--- a/templates/show_add_live_stream.inc.php
+++ b/templates/show_add_live_stream.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_add_playlist.inc.php b/templates/show_add_playlist.inc.php
index 8ce0e4b1..76ee77d6 100644
--- a/templates/show_add_playlist.inc.php
+++ b/templates/show_add_playlist.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_add_podcast.inc.php b/templates/show_add_podcast.inc.php
index e4635e99..d1b5cb90 100644
--- a/templates/show_add_podcast.inc.php
+++ b/templates/show_add_podcast.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_add_pvmsg.inc.php b/templates/show_add_pvmsg.inc.php
index a6dcd9db..8505a06f 100644
--- a/templates/show_add_pvmsg.inc.php
+++ b/templates/show_add_pvmsg.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_add_share.inc.php b/templates/show_add_share.inc.php
index 12854003..d290deb1 100644
--- a/templates/show_add_share.inc.php
+++ b/templates/show_add_share.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_add_shout.inc.php b/templates/show_add_shout.inc.php
index 1ee979e4..fd22d1ec 100644
--- a/templates/show_add_shout.inc.php
+++ b/templates/show_add_shout.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_add_upload.inc.php b/templates/show_add_upload.inc.php
index 380c8643..360b7200 100644
--- a/templates/show_add_upload.inc.php
+++ b/templates/show_add_upload.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_add_user.inc.php b/templates/show_add_user.inc.php
index 2b611fd9..ffbe41f8 100644
--- a/templates/show_add_user.inc.php
+++ b/templates/show_add_user.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_adds_catalog.inc.php b/templates/show_adds_catalog.inc.php
index fd024996..489c09a7 100644
--- a/templates/show_adds_catalog.inc.php
+++ b/templates/show_adds_catalog.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_album.inc.php b/templates/show_album.inc.php
index 24a9da45..5df1d7ee 100644
--- a/templates/show_album.inc.php
+++ b/templates/show_album.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_album_group_disks.inc.php b/templates/show_album_group_disks.inc.php
index 2cdfb284..a76f78f4 100644
--- a/templates/show_album_group_disks.inc.php
+++ b/templates/show_album_group_disks.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_album_row.inc.php b/templates/show_album_row.inc.php
index 8abac547..6a781ed1 100644
--- a/templates/show_album_row.inc.php
+++ b/templates/show_album_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_albums.inc.php b/templates/show_albums.inc.php
index e862adfa..0befed00 100644
--- a/templates/show_albums.inc.php
+++ b/templates/show_albums.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_alphabet_form.inc.php b/templates/show_alphabet_form.inc.php
index 4abf677f..46b6821b 100644
--- a/templates/show_alphabet_form.inc.php
+++ b/templates/show_alphabet_form.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_artist.inc.php b/templates/show_artist.inc.php
index 8b56ea23..dd8ef7a7 100644
--- a/templates/show_artist.inc.php
+++ b/templates/show_artist.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_artist_info.inc.php b/templates/show_artist_info.inc.php
index 7ea3f435..0bd855f9 100644
--- a/templates/show_artist_info.inc.php
+++ b/templates/show_artist_info.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_artist_row.inc.php b/templates/show_artist_row.inc.php
index d7167e12..b9824328 100644
--- a/templates/show_artist_row.inc.php
+++ b/templates/show_artist_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_artists.inc.php b/templates/show_artists.inc.php
index d19e278d..34d428c7 100644
--- a/templates/show_artists.inc.php
+++ b/templates/show_artists.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_arts.inc.php b/templates/show_arts.inc.php
index 2c29864b..7900065e 100644
--- a/templates/show_arts.inc.php
+++ b/templates/show_arts.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_big_art.inc.php b/templates/show_big_art.inc.php
index ed660699..5cf1c350 100644
--- a/templates/show_big_art.inc.php
+++ b/templates/show_big_art.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_box_bottom.inc.php b/templates/show_box_bottom.inc.php
index 81541fdf..62637350 100644
--- a/templates/show_box_bottom.inc.php
+++ b/templates/show_box_bottom.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_box_top.inc.php b/templates/show_box_top.inc.php
index 4385bc25..b54687fb 100644
--- a/templates/show_box_top.inc.php
+++ b/templates/show_box_top.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_broadcast_row.inc.php b/templates/show_broadcast_row.inc.php
index 35dbac2b..7fb6732e 100644
--- a/templates/show_broadcast_row.inc.php
+++ b/templates/show_broadcast_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_broadcasts.inc.php b/templates/show_broadcasts.inc.php
index 56447214..8e780aa6 100644
--- a/templates/show_broadcasts.inc.php
+++ b/templates/show_broadcasts.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_broadcasts_dialog.inc.php b/templates/show_broadcasts_dialog.inc.php
index dfbbf69f..23967957 100644
--- a/templates/show_broadcasts_dialog.inc.php
+++ b/templates/show_broadcasts_dialog.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_catalog_row.inc.php b/templates/show_catalog_row.inc.php
index bd01301c..5b78fcdb 100644
--- a/templates/show_catalog_row.inc.php
+++ b/templates/show_catalog_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_catalog_types.inc.php b/templates/show_catalog_types.inc.php
index 4a1966d6..f19c5ac6 100644
--- a/templates/show_catalog_types.inc.php
+++ b/templates/show_catalog_types.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_catalogs.inc.php b/templates/show_catalogs.inc.php
index 3f0cafaf..e203e560 100644
--- a/templates/show_catalogs.inc.php
+++ b/templates/show_catalogs.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_channel_row.inc.php b/templates/show_channel_row.inc.php
index 474091cb..9e553081 100644
--- a/templates/show_channel_row.inc.php
+++ b/templates/show_channel_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_channels.inc.php b/templates/show_channels.inc.php
index 5d45b3b4..6548ae39 100644
--- a/templates/show_channels.inc.php
+++ b/templates/show_channels.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_clean_catalog.inc.php b/templates/show_clean_catalog.inc.php
index 369359de..3f051752 100644
--- a/templates/show_clean_catalog.inc.php
+++ b/templates/show_clean_catalog.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_concert_row.inc.php b/templates/show_concert_row.inc.php
index b359d61d..6e37b4a4 100644
--- a/templates/show_concert_row.inc.php
+++ b/templates/show_concert_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_concerts.inc.php b/templates/show_concerts.inc.php
index 8104d433..f400ed6f 100644
--- a/templates/show_concerts.inc.php
+++ b/templates/show_concerts.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_confirmation.inc.php b/templates/show_confirmation.inc.php
index fb51f4fb..ff7816d8 100644
--- a/templates/show_confirmation.inc.php
+++ b/templates/show_confirmation.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_create_democratic.inc.php b/templates/show_create_democratic.inc.php
index 9c6a6076..9273a355 100644
--- a/templates/show_create_democratic.inc.php
+++ b/templates/show_create_democratic.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_debug.inc.php b/templates/show_debug.inc.php
index b673df14..b6bd6c86 100644
--- a/templates/show_debug.inc.php
+++ b/templates/show_debug.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_democratic.inc.php b/templates/show_democratic.inc.php
index 229f5a53..ce4efb5b 100644
--- a/templates/show_democratic.inc.php
+++ b/templates/show_democratic.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_democratic_playlist.inc.php b/templates/show_democratic_playlist.inc.php
index 041d019b..aacb66cd 100644
--- a/templates/show_democratic_playlist.inc.php
+++ b/templates/show_democratic_playlist.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_denied.inc.php b/templates/show_denied.inc.php
index c4d52370..fbe15c48 100644
--- a/templates/show_denied.inc.php
+++ b/templates/show_denied.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_disabled_songs.inc.php b/templates/show_disabled_songs.inc.php
index 34d7507f..1649c13c 100644
--- a/templates/show_disabled_songs.inc.php
+++ b/templates/show_disabled_songs.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_duplicate.inc.php b/templates/show_duplicate.inc.php
index 319624d8..e09dd1e2 100644
--- a/templates/show_duplicate.inc.php
+++ b/templates/show_duplicate.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_duplicates.inc.php b/templates/show_duplicates.inc.php
index b3de8b66..2193b0a8 100644
--- a/templates/show_duplicates.inc.php
+++ b/templates/show_duplicates.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_dynamic.inc.php b/templates/show_dynamic.inc.php
index d0e33b8c..132de2dd 100644
--- a/templates/show_dynamic.inc.php
+++ b/templates/show_dynamic.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_edit_access.inc.php b/templates/show_edit_access.inc.php
index c5f9fb54..5e9cf97d 100644
--- a/templates/show_edit_access.inc.php
+++ b/templates/show_edit_access.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_edit_album_row.inc.php b/templates/show_edit_album_row.inc.php
index 919e4e49..9e5efd33 100644
--- a/templates/show_edit_album_row.inc.php
+++ b/templates/show_edit_album_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_edit_artist_row.inc.php b/templates/show_edit_artist_row.inc.php
index e1cec0c8..ccfebdc6 100644
--- a/templates/show_edit_artist_row.inc.php
+++ b/templates/show_edit_artist_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_edit_broadcast_row.inc.php b/templates/show_edit_broadcast_row.inc.php
index 871453a9..a3b5208d 100644
--- a/templates/show_edit_broadcast_row.inc.php
+++ b/templates/show_edit_broadcast_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_edit_catalog.inc.php b/templates/show_edit_catalog.inc.php
index a55a7204..04e659a4 100644
--- a/templates/show_edit_catalog.inc.php
+++ b/templates/show_edit_catalog.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_edit_channel_row.inc.php b/templates/show_edit_channel_row.inc.php
index f8fcd01a..b2300012 100644
--- a/templates/show_edit_channel_row.inc.php
+++ b/templates/show_edit_channel_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_edit_label_row.inc.php b/templates/show_edit_label_row.inc.php
index 88df89ac..bfdc0668 100644
--- a/templates/show_edit_label_row.inc.php
+++ b/templates/show_edit_label_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_edit_license.inc.php b/templates/show_edit_license.inc.php
index 163da29a..b0de28d1 100644
--- a/templates/show_edit_license.inc.php
+++ b/templates/show_edit_license.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_edit_live_stream_row.inc.php b/templates/show_edit_live_stream_row.inc.php
index 3481bd1b..8e12b0fd 100644
--- a/templates/show_edit_live_stream_row.inc.php
+++ b/templates/show_edit_live_stream_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_edit_playlist_row.inc.php b/templates/show_edit_playlist_row.inc.php
index af4edd0a..2756f7ca 100644
--- a/templates/show_edit_playlist_row.inc.php
+++ b/templates/show_edit_playlist_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_edit_podcast_episode_row.inc.php b/templates/show_edit_podcast_episode_row.inc.php
index c79c862c..1ff34023 100644
--- a/templates/show_edit_podcast_episode_row.inc.php
+++ b/templates/show_edit_podcast_episode_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_edit_podcast_row.inc.php b/templates/show_edit_podcast_row.inc.php
index f91dca44..21952453 100644
--- a/templates/show_edit_podcast_row.inc.php
+++ b/templates/show_edit_podcast_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_edit_search_row.inc.php b/templates/show_edit_search_row.inc.php
index 7b467ad2..d0df71f8 100644
--- a/templates/show_edit_search_row.inc.php
+++ b/templates/show_edit_search_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_edit_share_row.inc.php b/templates/show_edit_share_row.inc.php
index 21947138..c5053fe9 100644
--- a/templates/show_edit_share_row.inc.php
+++ b/templates/show_edit_share_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_edit_shout.inc.php b/templates/show_edit_shout.inc.php
index 1c832e39..0f81d4d4 100644
--- a/templates/show_edit_shout.inc.php
+++ b/templates/show_edit_shout.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_edit_song_row.inc.php b/templates/show_edit_song_row.inc.php
index 89d93a2e..224d7dc6 100644
--- a/templates/show_edit_song_row.inc.php
+++ b/templates/show_edit_song_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_edit_tag_row.inc.php b/templates/show_edit_tag_row.inc.php
index d4f915c4..180b1181 100644
--- a/templates/show_edit_tag_row.inc.php
+++ b/templates/show_edit_tag_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_edit_tvshow_row.inc.php b/templates/show_edit_tvshow_row.inc.php
index 8edcd30e..c1b2f212 100644
--- a/templates/show_edit_tvshow_row.inc.php
+++ b/templates/show_edit_tvshow_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_edit_tvshow_season_row.inc.php b/templates/show_edit_tvshow_season_row.inc.php
index 2db34967..9a38ef1f 100644
--- a/templates/show_edit_tvshow_season_row.inc.php
+++ b/templates/show_edit_tvshow_season_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_edit_user.inc.php b/templates/show_edit_user.inc.php
index 890138d9..bcd9ea7c 100644
--- a/templates/show_edit_user.inc.php
+++ b/templates/show_edit_user.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_edit_video_row.inc.php b/templates/show_edit_video_row.inc.php
index dcd67004..9b20d01b 100644
--- a/templates/show_edit_video_row.inc.php
+++ b/templates/show_edit_video_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_export.inc.php b/templates/show_export.inc.php
index 1b5dbf0d..5d073ca0 100644
--- a/templates/show_export.inc.php
+++ b/templates/show_export.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_gather_art.inc.php b/templates/show_gather_art.inc.php
index fb242cd4..29d3272e 100644
--- a/templates/show_gather_art.inc.php
+++ b/templates/show_gather_art.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_get_art.inc.php b/templates/show_get_art.inc.php
index 2696e661..e4da8a2a 100644
--- a/templates/show_get_art.inc.php
+++ b/templates/show_get_art.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_graphs.inc.php b/templates/show_graphs.inc.php
index dc6127ac..f92aedd6 100644
--- a/templates/show_graphs.inc.php
+++ b/templates/show_graphs.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_highest.inc.php b/templates/show_highest.inc.php
index 9f2eb6fe..8e368b1f 100644
--- a/templates/show_highest.inc.php
+++ b/templates/show_highest.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_import_playlist.inc.php b/templates/show_import_playlist.inc.php
index bd49aa53..4913f3bc 100644
--- a/templates/show_import_playlist.inc.php
+++ b/templates/show_import_playlist.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_index.inc.php b/templates/show_index.inc.php
index 03e8c9f7..835ad178 100644
--- a/templates/show_index.inc.php
+++ b/templates/show_index.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_install.inc.php b/templates/show_install.inc.php
index ecb057f2..337504ca 100644
--- a/templates/show_install.inc.php
+++ b/templates/show_install.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_install_account.inc.php b/templates/show_install_account.inc.php
index ae306551..5a685c9b 100644
--- a/templates/show_install_account.inc.php
+++ b/templates/show_install_account.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_install_check.inc.php b/templates/show_install_check.inc.php
index 33ffdfd9..c8faf57a 100644
--- a/templates/show_install_check.inc.php
+++ b/templates/show_install_check.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_install_config.inc.php b/templates/show_install_config.inc.php
index 19f75507..60ca650e 100644
--- a/templates/show_install_config.inc.php
+++ b/templates/show_install_config.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_install_lang.inc.php b/templates/show_install_lang.inc.php
index 8b69856c..dccfee6f 100644
--- a/templates/show_install_lang.inc.php
+++ b/templates/show_install_lang.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_ip_history.inc.php b/templates/show_ip_history.inc.php
index b6ebe4ae..a8bd30d9 100644
--- a/templates/show_ip_history.inc.php
+++ b/templates/show_ip_history.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_label.inc.php b/templates/show_label.inc.php
index aab022a5..a4e976db 100644
--- a/templates/show_label.inc.php
+++ b/templates/show_label.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_label_row.inc.php b/templates/show_label_row.inc.php
index 44118738..15e9b5d7 100644
--- a/templates/show_label_row.inc.php
+++ b/templates/show_label_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_labels.inc.php b/templates/show_labels.inc.php
index 69e9a288..54e17b71 100644
--- a/templates/show_labels.inc.php
+++ b/templates/show_labels.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_license_row.inc.php b/templates/show_license_row.inc.php
index 4e0b88f3..3cd1ef22 100644
--- a/templates/show_license_row.inc.php
+++ b/templates/show_license_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_live_stream.inc.php b/templates/show_live_stream.inc.php
index fd534bb3..1fd25f8d 100644
--- a/templates/show_live_stream.inc.php
+++ b/templates/show_live_stream.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_live_stream_row.inc.php b/templates/show_live_stream_row.inc.php
index 0760d93d..18f7fef3 100644
--- a/templates/show_live_stream_row.inc.php
+++ b/templates/show_live_stream_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_live_streams.inc.php b/templates/show_live_streams.inc.php
index db9c4cfc..5ee01f28 100644
--- a/templates/show_live_streams.inc.php
+++ b/templates/show_live_streams.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_localplay_add_instance.inc.php b/templates/show_localplay_add_instance.inc.php
index d099b86d..9d35d8ff 100644
--- a/templates/show_localplay_add_instance.inc.php
+++ b/templates/show_localplay_add_instance.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_localplay_control.inc.php b/templates/show_localplay_control.inc.php
index 62397bc6..88f9252b 100644
--- a/templates/show_localplay_control.inc.php
+++ b/templates/show_localplay_control.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_localplay_controllers.inc.php b/templates/show_localplay_controllers.inc.php
index 746232e0..d8132bb5 100644
--- a/templates/show_localplay_controllers.inc.php
+++ b/templates/show_localplay_controllers.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_localplay_edit_instance.inc.php b/templates/show_localplay_edit_instance.inc.php
index 159723a3..9111217c 100644
--- a/templates/show_localplay_edit_instance.inc.php
+++ b/templates/show_localplay_edit_instance.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_localplay_instances.inc.php b/templates/show_localplay_instances.inc.php
index c374a4d6..c911f7e9 100644
--- a/templates/show_localplay_instances.inc.php
+++ b/templates/show_localplay_instances.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_localplay_playlist.inc.php b/templates/show_localplay_playlist.inc.php
index 5700d611..f8b4a5ac 100644
--- a/templates/show_localplay_playlist.inc.php
+++ b/templates/show_localplay_playlist.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_localplay_status.inc.php b/templates/show_localplay_status.inc.php
index 2c731792..a251977d 100644
--- a/templates/show_localplay_status.inc.php
+++ b/templates/show_localplay_status.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_login_form.inc.php b/templates/show_login_form.inc.php
index e28c57b9..cfb62559 100644
--- a/templates/show_login_form.inc.php
+++ b/templates/show_login_form.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_lostpassword_form.inc.php b/templates/show_lostpassword_form.inc.php
index d881d667..c8af98f3 100644
--- a/templates/show_lostpassword_form.inc.php
+++ b/templates/show_lostpassword_form.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_lyrics.inc.php b/templates/show_lyrics.inc.php
index 3ca6b99b..a095b2f1 100644
--- a/templates/show_lyrics.inc.php
+++ b/templates/show_lyrics.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_mail_users.inc.php b/templates/show_mail_users.inc.php
index 9f2b9263..849e6251 100644
--- a/templates/show_mail_users.inc.php
+++ b/templates/show_mail_users.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_manage_catalogs.inc.php b/templates/show_manage_catalogs.inc.php
index 01279e7c..532bfc27 100644
--- a/templates/show_manage_catalogs.inc.php
+++ b/templates/show_manage_catalogs.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_manage_democratic.inc.php b/templates/show_manage_democratic.inc.php
index c4ab5140..f7dd797e 100644
--- a/templates/show_manage_democratic.inc.php
+++ b/templates/show_manage_democratic.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_manage_license.inc.php b/templates/show_manage_license.inc.php
index 63107996..9a978b3b 100644
--- a/templates/show_manage_license.inc.php
+++ b/templates/show_manage_license.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_manage_shoutbox.inc.php b/templates/show_manage_shoutbox.inc.php
index e968a26e..8c2900d8 100644
--- a/templates/show_manage_shoutbox.inc.php
+++ b/templates/show_manage_shoutbox.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_mashup.inc.php b/templates/show_mashup.inc.php
index f75215a0..d946a888 100644
--- a/templates/show_mashup.inc.php
+++ b/templates/show_mashup.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_missing_album.inc.php b/templates/show_missing_album.inc.php
index 73327ac8..1d516a09 100644
--- a/templates/show_missing_album.inc.php
+++ b/templates/show_missing_album.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_missing_albums.inc.php b/templates/show_missing_albums.inc.php
index 0310c8b7..052fa28b 100644
--- a/templates/show_missing_albums.inc.php
+++ b/templates/show_missing_albums.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_missing_artist.inc.php b/templates/show_missing_artist.inc.php
index bddc9b0f..a6210c44 100644
--- a/templates/show_missing_artist.inc.php
+++ b/templates/show_missing_artist.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_missing_artists.inc.php b/templates/show_missing_artists.inc.php
index eb463873..098b98bf 100644
--- a/templates/show_missing_artists.inc.php
+++ b/templates/show_missing_artists.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_newest.inc.php b/templates/show_newest.inc.php
index 2c300178..8ae90d97 100644
--- a/templates/show_newest.inc.php
+++ b/templates/show_newest.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_now_playing.inc.php b/templates/show_now_playing.inc.php
index 45934884..8a5b234e 100644
--- a/templates/show_now_playing.inc.php
+++ b/templates/show_now_playing.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_now_playing_row.inc.php b/templates/show_now_playing_row.inc.php
index 5045e535..23a88e90 100644
--- a/templates/show_now_playing_row.inc.php
+++ b/templates/show_now_playing_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_now_playing_similar.inc.php b/templates/show_now_playing_similar.inc.php
index 49e7f7e2..020dfc23 100644
--- a/templates/show_now_playing_similar.inc.php
+++ b/templates/show_now_playing_similar.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_now_playing_video_row.inc.php b/templates/show_now_playing_video_row.inc.php
index b8983b42..b70a2465 100644
--- a/templates/show_now_playing_video_row.inc.php
+++ b/templates/show_now_playing_video_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_object_rating.inc.php b/templates/show_object_rating.inc.php
index 85fc0b33..9d8bb319 100644
--- a/templates/show_object_rating.inc.php
+++ b/templates/show_object_rating.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_object_userflag.inc.php b/templates/show_object_userflag.inc.php
index 7f21e796..8bc22857 100644
--- a/templates/show_object_userflag.inc.php
+++ b/templates/show_object_userflag.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_partial_clip.inc.php b/templates/show_partial_clip.inc.php
index 1fc8496a..949deb70 100644
--- a/templates/show_partial_clip.inc.php
+++ b/templates/show_partial_clip.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_partial_clip_row.inc.php b/templates/show_partial_clip_row.inc.php
index b5c84cf2..919b67db 100644
--- a/templates/show_partial_clip_row.inc.php
+++ b/templates/show_partial_clip_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_partial_clips.inc.php b/templates/show_partial_clips.inc.php
index 48619c34..4dc94fb8 100644
--- a/templates/show_partial_clips.inc.php
+++ b/templates/show_partial_clips.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_partial_edit_clip_row.inc.php b/templates/show_partial_edit_clip_row.inc.php
index 4fe4cb75..d8fcd6f4 100644
--- a/templates/show_partial_edit_clip_row.inc.php
+++ b/templates/show_partial_edit_clip_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_partial_edit_movie_row.inc.php b/templates/show_partial_edit_movie_row.inc.php
index 262fd863..afeaea14 100644
--- a/templates/show_partial_edit_movie_row.inc.php
+++ b/templates/show_partial_edit_movie_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_partial_edit_personal_video_row.inc.php b/templates/show_partial_edit_personal_video_row.inc.php
index 9d526692..fd8b21df 100644
--- a/templates/show_partial_edit_personal_video_row.inc.php
+++ b/templates/show_partial_edit_personal_video_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_partial_edit_tvshow_episode_row.inc.php b/templates/show_partial_edit_tvshow_episode_row.inc.php
index 07ca6a98..ff9ae9cb 100644
--- a/templates/show_partial_edit_tvshow_episode_row.inc.php
+++ b/templates/show_partial_edit_tvshow_episode_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_partial_movie.inc.php b/templates/show_partial_movie.inc.php
index e5e19122..ec16cf79 100644
--- a/templates/show_partial_movie.inc.php
+++ b/templates/show_partial_movie.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_partial_movie_row.inc.php b/templates/show_partial_movie_row.inc.php
index ad9bcb0d..277a96ad 100644
--- a/templates/show_partial_movie_row.inc.php
+++ b/templates/show_partial_movie_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_partial_movies.inc.php b/templates/show_partial_movies.inc.php
index 8644e87a..3bc3154e 100644
--- a/templates/show_partial_movies.inc.php
+++ b/templates/show_partial_movies.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_partial_personal_video.inc.php b/templates/show_partial_personal_video.inc.php
index 1725996b..e1ba66c8 100644
--- a/templates/show_partial_personal_video.inc.php
+++ b/templates/show_partial_personal_video.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_partial_personal_video_row.inc.php b/templates/show_partial_personal_video_row.inc.php
index fbf21afc..a727c65f 100644
--- a/templates/show_partial_personal_video_row.inc.php
+++ b/templates/show_partial_personal_video_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_partial_personal_videos.inc.php b/templates/show_partial_personal_videos.inc.php
index 5bb1d64a..237c4ad5 100644
--- a/templates/show_partial_personal_videos.inc.php
+++ b/templates/show_partial_personal_videos.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_partial_tvshow_episode.inc.php b/templates/show_partial_tvshow_episode.inc.php
index 01a40c5b..7f1336dc 100644
--- a/templates/show_partial_tvshow_episode.inc.php
+++ b/templates/show_partial_tvshow_episode.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_partial_tvshow_episode_row.inc.php b/templates/show_partial_tvshow_episode_row.inc.php
index afd32c92..419bde0b 100644
--- a/templates/show_partial_tvshow_episode_row.inc.php
+++ b/templates/show_partial_tvshow_episode_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_partial_tvshow_episodes.inc.php b/templates/show_partial_tvshow_episodes.inc.php
index f4994257..89d54945 100644
--- a/templates/show_partial_tvshow_episodes.inc.php
+++ b/templates/show_partial_tvshow_episodes.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_playlist.inc.php b/templates/show_playlist.inc.php
index 9c219fe6..6793b868 100644
--- a/templates/show_playlist.inc.php
+++ b/templates/show_playlist.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_playlist_media_row.inc.php b/templates/show_playlist_media_row.inc.php
index ca8ff58d..8bf048c3 100644
--- a/templates/show_playlist_media_row.inc.php
+++ b/templates/show_playlist_media_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_playlist_medias.inc.php b/templates/show_playlist_medias.inc.php
index d88f47da..d5b0852d 100644
--- a/templates/show_playlist_medias.inc.php
+++ b/templates/show_playlist_medias.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_playlist_row.inc.php b/templates/show_playlist_row.inc.php
index f9e3056c..d6152a9b 100644
--- a/templates/show_playlist_row.inc.php
+++ b/templates/show_playlist_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_playlist_title.inc.php b/templates/show_playlist_title.inc.php
index 7adce472..d75bb55e 100644
--- a/templates/show_playlist_title.inc.php
+++ b/templates/show_playlist_title.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_playlists.inc.php b/templates/show_playlists.inc.php
index 8218e4f5..7bc74e89 100644
--- a/templates/show_playlists.inc.php
+++ b/templates/show_playlists.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_playlists_dialog.inc.php b/templates/show_playlists_dialog.inc.php
index 1b093867..e09c8555 100644
--- a/templates/show_playlists_dialog.inc.php
+++ b/templates/show_playlists_dialog.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_playtype_switch.inc.php b/templates/show_playtype_switch.inc.php
index fecff968..fee3f851 100644
--- a/templates/show_playtype_switch.inc.php
+++ b/templates/show_playtype_switch.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_plugins.inc.php b/templates/show_plugins.inc.php
index 52ef472e..2600bf4e 100644
--- a/templates/show_plugins.inc.php
+++ b/templates/show_plugins.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_podcast.inc.php b/templates/show_podcast.inc.php
index 100f33f9..18341980 100644
--- a/templates/show_podcast.inc.php
+++ b/templates/show_podcast.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_podcast_episode.inc.php b/templates/show_podcast_episode.inc.php
index 3a600722..51286ee9 100644
--- a/templates/show_podcast_episode.inc.php
+++ b/templates/show_podcast_episode.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_podcast_episode_row.inc.php b/templates/show_podcast_episode_row.inc.php
index 47c0825a..a736f66e 100644
--- a/templates/show_podcast_episode_row.inc.php
+++ b/templates/show_podcast_episode_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_podcast_episodes.inc.php b/templates/show_podcast_episodes.inc.php
index 06afe68a..ccfbb96d 100644
--- a/templates/show_podcast_episodes.inc.php
+++ b/templates/show_podcast_episodes.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_podcast_row.inc.php b/templates/show_podcast_row.inc.php
index ea31d807..7bdc7900 100644
--- a/templates/show_podcast_row.inc.php
+++ b/templates/show_podcast_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_podcasts.inc.php b/templates/show_podcasts.inc.php
index b853bff4..5e5e7c05 100644
--- a/templates/show_podcasts.inc.php
+++ b/templates/show_podcasts.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_popular.inc.php b/templates/show_popular.inc.php
index 673fbe4d..08d5909c 100644
--- a/templates/show_popular.inc.php
+++ b/templates/show_popular.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_preference_admin.inc.php b/templates/show_preference_admin.inc.php
index bdb5f05d..14b07521 100644
--- a/templates/show_preference_admin.inc.php
+++ b/templates/show_preference_admin.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_preference_box.inc.php b/templates/show_preference_box.inc.php
index 005739e2..bb6c3122 100644
--- a/templates/show_preference_box.inc.php
+++ b/templates/show_preference_box.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_preferences.inc.php b/templates/show_preferences.inc.php
index 703abc76..0cb9ff91 100644
--- a/templates/show_preferences.inc.php
+++ b/templates/show_preferences.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_pvmsg.inc.php b/templates/show_pvmsg.inc.php
index 9f5dd17b..d4c6aab1 100644
--- a/templates/show_pvmsg.inc.php
+++ b/templates/show_pvmsg.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_pvmsg_row.inc.php b/templates/show_pvmsg_row.inc.php
index c8d8764b..e8f66d58 100644
--- a/templates/show_pvmsg_row.inc.php
+++ b/templates/show_pvmsg_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_pvmsgs.inc.php b/templates/show_pvmsgs.inc.php
index 9c6e40be..e4f21251 100644
--- a/templates/show_pvmsgs.inc.php
+++ b/templates/show_pvmsgs.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_random.inc.php b/templates/show_random.inc.php
index 62a8e826..d669ca80 100644
--- a/templates/show_random.inc.php
+++ b/templates/show_random.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_random_albums.inc.php b/templates/show_random_albums.inc.php
index 2a73f35a..0dfb2b04 100644
--- a/templates/show_random_albums.inc.php
+++ b/templates/show_random_albums.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_random_videos.inc.php b/templates/show_random_videos.inc.php
index 73a6c688..66f82792 100644
--- a/templates/show_random_videos.inc.php
+++ b/templates/show_random_videos.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_recent.inc.php b/templates/show_recent.inc.php
index f1212792..1cf8a6d8 100644
--- a/templates/show_recent.inc.php
+++ b/templates/show_recent.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_recently_played.inc.php b/templates/show_recently_played.inc.php
index 7518ba58..2c67fd9c 100644
--- a/templates/show_recently_played.inc.php
+++ b/templates/show_recently_played.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_recommended_artists.inc.php b/templates/show_recommended_artists.inc.php
index 017f4952..3c8cf83f 100644
--- a/templates/show_recommended_artists.inc.php
+++ b/templates/show_recommended_artists.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_registration_confirmation.inc.php b/templates/show_registration_confirmation.inc.php
index a4eaa2fa..ebb1ab5b 100644
--- a/templates/show_registration_confirmation.inc.php
+++ b/templates/show_registration_confirmation.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_rules.inc.php b/templates/show_rules.inc.php
index 26da328d..c2159bf9 100644
--- a/templates/show_rules.inc.php
+++ b/templates/show_rules.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_run_add_catalog.inc.php b/templates/show_run_add_catalog.inc.php
index 23637595..73838754 100644
--- a/templates/show_run_add_catalog.inc.php
+++ b/templates/show_run_add_catalog.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_search.inc.php b/templates/show_search.inc.php
index e6373885..2e5296e1 100644
--- a/templates/show_search.inc.php
+++ b/templates/show_search.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_search_bar.inc.php b/templates/show_search_bar.inc.php
index da2634b1..dbba3337 100644
--- a/templates/show_search_bar.inc.php
+++ b/templates/show_search_bar.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_search_descriptor.inc.php b/templates/show_search_descriptor.inc.php
index 364ca5d0..b991599c 100644
--- a/templates/show_search_descriptor.inc.php
+++ b/templates/show_search_descriptor.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_search_form.inc.php b/templates/show_search_form.inc.php
index e288a4aa..38548ac1 100644
--- a/templates/show_search_form.inc.php
+++ b/templates/show_search_form.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_search_options.inc.php b/templates/show_search_options.inc.php
index 7eff38dd..4fb41b9e 100644
--- a/templates/show_search_options.inc.php
+++ b/templates/show_search_options.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_search_row.inc.php b/templates/show_search_row.inc.php
index 3de47157..399f22f2 100644
--- a/templates/show_search_row.inc.php
+++ b/templates/show_search_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_search_title.inc.php b/templates/show_search_title.inc.php
index 34b05abd..764df276 100644
--- a/templates/show_search_title.inc.php
+++ b/templates/show_search_title.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_searches.inc.php b/templates/show_searches.inc.php
index 1abf8f48..2ab0a65e 100644
--- a/templates/show_searches.inc.php
+++ b/templates/show_searches.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_share.inc.php b/templates/show_share.inc.php
index 94224ec1..6bc57eba 100644
--- a/templates/show_share.inc.php
+++ b/templates/show_share.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_share_row.inc.php b/templates/show_share_row.inc.php
index 593159c2..4acb06dd 100644
--- a/templates/show_share_row.inc.php
+++ b/templates/show_share_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_shared_objects.inc.php b/templates/show_shared_objects.inc.php
index 4afdaad9..9a6c88f9 100644
--- a/templates/show_shared_objects.inc.php
+++ b/templates/show_shared_objects.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_shares.inc.php b/templates/show_shares.inc.php
index 022d42ef..eaad16d2 100644
--- a/templates/show_shares.inc.php
+++ b/templates/show_shares.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_shout_row.inc.php b/templates/show_shout_row.inc.php
index 8a2845e1..be992bfe 100644
--- a/templates/show_shout_row.inc.php
+++ b/templates/show_shout_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_shoutbox.inc.php b/templates/show_shoutbox.inc.php
index 5f7950d8..31d4ea57 100644
--- a/templates/show_shoutbox.inc.php
+++ b/templates/show_shoutbox.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_song.inc.php b/templates/show_song.inc.php
index b396ca35..ead571a7 100644
--- a/templates/show_song.inc.php
+++ b/templates/show_song.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_song_preview_row.inc.php b/templates/show_song_preview_row.inc.php
index 01deff08..20e08281 100644
--- a/templates/show_song_preview_row.inc.php
+++ b/templates/show_song_preview_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_song_previews.inc.php b/templates/show_song_previews.inc.php
index 74f64507..cc038423 100644
--- a/templates/show_song_previews.inc.php
+++ b/templates/show_song_previews.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_song_row.inc.php b/templates/show_song_row.inc.php
index 676919b9..ef3c3c13 100644
--- a/templates/show_song_row.inc.php
+++ b/templates/show_song_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_songs.inc.php b/templates/show_songs.inc.php
index ba8956e8..82836a03 100644
--- a/templates/show_songs.inc.php
+++ b/templates/show_songs.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_stats.inc.php b/templates/show_stats.inc.php
index 552ef1b6..938063fa 100644
--- a/templates/show_stats.inc.php
+++ b/templates/show_stats.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_stats_highest.inc.php b/templates/show_stats_highest.inc.php
index 7c9a999a..2e76d77b 100644
--- a/templates/show_stats_highest.inc.php
+++ b/templates/show_stats_highest.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_stats_newest.inc.php b/templates/show_stats_newest.inc.php
index a5fdf47f..4409598f 100644
--- a/templates/show_stats_newest.inc.php
+++ b/templates/show_stats_newest.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_stats_popular.inc.php b/templates/show_stats_popular.inc.php
index abb4388d..aa3fece2 100644
--- a/templates/show_stats_popular.inc.php
+++ b/templates/show_stats_popular.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_stats_recent.inc.php b/templates/show_stats_recent.inc.php
index 8c5c7173..c0b48b90 100644
--- a/templates/show_stats_recent.inc.php
+++ b/templates/show_stats_recent.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_stats_share.inc.php b/templates/show_stats_share.inc.php
index 86ab70b4..20bcacd4 100644
--- a/templates/show_stats_share.inc.php
+++ b/templates/show_stats_share.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_stats_upload.inc.php b/templates/show_stats_upload.inc.php
index 8e66d8c5..3bbf5979 100644
--- a/templates/show_stats_upload.inc.php
+++ b/templates/show_stats_upload.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_stats_userflag.inc.php b/templates/show_stats_userflag.inc.php
index a00d3fc5..f7bbcaa4 100644
--- a/templates/show_stats_userflag.inc.php
+++ b/templates/show_stats_userflag.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_stats_wanted.inc.php b/templates/show_stats_wanted.inc.php
index 86317554..bc7f7eed 100644
--- a/templates/show_stats_wanted.inc.php
+++ b/templates/show_stats_wanted.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_tag_row.inc.php b/templates/show_tag_row.inc.php
index cbb960b0..651367e5 100644
--- a/templates/show_tag_row.inc.php
+++ b/templates/show_tag_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_tagcloud.inc.php b/templates/show_tagcloud.inc.php
index 00f49d75..51be53ad 100644
--- a/templates/show_tagcloud.inc.php
+++ b/templates/show_tagcloud.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_test.inc.php b/templates/show_test.inc.php
index 40b0f07e..84cc6629 100644
--- a/templates/show_test.inc.php
+++ b/templates/show_test.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_test_config.inc.php b/templates/show_test_config.inc.php
index 9b5c4e34..130cb281 100644
--- a/templates/show_test_config.inc.php
+++ b/templates/show_test_config.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_test_table.inc.php b/templates/show_test_table.inc.php
index dae8a819..09c50961 100644
--- a/templates/show_test_table.inc.php
+++ b/templates/show_test_table.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_tvshow.inc.php b/templates/show_tvshow.inc.php
index bb1e5657..f3cf9acc 100644
--- a/templates/show_tvshow.inc.php
+++ b/templates/show_tvshow.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_tvshow_row.inc.php b/templates/show_tvshow_row.inc.php
index 58e1a7ee..b3148f12 100644
--- a/templates/show_tvshow_row.inc.php
+++ b/templates/show_tvshow_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_tvshow_season.inc.php b/templates/show_tvshow_season.inc.php
index 9be8b31c..680766e7 100644
--- a/templates/show_tvshow_season.inc.php
+++ b/templates/show_tvshow_season.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_tvshow_season_row.inc.php b/templates/show_tvshow_season_row.inc.php
index a2404a42..8633f6bc 100644
--- a/templates/show_tvshow_season_row.inc.php
+++ b/templates/show_tvshow_season_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_tvshow_seasons.inc.php b/templates/show_tvshow_seasons.inc.php
index 044e1324..e0396c13 100644
--- a/templates/show_tvshow_seasons.inc.php
+++ b/templates/show_tvshow_seasons.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_tvshows.inc.php b/templates/show_tvshows.inc.php
index 5dee45a9..45ef68f6 100644
--- a/templates/show_tvshows.inc.php
+++ b/templates/show_tvshows.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_update_items.inc.php b/templates/show_update_items.inc.php
index bb0343d8..46720934 100644
--- a/templates/show_update_items.inc.php
+++ b/templates/show_update_items.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_uploads.inc.php b/templates/show_uploads.inc.php
index f3c21976..3631a600 100644
--- a/templates/show_uploads.inc.php
+++ b/templates/show_uploads.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_user.inc.php b/templates/show_user.inc.php
index e6de1c74..d8d54559 100644
--- a/templates/show_user.inc.php
+++ b/templates/show_user.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_user_activate.inc.php b/templates/show_user_activate.inc.php
index 369791a5..e0fa5755 100644
--- a/templates/show_user_activate.inc.php
+++ b/templates/show_user_activate.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_user_preferences.inc.php b/templates/show_user_preferences.inc.php
index 83de87b3..026b1b7a 100644
--- a/templates/show_user_preferences.inc.php
+++ b/templates/show_user_preferences.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_user_registration.inc.php b/templates/show_user_registration.inc.php
index 76c0f945..8af00440 100644
--- a/templates/show_user_registration.inc.php
+++ b/templates/show_user_registration.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_user_row.inc.php b/templates/show_user_row.inc.php
index 938858d0..b504b21c 100644
--- a/templates/show_user_row.inc.php
+++ b/templates/show_user_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_userflag.inc.php b/templates/show_userflag.inc.php
index 7f81d35a..e9611665 100644
--- a/templates/show_userflag.inc.php
+++ b/templates/show_userflag.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_users.inc.php b/templates/show_users.inc.php
index 93695b23..65d48730 100644
--- a/templates/show_users.inc.php
+++ b/templates/show_users.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_verify_catalog.inc.php b/templates/show_verify_catalog.inc.php
index 2cca90e0..91df9e98 100644
--- a/templates/show_verify_catalog.inc.php
+++ b/templates/show_verify_catalog.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_video.inc.php b/templates/show_video.inc.php
index 7ea53692..82019d86 100644
--- a/templates/show_video.inc.php
+++ b/templates/show_video.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_video_row.inc.php b/templates/show_video_row.inc.php
index 7b7b9dd7..8b2c516b 100644
--- a/templates/show_video_row.inc.php
+++ b/templates/show_video_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_videos.inc.php b/templates/show_videos.inc.php
index f81228e5..112188fc 100644
--- a/templates/show_videos.inc.php
+++ b/templates/show_videos.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_wanted.inc.php b/templates/show_wanted.inc.php
index 488be5f3..d8576826 100644
--- a/templates/show_wanted.inc.php
+++ b/templates/show_wanted.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_wanted_album_row.inc.php b/templates/show_wanted_album_row.inc.php
index 592fe095..fbdbf22e 100644
--- a/templates/show_wanted_album_row.inc.php
+++ b/templates/show_wanted_album_row.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_wanted_albums.inc.php b/templates/show_wanted_albums.inc.php
index 62be60f4..2361cedd 100644
--- a/templates/show_wanted_albums.inc.php
+++ b/templates/show_wanted_albums.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/show_web_player.inc.php b/templates/show_web_player.inc.php
index 8d295297..bbe1a20f 100644
--- a/templates/show_web_player.inc.php
+++ b/templates/show_web_player.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/sidebar.inc.php b/templates/sidebar.inc.php
index ec9ac358..2969c01c 100644
--- a/templates/sidebar.inc.php
+++ b/templates/sidebar.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/sidebar.light.inc.php b/templates/sidebar.light.inc.php
index 826f7b53..a945b3ca 100644
--- a/templates/sidebar.light.inc.php
+++ b/templates/sidebar.light.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/sidebar_admin.inc.php b/templates/sidebar_admin.inc.php
index 3bf55df8..b3d08317 100644
--- a/templates/sidebar_admin.inc.php
+++ b/templates/sidebar_admin.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/sidebar_home.inc.php b/templates/sidebar_home.inc.php
index 1ca17f47..8dbcb332 100644
--- a/templates/sidebar_home.inc.php
+++ b/templates/sidebar_home.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/sidebar_localplay.inc.php b/templates/sidebar_localplay.inc.php
index 5ddd5087..e6b9544c 100644
--- a/templates/sidebar_localplay.inc.php
+++ b/templates/sidebar_localplay.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/sidebar_modules.inc.php b/templates/sidebar_modules.inc.php
index 0f548cbc..b4beb816 100644
--- a/templates/sidebar_modules.inc.php
+++ b/templates/sidebar_modules.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/sidebar_preferences.inc.php b/templates/sidebar_preferences.inc.php
index e21e0256..8355859a 100644
--- a/templates/sidebar_preferences.inc.php
+++ b/templates/sidebar_preferences.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/stylesheets.inc.php b/templates/stylesheets.inc.php
index 7e4847bb..2ba044a4 100644
--- a/templates/stylesheets.inc.php
+++ b/templates/stylesheets.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/templates/subnavbar.inc.php b/templates/subnavbar.inc.php
index 597147f5..aaac7ef4 100644
--- a/templates/subnavbar.inc.php
+++ b/templates/subnavbar.inc.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/test.php b/test.php
index 1c6c4081..83570cd8 100644
--- a/test.php
+++ b/test.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/themes/reborn/templates/dark.css b/themes/reborn/templates/dark.css
index 4f4696ff..52a8b557 100644
--- a/themes/reborn/templates/dark.css
+++ b/themes/reborn/templates/dark.css
@@ -2,7 +2,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/themes/reborn/templates/default.css b/themes/reborn/templates/default.css
index adaeeb4d..4572505f 100644
--- a/themes/reborn/templates/default.css
+++ b/themes/reborn/templates/default.css
@@ -2,7 +2,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/themes/reborn/templates/light.css b/themes/reborn/templates/light.css
index 1b277e4c..5b248c12 100644
--- a/themes/reborn/templates/light.css
+++ b/themes/reborn/templates/light.css
@@ -2,7 +2,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/themes/reborn/theme.cfg.php b/themes/reborn/theme.cfg.php
index 18dcfb23..ba7b6bda 100644
--- a/themes/reborn/theme.cfg.php
+++ b/themes/reborn/theme.cfg.php
@@ -1,7 +1,7 @@
 ;;;;;;;;;;;;;;;;;;
 ;<?php exit(); ?>;
 ;;;;;;;;;;;;;;;;;;
-; Copyright 2001 - 2015 Ampache.org
+; Copyright 2001 - 2016 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
diff --git a/tvshow_seasons.php b/tvshow_seasons.php
index 76a5462e..56cf619d 100644
--- a/tvshow_seasons.php
+++ b/tvshow_seasons.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/tvshows.php b/tvshows.php
index 27032b0a..d78ca7a2 100644
--- a/tvshows.php
+++ b/tvshows.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/update.php b/update.php
index e1dcdc58..0ebd7871 100644
--- a/update.php
+++ b/update.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/upload.php b/upload.php
index 163e1b9e..05916296 100644
--- a/upload.php
+++ b/upload.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/util.php b/util.php
index 60eff883..47e0e9e9 100644
--- a/util.php
+++ b/util.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/video.php b/video.php
index 9d975eab..22d61776 100644
--- a/video.php
+++ b/video.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/waveform.php b/waveform.php
index 426127fa..00f3b905 100644
--- a/waveform.php
+++ b/waveform.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/web_player.php b/web_player.php
index 354a4c08..f68dc6bc 100644
--- a/web_player.php
+++ b/web_player.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/web_player_embedded.php b/web_player_embedded.php
index db0c2c3a..9ee842c7 100644
--- a/web_player_embedded.php
+++ b/web_player_embedded.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
diff --git a/webdav/index.php b/webdav/index.php
index c8a88515..fec7ac39 100644
--- a/webdav/index.php
+++ b/webdav/index.php
@@ -3,7 +3,7 @@
 /**
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPLv3)
- * Copyright 2001 - 2015 Ampache.org
+ * Copyright 2001 - 2016 Ampache.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

From 8e0b38e0c001d4a9f3955f9c5bdbc4d00b8f5c78 Mon Sep 17 00:00:00 2001
From: "Phyks (Lucas Verney)" <phyks@phyks.me>
Date: Mon, 1 Aug 2016 22:10:12 +0200
Subject: [PATCH 4/4] Some extra PHPCS fixes

---
 scripts/tests/syntax.sh                        | 6 +++---
 templates/error_page.inc.php                   | 2 +-
 templates/show_localplay_add_instance.inc.php  | 4 +++-
 templates/show_localplay_edit_instance.inc.php | 4 +++-
 templates/show_localplay_instances.inc.php     | 5 ++++-
 templates/show_playlist.inc.php                | 9 +++++++++
 6 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/scripts/tests/syntax.sh b/scripts/tests/syntax.sh
index 5ec7eed9..faf6c451 100644
--- a/scripts/tests/syntax.sh
+++ b/scripts/tests/syntax.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 
 echo -e "\e[1;34mChecking syntax error\e[00m"
-output=$(find . -name '*.php' -exec php --syntax-check {} \; | grep -v 'No syntax errors detected in')
+output=$(find . -name '*.php' -not -path "./lib/vendor/*" -exec php --syntax-check {} \; | grep -v 'No syntax errors detected in')
 if [[ $output ]]
-then 
+then
     echo -e '\e[00;31mPlease check files syntax\e[00m'
     exit 1
-else 
+else
     echo -e "\e[1;32mSyntax is OK\e[00m"
 fi
diff --git a/templates/error_page.inc.php b/templates/error_page.inc.php
index 29d1f9b5..ac9c51ca 100644
--- a/templates/error_page.inc.php
+++ b/templates/error_page.inc.php
@@ -48,7 +48,7 @@
     <div class="container" role="main">
         <div class="jumbotron">
             <h1><?php echo T_('Error'); ?></h1>
-            <p><?php echo (T_("The following error has occured, you will automaticly be redirected after 10 seconds.") ); ?></p>
+            <p><?php echo(T_("The following error has occured, you will automaticly be redirected after 10 seconds.")); ?></p>
         </div>
         <h2><?php echo(T_("Error messages"));?>:</h2>
         <?php AmpError::display('general'); ?>
diff --git a/templates/show_localplay_add_instance.inc.php b/templates/show_localplay_add_instance.inc.php
index 9d35d8ff..7d617138 100644
--- a/templates/show_localplay_add_instance.inc.php
+++ b/templates/show_localplay_add_instance.inc.php
@@ -28,10 +28,12 @@
 <tr>
     <td><?php echo $field['description'];
     ?></td>
-    <td><input type="<?php echo $field["type"]; ?>" name="<?php echo $key;
+    <td><input type="<?php echo $field["type"];
+    ?>" name="<?php echo $key;
     ?>" /></td>
 </tr>
 <?php
+
 } ?>
 </table>
     <div class="formValidation">
diff --git a/templates/show_localplay_edit_instance.inc.php b/templates/show_localplay_edit_instance.inc.php
index 9111217c..5a91afc4 100644
--- a/templates/show_localplay_edit_instance.inc.php
+++ b/templates/show_localplay_edit_instance.inc.php
@@ -28,11 +28,13 @@
 <tr>
     <td><?php echo $field['description'];
     ?></td>
-    <td><input type="<?php echo $field['type'];?>" name="<?php echo $key;
+    <td><input type="<?php echo $field['type'];
+    ?>" name="<?php echo $key;
     ?>" value="<?php echo scrub_out($instance[$key]);
     ?>" /></td>
 </tr>
 <?php
+
 } ?>
 </table>
     <div class="formValidation">
diff --git a/templates/show_localplay_instances.inc.php b/templates/show_localplay_instances.inc.php
index c911f7e9..b2e6dfaf 100644
--- a/templates/show_localplay_instances.inc.php
+++ b/templates/show_localplay_instances.inc.php
@@ -28,6 +28,7 @@
         <th><?php echo $field['description'];
     ?></th>
     <?php
+
 } ?>
     <th><?php echo T_('Action'); ?></th>
 </tr>
@@ -46,9 +47,10 @@
             } else {
                 echo "*****";
             }
-        ?>
+    ?>
     </td>
     <?php
+
 }
     ?>
     <td>
@@ -61,6 +63,7 @@
     </td>
 </tr>
 <?php
+
 } ?>
 </table>
 <?php UI::show_box_bottom(); ?>
diff --git a/templates/show_playlist.inc.php b/templates/show_playlist.inc.php
index 6793b868..d833bad8 100644
--- a/templates/show_playlist.inc.php
+++ b/templates/show_playlist.inc.php
@@ -43,6 +43,7 @@ UI::show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title . '</d
     ?>
     </div>
     <?php
+
 }
     ?>
     <?php if (AmpConfig::get('userflags')) {
@@ -53,9 +54,11 @@ UI::show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title . '</d
     ?>
     </div>
     <?php
+
 }
     ?>
 <?php
+
 } ?>
 <div id="information_actions">
     <ul>
@@ -90,6 +93,7 @@ UI::show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title . '</d
     ?></a>
         </li>
     <?php
+
 } ?>
     <?php if (Access::check_function('batch_download') && check_can_zip('playlist')) {
     ?>
@@ -104,6 +108,7 @@ UI::show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title . '</d
             </a>
         </li>
     <?php
+
 } ?>
     <?php if (AmpConfig::get('directplay')) {
     ?>
@@ -114,6 +119,7 @@ UI::show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title . '</d
     ?>
         </li>
     <?php
+
 } ?>
     <?php if (Stream_Playlist::check_autoplay_append()) {
     ?>
@@ -124,6 +130,7 @@ UI::show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title . '</d
     ?>
         </li>
     <?php
+
 } ?>
         <li>
             <?php echo Ajax::button('?action=basket&type=playlist&id=' . $playlist->id, 'add', T_('Add all to temporary playlist'), 'play_playlist'); ?>
@@ -146,6 +153,7 @@ UI::show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title . '</d
             </a>
         </li>
     <?php
+
 } ?>
     <?php if ($playlist->has_access()) {
     ?>
@@ -161,6 +169,7 @@ UI::show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title . '</d
             </a>
         </li>
     <?php
+
 } ?>
     </ul>
 </div>