Some minor bug fixes

lib/Feed.php

@@ -30,9 +30,6 @@ class Feed extends PhpObject {
 
 	//Timezone
 	const TIMEZONE_HOOK = 'http://api.geonames.org/timezoneJSON';
-	const TIMEZONE_PARAM = array(
-		'username'	=> Settings::TIMEZONE_USER
-	);
 	
 	//DB Tables
 	const SPOT_TABLE = 'spots';
@@ -235,10 +232,10 @@ class Feed extends PhpObject {
 						'type'						=> $asMsg['messageType'],
 						'latitude'					=> $asMsg['latitude'],
 						'longitude'					=> $asMsg['longitude'],
-						'iso_time'					=> $asMsg['dateTime'],								//ISO 8601 time (backup)
-						'site_time'					=> date(Db::TIMESTAMP_FORMAT, $asMsg['unixTime']),	//Conversion to Site Time
-						'timezone'					=> $this->getTimeZone(array($asMsg['latitude'], $asMsg['longitude']), $asMsg['unixTime']),
-						'unix_time'					=> $asMsg['unixTime'], 								//UNIX Time (backup)
+						'iso_time'					=> $asMsg['dateTime'],											//ISO 8601 time (backup)
+						'site_time'					=> date(Db::TIMESTAMP_FORMAT, $asMsg['unixTime']),				//Conversion to Site Time
+						'timezone'					=> $this->getTimeZone($asMsg['latitude'], $asMsg['longitude']),	//Get message time zone
+						'unix_time'					=> $asMsg['unixTime'], 											//UNIX Time (backup)
 						'content'					=> $asMsg['messageContent'],
 						'battery_state'				=> $asMsg['batteryState']
 					);
@@ -291,10 +288,12 @@ class Feed extends PhpObject {
 		);
 	}
 
-	private function getTimeZone($asLatLng, $iTimeStamp) {
-		$asParams = self::TIMEZONE_PARAM;
-		$asParams['lat'] = $asLatLng[0];
-		$asParams['lng'] = $asLatLng[1];
+	private function getTimeZone($iLat, $iLng) {
+		$asParams = array(
+			'username'	=> Settings::TIMEZONE_USER,
+			'lat'		=> $iLat,
+			'lng'		=> $iLng
+		);
 		$sApiUrl = self::TIMEZONE_HOOK.'?'.http_build_query($asParams);
 
 		$asTimeZone = json_decode(file_get_contents($sApiUrl), true);

lib/Livetrail.php

@@ -271,9 +271,9 @@ class Livetrail extends Main
 		//Send Update Email
 		if($bNewMsg) {
 			$bSuccess = $this->sendEmail();
-			$sDesc = $bSuccess?'mail_sent':'mail_failure';
+			$sDesc = Mask::LANG_PREFIX.($bSuccess?'email.sent':'email.failure');
 		}
-		else $sDesc = 'no_new_msg';
+		else $sDesc = Mask::LANG_PREFIX.'spot.no_new_msg';
 
 		return self::getJsonResult($bSuccess, $sDesc);
 	}
@@ -711,14 +711,14 @@ class Livetrail extends Main
 
 		if($bSuccess) {
 			$bSuccess = $this->sendEmail();
-			$sDesc = $bSuccess?'mail_sent':'mail_failure';
+			$sDesc = Mask::LANG_PREFIX.($bSuccess?'email.sent':'email.failure');
 		}
 		else $sDesc = 'error.commit_db';
 
 		return self::getJsonResult($bSuccess, $sDesc);
 	}
 
-	public function getAdminSettings($sType='') {
+	public function getAdminSettings() {
 		$oFeed = new Feed($this->oDb);
 		$asData = array(
 			'project'	=> $this->oProject->getProjects(),

lib/Map.php

@@ -3,7 +3,6 @@
 namespace Franzz\Livetrail;
 use Franzz\Objects\PhpObject;
 use Franzz\Objects\Db;
-use \Settings;
 
 class Map extends PhpObject {
 
@@ -63,4 +62,4 @@ class Map extends PhpObject {
 
 		return $sUrl;
 	}
-}
+}

lib/Media.php

@@ -4,7 +4,6 @@ namespace Franzz\Livetrail;
 use Franzz\Objects\PhpObject;
 use Franzz\Objects\Db;
 use Franzz\Objects\ToolBox;
-use \Settings;
 
 class Media extends PhpObject {
 
@@ -21,7 +20,6 @@ class Media extends PhpObject {
 	private Project $oProject;
 	private $asMedia;
 	private $asMedias;
-	//private $sSystemType;
 
 	private $iMediaId;
 
@@ -31,7 +29,6 @@ class Media extends PhpObject {
 		$this->oProject = &$oProject;
 		$this->asMedia = array();
 		$this->asMedias = array();
-		//$this->sSystemType = (substr(php_uname(), 0, 7) == "Windows")?'win':'unix';
 		$this->setMediaId($iMediaId);
 	}
 
@@ -328,4 +325,4 @@ class Media extends PhpObject {
 		preg_match('/^(?P<lat>[\+\-][0,1]?\d{2}\.\d+)(?P<lng>[\+\-][0,1]?\d{2}\.\d+)(?P<alt>[\+\-]\d+)?/', $sIso6709, $asMatches);
 		return array(floatval($asMatches['lat']), floatval($asMatches['lng']), floatval($asMatches['alt'] ?? 0));
 	}
-}
+}

lib/Project.php

@@ -3,7 +3,6 @@
 namespace Franzz\Livetrail;
 use Franzz\Objects\PhpObject;
 use Franzz\Objects\Db;
-use \Settings;
 
 class Project extends PhpObject {
 
@@ -28,7 +27,6 @@ class Project extends PhpObject {
 	private $sCodeName;
 	private $sMode;
 	private $asActive;
-	private $asGeo;
 
 	public function __construct(Db &$oDb, $iProjectId=0) {
 		parent::__construct(__CLASS__);
@@ -195,7 +193,6 @@ class Project extends PhpObject {
 			$this->sCodeName = $asProject['codename'];
 			$this->sMode = $asProject['mode'];
 			$this->asActive = array('from'=>$asProject['active_from'], 'to'=>$asProject['active_to']);
-			$this->asGeo = array(/*'geofile'=>$asProject['geofilepath'], */'gpxfile'=>$asProject['gpxfilepath']);
 		}
 		else $this->addError('Error while setting project: no project ID');
 	}

lib/User.php

@@ -3,7 +3,6 @@
 namespace Franzz\Livetrail;
 use Franzz\Objects\PhpObject;
 use Franzz\Objects\Db;
-use \Settings;
 
 class User extends PhpObject {