summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Jakum <aj-gh@users.noreply.github.com>2019-03-20 22:50:13 +0100
committerAndreas Jakum <aj-gh@users.noreply.github.com>2019-03-20 22:50:13 +0100
commit6086c26404d0a534f2ce212b7e9c8e669754e8b0 (patch)
tree5af4c5062c50180c8425c9cccbe162a4a8beb43b
parenta9b9739ddd8c2e3147b36172b32ff3925d56a041 (diff)
parent21ed8cf5c8dc2fe6353a5065016a0e781ca4e126 (diff)
Merge branch 'master' into stable
-rw-r--r--data.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/data.php b/data.php
index 005267c..938c865 100644
--- a/data.php
+++ b/data.php
@@ -326,8 +326,10 @@ foreach ($lines as $num => $line)
if($locations[$locids[$iptoLoc]]->state == "offline")
$locations[$locids[$iptoLoc]]->state = "online";
}
- if (($nodename[$ipfromLoc] == "tunnel" && $locations[$locids[$ipfromLoc]]->locname=="housing") ||
- ($nodename[$iptoLoc] == "tunnel" && $locations[$locids[$iptoLoc]]->locname=="housing" ) ||
+ if (($nodename[$ipfromLoc] == "tunnel" && $locations[$locids[$ipfromLoc]]->locname == "housing") ||
+ ($nodename[$iptoLoc] == "tunnel" && $locations[$locids[$iptoLoc]]->locname == "housing") ||
+ ($nodename[$ipfromLoc] == "viennagw" && $locations[$locids[$ipfromLoc]]->locname == "edis") ||
+ ($nodename[$iptoLoc] == "viennagw" && $locations[$locids[$iptoLoc]]->locname == "edis") ||
($locations[$locids[$iptoLoc]]->hastinc && $locations[$locids[$ipfromLoc]]->hastinc)) {
$links[$i]->label = -1;