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

Deactivate macro no longer needs a template. HasValueText macro is now called If

Browse source
This commit is contained in:
Frank Dillon 2008-11-18 16:55:41 +00:00
parent f362a72210
commit 1574d5927c
6 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
docs/upgrades/packages-7.6.4/default_ldap_account_display_template.wgpkg
View file

Binary file not shown.

BIN
docs/upgrades/packages-7.6.4/default_webgui_account_display_template.wgpkg
View file

Binary file not shown.

BIN
docs/upgrades/packages-7.6.4/root_import_macro.wgpkg
View file

Binary file not shown.

4
docs/upgrades/upgrade_7.6.3-7.6.4.pl
View file

@ -31,8 +31,8 @@ my $quiet; # this line required
my $session = start(); # this line required
migrateSurvey($session);
addVersionTagMode($session);
migrateSurvey($session);
addPosMode($session);
fixFriendsGroups( $session );
upgradeAccount( $session );
@ -386,7 +386,7 @@ sub upgradeAccount {
#Add new macros to the config file
$session->config->addToHash("macros","BackToSite","BackToSite");
$session->config->addToHash("macros","HasValueText","HasValueText");
$session->config->addToHash("macros","If","If");
$session->config->addToHash("macros","DeactivateAccount","DeactivateAccount");

23
lib/WebGUI/Macro/DeactivateAccount.pm
View file

@ -23,7 +23,7 @@ Package WebGUI::Macro::DeactivateAccount
Macro for displaying a url to the user for deactivating their account, if
the setting is turned on.
=head2 process ( [deactivateText, template ] )
=head2 process ( deactivateText )
process takes two optional parameters for customizing the content and layout
of the self deactivation link.
@ -32,7 +32,7 @@ of the self deactivation link.
The text displayed to the user for this link. If this is blank an internationalized default is used.
=head3 template
=head3 linkonly
The url for a template from the Macro/DeactivateAccount namespace to use for formatting the link.
@ -41,20 +41,19 @@ The url for a template from the Macro/DeactivateAccount namespace to use for for
#-------------------------------------------------------------------
sub process {
my $session = shift;
my ($deactivateText, $templateName) = @_;
my ($deactivateText, $linkonly) = @_;
return "" unless ($session->setting->get("selfDeactivation") && !$session->user->isAdmin);
my $i18n = WebGUI::International->new($session);
my $var = {};
$var->{'self_deactivation_url' } = $session->url->page('op=auth;method=deactivateAccount');
$var->{'self_deactivation_text'} = $deactivateText || $i18n->get(65);
my $deactivateUrl = $session->url->page('op=auth;method=deactivateAccount');
my $template = $templateName ? WebGUI::Asset::Template->newByUrl($session, $templateName)
: WebGUI::Asset::Template->new($session, "CocyDcs-NqmKtPy0Bs_vUA")
;
return $template->process($var);
return $deactivateUrl if($linkonly);
my $i18n = WebGUI::International->new($session);
my $format = q{<a href="%s">%s</a>};
$deactivateText = $i18n->get(65) unless ($deactivateText);
return sprintf($format,$deactivateUrl,$deactivateText);
}
1;

4
lib/WebGUI/Macro/HasValueText.pm → lib/WebGUI/Macro/If.pm
View file

@ -1,4 +1,4 @@
package WebGUI::Macro::HasValueText;
package WebGUI::Macro::If;
#-------------------------------------------------------------------
# WebGUI is Copyright 2001-2008 Plain Black Corporation.
@ -14,7 +14,7 @@ use strict;
=head1 NAME
Package WebGUI::Macro::HasValueText
Package WebGUI::Macro::If
=head1 DESCRIPTION