sort messages by timestamp

This commit is contained in:
2016-06-23 21:11:24 +02:00
parent e4dbed2716
commit d74cbccd01

View File

@@ -126,8 +126,8 @@ class Spot extends Main
'type' => $asMsg['messageType'], 'type' => $asMsg['messageType'],
'latitude' => $asMsg['latitude'], 'latitude' => $asMsg['latitude'],
'longitude' => $asMsg['longitude'], 'longitude' => $asMsg['longitude'],
'timestamp' => date(MySqlManager::MYSQL_TIMESTAMP, strtotime($asMsg['dateTime'])), //Stored in Paris Time :s 'timestamp' => date(MySqlManager::MYSQL_TIMESTAMP, strtotime($asMsg['dateTime'])), //Stored in Local Time
'unix_timestamp' => $asMsg['unixTime'], 'unix_timestamp' => $asMsg['unixTime'], //Stored in UNIX time
'content' => $asMsg['messageContent'], 'content' => $asMsg['messageContent'],
'battery_state' => $asMsg['batteryState']); 'battery_state' => $asMsg['batteryState']);
$this->oMySql->insertUpdateRow(self::MSG_TABLE, $asMsg, array('ref_msg_id')); $this->oMySql->insertUpdateRow(self::MSG_TABLE, $asMsg, array('ref_msg_id'));
@@ -149,7 +149,7 @@ class Spot extends Main
//Check last message & update feed if necessary (max once a day) //Check last message & update feed if necessary (max once a day)
$sLastMsg = $this->oMySql->selectValue(self::FEED_TABLE, 'led', array('ref_feed_id'=>$sRefFeedId)); $sLastMsg = $this->oMySql->selectValue(self::FEED_TABLE, 'led', array('ref_feed_id'=>$sRefFeedId));
if(mb_substr($sLastMsg, 0, 10) != date('Y-m-d')) $this->updateFeed($sRefFeedId); if(Settings::MODE!=self::MODE_HISTO && mb_substr($sLastMsg, 0, 10) != date('Y-m-d')) $this->updateFeed($sRefFeedId);
//Extract messages //Extract messages
$asMessages = $this->getSpotMessages(); $asMessages = $this->getSpotMessages();
@@ -161,7 +161,7 @@ class Spot extends Main
private function getSpotMessages() private function getSpotMessages()
{ {
$asMessages = $this->oMySql->selectRows(array('from'=>self::MSG_TABLE)); $asMessages = $this->oMySql->selectRows(array('from'=>self::MSG_TABLE, 'orderBy'=>array('timestamp'=>'ASC')));
foreach($asMessages as $iKey=>$asMessage) foreach($asMessages as $iKey=>$asMessage)
{ {
$iUnixTimeStamp = strtotime($asMessage['timestamp']); $iUnixTimeStamp = strtotime($asMessage['timestamp']);
@@ -246,7 +246,7 @@ class Spot extends Main
public static function getPicInfo($sPicPath) public static function getPicInfo($sPicPath)
{ {
$iPicTimeStamp = 0; $iPicTimeStamp = 0;
$asExif = exif_read_data($sPicPath, 0, true); $asExif = @exif_read_data($sPicPath, 0, true);
//Timestamp //Timestamp
if(array_key_exists('DateTimeOriginal', $asExif['EXIF'])) $iPicTimeStamp = strtotime($asExif['EXIF']['DateTimeOriginal']); if(array_key_exists('DateTimeOriginal', $asExif['EXIF'])) $iPicTimeStamp = strtotime($asExif['EXIF']['DateTimeOriginal']);