From d6f61c07d18ba2054deac5f86b59f813d152c7bf Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Mon, 22 Mar 2010 10:43:29 -0700 Subject: [PATCH] Make the Deactivate account template user selectable for both LDAP and WebGUI. Fixes bug #11482 --- docs/changelog/7.x.x.txt | 1 + .../packages-7.9.1/root_import_auth.wgpkg | Bin 0 -> 10141 bytes docs/upgrades/upgrade_7.9.0-7.9.1.pl | 16 +++++++++ lib/WebGUI/Auth.pm | 14 +++++++- lib/WebGUI/Auth/LDAP.pm | 17 +++++++++- lib/WebGUI/Auth/WebGUI.pm | 32 +++++++++++++----- lib/WebGUI/Help/AuthLDAP.pm | 1 + lib/WebGUI/Help/AuthWebGUI.pm | 15 ++++++++ lib/WebGUI/Operation/LDAPLink.pm | 8 +++++ lib/WebGUI/i18n/English/AuthLDAP.pm | 15 ++++++++ lib/WebGUI/i18n/English/AuthWebGUI.pm | 16 +++++++++ 11 files changed, 124 insertions(+), 11 deletions(-) create mode 100644 docs/upgrades/packages-7.9.1/root_import_auth.wgpkg diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 351c58b1b..32cd22da9 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -7,6 +7,7 @@ - fixed: Unable to add threads with permission to edit CS but not in post group - fixed #11478: Overzealous removal of double slashes in FilePump macro - fixed thread pagination on search results, off by 1 error and modal direction + - fixed #11482: Template hard-coded in deactivateAccount 7.9.0 - added #11383: AJAX username checks at registration (Luke Robinson / Orchard Solutions) diff --git a/docs/upgrades/packages-7.9.1/root_import_auth.wgpkg b/docs/upgrades/packages-7.9.1/root_import_auth.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..d8ae7932f6f0fdfa303c4f7f2382bec6a0d6f906 GIT binary patch literal 10141 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 LvXb?@07?M>4$}=C literal 0 HcmV?d00001 diff --git a/docs/upgrades/upgrade_7.9.0-7.9.1.pl b/docs/upgrades/upgrade_7.9.0-7.9.1.pl index 8ede20cca..0971fd390 100644 --- a/docs/upgrades/upgrade_7.9.0-7.9.1.pl +++ b/docs/upgrades/upgrade_7.9.0-7.9.1.pl @@ -29,11 +29,27 @@ my $quiet; # this line required my $session = start(); # this line required +addDeactivateAccountTemplateSettings($session); # upgrade functions go here finish($session); # this line required +#---------------------------------------------------------------------------- +# Describe what our function does +sub addDeactivateAccountTemplateSettings { + my $session = shift; + print "\tAdd settings for deactivate account... " unless $quiet; + # and here's our code + $session->setting->add('webguiDeactivateAccountTemplate', 'zaHUYsE_PgKk8hnVd8ffEQ'); + $session->db->write(<db->write(<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->new($self->session,$self->get('getDeactivateAccountTemplateId'))->process(\%var); } #------------------------------------------------------------------- @@ -662,6 +662,18 @@ sub getCreateAccountTemplateId { #------------------------------------------------------------------- +=head2 getDeactivateAccountTemplateId ( ) + +This method should be overridden by the subclass and should return the template ID for the deactivate account screen. + +=cut + +sub getDeactivateAccountTemplateId { + return "PBtmpl0000000000000057"; +} + +#------------------------------------------------------------------- + =head2 getDefaultLoginTemplateId ( ) This method should be overridden by the subclass and should return the default template ID for the login screen. diff --git a/lib/WebGUI/Auth/LDAP.pm b/lib/WebGUI/Auth/LDAP.pm index f2db85138..77f385b0f 100644 --- a/lib/WebGUI/Auth/LDAP.pm +++ b/lib/WebGUI/Auth/LDAP.pm @@ -600,7 +600,22 @@ sub getCreateAccountTemplateId { my $self = shift; my $ldapConnect = $self->getLDAPConnection; return "PBtmpl0000000000000005" unless $ldapConnect; - return ($self->getLDAPConnection->{ldapCreateAccountTemplate} || "PBtmpl0000000000000005"); + return ($ldapConnect->{ldapCreateAccountTemplate} || "PBtmpl0000000000000005"); +} + +#------------------------------------------------------------------- + +=head2 getDeactivateAccountTemplateId ( ) + +Get the default template ID for the deactivate account form. + +=cut + +sub getDeactivateAccountTemplateId { + my $self = shift; + my $ldapConnect = $self->getLDAPConnection; + return $self->SUPER::getDeactivateAccountTemplateId unless $ldapConnect; + return ($ldapConnect->{ldapDeactivateAccountTemplate} || $self->SUPER::getDeactivateAccountTemplateId); } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Auth/WebGUI.pm b/lib/WebGUI/Auth/WebGUI.pm index 75a49ec96..f96fc4c6b 100644 --- a/lib/WebGUI/Auth/WebGUI.pm +++ b/lib/WebGUI/Auth/WebGUI.pm @@ -580,6 +580,13 @@ sub editUserSettingsForm { -namespace => "Auth/WebGUI/Create", -label => $i18n->get("create account template"), -hoverHelp => $i18n->get("create account template help"), + ); + $f->template( + -name => "webguiDeactivateAccountTemplate", + -value => $self->session->setting->get("webguiDeactivateAccountTemplate"), + -namespace => "Auth/WebGUI/Deactivate", + -label => $i18n->get("deactivate account template"), + -hoverHelp => $i18n->get("deactivate account template help"), ); $f->template( -name => "webguiExpiredPasswordTemplate", @@ -661,15 +668,16 @@ sub editUserSettingsFormSave { } $s->set("webguiPasswordRecoveryRequireUsername", $f->process("webguiPasswordRecoveryRequireUsername","yesNo")); - $s->set("webguiValidateEmail", $f->process("webguiValidateEmail","yesNo")); - $s->set("webguiUseCaptcha", $f->process("webguiUseCaptcha","yesNo")); - $s->set("webguiAccountTemplate", $f->process("webguiAccountTemplate","template")); - $s->set("webguiCreateAccountTemplate", $f->process("webguiCreateAccountTemplate","template")); - $s->set("webguiExpiredPasswordTemplate", $f->process("webguiExpiredPasswordTemplate","template")); - $s->set("webguiLoginTemplate", $f->process("webguiLoginTemplate","template")); - $s->set("webguiPasswordRecoveryTemplate", $f->process("webguiPasswordRecoveryTemplate","template")); - $s->set("webguiWelcomeMessageTemplate", $f->process("webguiWelcomeMessageTemplate","template")); - $s->set("webguiAccountActivationTemplate", $f->process("webguiAccountActivationTemplate","template")); + $s->set("webguiValidateEmail", $f->process("webguiValidateEmail","yesNo")); + $s->set("webguiUseCaptcha", $f->process("webguiUseCaptcha","yesNo")); + $s->set("webguiAccountTemplate", $f->process("webguiAccountTemplate","template")); + $s->set("webguiCreateAccountTemplate", $f->process("webguiCreateAccountTemplate","template")); + $s->set("webguiDeactivateAccountTemplate", $f->process("webguiDeactivateAccountTemplate","template")); + $s->set("webguiExpiredPasswordTemplate", $f->process("webguiExpiredPasswordTemplate","template")); + $s->set("webguiLoginTemplate", $f->process("webguiLoginTemplate","template")); + $s->set("webguiPasswordRecoveryTemplate", $f->process("webguiPasswordRecoveryTemplate","template")); + $s->set("webguiWelcomeMessageTemplate", $f->process("webguiWelcomeMessageTemplate","template")); + $s->set("webguiAccountActivationTemplate", $f->process("webguiAccountActivationTemplate","template")); if (@errors) { return \@errors; @@ -691,6 +699,12 @@ sub getCreateAccountTemplateId { return $self->session->setting->get("webguiCreateAccountTemplate") || "PBtmpl0000000000000011"; } +#------------------------------------------------------------------- +sub getDeactivateAccountTemplateId { + my $self = shift; + return $self->session->setting->get("webguiDeactivateAccountTemplate") || $self->SUPER::getDeactivateAccountTemplateId; +} + #------------------------------------------------------------------- sub getDefaultLoginTemplateId { return "PBtmpl0000000000000013"; diff --git a/lib/WebGUI/Help/AuthLDAP.pm b/lib/WebGUI/Help/AuthLDAP.pm index 6acb014f2..69ac451dd 100644 --- a/lib/WebGUI/Help/AuthLDAP.pm +++ b/lib/WebGUI/Help/AuthLDAP.pm @@ -88,6 +88,7 @@ our $HELP = { fields => [], related => [], }, + }; 1; diff --git a/lib/WebGUI/Help/AuthWebGUI.pm b/lib/WebGUI/Help/AuthWebGUI.pm index 9eb272195..04cec68f7 100644 --- a/lib/WebGUI/Help/AuthWebGUI.pm +++ b/lib/WebGUI/Help/AuthWebGUI.pm @@ -185,6 +185,21 @@ our $HELP = { fields => [], related => [] }, + + 'webgui deactivate account template' => { + title => 'deactivate account template title', + body => '', + isa => [ + { namespace => "Auth", + tag => "deactivate account template" + }, + ], + variables => [ + ], + fields => [], + related => [] + }, + }; 1; diff --git a/lib/WebGUI/Operation/LDAPLink.pm b/lib/WebGUI/Operation/LDAPLink.pm index 6d8f31f4e..178ccaa00 100644 --- a/lib/WebGUI/Operation/LDAPLink.pm +++ b/lib/WebGUI/Operation/LDAPLink.pm @@ -295,6 +295,13 @@ sub www_editLDAPLink { -label =>$i18n->get("create account template"), -hoverHelp =>$i18n->get("create account template description"), ); + $f->template( + -name =>"ldapDeactivateAccountTemplate", + -value =>$form->template("ldapDeactivateAccountTemplate") || $db{ldapDeactivateAccountTemplate}, + -namespace =>"Auth/LDAP/Deactivate", + -label =>$i18n->get("deactivate account template"), + -hoverHelp =>$i18n->get("deactivate account template description"), + ); $f->template( -name =>"ldapLoginTemplate", -value =>$form->template("ldapLoginTemplate") || $db{ldapLoginTemplate}, @@ -340,6 +347,7 @@ sub www_editLDAPLinkSave { $properties->{ldapWelcomeMessage} = $session->form->textarea("ldapWelcomeMessage"); $properties->{ldapAccountTemplate} = $session->form->template("ldapAccountTemplate"); $properties->{ldapCreateAccountTemplate} = $session->form->template("ldapCreateAccountTemplate"); + $properties->{ldapDeactivateAccountTemplate} = $session->form->template("ldapDeactivateAccountTemplate"); $properties->{ldapLoginTemplate} = $session->form->template("ldapLoginTemplate"); $session->db->setRow("ldapLink","ldapLinkId",$properties); if($session->form->process("returnUrl")) { diff --git a/lib/WebGUI/i18n/English/AuthLDAP.pm b/lib/WebGUI/i18n/English/AuthLDAP.pm index a92390f74..5e32cf677 100644 --- a/lib/WebGUI/i18n/English/AuthLDAP.pm +++ b/lib/WebGUI/i18n/English/AuthLDAP.pm @@ -74,6 +74,11 @@ our $I18N = { lastUpdated => 1078852969 }, + 'deactivate account template' => { + message => q|Deactivate Account Template|, + lastUpdated => 1269278436, + }, + 'login template' => { message => q|Login Template|, lastUpdated => 1078852969 @@ -84,6 +89,11 @@ our $I18N = { lastUpdated => 1184793098 }, + 'deactivate account template title' => { + message => q|LDAP Authentication Deactivate Account Template Variables|, + lastUpdated => 1269279436, + }, + '11' => { message => q|No connect DN specified for this user|, lastUpdated => 1071848383 @@ -622,6 +632,11 @@ and should be entered as such.

