sven/ulogger-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix winter/summer timezones

Browse Source
This commit is contained in:
Mark Campbell-Smith 2014-04-10 12:12:15 +10:00
parent 73fe9afe76
commit ed979e37c7
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
requests.php
View File

@ -166,12 +166,7 @@ switch($action) {
$lat = isset($_REQUEST["lat"]) ? $_REQUEST["lat"] : NULL; $lat = isset($_REQUEST["lat"]) ? $_REQUEST["lat"] : NULL;
$long = isset($_REQUEST["long"]) ? $_REQUEST["long"] : NULL; $long = isset($_REQUEST["long"]) ? $_REQUEST["long"] : NULL;
// If the client uses Backitude then convert the date into handled format // If the client uses Backitude then convert the date into handled format
if ($requireddb == 'backitude') { $dateoccurred = isset($_REQUEST["do"]) ? $_REQUEST["do"] : NULL;
$dateoccurred = isset($_REQUEST["do"]) ? date("Y-m-d H:i:s",intval($_REQUEST["do"])) : NULL;
}
else {
$dateoccurred = isset($_REQUEST["do"]) ? $_REQUEST["do"] : NULL;
}
$altitude = isset($_REQUEST["alt"]) ? $_REQUEST["alt"] : NULL; $altitude = isset($_REQUEST["alt"]) ? $_REQUEST["alt"] : NULL;
$angle = isset($_REQUEST["ang"]) ? $_REQUEST["ang"] : NULL; $angle = isset($_REQUEST["ang"]) ? $_REQUEST["ang"] : NULL;
$speed = isset($_REQUEST["sp"]) ? $_REQUEST["sp"] : NULL; $speed = isset($_REQUEST["sp"]) ? $_REQUEST["sp"] : NULL;
@ -225,10 +220,18 @@ switch($action) {
} }
} }
} }
$sql = "INSERT INTO positions " if ($requireddb == 'backitude') {
."(FK_Users_ID,FK_Trips_ID,Latitude,Longitude,DateOccurred,FK_Icons_ID," $sql = "INSERT INTO positions "
."Speed,Altitude,Comments,ImageURL,Angle,SignalStrength,SignalStrengthMax," ."(FK_Users_ID,FK_Trips_ID,Latitude,Longitude,DateOccurred,FK_Icons_ID,"
."SignalStrengthMin,BatteryStatus) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; ."Speed,Altitude,Comments,ImageURL,Angle,SignalStrength,SignalStrengthMax,"
."SignalStrengthMin,BatteryStatus) VALUES (?,?,?,?,FROM_UNIXTIME(?),?,?,?,?,?,?,?,?,?,?)";
} else {
$sql = "INSERT INTO positions "
."(FK_Users_ID,FK_Trips_ID,Latitude,Longitude,DateOccurred,FK_Icons_ID,"
."Speed,Altitude,Comments,ImageURL,Angle,SignalStrength,SignalStrengthMax,"
."SignalStrengthMin,BatteryStatus) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
}
$query = $mysqli->prepare($sql); $query = $mysqli->prepare($sql);
$query->bind_param('iiddsiddssdiiii', $query->bind_param('iiddsiddssdiiii',
$userid,$tripid,$lat,$long,$dateoccurred,$iconid, $userid,$tripid,$lat,$long,$dateoccurred,$iconid,