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

Update Auth system for wg8 instanciators.

Browse source
This commit is contained in:
Colin Kuskie 2010-03-04 08:52:46 -08:00
parent 360acb5191
commit 3d9006b643
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/WebGUI/Auth.pm
View file

@ -266,7 +266,7 @@ sub createAccount {
$vars->{'login.url'} = $self->session->url->page('op=auth;method=init'); $vars->{'login.url'} = $self->session->url->page('op=auth;method=init');
$vars->{'login.label'} = $i18n->get(58); $vars->{'login.label'} = $i18n->get(58);
return WebGUI::Asset::Template->new($self->session,$self->getCreateAccountTemplateId)->process($vars); return WebGUI::Asset::Template->newById($self->session,$self->getCreateAccountTemplateId)->process($vars);
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -319,7 +319,7 @@ sub createAccountSave {
$var->{welcomeMessage} = $self->getSetting("welcomeMessage"); $var->{welcomeMessage} = $self->getSetting("welcomeMessage");
$var->{newUser_username} = $username; $var->{newUser_username} = $username;
$var->{newUser_password} = $password; $var->{newUser_password} = $password;
my $message = WebGUI::Asset::Template->new($self->session,$self->getSetting('welcomeMessageTemplate'))->process($var); my $message = WebGUI::Asset::Template->newById($self->session,$self->getSetting('welcomeMessageTemplate'))->process($var);
WebGUI::Macro::process($self->session,\$message); WebGUI::Macro::process($self->session,\$message);
WebGUI::Inbox->new($self->session)->addMessage({ WebGUI::Inbox->new($self->session)->addMessage({
message => $message, message => $message,
@ -406,7 +406,7 @@ sub deactivateAccount {
$var{'yes.label'} = $i18n->get(44); $var{'yes.label'} = $i18n->get(44);
$var{'no.url'} = $self->session->url->page(); $var{'no.url'} = $self->session->url->page();
$var{'no.label'} = $i18n->get(45); $var{'no.label'} = $i18n->get(45);
return WebGUI::Asset::Template->new($self->session,"PBtmpl0000000000000057")->process(\%var); return WebGUI::Asset::Template->newById($self->session,"PBtmpl0000000000000057")->process(\%var);
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -509,7 +509,7 @@ sub displayAccount {
########### ACCOUNT SHUNT ########### ACCOUNT SHUNT
#The following is a shunt which allows the displayAccount page to be displayed in the #The following is a shunt which allows the displayAccount page to be displayed in the
#Account system. This shunt will be replaced in WebGUI 8 when the API can be broken #Account system. This shunt will be replaced in WebGUI 8 when the API can be broken
my $output = WebGUI::Asset::Template->new($self->session,$self->getAccountTemplateId)->process($vars); my $output = WebGUI::Asset::Template->newById($self->session,$self->getAccountTemplateId)->process($vars);
#If the account system is calling this method, just return the template #If the account system is calling this method, just return the template
my $op = $self->session->form->get("op"); my $op = $self->session->form->get("op");
if($op eq "account") { if($op eq "account") {
@ -571,7 +571,7 @@ sub displayLogin {
$vars->{'anonymousRegistration.isAllowed'} = ($self->session->setting->get("anonymousRegistration")); $vars->{'anonymousRegistration.isAllowed'} = ($self->session->setting->get("anonymousRegistration"));
$vars->{'createAccount.url'} = $self->session->url->page('op=auth;method=createAccount'); $vars->{'createAccount.url'} = $self->session->url->page('op=auth;method=createAccount');
$vars->{'createAccount.label'} = $i18n->get(67); $vars->{'createAccount.label'} = $i18n->get(67);
return WebGUI::Asset::Template->new($self->session,$self->getLoginTemplateId)->process($vars); return WebGUI::Asset::Template->newById($self->session,$self->getLoginTemplateId)->process($vars);
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

2
lib/WebGUI/Auth/LDAP.pm
View file

@ -404,7 +404,7 @@ sub displayAccount {
########### ACCOUNT SHUNT ########### ACCOUNT SHUNT
#The following is a shunt which allows the displayAccount page to be displayed in the #The following is a shunt which allows the displayAccount page to be displayed in the
#Account system. This shunt will be replaced in WebGUI 8 when the API can be broken #Account system. This shunt will be replaced in WebGUI 8 when the API can be broken
my $output = WebGUI::Asset::Template->new($self->session,$self->getAccountTemplateId)->process($vars); my $output = WebGUI::Asset::Template->newById($self->session,$self->getAccountTemplateId)->process($vars);
#If the account system is calling this method, just return the template #If the account system is calling this method, just return the template
my $op = $self->session->form->get("op"); my $op = $self->session->form->get("op");
if($op eq "account") { if($op eq "account") {

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

@ -284,7 +284,7 @@ sub createAccountSave {
$var->{newUser_username} = $username; $var->{newUser_username} = $username;
$var->{activationUrl} = $session->url->page("op=auth;method=validateEmail;key=".$key, 'full'); $var->{activationUrl} = $session->url->page("op=auth;method=validateEmail;key=".$key, 'full');
my $text = my $text =
WebGUI::Asset::Template->new($self->session,$self->getSetting('accountActivationTemplate'))->process($var); WebGUI::Asset::Template->newById($self->session,$self->getSetting('accountActivationTemplate'))->process($var);
WebGUI::Macro::process($self->session,\$text); WebGUI::Macro::process($self->session,\$text);
$mail->addText($text); $mail->addText($text);
$mail->addFooter; $mail->addFooter;
@ -853,7 +853,7 @@ sub emailRecoverPassword {
$vars->{'recoverFormUsername'} = WebGUI::Form::text($session, {name => 'username'}); $vars->{'recoverFormUsername'} = WebGUI::Form::text($session, {name => 'username'});
$vars->{'recoverFormUsernameLabel'} = $i18n->get(50); $vars->{'recoverFormUsernameLabel'} = $i18n->get(50);
return WebGUI::Asset::Template->new($self->session,$self->getPasswordRecoveryTemplateId)->process($vars); return WebGUI::Asset::Template->newById($self->session,$self->getPasswordRecoveryTemplateId)->process($vars);
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -898,7 +898,7 @@ sub profileRecoverPassword {
$vars->{'recoverFormUsernameLabel'} = $i18n->get(50); $vars->{'recoverFormUsernameLabel'} = $i18n->get(50);
} }
return WebGUI::Asset::Template->new($self->session,$self->getPasswordRecoveryTemplateId)->process($vars); return WebGUI::Asset::Template->newById($self->session,$self->getPasswordRecoveryTemplateId)->process($vars);
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -1024,7 +1024,7 @@ sub profileRecoverPasswordFinish {
# Mrgh. z.z # Mrgh. z.z
$vars->{'doingRecovery'} = 1; $vars->{'doingRecovery'} = 1;
return WebGUI::Asset::Template->new($self->session, $self->getPasswordRecoveryTemplateId)->process($vars); return WebGUI::Asset::Template->newById($self->session, $self->getPasswordRecoveryTemplateId)->process($vars);
} }
if ($self->_isValidPassword($password, $passwordConfirm)) { if ($self->_isValidPassword($password, $passwordConfirm)) {
@ -1217,7 +1217,7 @@ sub resetExpiredPassword {
$vars->{'expired.form.submit'} = WebGUI::Form::submit($self->session,{}); $vars->{'expired.form.submit'} = WebGUI::Form::submit($self->session,{});
$vars->{'expired.form.footer'} = WebGUI::Form::formFooter($self->session,); $vars->{'expired.form.footer'} = WebGUI::Form::formFooter($self->session,);
return WebGUI::Asset::Template->new($self->session,$self->getExpiredPasswordTemplateId)->process($vars); return WebGUI::Asset::Template->newById($self->session,$self->getExpiredPasswordTemplateId)->process($vars);
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------