Rebased again :/

2024-10-07 16:52:45 +00:00 · 2015-11-18 23:51:50 +00:00
parent 2b92bd5fb8 d1baeb436c
commit 27d507204a
5 changed files with 90 additions and 17 deletions
--- 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"
--- 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
 ```
--- 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,35 @@ 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.'">';
+
+                $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>
  <div class="form-group">
    <div class="col-sm-2">
      <button type="submit" class="btn btn-default">Set</button>
@@ -101,6 +126,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 +153,7 @@ var greenMarker = L.AwesomeMarkers.icon({
            $sql = "SELECT DISTINCT(`device_id`),`devices`.`location`,`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` != '') OR (`devices`.`location` REGEXP '\[[0-9\.\, ]+\]'))
+                      AND `status` IN (".$widget_settings['status'].")
                    ORDER BY `status` ASC, `hostname`";
        }
        else {
@@ -134,10 +163,11 @@ var greenMarker = L.AwesomeMarkers.icon({
                    LEFT JOIN `locations` ON `devices`.`location`=`locations`.`location`
                    WHERE `disabled`=0 AND `ignore`=0 AND ((`lat` != '' AND `lng` != '') OR (`devices`.`location` REGEXP '\[[0-9\.\, ]+\]'))
                    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;
            $tmp_loc = parse_location($map_devices['location']);
--- 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,13 +176,17 @@ 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;
+$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);
@@ -233,10 +237,23 @@ 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++;
+            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,6 +321,10 @@ if ($port_details && $config['enable_port_relationship'] === true && port_permit

 unset($int_links, $int_links_v6, $int_links_v4, $int_links_phys, $br);

+if($nbLinks > 3)
+{
+echo '</span></div>';
+}
 echo '</td></tr>';

 // If we're showing graphs, generate the graph and print the img tags
--- 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-plus"))
+    {
+        button.addClass('glyphicon-minus').removeClass('glyphicon-plus');
+    }else
+    {
+        button.addClass('glyphicon-plus').removeClass('glyphicon-minus');
+    }
+   
+    list.toggle();
+    continued.toggle();
+});
+