Fix code style

albums.php

@@ -93,8 +93,7 @@ switch ($_REQUEST['action']) {
             $artist = scrub_in($_REQUEST['artist_name']);
         } elseif ($album->artist_count == '1') {
             $artist = $album->f_artist_name;
-        }
+        } else {
-        else {
             $artist = "";
         }
         if (isset($_REQUEST['album_name'])) {

lib/class/access.class.php

@@ -38,7 +38,7 @@ class Access
     public $user;
     public $type;
     public $enabled;
-    
+
     public $f_start;
     public $f_end;
     public $f_user;

lib/class/art.class.php

@@ -430,7 +430,7 @@ class Art extends database_object
             debug_event('Art', 'Eror: No mime type found.', 1);
             return false;
         }
-        
+
         $data = ob_get_contents();
         ob_end_clean();
 
@@ -589,7 +589,7 @@ class Art extends database_object
             case 'artist':
             case 'video':
             default:
-                $allowed_methods = array();                
+                $allowed_methods = array();
             break;
         }
 
@@ -836,7 +836,7 @@ class Art extends database_object
             'MediumImage',
             'SmallImage'
         );
-        
+
         if ($this->type == 'album') {
             $album = new Album($this->uid);
         } else {

lib/class/artist.class.php

@@ -35,7 +35,7 @@ class Artist extends database_object
     public $mbid; // MusicBrainz ID
     public $catalog_id;
     public $time;
-    
+
     public $tags;
     public $f_tags;
     public $object_cnt;
@@ -44,7 +44,7 @@ class Artist extends database_object
     public $f_link;
     public $f_name_link;
     public $f_time;
-    
+
 
     // Constructed vars
     public $_fake = false; // Set if construct_from_array() used
@@ -440,7 +440,7 @@ class Artist extends database_object
 
             $updated = false;
             $songs = array();
-            
+
             // If it's changed we need to update
             if ($artist_id != $this->id) {
                 $songs = $this->get_songs();

lib/class/broadcast.class.php

@@ -28,7 +28,7 @@ class Broadcast extends database_object
     public $song;
     public $song_position;
     public $name;
-    
+
     public $tags;
     public $f_name;
     public $f_link;

lib/class/browse.class.php

@@ -32,7 +32,7 @@
 class Browse extends Query
 {
     public $show_header;
-    
+
     public function __construct($id = null, $cached = true)
     {
         parent::__construct($id, $cached);

lib/class/catalog.class.php

@@ -38,7 +38,7 @@ abstract class Catalog extends database_object
     public $rename_pattern;
     public $sort_pattern;
     public $catalog_type;
-    
+
     public $f_name;
     public $f_name_link;
     public $f_update;
@@ -737,7 +737,7 @@ abstract class Catalog extends database_object
 
         echo "Starting Dump Album Art...\n";
         $i = 0;
-        
+
         // Run through them and get the art!
         foreach ($albums as $album_id) {
 

lib/class/channel.class.php

@@ -37,10 +37,10 @@ class Channel extends database_object
     public $loop;
     public $bitrate;
     public $name;
-    
+
     public $tags;
     public $f_tags;
-    
+
     private $is_init;
     private $playlist;
     private $song_pos;

lib/class/core.class.php

@@ -138,7 +138,7 @@ class Core
             default:
                 return false;
         }
-        
+
         if (!isset($_SESSION['forms'][$sid])) {
             debug_event('Core', "Form $sid not found in session, rejecting request", 2);
             return false;

lib/class/democratic.class.php

@@ -35,7 +35,7 @@ class Democratic extends Tmp_Playlist
     public $user;
     public $primary;
     public $base_playlist;
-    
+
     public $f_cooldown;
     public $f_primary;
     public $f_level;

lib/class/localplay.class.php

@@ -28,7 +28,7 @@ class Localplay
     public $f_name;
     public $f_description;
     public $f_version;
-    
+
     /* Built Variables */
     private $_player;
 

lib/class/playlist.class.php

@@ -32,7 +32,7 @@ class Playlist extends playlist_object
     /* Variables from the database */
     public $genre;
     public $date;
-    
+
     public $f_link;
     public $f_name_link;
 

lib/class/playlist_object.abstract.php

@@ -31,7 +31,7 @@ abstract class playlist_object extends database_object
     public $name;
     public $user;
     public $type;
-    
+
     public $f_type;
     public $f_name;
     public $f_user;

lib/class/radio.class.php

@@ -38,7 +38,7 @@ class Radio extends database_object implements media
     public $genre;
     public $codec;
     public $catalog;
-    
+
     public $f_link;
     public $f_name_link;
     public $f_url_link;

lib/class/search.class.php

@@ -34,7 +34,7 @@ class Search extends playlist_object
 
     public $basetypes;
     public $types;
-    
+
     public $f_link;
     public $f_name_link;
 

lib/class/share.class.php

@@ -35,14 +35,14 @@ class Share extends database_object
     public $counter;
     public $secret;
     public $public_url;
-    
+
     public $f_object_link;
     public $f_user;
     public $f_allow_stream;
     public $f_allow_download;
     public $f_creation_date;
     public $f_lastvisite_date;
-    
+
     /**
      * Constructor
      */

lib/class/shoutbox.class.php

@@ -29,7 +29,7 @@ class Shoutbox
     public $sticky;
     public $text;
     public $data;
-    
+
     public $f_link;
 
     /**

lib/class/song.class.php

@@ -46,7 +46,7 @@ class Song extends database_object implements media
     public $mbid; // MusicBrainz ID
     public $catalog;
     public $waveform;
-    
+
     public $tags;
     public $language;
     public $comment;
@@ -505,7 +505,7 @@ class Song extends database_object implements media
     {
         // Remove some stuff we don't care about
         unset($song->catalog,$song->played,$song->enabled,$song->addition_time,$song->update_time,$song->type);
-        
+
         $array = array();
         $string_array = array('title','comment','lyrics');
         $skip_array = array('id','tag_id','mime','mb_artistid','mbid');

lib/class/song_preview.class.php

@@ -34,7 +34,7 @@ class Song_Preview extends database_object implements media
     public $mime;
     public $mbid; // MusicBrainz ID
     public $enabled = true;
-    
+
     public $f_file;
     public $f_artist;
     public $f_artist_full;

lib/class/user.class.php

@@ -46,7 +46,7 @@ class User extends database_object
     // Constructed variables
     public $prefs = array();
     public $playlist;
-    
+
     public $f_last_seen;
     public $f_create_date;
     public $link;

lib/class/video.class.php

@@ -33,7 +33,7 @@ class Video extends database_object implements media
     public $resolution_y;
     public $time;
     public $mime;
-    
+
     public $tags;
     public $f_title;
     public $f_link;

lib/class/wanted.class.php

@@ -35,12 +35,12 @@ class Wanted extends database_object
     public $accepted;
     public $release_mbid;
     public $user;
-    
+
     public $f_name_link;
     public $f_artist_link;
     public $f_user;
     public $songs;
-    
+
     /**
      * Constructor
      */

lib/login.php

@@ -67,8 +67,7 @@ if (empty($_REQUEST['step'])) {
                     $username = $_SERVER['REMOTE_USER'];
                 } elseif ($_SERVER['HTTP_REMOTE_USER']) {
                     $username = $_SERVER['HTTP_REMOTE_USER'];
-                }
+                } else {
-                else {
                     $username = '';
                 }
                 $password = '';

lib/ui.lib.php

@@ -188,7 +188,7 @@ function show_preference_box($preferences)
 function show_album_select($name='album',$album_id=0,$allow_add=0,$song_id=0)
 {
     static $album_id_cnt = 0;
-    
+
     // Generate key to use for HTML element ID
     if ($song_id) {
         $key = "album_select_" . $song_id;