From f2df2d0748e585093e574188fb77f5c841d11be8 Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Mon, 16 Nov 2015 17:27:47 -0800
Subject: [PATCH 01/10] Added ability to select down/up devices on worldmap

---
 html/includes/common/worldmap.inc.php | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/html/includes/common/worldmap.inc.php b/html/includes/common/worldmap.inc.php
index bf9e6f36e1..662785e596 100644
--- a/html/includes/common/worldmap.inc.php
+++ b/html/includes/common/worldmap.inc.php
@@ -30,7 +30,7 @@ if ($config['map']['engine'] == 'leaflet') {
     <div class="col-sm-4">
       <label for="init_lat" class="control-label">Initial Latitude: </label>
     </div>
-    <div class="col-sm-6">
+    <div class="col-sm-8">
       <input class="form-control" name="init_lat" id="input_lat_'.$unique_id.'" value="'.$widget_settings['init_lat'].'" placeholder="ie. 51.4800 for Greenwich">
     </div>
   </div>
@@ -46,7 +46,7 @@ if ($config['map']['engine'] == 'leaflet') {
     <div class="col-sm-4">
       <label for="init_zoom" class="control-label">Initial Zoom: </label>
     </div>
-    <div class="col-sm-6">
+    <div class="col-sm-8">
       <select class="form-control" name="init_zoom" id="select_zoom'.$unique_id.'">
         ';
         for ($i=0; $i<19; $i++) {
@@ -65,10 +65,22 @@ if ($config['map']['engine'] == 'leaflet') {
     <div class="col-sm-4">
       <label for="group_radius" class="control-label">Grouping radius: </label>
     </div>
-    <div class="col-sm-4">
+    <div class="col-sm-8">
       <input class="form-control" name="group_radius" id="input_radius_'.$unique_id.'" value="'.$widget_settings['group_radius'].'" placeholder="default 80">
     </div>
   </div>
+    <div class="form-group">
+        <div class="col-sm-4">
+            <label for="status" class="control-label">Show devices: </label>
+        </div>
+        <div class="col-sm-8">
+            <select class="form-control" name="status" id="status_'.$unique_id.'">
+                <option value="0,1">Up + Down</option>
+                <option value="1">Up</option>
+                <option value="0">Down</option>
+            </select>
+        </div>
+    </div>
   <div class="form-group">
     <div class="col-sm-2">
       <button type="submit" class="btn btn-default">Set</button>
@@ -101,6 +113,9 @@ if ($config['map']['engine'] == 'leaflet') {
         else {
             $group_radius = 80;
         }
+        if (empty($widget_settings['status']) && $widget_settings['status'] != '0') {
+            $widget_settings['status'] = '0,1';
+        }
         $map_init = "[" . $init_lat . ", " . $init_lng . "], " . sprintf("%01.0f", $init_zoom);
         $temp_output .= 'var map = L.map(\'leaflet-map\').setView('.$map_init.');
 L.tileLayer(\'//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png\', {
@@ -125,6 +140,7 @@ var greenMarker = L.AwesomeMarkers.icon({
             $sql = "SELECT DISTINCT(`device_id`),`hostname`,`os`,`status`,`lat`,`lng` FROM `devices`
                     LEFT JOIN `locations` ON `devices`.`location`=`locations`.`location`
                     WHERE `disabled`=0 AND `ignore`=0 AND `lat` != '' AND `lng` != ''
+                      AND `status` IN (".$widget_settings['status'].")
                     ORDER BY `status` ASC, `hostname`";
         }
         else {
@@ -134,10 +150,11 @@ var greenMarker = L.AwesomeMarkers.icon({
                     LEFT JOIN `locations` ON `devices`.`location`=`locations`.`location`
                     WHERE `disabled`=0 AND `ignore`=0 AND `lat` != '' AND `lng` != ''
                     AND `devices`.`device_id` = `devices_perms`.`device_id`
-                    AND `devices_perms`.`user_id` = ?
+                    AND `devices_perms`.`user_id` = ? AND `status` IN (".$widget_settings['status'].")
                     ORDER BY `status` ASC, `hostname`";
+            $param[] = $_SESSION['user_id'];
         }
-        foreach (dbFetchRows($sql, array($_SESSION['user_id'])) as $map_devices) {
+        foreach (dbFetchRows($sql, $param) as $map_devices) {
             $icon = 'greenMarker';
             $z_offset = 0;
             if ($map_devices['status'] == 0) {

From 37f5b8bcff964b66ec711739f30145b6901b2926 Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Wed, 18 Nov 2015 22:01:38 +0000
Subject: [PATCH 02/10] Added detection of existing settings

---
 html/includes/common/worldmap.inc.php | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/html/includes/common/worldmap.inc.php b/html/includes/common/worldmap.inc.php
index 662785e596..c179b6db27 100644
--- a/html/includes/common/worldmap.inc.php
+++ b/html/includes/common/worldmap.inc.php
@@ -74,10 +74,23 @@ if ($config['map']['engine'] == 'leaflet') {
             <label for="status" class="control-label">Show devices: </label>
         </div>
         <div class="col-sm-8">
-            <select class="form-control" name="status" id="status_'.$unique_id.'">
-                <option value="0,1">Up + Down</option>
-                <option value="1">Up</option>
-                <option value="0">Down</option>
+            <select class="form-control" name="status" id="status_'.$unique_id.'">';
+
+                $temp_output .= '<option value="0,1"';
+                if ($widget_settings['status'] == '0,1') {
+                    $temp_output .= ' selected';
+                }
+                $temp_output .= '>Up + Down</option>
+                <option value="1"';
+                if ($widget_settings['status'] == '1') {
+                    $temp_output .= ' selected';
+                }
+                $temp_output .= '>Up</option>
+                <option value="0"';
+                if ($widget_settings['status'] == '0') {
+                    $temp_output .= ' selected';
+                }
+                $temp_output .= '>Down</option>
             </select>
         </div>
     </div>

From 32f97ab4246f2a5b604e016726f0bc95fc34ea26 Mon Sep 17 00:00:00 2001
From: Louis Bailleul <louis.bailleul@pgs.com>
Date: Thu, 19 Nov 2015 09:54:26 +0000
Subject: [PATCH 03/10] Add hide/show feature for neighbors interfaces in the
 device ports page

---
 html/css/styles.css                   |  3 ++-
 html/includes/print-interface.inc.php | 35 ++++++++++++++++++---------
 html/js/librenms.js                   | 20 +++++++++++++++
 3 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/html/css/styles.css b/html/css/styles.css
index 46abbc37ff..778f3fba20 100644
--- a/html/css/styles.css
+++ b/html/css/styles.css
@@ -1764,4 +1764,5 @@ tr.search:nth-child(odd) {
 
 label {
     font-weight: normal;
-}
\ No newline at end of file
+}
+
diff --git a/html/includes/print-interface.inc.php b/html/includes/print-interface.inc.php
index b15c9b7731..31f947f1e7 100644
--- a/html/includes/print-interface.inc.php
+++ b/html/includes/print-interface.inc.php
@@ -36,8 +36,8 @@ else {
     $mac = '';
 }
 
-echo "<tr style=\"background-color: $row_colour;\" valign=top onmouseover=\"this.style.backgroundColor='$list_highlight';\" onmouseout=\"this.style.backgroundColor='$row_colour';\" onclick=\"location.href='".generate_port_url($port)."'\" style='cursor: pointer;'>
-    <td valign=top width=350>";
+echo "<tr style=\"background-color: $row_colour;\" valign=top onmouseover=\"this.style.backgroundColor='$list_highlight';\" onmouseout=\"this.style.backgroundColor='$row_colour';\" style='cursor: pointer;'>
+    <td valign=top width=350 onclick=\"location.href='".generate_port_url($port)."'\">";
 echo '        <span class=list-large>
     '.generate_port_link($port, $port['ifIndex'].'. '.$port['label'])." $error_img $mac
     </span><br /><span class=interface-desc>".$port['ifAlias'].'</span>';
@@ -62,7 +62,7 @@ if ($port_details) {
 
 echo '</span>';
 
-echo '</td><td width=100>';
+echo "</td><td width=100 onclick=\"location.href='".generate_port_url($port)."'\" >";
 
 if ($port_details) {
     $port['graph_type'] = 'port_bits';
@@ -73,7 +73,7 @@ if ($port_details) {
     echo generate_port_link($port, "<img src='graph.php?type=port_errors&amp;id=".$port['port_id'].'&amp;from='.$config['time']['day'].'&amp;to='.$config['time']['now'].'&amp;width=100&amp;height=20&amp;legend=no&amp;bg='.str_replace('#', '', $row_colour)."'>");
 }
 
-echo '</td><td width=120>';
+echo "</td><td width=120 onclick=\"location.href='".generate_port_url($port)."'\" >";
 
 if ($port['ifOperStatus'] == 'up') {
     $port['in_rate']  = ($port['ifInOctets_rate'] * 8);
@@ -86,7 +86,7 @@ if ($port['ifOperStatus'] == 'up') {
         <img src='images/icons/arrow_pps_out.png' align=absmiddle> ".format_bi($port['ifOutUcastPkts_rate']).'pps</span>';
 }
 
-echo '</td><td width=75>';
+echo "</td><td width=75 onclick=\"location.href='".generate_port_url($port)."'\" >";
 if ($port['ifSpeed']) {
     echo '<span class=box-desc>'.humanspeed($port['ifSpeed']).'</span>';
 }
@@ -130,19 +130,19 @@ if ($device['os'] == 'ios' || $device['os'] == 'iosxe') {
 }//end if
 
 if ($port_adsl['adslLineCoding']) {
-    echo '</td><td width=150>';
+    echo "</td><td width=150 onclick=\"location.href='".generate_port_url($port)."'\" >";
     echo $port_adsl['adslLineCoding'].'/'.rewrite_adslLineType($port_adsl['adslLineType']);
     echo '<br />';
     echo 'Sync:'.formatRates($port_adsl['adslAtucChanCurrTxRate']).'/'.formatRates($port_adsl['adslAturChanCurrTxRate']);
     echo '<br />';
     echo 'Max:'.formatRates($port_adsl['adslAtucCurrAttainableRate']).'/'.formatRates($port_adsl['adslAturCurrAttainableRate']);
-    echo '</td><td width=150>';
+    echo "</td><td width=150 onclick=\"location.href='".generate_port_url($port)."'\" >";
     echo 'Atten:'.$port_adsl['adslAtucCurrAtn'].'dB/'.$port_adsl['adslAturCurrAtn'].'dB';
     echo '<br />';
     echo 'SNR:'.$port_adsl['adslAtucCurrSnrMgn'].'dB/'.$port_adsl['adslAturCurrSnrMgn'].'dB';
 }
 else {
-    echo '</td><td width=150>';
+    echo "</td><td width=150 onclick=\"location.href='".generate_port_url($port)."'\" >";
     if ($port['ifType'] && $port['ifType'] != '') {
         echo '<span class=box-desc>'.fixiftype($port['ifType']).'</span>';
     }
@@ -158,7 +158,7 @@ else {
         echo '-';
     }
 
-    echo '</td><td width=150>';
+    echo "</td><td width=150 onclick=\"location.href='".generate_port_url($port)."'\" >";
     if ($port['ifPhysAddress'] && $port['ifPhysAddress'] != '') {
         echo '<span class=box-desc>'.formatMac($port['ifPhysAddress']).'</span>';
     }
@@ -176,7 +176,11 @@ else {
 }//end if
 
 echo '</td>';
-echo '<td width=375 valign=top class=interface-desc>';
+echo '<td width=375 valign=top class="interface-desc">';
+
+$neighborsCount=0;
+echo '<div class="collapse-neighbors"><span class="neighbors-button glyphicon glyphicon-triangle-right" aria-hidden="true"></span>
+    <span class="neighbors-interface-list-firsts" style="display: inline;">';
 if (strpos($port['label'], 'oopback') === false && !$graph_type) {
     foreach (dbFetchRows('SELECT * FROM `links` AS L, `ports` AS I, `devices` AS D WHERE L.local_port_id = ? AND L.remote_port_id = I.port_id AND I.device_id = D.device_id', array($if_id)) as $link) {
         // echo("<img src='images/16/connect.png' align=absmiddle alt='Directly Connected' /> " . generate_port_link($link, makeshortif($link['label'])) . " on " . generate_device_link($link, shorthost($link['hostname'])) . "</a><br />");
@@ -235,8 +239,15 @@ if (strpos($port['label'], 'oopback') === false && !$graph_type) {
 
     if ($port_details && $config['enable_port_relationship'] === true && port_permitted($int_link,$device['device_id'])) {
         foreach ($int_links as $int_link) {
+            $neighborsCount++;
+            if($neighborsCount == 4)
+	    {
+		echo '<span class="neighbors-list-continued" style="display: inline;"></br>[...]</span>';
+		echo '</span>';
+         	echo '<span class="neighbors-interface-list" style="display: none;">';
+            }
             $link_if = dbFetchRow('SELECT * from ports AS I, devices AS D WHERE I.device_id = D.device_id and I.port_id = ?', array($int_link));
-
+	
             echo "$br";
 
             if ($int_links_phys[$int_link]) {
@@ -304,7 +315,7 @@ if ($port_details && $config['enable_port_relationship'] === true && port_permit
 
 unset($int_links, $int_links_v6, $int_links_v4, $int_links_phys, $br);
 
-echo '</td></tr>';
+echo '</span></div></td></tr>';
 
 // If we're showing graphs, generate the graph and print the img tags
 if ($graph_type == 'etherlike') {
diff --git a/html/js/librenms.js b/html/js/librenms.js
index 3df1fc5338..31f4f87960 100644
--- a/html/js/librenms.js
+++ b/html/js/librenms.js
@@ -122,6 +122,7 @@ $(document).ready(function() {
             }
         });
     });
+
 });
 
 function submitCustomRange(frmdata) {
@@ -135,3 +136,22 @@ function submitCustomRange(frmdata) {
     return true;
 }
 
+$(document).on("click", '.collapse-neighbors', function(event)
+{
+    var caller = $(this);
+    var button = caller.find('.neighbors-button');
+    var list = caller.find('.neighbors-interface-list');
+    var continued = caller.find('.neighbors-list-continued');
+
+    if(button.hasClass("glyphicon-triangle-right"))
+    {
+        button.addClass('glyphicon-triangle-bottom').removeClass('glyphicon-triangle-right');
+    }else
+    {
+        button.addClass('glyphicon-triangle-right').removeClass('glyphicon-triangle-bottom');
+    }
+   
+    list.toggle();
+    continued.toggle();
+});
+

From cc9fde610d29649bc3d3b40bf0dc671cb27c93f8 Mon Sep 17 00:00:00 2001
From: Louis Bailleul <louis.bailleul@pgs.com>
Date: Thu, 19 Nov 2015 10:02:31 +0000
Subject: [PATCH 04/10] Remove unneeded changes

---
 html/css/styles.css                   | 1 -
 html/includes/print-interface.inc.php | 1 -
 2 files changed, 2 deletions(-)

diff --git a/html/css/styles.css b/html/css/styles.css
index 778f3fba20..a750512d0d 100644
--- a/html/css/styles.css
+++ b/html/css/styles.css
@@ -1765,4 +1765,3 @@ tr.search:nth-child(odd) {
 label {
     font-weight: normal;
 }
-
diff --git a/html/includes/print-interface.inc.php b/html/includes/print-interface.inc.php
index 31f947f1e7..2b7d14fea7 100644
--- a/html/includes/print-interface.inc.php
+++ b/html/includes/print-interface.inc.php
@@ -247,7 +247,6 @@ if (strpos($port['label'], 'oopback') === false && !$graph_type) {
          	echo '<span class="neighbors-interface-list" style="display: none;">';
             }
             $link_if = dbFetchRow('SELECT * from ports AS I, devices AS D WHERE I.device_id = D.device_id and I.port_id = ?', array($int_link));
-	
             echo "$br";
 
             if ($int_links_phys[$int_link]) {

From 40c7f8c721a8f07b5374c63d791ee3677dd33781 Mon Sep 17 00:00:00 2001
From: Louis Bailleul <louis.bailleul@pgs.com>
Date: Thu, 19 Nov 2015 10:08:24 +0000
Subject: [PATCH 05/10] Did not modified any styles so remove any changes in
 the file

---
 html/css/styles.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/css/styles.css b/html/css/styles.css
index a750512d0d..46abbc37ff 100644
--- a/html/css/styles.css
+++ b/html/css/styles.css
@@ -1764,4 +1764,4 @@ tr.search:nth-child(odd) {
 
 label {
     font-weight: normal;
-}
+}
\ No newline at end of file

From 493e0f33e3482315b2597899559e1d12efd2d0dc Mon Sep 17 00:00:00 2001
From: Louis Bailleul <louis.bailleul@pgs.com>
Date: Thu, 19 Nov 2015 11:57:39 +0000
Subject: [PATCH 06/10] I agree to the conditions of the Contributor Agreement
 contained in doc/General/Contributing.md.

---
 AUTHORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index 0b495e5b1a..8263114812 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -70,4 +70,5 @@ Contributors to LibreNMS:
 - Richard Kojedzinszky <krichy@nmdps.net> (rkojedzinszky)
 - Tony Murray <murraytony@gmail.com> (murrant)
 - Peter Lamperud <peter.lamperud@gmail.com> (vizay)
+- Louis Bailleul <louis.bailleul@gmail.com> (alucardfh)
 [1]: http://observium.org/ "Observium web site"

From db37acbe837b9ef997006ab5ffd4397c4b7b8055 Mon Sep 17 00:00:00 2001
From: Louis Bailleul <louis.bailleul@pgs.com>
Date: Thu, 19 Nov 2015 12:01:10 +0000
Subject: [PATCH 07/10] Replace left and bottom arrow icons by plus and minus
 icons

---
 html/includes/print-interface.inc.php | 2 +-
 html/js/librenms.js                   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/html/includes/print-interface.inc.php b/html/includes/print-interface.inc.php
index 2b7d14fea7..bbec19f8a3 100644
--- a/html/includes/print-interface.inc.php
+++ b/html/includes/print-interface.inc.php
@@ -179,7 +179,7 @@ echo '</td>';
 echo '<td width=375 valign=top class="interface-desc">';
 
 $neighborsCount=0;
-echo '<div class="collapse-neighbors"><span class="neighbors-button glyphicon glyphicon-triangle-right" aria-hidden="true"></span>
+echo '<div class="collapse-neighbors"><span class="neighbors-button glyphicon glyphicon-plus" aria-hidden="true"></span>
     <span class="neighbors-interface-list-firsts" style="display: inline;">';
 if (strpos($port['label'], 'oopback') === false && !$graph_type) {
     foreach (dbFetchRows('SELECT * FROM `links` AS L, `ports` AS I, `devices` AS D WHERE L.local_port_id = ? AND L.remote_port_id = I.port_id AND I.device_id = D.device_id', array($if_id)) as $link) {
diff --git a/html/js/librenms.js b/html/js/librenms.js
index 31f4f87960..9bffaffcaf 100644
--- a/html/js/librenms.js
+++ b/html/js/librenms.js
@@ -143,12 +143,12 @@ $(document).on("click", '.collapse-neighbors', function(event)
     var list = caller.find('.neighbors-interface-list');
     var continued = caller.find('.neighbors-list-continued');
 
-    if(button.hasClass("glyphicon-triangle-right"))
+    if(button.hasClass("glyphicon-plus"))
     {
-        button.addClass('glyphicon-triangle-bottom').removeClass('glyphicon-triangle-right');
+        button.addClass('glyphicon-minus').removeClass('glyphicon-plus');
     }else
     {
-        button.addClass('glyphicon-triangle-right').removeClass('glyphicon-triangle-bottom');
+        button.addClass('glyphicon-plus').removeClass('glyphicon-minus');
     }
    
     list.toggle();

From d66c18dff597a15c51ddd752fc9852c7656eeb09 Mon Sep 17 00:00:00 2001
From: Louis Bailleul <louis.bailleul@pgs.com>
Date: Thu, 19 Nov 2015 12:09:58 +0000
Subject: [PATCH 08/10] Only display plus icon if there is something to display

---
 html/includes/print-interface.inc.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/html/includes/print-interface.inc.php b/html/includes/print-interface.inc.php
index bbec19f8a3..b2a6d2dc44 100644
--- a/html/includes/print-interface.inc.php
+++ b/html/includes/print-interface.inc.php
@@ -179,8 +179,7 @@ echo '</td>';
 echo '<td width=375 valign=top class="interface-desc">';
 
 $neighborsCount=0;
-echo '<div class="collapse-neighbors"><span class="neighbors-button glyphicon glyphicon-plus" aria-hidden="true"></span>
-    <span class="neighbors-interface-list-firsts" style="display: inline;">';
+$displayPlus=0;
 if (strpos($port['label'], 'oopback') === false && !$graph_type) {
     foreach (dbFetchRows('SELECT * FROM `links` AS L, `ports` AS I, `devices` AS D WHERE L.local_port_id = ? AND L.remote_port_id = I.port_id AND I.device_id = D.device_id', array($if_id)) as $link) {
         // echo("<img src='images/16/connect.png' align=absmiddle alt='Directly Connected' /> " . generate_port_link($link, makeshortif($link['label'])) . " on " . generate_device_link($link, shorthost($link['hostname'])) . "</a><br />");
@@ -194,6 +193,11 @@ if (strpos($port['label'], 'oopback') === false && !$graph_type) {
     if ($port_details && $config['enable_port_relationship'] === true) {
         // Show which other devices are on the same subnet as this interface
         foreach (dbFetchRows("SELECT `ipv4_network_id` FROM `ipv4_addresses` WHERE `port_id` = ? AND `ipv4_address` NOT LIKE '127.%'", array($port['port_id'])) as $net) {
+            if($displayPlus == 0) {
+                $displayPlus=1;
+                echo '<div class="collapse-neighbors"><span class="neighbors-button glyphicon glyphicon-plus" aria-hidden="true"></span>
+                    <span class="neighbors-interface-list-firsts" style="display: inline;">';
+            }
             $ipv4_network_id = $net['ipv4_network_id'];
             $sql             = 'SELECT I.port_id FROM ipv4_addresses AS A, ports AS I, devices AS D
                 WHERE A.port_id = I.port_id
@@ -314,7 +318,11 @@ if ($port_details && $config['enable_port_relationship'] === true && port_permit
 
 unset($int_links, $int_links_v6, $int_links_v4, $int_links_phys, $br);
 
-echo '</span></div></td></tr>';
+if($displayPlus)
+{
+echo '</span></div>';
+}
+echo '</td></tr>';
 
 // If we're showing graphs, generate the graph and print the img tags
 if ($graph_type == 'etherlike') {

From b48dbc99407c1b145a312bcd62df8bd0a318917b Mon Sep 17 00:00:00 2001
From: Louis Bailleul <louis.bailleul@pgs.com>
Date: Thu, 19 Nov 2015 12:34:21 +0000
Subject: [PATCH 09/10] Only display plus sign if there is more than three
 neighbor interfaces Take into account the number of ipv6 interfaces

---
 html/includes/print-interface.inc.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/html/includes/print-interface.inc.php b/html/includes/print-interface.inc.php
index b2a6d2dc44..996069a44b 100644
--- a/html/includes/print-interface.inc.php
+++ b/html/includes/print-interface.inc.php
@@ -179,13 +179,14 @@ echo '</td>';
 echo '<td width=375 valign=top class="interface-desc">';
 
 $neighborsCount=0;
-$displayPlus=0;
+$nbLinks=0;
 if (strpos($port['label'], 'oopback') === false && !$graph_type) {
     foreach (dbFetchRows('SELECT * FROM `links` AS L, `ports` AS I, `devices` AS D WHERE L.local_port_id = ? AND L.remote_port_id = I.port_id AND I.device_id = D.device_id', array($if_id)) as $link) {
         // echo("<img src='images/16/connect.png' align=absmiddle alt='Directly Connected' /> " . generate_port_link($link, makeshortif($link['label'])) . " on " . generate_device_link($link, shorthost($link['hostname'])) . "</a><br />");
         // $br = "<br />";
         $int_links[$link['port_id']]      = $link['port_id'];
         $int_links_phys[$link['port_id']] = 1;
+	$nbLinks++;
     }
 
     unset($br);
@@ -193,11 +194,6 @@ if (strpos($port['label'], 'oopback') === false && !$graph_type) {
     if ($port_details && $config['enable_port_relationship'] === true) {
         // Show which other devices are on the same subnet as this interface
         foreach (dbFetchRows("SELECT `ipv4_network_id` FROM `ipv4_addresses` WHERE `port_id` = ? AND `ipv4_address` NOT LIKE '127.%'", array($port['port_id'])) as $net) {
-            if($displayPlus == 0) {
-                $displayPlus=1;
-                echo '<div class="collapse-neighbors"><span class="neighbors-button glyphicon glyphicon-plus" aria-hidden="true"></span>
-                    <span class="neighbors-interface-list-firsts" style="display: inline;">';
-            }
             $ipv4_network_id = $net['ipv4_network_id'];
             $sql             = 'SELECT I.port_id FROM ipv4_addresses AS A, ports AS I, devices AS D
                 WHERE A.port_id = I.port_id
@@ -241,6 +237,13 @@ if (strpos($port['label'], 'oopback') === false && !$graph_type) {
         }//end foreach
     }//end if
 
+    if(count($int_links) > 3)
+    {
+       echo '<div class="collapse-neighbors"><span class="neighbors-button glyphicon glyphicon-plus" aria-hidden="true"></span>
+               <span class="neighbors-interface-list-firsts" style="display: inline;">';
+    }
+
+
     if ($port_details && $config['enable_port_relationship'] === true && port_permitted($int_link,$device['device_id'])) {
         foreach ($int_links as $int_link) {
             $neighborsCount++;
@@ -318,7 +321,7 @@ if ($port_details && $config['enable_port_relationship'] === true && port_permit
 
 unset($int_links, $int_links_v6, $int_links_v4, $int_links_phys, $br);
 
-if($displayPlus)
+if($nbLinks > 3)
 {
 echo '</span></div>';
 }

From 684c9b2093423f31ea8efb6eb36e914b35eee08e Mon Sep 17 00:00:00 2001
From: Svennd <svennson@gmail.com>
Date: Thu, 19 Nov 2015 16:04:58 +0100
Subject: [PATCH 10/10] update documentation for centos 7

epel is required for fping and php-mcrypt, vixie-cron is replaced by
cronie.
---
 doc/Installation/Installation-(RHEL-CentOS).md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/Installation/Installation-(RHEL-CentOS).md b/doc/Installation/Installation-(RHEL-CentOS).md
index 25fbc1db94..10767378d2 100644
--- a/doc/Installation/Installation-(RHEL-CentOS).md
+++ b/doc/Installation/Installation-(RHEL-CentOS).md
@@ -99,7 +99,8 @@ Note if not using HTTPd (Apache): RHEL requires `httpd` to be installed regardle
 
 **CentOS 7**
 ```bash
-    yum install php php-cli php-gd php-mysql php-snmp php-pear php-curl httpd net-snmp graphviz graphviz-php mariadb ImageMagick jwhois nmap mtr rrdtool MySQL-python net-snmp-utils vixie-cron php-mcrypt fping git
+    yum install epel-release
+    yum install php php-cli php-gd php-mysql php-snmp php-pear php-curl httpd net-snmp graphviz graphviz-php mariadb ImageMagick jwhois nmap mtr rrdtool MySQL-python net-snmp-utils cronie php-mcrypt fping git
     pear install Net_IPv4-1.3.4
     pear install Net_IPv6-1.2.2b2
 ```