1 files changed, 99 insertions, 99 deletions

diff --git a/modules/plugins/Lastfm.plugin.php b/modules/plugins/Lastfm.plugin.php
index 99ac5fd7..24f9862f 100644
--- a/modules/plugins/Lastfm.plugin.php
+++ b/modules/plugins/Lastfm.plugin.php
@@ -20,31 +20,31 @@
 
 */
 
-class AmpacheLastfm { 
+class AmpacheLastfm {
 
-	public $name		='Last.FM'; 
-	public $description	='Records your played songs to your Last.FM Account'; 
+	public $name		='Last.FM';
+	public $description	='Records your played songs to your Last.FM Account';
 	public $url		='';
 	public $version		='000003';
 	public $min_ampache	='340007';
 	public $max_ampache	='340008';
 
-	// These are internal settings used by this class, run this->load to 
+	// These are internal settings used by this class, run this->load to
 	// fill em out
-	private $username; 
-	private $password; 
+	private $username;
+	private $password;
 	private $hostname;
-	private $port; 
-	private $path; 
+	private $port;
+	private $path;
 	private $challenge;
 
 	/**
 	 * Constructor
 	 * This function does nothing...
 	 */
-	public function __construct() { 
+	public function __construct() {
 
-		return true; 
+		return true;
 
 	} // PluginLastfm
 
@@ -53,19 +53,19 @@ class AmpacheLastfm {
 	 * This is a required plugin function it inserts the required preferences
 	 * into Ampache
 	 */
-	public function install() { 
+	public function install() {
 
 		// Check and see if it's already installed (they've just hit refresh, those dorks)
-		if (Preference::exists('lastfm_user')) { return false; } 
+		if (Preference::exists('lastfm_user')) { return false; }
 
-		Preference::insert('lastfm_user','Last.FM Username','','25','string','plugins'); 
-		Preference::insert('lastfm_pass','Last.FM Password','','25','string','plugins'); 
-		Preference::insert('lastfm_port','Last.FM Submit Port','','25','string','internal'); 
-		Preference::insert('lastfm_host','Last.FM Submit Host','','25','string','internal'); 
-		Preference::insert('lastfm_url','Last.FM Submit URL','','25','string','internal'); 
-		Preference::insert('lastfm_challenge','Last.FM Submit Challenge','','25','string','internal'); 
+		Preference::insert('lastfm_user','Last.FM Username','','25','string','plugins');
+		Preference::insert('lastfm_pass','Last.FM Password','','25','string','plugins');
+		Preference::insert('lastfm_port','Last.FM Submit Port','','25','string','internal');
+		Preference::insert('lastfm_host','Last.FM Submit Host','','25','string','internal');
+		Preference::insert('lastfm_url','Last.FM Submit URL','','25','string','internal');
+		Preference::insert('lastfm_challenge','Last.FM Submit Challenge','','25','string','internal');
 
-		return true; 
+		return true;
 
 	} // install
 
@@ -74,14 +74,14 @@ class AmpacheLastfm {
 	 * This is a required plugin function it removes the required preferences from
 	 * the database returning it to its origional form
 	 */
-	public function uninstall() { 
+	public function uninstall() {
 
-		Preference::delete('lastfm_pass'); 
-		Preference::delete('lastfm_user'); 
-		Preference::delete('lastfm_url'); 
-		Preference::delete('lastfm_host'); 
-		Preference::delete('lastfm_port'); 
-		Preference::delete('lastfm_challenge'); 
+		Preference::delete('lastfm_pass');
+		Preference::delete('lastfm_user');
+		Preference::delete('lastfm_url');
+		Preference::delete('lastfm_host');
+		Preference::delete('lastfm_port');
+		Preference::delete('lastfm_challenge');
 
 	} // uninstall
 
@@ -90,76 +90,76 @@ class AmpacheLastfm {
 	 * This takes care of queueing and then submiting the tracks eventually this will make sure
 	 * that you've haven't
 	 */
-	public function submit($song,$user_id) { 
+	public function submit($song,$user_id) {
 
 		// Before we start let's pull the last song submited by this user
-		$previous = Stats::get_last_song($user_id); 
+		$previous = Stats::get_last_song($user_id);
+
+		$diff = time() - $previous['date'];
 
-		$diff = time() - $previous['date']; 
-		
 		// Make sure it wasn't within the last min
-		if ($diff < 60) { 
-			debug_event('LastFM','Last song played within ' . $diff . ' seconds, not recording stats','3'); 
-			return false; 
-		} 
+		if ($diff < 60) {
+			debug_event('LastFM','Last song played within ' . $diff . ' seconds, not recording stats','3');
+			return false;
+		}
 
-		if ($song->time < 30) { 
-			debug_event('LastFM','Song less then 30 seconds not queueing','3'); 
-			return false; 
-		} 
+		if ($song->time < 30) {
+			debug_event('LastFM','Song less then 30 seconds not queueing','3');
+			return false;
+		}
 
 		// Make sure there's actually a username and password before we keep going
-		if (!$this->username || !$this->password) { return false; } 
-		
+		if (!$this->username || !$this->password) { return false; }
+
 		// Create our scrobbler with everything this time and then queue it
-		$scrobbler = new scrobbler($this->username,$this->password,$this->hostname,$this->port,$this->path,$this->challenge); 
+		$scrobbler = new scrobbler($this->username,$this->password,$this->hostname,$this->port,$this->path,$this->challenge);
 
 		// Check to see if the scrobbling works
-		if (!$scrobbler->queue_track($song->f_artist_full,$song->f_album_full,$song->title,time(),$song->time,$song->track)) { 
+		if (!$scrobbler->queue_track($song->f_artist_full,$song->f_album_full,$song->title,time(),$song->time,$song->track)) {
 			// Depending on the error we might need to do soemthing here
-			return false; 
-		} 
-		
-		// Go ahead and submit it now	
-		if (!$scrobbler->submit_tracks()) { 
-			debug_event('LastFM','Error Submit Failed: ' . $scrobbler->error_msg,'3'); 
-			if ($scrobbler->reset_handshake) { 
+			return false;
+		}
+
+		// Go ahead and submit it now
+		if (!$scrobbler->submit_tracks()) {
+			debug_event('LastFM','Error Submit Failed: ' . $scrobbler->error_msg,'3');
+			if ($scrobbler->reset_handshake) {
 				debug_event('LastFM','Re-running Handshake due to error','3');
-				$this->set_handshake($user_id); 
+				$this->set_handshake($user_id);
 				// Try try again
-				if ($scrobbler->submit_tracks()) { 
-					return true; 
-				} 
-			} 
-			return false; 
+				if ($scrobbler->submit_tracks()) {
+					return true;
+				}
+			}
+			return false;
 		}
 
-		debug_event('LastFM','Submission Successful','5'); 
-		
-		return true; 
+		debug_event('LastFM','Submission Successful','5');
+
+		return true;
 
 	} // submit
 
-	/** 
+	/**
 	 * set_handshake
 	 * This runs a handshake and properly updates the preferences as needed, it returns the data
-	 * as an array so we don't have to requery the db. This requires a userid so it knows who's 
+	 * as an array so we don't have to requery the db. This requires a userid so it knows who's
 	 * crap to update
 	 */
-	public function set_handshake($user_id) { 
-	
-		$scrobbler = new scrobbler($this->username,$this->password); 
-		$data = $scrobbler->handshake(); 
+	public function set_handshake($user_id) {
+
+		$scrobbler = new scrobbler($this->username,$this->password);
+		$data = $scrobbler->handshake();
 
-		if (!$data) { 
-			debug_event('LastFM','Handshake Failed: ' . $scrobbler->error_msg,'3'); 
-			return false; 
-		} 
+		if (!$data) {
+			debug_event('LastFM','Handshake Failed: ' . $scrobbler->error_msg,'3');
+			return false;
+		}
 
-		$this->hostname = $data['submit_host']; 
-		$this->port = $data['submit_port']; 
-		$this->path = $data['submit_url']; 
-		$this->challenge = $data['challenge']; 
+		$this->hostname = $data['submit_host'];
+		$this->port = $data['submit_port'];
+		$this->path = $data['submit_url'];
+		$this->challenge = $data['challenge'];
 
                 // Update the preferences
                 Preference::update('lastfm_port',$user_id,$data['submit_port']);
@@ -167,7 +167,7 @@ class AmpacheLastfm {
                 Preference::update('lastfm_url',$user_id,$data['submit_url']);
                 Preference::update('lastfm_challenge',$user_id,$data['challenge']);
 
-		return true; 
+		return true;
 
 	} // set_handshake
 
@@ -176,40 +176,40 @@ class AmpacheLastfm {
 	 * This loads up the data we need into this object, this stuff comes from the preferences
 	 * it's passed as a key'd array
 	 */
-	public function load($data,$user_id) { 
-
-		if (strlen(trim($data['lastfm_user']))) { 
-			$this->username = trim($data['lastfm_user']); 
-		} 
-		else { 
-			debug_event('LastFM','No Username, not scrobbling','3'); 
-			return false; 
-		} 
-		if (strlen(trim($data['lastfm_pass']))) { 
-			$this->password = trim($data['lastfm_pass']); 
-		} 
-		else { 
-			debug_event('LastFM','No Password, not scrobbling','3'); 
-			return false; 
-		} 
+	public function load($data,$user_id) {
+
+		if (strlen(trim($data['lastfm_user']))) {
+			$this->username = trim($data['lastfm_user']);
+		}
+		else {
+			debug_event('LastFM','No Username, not scrobbling','3');
+			return false;
+		}
+		if (strlen(trim($data['lastfm_pass']))) {
+			$this->password = trim($data['lastfm_pass']);
+		}
+		else {
+			debug_event('LastFM','No Password, not scrobbling','3');
+			return false;
+		}
 
 		// If we don't have the other stuff try to get it before giving up
-		if (!$data['lastfm_host'] || !$data['lastfm_port'] || !$data['lastfm_url'] || !$data['lastfm_challenge']) { 
-			debug_event('LastFM','Running Handshake, missing information','3'); 
-			if (!$this->set_handshake($user_id)) { 
+		if (!$data['lastfm_host'] || !$data['lastfm_port'] || !$data['lastfm_url'] || !$data['lastfm_challenge']) {
+			debug_event('LastFM','Running Handshake, missing information','3');
+			if (!$this->set_handshake($user_id)) {
 				debug_event('LastFM','Handshake failed, you lose','3');
-				return false; 
-			} 
-		}  
-		else { 
+				return false;
+			}
+		}
+		else {
 	                $this->hostname = $data['lastfm_host'];
 	                $this->port = $data['lastfm_port'];
 	                $this->path = $data['lastfm_url'];
 	                $this->challenge = $data['lastfm_challenge'];
-		} 
-		
+		}
+
 
-		return true; 	
+		return true;
 
 	} // load