Cosmetics: remove trailing whitespace

1 files changed, 129 insertions, 129 deletions

diff --git a/play/index.php b/play/index.php
index 3bc77b96..88e02b84 100644
--- a/play/index.php
+++ b/play/index.php
@@ -3,7 +3,7 @@
 /*
 
  Copyright (c) Ampache.org
- All rights reserved.  
+ All rights reserved.
 
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License v2
@@ -24,63 +24,63 @@
  This is the wrapper for opening music streams from this server.  This script
    will play the local version or redirect to the remote server if that be
    the case.  Also this will update local statistics for songs as well.
-   This is also where it decides if you need to be downsampled. 
+   This is also where it decides if you need to be downsampled.
 */
 define('NO_SESSION','1');
 require_once '../lib/init.php';
 require_once Config::get('prefix') . '/modules/horde/Browser.php';
-ob_end_clean(); 
+ob_end_clean();
 
 /* These parameters had better come in on the url. */
 $uid 		= scrub_in($_REQUEST['uid']);
-$oid	 	= $_REQUEST['song'] ? scrub_in($_REQUEST['song']) : scrub_in($_REQUEST['oid']); 
+$oid	 	= $_REQUEST['song'] ? scrub_in($_REQUEST['song']) : scrub_in($_REQUEST['oid']);
 $sid 		= scrub_in($_REQUEST['ssid']);
-$xml_rpc	= scrub_in($_REQUEST['xml_rpc']); 
-$video		= make_bool($_REQUEST['video']); 
+$xml_rpc	= scrub_in($_REQUEST['xml_rpc']);
+$video		= make_bool($_REQUEST['video']);
 
 /* This is specifically for tmp playlist requests */
 $demo_id	= scrub_in($_REQUEST['demo_id']);
-$random		= scrub_in($_REQUEST['random']); 
+$random		= scrub_in($_REQUEST['random']);
 
 // Parse byte range request
 $n = sscanf($_SERVER['HTTP_RANGE'], "bytes=%d-%d",$start,$end);
 
 /* First things first, if we don't have a uid/oid stop here */
