From 30594afdec7ef76ae917617407a83f263bccffc5 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Thu, 10 Jul 2014 02:14:07 +0200
Subject: support -U $foo with -lh

---
 Changelog |  1 +
 bin/icli  | 24 +++++++++++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/Changelog b/Changelog
index dcb7792..c980c21 100644
--- a/Changelog
+++ b/Changelog
@@ -2,6 +2,7 @@ git HEAD
 
     * Do not throw warnings when encountering a host/service with an empty
       contact group list
+    * Support -U user for hosts (-lh) as well
 
 App::Icli 0.48 - Fri Jun 13 2014
 
diff --git a/bin/icli b/bin/icli
index 44dd584..f6c33fa 100755
--- a/bin/icli
+++ b/bin/icli
@@ -312,6 +312,10 @@ sub filter_host {
 		return 0;
 	}
 
+	if ( $as_contact and not has_contact_host( $h, $as_contact ) ) {
+		return 0;
+	}
+
 	return 1;
 }
 
@@ -328,14 +332,22 @@ sub filter_service {
 		return 0;
 	}
 
-	if ( $as_contact and not has_contact( $s, $as_contact ) ) {
+	if ( $as_contact and not has_contact_service( $s, $as_contact ) ) {
 		return 0;
 	}
 
 	return 1;
 }
 
-sub has_contact {
+sub has_contact_host {
+	my ( $h, $contact ) = @_;
+
+	my $conf_h = $config->{hosts}{ $h->{host_name} };
+
+	return any { $_ eq $contact } @{ $conf_h->{contacts} };
+}
+
+sub has_contact_service {
 	my ( $s, $contact ) = @_;
 
 	my $conf_s
@@ -457,13 +469,19 @@ sub enhance_status {
 			}
 		}
 	}
+	for my $h ( values %{ $config->{hosts} } ) {
+		if ( $h->{contacts} ) {
+			$h->{contacts} =~ s{^ *}{}o;
+			$h->{contacts} = [ split( m{, *}, $h->{contacts} ) ];
+		}
+	}
 	HOST: for my $h ( keys %{ $config->{services} } ) {
 		for my $s ( @{ $config->{services}->{$h} } ) {
 			if ( $s->{contacts} ) {
 				$s->{contacts} =~ s{^ *}{}o;
 				$s->{contacts} = [ split( m{, *}, $s->{contacts} ) ];
 			}
-			if ($s->{contact_groups}) {
+			if ( $s->{contact_groups} ) {
 				for my $group ( split( m{, *}, $s->{contact_groups} ) ) {
 					push(
 						@{ $s->{contacts} },
-- 
cgit v1.2.3