From e812135a452a00fe2f51280ca44bf21071b59368 Mon Sep 17 00:00:00 2001
From: Daniel Tiefnig <dtiefnig@sipwise.com>
Date: Tue, 22 Apr 2008 23:44:33 +0000
Subject: [PATCH] printing friendly error string on empty search boxes

---
 lib/admin/Controller/subscriber.pm | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/lib/admin/Controller/subscriber.pm b/lib/admin/Controller/subscriber.pm
index 65ea451..7ae3efa 100644
--- a/lib/admin/Controller/subscriber.pm
+++ b/lib/admin/Controller/subscriber.pm
@@ -77,6 +77,22 @@ sub search : Local {
     $c->session->{search_filter} = \%filter;
     $c->session->{exact_filter} = \%exact;
 
+    $c->stash->{exact_user} = $exact{username};
+    $c->stash->{exact_e164} = $exact{number};
+    $c->stash->{exact_uuid} = $exact{uuid};
+
+    $c->stash->{search_user} = $filter{username};
+    $c->stash->{search_e164} = $filter{number};
+    $c->stash->{search_uuid} = $filter{uuid};
+    $c->stash->{search_user} =~ s/^\%*(.*?)\%*$/$1/ if defined $c->stash->{search_user};
+    $c->stash->{search_e164} =~ s/^\%*(.*?)\%*$/$1/ if defined $c->stash->{search_e164};
+    $c->stash->{search_uuid} =~ s/^\%*(.*?)\%*$/$1/ if defined $c->stash->{search_uuid};
+
+    unless(keys %filter) {
+        $c->session->{messages}{toperr} = 'Web.MissingSearchString';
+        return;
+    }
+
     my $offset = $c->request->params->{offset} || 0;
     $offset = 0 if $offset !~ /^\d+$/;
 
@@ -90,16 +106,6 @@ sub search : Local {
                                                         \$subscriber_list
                                                       );
 
-    $c->stash->{search_user} = $filter{username};
-    $c->stash->{search_e164} = $filter{number};
-    $c->stash->{search_uuid} = $filter{uuid};
-    $c->stash->{search_user} =~ s/^\%*(.*?)\%*$/$1/ if defined $c->stash->{search_user};
-    $c->stash->{search_e164} =~ s/^\%*(.*?)\%*$/$1/ if defined $c->stash->{search_e164};
-    $c->stash->{search_uuid} =~ s/^\%*(.*?)\%*$/$1/ if defined $c->stash->{search_uuid};
-    $c->stash->{exact_user} = $exact{username};
-    $c->stash->{exact_e164} = $exact{number};
-    $c->stash->{exact_uuid} = $exact{uuid};
-
     $c->stash->{searched} = 1;
     if(ref $$subscriber_list{subscribers} eq 'ARRAY' and @{$$subscriber_list{subscribers}}) {
         $c->stash->{subscriber_list} = $$subscriber_list{subscribers};