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

no message

Browse source
This commit is contained in:
Frank Dillon 2003-12-21 16:31:06 +00:00
parent 4109fb7e0e
commit 50204c82f1
4 changed files with 30 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/WebGUI/Auth.pm
View file

@ -19,6 +19,7 @@ use DBI;
use strict qw(subs vars);
use Tie::IxHash;
use WebGUI::DateTime;
use WebGUI::ErrorHandler;
use WebGUI::FormProcessor;
use WebGUI::HTML;
use WebGUI::HTMLForm;
@ -441,6 +442,13 @@ sub getSetting {
return $session{setting}{$setting};
}
#-------------------------------------------------------------------
sub init {
my $self = shift;
WebGUI::ErrorHandler::warn("In init");
return $self->displayLogin;
}
#-------------------------------------------------------------------
=head2 isCallable ( method )
@ -540,6 +548,7 @@ sub recoverPassword {
my $self = shift;
my $method = $_[0];
my $vars = $_[1];
my $template = $_[2] || 'Auth/'.$self->authMethod.'/Recovery';
$vars->{displayTitle} = '<h1>'.WebGUI::International::get(71).'</h1>';
@ -554,7 +563,8 @@ sub recoverPassword {
$vars->{'recover.options.accountExists'} = '<a href="'.WebGUI::URL::page('op=displayLogin').'">'.WebGUI::International::get(73).'</a>';
if ($session{setting}{anonymousRegistration}) {
$vars->{'recover.options.anonymousRegistration'} = '<a href="'.WebGUI::URL::page('op=createAccount').'">'.WebGUI::International::get(67).'</a>';
}
}
return WebGUI::Template::process(WebGUI::Template::get(1,$template), $vars);
}
#-------------------------------------------------------------------

3
lib/WebGUI/Auth/WebGUI.pm
View file

@ -294,8 +294,7 @@ sub recoverPassword {
$vars->{'recover.message'} = $_[0] if ($_[0]);
$vars->{'recover.form.email'} = WebGUI::Form::text({"name"=>"email"});
$vars->{'recover.form.email.label'} = WebGUI::International::get(56);
$self->SUPER::recoverPassword("recoverPasswordFinish",$vars);
return WebGUI::Template::process(WebGUI::Template::get(1,'Auth/WebGUI/Recovery'), $vars);
return $self->SUPER::recoverPassword("recoverPasswordFinish",$vars);
}
#-------------------------------------------------------------------

1
lib/WebGUI/Operation.pm
View file

@ -11,7 +11,6 @@ package WebGUI::Operation;
#-------------------------------------------------------------------
use strict;
#use WebGUI::Operation::Account;
use WebGUI::Operation::Auth;
use WebGUI::Operation::Admin;
use WebGUI::Operation::Clipboard;

37
lib/WebGUI/Privilege.pm
View file

@ -22,7 +22,6 @@ use WebGUI::Group;
use WebGUI::Grouping;
use WebGUI::International;
use WebGUI::Macro;
use WebGUI::Operation::Account ();
use WebGUI::Session;
use WebGUI::SQL;
use WebGUI::URL;
@ -397,24 +396,24 @@ Returns a message stating that the user does not have the privileges necessary t
=cut
sub noAccess {
if($session{env}{MOD_PERL}) {
my $r = Apache->request;
if(defined($r)) {
$r->custom_response(401, '<!--No Access-->' );
$r->status(401);
}
} else {
$session{header}{status} = 401;
}
my ($output);
if ($session{user}{userId} <= 1) {
$output = WebGUI::Operation::Account::www_displayLogin();
} else {
$output = '<h1>'.WebGUI::International::get(37).'</h1>';
$output .= WebGUI::International::get(39);
$output .= '<p>';
}
return $output;
if($session{env}{MOD_PERL}) {
my $r = Apache->request;
if(defined($r)) {
$r->custom_response(401, '<!--No Access-->' );
$r->status(401);
}
} else {
$session{header}{status} = 401;
}
my ($output);
if ($session{user}{userId} <= 1) {
$output = WebGUI::Operation::Auth::www_auth("init");
} else {
$output = '<h1>'.WebGUI::International::get(37).'</h1>';
$output .= WebGUI::International::get(39);
$output .= '<p>';
}
return $output;
}
#-------------------------------------------------------------------