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
4677a291
Commit
4677a291
authored
Jun 26, 2020
by
Eric - kg6wxc
Browse files
Merge branch 'fix_php_warnings01' into 'master'
bugfix: fixed some php warning messages See merge request
!21
parents
2074f182
d4db4a70
Changes
1
Hide whitespace changes
Inline
Side-by-side
scripts/map_functions.inc
View file @
4677a291
...
...
@@ -197,7 +197,7 @@ function load_LinkList($NodeList, $TopoList)
{
foreach
(
$TopoList
as
$value
)
{
if
(
$value
[
'nodelat'
]
&&
$value
[
'linklon'
])
if
((
isset
(
$value
[
'nodelat'
]
))
&&
(
isset
(
$value
[
'linklon'
])
))
//if there's no location info ignore the entry
{
$node_lat
=
$value
[
'nodelat'
];
...
...
@@ -366,7 +366,7 @@ function load_LinkedTO($node_info, $TopoList)
foreach
(
$TopoList
as
$value
)
{
//if there's no location info (at each end of the link) ignore the entry
if
(
$value
[
'nodelat'
]
&&
$value
[
'linklon'
])
if
((
isset
(
$value
[
'nodelat'
]
))
&&
(
isset
(
$value
[
'linklon'
])
))
{
//this is the section that is exploding in php7.2.3
...
...
@@ -536,7 +536,11 @@ function build_Marker($node_info, $node_ServiceList, $node_LinkedList, $node_Fir
if
(
$node_info
[
'loadavg'
]
!==
"Not Available"
)
{
$loadavgs
=
unserialize
(
$node_info
[
'loadavg'
]);
//var_dump($loadavgs);
echo
'LoadAvg: 1 min '
.
$loadavgs
[
0
]
.
', 5 min '
.
$loadavgs
[
1
]
.
', 15 min '
.
$loadavgs
[
2
]
.
"<br></div></div>';"
.
"
\n
"
;
if
(
is_array
(
$loadavgs
))
{
echo
'LoadAvg: 1 min '
.
$loadavgs
[
0
]
.
', 5 min '
.
$loadavgs
[
1
]
.
', 15 min '
.
$loadavgs
[
2
]
.
"<br></div></div>';"
.
"
\n
"
;
}
else
{
echo
"</div></div>';"
.
"
\n
"
;
}
}
else
{
echo
"</div></div>';"
.
"
\n
"
;
}
...
...
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