#721 search will trim whitespace and handle more MAC formats

lib/App/Netdisco/Web.pm

@@ -145,6 +145,9 @@ hook 'before' => sub {
   $key =~ s|.*/(\w+)/(\w+)$|${1}_${2}|;
   var(sidebar_key => $key);
 
+  # trim whitespace
+  params->{'q'} =~ s/^\s+|\s+$//g if param('q');
+
   # copy sidebar defaults into vars so we can mess about with it
   foreach my $sidebar (keys %{setting('sidebar_defaults')}) {
     vars->{'sidebar_defaults'}->{$sidebar} = { map {

lib/App/Netdisco/Web/Search.pm

@@ -32,7 +32,7 @@ get '/search' => require_login sub {
         }
 
         # pick most likely tab for initial results
-        if ($q =~ m/^\d+$/) {
+        if ($q =~ m/^[0-9]+$/ and $q < 4096) {
             params->{'tab'} = 'vlan';
         }
         else {