Switched macro to use new nesting mechanism.

This commit is contained in:
JT Smith 2003-02-28 05:25:18 +00:00
parent 85cdb5bd0c
commit 147aac791a
51 changed files with 133 additions and 435 deletions

View file

@ -13,7 +13,7 @@ package WebGUI::Macro::L_loginBox;
use strict;
use WebGUI::HTMLForm;
use WebGUI::International;
use WebGUI::Macro::Backslash_pageUrl;
use WebGUI::Macro;
use WebGUI::Session;
use WebGUI::URL;
@ -23,7 +23,7 @@ sub _createURL {
}
#-------------------------------------------------------------------
sub _replacement {
sub process {
my ($temp,$boxSize,@param,$text,$f);
@param = WebGUI::Macro::getParams($_[0]);
$temp = '<div class="loginBox">';
@ -34,11 +34,10 @@ sub _replacement {
$temp .= ' <a href="'.WebGUI::URL::page('op=displayAccount').
'">'.$session{user}{username}.'</a>. ';
$temp .= WebGUI::International::get(49);
$temp = WebGUI::Macro::Backslash_pageUrl::process($temp);
} else {
$text =~ s/%(.*?)%/_createURL($1)/ge;
$temp .= WebGUI::Macro::Backslash_pageUrl::process($text);
}
$temp = WebGUI::Macro::process($temp);
} else {
$boxSize = $param[0];
if (not defined $boxSize) {
@ -64,14 +63,5 @@ sub _replacement {
return $temp;
}
#-------------------------------------------------------------------
sub process {
my ($output, $temp);
$output = $_[0];
$output =~ s/\^L\((.*?)\)\;/_replacement($1)/ge;
$output =~ s/\^L\;/_replacement()/ge;
return $output;
}
1;