diff options
| author | Andreas Jakum <aj-gh@users.noreply.github.com> | 2019-03-20 22:50:13 +0100 |
|---|---|---|
| committer | Andreas Jakum <aj-gh@users.noreply.github.com> | 2019-03-20 22:50:13 +0100 |
| commit | 6086c26404d0a534f2ce212b7e9c8e669754e8b0 (patch) | |
| tree | 5af4c5062c50180c8425c9cccbe162a4a8beb43b /data.php | |
| parent | a9b9739ddd8c2e3147b36172b32ff3925d56a041 (diff) | |
| parent | 21ed8cf5c8dc2fe6353a5065016a0e781ca4e126 (diff) | |
Merge branch 'master' into stable
Diffstat (limited to 'data.php')
| -rw-r--r-- | data.php | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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; |