Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'frontends/php/search.php')
-rw-r--r--frontends/php/search.php22
1 files changed, 11 insertions, 11 deletions
diff --git a/frontends/php/search.php b/frontends/php/search.php
index 2fc6d04fd78..82b301d1d1a 100644
--- a/frontends/php/search.php
+++ b/frontends/php/search.php
@@ -63,7 +63,7 @@ $rows_per_page = CWebUser::$data['rows_per_page'];
$searchWidget = new CWidget('search_wdgt');
-$search = get_request('search', '');
+$search = getRequest('search', '');
// Header
if (zbx_empty($search)) {
@@ -203,7 +203,7 @@ foreach ($hosts as $hnum => $host) {
}
// display the host name only if it matches the search string and is different from the visible name
- if ($host['host'] !== $host['name'] && zbx_stripos($host['host'], $search) !== false) {
+ if ($host['host'] !== $host['name'] && stripos($host['host'], $search) !== false) {
$hostCell[] = BR();
$hostCell[] = '(';
$hostCell[] = make_decoration($host['host'], $search);
@@ -217,7 +217,7 @@ foreach ($hosts as $hnum => $host) {
$hostCell,
$hostip,
$hostdns,
- new CLink(_('Latest data'), 'latest.php?'.$link),
+ new CLink(_('Latest data'), 'latest.php?filter_set=1&groupids[]='.$group['groupid'].'&hostids[]='.$hostid),
new CLink(_('Triggers'), 'tr_status.php?'.$link),
new CLink(_('Events'), 'events.php?source='.EVENT_SOURCE_TRIGGERS.'&'.$link),
new CLink(_('Graphs'), 'charts.php?'.$link),
@@ -232,9 +232,9 @@ foreach ($hosts as $hnum => $host) {
));
}
-$searchHostWidget = new CUIWidget('search_hosts', $table);
+$searchHostWidget = new CCollapsibleUiWidget('search_hosts', $table);
$searchHostWidget->open = (bool) CProfile::get('web.search.hats.search_hosts.state', true);
-$searchHostWidget->setHeader(_('Hosts'), SPACE);
+$searchHostWidget->setHeader(_('Hosts'));
$searchHostWidget->setFooter(_s('Displaying %1$s of %2$s found', $viewCount, $overalCount));
$searchWidget->addItem(new CDiv($searchHostWidget));
@@ -324,7 +324,7 @@ foreach ($hostGroups as $hnum => $group) {
$table->addRow(array(
$hgroup_link,
- new CLink(_('Latest data'), 'latest.php?'.$link),
+ new CLink(_('Latest data'), 'latest.php?filter_set=1&groupids[]='.$hostgroupid),
new CLink(_('Triggers'), 'tr_status.php?'.$link),
new CLink(_('Events'), 'events.php?source='.EVENT_SOURCE_TRIGGERS.'&'.$link),
new CLink(_('Graphs'), 'charts.php?'.$link),
@@ -334,9 +334,9 @@ foreach ($hostGroups as $hnum => $group) {
));
}
-$searchHostGroupWidget = new CUIWidget('search_hostgroup', $table);
+$searchHostGroupWidget = new CCollapsibleUiWidget('search_hostgroup', $table);
$searchHostGroupWidget->open = (bool) CProfile::get('web.search.hats.search_hostgroup.state', true);
-$searchHostGroupWidget->setHeader(_('Host groups'), SPACE);
+$searchHostGroupWidget->setHeader(_('Host groups'));
$searchHostGroupWidget->setFooter(_s('Displaying %1$s of %2$s found', $viewCount, $overalCount));
$searchWidget->addItem(new CDiv($searchHostGroupWidget));
@@ -461,7 +461,7 @@ if ($admin) {
}
// display the template host name only if it matches the search string and is different from the visible name
- if ($template['host'] !== $template['name'] && zbx_stripos($template['host'], $search) !== false) {
+ if ($template['host'] !== $template['name'] && stripos($template['host'], $search) !== false) {
$templateCell[] = BR();
$templateCell[] = '(';
$templateCell[] = make_decoration($template['host'], $search);
@@ -480,9 +480,9 @@ if ($admin) {
));
}
- $searchTemplateWidget = new CUIWidget('search_templates', $table);
+ $searchTemplateWidget = new CCollapsibleUiWidget('search_templates', $table);
$searchTemplateWidget->open = (bool) CProfile::get('web.search.hats.search_templates.state', true);
- $searchTemplateWidget->setHeader(_('Templates'), SPACE);
+ $searchTemplateWidget->setHeader(_('Templates'));
$searchTemplateWidget->setFooter(_s('Displaying %1$s of %2$s found', $viewCount, $overalCount));
$searchWidget->addItem(new CDiv($searchTemplateWidget));