From 3d9006b64326aa37ba871dcd075e09b5f47ba047 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Thu, 4 Mar 2010 08:52:46 -0800 Subject: [PATCH] Update Auth system for wg8 instanciators. --- lib/WebGUI/Auth.pm | 10 +++++----- lib/WebGUI/Auth/LDAP.pm | 2 +- lib/WebGUI/Auth/WebGUI.pm | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/WebGUI/Auth.pm b/lib/WebGUI/Auth.pm index 9ddeb45ec..64aa7e160 100644 --- a/lib/WebGUI/Auth.pm +++ b/lib/WebGUI/Auth.pm @@ -266,7 +266,7 @@ sub createAccount { $vars->{'login.url'} = $self->session->url->page('op=auth;method=init'); $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->{newUser_username} = $username; $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::Inbox->new($self->session)->addMessage({ message => $message, @@ -406,7 +406,7 @@ sub deactivateAccount { $var{'yes.label'} = $i18n->get(44); $var{'no.url'} = $self->session->url->page(); $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 #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 - 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 my $op = $self->session->form->get("op"); if($op eq "account") { @@ -571,7 +571,7 @@ sub displayLogin { $vars->{'anonymousRegistration.isAllowed'} = ($self->session->setting->get("anonymousRegistration")); $vars->{'createAccount.url'} = $self->session->url->page('op=auth;method=createAccount'); $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); } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Auth/LDAP.pm b/lib/WebGUI/Auth/LDAP.pm index ba50cd348..faa1d6bfd 100644 --- a/lib/WebGUI/Auth/LDAP.pm +++ b/lib/WebGUI/Auth/LDAP.pm @@ -404,7 +404,7 @@ sub displayAccount { ########### ACCOUNT SHUNT #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 - 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 my $op = $self->session->form->get("op"); if($op eq "account") { diff --git a/lib/WebGUI/Auth/WebGUI.pm b/lib/WebGUI/Auth/WebGUI.pm index 9321af0a9..042762b10 100644 --- a/lib/WebGUI/Auth/WebGUI.pm +++ b/lib/WebGUI/Auth/WebGUI.pm @@ -284,7 +284,7 @@ sub createAccountSave { $var->{newUser_username} = $username; $var->{activationUrl} = $session->url->page("op=auth;method=validateEmail;key=".$key, 'full'); 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); $mail->addText($text); $mail->addFooter; @@ -853,7 +853,7 @@ sub emailRecoverPassword { $vars->{'recoverFormUsername'} = WebGUI::Form::text($session, {name => 'username'}); $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); } - 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 $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)) { @@ -1217,7 +1217,7 @@ sub resetExpiredPassword { $vars->{'expired.form.submit'} = WebGUI::Form::submit($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); } #-------------------------------------------------------------------