Fix module loading

Author: nigelhorne

cgi-bin/page.fcgi

@@ -328,7 +328,10 @@ sub doit
 
 	# Check if this is a CAPTCHA verification attempt
 	if ($info->param('g-recaptcha-response')) {
-		require 'VWF::CAPTCHA' && VWF::CAPTCHA->import() unless VWF::CAPTCHA->can('new');
+		unless(VWF::CAPTCHA->can('new')) {
+			require VWF::CAPTCHA;
+			VWF::CAPTCHA->import();
+		}
 
 		my $recaptcha_config = $config->recaptcha();
 		if ($recaptcha_config && $recaptcha_config->{enabled}) {
@@ -389,7 +392,10 @@ sub doit
 				$logger->warn("Hard rate limit exceeded for $client_ip ($request_count requests)");
 				$info->status(429);
 
-				require 'VWF::Display::captcha' && VWF::Display::captcha->import() unless VWF::Display::captcha->can('new');
+				unless(VWF::Display::captcha->can('new')) {
+					require VWF::Display::captcha;
+					VWF::Display::captcha->import();
+				}
 				my $display = VWF::Display::captcha->new({
 					cachedir => $cachedir,
 					info => $info,
@@ -538,7 +544,10 @@ sub doit
 
 			# TODO: consider creating a whitelist of valid modules
 			$logger->debug("doit(): Loading module $display_module from @INC");
-			eval "require $display_module; 1" && $display_module->import() unless $display_module->can('new');
+			unless($display_module->can('new')) {
+				eval "require $display_module; 1";
+				$display_module->import();
+			}
 			if($@) {
 				$logger->debug("Failed to load module $display_module: $@");
 				$logger->info("Unknown page $page");
@@ -773,7 +782,10 @@ sub vwflog
 	}
 
 	if($syslog) {
-		require 'Sys::Syslog' && Sys::Syslog->import() unless Sys::Syslog->can('openlog');
+		unless(Sys::Syslog->can('openlog')) {
+			require Sys::Syslog;
+			Sys::Syslog->import();
+		}
 
 		if(ref($syslog) eq 'HASH') {
 			Sys::Syslog::setlogsock($syslog);

lib/VWF/Display.pm

@@ -81,7 +81,10 @@ sub new
 
 	if(defined($ENV{'HTTP_REFERER'})) {
 		# Protect against Shellshocker
-		require 'Data::Validate::URI' && Data::Validate::URI->import() unless Data::Validate::URI->can('new');
+		unless(Data::Validate::URI->can('new')) {
+			require Data::Validate::URI;
+			Data::Validate::URI->import();
+		}
 
 		unless(Data::Validate::URI->new()->is_uri($ENV{'HTTP_REFERER'})) {
 			return;	# Block invalid referrers