|, lastUpdated => 1120164594, }, + 'deactivate account template description' => { + message => q|Template to be used to show the form for deactivating an account.|, + lastUpdated => 1269278461, + }, + 'login template description' => { message => q|Template used to display login information to the user as an operation, as opposed to inside of a page via a macro.|, lastUpdated => 1165512102, diff --git a/lib/WebGUI/i18n/English/AuthWebGUI.pm b/lib/WebGUI/i18n/English/AuthWebGUI.pm index d3618d565..a3f2f3bec 100644 --- a/lib/WebGUI/i18n/English/AuthWebGUI.pm +++ b/lib/WebGUI/i18n/English/AuthWebGUI.pm @@ -32,6 +32,16 @@ our $I18N = { lastUpdated => 1078852836, }, + 'deactivate account template' => { + message => q|Deactivate Account Template|, + lastUpdated => 1269277147, + }, + + 'deactivate account template help' => { + message => q|Select a template to display the screen where the user deactivates their account.|, + lastUpdated => 1269277148, + }, + 'expired password template' => { message => q|Expired Password Template|, lastUpdated => 1078852836 @@ -68,6 +78,12 @@ our $I18N = { context => q|The title of the help page for the webgui auth account activition mail template.|, }, + 'account deactivate account template title' => { + message => q|WebGUI Authentication Deactivate Account Template|, + lastUpdated => 1269279365, + context => q|The title of the help page for the webgui auth account activition mail template.|, + }, + 'account activation template' => { message => q|Account Activation Mail Template|, lastUpdated => 1230600500,