Index: html/includes/entities/mempool.inc.php
===================================================================
--- html/includes/entities/mempool.inc.php (revision 7900)
+++ html/includes/entities/mempool.inc.php (working copy)
@@ -16,7 +16,7 @@
global $config, $cache;
$sql = 'SELECT *, `mempools`.`mempool_id` AS `mempool_id` FROM `mempools`';
- $sql .= ' LEFT JOIN `mempools-state` ON `mempools`.`mempool_id` = `mempools-state`.`mempool_id`';
+ $sql .= ' LEFT JOIN `mempools-state` USING(`mempool_id`)';
$sql .= ' WHERE 1' . generate_query_permitted(array('device'));
// Build query
Index: html/includes/entities/port.inc.php
===================================================================
--- html/includes/entities/port.inc.php (revision 7900)
+++ html/includes/entities/port.inc.php (working copy)
@@ -491,7 +491,7 @@
}
switch ($native_state)
{
- case 'blocking': $class = 'text-error'; break;
+ case 'blocking': $class = 'text-danger'; break;
case 'forwarding': $class = 'text-success'; break;
default: $class = 'muted';
}
@@ -524,7 +524,7 @@
// List VLANs
switch ($vlan['state'])
{
- case 'blocking': $class = 'text-error'; break;
+ case 'blocking': $class = 'text-danger'; break;
case 'forwarding': $class = 'text-success'; break;
default: $class = 'muted';
}
@@ -550,14 +550,14 @@
$native_state = $cache['ports_vlan'][$port['port_id']][$port['ifVlan']]['state'];
$native_name = $cache['ports_vlan'][$port['port_id']][$port['ifVlan']]['vlan_name'];
}
- switch ($vlan_state)
+ switch ($native_state)
{
case 'blocking': $class = 'label-error'; break;
case 'forwarding': $class = 'label-success'; break;
default: $class = '';
}
$rel = ($native_name) ? 'tooltip' : ''; // Hide tooltip for empty
- $string .= '<br /><span data-rel="'.$rel.'" class="label '.$class.'" data-tooltip="<strong class=\'small '.$class.'\'>'.$port['ifVlan'].' ['.$native_name.']</strong>">VLAN ' . $port['ifVlan'] . '</span>';
+ $string .= '<br /><span data-rel="'.$rel.'" class="label '.$class.'" data-tooltip="<strong class=\'small\'>'.$port['ifVlan'].' ['.$native_name.']</strong>">VLAN ' . $port['ifVlan'] . '</span>';
}
else if ($port['ifVrf']) // Print the VRF name if the port is assigned to a VRF
{
Index: html/includes/entities/printersupply.inc.php
===================================================================
--- html/includes/entities/printersupply.inc.php (revision 7900)
+++ html/includes/entities/printersupply.inc.php (working copy)
@@ -82,7 +82,7 @@
echo('<table class="table ' . $stripe_class . ' table-condensed">');
echo(' <thead>');
- echo '<tr class="strong"></th>';
+ echo '<tr class="strong">';
echo '<th class="state-marker"></th>';
echo '<th></th>';
if ($vars['page'] != "device" && $vars['popup'] != TRUE)
@@ -148,9 +148,9 @@
$output .= '<td class="state-marker"></td>';
if ($vars['popup'] == TRUE )
{
- $output .= '<td width="40" style="text-align: center;"><i class="'.$GLOBALS['config']['entities']['printersupply']['icon'].'"></i></td>';
+ $output .= '<td style="width: 40px; text-align: center;"><i class="'.$GLOBALS['config']['entities']['printersupply']['icon'].'"></i></td>';
} else {
- $output .= '<td width="1px"></td>';
+ $output .= '<td style="width: 1px;"></td>';
}
if ($vars['page'] != "device" && $vars['popup'] != TRUE)
Index: html/includes/navbar.inc.php
===================================================================
--- html/includes/navbar.inc.php (revision 7900)
+++ html/includes/navbar.inc.php (working copy)
@@ -253,7 +253,7 @@
if(count($entity_group_menu['port']))
{
- $navbar['ports']['entries'][] = array('title' => 'Groups', 'url' => generate_url(array('page' => 'groups', 'entity_type' => 'device')), 'icon' => 'oicon-category', 'count' => count($entity_group_menu['port']), 'entries' => $entity_group_menu['port']);
+ $navbar['ports']['entries'][] = array('title' => 'Groups', 'url' => generate_url(array('page' => 'groups', 'entity_type' => 'port')), 'icon' => 'oicon-category', 'count' => count($entity_group_menu['port']), 'entries' => $entity_group_menu['port']);
$navbar['ports']['entries'][] = array('divider' => TRUE);
}
Index: html/includes/panels/default.inc.php
===================================================================
--- html/includes/panels/default.inc.php (revision 7900)
+++ html/includes/panels/default.inc.php (working copy)
@@ -14,10 +14,6 @@
$div_class = ""; // Class for each block in status summary
include($config['html_dir']."/includes/status-summary.inc.php");
-echo '<div class="box box-solid">';
-echo ' <div class="box-content no-padding">';
print_alert_table(array('status' => 'failed', 'pagination' => FALSE, 'format' => 'condensed'));
-echo ' </div>';
-echo '</div>';
// EOF
Index: html/includes/print/inventory.inc.php
===================================================================
--- html/includes/print/inventory.inc.php (revision 7900)
+++ html/includes/print/inventory.inc.php (working copy)
@@ -26,7 +26,8 @@
// DHTML expandable tree
register_html_resource('js', 'mktree.js');
register_html_resource('css', 'mktree.css');
-
+
+ echo generate_box_open($vars['header']);
echo('<table class="table table-striped table-condensed "><tr><td>');
echo('<div class="btn-group pull-right" style="margin-top:5px; margin-right: 5px;">
<button class="btn btn-small" onClick="expandTree(\'enttree\');return false;"><i class="icon-plus muted small"></i> Expand</button>
@@ -37,6 +38,7 @@
print_ent_physical(0, 0, "liOpen");
echo('</ul></div>');
echo('</td></tr></table>');
+ echo generate_box_close();
return TRUE;
}
@@ -125,8 +127,7 @@
}
elseif ($entry['entPhysicalClass'] == "sensor")
{
- $sensor = dbFetchRow("SELECT * FROM `sensors` AS S
- LEFT JOIN `sensors-state` AS ST ON S.`sensor_id` = ST.`sensor_id`
+ $sensor = dbFetchRow("SELECT * FROM `sensors` LEFT JOIN `sensors-state` USING(`sensor_id`)
WHERE `device_id` = ? AND (`entPhysicalIndex` = ? OR `sensor_index` = ?)", array($entry['device_id'], $entry['entPhysicalIndex'], $entry['entPhysicalIndex']));
//$ent_text .= ' ('.$sensor['sensor_value'] .' '. $sensor['sensor_class'].')';
$entry['entPhysicalName'] = generate_entity_link('sensor', $sensor);
@@ -205,43 +206,48 @@
{
case 'chassis':
case 'board':
- $text .= '<i class="oicon-database"></i> ';
+ $icon = 'oicon-database';
break;
case 'module':
case 'portInterfaceCard':
- $text .= '<i class="oicon-drive"></i> ';
+ $icon = 'oicon-drive';
break;
case 'port':
- $text .= '<i class="oicon-network-ethernet"></i> ';
+ $icon = 'oicon-network-ethernet';
break;
case 'container':
case 'flexiblePicConcentrator':
- $text .= '<i class="oicon-box-zipper"></i> ';
+ $icon = 'oicon-box-zipper';
break;
case 'stack':
- $text .= '<i class="oicon-databases"></i> ';
+ $icon = 'icon-databases';
break;
case 'fan':
case 'airflowSensor':
- $text .= '<i class="oicon-weather-wind"></i> ';
+ $icon = 'oicon-weather-wind';
break;
case 'powerSupply':
case 'powerEntryModule':
- $text .= '<i class="oicon-plug"></i> ';
+ $icon = 'oicon-plug';
break;
case 'backplane':
- $text .= '<i class="oicon-zones"></i> ';
+ $icon = 'oicon-zones';
break;
case 'sensor':
- $text .= '<i class="oicon-asterisk"></i> ';
- $sensor = dbFetchRow("SELECT * FROM `sensors` AS S
- LEFT JOIN `sensors-state` AS ST ON S.`sensor_id` = ST.`sensor_id`
+ $sensor = dbFetchRow("SELECT * FROM `sensors` LEFT JOIN `sensors-state` USING(`sensor_id`)
WHERE `device_id` = ? AND (`entPhysicalIndex` = ? OR `sensor_index` = ?)", array($device['device_id'], $ent['entPhysicalIndex'], $ent['entPhysicalIndex']));
+ if ($sensor['sensor_class'])
+ {
+ $icon = $GLOBALS['config']['sensor_types'][$sensor['sensor_class']]['icon'];
+ } else {
+ $icon = 'oicon-asterisk';
+ }
break;
default:
- $text .= '<i class="oicon-chain"></i> ';
+ $icon = 'oicon-chain';
}
-
+
+ $text .= '<i class="'.$icon.'"></i> ';
if ($ent['entPhysicalParentRelPos'] > '-1') { $text .= '<strong>'.$ent['entPhysicalParentRelPos'].'.</strong> '; }
$ent_text = '';
Index: html/includes/print/rows.inc.php
===================================================================
--- html/includes/print/rows.inc.php (revision 7900)
+++ html/includes/print/rows.inc.php (working copy)
@@ -76,7 +76,7 @@
$return .= ' <div class="box-body'.($args['padding'] ? '' : ' no-padding').'"';
if (isset($args['body-style']))
{
- $return .= 'style="'.$args['body-style'].'"';
+ $return .= ' style="'.$args['body-style'].'"';
}
$return .= '>'.PHP_EOL;
return $return;
Index: html/pages/alert_check.inc.php
===================================================================
--- html/pages/alert_check.inc.php (revision 7900)
+++ html/pages/alert_check.inc.php (working copy)
@@ -308,7 +308,7 @@
<input type="hidden" name="assoc_id" value="'. $assoc['alert_assoc_id'].'">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
- <h3 id="myModalLabel"><i class="oicon-minus-circle"></i> Delete Assocation Rule '.$assoc['alert_assoc_id'].'</h3>
+ <h3 id="myModalLabel">Delete Assocation Rule '.$assoc['alert_assoc_id'].'</h3>
</div>
<div class="modal-body">
@@ -419,7 +419,7 @@
<form id="edit" name="edit" method="post" class="form" action="">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
- <h3 id="myModalLabel"><i class="oicon-traffic-light"></i> Edit Check Conditions</h3>
+ <h3 id="myModalLabel">Edit Check Conditions</h3>
</div>
<div class="modal-body">
<span class="help-block">Please exercise care when editing here.</span>
@@ -452,7 +452,7 @@
<input type="hidden" name="alert_test_id" value="<?php echo($check['alert_test_id']); ?>" />
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
- <h3 id="myModalLabel"><i class="oicon-minus-circle"></i> Delete Alert Checker <?php echo($check['alert_test_id']); ?></h3>
+ <h3 id="myModalLabel">Delete Alert Checker <?php echo($check['alert_test_id']); ?></h3>
</div>
<div class="modal-body">
Index: html/pages/alerts.inc.php
===================================================================
--- html/pages/alerts.inc.php (revision 7900)
+++ html/pages/alerts.inc.php (working copy)
@@ -45,7 +45,7 @@
$navbar['options_right']['filters']['url'] = '#';
$navbar['options_right']['filters']['text'] = 'Filter';
$navbar['options_right']['filters']['icon'] = 'oicon-filter';
-$navbar['options_right']['filters']['link_opts'] = 'data-hover="dropdown" data-toggle="dropdown"';
+//$navbar['options_right']['filters']['link_opts'] = 'data-hover="dropdown" data-toggle="dropdown"';
$filters = array('all' => array('url' => generate_url($vars, array('page' => 'alerts', 'status' => 'all')),
'url_o' => generate_url($vars, array('page' => 'alerts', 'status' => 'all')),
Index: html/pages/contact.inc.php
===================================================================
--- html/pages/contact.inc.php (revision 7900)
+++ html/pages/contact.inc.php (working copy)
@@ -238,7 +238,7 @@
echo('<tr>
<td width="150"><i class="'.$config['entities'][$alert_test['entity_type']]['icon'].'"></i> '.nicecase($alert_test['entity_type']).'</td>
<td>'.escape_html($alert_test['alert_name']).'</td>
- <td width="25"><a href="'.generate_url(array('page' => 'contact', 'contact_id' => $contact['contact_id'], 'delete_contact_assoc' => $assoc['aca_id'])).'"><i class="oicon-minus-circle"></i></a></td>
+ <td width="25"><a href="'.generate_url(array('page' => 'contact', 'contact_id' => $contact['contact_id'], 'delete_contact_assoc' => $assoc['aca_id'])).'"><i class="icon-trash text-danger"></i></a></td>
</tr>');
}
Index: html/pages/customoids.inc.php
===================================================================
--- html/pages/customoids.inc.php (revision 7900)
+++ html/pages/customoids.inc.php (working copy)
@@ -55,9 +55,10 @@
if (count($oids))
{
// We have customoids, print the table.
+ echo generate_box_open();
?>
-<table class="table table-condensed table-striped table-hover box box-solid">
+<table class="table table-condensed table-striped table-hover">
<thead>
<tr>
<th style="width: 1px"></th>
@@ -94,7 +95,7 @@
echo ' <td><span class="label label-'.($oid['oid_type'] == "GAUGE" ? "success" : "error").'">'.$oid['oid_type'].'</span></td>';
echo ' <td>'.$oid['oid_unit'].'</td>';
echo ' <td><span class="label">'.$count.'</span></td>';
- echo ' <td><a href="#customoid_del_modal_' . $oid['oid_id'] . '" data-toggle="modal"><i class="oicon-minus-circle"></i></a></td>';
+ echo ' <td><a href="#customoid_del_modal_' . $oid['oid_id'] . '" data-toggle="modal"><i class="icon-trash text-danger"></i></a></td>';
echo ' </tr>';
$modals .= '
@@ -103,7 +104,7 @@
<input type="hidden" name="oid_id" value="'. $oid['oid_id'].'">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
- <h3 id="myModalLabel"><i class="oicon-minus-circle"></i> Delete Custom OID '.$oid['oid'].' ('.$oid['oid_id'].')</h3>
+ <h3 id="myModalLabel">Delete Custom OID '.$oid['oid'].' ('.$oid['oid_id'].')</h3>
</div>
<div class="modal-body">
Index: html/pages/device/apps/mssql/memory.inc.php
===================================================================
--- html/pages/device/apps/mssql/memory.inc.php (revision 7900)
+++ html/pages/device/apps/mssql/memory.inc.php (working copy)
@@ -49,7 +49,7 @@
echo(overlib_link($link, $graph, $overlib_content, NULL));
?>
- <div class="box box-solid info_box">
+ <div class="box box-solid">
<div class="title"><i class="oicon-memory"></i> Memory</div>
<div class="content">
<table width="100%" class="table table-striped table-condensed-more ">
Index: html/pages/device/edit/graphs.inc.php
===================================================================
--- html/pages/device/edit/graphs.inc.php (revision 7900)
+++ html/pages/device/edit/graphs.inc.php (working copy)
@@ -104,7 +104,7 @@
'value' => 'graph_toggle');
print_form($form); unset($form);
} else {
- echo('<span style="line-height: 20px;" class="btn btn-mini disabled pull-right"><i class="icon-lock"></i> Required</span>');
+ echo('<button id="submit" name="submit" type="submit" class="btn btn-default btn-mini pull-right disabled text-nowrap" disabled="1" value="Toggle"><i class="icon-lock"></i> Required</button>');
}
echo('</td></tr>');
Index: html/pages/device/entphysical.inc.php
===================================================================
--- html/pages/device/entphysical.inc.php (revision 7900)
+++ html/pages/device/entphysical.inc.php (working copy)
@@ -11,9 +11,7 @@
*
*/
-echo generate_box_open();
print_inventory($vars);
-echo generate_box_close();
register_html_title("Inventory");
Index: html/pages/device/graphs.inc.php
===================================================================
--- html/pages/device/graphs.inc.php (revision 7900)
+++ html/pages/device/graphs.inc.php (working copy)
@@ -62,7 +62,8 @@
$graph_enable = $graphs_sections[$vars['group']];
-echo('<div class="box box-solid"><table class="table table-condensed table-striped table-hover ">');
+echo generate_box_open();
+echo('<table class="table table-condensed table-striped table-hover ">');
if ($vars['group'] == "custom" && $graphs_sections['custom'])
{
@@ -105,7 +106,8 @@
}
}
-echo('</table></div>');
+echo('</table>');
+echo generate_box_close();
register_html_title("Graphs");
Index: html/pages/device/overview/information.inc.php
===================================================================
--- html/pages/device/overview/information.inc.php (revision 7900)
+++ html/pages/device/overview/information.inc.php (working copy)
@@ -11,12 +11,8 @@
*
*/
-?>
- <div class="box box-solid hidden-xl">
- <div class="box-body no-padding">
+echo generate_box_open(array('box-class' => 'hidden-xl'));
-<?php
-
if ($device['os'] == "ios") { formatCiscoHardware($device); } // FIXME or do this in a general function for all OS types with a switch($device['os']) ?
echo('<table class="table table-condensed table-striped table-hover">');
Index: html/pages/device/overview/mempools.inc.php
===================================================================
--- html/pages/device/overview/mempools.inc.php (revision 7900)
+++ html/pages/device/overview/mempools.inc.php (working copy)
@@ -15,7 +15,7 @@
$sql = "SELECT *, `mempools`.mempool_id as mempool_id";
$sql .= " FROM `mempools`";
-$sql .= " LEFT JOIN `mempools-state` ON `mempools`.mempool_id = `mempools-state`.mempool_id";
+$sql .= " LEFT JOIN `mempools-state` USING(`mempool_id`)";
$sql .= " WHERE `device_id` = ?";
$mempools = dbFetchRows($sql, array($device['device_id']));
Index: html/pages/device/overview-normal.inc.php
===================================================================
--- html/pages/device/overview-normal.inc.php (revision 7900)
+++ html/pages/device/overview-normal.inc.php (working copy)
@@ -41,7 +41,7 @@
{
?>
-<div class="box box-solid info_box">
+<div class="box box-solid">
<div class="title"><i class="oicon-network-ethernet"></i> Services</div>
<div class="content">
Index: html/pages/device/routing/ipsec_tunnels.inc.php
===================================================================
--- html/pages/device/routing/ipsec_tunnels.inc.php (revision 7900)
+++ html/pages/device/routing/ipsec_tunnels.inc.php (working copy)
@@ -45,6 +45,7 @@
$table_class = 'table-striped';
}
+echo generate_box_open();
echo('<table class="table table-hover '.$table_class.' table-condensed ">
<thead><tr><th>Local address</th><th></th><th>Peer address</th><th>Tunnel name</th><th>State</th></tr></thead>');
@@ -88,5 +89,6 @@
}
echo('</table>');
+echo generate_box_close();
// EOF
Index: html/pages/graphs.inc.php
===================================================================
--- html/pages/graphs.inc.php (revision 7900)
+++ html/pages/graphs.inc.php (working copy)
@@ -146,7 +146,7 @@
// Start form for the custom range.
- echo '<div class="box box-solid" style="padding-bottom: 5px;">';
+ echo generate_box_open(array('box-style' => 'padding-bottom: 5px;'));
$thumb_array = array('sixhour' => '6 Hours',
'day' => '24 Hours',
@@ -186,7 +186,7 @@
$graph_array['height'] = "300";
$graph_array['width'] = $graph_width;
- print_optionbar_end();
+ echo generate_box_close();
$form = array('type' => 'rows',
'space' => '5px',
Index: html/pages/group.inc.php
===================================================================
--- html/pages/group.inc.php (revision 7900)
+++ html/pages/group.inc.php (working copy)
@@ -456,7 +456,7 @@
case "device":
echo generate_box_open();
- echo '<table class="box box-solid table table-condensed table-striped table-hover">';
+ echo '<table class="table table-condensed table-striped table-hover">';
foreach ($members as $member)
{
@@ -518,7 +518,7 @@
$list = array('device_id' => 1, 'entity_id' => 1);
- echo('<table class="box box-solid table table-condensed table-striped table-hover">
+ echo('<table class="table table-condensed table-striped table-hover">
<thead>
<tr>
<th style="width: 1px;"></th>
Index: html/pages/groups.inc.php
===================================================================
--- html/pages/groups.inc.php (revision 7900)
+++ html/pages/groups.inc.php (working copy)
@@ -127,7 +127,7 @@
//echo '</strong></td>';
echo '<td><strong>';
- echo '<a href="', generate_url(array('page' => 'group', 'group_id' => $group['group_id'])), '">' . escape_html($group['group_name']). '</a></strong><br />';
+ echo '<a href="', generate_url(array('page' => 'group', 'group_id' => $group['group_id'], 'entity_type' => $group['entity_type'])), '">' . escape_html($group['group_name']). '</a></strong><br />';
echo '<i>',escape_html($group['group_descr']),'</i>';
echo '</td>';
Index: html/pages/neighbours.inc.php
===================================================================
--- html/pages/neighbours.inc.php (revision 7900)
+++ html/pages/neighbours.inc.php (working copy)
@@ -44,7 +44,10 @@
{
foreach (dbFetchColumn('SELECT DISTINCT `' . $column . '` FROM `neighbours`' . $where) as $entry)
{
- $form_items[$param][$entry] = ($param == 'protocols' ? nicecase($entry) : escape_html($entry));
+ if (!empty($entry))
+ {
+ $form_items[$param][$entry] = ($param == 'protocols' ? nicecase($entry) : escape_html($entry));
+ }
}
}
@@ -68,13 +71,13 @@
'type' => 'multiselect',
'name' => 'Platform',
'width' => '100%',
- 'value' => escape_html($vars['platform']),
+ 'value' => $vars['platform'],
'values' => $form_items['platforms']);
$form['row'][0]['version'] = array(
'type' => 'multiselect',
'name' => 'Version',
'width' => '100%',
- 'value' => escape_html($vars['version']),
+ 'value' => $vars['version'],
'values' => $form_items['versions']);
$form['row'][0]['remote_port_id'] = array(
'type' => 'select',
Index: html/pages/routing/vrf.inc.php
===================================================================
--- html/pages/routing/vrf.inc.php (revision 7900)
+++ html/pages/routing/vrf.inc.php (working copy)
@@ -152,12 +152,13 @@
}
echo("</table>");
- echo print_box_close();
+ echo generate_box_close();
} else {
// Print single VRF
-
+
+ echo generate_box_open();
echo('<table class="table table-striped">');
$vrf = dbFetchRow("SELECT * FROM `vrfs` WHERE `mplsVpnVrfRouteDistinguisher` = ? ".$GLOBALS['cache']['where']['devices_permitted'], array($vars['vrf']));
echo('<tr>');
@@ -165,16 +166,19 @@
echo('<td style="width: 100px;" class="small">' . $vrf['mplsVpnVrfRouteDistinguisher'] . '</td>');
echo('<td style="width: 200px;" class="small">' . $vrf['mplsVpnVrfDescription'] . '</td>');
echo('</table>');
+ echo generate_box_close();
$vrf_devices = dbFetchRows("SELECT * FROM `vrfs` LEFT JOIN `devices` USING (`device_id`) WHERE `mplsVpnVrfRouteDistinguisher` = ? ".$GLOBALS['cache']['where']['devices_permitted'], array($vrf['mplsVpnVrfRouteDistinguisher']));
foreach ($vrf_devices as $device)
{
$hostname = $device['hostname'];
+ echo generate_box_open();
echo('<table cellpadding="10" cellspacing="0" class="table table-striped" width="100%">');
print_device_row($device);
echo('</table>');
+ echo generate_box_close();
unset($seperator);
echo('<div style="margin: 10px;"><table class="table table-striped">');
$i=1;
Index: includes/definitions/apps.inc.php
===================================================================
--- includes/definitions/apps.inc.php (revision 7900)
+++ includes/definitions/apps.inc.php (working copy)
@@ -41,5 +41,7 @@
$config['app']['postfix_mailgraph']['top'] = array('sent', 'spam','reject');
$config['app']['postfix_qshape']['top'] = array('stats');
$config['app']['lvs_stats']['top'] = array('connections', 'packets', 'bytes');
+$config['app']['varnish']['top'] = array('backend', 'cache', 'lru');
+$config['app']['vmwaretools']['top'] = array('mem', 'cpu');
// EOF
Index: includes/definitions/rewrites.inc.php
===================================================================
--- includes/definitions/rewrites.inc.php (revision 7900)
+++ includes/definitions/rewrites.inc.php (working copy)
@@ -100,6 +100,7 @@
'wastetoner' => 'Waste Toner Box',
'wasteink' => 'Waste Ink Box',
'voip' => 'VoIP',
+ 'vmwaretools' => 'VMware Tools',
);
$config['wifi']['channels']['2.4'] = array(
Index: includes/definitions.inc.php
===================================================================
--- includes/definitions.inc.php (revision 7900)
+++ includes/definitions.inc.php (working copy)
@@ -368,7 +368,7 @@
$config['toner']['cyan'] = array('cyan');
$config['toner']['magenta'] = array('magenta');
$config['toner']['yellow'] = array('yellow', 'giallo', 'gul');
-$config['toner']['black'] = array('black', 'preto', 'nero');
+$config['toner']['black'] = array('black', 'preto', 'nero', 'svart');
// Nicer labels for the SLA types
$config['sla_type_labels']['echo'] = 'ICMP ping';
Index: includes/rewrites.inc.php
===================================================================
--- includes/rewrites.inc.php (revision 7900)
+++ includes/rewrites.inc.php (working copy)
@@ -2820,7 +2820,7 @@
$string = str_replace("DFC Card", "DFC", $string);
$string = str_replace("Centralized Forwarding Card", "CFC", $string);
$string = str_replace(array('fan-tray'), 'Fan Tray', $string);
- $string = str_replace(array('Temp: ', 'CPU of ', 'CPU ', '(TM)', '(R)'), '', $string);
+ $string = str_replace(array('Temp: ', 'CPU of ', 'CPU ', '(TM)', '(R)', '(r)'), '', $string);
$string = str_replace('GenuineIntel Intel', 'Intel', $string);
$string = preg_replace("/(HP \w+) Switch/", "$1", $string);
$string = preg_replace("/power[ -]supply( \d+)?(?: (?:module|sensor))?/i", "Power Supply$1", $string);