From c8cc6ddf8d71d8c345338cb43380427f5a9984f1 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Thu, 1 Dec 2005 23:19:52 +0000
Subject: [PATCH] oops, checked in some mistakes, fixing

---
 lib/WebGUI.pm                  | 18 ++++++++----------
 lib/WebGUI/Operation/WebGUI.pm |  1 -
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/lib/WebGUI.pm b/lib/WebGUI.pm
index d3a26bc95..01594605e 100644
--- a/lib/WebGUI.pm
+++ b/lib/WebGUI.pm
@@ -47,21 +47,19 @@ sub handler {
 	$session{wguri} = $r->uri;
 	$session{config} = WebGUI::Config::getConfig($s->dir_config('WebguiRoot'),$session{site});
 	### Add Apache Request stuff to global session.  Yes, I know the global hash will eventually be deprecated.
-#	foreach my $url ($session{config}{extrasURL}, @{$session{config}{passthruUrls}}) {
-#		return Apache2::Const::DECLINED if ($session{wguri} =~ m/^$url/);
-#	}
-#	my $uploads = $session{config}{uploadsURL};
-#	if ($session{wguri} =~ m/^$uploads/) {
-#		$r->handler('perl-script');
-#		$r->set_handlers(PerlAccessHandler => \&uploadsHandler);
-#	} else {
+	foreach my $url ($session{config}{extrasURL}, @{$session{config}{passthruUrls}}) {
+		return Apache2::Const::DECLINED if ($session{wguri} =~ m/^$url/);
+	}
+	my $uploads = $session{config}{uploadsURL};
+	if ($session{wguri} =~ m/^$uploads/) {
+		$r->set_handlers(PerlAccessHandler => \&uploadsHandler);
+	} else {
 		$session{requestedUrl} = $session{wguri};
 		my $gateway = $session{config}{gateway};
 		$session{requestedUrl} =~ s/^$gateway(.*)$/$1/;
-#		$r->handler('perl-script');
 		$r->set_handlers(PerlResponseHandler => \&contentHandler);
 		$r->set_handlers(PerlTransHandler => sub { return Apache2::Const::OK });
-#	}
+	}
 	return Apache2::Const::DECLINED;
 }
 
diff --git a/lib/WebGUI/Operation/WebGUI.pm b/lib/WebGUI/Operation/WebGUI.pm
index 4091eb5f7..a480e99c6 100644
--- a/lib/WebGUI/Operation/WebGUI.pm
+++ b/lib/WebGUI/Operation/WebGUI.pm
@@ -96,7 +96,6 @@ sub www_setup {
 		WebGUI::Setting::set('companyEmail',WebGUI::FormProcessor::email("companyEmail"));
 		WebGUI::HTTP::setRedirect(WebGUI::URL::gateway());
 		return "";
-		#$output .= '<a href="'.WebGUI::URL::gateway().'">Configuration complete. Click here to go to your new site.</a>';
 	} else {
 		$output .= '<legend align="left">Admin Account</legend>';
 		my $u = WebGUI::User->new('3');