Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
mesh
meshmap
Commits
61646a0f
Commit
61646a0f
authored
Dec 13, 2018
by
Eric - kg6wxc
Browse files
Merge branch 'moreTimezoneFixing' into 'master'
bugfix: yet even more fixes for timezone display. See merge request
!4
parents
1eed246b
8c4a3f99
Changes
5
Hide whitespace changes
Inline
Side-by-side
scripts/map_functions.inc
View file @
61646a0f
...
...
@@ -433,7 +433,7 @@ function build_Marker($node_info, $node_ServiceList, $node_LinkedList, $node_Fir
{
//timezone fixes - wxc 11-27-2018
$nodeLastSeen
=
new
DateTime
(
$node_info
[
'last_seen'
]);
$nodeLastSeen
=
new
DateTime
(
$node_info
[
'last_seen'
]
,
$GLOBALS
[
'localTimeZone'
]
);
date_timezone_set
(
$nodeLastSeen
,
$GLOBALS
[
'localTimeZone'
]);
...
...
webpage/admin/status_updates.php
View file @
61646a0f
...
...
@@ -29,8 +29,8 @@ if (!$sql_connection) {
mysqli_close
(
$sql_connection
);
}
$localTimeZone
=
new
DateTimeZone
(
$USER_SETTINGS
[
'localTimeZone'
]);
$nodeInfoLastUpdate
=
new
DateTime
(
$lastUpdateNodeInfo
[
'script_last_run'
]);
$linkInfoLastUpdate
=
new
DateTime
(
$lastUpdateLinkInfo
[
'table_last_update'
]);
$nodeInfoLastUpdate
=
new
DateTime
(
$lastUpdateNodeInfo
[
'script_last_run'
]
,
$localTimeZone
);
$linkInfoLastUpdate
=
new
DateTime
(
$lastUpdateLinkInfo
[
'table_last_update'
]
,
$localTimeZone
);
date_timezone_set
(
$nodeInfoLastUpdate
,
$localTimeZone
);
date_timezone_set
(
$linkInfoLastUpdate
,
$localTimeZone
);
...
...
webpage/admin/update_node_location.php
View file @
61646a0f
...
...
@@ -47,7 +47,7 @@ if (!isset($_SESSION['userLoggedIn'])) {
echo
"</tr>
\n
"
;
foreach
(
$nodeInfo
as
$value
)
{
$localTimeZone
=
new
DateTimeZone
(
$USER_SETTINGS
[
'localTimeZone'
]);
$lastSeen
=
new
DateTime
(
$value
[
'last_seen'
]);
$lastSeen
=
new
DateTime
(
$value
[
'last_seen'
]
,
$localTimeZone
);
date_timezone_set
(
$lastSeen
,
$localTimeZone
);
// if ($value['location_fix'] == 0) {
// $yesOrNo = "No";
...
...
webpage/admin/users.php
View file @
61646a0f
...
...
@@ -295,7 +295,7 @@ if (!isset($_SESSION['userLoggedIn'])) {
echo
"</tr>
\n
"
;
foreach
(
$users
as
$value
)
{
$localTimeZone
=
new
DateTimeZone
(
$USER_SETTINGS
[
'localTimeZone'
]);
$lastLogin
=
new
DateTime
(
$value
[
'last_login'
]);
$lastLogin
=
new
DateTime
(
$value
[
'last_login'
]
,
$localTimeZone
);
date_timezone_set
(
$lastLogin
,
$localTimeZone
);
/*
if ($value['id'] !== "map-admin") {
...
...
webpage/node_report.php
View file @
61646a0f
...
...
@@ -185,7 +185,7 @@ if (is_array($NodeList) && !empty($NodeList))
foreach
(
$NodeList
as
$Node
)
{
$tz
=
new
DateTimeZone
(
$USER_SETTINGS
[
'localTimeZone'
]);
$datetime
=
new
DateTime
(
$Node
[
'last_seen'
]);
$datetime
=
new
DateTime
(
$Node
[
'last_seen'
]
,
$tz
);
date_timezone_set
(
$datetime
,
$tz
);
$node_FirmwareStatus
=
checkVersion
(
$Node
[
'firmware_version'
],
$STABLE_MESH_VERSION
);
/*
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment