mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace Packages-link in menubar with Packages-Search.

Browse Source 
Rewrote inclusion code in `html/pages/search.inc.php`.
Added replacement for `:` character in versions to level out debian-version oddities.
This commit is contained in:
f0o
2015-01-07 09:22:39 +00:00
parent a5b643d251
commit 75d37fe478
3 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
html/includes/print-menubar.php
View File

@@ -378,18 +378,10 @@ if ($_SESSION['userlevel'] >= '5' && ($routing_count['bgp']+$routing_count['ospf
<?php
}
$packages = dbFetchCell("SELECT COUNT(pkg_id) from `packages`");
if ($packages)
{
if ( dbFetchCell("SELECT 1 from `packages` LIMIT 1") ) {
?>
<li class="dropdown">
<a href="<?php echo(generate_url(array('page'=>'packages'))); ?>" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><img src="images/16/box.png" border="0" align="absmiddle" /> Packages<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="<?php echo(generate_url(array('page'=>'search','search'=>'packages'))); ?>"><img src="images/16/box.png" border="0" align="absmiddle" /> Search Packages</a></li>
<li><a href="<?php echo(generate_url(array('page'=>'packages'))); ?>"><img src="images/16/box.png" border="0" align="absmiddle" /> All Packages</a></li>
</ul>
<li>
<a href="<?php echo(generate_url(array('page'=>'search','search'=>'packages'))); ?>"><img src="images/16/box.png" border="0" align="absmiddle" /> Packages</a>
</li>
<?php
} # if ($packages)

22
html/pages/search.inc.php
View File

@@ -2,7 +2,11 @@
$pagetitle[] = "Search";
$sections = array('packages' => 'Packages', 'ipv4' => 'IPv4 Address', 'ipv6' => 'IPv6 Address', 'mac' => 'MAC Address', 'arp' => 'ARP Table');
$sections = array('ipv4' => 'IPv4 Address', 'ipv6' => 'IPv6 Address', 'mac' => 'MAC Address', 'arp' => 'ARP Table');
if( dbFetchCell("SELECT 1 from `packages` LIMIT 1") ) {
$sections['packages'] = 'Packages';
}
if (!isset($vars['search'])) { $vars['search'] = "ipv4"; }
@@ -30,18 +34,10 @@ unset ($sep);
print_optionbar_end('', '');
switch ($vars['search'])
{
case 'packages':
case 'ipv4':
case 'ipv6':
case 'mac':
case 'arp':
include('pages/search/'.$vars['search'].'.inc.php');
break;
default:
echo(report_this('Unknown search type '.$vars['search']));
break;
if( file_exists('pages/search/'.$vars['search'].'.inc.php') ) {
include('pages/search/'.$vars['search'].'.inc.php');
} else {
echo(report_this('Unknown search type '.$vars['search']));
}
?>

3
html/pages/search/packages.inc.php
View File

@@ -26,7 +26,7 @@ print_optionbar_start(28);
?>
<form method="post" action="" class="form-inline" role="form">
<div class="form-group">
<label for="package">Name</label>
<label for="package">Package</label>
<input type="text" name="package" id="package" size=20 value="<?php echo($_POST['package']); ?>" class="form-control input-sm" placeholder="Any" />
</div>
<div class="form-group">
@@ -130,6 +130,7 @@ foreach( $ordered as $name=>$entry ) {
$arch = array();
$devs = array();
foreach( $entry as $variation ) {
$variation['version'] = str_replace(":",".",$variation['version']);
if( !in_array($variation['version'], $vers) && (empty($ver) || version_compare($variation['version'],$ver,$opt)) ) {
$vers[] = $variation['version'];
}