franzz/spot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add Local Time Zone

Browse Source
This commit is contained in:
Franzz
2021-05-24 01:05:36 +02:00
parent 6b3d637e64
commit b398480c7f
19 changed files with 1815 additions and 1679 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
inc/feed.php
View File

@@ -90,7 +90,7 @@ class Feed extends PhpObject {
public function getMessages($asActivePeriod = array()) {
$asInfo = array(
'select' => array('id_message', 'ref_msg_id', 'type', 'latitude', 'longitude', 'site_time', 'unix_time'),
'select' => array('id_message', 'ref_msg_id', 'type', 'latitude', 'longitude', 'site_time', 'timezone', 'unix_time'),
'from' => self::MSG_TABLE,
'constraint'=> array(Db::getId(self::FEED_TABLE) => $this->getFeedId()),
'constOpe' => array(Db::getId(self::FEED_TABLE) => "="),
@@ -163,7 +163,8 @@ class Feed extends PhpObject {
'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 (default timezone, see Settings::TIMEZONE)
'site_time' => date(Db::TIMESTAMP_FORMAT, $asMsg['unixTime']), //Conversion to Site Time
'timezone' => Spot::getTimeZoneFromDate($asMsg['dateTime']), //Local Time Zone
'unix_time' => $asMsg['unixTime'], //UNIX Time (backup)
'content' => $asMsg['messageContent'],
'battery_state' => $asMsg['batteryState']
@@ -200,13 +201,16 @@ class Feed extends PhpObject {
}
public function delete() {
$sDesc = '';
$asResult = array();
if($this->getFeedId() > 0) {
$bSuccess = $this->oDb->deleteRow(self::FEED_TABLE, $this->getFeedId());
if(!$bSuccess) $sDesc = $this->oDb->getLastError();
$asResult = array(
'id' => $this->getFeedId(),
'del' => $this->oDb->deleteRow(self::FEED_TABLE, $this->getFeedId()),
'desc' => $this->oDb->getLastError()
);
}
else $sDesc = 'Error while setting project: no Feed ID';
else $asResult = array('del'=>false, 'desc'=>'Error while setting project: no Feed ID');
return $sDesc;
return $asResult;
}
}