Cosmetics: death to tabs

The refactoring I've been doing has reminded me of my strong preference
for spaces, and I feel inclined to impose my will on the tree.

13 files changed, 939 insertions, 939 deletions

diff --git a/server/ajax.server.php b/server/ajax.server.php
index 55739b8d..52175876 100644
--- a/server/ajax.server.php
+++ b/server/ajax.server.php
@@ -1,5 +1,5 @@
 <?php
-/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */
+/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
 /**
  *
  * LICENSE: GNU General Public License, version 2 (GPLv2)
@@ -40,312 +40,312 @@ header("Pragma: no-cache");
 $page = isset($_REQUEST['page']) ? $_REQUEST['page'] : null;
 
 switch ($page) {
-	case 'flag':
-		require_once Config::get('prefix') . '/server/flag.ajax.php';
-		exit;
-	break;
-	case 'stats':
-		require_once Config::get('prefix') . '/server/stats.ajax.php';
-		exit;
-	break;
-	case 'browse':
-		require_once Config::get('prefix') . '/server/browse.ajax.php';
-		exit;
-	break;
-	case 'random':
-		require_once Config::get('prefix') . '/server/random.ajax.php';
-		exit;
-	break;
-	case 'playlist':
-		require_once Config::get('prefix') . '/server/playlist.ajax.php';
-		exit;
-	break;
-	case 'localplay':
-		require_once Config::get('prefix') . '/server/localplay.ajax.php';
-		exit;
-	break;
-	case 'tag':
-		require_once Config::get('prefix') . '/server/tag.ajax.php';
-		exit;
-	break;
-	case 'stream':
-		require_once Config::get('prefix') . '/server/stream.ajax.php';
-		exit;
-	break;
-	case 'song':
-		require_once Config::get('prefix') . '/server/song.ajax.php';
-		exit;
-	break;
-	case 'democratic':
-		require_once Config::get('prefix') . '/server/democratic.ajax.php';
-		exit;
-	break;
-	case 'index':
-		require_once Config::get('prefix') . '/server/index.ajax.php';
-		exit;
-	break;
-	default:
-		// A taste of compatibility
-	break;
+    case 'flag':
+        require_once Config::get('prefix') . '/server/flag.ajax.php';
+        exit;
+    break;
+    case 'stats':
+        require_once Config::get('prefix') . '/server/stats.ajax.php';
+        exit;
+    break;
+    case 'browse':
+        require_once Config::get('prefix') . '/server/browse.ajax.php';
+        exit;
+    break;
+    case 'random':
+        require_once Config::get('prefix') . '/server/random.ajax.php';
+        exit;
+    break;
+    case 'playlist':
+        require_once Config::get('prefix') . '/server/playlist.ajax.php';
+        exit;
+    break;
+    case 'localplay':
+        require_once Config::get('prefix') . '/server/localplay.ajax.php';
+        exit;
+    break;
+    case 'tag':
+        require_once Config::get('prefix') . '/server/tag.ajax.php';
+        exit;
+    break;
+    case 'stream':
+        require_once Config::get('prefix') . '/server/stream.ajax.php';
+        exit;
+    break;
+    case 'song':
+        require_once Config::get('prefix') . '/server/song.ajax.php';
+        exit;
+    break;
+    case 'democratic':
+        require_once Config::get('prefix') . '/server/democratic.ajax.php';
+        exit;
+    break;
+    case 'index':
+        require_once Config::get('prefix') . '/server/index.ajax.php';
+        exit;
+    break;
+    default:
+        // A taste of compatibility
+    break;
 } // end switch on page
 
 switch ($_REQUEST['action']) {
-	case 'refresh_rightbar':
-		$results['rightbar'] = UI::ajax_include('rightbar.inc.php');
-	break;
-	/* Controls the editing of objects */
-	case 'show_edit_object':
+    case 'refresh_rightbar':
+        $results['rightbar'] = UI::ajax_include('rightbar.inc.php');
+    break;
+    /* Controls the editing of objects */
+    case 'show_edit_object':
 
-		// Set the default required level
-		$level = '50';
+        // Set the default required level
+        $level = '50';
 
-		switch ($_GET['type']) {
-			case 'album_row':
-				$key = 'album_' . $_GET['id'];
-				$album = new Album($_GET['id']);
-				$album->format();
-			break;
-			case 'artist_row':
-				$key = 'artist_' . $_GET['id'];
-				$artist = new Artist($_GET['id']);
-				$artist->format();
-			break;
-			case 'song_row':
-				$key = 'song_' . $_GET['id'];
-				$song = new Song($_GET['id']);
-				$song->format();
-			break;
-			case 'live_stream_row':
-				$key = 'live_stream_' . $_GET['id'];
-				$radio = new Radio($_GET['id']);
-				$radio->format();
-			break;
-			case 'playlist_row':
-			case 'playlist_title':
-				$key = 'playlist_row_' . $_GET['id'];
-				$playlist = new Playlist($_GET['id']);
-				$playlist->format();
-				// If the current user is the owner, only user is required
-				if ($playlist->user == $GLOBALS['user']->id) {
-					$level = '25';
-				}
-			break;
-			case 'smartplaylist_row':
-			case 'smartplaylist_title':
-				$key = 'playlist_row_' . $_GET['id'];
-				$playlist = new Search('song', $_GET['id']);
-				$playlist->format();
-				if ($playlist->user == $GLOBALS['user']->id) {
-					$level = '25';
-				}
-			break;
-			default:
-				$key = 'rfc3514';
-				echo xml_from_array(array($key=>'0x1'));
-				exit;
-			break;
-		} // end switch on type
+        switch ($_GET['type']) {
+            case 'album_row':
+                $key = 'album_' . $_GET['id'];
+                $album = new Album($_GET['id']);
+                $album->format();
+            break;
+            case 'artist_row':
+                $key = 'artist_' . $_GET['id'];
+                $artist = new Artist($_GET['id']);
+                $artist->format();
+            break;
+            case 'song_row':
+                $key = 'song_' . $_GET['id'];
+                $song = new Song($_GET['id']);
+                $song->format();
+            break;
+            case 'live_stream_row':
+                $key = 'live_stream_' . $_GET['id'];
+                $radio = new Radio($_GET['id']);
+                $radio->format();
+            break;
+            case 'playlist_row':
+            case 'playlist_title':
+                $key = 'playlist_row_' . $_GET['id'];
+                $playlist = new Playlist($_GET['id']);
+                $playlist->format();
+                // If the current user is the owner, only user is required
+                if ($playlist->user == $GLOBALS['user']->id) {
+                    $level = '25';
+                }
+            break;
+            case 'smartplaylist_row':
+            case 'smartplaylist_title':
+                $key = 'playlist_row_' . $_GET['id'];
+                $playlist = new Search('song', $_GET['id']);
+                $playlist->format();
+                if ($playlist->user == $GLOBALS['user']->id) {
+                    $level = '25';
+                }
+            break;
+            default:
+                $key = 'rfc3514';
+                echo xml_from_array(array($key=>'0x1'));
+                exit;
+            break;
+        } // end switch on type
 
-		// Make sure they got them rights
-		if (!Access::check('interface',$level)) {
-			$results['rfc3514'] = '0x1';
-			break;
-		}
+        // Make sure they got them rights
+        if (!Access::check('interface',$level)) {
+            $results['rfc3514'] = '0x1';
+            break;
+        }
 
-		ob_start();
-		require Config::get('prefix') . '/templates/show_edit_' . $_GET['type'] . '.inc.php';
-		$results[$key] = ob_get_contents();
-		ob_end_clean();
-	break;
-	case 'edit_object':
+        ob_start();
+        require Config::get('prefix') . '/templates/show_edit_' . $_GET['type'] . '.inc.php';
+        $results[$key] = ob_get_contents();
+        ob_end_clean();
+    break;
+    case 'edit_object':
 
-		$level = '50';
+        $level = '50';
 
-		if ($_POST['type'] == 'playlist_row' || $_POST['type'] == 'playlist_title') {
-			$playlist = new Playlist($_POST['id']);
-			if ($GLOBALS['user']->id == $playlist->user) {
-				$level = '25';
-			}
-		}
-		if ($_POST['type'] == 'smartplaylist_row' || 
-			$_POST['type'] == 'smartplaylist_title') {
-			$playlist = new Search('song', $_POST['id']);
-			if ($GLOBALS['user']->id == $playlist->user) {
-				$level = '25';
-			}
-		}
+        if ($_POST['type'] == 'playlist_row' || $_POST['type'] == 'playlist_title') {
+            $playlist = new Playlist($_POST['id']);
+            if ($GLOBALS['user']->id == $playlist->user) {
+                $level = '25';
+            }
+        }
+        if ($_POST['type'] == 'smartplaylist_row' || 
+            $_POST['type'] == 'smartplaylist_title') {
+            $playlist = new Search('song', $_POST['id']);
+            if ($GLOBALS['user']->id == $playlist->user) {
+                $level = '25';
+            }
+        }
 
