oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

oops, checked in some mistakes, fixing

Browse source
This commit is contained in:
JT Smith 2005-12-01 23:19:52 +00:00
parent 99df1f414e
commit c8cc6ddf8d
2 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/WebGUI.pm
View file

@ -47,21 +47,19 @@ sub handler {
$session{wguri} = $r->uri; $session{wguri} = $r->uri;
$session{config} = WebGUI::Config::getConfig($s->dir_config('WebguiRoot'),$session{site}); $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. ### 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}}) { foreach my $url ($session{config}{extrasURL}, @{$session{config}{passthruUrls}}) {
# return Apache2::Const::DECLINED if ($session{wguri} =~ m/^$url/); return Apache2::Const::DECLINED if ($session{wguri} =~ m/^$url/);
# } }
# my $uploads = $session{config}{uploadsURL}; my $uploads = $session{config}{uploadsURL};
# if ($session{wguri} =~ m/^$uploads/) { if ($session{wguri} =~ m/^$uploads/) {
# $r->handler('perl-script'); $r->set_handlers(PerlAccessHandler => \&uploadsHandler);
# $r->set_handlers(PerlAccessHandler => \&uploadsHandler); } else {
# } else {
$session{requestedUrl} = $session{wguri}; $session{requestedUrl} = $session{wguri};
my $gateway = $session{config}{gateway}; my $gateway = $session{config}{gateway};
$session{requestedUrl} =~ s/^$gateway(.*)$/$1/; $session{requestedUrl} =~ s/^$gateway(.*)$/$1/;
# $r->handler('perl-script');
$r->set_handlers(PerlResponseHandler => \&contentHandler); $r->set_handlers(PerlResponseHandler => \&contentHandler);
$r->set_handlers(PerlTransHandler => sub { return Apache2::Const::OK }); $r->set_handlers(PerlTransHandler => sub { return Apache2::Const::OK });
# } }
return Apache2::Const::DECLINED; return Apache2::Const::DECLINED;
} }

1
lib/WebGUI/Operation/WebGUI.pm
View file

@ -96,7 +96,6 @@ sub www_setup {
WebGUI::Setting::set('companyEmail',WebGUI::FormProcessor::email("companyEmail")); WebGUI::Setting::set('companyEmail',WebGUI::FormProcessor::email("companyEmail"));
WebGUI::HTTP::setRedirect(WebGUI::URL::gateway()); WebGUI::HTTP::setRedirect(WebGUI::URL::gateway());
return ""; return "";
#$output .= '<a href="'.WebGUI::URL::gateway().'">Configuration complete. Click here to go to your new site.</a>';
} else { } else {
$output .= '<legend align="left">Admin Account</legend>'; $output .= '<legend align="left">Admin Account</legend>';
my $u = WebGUI::User->new('3'); my $u = WebGUI::User->new('3');