Cosmetics: remove trailing whitespace

1 files changed, 167 insertions, 167 deletions

diff --git a/lib/class/access.class.php b/lib/class/access.class.php
index 3652715d..7f986fef 100644
--- a/lib/class/access.class.php
+++ b/lib/class/access.class.php
@@ -16,10 +16,10 @@
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA. 
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-/** 
+/**
  * Access Class
  * This class handles the access list mojo for Ampache, it is ment to restrict
  * access based on IP and maybe something else in the future
@@ -38,7 +38,7 @@ class Access {
 
 	/**
 	 * constructor
-	 * Takes an ID of the access_id dealie :) 
+	 * Takes an ID of the access_id dealie :)
 	 */
 	public function __construct($access_id='') {
 
@@ -48,9 +48,9 @@ class Access {
 		$this->id = intval($access_id);
 
 		$info = $this->_get_info();
-		foreach ($info as $key=>$value) { 
-			$this->$key = $value; 
-		} 
+		foreach ($info as $key=>$value) {
+			$this->$key = $value;
+		}
 
 		return true;
 
@@ -58,7 +58,7 @@ class Access {
 
 	/**
 	 * _get_info
-	 * get's the vars for $this out of the database 
+	 * get's the vars for $this out of the database
 	 * Taken from the object
 	 */
 	private function _get_info() {
@@ -75,16 +75,16 @@ class Access {
 
 	/**
 	 * format
-	 * This makes the Access object a nice fuzzy human readable object, spiffy ain't it. 
+	 * This makes the Access object a nice fuzzy human readable object, spiffy ain't it.
 	 */
-	public function format() { 
+	public function format() {
 
-		$this->f_start = inet_ntop($this->start); 
-		$this->f_end = inet_ntop($this->end); 
+		$this->f_start = inet_ntop($this->start);
+		$this->f_end = inet_ntop($this->end);
 
-		$this->f_user = $this->get_user_name(); 
-		$this->f_level = $this->get_level_name(); 
-		$this->f_type = $this->get_type_name(); 
+		$this->f_user = $this->get_user_name();
+		$this->f_level = $this->get_level_name();
+		$this->f_type = $this->get_type_name();
 
 	} // format
 
@@ -92,7 +92,7 @@ class Access {
 	 * update
 	 * This function takes a named array as a datasource and updates the current access list entry
 	 */
-	public function update($data) { 
+	public function update($data) {
 
 		/* We need to verify the incomming data a littlebit */
 		$start = @inet_pton($data['start']);
@@ -113,16 +113,16 @@ class Access {
 			return false;
 		}
 
-		$name	= Dba::escape($data['name']); 
-		$type	= self::validate_type($data['type']); 
+		$name	= Dba::escape($data['name']);
+		$type	= self::validate_type($data['type']);
 		$start 	= Dba::escape(inet_pton($data['start']));
-		$end	= Dba::escape(inet_pton($data['end'])); 
+		$end	= Dba::escape(inet_pton($data['end']));
 		$level	= Dba::escape($data['level']);
-		$user	= $data['user'] ? Dba::escape($data['user']) : '-1'; 
-		$enabled = make_bool($data['enabled']); 
-		
-		$sql = "UPDATE `access_list` " . 
-			"SET `start`='$start', `end`='$end', `level`='$level', `user`='$user', " . 
+		$user	= $data['user'] ? Dba::escape($data['user']) : '-1';
+		$enabled = make_bool($data['enabled']);
+
+		$sql = "UPDATE `access_list` " .
+			"SET `start`='$start', `end`='$end', `level`='$level', `user`='$user', " .
 			"`name`='$name', `type`='$type',`enabled`='$enabled' WHERE `id`='" . Dba::escape($this->id) . "'";
 		$db_results = Dba::write($sql);
 
@@ -132,45 +132,45 @@ class Access {
 
 	/**
 	 * create
-	 * This takes a key'd array of data and trys to insert it as a 
+	 * This takes a key'd array of data and trys to insert it as a
 	 * new ACL entry
 	 */
-	public static function create($data) { 
+	public static function create($data) {
 
 		/* We need to verify the incomming data a littlebit */
-		$start = @inet_pton($data['start']); 
-		$end = @inet_pton($data['end']); 
-
-		if (!$start AND $data['start'] != '0.0.0.0' AND $data['start'] != '::') { 
-			Error::add('start',_('Invalid IPv4 / IPv6 Address Entered')); 
-			return false; 
-		} 
-		if (!$end) { 
-			Error::add('end',_('Invalid IPv4 / IPv6 Address Entered')); 
-			return false; 
-		} 
-
-		if (strlen(bin2hex($start)) != strlen(bin2hex($end))) { 
-			Error::add('start',_('IP Address Version Mismatch')); 
-			Error::add('end',_('IP Address Version Mismatch')); 
-			return false; 
-		} 
+		$start = @inet_pton($data['start']);
+		$end = @inet_pton($data['end']);
+
+		if (!$start AND $data['start'] != '0.0.0.0' AND $data['start'] != '::') {
+			Error::add('start',_('Invalid IPv4 / IPv6 Address Entered'));
+			return false;
+		}
+		if (!$end) {
+			Error::add('end',_('Invalid IPv4 / IPv6 Address Entered'));
+			return false;
+		}
+
+		if (strlen(bin2hex($start)) != strlen(bin2hex($end))) {
+			Error::add('start',_('IP Address Version Mismatch'));
+			Error::add('end',_('IP Address Version Mismatch'));
+			return false;
+		}
 
 		// Check existing ACL's to make sure we're not duplicating values here
-		if (self::exists($data)) { 
-			debug_event('ACL Create','Error did not create duplicate ACL entrie for ' . $data['start'] . ' - ' . $data['end'],'1'); 
-			return false; 
-		} 
+		if (self::exists($data)) {
+			debug_event('ACL Create','Error did not create duplicate ACL entrie for ' . $data['start'] . ' - ' . $data['end'],'1');
+			return false;
+		}
 
-		$start 	= Dba::escape($start); 
+		$start 	= Dba::escape($start);
 		$end 	= Dba::escape($end);
 		$name	= Dba::escape($data['name']);
-		$user	= $data['user'] ? Dba::escape($data['user']) : '-1'; 
+		$user	= $data['user'] ? Dba::escape($data['user']) : '-1';
 		$level	= intval($data['level']);
 		$type	= self::validate_type($data['type']);
-		$enabled = make_bool($data['enabled']); 
+		$enabled = make_bool($data['enabled']);
 
-		$sql = "INSERT INTO `access_list` (`name`,`level`,`start`,`end`,`user`,`type`,`enabled`) " . 
+		$sql = "INSERT INTO `access_list` (`name`,`level`,`start`,`end`,`user`,`type`,`enabled`) " .
 			"VALUES ('$name','$level','$start','$end','$user','$type','$enabled')";
 		$db_results = Dba::write($sql);
 
@@ -182,22 +182,22 @@ class Access {
 	 * exists
 	 * this sees if the ACL that we've specified already exists, prevent duplicates. This ignores the name
 	 */
-	public static function exists($data) { 
+	public static function exists($data) {
 
-		$start = Dba::escape(inet_pton($data['start'])); 
-		$end = Dba::escape(inet_pton($data['end'])); 
-		$type = self::validate_type($data['type']); 
-		$user = $data['user'] ? Dba::escape($data['user']) : '-1'; 
+		$start = Dba::escape(inet_pton($data['start']));
+		$end = Dba::escape(inet_pton($data['end']));
+		$type = self::validate_type($data['type']);
+		$user = $data['user'] ? Dba::escape($data['user']) : '-1';
 
-		$sql = "SELECT * FROM `access_list` WHERE `start`='$start' AND `end` = '$end' " . 
-			"AND `type`='$type' AND `user`='$user'"; 
-		$db_results = Dba::read($sql); 
+		$sql = "SELECT * FROM `access_list` WHERE `start`='$start' AND `end` = '$end' " .
+			"AND `type`='$type' AND `user`='$user'";
+		$db_results = Dba::read($sql);
 
-		if (Dba::fetch_assoc($db_results)) { 
-			return true; 
-		} 
+		if (Dba::fetch_assoc($db_results)) {
+			return true;
+		}
 
-		return false; 
+		return false;
 
 	} // exists
 
@@ -205,23 +205,23 @@ class Access {
 	 * delete
 	 * deletes the specified access_list entry
 	 */
-	public static function delete($access_id) { 
+	public static function delete($access_id) {
 
 		$sql = "DELETE FROM `access_list` WHERE `id`='" . Dba::escape($access_id) . "'";
 		$db_results = Dba::write($sql);
 
 	} // delete
-	
+
 	/**
 	 * check_function
 	 * This checks if a specific functionality is enabled
 	 * it takes a type only
 	 */
-	public static function check_function($type) { 
+	public static function check_function($type) {
 
-		switch ($type) { 
-			case 'download': 
-				return Config::get('download'); 
+		switch ($type) {
+			case 'download':
+				return Config::get('download');
 			break ;
 			case 'batch_download':
 				if (!function_exists('gzcompress')) {
@@ -233,37 +233,37 @@ class Access {
 				}
 			break;
 			default:
-				return false; 
+				return false;
 			break;
-		} // end switch			
+		} // end switch
 
 	} // check_function
 
 	/**
 	 * check_network
-	 * This takes a type, ip, user, level and key 
+	 * This takes a type, ip, user, level and key
 	 * and then returns true or false if they have access to this
 	 * the IP is passed as a dotted quad
 	 */
-	public static function check_network($type,$user,$level,$ip='') { 
-
-		if (!Config::get('access_control')) { 
-			switch ($type) { 
-				case 'interface': 
-				case 'stream': 
-					return true; 
-				break; 
-				default: 
-					return false; 
+	public static function check_network($type,$user,$level,$ip='') {
+
+		if (!Config::get('access_control')) {
+			switch ($type) {
+				case 'interface':
+				case 'stream':
+					return true;
+				break;
+				default:
+					return false;
 			} // end switch
 		} // end if access control is turned off
 
 		// Clean incomming variables
-		$ip 	= $ip ? Dba::escape(inet_pton($ip)) : Dba::escape(inet_pton($_SERVER['REMOTE_ADDR'])); 
+		$ip 	= $ip ? Dba::escape(inet_pton($ip)) : Dba::escape(inet_pton($_SERVER['REMOTE_ADDR']));
 		$user 	= Dba::escape($user);
 		$level	= Dba::escape($level);
 
-		switch ($type) { 
+		switch ($type) {
 			/* This is here because we want to at least check IP before even creating the xml-rpc server
 			 * however we don't have the key that was passed yet so we've got to do just ip
 			 */
@@ -272,39 +272,39 @@ class Access {
 				$sql = "SELECT `id` FROM `access_list`" .
 					" WHERE `start` <= '$ip' AND `end` >= '$ip' AND `type`='rpc' AND `level` >= '$level'";
 			break;
-			case 'rpc': 
+			case 'rpc':
 			case 'xml-rpc':
-				$sql = "SELECT `id` FROM `access_list`" . 
-					" WHERE `start` <= '$ip' AND `end` >= '$ip'" . 
+				$sql = "SELECT `id` FROM `access_list`" .
+					" WHERE `start` <= '$ip' AND `end` >= '$ip'" .
 					" AND `level` >= '$level' AND `type`='rpc'";
 			break;
 			case 'init-api':
 				$type = 'rpc';
-				if ($user) { 
-					$client = User::get_from_username($user); 
-					$user = $client->id; 
-				} 
+				if ($user) {
+					$client = User::get_from_username($user);
+					$user = $client->id;
+				}
 			case 'network':
 			case 'interface':
 			case 'stream':
 			default:
-				$sql = "SELECT `id` FROM `access_list`" . 
+				$sql = "SELECT `id` FROM `access_list`" .
 					" WHERE `start` <= '$ip' AND `end` >= '$ip'" .
 					" AND `level` >= '$level' AND `type` = '$type'";
 				if (strlen($user)) { $sql .= " AND (`user` = '$user' OR `user` = '-1')"; }
 				else { $sql .= " AND `user` = '-1'"; }
 			break;
 		} // end switch on type
-		
+
 		$db_results = Dba::read($sql);
 
 		// Yah they have access they can use the mojo
-		if (Dba::fetch_row($db_results)) { 
+		if (Dba::fetch_row($db_results)) {
 			return true;
 		}
 
 		// No Access Sucks to be them.
-		else { 
+		else {
 			return false;
 		}
 
@@ -315,40 +315,40 @@ class Access {
 	 * This is the global 'has_access' function it can check for any 'type' of object
 	 * everything uses the global 0,5,25,50,75,100 stuff. GLOBALS['user'] is always used
 	 */
-	public static function check($type,$level) { 
+	public static function check($type,$level) {
 
-		if (Config::get('demo_mode')) { return true; } 
-		if (INSTALL == '1') { return true; } 
+		if (Config::get('demo_mode')) { return true; }
+		if (INSTALL == '1') { return true; }
 
-		$level = intval($level); 
+		$level = intval($level);
 
 		// Switch on the type
-		switch ($type) { 
-			case 'localplay': 
-				// Check their localplay_level 
-				if (Config::get('localplay_level') >= $level OR $GLOBALS['user']->access >= '100') { 
-					return true; 
-				} 
-				else { 
-					return false; 
-				} 
+		switch ($type) {
+			case 'localplay':
+				// Check their localplay_level
+				if (Config::get('localplay_level') >= $level OR $GLOBALS['user']->access >= '100') {
+					return true;
+				}
+				else {
+					return false;
+				}
 			break;
-			case 'interface': 
+			case 'interface':
 				// Check their standard user level
-				if ($GLOBALS['user']->access >= $level) { 
-					return true; 
-				} 
-				else { 
-					return false; 
-				} 
+				if ($GLOBALS['user']->access >= $level) {
+					return true;
+				}
+				else {
+					return false;
+				}
 			break;
 			default:
-				return false; 
-			break; 
+				return false;
+			break;
 		} // end switch on type
 
 		// Default false
-		return false; 
+		return false;
 
 	} // check
 
@@ -356,9 +356,9 @@ class Access {
 	 * validate_type
 	 * This cleans up and validates the specified type
 	 */
-	public static function validate_type($type) { 
+	public static function validate_type($type) {
 
-		switch($type) { 
+		switch($type) {
 			case 'rpc':
 			case 'interface':
 			case 'network':
@@ -366,8 +366,8 @@ class Access {
 			break;
 			case 'xml-rpc':
 				return 'rpc';
-			break; 
-			default: 
+			break;
+			default:
 				return 'stream';
 			break;
 		} // end switch
@@ -378,13 +378,13 @@ class Access {
 	 * get_access_lists
 	 * returns a full listing of all access rules on this server
 	 */
-	public static function get_access_lists() { 
+	public static function get_access_lists() {
 
 		$sql = "SELECT `id` FROM `access_list`";
 		$db_results = Dba::read($sql);
-	
-		$results = array(); 
-	
+
+		$results = array();
+
 		// Man this is the wrong way to do it...
 		while ($row = Dba::fetch_assoc($db_results)) {
 			$results[] = $row['id'];
@@ -395,22 +395,22 @@ class Access {
 	} // get_access_lists
 
 
-	/** 
+	/**
 	 * get_level_name
 	 * take the int level and return a named level
 	 */
-	public function get_level_name() { 
+	public function get_level_name() {
 
-		if ($this->level >= '75') { 
+		if ($this->level >= '75') {
 			return _('All');
 		}
-		if ($this->level == '5') { 
-			return _('View'); 
+		if ($this->level == '5') {
+			return _('View');
 		}
-		if ($this->level == '25') { 
+		if ($this->level == '25') {
 			return _('Read');
 		}
-		if ($this->level == '50') { 
+		if ($this->level == '50') {
 			return _('Read/Write');
 		}
 
@@ -420,23 +420,23 @@ class Access {
  	 * get_user_name
 	 * Take a user and return their full name
 	 */
-	public function get_user_name() { 
+	public function get_user_name() {
+
+		if ($this->user == '-1') { return _('All'); }
 
-		if ($this->user == '-1') { return _('All'); } 
-		
 		$user = new User($this->user);
 		return $user->fullname . " (" . $user->username . ")";
-		
+
 	} // get_user_name
 
 	/**
 	 * get_type_name
 	 * This function returns the pretty name for our current type
 	 */
-	public function get_type_name() { 
+	public function get_type_name() {
 
-		switch ($this->type) { 
-			case 'xml-rpc': 
+		switch ($this->type) {
+			case 'xml-rpc':
 			case 'rpc':
 				return _('API/RPC');
 			break;
@@ -447,7 +447,7 @@ class Access {
 				return _('Web Interface');
 			break;
 			case 'stream':
-			default: 
+			default:
 				return _('Stream Access');
 			break;
 		} // end switch
@@ -460,35 +460,35 @@ class Access {
 	 * exists, it also provides an array of key'd data that may be required
 	 * based on the type
 	 */
-	public static function session_exists($data,$key,$type) { 
+	public static function session_exists($data,$key,$type) {
 
 		// Switch on the type they pass
-		switch ($type) { 
-			case 'api': 
-				$key = Dba::escape($key); 
-				$time = time(); 
-				$sql = "SELECT * FROM `session_api` WHERE `id`='$key' AND `expire` > '$time'"; 
-				$db_results = Dba::read($sql); 
-		
-				if (Dba::num_rows($db_results)) { 
-					$time = $time + 3600; 
-					$sql = "UPDATE `session_api` WHERE `id`='$key' SET `expire`='$time'"; 
-					$db_results = Dba::write($sql); 
-					return true; 
-				} 
-
-				return false; 
-
-			break; 
-			case 'stream': 
-		
-			break; 
-			case 'interface': 
-
-			break; 
-			default: 
-				return false; 
-			break; 
+		switch ($type) {
+			case 'api':
+				$key = Dba::escape($key);
+				$time = time();
+				$sql = "SELECT * FROM `session_api` WHERE `id`='$key' AND `expire` > '$time'";
+				$db_results = Dba::read($sql);
+
+				if (Dba::num_rows($db_results)) {
+					$time = $time + 3600;
+					$sql = "UPDATE `session_api` WHERE `id`='$key' SET `expire`='$time'";
+					$db_results = Dba::write($sql);
+					return true;
+				}
+
+				return false;
+
+			break;
+			case 'stream':
+
+			break;
+			case 'interface':
+
+			break;
+			default:
+				return false;
+			break;
 		} // type