-		// Make sure we've got them rights
-		if (!Access::check('interface',$level) || Config::get('demo_mode')) {
-			$results['rfc3514'] = '0x1';
-			break;
-		}
+        // Make sure we've got them rights
+        if (!Access::check('interface',$level) || Config::get('demo_mode')) {
+            $results['rfc3514'] = '0x1';
+            break;
+        }
 
-		switch ($_POST['type']) {
-			case 'album_row':
-				$key = 'album_' . $_POST['id'];
-				$album = new Album($_POST['id']);
-				$songs = $album->get_songs();
-				$new_id = $album->update($_POST);
-				if ($new_id != $_POST['id']) {
-					$album = new Album($new_id);
-					foreach ($songs as $song_id) {
-						Flag::add($song_id,'song','retag','Inline Album Update');
-					}
-				}
-				$album->format();
-			break;
-			case 'artist_row':
-				$key = 'artist_' . $_POST['id'];
-				$artist = new Artist($_POST['id']);
-				$songs = $artist->get_songs();
-				$new_id = $artist->update($_POST);
-				if ($new_id != $_POST['id']) {
-					$artist = new Artist($new_id);
-					foreach ($songs as $song_id) {
-						Flag::add($song_id,'song','retag','Inline Artist Update');
-					}
-				}
-				$artist->format();
-			break;
-			case 'song_row':
-				$key = 'song_' . $_POST['id'];
-				$song = new Song($_POST['id']);
-				Flag::add($song->id,'song','retag','Inline Single Song Update');
-				$song->update($_POST);
-				$song->format();
-			break;
-			case 'playlist_row':
-			case 'playlist_title':
-				$key = 'playlist_row_' . $_POST['id'];
-				$playlist->update($_POST);
-				$playlist->format();
-				$count = $playlist->get_song_count();
-			break;
-			case 'smartplaylist_row':
-			case 'smartplaylist_title':
-				$key = 'playlist_row_' . $_POST['id'];
-				$playlist->name = $_POST['name'];
-				$playlist->type = $_POST['pl_type'];
-				$playlist->update();
-				$playlist->format();
-			break;
-			case 'live_stream_row':
-				$key = 'live_stream_' . $_POST['id'];
-				Radio::update($_POST);
-				$radio = new Radio($_POST['id']);
-				$radio->format();
-			break;
-			default:
-				$key = 'rfc3514';
-				echo xml_from_array(array($key=>'0x1'));
-				exit;
-			break;
-		} // end switch on type
+        switch ($_POST['type']) {
+            case 'album_row':
+                $key = 'album_' . $_POST['id'];
+                $album = new Album($_POST['id']);
+                $songs = $album->get_songs();
+                $new_id = $album->update($_POST);
+                if ($new_id != $_POST['id']) {
+                    $album = new Album($new_id);
+                    foreach ($songs as $song_id) {
+                        Flag::add($song_id,'song','retag','Inline Album Update');
+                    }
+                }
+                $album->format();
+            break;
+            case 'artist_row':
+                $key = 'artist_' . $_POST['id'];
+                $artist = new Artist($_POST['id']);
+                $songs = $artist->get_songs();
+                $new_id = $artist->update($_POST);
+                if ($new_id != $_POST['id']) {
+                    $artist = new Artist($new_id);
+                    foreach ($songs as $song_id) {
+                        Flag::add($song_id,'song','retag','Inline Artist Update');
+                    }
+                }
+                $artist->format();
+            break;
+            case 'song_row':
+                $key = 'song_' . $_POST['id'];
+                $song = new Song($_POST['id']);
+                Flag::add($song->id,'song','retag','Inline Single Song Update');
+                $song->update($_POST);
+                $song->format();
+            break;
+            case 'playlist_row':
+            case 'playlist_title':
+                $key = 'playlist_row_' . $_POST['id'];
+                $playlist->update($_POST);
+                $playlist->format();
+                $count = $playlist->get_song_count();
+            break;
+            case 'smartplaylist_row':
+            case 'smartplaylist_title':
+                $key = 'playlist_row_' . $_POST['id'];
+                $playlist->name = $_POST['name'];
+                $playlist->type = $_POST['pl_type'];
+                $playlist->update();
+                $playlist->format();
+            break;
+            case 'live_stream_row':
+                $key = 'live_stream_' . $_POST['id'];
+                Radio::update($_POST);
+                $radio = new Radio($_POST['id']);
+                $radio->format();
+            break;
+            default:
+                $key = 'rfc3514';
+                echo xml_from_array(array($key=>'0x1'));
+                exit;
+            break;
+        } // end switch on type
 
-		ob_start();
-		require Config::get('prefix') . '/templates/show_' . $_POST['type'] . '.inc.php';
-		$results[$key] = ob_get_contents();
-		ob_end_clean();
-	break;
-	case 'current_playlist':
-		switch ($_REQUEST['type']) {
-			case 'delete':
-				$GLOBALS['user']->playlist->delete_track($_REQUEST['id']);
-			break;
-		} // end switch
+        ob_start();
+        require Config::get('prefix') . '/templates/show_' . $_POST['type'] . '.inc.php';
+        $results[$key] = ob_get_contents();
+        ob_end_clean();
+    break;
+    case 'current_playlist':
+        switch ($_REQUEST['type']) {
+            case 'delete':
+                $GLOBALS['user']->playlist->delete_track($_REQUEST['id']);
+            break;
+        } // end switch
 
-		$results['rightbar'] = UI::ajax_include('rightbar.inc.php');
-	break;
-	// Handle the users basketcases...
-	case 'basket':
-		switch ($_REQUEST['type']) {
-			case 'album':
-			case 'artist':
-			case 'tag':
-				$object = new $_REQUEST['type']($_REQUEST['id']);
-				$songs = $object->get_songs();
-				foreach ($songs as $song_id) {
-					$GLOBALS['user']->playlist->add_object($song_id,'song');
-				} // end foreach
-			break;
-			case 'browse_set':
-				$browse = new Browse($_REQUEST['browse_id']);
-				$objects = $browse->get_saved();
-				foreach ($objects as $object_id) {
-					$GLOBALS['user']->playlist->add_object($object_id,'song');
-				}
-			break;
-			case 'album_random':
-			case 'artist_random':
-			case 'tag_random':
-				$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');
-				}
-			break;
-			case 'playlist':
-				$playlist = new Playlist($_REQUEST['id']);
-				$items = $playlist->get_items();
-				foreach ($items as $item) {
-					$GLOBALS['user']->playlist->add_object($item['object_id'], $item['object_type']);
-				}
-			break;
-			case 'playlist_random':
-				$playlist = new Playlist($_REQUEST['id']);
-				$items = $playlist->get_random_items();
-				foreach ($items as $item) {
-					$GLOBALS['user']->playlist->add_object($item['object_id'], $item['object_type']);
-				}
-			break;
-			case 'smartplaylist':
-				$playlist = new Search('song', $_REQUEST['id']);
-				$items = $playlist->get_items();
-				foreach ($items as $item) {
-					$GLOBALS['user']->playlist->add_object($item['object_id'],$item['object_type']);
-				}
-			break;
-			case 'clear_all':
-				$GLOBALS['user']->playlist->clear();
-			break;
-			case 'live_stream':
-				$object = new Radio($_REQUEST['id']);
-				// Confirm its a valid ID
-				if ($object->name) {
-					$GLOBALS['user']->playlist->add_object($object->id,'radio');
-				}
-			break;
-			case 'dynamic':
-				$random_id = Random::get_type_id($_REQUEST['random_type']);
-				$GLOBALS['user']->playlist->add_object($random_id,'random');
-			break;
-			case 'video':
-				$GLOBALS['user']->playlist->add_object($_REQUEST['id'],'video');
-			break;
-			default:
-			case 'song':
-				$GLOBALS['user']->playlist->add_object($_REQUEST['id'],'song');
-			break;
-		} // end switch
+        $results['rightbar'] = UI::ajax_include('rightbar.inc.php');
+    break;
+    // Handle the users basketcases...
+    case 'basket':
+        switch ($_REQUEST['type']) {
+            case 'album':
+            case 'artist':
+            case 'tag':
+                $object = new $_REQUEST['type']($_REQUEST['id']);
+                $songs = $object->get_songs();
+                foreach ($songs as $song_id) {
+                    $GLOBALS['user']->playlist->add_object($song_id,'song');
+                } // end foreach
+            break;
+            case 'browse_set':
+                $browse = new Browse($_REQUEST['browse_id']);
+                $objects = $browse->get_saved();
+                foreach ($objects as $object_id) {
+                    $GLOBALS['user']->playlist->add_object($object_id,'song');
+                }
+            break;
+            case 'album_random':
+            case 'artist_random':
+            case 'tag_random':
+                $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');
+                }
+            break;
+            case 'playlist':
+                $playlist = new Playlist($_REQUEST['id']);
+                $items = $playlist->get_items();
+                foreach ($items as $item) {
+                    $GLOBALS['user']->playlist->add_object($item['object_id'], $item['object_type']);
+                }
+            break;
+            case 'playlist_random':
+                $playlist = new Playlist($_REQUEST['id']);
+                $items = $playlist->get_random_items();
+                foreach ($items as $item) {
+                    $GLOBALS['user']->playlist->add_object($item['object_id'], $item['object_type']);
+                }
+            break;
+            case 'smartplaylist':
+                $playlist = new Search('song', $_REQUEST['id']);
+                $items = $playlist->get_items();
+                foreach ($items as $item) {
+                    $GLOBALS['user']->playlist->add_object($item['object_id'],$item['object_type']);
+                }
+            break;
+            case 'clear_all':
+                $GLOBALS['user']->playlist->clear();
+            break;
+            case 'live_stream':
+                $object = new Radio($_REQUEST['id']);
+                // Confirm its a valid ID
+                if ($object->name) {
+                    $GLOBALS['user']->playlist->add_object($object->id,'radio');
+                }
+            break;
+            case 'dynamic':
+                $random_id = Random::get_type_id($_REQUEST['random_type']);
+                $GLOBALS['user']->playlist->add_object($random_id,'random');
+            break;
+            case 'video':
+                $GLOBALS['user']->playlist->add_object($_REQUEST['id'],'video');
+            break;
+            default:
+            case 'song':
+                $GLOBALS['user']->playlist->add_object($_REQUEST['id'],'song');
+            break;
+        } // end switch
 