-if (empty($oid) && empty($demo_id) && empty($random)) { 
+if (empty($oid) && empty($demo_id) && empty($random)) {
 	debug_event('Play',"Error: No Object UID Specified, nothing to play",'2');
 	echo "Error: No Object UID Specified, nothing to play";
-	exit; 
+	exit;
 }
 
 // If we're XML-RPC and it's enabled, use system user
-if (isset($xml_rpc) AND Config::get('xml_rpc') AND !isset($uid)) { 
-	$uid = '-1'; 
-} 
+if (isset($xml_rpc) AND Config::get('xml_rpc') AND !isset($uid)) {
+	$uid = '-1';
+}
 
-if (!isset($uid)) { 
-	debug_event('Play','Error: No User specified','2'); 
-	echo "Error: No User Specified"; 
+if (!isset($uid)) {
+	debug_event('Play','Error: No User specified','2');
+	echo "Error: No User Specified";
 	exit;
 }
 
 /* Misc Housework */
 $GLOBALS['user'] = new User($uid);
-Preference::init(); 
+Preference::init();
 
 /* If the user has been disabled (true value) */
 if (make_bool($GLOBALS['user']->disabled)) {
 	debug_event('user_disabled',"Error $user->username is currently disabled, stream access denied",'3');
-	echo "Error: User Disabled"; 
-	exit; 
+	echo "Error: User Disabled";
+	exit;
 }
 
 // If require session is set then we need to make sure we're legit
-if (Config::get('require_session')) { 
-	if (!Config::get('require_localnet_session') AND Access::check_network('network',$GLOBALS['user']->id,'5')) { 
+if (Config::get('require_session')) {
+	if (!Config::get('require_localnet_session') AND Access::check_network('network',$GLOBALS['user']->id,'5')) {
 		// Localnet defined IP and require localnot session has been turned off we let this one through
-		debug_event('LocalNet','Streaming Access Granted to Localnet defined IP ' . $_SERVER['REMOTE_ADDR'],'5'); 
+		debug_event('LocalNet','Streaming Access Granted to Localnet defined IP ' . $_SERVER['REMOTE_ADDR'],'5');
 	}
-	elseif(!Stream::session_exists($sid)) {	
+	elseif(!Stream::session_exists($sid)) {
 		debug_event('session_expired',"Streaming Access Denied: " . $GLOBALS['user']->username . "'s session has expired",'3');
     		die(_("Session Expired: please log in again at") . " " . Config::get('web_path') . "/login.php");
 	}
@@ -98,103 +98,103 @@ $GLOBALS['user']->update_last_seen();
 if (Config::get('demo_mode') || (!Access::check('interface','25') AND !isset($xml_rpc))) {
 	debug_event('access_denied',"Streaming Access Denied:" .Config::get('demo_mode') . "is the value of demo_mode. Current user level is " . $GLOBALS['user']->access,'3');
 	access_denied();
-	exit; 
+	exit;
 }
 
-/* 
-   If they are using access lists let's make sure 
+/*
+   If they are using access lists let's make sure
    that they have enough access to play this mojo
 */
-if (Config::get('access_control')) { 
+if (Config::get('access_control')) {
 	if (!Access::check_network('stream',$GLOBALS['user']->id,'25') AND
-		!Access::check_network('network',$GLOBALS['user']->id,'25')) { 
+		!Access::check_network('network',$GLOBALS['user']->id,'25')) {
 		debug_event('access_denied', "Streaming Access Denied: " . $_SERVER['REMOTE_ADDR'] . " does not have stream level access",'3');
 		access_denied();
-		exit; 
+		exit;
 	}
 } // access_control is enabled
 
-/** 
+/**
  * If we've got a tmp playlist then get the
  * current song, and do any other crazyness
- * we need to 
+ * we need to
  */
-if ($demo_id) { 
+if ($demo_id) {
 	$democratic = new Democratic($demo_id);
-	$democratic->set_parent(); 
+	$democratic->set_parent();
 
 	// If there is a cooldown we need to make sure this song isn't a repeat
-	if (!$democratic->cooldown) { 
+	if (!$democratic->cooldown) {
 		/* This takes into account votes etc and removes the */
 		$oid = $democratic->get_next_object();
-	} 
-	else { 
+	}
+	else {
 		// Pull history
 		$oid = $democratic->get_next_object($song_cool_check);
-		$oids = $democratic->get_cool_songs(); 
-		while (in_array($oid,$oids)) { 
-			$song_cool_check++; 
+		$oids = $democratic->get_cool_songs();
+		while (in_array($oid,$oids)) {
+			$song_cool_check++;
 			$oid = $democratic->get_next_object($song_cool_check);
-			if ($song_cool_check >= '5') { break; } 
+			if ($song_cool_check >= '5') { break; }
 		} // while we've got the 'new' song in old the array
-		
-	} // end if we've got a cooldown 
+
+	} // end if we've got a cooldown
 } // if democratic ID passed
 
 /**
  * if we are doing random let's pull the random object
  */
-if ($random) { 
-	if ($start < 1) { 
-		$oid = Random::get_single_song($_REQUEST['type']); 
+if ($random) {
+	if ($start < 1) {
+		$oid = Random::get_single_song($_REQUEST['type']);
 		// Save this one incase we do a seek
-		$_SESSION['random']['last'] = $oid; 
-	} 
-	else { 
-		$oid = $_SESSION['random']['last']; 
-	} 
-} // if random 
-
-if (!$video) { 
+		$_SESSION['random']['last'] = $oid;
+	}
+	else {
+		$oid = $_SESSION['random']['last'];
+	}
+} // if random
+
+if (!$video) {
 	/* Base Checks passed create the song object */
 	$media = new Song($oid);
 	$media->format();
 }
-else { 
-	$media = new Video($oid); 
-	$media->format(); 
-} 
+else {
+	$media = new Video($oid);
+	$media->format();
+}
 
 // Build up the catalog for our current object
 $catalog = new Catalog($media->catalog);
 
 /* If the song is disabled */
-if (!make_bool($media->enabled)) { 
+if (!make_bool($media->enabled)) {
 	debug_event('Play',"Error: $media->file is currently disabled, song skipped",'5');
 	exit;
 }
 
 // If we are running in Legalize mode, don't play songs already playing
 if (Config::get('lock_songs')) {
-	if (!Stream::check_lock_media($media->id,get_class($media))) { 
-		exit; 
+	if (!Stream::check_lock_media($media->id,get_class($media))) {
+		exit;
 	}
 }
 
 /* Check to see if this is a 'remote' catalog */
 if ($catalog->catalog_type == 'remote') {
 
-	preg_match("/(.+)\/play\/index.+/",$media->file,$match); 
+	preg_match("/(.+)\/play\/index.+/",$media->file,$match);
 
-	$token = xmlRpcClient::ampache_handshake($match['1'],$catalog->key); 
+	$token = xmlRpcClient::ampache_handshake($match['1'],$catalog->key);
 
 	// If we don't get anything back we failed and should bail now
-	if (!$token) { 
-		debug_event('xmlrpc-stream','Error Unable to get Token from ' . $match['1'] . ' check target servers logs','1'); 
-		exit; 
-	} 
+	if (!$token) {
+		debug_event('xmlrpc-stream','Error Unable to get Token from ' . $match['1'] . ' check target servers logs','1');
+		exit;
+	}
 
-	$sid   = xmlRpcClient::ampache_create_stream_session($match['1'],$token); 
+	$sid   = xmlRpcClient::ampache_create_stream_session($match['1'],$token);
 
 	$extra_info = "&xml_rpc=1&sid=$sid";
 	header("Location: " . $media->file . $extra_info);
@@ -213,17 +213,17 @@ if ($catalog->catalog_type == 'remote') {
 } // end if remote catalog
 
 /* If we don't have a file, or the file is not readable */
-if (!$media->file OR !is_readable($media->file)) { 
+if (!$media->file OR !is_readable($media->file)) {
 
 	// We need to make sure this isn't democratic play, if it is then remove the song
 	// from the vote list
-	if (is_object($tmp_playlist)) { 
-		$tmp_playlist->delete_track($oid); 
+	if (is_object($tmp_playlist)) {
+		$tmp_playlist->delete_track($oid);
 	}
 
 	debug_event('Play',"Error song $media->file ($media->title) does not have a valid filename specified",'2');
-	echo "Error: Invalid Song Specified, file not found or file unreadable"; 
-	exit; 
+	echo "Error: Invalid Song Specified, file not found or file unreadable";
+	exit;
 }
 
 // make fread binary safe
@@ -238,48 +238,48 @@ ignore_user_abort(TRUE);
 // Format the song name
 $media_name = $media->f_artist_full . " - " . $media->title . "." . $media->type;
 
-/* If they are just trying to download make sure they have rights 
+/* If they are just trying to download make sure they have rights
  * and then present them with the download file
  */
-if ($_GET['action'] == 'download' AND Config::get('download')) { 
-	
+if ($_GET['action'] == 'download' AND Config::get('download')) {
+
 	// STUPID IE
-	$media->format_pattern(); 
+	$media->format_pattern();
 	$media_name = str_replace(array('?','/','\\'),"_",$media->f_file);
 
 	// Use Horde's Browser class to send the headers
-	header("Content-Length: " . $media->size); 
-	$browser = new Browser(); 
-	$browser->downloadHeaders($media_name,$media->mime,false,$media->size); 
-	$fp = fopen($media->file,'rb'); 
-	$bytesStreamed = 0; 
+	header("Content-Length: " . $media->size);
+	$browser = new Browser();
+	$browser->downloadHeaders($media_name,$media->mime,false,$media->size);
+	$fp = fopen($media->file,'rb');
+	$bytesStreamed = 0;
 
-	if (!is_resource($fp)) { 
+	if (!is_resource($fp)) {
                 debug_event('Play',"Error: Unable to open $media->file for downloading",'2');
-		exit(); 
+		exit();
         }
-		
+
 	// Check to see if we should be throttling because we can get away with it
-	if (Config::get('rate_limit') > 0) { 
-		while (!feof($fp)) { 
-			echo fread($fp,round(Config::get('rate_limit')*1024)); 
-			$bytesStreamed += round(Config::get('rate_limit')*1024); 
-			flush(); 
-			sleep(1); 
-		} 
-	} 
-	else { 
-		fpassthru($fp); 
-	} 
+	if (Config::get('rate_limit') > 0) {
+		while (!feof($fp)) {
+			echo fread($fp,round(Config::get('rate_limit')*1024));
+			$bytesStreamed += round(Config::get('rate_limit')*1024);
+			flush();
+			sleep(1);
+		}
+	}
+	else {
+		fpassthru($fp);
+	}
 
 	// Make sure that a good chunk of the song has been played
 	if ($bytesStreamed >= $media->size) {
         	debug_event('Play','Downloaded, Registering stats for ' . $media->title,'5');
 	        $GLOBALS['user']->update_stats($media->id);
 	} // if enough bytes are streamed
-		
-	fclose($fp); 
-	exit(); 
+
+	fclose($fp);
+	exit();
 
 } // if they are trying to download and they can
 
@@ -288,41 +288,41 @@ $browser = new Browser();
 header("Accept-Ranges: bytes" );
 
 // Prevent the script from timing out
-set_time_limit(0);			
+set_time_limit(0);
 
 /* We're about to start record this persons IP */
-if (Config::get('track_user_ip')) { 
+if (Config::get('track_user_ip')) {
 	$GLOBALS['user']->insert_ip_history();
 }
 
 // If we've got downsample remote enabled
-if (Config::get('downsample_remote')) { 
-	if (!Access::check_network('network',$GLOBALS['user']->id,'0')) { 
-		debug_event('Downsample','Network Downsample ' . $_SERVER['REMOTE_ADDR'] . ' is not in Local definition','5'); 
+if (Config::get('downsample_remote')) {
+	if (!Access::check_network('network',$GLOBALS['user']->id,'0')) {
+		debug_event('Downsample','Network Downsample ' . $_SERVER['REMOTE_ADDR'] . ' is not in Local definition','5');
 		$not_local = true;
 	}
 } // if downsample remote is enabled
 
 // If they are downsampling, or if the song is not a native stream or it's non-local
-if ((Config::get('transcode') == 'always' || !$media->native_stream() || $not_local) && Config::get('transcode') != 'never') { 
+if ((Config::get('transcode') == 'always' || !$media->native_stream() || $not_local) && Config::get('transcode') != 'never') {
         debug_event('Downsample','Starting Downsample {Transcode:' . Config::get('transcode') . '} {Native Stream:' . $media->native_stream() .'} {Not Local:' . $not_local . '}','5');
 	$fp = Stream::start_downsample($media,$lastid,$media_name,$start);
 	$media_name = $media->f_artist_full . " - " . $media->title . "." . $media->type;
 	// Note that this is downsampling
-	$downsampled_song = true; 
+	$downsampled_song = true;
 } // end if downsampling
-else { 
+else {
 	// Send file, possible at a byte offset
 	$fp = fopen($media->file, 'rb');
-	
-	if (!is_resource($fp)) { 
+
+	if (!is_resource($fp)) {
 		debug_event('Play',"Error: Unable to open $media->file for reading",'2');
 		cleanup_and_exit($lastid);
 	}
 } // else not downsampling
 
-// Put this song in the now_playing table only if it's a song for now... 
-if (get_class($media) == 'Song') { 
+// Put this song in the now_playing table only if it's a song for now...
+if (get_class($media) == 'Song') {
 	Stream::insert_now_playing($media->id,$uid,$media->time,$sid,get_class($media));
 }
 
@@ -332,16 +332,16 @@ if ($start > 0) {
 	if(isset($end)) {
 		$end = min($end,$media->size-1);
 		$stream_size = ($end-$start)+1;
-	} 
+	}
 	else {
 		$stream_size = $media->size - $start;
 	}
-	
+
 	debug_event('Play','Content-Range header recieved, skipping ahead ' . $start . ' bytes out of ' . $media->size,'5');
 	$browser->downloadHeaders($media_name, $media->mime, false, $media->size);
-	if (!$downsampled_song) { 
+	if (!$downsampled_song) {
 		fseek( $fp, $start );
-	} 
+	}
 	$range = $start ."-". $end . "/" . $media->size;
 	header("HTTP/1.1 206 Partial Content");
 	header("Content-Range: bytes $range");
@@ -350,22 +350,22 @@ if ($start > 0) {
 
 /* Last but not least pump em out */
 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');
 	header("Content-Length: $media->size");
 	$browser->downloadHeaders($media_name, $media->mime, false, $media->size);
-	$stream_size = $media->size; 
+	$stream_size = $media->size;
 }
-	
-/* Let's force them to actually play a portion of the song before 
+
+/* Let's force them to actually play a portion of the song before
  * we count it in the statistics
  */
 $bytes_streamed = 0;
 $min_bytes_streamed = $media->size / 2;
 
-// Actually do the streaming 
+// Actually do the streaming
 do {
-	$read_size = min(2048,$stream_size-$bytes_streamed); 
-	if ($read_size < 1) { break; } 
+	$read_size = min(2048,$stream_size-$bytes_streamed);
+	if ($read_size < 1) { break; }
 	$buf = fread($fp, $read_size);
 	print($buf);
 	$bytes_streamed += strlen($buf);
@@ -378,16 +378,16 @@ if($bytes_streamed < $stream_size AND (connection_status() == 0)) {
 
 // Make sure that a good chunk of the song has been played
 if ($bytes_streamed > $min_bytes_streamed AND get_class($media) == 'Song') {
-	debug_event('Play','Registering stats for ' . $media->title,'5'); 
-	
+	debug_event('Play','Registering stats for ' . $media->title,'5');
+
         $GLOBALS['user']->update_stats($media->id);
 	/* Set the Song as Played if it isn't already */
 	$media->set_played();
 
 } // if enough bytes are streamed
-else { 
-	debug_event('Play',$bytes_streamed .' of ' . $media->size . ' streamed, less than ' . $min_bytes_streamed . ' not collecting stats','5'); 
-} 
+else {
+	debug_event('Play',$bytes_streamed .' of ' . $media->size . ' streamed, less than ' . $min_bytes_streamed . ' not collecting stats','5');
+}
 
 
 /* If this is a voting tmp playlist remove the entry, we do this regardless of play amount */
@@ -400,14 +400,14 @@ if ($demo_id) {
 } // if tmp_playlist
 
 /* Clean up any open ends */
-if (Config::get('play_type') == 'downsample' || !$media->native_stream()) { 
+if (Config::get('play_type') == 'downsample' || !$media->native_stream()) {
 	@pclose($fp);
-} 
-else { 
+}
+else {
 	@fclose($fp);
 }
 
 // Note that the stream has ended
-debug_event('Play','Stream Ended at ' . $bytes_streamed . ' bytes out of ' . $media->size,'5'); 
+debug_event('Play','Stream Ended at ' . $bytes_streamed . ' bytes out of ' . $media->size,'5');
 
 ?>