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
32161c5a
Commit
32161c5a
authored
May 16, 2019
by
Eric - kg6wxc
Browse files
fixed typo in wxc_functions and map_functions
parent
484b6ef6
Changes
2
Hide whitespace changes
Inline
Side-by-side
scripts/map_functions.inc
View file @
32161c5a
...
@@ -529,7 +529,7 @@ function build_Marker($node_info, $node_ServiceList, $node_LinkedList, $node_Fir
...
@@ -529,7 +529,7 @@ function build_Marker($node_info, $node_ServiceList, $node_LinkedList, $node_Fir
//timezone fixes - wxc 11-26-2018
//timezone fixes - wxc 11-26-2018
"<br>Last Polled: "
.
date_format
(
$nodeLastSeen
,
'Y-m-d H:i:s T'
)
.
'<br>'
.
"Uptime: "
.
$node_info
[
'uptime'
]
.
'<br>'
;
"<br>Last Polled: "
.
date_format
(
$nodeLastSeen
,
'Y-m-d H:i:s T'
)
.
'<br>'
.
"Uptime: "
.
$node_info
[
'uptime'
]
.
'<br>'
;
//dot
//dot
if
(
$node_info
[
'loadavg'
]
!==
"NotAvailable"
)
{
if
(
$node_info
[
'loadavg'
]
!==
"Not
Available"
)
{
$loadavgs
=
unserialize
(
$node_info
[
'loadavg'
]);
$loadavgs
=
unserialize
(
$node_info
[
'loadavg'
]);
//var_dump($loadavgs);
//var_dump($loadavgs);
$markerList
.
=
'LoadAvg: 1 min '
.
$loadavgs
[
0
]
.
', 5 min '
.
$loadavgs
[
1
]
.
', 15 min '
.
$loadavgs
[
2
]
.
"<br>"
;
$markerList
.
=
'LoadAvg: 1 min '
.
$loadavgs
[
0
]
.
', 5 min '
.
$loadavgs
[
1
]
.
', 15 min '
.
$loadavgs
[
2
]
.
"<br>"
;
...
...
scripts/wxc_functions.inc
View file @
32161c5a
...
@@ -571,7 +571,7 @@ function wxc_removeIgnoredNodes() {
...
@@ -571,7 +571,7 @@ function wxc_removeIgnoredNodes() {
//use the info from the nodes json file to get the local services from the node
//use the info from the nodes json file to get the local services from the node
function
wxc_listServices
(
$serviceList
)
{
function
wxc_listServices
(
$serviceList
)
{
$services
=
array
();
$services
=
array
();
if
(
$serviceList
==
"NotAvailable"
||
empty
(
$serviceList
)
||
is_null
(
$serviceList
))
{
if
(
$serviceList
==
"Not
Available"
||
empty
(
$serviceList
)
||
is_null
(
$serviceList
))
{
return
FALSE
;
return
FALSE
;
}
elseif
(
is_array
(
unserialize
(
$serviceList
)))
{
}
elseif
(
is_array
(
unserialize
(
$serviceList
)))
{
$serviceArray
=
unserialize
(
$serviceList
);
$serviceArray
=
unserialize
(
$serviceList
);
...
...
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