-		$results['rightbar'] = UI::ajax_include('rightbar.inc.php');
-	break;
-	/* Setting ratings */
-	case 'set_rating':
-		ob_start();
-		$rating = new Rating($_GET['object_id'], $_GET['rating_type']);
-		$rating->set_rating($_GET['rating']);
-		Rating::show($_GET['object_id'], $_GET['rating_type']);
-		$key = "rating_" . $_GET['object_id'] . "_" . $_GET['rating_type'];
-		$results[$key] = ob_get_contents();
-		ob_end_clean();
-	break;
-	default:
-		$results['rfc3514'] = '0x1';
-	break;
+        $results['rightbar'] = UI::ajax_include('rightbar.inc.php');
+    break;
+    /* Setting ratings */
+    case 'set_rating':
+        ob_start();
+        $rating = new Rating($_GET['object_id'], $_GET['rating_type']);
+        $rating->set_rating($_GET['rating']);
+        Rating::show($_GET['object_id'], $_GET['rating_type']);
+        $key = "rating_" . $_GET['object_id'] . "_" . $_GET['rating_type'];
+        $results[$key] = ob_get_contents();
+        ob_end_clean();
+    break;
+    default:
+        $results['rfc3514'] = '0x1';
+    break;
 } // end switch action
 
 // Go ahead and do the echo
diff --git a/server/browse.ajax.php b/server/browse.ajax.php
index b6f3e154..f9e4d39a 100644
--- a/server/browse.ajax.php
+++ b/server/browse.ajax.php
@@ -1,5 +1,5 @@
 <?php
