small adjustments to session middleware

plainblack · Jun 17, 2010 · 29428d7 · 29428d7
1 parent 18525e7
commit 29428d7
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/lib/WebGUI/Middleware/Session.pm b/lib/WebGUI/Middleware/Session.pm
@@ -3,10 +3,8 @@ use strict;
 use parent qw(Plack::Middleware);
 use WebGUI::Config;
 use WebGUI::Session;
-use WebGUI::Utility ();
 use Try::Tiny;
 use WebGUI::Middleware::HTTPExceptions;
-use Plack::Middleware::SimpleLogger;
 use Plack::Util::Accessor qw( config );
 
 =head1 NAME
@@ -37,6 +35,7 @@ sub call {
 
     # Logger fallback
     if (!$env->{'psgix.logger'}) {
+        require Plack::Middleware::SimpleLogger;
         $app = Plack::Middleware::SimpleLogger->wrap( $app );
     }
 
@@ -87,7 +86,7 @@ sub canShowDebug {
         if $ips eq '';
     $ips =~ s/\s+//g;
     my @ips = split /,/, $ips;
-    my $ok = WebGUI::Utility::isInSubnet($session->env->getIp, [ @ips ] );
+    my $ok = Net::CIDR::Lite->new(@ips)->find($env->{REMOTE_ADDR});
     return $ok;
 }