-/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */
+/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
 /**
  *
  * LICENSE: GNU General Public License, version 2 (GPLv2)
@@ -29,111 +29,111 @@ session_start();
 if (!defined('AJAX_INCLUDE')) { exit; }
 
 if (isset($_REQUEST['browse_id'])) {
-	$browse_id = $_REQUEST['browse_id'];
+    $browse_id = $_REQUEST['browse_id'];
 }
 else {
-	$browse_id = null;
+    $browse_id = null;
 }
 
 $browse = new Browse($browse_id);
 
 switch ($_REQUEST['action']) {
-	case 'browse':
-		$object_ids = array();
-
-		// Check 'value' with isset because it can null
-		//(user type a "start with" word and deletes it)
-		if ($_REQUEST['key'] && (isset($_REQUEST['multi_alpha_filter']) OR isset($_REQUEST['value']))) {
-			// Set any new filters we've just added
-			$browse->set_filter($_REQUEST['key'],$_REQUEST['multi_alpha_filter']);
-			$browse->set_catalog($_SESSION['catalog']);
-		}
-
-		if ($_REQUEST['sort']) {
-			// Set the new sort value
-			$browse->set_sort($_REQUEST['sort']);
-		}
-		
-		
-		if ($_REQUEST['catalog_key'] || $SESSION['catalog'] != 0) {
-			$browse->set_filter('catalog',$_REQUEST['catalog_key']);
-			$_SESSION['catalog'] = $_REQUEST['catalog_key'];
-		} elseif ($_REQUEST['catalog_key'] == 0) {
-			$browse->set_filter('catalog', null);
-		    unset($_SESSION['catalog']);
-		}
-
-		ob_start();
+    case 'browse':
+        $object_ids = array();
+
+        // Check 'value' with isset because it can null
+        //(user type a "start with" word and deletes it)
+        if ($_REQUEST['key'] && (isset($_REQUEST['multi_alpha_filter']) OR isset($_REQUEST['value']))) {
+            // Set any new filters we've just added
+            $browse->set_filter($_REQUEST['key'],$_REQUEST['multi_alpha_filter']);
+            $browse->set_catalog($_SESSION['catalog']);
+        }
+
+        if ($_REQUEST['sort']) {
+            // Set the new sort value
+            $browse->set_sort($_REQUEST['sort']);
+        }
+        
+        
+        if ($_REQUEST['catalog_key'] || $SESSION['catalog'] != 0) {
+            $browse->set_filter('catalog',$_REQUEST['catalog_key']);
+            $_SESSION['catalog'] = $_REQUEST['catalog_key'];
+        } elseif ($_REQUEST['catalog_key'] == 0) {
+            $browse->set_filter('catalog', null);
+            unset($_SESSION['catalog']);
+        }
+
+        ob_start();
                 $browse->show_objects();
                 $results['browse_content'] = ob_get_clean();
-	break;
-	
-	case 'set_sort':
-	
-		if ($_REQUEST['sort']) {
-			$browse->set_sort($_REQUEST['sort']);
-		}
-
-		ob_start();
-		$browse->show_objects();
-		$results['browse_content'] = ob_get_clean();
-	break;
-	case 'toggle_tag':
-		$type = $_SESSION['tagcloud_type'] ? $_SESSION['tagcloud_type'] : 'song';
-		$browse->set_type($type);
-	break;
-	case 'delete_object':
-		switch ($_REQUEST['type']) {
-			case 'playlist':
-				// Check the perms we need to on this
-				$playlist = new Playlist($_REQUEST['id']);
-				if (!$playlist->has_access()) { exit; }
-
-				// Delete it!
-				$playlist->delete();
-				$key = 'playlist_row_' . $playlist->id;
-			break;
-			case 'smartplaylist':
-				$playlist = new Search('song', $_REQUEST['id']);
-				if (!$playlist->has_access()) { exit; }
-				$playlist->delete();
-				$key = 'playlist_row_' . $playlist->id;
-			break;
-			case 'live_stream':
-				if (!$GLOBALS['user']->has_access('75')) { exit; }
-				$radio = new Radio($_REQUEST['id']);
-				$radio->delete();
-				$key = 'live_stream_' . $radio->id;
-			break;
-			default:
-
-			break;
-		} // end switch on type
-
-		$results[$key] = '';
-
-	break;
-	case 'page':
-		$browse->set_start($_REQUEST['start']);
-
-		ob_start();
-		$browse->show_objects();
-		$results['browse_content'] = ob_get_clean();
-	break;
-	case 'show_art':
-		Art::set_enabled();
-
-		ob_start();
-		$browse->show_objects();
-		$results['browse_content'] = ob_get_clean();
-	break;
-	case 'get_filters':
-		ob_start();
-		require_once Config::get('prefix') . '/templates/browse_filters.inc.php';
-		$results['browse_filters'] = ob_get_clean();
-	default:
-		$results['rfc3514'] = '0x1';
-	break;
+    break;
+    
+    case 'set_sort':
+    
+        if ($_REQUEST['sort']) {
+            $browse->set_sort($_REQUEST['sort']);
+        }
+
+        ob_start();
+        $browse->show_objects();
+        $results['browse_content'] = ob_get_clean();
+    break;
+    case 'toggle_tag':
+        $type = $_SESSION['tagcloud_type'] ? $_SESSION['tagcloud_type'] : 'song';
+        $browse->set_type($type);
+    break;
+    case 'delete_object':
+        switch ($_REQUEST['type']) {
+            case 'playlist':
+                // Check the perms we need to on this
+                $playlist = new Playlist($_REQUEST['id']);
+                if (!$playlist->has_access()) { exit; }
+
+                // Delete it!
+                $playlist->delete();
+                $key = 'playlist_row_' . $playlist->id;
+            break;
+            case 'smartplaylist':
+                $playlist = new Search('song', $_REQUEST['id']);
+                if (!$playlist->has_access()) { exit; }
+                $playlist->delete();
+                $key = 'playlist_row_' . $playlist->id;
+            break;
+            case 'live_stream':
+                if (!$GLOBALS['user']->has_access('75')) { exit; }
+                $radio = new Radio($_REQUEST['id']);
+                $radio->delete();
+                $key = 'live_stream_' . $radio->id;
+            break;
+            default:
+
+            break;
+        } // end switch on type
+
+        $results[$key] = '';
+
+    break;
+    case 'page':
+        $browse->set_start($_REQUEST['start']);
+
+        ob_start();
+        $browse->show_objects();
+        $results['browse_content'] = ob_get_clean();
+    break;
+    case 'show_art':
+        Art::set_enabled();
+
+        ob_start();
+        $browse->show_objects();
+        $results['browse_content'] = ob_get_clean();
+    break;
+    case 'get_filters':
+        ob_start();
+        require_once Config::get('prefix') . '/templates/browse_filters.inc.php';
+        $results['browse_filters'] = ob_get_clean();
+    default:
+        $results['rfc3514'] = '0x1';
+    break;
 } // switch on action;
 
 $browse->store();
diff --git a/server/democratic.ajax.php b/server/democratic.ajax.php
index 42ac3260..a3ebc998 100644
--- a/server/democratic.ajax.php
+++ b/server/democratic.ajax.php
@@ -1,5 +1,5 @@
 <?php
-/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */
+/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
 /**
  *
  * LICENSE: GNU General Public License, version 2 (GPLv2)
@@ -29,64 +29,64 @@ $democratic = Democratic::get_current_playlist();
 $democratic->set_parent();
 
 switch ($_REQUEST['action']) {
-	case 'delete_vote':
-		$democratic->remove_vote($_REQUEST['row_id']);
-		$show_browse = true;
-	break;
-	case 'add_vote':
-		$democratic->add_vote(array(
-			array(
-				'object_type' => $_REQUEST['type'],
-				'object_id' => $_REQUEST['object_id']
-			)
-		));
-		$show_browse = true;
-	break;
-	case 'delete':
-		if (!$GLOBALS['user']->has_access('75')) {
-			echo xml_from_array(array('rfc3514' => '0x1'));
-			exit;
-		}
+    case 'delete_vote':
+        $democratic->remove_vote($_REQUEST['row_id']);
+        $show_browse = true;
+    break;
+    case 'add_vote':
+        $democratic->add_vote(array(
+            array(
+                'object_type' => $_REQUEST['type'],
+                'object_id' => $_REQUEST['object_id']
+            )
+        ));
+        $show_browse = true;
+    break;
+    case 'delete':
+        if (!$GLOBALS['user']->has_access('75')) {
+            echo xml_from_array(array('rfc3514' => '0x1'));
+            exit;
+        }
 
-		$democratic->delete_votes($_REQUEST['row_id']);
-		$show_browse = true;
-	break;
-	case 'send_playlist':
-		if (!Access::check('interface','75')) {
-			echo xml_from_array(array('rfc3514' => '0x1'));
-			exit;
-		}
+        $democratic->delete_votes($_REQUEST['row_id']);
+        $show_browse = true;
+    break;
+    case 'send_playlist':
+        if (!Access::check('interface','75')) {
+            echo xml_from_array(array('rfc3514' => '0x1'));
+            exit;
+        }
 
-		$_SESSION['iframe']['target'] = Config::get('web_path') . '/stream.php?action=democratic&democratic_id=' . scrub_out($_REQUEST['democratic_id']);
-		$results['rfc3514'] = '<script type="text/javascript">reloadUtil("'.$_SESSION['iframe']['target'].'")</script>';
-	break;
-	case 'clear_playlist':
-		if (!Access::check('interface','100')) {
-			echo xml_from_array(array('rfc3514' => '0x1'));
-			exit;
-		}
+        $_SESSION['iframe']['target'] = Config::get('web_path') . '/stream.php?action=democratic&democratic_id=' . scrub_out($_REQUEST['democratic_id']);
+        $results['rfc3514'] = '<script type="text/javascript">reloadUtil("'.$_SESSION['iframe']['target'].'")</script>';
+    break;
+    case 'clear_playlist':
+        if (!Access::check('interface','100')) {
+            echo xml_from_array(array('rfc3514' => '0x1'));
+            exit;
+        }
 
-		$democratic = new Democratic($_REQUEST['democratic_id']);
-		$democratic->set_parent();
-		$democratic->clear();
+        $democratic = new Democratic($_REQUEST['democratic_id']);
+        $democratic->set_parent();
+        $democratic->clear();
 
-		$show_browse = true;
-	break;
-	default:
-		$results['rfc3514'] = '0x1';
-	break;
+        $show_browse = true;
+    break;
+    default:
+        $results['rfc3514'] = '0x1';
+    break;
 } // switch on action;
 
 if ($show_browse) {
-	ob_start();
-	$object_ids = $democratic->get_items();
-	$browse = new Browse();
-	$browse->set_type('democratic');
-	$browse->set_static_content(true);
-	$browse->show_objects($object_ids);
-	$browse->store();
-	$results['browse_content'] = ob_get_contents();
-	ob_end_clean();
+    ob_start();
+    $object_ids = $democratic->get_items();
+    $browse = new Browse();
+    $browse->set_type('democratic');
+    $browse->set_static_content(true);
+    $browse->show_objects($object_ids);
+    $browse->store();
+    $results['browse_content'] = ob_get_contents();
+    ob_end_clean();
 }
 
 // We always do this
diff --git a/server/flag.ajax.php b/server/flag.ajax.php
index a3752789..04452177 100644
--- a/server/flag.ajax.php
+++ b/server/flag.ajax.php
@@ -1,5 +1,5 @@
 <?php
-/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */
+/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
 /**
  *
  * LICENSE: GNU General Public License, version 2 (GPLv2)
@@ -26,46 +26,46 @@
 if (!defined('AJAX_INCLUDE')) { exit; }
 
 switch ($_REQUEST['action']) {
-	case 'reject':
-		if (!Access::check('interface','75')) {
-			$results['rfc3514'] = '0x1';
-			break;
-		}
+    case 'reject':
+        if (!Access::check('interface','75')) {
+            $results['rfc3514'] = '0x1';
+            break;
+        }
 
-		// Remove the flag from the table
-		$flag = new Flag($_REQUEST['flag_id']);
-		$flag->delete();
+        // Remove the flag from the table
+        $flag = new Flag($_REQUEST['flag_id']);
+        $flag->delete();
 
-		$flagged = Flag::get_all();
-		ob_start();
-		$browse = new Browse();
-		$browse->set_type('flagged');
-		$browse->set_static_content(true);
-		$browse->save_objects($flagged);
-		$browse->show_objects($flagged);
-		$browse->store();
-		$results['browse_content'] = ob_get_contents();
-		ob_end_clean();
+        $flagged = Flag::get_all();
+        ob_start();
+        $browse = new Browse();
+        $browse->set_type('flagged');
+        $browse->set_static_content(true);
+        $browse->save_objects($flagged);
+        $browse->show_objects($flagged);
+        $browse->store();
+        $results['browse_content'] = ob_get_contents();
+        ob_end_clean();
 
-	break;
-	case 'accept':
-		if (!Access::check('interface','75')) {
-			$results['rfc3514'] = '0x1';
-			break;
-		}
+    break;
+    case 'accept':
+        if (!Access::check('interface','75')) {
+            $results['rfc3514'] = '0x1';
+            break;
+        }
 
-		$flag = new Flag($_REQUEST['flag_id']);
-		$flag->approve();
-		$flag->format();
-		ob_start();
-		require_once Config::get('prefix') . '/templates/show_flag_row.inc.php';
-		$results['flagged_' . $flag->id] = ob_get_contents();
-		ob_end_clean();
+        $flag = new Flag($_REQUEST['flag_id']);
+        $flag->approve();
+        $flag->format();
+        ob_start();
+        require_once Config::get('prefix') . '/templates/show_flag_row.inc.php';
+        $results['flagged_' . $flag->id] = ob_get_contents();
+        ob_end_clean();
 
-	break;
-	default:
-		$results['rfc3514'] = '0x1';
-	break;
+    break;
+    default:
+        $results['rfc3514'] = '0x1';
+    break;
 } // switch on action;
 
 // We always do this
diff --git a/server/index.ajax.php b/server/index.ajax.php
index b46674d5..2dc4b399 100644
--- a/server/index.ajax.php
+++ b/server/index.ajax.php
@@ -1,5 +1,5 @@
 <?php
-/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */
+/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
 /**
  *
  * LICENSE: GNU General Public License, version 2 (GPLv2)
@@ -26,30 +26,30 @@
 if (!defined('AJAX_INCLUDE')) { exit; }
 
 switch ($_REQUEST['action']) {
-	case 'random_albums':
-		$albums = Album::get_random_albums('6');
-		if (count($albums) AND is_array($albums)) {
-			ob_start();
-			require_once Config::get('prefix') . '/templates/show_random_albums.inc.php';
-			$results['random_selection'] = ob_get_clean();
-		}
-		else {
-			$results['random_selection'] = '<!-- None found -->';
-		}
-	break;
-	case 'reloadnp':
-		ob_start();
-		show_now_playing();
-		$results['now_playing'] = ob_get_clean();
-		ob_start();
-		$data = Song::get_recently_played();
-		Song::build_cache(array_keys($data));
-		if (count($data)) {
+    case 'random_albums':
+        $albums = Album::get_random_albums('6');
+        if (count($albums) AND is_array($albums)) {
+            ob_start();
+            require_once Config::get('prefix') . '/templates/show_random_albums.inc.php';
+            $results['random_selection'] = ob_get_clean();
+        }
+        else {
+            $results['random_selection'] = '<!-- None found -->';
+        }
+    break;
+    case 'reloadnp':
+        ob_start();
+        show_now_playing();
+        $results['now_playing'] = ob_get_clean();
+        ob_start();
+        $data = Song::get_recently_played();
+        Song::build_cache(array_keys($data));
+        if (count($data)) {
                         require_once Config::get('prefix') . '/templates/show_recently_played.inc.php';
-		}
-		$results['recently_played'] = ob_get_clean();
-	break;
-	case 'sidebar':
+        }
+        $results['recently_played'] = ob_get_clean();
+    break;
+    case 'sidebar':
                 switch ($_REQUEST['button']) {
                         case 'home':
                         case 'modules':
@@ -72,9 +72,9 @@ switch ($_REQUEST['action']) {
                 require_once Config::get('prefix') . '/templates/sidebar.inc.php';
                 $results['sidebar'] = ob_get_contents();
                 ob_end_clean();
-	default:
-		$results['rfc3514'] = '0x1';
-	break;
+    default:
+        $results['rfc3514'] = '0x1';
+    break;
 } // switch on action;
 
 // We always do this
diff --git a/server/localplay.ajax.php b/server/localplay.ajax.php
index 66368870..f37cac7e 100644
--- a/server/localplay.ajax.php
+++ b/server/localplay.ajax.php
@@ -1,5 +1,5 @@
 <?php
-/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */
+/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
 /**
  *
  * LICENSE: GNU General Public License, version 2 (GPLv2)
@@ -26,171 +26,171 @@
 if (!defined('AJAX_INCLUDE')) { exit; }
 
 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');
-			exit;
-		}
-
-		$type = $_REQUEST['instance'] ? 'localplay' : 'stream';
-
-		$localplay = new Localplay(Config::get('localplay_controller'));
-		$localplay->set_active_instance($_REQUEST['instance']);
-		Preference::update('play_type',$GLOBALS['user']->id,$type);
-
-		// We should also refesh the sidebar
-		ob_start();
-		require_once Config::get('prefix') . '/templates/sidebar.inc.php';
-		$results['sidebar'] = ob_get_contents();
-		ob_end_clean();
-	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');
-			exit;
-		}
-
-		$localplay = new Localplay(Config::get('localplay_controller'));
-		$localplay->connect();
-
-		// Switch on valid commands
-		switch ($_REQUEST['command']) {
-			case 'prev':
-			case 'next':
-			case 'stop':
-			case 'play':
-			case 'pause':
-				$command = scrub_in($_REQUEST['command']);
-				$localplay->$command();
-			break;
-			case 'volume_up':
-			case 'volume_down':
-			case 'volume_mute':
-				$command = scrub_in($_REQUEST['command']);
-				$localplay->$command();
-
-				// We actually want to refresh something here
-				ob_start();
-				require_once Config::get('prefix') . '/templates/show_localplay_status.inc.php';
-				$results['localplay_status'] = ob_get_contents();
-				ob_end_clean();
-			break;
-			case 'delete_all':
-				$localplay->delete_all();
-				ob_start();
-				$browse = new Browse();
-				$browse->set_type('playlist_localplay');
-				$browse->set_static_content(true);
-				$browse->save_objects(array());
-				$browse->show_objects(array());
-				$browse->store();
-				$results['browse_content'] = ob_get_contents();
-				ob_end_clean();
-			break;
-			case 'skip':
-				$localplay->skip(intval($_REQUEST['id']));
-				$objects = $localplay->get();
-				ob_start();
-				$browse = new Browse();
-				$browse->set_type('playlist_localplay');
-				$browse->set_static_content(true);
-				$browse->save_objects($objects);
-				$browse->show_objects($objects);
-				$browse->store();
-				$results['browse_content'] = ob_get_contents();
-				ob_end_clean();
-			break;
-			default:
-				// Nothing
-			break;
-		} // end whitelist
-
-	break;
-	case 'delete_track':
-		// Load Connect... yada yada
-		if (!Access::check('localplay','50')) {
-			debug_event('DENIED','Attempted to delete track without access','1');
-			exit;
-		}
-		$localplay = new Localplay(Config::get('localplay_controller'));
-		$localplay->connect();
-
-		// Scrub in the delete request
-		$id = intval($_REQUEST['id']);
-
-		$localplay->delete_track($id);
-
-		// Wait in case we just deleted what we were playing
-		sleep(3);
-		$objects = $localplay->get();
-		$status = $localplay->status();
-
-		ob_start();
-		$browse = new Browse();
-		$browse->set_type('playlist_localplay');
-		$browse->set_static_content(true);
-		$browse->save_objects($objects);
-		$browse->show_objects($objects);
-		$browse->store();
-		$results['browse_content'] = ob_get_contents();
-		ob_end_clean();
-
-	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');
-			exit;
-		}
-
-		// Scrub it in
-		$localplay = new Localplay(Config::get('localplay_controller'));
-		$localplay->delete_instance($_REQUEST['instance']);
-
-		$key = 'localplay_instance_' . $_REQUEST['instance'];
-		$results[$key] = '';
-	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');
-			exit;
-		}
-
-		// Scrub her in
-		$localplay = new Localplay(Config::get('localplay_controller'));
-		$localplay->connect();
-		$localplay->repeat(make_bool($_REQUEST['value']));
-
-		ob_start();
-		require_once Config::get('prefix') . '/templates/show_localplay_status.inc.php';
-		$results['localplay_status'] = ob_get_contents();
-		ob_end_clean();
-
-	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');
-			exit;
-		}
-
-		// Scrub her in
-		$localplay = new Localplay(Config::get('localplay_controller'));
-		$localplay->connect();
-		$localplay->random(make_bool($_REQUEST['value']));
-
-		ob_start();
-		require_once Config::get('prefix') . '/templates/show_localplay_status.inc.php';
-		$results['localplay_status'] = ob_get_contents();
-		ob_end_clean();
-
-	break;
-	default:
-		$results['rfc3514'] = '0x1';
-	break;
+    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');
+            exit;
+        }
+
+        $type = $_REQUEST['instance'] ? 'localplay' : 'stream';
+
+        $localplay = new Localplay(Config::get('localplay_controller'));
+        $localplay->set_active_instance($_REQUEST['instance']);
+        Preference::update('play_type',$GLOBALS['user']->id,$type);
+
+        // We should also refesh the sidebar
+        ob_start();
+        require_once Config::get('prefix') . '/templates/sidebar.inc.php';
+        $results['sidebar'] = ob_get_contents();
+        ob_end_clean();
+    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');
+            exit;
+        }
+
+        $localplay = new Localplay(Config::get('localplay_controller'));
+        $localplay->connect();
+
+        // Switch on valid commands
+        switch ($_REQUEST['command']) {
+            case 'prev':
+            case 'next':
+            case 'stop':
+            case 'play':
+            case 'pause':
+                $command = scrub_in($_REQUEST['command']);
+                $localplay->$command();
+            break;
+            case 'volume_up':
+            case 'volume_down':
+            case 'volume_mute':
+                $command = scrub_in($_REQUEST['command']);
+                $localplay->$command();
+
+                // We actually want to refresh something here
+                ob_start();
+                require_once Config::get('prefix') . '/templates/show_localplay_status.inc.php';
+                $results['localplay_status'] = ob_get_contents();
+                ob_end_clean();
+            break;
+            case 'delete_all':
+                $localplay->delete_all();
+                ob_start();
+                $browse = new Browse();
+                $browse->set_type('playlist_localplay');
+                $browse->set_static_content(true);
+                $browse->save_objects(array());
+                $browse->show_objects(array());
+                $browse->store();
+                $results['browse_content'] = ob_get_contents();
+                ob_end_clean();
+            break;
+            case 'skip':
+                $localplay->skip(intval($_REQUEST['id']));
+                $objects = $localplay->get();
+                ob_start();
+                $browse = new Browse();
+                $browse->set_type('playlist_localplay');
+                $browse->set_static_content(true);
+                $browse->save_objects($objects);
+                $browse->show_objects($objects);
+                $browse->store();
+                $results['browse_content'] = ob_get_contents();
+                ob_end_clean();
+            break;
+            default:
+                // Nothing
+            break;
+        } // end whitelist
+
+    break;
+    case 'delete_track':
+        // Load Connect... yada yada
+        if (!Access::check('localplay','50')) {
+            debug_event('DENIED','Attempted to delete track without access','1');
+            exit;
+        }
+        $localplay = new Localplay(Config::get('localplay_controller'));
+        $localplay->connect();
+
+        // Scrub in the delete request
+        $id = intval($_REQUEST['id']);
+
+        $localplay->delete_track($id);
+
+        // Wait in case we just deleted what we were playing
+        sleep(3);
+        $objects = $localplay->get();
+        $status = $localplay->status();
+
+        ob_start();
+        $browse = new Browse();
+        $browse->set_type('playlist_localplay');
+        $browse->set_static_content(true);
+        $browse->save_objects($objects);
+        $browse->show_objects($objects);
+        $browse->store();
+        $results['browse_content'] = ob_get_contents();
+        ob_end_clean();
+
+    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');
+            exit;
+        }
+
+        // Scrub it in
+        $localplay = new Localplay(Config::get('localplay_controller'));
+        $localplay->delete_instance($_REQUEST['instance']);
+
+        $key = 'localplay_instance_' . $_REQUEST['instance'];
+        $results[$key] = '';
+    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');
+            exit;
+        }
+
+        // Scrub her in
+        $localplay = new Localplay(Config::get('localplay_controller'));
+        $localplay->connect();
+        $localplay->repeat(make_bool($_REQUEST['value']));
+
+        ob_start();
+        require_once Config::get('prefix') . '/templates/show_localplay_status.inc.php';
+        $results['localplay_status'] = ob_get_contents();
+        ob_end_clean();
+
+    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');
+            exit;
+        }
+
+        // Scrub her in
+        $localplay = new Localplay(Config::get('localplay_controller'));
+        $localplay->connect();
+        $localplay->random(make_bool($_REQUEST['value']));
+
+        ob_start();
+        require_once Config::get('prefix') . '/templates/show_localplay_status.inc.php';
+        $results['localplay_status'] = ob_get_contents();
+        ob_end_clean();
+
+    break;
+    default:
+        $results['rfc3514'] = '0x1';
+    break;
 } // switch on action;
 
 // We always do this
diff --git a/server/playlist.ajax.php b/server/playlist.ajax.php
index 33369063..5bfe1a99 100644
--- a/server/playlist.ajax.php
+++ b/server/playlist.ajax.php
@@ -1,5 +1,5 @@
 <?php
-/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */
+/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
 /**
  *
  * LICENSE: GNU General Public License, version 2 (GPLv2)
@@ -26,127 +26,127 @@
 if (!defined('AJAX_INCLUDE')) { exit; }
 
 switch ($_REQUEST['action']) {
-	case 'delete_track':
-		// Create the object and remove the track
-		$playlist = new Playlist($_REQUEST['playlist_id']);
-		$playlist->format();
-		if ($playlist->has_access()) {
-			$playlist->delete_track($_REQUEST['track_id']);
-		}
-
-		$object_ids = $playlist->get_items();
-		ob_start();
-		$browse = new Browse();
-	        $browse->set_type('playlist_song');
-	        $browse->add_supplemental_object('playlist',$playlist->id);
-	        $browse->save_objects($object_ids);
-	        $browse->show_objects($object_ids);
-		$browse->store();
-		$results['browse_content'] = ob_get_clean();
-	break;
-	case 'edit_track':
-		$playlist = new Playlist($_REQUEST['playlist_id']);
-		if (!$playlist->has_access()) {
-			$results['rfc3514'] = '0x1';
-			break;
-		}
-
-		// They've got access, show the edit page
-		$track = $playlist->get_track($_REQUEST['track_id']);
-		$song = new Song($track['object_id']);
-		$song->format();
-		require_once Config::get('prefix') . '/templates/show_edit_playlist_song_row.inc.php';
-		$results['track_' . $track['id']] = ob_get_clean();
-	break;
-	case 'save_track':
-		$playlist = new Playlist($_REQUEST['playlist_id']);
-		if (!$playlist->has_access()) {
-			$results['rfc3514'] = '0x1';
-			break;
-		}
-		$playlist->format();
-
-		// They've got access, save this guy and re-display row
-		$playlist->update_track_number($_GET['track_id'],$_POST['track']);
-		$track = $playlist->get_track($_GET['track_id']);
-		$song = new Song($track['object_id']);
-		$song->format();
-		$playlist_track = $track['track'];
-		require Config::get('prefix') . '/templates/show_playlist_song_row.inc.php';
-		$results['track_' . $track['id']] = ob_get_clean();
-	break;
-	case 'create':
-		if (!Access::check('interface','25')) {
-			debug_event('DENIED','Error:' . $GLOBALS['user']->username . ' does not have user access, unable to create playlist','1');
-			break;
-		}
-
-		// Pull the current active playlist items
-		$objects = $GLOBALS['user']->playlist->get_items();
-
-		$name = $GLOBALS['user']->username . ' - ' . date("Y-m-d H:i:s",time());
-
-		// generate the new playlist
-		$playlist_id = Playlist::create($name,'public');
-		if (!$playlist_id) { break; }
-		$playlist = new Playlist($playlist_id);
-
-		// Itterate through and add them to our new playlist
-		foreach ($objects as $object_data) {
-			// For now only allow songs on here, we'll change this later
-			$type = array_shift($object_data);
-			if ($type == 'song') {
-				$songs[] = array_shift($object_data);
-			}
-		} // object_data
-
-		// Add our new songs
-		$playlist->add_songs($songs,'ORDERED');
-		$playlist->format();
-		$object_ids = $playlist->get_items();
-		ob_start();
-		require_once Config::get('prefix') . '/templates/show_playlist.inc.php';
-		$results['content'] = ob_get_clean();
-	break;
-	case 'append':
-		// Pull the current active playlist items
-		$objects = $GLOBALS['user']->playlist->get_items();
-
-		// Create the playlist object
-		$playlist = new Playlist($_REQUEST['playlist_id']);
-
-		// We need to make sure that they have access
-		if (!$playlist->has_access()) {
-			break;
-		}
-
-		$songs = array();
-
-		// Itterate through and add them to our new playlist
-		foreach ($objects as $element) {
-			$type = array_shift($element);
-			switch ($type) {
-				case 'song':
-					$songs[] = array_shift($element);
-				break;
-			} // end switch
-		} // foreach
-
-		// Override normal include procedure
-		Ajax::set_include_override(true);
-
-		// Add our new songs
-		$playlist->add_songs($songs,'ORDERED');
-		$playlist->format();
-		$object_ids = $playlist->get_items();
-		ob_start();
-		require_once Config::get('prefix') . '/templates/show_playlist.inc.php';
-		$results['content'] = ob_get_contents();
-		ob_end_clean();
-	break;
-	default:
-		$results['rfc3514'] = '0x1';
-	break;
+    case 'delete_track':
+        // Create the object and remove the track
+        $playlist = new Playlist($_REQUEST['playlist_id']);
+        $playlist->format();
+        if ($playlist->has_access()) {
+            $playlist->delete_track($_REQUEST['track_id']);
+        }
+
+        $object_ids = $playlist->get_items();
+        ob_start();
+        $browse = new Browse();
+            $browse->set_type('playlist_song');
+            $browse->add_supplemental_object('playlist',$playlist->id);
+            $browse->save_objects($object_ids);
+            $browse->show_objects($object_ids);
+        $browse->store();
+        $results['browse_content'] = ob_get_clean();
+    break;
+    case 'edit_track':
+        $playlist = new Playlist($_REQUEST['playlist_id']);
+        if (!$playlist->has_access()) {
+            $results['rfc3514'] = '0x1';
+            break;
+        }
+
+        // They've got access, show the edit page
+        $track = $playlist->get_track($_REQUEST['track_id']);
+        $song = new Song($track['object_id']);
+        $song->format();
+        require_once Config::get('prefix') . '/templates/show_edit_playlist_song_row.inc.php';
+        $results['track_' . $track['id']] = ob_get_clean();
+    break;
+    case 'save_track':
+        $playlist = new Playlist($_REQUEST['playlist_id']);
+        if (!$playlist->has_access()) {
+            $results['rfc3514'] = '0x1';
+            break;
+        }
+        $playlist->format();
+
+        // They've got access, save this guy and re-display row
+        $playlist->update_track_number($_GET['track_id'],$_POST['track']);
+        $track = $playlist->get_track($_GET['track_id']);
+        $song = new Song($track['object_id']);
+        $song->format();
+        $playlist_track = $track['track'];
+        require Config::get('prefix') . '/templates/show_playlist_song_row.inc.php';
+        $results['track_' . $track['id']] = ob_get_clean();
+    break;
+    case 'create':
+        if (!Access::check('interface','25')) {
+            debug_event('DENIED','Error:' . $GLOBALS['user']->username . ' does not have user access, unable to create playlist','1');
+            break;
+        }
+
+        // Pull the current active playlist items
+        $objects = $GLOBALS['user']->playlist->get_items();
+
+        $name = $GLOBALS['user']->username . ' - ' . date("Y-m-d H:i:s",time());
+
+        // generate the new playlist
+        $playlist_id = Playlist::create($name,'public');
+        if (!$playlist_id) { break; }
+        $playlist = new Playlist($playlist_id);
+
+        // Itterate through and add them to our new playlist
+        foreach ($objects as $object_data) {
+            // For now only allow songs on here, we'll change this later
+            $type = array_shift($object_data);
+            if ($type == 'song') {
+                $songs[] = array_shift($object_data);
+            }
+        } // object_data
+
+        // Add our new songs
+        $playlist->add_songs($songs,'ORDERED');
+        $playlist->format();
+        $object_ids = $playlist->get_items();
+        ob_start();
+        require_once Config::get('prefix') . '/templates/show_playlist.inc.php';
+        $results['content'] = ob_get_clean();
+    break;
+    case 'append':
+        // Pull the current active playlist items
+        $objects = $GLOBALS['user']->playlist->get_items();
+
+        // Create the playlist object
+        $playlist = new Playlist($_REQUEST['playlist_id']);
+
+        // We need to make sure that they have access
+        if (!$playlist->has_access()) {
+            break;
+        }
+
+        $songs = array();
+
+        // Itterate through and add them to our new playlist
+        foreach ($objects as $element) {
+            $type = array_shift($element);
+            switch ($type) {
+                case 'song':
+                    $songs[] = array_shift($element);
+                break;
+            } // end switch
+        } // foreach
+
+        // Override normal include procedure
+        Ajax::set_include_override(true);
+
+        // Add our new songs
+        $playlist->add_songs($songs,'ORDERED');
+        $playlist->format();
+        $object_ids = $playlist->get_items();
+        ob_start();
+        require_once Config::get('prefix') . '/templates/show_playlist.inc.php';
+        $results['content'] = ob_get_contents();
+        ob_end_clean();
+    break;
+    default:
+        $results['rfc3514'] = '0x1';
+    break;
 } // switch on action;
 
 // We always do this
diff --git a/server/random.ajax.php b/server/random.ajax.php
index ff149476..dbcd43b5 100644
--- a/server/random.ajax.php
+++ b/server/random.ajax.php
@@ -1,5 +1,5 @@
 <?php
-/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */
+/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
 /**
  *
  * LICENSE: GNU General Public License, version 2 (GPLv2)
@@ -29,64 +29,64 @@ switch ($_REQUEST['action']) {
         case 'album':
                 $album_id = Random::album();
 
-		// If we don't get anything stop
-		if (!$album_id) { $results['rfc3514'] = '0x1'; break; }
+        // If we don't get anything stop
+        if (!$album_id) { $results['rfc3514'] = '0x1'; break; }
 
                 $album = new Album($album_id);
                 $songs = $album->get_songs();
                 foreach ($songs as $song_id) {
                         $GLOBALS['user']->playlist->add_object($song_id,'song');
                 }
-		$results['rightbar'] = UI::ajax_include('rightbar.inc.php');
+        $results['rightbar'] = UI::ajax_include('rightbar.inc.php');
         break;
         case 'artist':
                 $artist_id = Random::artist();
 
-		// If we don't get anything stop
-		if (!$artist_id) { $results['rfc3514'] = '0x1'; break; }
+        // If we don't get anything stop
+        if (!$artist_id) { $results['rfc3514'] = '0x1'; break; }
 
                 $artist = new Artist($artist_id);
                 $songs = $artist->get_songs();
                 foreach ($songs as $song_id) {
                         $GLOBALS['user']->playlist->add_object($song_id,'song');
                 }
-		$results['rightbar'] = UI::ajax_include('rightbar.inc.php');
+        $results['rightbar'] = UI::ajax_include('rightbar.inc.php');
         break;
         case 'playlist':
                 $playlist_id = Random::playlist();
 
-		// If we don't get any results stop right here!
-		if (!$playlist_id) { $results['rfc3514'] = '0x1'; break; }
+        // If we don't get any results stop right here!
+        if (!$playlist_id) { $results['rfc3514'] = '0x1'; break; }
 
                 $playlist = new Playlist($playlist_id);
                 $items = $playlist->get_items();
                 foreach ($items as $item) {
                         $GLOBALS['user']->playlist->add_object($item['object_id'],$item['type']);
                 }
-		$results['rightbar'] = UI::ajax_include('rightbar.inc.php');
+        $results['rightbar'] = UI::ajax_include('rightbar.inc.php');
         break;
-	case 'advanced_random':
-		$object_ids = Random::advanced($_POST);
+    case 'advanced_random':
+        $object_ids = Random::advanced($_POST);
 
-		// First add them to the active playlist
-		foreach ($object_ids as $object_id) {
-			$GLOBALS['user']->playlist->add_object($object_id,'song');
-		}
-		$results['rightbar'] = UI::ajax_include('rightbar.inc.php');
+        // First add them to the active playlist
+        foreach ($object_ids as $object_id) {
+            $GLOBALS['user']->playlist->add_object($object_id,'song');
+        }
+        $results['rightbar'] = UI::ajax_include('rightbar.inc.php');
 
-		// Now setup the browse and show them below!
-		$browse = new Browse();
-		$browse->set_type('song');
-		$browse->save_objects($object_ids);
-		ob_start();
-		$browse->show_objects();
-		$results['browse'] = ob_get_contents();
-		ob_end_clean();
+        // Now setup the browse and show them below!
+        $browse = new Browse();
+        $browse->set_type('song');
+        $browse->save_objects($object_ids);
+        ob_start();
+        $browse->show_objects();
+        $results['browse'] = ob_get_contents();
+        ob_end_clean();
 
-	break;
-	default:
-		$results['rfc3514'] = '0x1';
-	break;
+    break;
+    default:
+        $results['rfc3514'] = '0x1';
+    break;
 } // switch on action;
 
 // We always do this
diff --git a/server/song.ajax.php b/server/song.ajax.php
index 2fccae37..1c83211e 100644
--- a/server/song.ajax.php
+++ b/server/song.ajax.php
@@ -1,5 +1,5 @@
 <?php
-/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */
+/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
 /**
  *
  * LICENSE: GNU General Public License, version 2 (GPLv2)
@@ -26,27 +26,27 @@
 if (!defined('AJAX_INCLUDE')) { exit; }
 
 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');
-			exit;
-		}
+    case 'flip_state':
+        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 ? '0' : '1';
-		$song->update_enabled($new_enabled,$song->id);
-		$song->enabled = $new_enabled;
-		$song->format();
+        $song = new Song($_REQUEST['song_id']);
+        $new_enabled = $song->enabled ? '0' : '1';
+        $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);
+        //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);
 
-	break;
-	default:
-		$results['rfc3514'] = '0x1';
-	break;
+    break;
+    default:
+        $results['rfc3514'] = '0x1';
+    break;
 } // switch on action;
 
 // We always do this
diff --git a/server/stats.ajax.php b/server/stats.ajax.php
index 7e6d99f1..b4811ab3 100644
--- a/server/stats.ajax.php
+++ b/server/stats.ajax.php
@@ -1,5 +1,5 @@
 <?php
-/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */
+/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
 /**
  *
  * LICENSE: GNU General Public License, version 2 (GPLv2)
@@ -26,9 +26,9 @@
 if (!defined('AJAX_INCLUDE')) { exit; }
 
 switch ($_REQUEST['action']) {
-	default:
-		$results['rfc3514'] = '0x1';
-	break;
+    default:
+        $results['rfc3514'] = '0x1';
+    break;
 } // switch on action;
 
 // We always do this
diff --git a/server/stream.ajax.php b/server/stream.ajax.php
index 516e919f..c08d6cb3 100644
--- a/server/stream.ajax.php
+++ b/server/stream.ajax.php
@@ -1,5 +1,5 @@
 <?php
-/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */
+/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
 /**
  *
  * LICENSE: GNU General Public License, version 2 (GPLv2)
@@ -26,69 +26,69 @@
 if (!defined('AJAX_INCLUDE')) { exit; }
 
 switch ($_REQUEST['action']) {
-	case 'set_play_type':
-		// Make sure they have the rights to do this
-		if (!Preference::has_access('play_type')) {
-			$results['rfc3514'] = '0x1';
-			break;
-		}
+    case 'set_play_type':
+        // Make sure they have the rights to do this
+        if (!Preference::has_access('play_type')) {
+            $results['rfc3514'] = '0x1';
+            break;
+        }
 
-		switch ($_POST['type']) {
-			case 'stream':
-			case 'localplay':
-			case 'democratic':
-				$key = 'allow_' . $_POST['type'] . '_playback';
-				if (!Config::get($key)) {
-					$results['rfc3514'] = '0x1';
-					break 2;
-				}
-				$new = $_POST['type'];
-			break;
-			case 'xspf_player':
-				$new = $_POST['type'];
-				// Rien a faire
-			break;
-			default:
-				$new = 'stream';
-				$results['rfc3514'] = '0x1';
-			break 2;
-		} // end switch
+        switch ($_POST['type']) {
+            case 'stream':
+            case 'localplay':
+            case 'democratic':
+                $key = 'allow_' . $_POST['type'] . '_playback';
+                if (!Config::get($key)) {
+                    $results['rfc3514'] = '0x1';
+                    break 2;
+                }
+                $new = $_POST['type'];
+            break;
+            case 'xspf_player':
+                $new = $_POST['type'];
+                // Rien a faire
+            break;
+            default:
+                $new = 'stream';
+                $results['rfc3514'] = '0x1';
+            break 2;
+        } // end switch
 
-		$current = Config::get('play_type');
+        $current = Config::get('play_type');
 
-		// Go ahead and update their preference
-		if (Preference::update('play_type',$GLOBALS['user']->id,$new)) {
-			Config::set('play_type', $new, true);
-		}
+        // Go ahead and update their preference
+        if (Preference::update('play_type',$GLOBALS['user']->id,$new)) {
+            Config::set('play_type', $new, true);
+        }
 
 
-		if (($new == 'localplay' AND $current != 'localplay') OR ($current == 'localplay' AND $new != 'localplay')) {
-			$results['rightbar'] = UI::ajax_include('rightbar.inc.php');
-		}
+        if (($new == 'localplay' AND $current != 'localplay') OR ($current == 'localplay' AND $new != 'localplay')) {
+            $results['rightbar'] = UI::ajax_include('rightbar.inc.php');
+        }
 
-		$results['rfc3514'] = '0x0';
+        $results['rfc3514'] = '0x0';
 
-	break;
-	case 'basket':
+    break;
+    case 'basket':
 
-		// Go ahead and see if we should clear the playlist here or not, we might not actually clear it in the session
-		// we'll just have to feed it bad data.
-		// FIXME: This is sad, will be fixed when I switch how streaming works.
+        // Go ahead and see if we should clear the playlist here or not, we might not actually clear it in the session
+        // we'll just have to feed it bad data.
+        // FIXME: This is sad, will be fixed when I switch how streaming works.
                 // Check to see if 'clear' was passed if it was then we need to reset the basket
                 if ( ($_REQUEST['playlist_method'] == 'clear' || Config::get('playlist_method') == 'clear') AND Config::get('play_type') != 'xspf_player') {
-			define('NO_SONGS','1');
-			ob_start();
-			require_once Config::get('prefix') . '/templates/rightbar.inc.php';
-			$results['rightbar'] = ob_get_clean();
+            define('NO_SONGS','1');
+            ob_start();
+            require_once Config::get('prefix') . '/templates/rightbar.inc.php';
+            $results['rightbar'] = ob_get_clean();
                 }
 
-		// We need to set the basket up!
-		$_SESSION['iframe']['target'] = Config::get('web_path') . '/stream.php?action=basket&playlist_method=' . scrub_out($_REQUEST['playlist_method']);
-		$results['rfc3514'] = '<script type="text/javascript">reloadUtil(\''.$_SESSION['iframe']['target'] . '\');</script>';
-	break;
-	default:
-		$results['rfc3514'] = '0x1';
-	break;
+        // We need to set the basket up!
+        $_SESSION['iframe']['target'] = Config::get('web_path') . '/stream.php?action=basket&playlist_method=' . scrub_out($_REQUEST['playlist_method']);
+        $results['rfc3514'] = '<script type="text/javascript">reloadUtil(\''.$_SESSION['iframe']['target'] . '\');</script>';
+    break;
+    default:
+        $results['rfc3514'] = '0x1';
+    break;
 } // switch on action;
 
 // We always do this
diff --git a/server/tag.ajax.php b/server/tag.ajax.php
index 99531861..d83c8ce7 100644
--- a/server/tag.ajax.php
+++ b/server/tag.ajax.php
@@ -1,5 +1,5 @@
 <?php
-/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */
+/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
 /**
  *
  * LICENSE: GNU General Public License, version 2 (GPLv2)
@@ -26,34 +26,34 @@
 if (!defined('AJAX_INCLUDE')) { exit; }
 
 switch ($_REQUEST['action']) {
-	case 'show_add_tag':
+    case 'show_add_tag':
 
-	break;
-	case 'add_tag':
-		Tag::add_tag_map($_GET['type'],$_GET['object_id'],$_GET['tag_id']);
-	break;
-	case 'remove_tag':
-		$tag = new Tag($_GET['tag_id']);
-		$tag->remove_map($_GET['type'],$_GET['object_id']);
-	break;
-	case 'browse_type':
-		$browse = new Browse($_GET['browse_id']);
-		$browse->set_filter('object_type', $_GET['type']);
-		$browse->store();
-	break;
-	case 'add_filter':
-		$browse = new Browse($_GET['browse_id']);
-		$browse->set_filter('tag', $_GET['tag_id']);
-		$object_ids = $browse->get_objects();
-		ob_start();
-		$browse->show_objects($object_ids);
-		$results['browse_content'] = ob_get_clean();
-		$browse->store();
-		// Retrieve current objects of type based on combined filters
-	break;
-	default:
-		$results['rfc3514'] = '0x1';
-	break;
+    break;
+    case 'add_tag':
+        Tag::add_tag_map($_GET['type'],$_GET['object_id'],$_GET['tag_id']);
+    break;
+    case 'remove_tag':
+        $tag = new Tag($_GET['tag_id']);
+        $tag->remove_map($_GET['type'],$_GET['object_id']);
+    break;
+    case 'browse_type':
+        $browse = new Browse($_GET['browse_id']);
+        $browse->set_filter('object_type', $_GET['type']);
+        $browse->store();
+    break;
+    case 'add_filter':
+        $browse = new Browse($_GET['browse_id']);
+        $browse->set_filter('tag', $_GET['tag_id']);
+        $object_ids = $browse->get_objects();
+        ob_start();
+        $browse->show_objects($object_ids);
+        $results['browse_content'] = ob_get_clean();
+        $browse->store();
+        // Retrieve current objects of type based on combined filters
+    break;
+    default:
+        $results['rfc3514'] = '0x1';
+    break;
 } // switch on action;
 
 
diff --git a/server/xml.server.php b/server/xml.server.php
index 4dfc124d..ea7b9df6 100644
--- a/server/xml.server.php
+++ b/server/xml.server.php
@@ -1,5 +1,5 @@
 <?php
-/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */
+/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
 /**
  *
  * LICENSE: GNU General Public License, version 2 (GPLv2)
@@ -29,7 +29,7 @@ require_once '../lib/init.php';
 
 // If it's not a handshake then we can allow it to take up lots of time
 if ($_REQUEST['action'] != 'handshake') {
-	set_time_limit(0);
+    set_time_limit(0);
 }
 
 /* Set the correct headers */
@@ -38,10 +38,10 @@ header("Content-Disposition: attachment; filename=information.xml");
 
 // If we don't even have access control on then we can't use this!
 if (!Config::get('access_control')) {
-	ob_end_clean();
-	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;
+    ob_end_clean();
+    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;
 }
 
 /**
@@ -79,15 +79,15 @@ $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)) { continue; }
+    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);
-		// We only allow a single function to be called, and we assume it's cleaned up!
-		exit;
-	}
+    // 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);
+        // We only allow a single function to be called, and we assume it's cleaned up!
+        exit;
+    }
 
 } // end foreach methods in API