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

Switched macro to use new nesting mechanism.

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

5
docs/gotcha.txt
View file

@ -44,6 +44,11 @@ save you many hours of grief.
drop table HttpProxy;
delete from Wobject where namespace='HttpProxy';
* If you're using any custom macros you'll need to get them updated
before using this release as the macro system has changed
significantly. Macros written for versions prior to 5.2.0
are not compatible with this version or after.
5.1.0
--------------------------------------------------------------------

61
lib/WebGUI/Macro.pm
View file

@ -44,6 +44,31 @@ These functions are available from this package:
#-------------------------------------------------------------------
sub _nestedMacro {
# This sub returns the regular expression for matching nested macro's.
# Regular expression for matching balanced parenthesis
my $parenthesis = qr /\( # Start with '(',
(?: # Followed by
(?>[^()]+) # Non-parenthesis
|(??{ $parenthesis }) # Or a balanced parenthesis block
)* # zero or more times
\)/x; # Ending with ')'
# Regular expression for matching balanced macros
my $nestedMacro = qr /\^ # Start with carat
([^\^;()]+) # And one or more none-macro characters -tagged-
((?: # Followed by
(??{ $parenthesis }) # a balanced parenthesis block
|(?>[^\^;]) # Or not a carat or semicolon
|(??{ $nestedMacro }) # Or a balanced carat-semicolon block
)*) # zero or more times -tagged-
;/x; # End with a semicolon.
return $nestedMacro;
}
#-------------------------------------------------------------------
=head2 getParams ( parameterString )
@ -89,19 +114,33 @@ A string of HTML to be processed.
=cut
sub process {
my ($macro, $cmd, $output, $temp);
$output = $_[0];
foreach $macro (keys %{$session{config}{macros}}) {
$cmd = "WebGUI::Macro::".$session{config}{macros}{$macro}."::process";
$temp = eval{&$cmd($output)};
if ($@) {
WebGUI::ErrorHandler::warn("Processing failed on macro: $macro: ".$@);
} else {
$output = $temp;
my $content = shift;
my $nestedMacro = &_nestedMacro;
while ($content =~ /($nestedMacro)/gs) {
my ($macro, $searchString, $params) = ($1, $2, $3);
next if ($searchString =~ /^\d+$/); # don't process ^0; ^1; ^2; etc.
next if ($searchString =~ /^\-$/); # don't process ^-;
if ($params ne "") {
#$params =~ s/^\(|\)$//; # remove opening / trailing parenthesis (doesn't seem to work)
$params =~ s/^\(//; # remove opening parenthesis
$params =~ s/\)$//; # remove trailing parenthesis
$params = &process($params); # recursive process params
}
}
return $output;
if ($session{config}{macros}{$searchString} ne "") {
my $cmd = "WebGUI::Macro::".$session{config}{macros}{$searchString}."::process";
my $result = eval{&$cmd($params)};
if ($@) {
WebGUI::ErrorHandler::warn("Processing failed on macro: $macro: ".$@);
} else {
$macro =~ s/\^/\\\^/;
$content =~ s/$macro/$result/ges;
}
}
}
return $content;
}
1;

14
lib/WebGUI/Macro/AdminBar.pm
View file

@ -21,7 +21,8 @@ use WebGUI::URL;
use WebGUI::Utility;
#-------------------------------------------------------------------
sub _replacement {
sub process {
return "" unless ($session{var}{adminOn});
my (%hash2, $miscSelect, $adminSelect, $clipboardSelect, %hash, $output, $contentSelect, $key);
tie %hash, "Tie::IxHash";
tie %hash2, "Tie::IxHash";
@ -137,17 +138,6 @@ sub _replacement {
return $output;
}
#-------------------------------------------------------------------
sub process {
my ($output,$temp);
$output = $_[0];
if ($session{var}{adminOn}) {
$output =~ s/\^AdminBar\;/_replacement()/ge;
} else {
$output =~ s/\^AdminBar\;//g;
}
return $output;
}

19
lib/WebGUI/Macro/AdminText.pm
View file

@ -15,23 +15,12 @@ use WebGUI::Macro;
use WebGUI::Session;
#-------------------------------------------------------------------
sub _replacement {
my ($temp,@param);
@param = WebGUI::Macro::getParams(shift);
if ($session{var}{adminOn}) {
$temp = $param[0];
} else {
$temp = "";
}
return $temp;
sub process {
my @param = WebGUI::Macro::getParams(shift);
return "" unless ($session{var}{adminOn});
return $param[0];
}
#-------------------------------------------------------------------
sub process {
my ($output) = @_;
$output =~ s/\^AdminText\((.*?)\)\;/_replacement($1)/ge;
return $output;
}
1;

11
lib/WebGUI/Macro/AdminToggle.pm
View file

@ -17,7 +17,7 @@ use WebGUI::Session;
use WebGUI::URL;
#-------------------------------------------------------------------
sub _replacement {
sub process {
my ($temp, @param, $turnOn, $turnOff);
if (WebGUI::Privilege::isInGroup(4)) {
@param = WebGUI::Macro::getParams($_[0]);
@ -32,15 +32,6 @@ sub _replacement {
return $temp;
}
#-------------------------------------------------------------------
sub process {
my ($output, $temp);
$output = $_[0];
$output =~ s/\^AdminToggle\((.*?)\)\;/_replacement($1)/ge;
$output =~ s/\^AdminToggle\;/_replacement()/ge;
return $output;
}
1;

5
lib/WebGUI/Macro/At_username.pm
View file

@ -15,10 +15,7 @@ use WebGUI::Session;
#-------------------------------------------------------------------
sub process {
my ($output);
$output = $_[0];
$output =~ s/\^\@\;/$session{user}{username}/g;
return $output;
return $session{user}{username};
}

6
lib/WebGUI/Macro/Backslash_pageUrl.pm
View file

@ -12,14 +12,10 @@ package WebGUI::Macro::Backslash_pageUrl;
use strict;
use WebGUI::Session;
use WebGUI::URL;
#-------------------------------------------------------------------
sub process {
my ($output);
$output = $_[0];
$output =~ s/\^\\\;/$session{page}{url}/g;
return $output;
return $session{page}{url};
}

10
lib/WebGUI/Macro/C_crumbTrail.pm
View file

@ -33,7 +33,7 @@ sub _recurseCrumbTrail {
}
#-------------------------------------------------------------------
sub _replacement {
sub process {
my (@param, $temp, $delimeter);
@param = WebGUI::Macro::getParams($_[0]);
if ($param[0] eq "") {
@ -46,14 +46,6 @@ sub _replacement {
return $temp;
}
#-------------------------------------------------------------------
sub process {
my ($output, $temp);
$output = $_[0];
$output =~ s/\^C\((.*?)\)\;/_replacement($1)/ge;
$output =~ s/\^C\;/_replacement()/ge;
return $output;
}
1;

10
lib/WebGUI/Macro/D_date.pm
View file

@ -15,7 +15,7 @@ use WebGUI::DateTime;
use WebGUI::Macro;
#-------------------------------------------------------------------
sub _replacement {
sub process {
my (@param, $temp, $time);
@param = WebGUI::Macro::getParams($_[0]);
$time = $param[1] || time();
@ -23,14 +23,6 @@ sub _replacement {
return $temp;
}
#-------------------------------------------------------------------
sub process {
my ($output);
$output = $_[0];
$output =~ s/\^D\((.*?)\)\;/_replacement($1)/ge;
$output =~ s/\^D\;/_replacement()/ge;
return $output;
}
1;

13
lib/WebGUI/Macro/Env.pm
View file

@ -14,19 +14,10 @@ use strict;
use WebGUI::Macro;
use WebGUI::Session;
#-------------------------------------------------------------------
sub _replacement {
my (@param);
@param = WebGUI::Macro::getParams($_[0]);
return $session{env}{$param[0]};
}
#-------------------------------------------------------------------
sub process {
my ($output);
$output = $_[0];
$output =~ s/\^Env\((.*?)\)\;/_replacement($1)/ge;
return $output;
my @param = WebGUI::Macro::getParams($_[0]);
return $session{env}{$param[0]};
}
1;

22
lib/WebGUI/Macro/Execute.pm
View file

@ -13,24 +13,14 @@ package WebGUI::Macro::Execute;
use strict;
use WebGUI::Macro;
#-------------------------------------------------------------------
sub _replacement {
my (@param, $temp);
@param = WebGUI::Macro::getParams($_[0]);
if ($param[0] =~ /passwd/ || $param[0] =~ /shadow/ || $param[0] =~ /WebGUI.conf/) {
$temp = "SECURITY VIOLATION";
} else {
$temp = `$param[0]`;
}
return $temp;
}
#-------------------------------------------------------------------
sub process {
my ($output, $temp);
$output = $_[0];
$output =~ s/\^Execute\((.*?)\)\;/_replacement($1)/ge;
return $output;
my @param = WebGUI::Macro::getParams($_[0]);
if ($param[0] =~ /passwd/ || $param[0] =~ /shadow/ || $param[0] =~ /\.conf/) {
return "SECURITY VIOLATION";
} else {
return `$param[0]`;
}
}
1;

5
lib/WebGUI/Macro/Extras.pm
View file

@ -15,10 +15,7 @@ use WebGUI::Session;
#-------------------------------------------------------------------
sub process {
my ($output);
$output = $_[0];
$output =~ s/\^Extras\;/$session{config}{extrasURL}\//g;
return $output;
return $session{config}{extrasURL}."/";
}
1;

10
lib/WebGUI/Macro/File.pm
View file

@ -18,7 +18,7 @@ use WebGUI::Session;
use WebGUI::SQL;
#-------------------------------------------------------------------
sub _replacement {
sub process {
my (@param, $temp, %data, $file);
tie %data, 'Tie::CPHash';
@param = WebGUI::Macro::getParams($_[0]);
@ -28,14 +28,6 @@ sub _replacement {
return $temp;
}
#-------------------------------------------------------------------
sub process {
my ($output, $temp);
$output = $_[0];
$output =~ s/\^File\((.*?)\)\;/_replacement($1)/ge;
return $output;
}
1;

10
lib/WebGUI/Macro/FlexMenu.pm
View file

@ -17,7 +17,7 @@ use WebGUI::Session;
use WebGUI::URL;
#-------------------------------------------------------------------
sub _replacement {
sub process {
my ($temp, @param);
@param = WebGUI::Macro::getParams($_[0]);
$temp = '<span class="verticalMenu">';
@ -52,14 +52,6 @@ sub _reversePageTree {
return $output;
}
#-------------------------------------------------------------------
sub process {
my ($output,$temp);
$output = $_[0];
#$output =~ s/\^FlexMenu\((.*?)\)\;/_replacement($1)/ge;
$output =~ s/\^FlexMenu\;/_replacement()/ge;
return $output;
}
1;

12
lib/WebGUI/Macro/FormParam.pm
View file

@ -15,19 +15,11 @@ use WebGUI::Macro;
use WebGUI::Session;
#-------------------------------------------------------------------
sub _replacement {
my (@param);
@param = WebGUI::Macro::getParams($1);
sub process {
my @param = WebGUI::Macro::getParams($1);
return $session{form}{$param[0]};
}
#-------------------------------------------------------------------
sub process {
my ($output, $temp, @param);
$output = $_[0];
$output =~ s/\^FormParam\((.*?)\)\;/_replacement($1)/ge;
return $output;
}
1;

18
lib/WebGUI/Macro/GroupText.pm
View file

@ -17,25 +17,17 @@ use WebGUI::Session;
use WebGUI::Privilege;
#-------------------------------------------------------------------
sub _replacement {
my ($temp,@param,$groupId);
@param = WebGUI::Macro::getParams($_[0]);
($groupId) = WebGUI::SQL->quickArray("select groupId from groups where groupName=".quote($param[0]));
sub process {
my @param = WebGUI::Macro::getParams($_[0]);
my ($groupId) = WebGUI::SQL->quickArray("select groupId from groups where groupName=".quote($param[0]));
$groupId = 3 if ($groupId eq "");
if (WebGUI::Privilege::isInGroup($groupId)) {
$temp = $param[1];
return $param[1];
} else {
$temp = "";
return "";
}
return $temp;
}
#-------------------------------------------------------------------
sub process {
my ($output) = @_;
$output =~ s/\^GroupText\((.*?)\)\;/_replacement($1)/ge;
return $output;
}
1;

12
lib/WebGUI/Macro/H_homeLink.pm
View file

@ -17,9 +17,9 @@ use WebGUI::Session;
use WebGUI::SQL;
#-------------------------------------------------------------------
sub _replacement {
sub process {
my (@param, $temp);
@param = WebGUI::Macro::getParams($1);
@param = WebGUI::Macro::getParams($_[0]);
if ($session{setting}{defaultPage} == $session{page}{pageId}) {
$temp = $session{page}{urlizedTitle};
} else {
@ -38,14 +38,6 @@ sub _replacement {
return $temp;
}
#-------------------------------------------------------------------
sub process {
my ($output);
$output = $_[0];
$output =~ s/\^H\((.*?)\)\;/_replacement($1)/ge;
$output =~ s/\^H\;/_replacement()/ge;
return $output;
}
1;

5
lib/WebGUI/Macro/Hash_userId.pm
View file

@ -15,10 +15,7 @@ use WebGUI::Session;
#-------------------------------------------------------------------
sub process {
my ($output);
$output = $_[0];
$output =~ s/\^\#\;/$session{user}{userId}/g;
return $output;
return $session{user}{userId};
}

9
lib/WebGUI/Macro/I_imageWithTags.pm
View file

@ -18,7 +18,7 @@ use WebGUI::Session;
use WebGUI::SQL;
#-------------------------------------------------------------------
sub _replacement {
sub process {
my (@param, $temp, %data, $image);
tie %data, 'Tie::CPHash';
@param = WebGUI::Macro::getParams($_[0]);
@ -28,13 +28,6 @@ sub _replacement {
return $temp;
}
#-------------------------------------------------------------------
sub process {
my ($output, $temp);
$output = $_[0];
$output =~ s/\^I\((.*?)\)\;/_replacement($1)/ge;
return $output;
}
1;

9
lib/WebGUI/Macro/Include.pm
View file

@ -15,7 +15,7 @@ use FileHandle;
use WebGUI::Macro;
#-------------------------------------------------------------------
sub _replacement {
sub process {
my (@param, $temp, $file);
@param = WebGUI::Macro::getParams($_[0]);
if ($param[0] =~ /passwd/ || $param[0] =~ /shadow/ || $param[0] =~ /WebGUI.conf/) {
@ -34,13 +34,6 @@ sub _replacement {
return $temp;
}
#-------------------------------------------------------------------
sub process {
my ($output, $temp);
$output = $_[0];
$output =~ s/\^Include\((.*?)\)\;/_replacement($1)/ge;
return $output;
}
1;

12
lib/WebGUI/Macro/International.pm
View file

@ -16,19 +16,11 @@ use WebGUI::Macro;
use WebGUI::Session;
#-------------------------------------------------------------------
sub _replacement {
my (@param);
@param = WebGUI::Macro::getParams($_[0]);
sub process {
my @param = WebGUI::Macro::getParams($_[0]);
return WebGUI::International::get($param[0],$param[1]);
}
#-------------------------------------------------------------------
sub process {
my ($output);
$output = $_[0];
$output =~ s/\^International\((.*?)\)\;/_replacement($1)/ge;
return $output;
}
1;

16
lib/WebGUI/Macro/L_loginBox.pm
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;

10
lib/WebGUI/Macro/LoginToggle.pm
View file

@ -17,7 +17,7 @@ use WebGUI::Session;
use WebGUI::URL;
#-------------------------------------------------------------------
sub _replacement {
sub process {
my (@param, $temp, $login, $logout);
@param = WebGUI::Macro::getParams($_[0]);
if ($session{user}{userId} == 1) {
@ -30,14 +30,6 @@ sub _replacement {
return $temp;
}
#-------------------------------------------------------------------
sub process {
my ($output, $temp);
$output = $_[0];
$output =~ s/\^LoginToggle\((.*?)\)\;/_replacement($1)/ge;
$output =~ s/\^LoginToggle\;/_replacement()/ge;
return $output;
}
1;

10
lib/WebGUI/Macro/M_currentMenuVertical.pm
View file

@ -16,7 +16,7 @@ use WebGUI::Navigation;
use WebGUI::Session;
#-------------------------------------------------------------------
sub _replacement {
sub process {
my ($tree, $temp, @param);
@param = WebGUI::Macro::getParams($_[0]);
$temp = '<span class="verticalMenu">';
@ -30,14 +30,6 @@ sub _replacement {
return $temp;
}
#-------------------------------------------------------------------
sub process {
my ($output, $temp, @param);
$output = $_[0];
$output =~ s/\^M\((.*?)\)\;/_replacement($1)/ge;
$output =~ s/\^M\;/_replacement()/ge;
return $output;
}
1;

10
lib/WebGUI/Macro/P_previousMenuVertical.pm
View file

@ -16,7 +16,7 @@ use WebGUI::Navigation;
use WebGUI::Session;
#-------------------------------------------------------------------
sub _replacement {
sub process {
my ($temp, @param, $tree);
@param = WebGUI::Macro::getParams($_[0]);
$temp = '<span class="verticalMenu">';
@ -30,14 +30,6 @@ sub _replacement {
return $temp;
}
#-------------------------------------------------------------------
sub process {
my ($output,$temp);
$output = $_[0];
$output =~ s/\^P\((.*?)\)\;/_replacement($1)/ge;
$output =~ s/\^P\;/_replacement()/ge;
return $output;
}
1;

9
lib/WebGUI/Macro/Page.pm
View file

@ -15,20 +15,13 @@ use WebGUI::Macro;
use WebGUI::Session;
#-------------------------------------------------------------------
sub _replacement {
sub process {
my (@param, $temp);
@param = WebGUI::Macro::getParams($_[0]);
$temp = $session{page}{$param[0]};
return $temp;
}
#-------------------------------------------------------------------
sub process {
my ($output, $temp);
$output = $_[0];
$output =~ s/\^Page\((.*?)\)\;/_replacement($1)/ge;
return $output;
}
1;

9
lib/WebGUI/Macro/PageTitle.pm
View file

@ -15,7 +15,7 @@ use WebGUI::Session;
use WebGUI::URL;
#-------------------------------------------------------------------
sub _replacement {
sub process {
if ($session{env}{QUERY_STRING} =~ /op/ || $session{env}{QUERY_STRING} =~ /func/) {
return '<a href="'.WebGUI::URL::page().'">'.$session{page}{title}.'</a>';
} else {
@ -23,13 +23,6 @@ sub _replacement {
}
}
#-------------------------------------------------------------------
sub process {
my ($output);
$output = $_[0];
$output =~ s/\^PageTitle\;/_replacement()/ge;
return $output;
}
1;

9
lib/WebGUI/Macro/Question_search.pm
View file

@ -17,7 +17,7 @@ use WebGUI::Session;
use WebGUI::URL;
#-------------------------------------------------------------------
sub _replacement {
sub process {
my ($f);
$f = WebGUI::HTMLForm->new(1);
$f->hidden("op","search");
@ -26,12 +26,5 @@ sub _replacement {
return $f->print;
}
#-------------------------------------------------------------------
sub process {
my ($output);
$output = $_[0];
$output =~ s/\^\?\;/_replacement()/ge;
return $output;
}
1;

9
lib/WebGUI/Macro/RootTitle.pm
View file

@ -18,7 +18,7 @@ use WebGUI::SQL;
use WebGUI::URL;
#-------------------------------------------------------------------
sub _recurse {
sub process {
my ($sth, %data, $output);
tie %data, 'Tie::CPHash';
%data = WebGUI::SQL->quickHash("select pageId,parentId,title,urlizedTitle from page where pageId=$_[0]");
@ -30,13 +30,6 @@ sub _recurse {
return $output;
}
#-------------------------------------------------------------------
sub process {
my ($output);
$output = $_[0];
$output =~ s/\^RootTitle\;/_recurse($session{page}{parentId})/ge;
return $output;
}
1;

8
lib/WebGUI/Macro/SQL.pm
View file

@ -15,7 +15,8 @@ use WebGUI::Macro;
use WebGUI::Session;
use WebGUI::SQL;
sub _replacement {
#-------------------------------------------------------------------
sub process {
my ($output, @data, $rownum, $temp);
my ($statement, $format) = WebGUI::Macro::getParams(shift);
$format = '^0;' if ($format eq "");
@ -37,11 +38,6 @@ sub _replacement {
}
}
sub process {
my $output = shift;
$output =~ s/\^SQL\((.*?)\)\;/_replacement($1)/ges;
return $output;
}
1;

10
lib/WebGUI/Macro/S_specificMenuVertical.pm
View file

@ -17,7 +17,7 @@ use WebGUI::Session;
use WebGUI::SQL;
#-------------------------------------------------------------------
sub _replacement {
sub process {
my ($temp, @param, $pageId, $tree);
@param = WebGUI::Macro::getParams($_[0]);
($pageId) = WebGUI::SQL->quickArray("select pageId from page where urlizedTitle='$param[0]'");
@ -34,14 +34,6 @@ sub _replacement {
return $temp;
}
#-------------------------------------------------------------------
sub process {
my ($output,$temp, @param, @data);
$output = $_[0];
$output =~ s/\^S\((.*?)\)\;/_replacement($1)/ge;
$output =~ s/\^S\;/_replacement()/ge;
return $output;
}
1;

7
lib/WebGUI/Macro/Slash_gatewayUrl.pm
View file

@ -12,15 +12,10 @@ package WebGUI::Macro::Slash_gatewayUrl;
use strict;
use WebGUI::Session;
use WebGUI::URL;
#-------------------------------------------------------------------
sub process {
my ($output, $temp);
$output = $_[0];
$temp = $session{config}{scripturl}.'/';
$output =~ s/\^\/\;/$temp/g;
return $output;
return $session{config}{scripturl}.'/';
}

9
lib/WebGUI/Macro/Snippet.pm
View file

@ -17,20 +17,13 @@ use WebGUI::Session;
use WebGUI::SQL;
#-------------------------------------------------------------------
sub _replacement {
sub process {
my (@param, $temp);
@param = WebGUI::Macro::getParams($_[0]);
($temp) = WebGUI::SQL->quickArray("select parameters from collateral where name=".quote($param[0]));
return WebGUI::Macro::process($temp);
}
#-------------------------------------------------------------------
sub process {
my ($output, $temp);
$output = $_[0];
$output =~ s/\^Snippet\((.*?)\)\;/_replacement($1)/ge;
return $output;
}
1;

10
lib/WebGUI/Macro/Splat_random.pm
View file

@ -15,7 +15,7 @@ use WebGUI::Macro;
use WebGUI::Utility;
#-------------------------------------------------------------------
sub _replacement {
sub process {
my ($temp, @param);
@param = WebGUI::Macro::getParams($_[0]);
if ($param[0] ne "") {
@ -26,14 +26,6 @@ sub _replacement {
return $temp;
}
#-------------------------------------------------------------------
sub process {
my ($output,$temp);
$output = $_[0];
$output =~ s/\^\*\((.*?)\)\;/_replacement($1)/ge;
$output =~ s/\^\*\;/_replacement()/ge;
return $output;
}

16
lib/WebGUI/Macro/Synopsis.pm
View file

@ -11,8 +11,10 @@ package WebGUI::Macro::Synopsis;
#-------------------------------------------------------------------
use strict;
use WebGUI::Privilege;
use WebGUI::Session;
use WebGUI::SQL;
use WebGUI::URL;
#-------------------------------------------------------------------
sub traversePageTreeSynopsis {
@ -50,15 +52,11 @@ sub traversePageTreeSynopsis {
#-------------------------------------------------------------------
sub process {
my ($output) = @_;
# Singleton
if ($output =~ /\^Synopsis\;/) {
$output =~ s/\^Synopsis;/$session{page}{synopsis}/g;
return $output;
if ($_[0]) {
return traversePageTreeSynopsis($session{page}{pageId},0,$_[0]);
} else {
return $session{page}{synopsis};
}
# Tree
$output =~ s/\^Synopsis\((\d+)\)\;/traversePageTreeSynopsis($session{page}{pageId},0,$1)/eg;
return $output;
}
1;

10
lib/WebGUI/Macro/T_topMenuVertical.pm
View file

@ -15,7 +15,7 @@ use WebGUI::Macro;
use WebGUI::Navigation;
#-------------------------------------------------------------------
sub _replacement {
sub process {
my ($temp, @param, $tree);
@param = WebGUI::Macro::getParams($_[0]);
$temp = '<span class="verticalMenu">';
@ -29,14 +29,6 @@ sub _replacement {
return $temp;
}
#-------------------------------------------------------------------
sub process {
my ($output,$temp);
$output = $_[0];
$output =~ s/\^T\((.*?)\)\;/_replacement($1)/ge;
$output =~ s/\^T\;/_replacement()/ge;
return $output;
}
1;

9
lib/WebGUI/Macro/Thumbnail.pm
View file

@ -18,7 +18,7 @@ use WebGUI::Session;
use WebGUI::SQL;
#-------------------------------------------------------------------
sub _replacement {
sub process {
my (@param, %data, $image);
tie %data, 'Tie::CPHash';
@param = WebGUI::Macro::getParams($_[0]);
@ -27,13 +27,6 @@ sub _replacement {
return $image->getThumbnail;
}
#-------------------------------------------------------------------
sub process {
my ($output, $temp);
$output = $_[0];
$output =~ s/\^Thumbnail\((.*?)\)\;/_replacement($1)/ge;
return $output;
}
1;

9
lib/WebGUI/Macro/ThumbnailLinker.pm
View file

@ -18,7 +18,7 @@ use WebGUI::Session;
use WebGUI::SQL;
#-------------------------------------------------------------------
sub _replacement {
sub process {
my (@param, %data, $image, $output);
tie %data, 'Tie::CPHash';
@param = WebGUI::Macro::getParams($_[0]);
@ -29,13 +29,6 @@ sub _replacement {
return $output;
}
#-------------------------------------------------------------------
sub process {
my ($output, $temp);
$output = $_[0];
$output =~ s/\^ThumbnailLinker\((.*?)\)\;/_replacement($1)/ge;
return $output;
}
1;

12
lib/WebGUI/Macro/URLEncode.pm
View file

@ -16,19 +16,11 @@ use WebGUI::Session;
use WebGUI::URL;
#-------------------------------------------------------------------
sub _replacement {
my (@param);
@param = WebGUI::Macro::getParams($1);
sub process {
my @param = WebGUI::Macro::getParams($1);
return WebGUI::URL::escape($param[0]);
}
#-------------------------------------------------------------------
sub process {
my ($output, $temp, @param);
$output = $_[0];
$output =~ s/\^URLEncode\((.*?)\)\;/_replacement($1)/ge;
return $output;
}
1;

15
lib/WebGUI/Macro/User.pm
View file

@ -15,20 +15,11 @@ use WebGUI::Macro;
use WebGUI::Session;
#-------------------------------------------------------------------
sub _replacement {
my (@param, $temp);
@param = WebGUI::Macro::getParams($_[0]);
$temp = $session{user}{$param[0]};
return $temp;
sub process {
my @param = WebGUI::Macro::getParams($_[0]);
return $session{user}{$param[0]};
}
#-------------------------------------------------------------------
sub process {
my ($output, $temp);
$output = $_[0];
$output =~ s/\^User\((.*?)\)\;/_replacement($1)/ge;
return $output;
}
1;

10
lib/WebGUI/Macro/a_account.pm
View file

@ -17,7 +17,7 @@ use WebGUI::Session;
use WebGUI::URL;
#-------------------------------------------------------------------
sub _replacement {
sub process {
my (@param, $temp);
@param = WebGUI::Macro::getParams($_[0]);
$temp = WebGUI::URL::page('op=displayAccount');
@ -33,14 +33,6 @@ sub _replacement {
return $temp;
}
#-------------------------------------------------------------------
sub process {
my ($output, $temp);
$output = $_[0];
$output =~ s/\^a\((.*?)\)\;/_replacement($1)/ge;
$output =~ s/\^a\;/_replacement()/ge;
return $output;
}
1;

5
lib/WebGUI/Macro/c_companyName.pm
View file

@ -15,10 +15,7 @@ use WebGUI::Session;
#-------------------------------------------------------------------
sub process {
my ($output);
$output = $_[0];
$output =~ s/\^c\;/$session{setting}{companyName}/g;
return $output;
return $session{setting}{companyName};
}
1;

5
lib/WebGUI/Macro/e_companyEmail.pm
View file

@ -15,10 +15,7 @@ use WebGUI::Session;
#-------------------------------------------------------------------
sub process {
my ($output);
$output = $_[0];
$output =~ s/\^e\;/$session{setting}{companyEmail}/g;
return $output;
return $session{setting}{companyEmail};
}
1;

9
lib/WebGUI/Macro/i_imageNoTags.pm
View file

@ -18,7 +18,7 @@ use WebGUI::Session;
use WebGUI::SQL;
#-------------------------------------------------------------------
sub _replacement {
sub process {
my (@param, $image, %data);
tie %data, 'Tie::CPHash';
@param = WebGUI::Macro::getParams($_[0]);
@ -27,13 +27,6 @@ sub _replacement {
return $image->getURL;
}
#-------------------------------------------------------------------
sub process {
my ($output, $temp);
$output = $_[0];
$output =~ s/\^i\((.*?)\)\;/_replacement($1)/ge;
return $output;
}
1;

10
lib/WebGUI/Macro/m_currentMenuHorizontal.pm
View file

@ -16,7 +16,7 @@ use WebGUI::Navigation;
use WebGUI::Session;
#-------------------------------------------------------------------
sub _replacement {
sub process {
my ($temp, @param, $tree);
@param = WebGUI::Macro::getParams($_[0]);
$tree = WebGUI::Navigation::tree($session{page}{pageId},1);
@ -26,14 +26,6 @@ sub _replacement {
return $temp;
}
#-------------------------------------------------------------------
sub process {
my ($output, $temp, @data, $sth, $first);
$output = $_[0];
$output =~ s/\^m\((.*?)\)\;/_replacement($1)/ge;
$output =~ s/\^m\;/_replacement()/ge;
return $output;
}
1;

10
lib/WebGUI/Macro/p_previousMenuHorizontal.pm
View file

@ -17,7 +17,7 @@ use WebGUI::Session;
use WebGUI::SQL;
#-------------------------------------------------------------------
sub _replacement {
sub process {
my ($temp, $tree, @param);
@param = WebGUI::Macro::getParams($_[0]);
$tree = WebGUI::Navigation::tree($session{page}{parentId},1);
@ -27,14 +27,6 @@ sub _replacement {
return $temp;
}
#-------------------------------------------------------------------
sub process {
my ($output, $temp, @data, $sth, $first);
$output = $_[0];
$output =~ s/\^p\((.*?)\)\;/_replacement($1)/ge;
$output =~ s/\^p\;/_replacement()/ge;
return $output;
}
1;

10
lib/WebGUI/Macro/r_printable.pm
View file

@ -19,7 +19,7 @@ use WebGUI::URL;
use WebGUI::Utility;
#-------------------------------------------------------------------
sub _replacement {
sub process {
my ($temp, @param, $styleId);
@param = WebGUI::Macro::getParams($_[0]);
$temp = WebGUI::URL::append($session{env}{REQUEST_URI},'makePrintable=1');
@ -41,14 +41,6 @@ sub _replacement {
return $temp;
}
#-------------------------------------------------------------------
sub process {
my ($output, $temp);
$output = $_[0];
$output =~ s/\^r\((.*?)\)\;/_replacement($1)/ge;
$output =~ s/\^r\;/_replacement()/ge;
return $output;
}
1;

10
lib/WebGUI/Macro/rootmenuHorizontal.pm
View file

@ -16,7 +16,7 @@ use WebGUI::Navigation;
use WebGUI::Session;
#-------------------------------------------------------------------
sub _replacement {
sub process {
my @param = WebGUI::Macro::getParams($_[0]);
my $tree = WebGUI::Navigation::tree(0,1);
my $temp = '<span class="horizontalMenu">';
@ -25,14 +25,6 @@ sub _replacement {
return $temp;
}
#-------------------------------------------------------------------
sub process {
my ($output);
$output = $_[0];
$output =~ s/\^rootmenu\;/_replacement()/ge;
$output =~ s/\^rootmenu\((.*?)\)\;/_replacement($1)/ge;
return $output;
}
1;

9
lib/WebGUI/Macro/s_specificMenuHorizontal.pm
View file

@ -16,7 +16,7 @@ use WebGUI::Navigation;
use WebGUI::Session;
#-------------------------------------------------------------------
sub _replacement {
sub process {
my ($temp, $tree, $parentId, @param);
@param = WebGUI::Macro::getParams($_[0]);
$temp = '<span class="horizontalMenu">';
@ -27,13 +27,6 @@ sub _replacement {
return $temp;
}
#-------------------------------------------------------------------
sub process {
my ($output);
$output = $_[0];
$output =~ s/\^s\((.*?)\)\;/_replacement($1)/ge;
return $output;
}
1;

10
lib/WebGUI/Macro/t_topMenuHorizontal.pm
View file

@ -16,7 +16,7 @@ use WebGUI::Navigation;
use WebGUI::Session;
#-------------------------------------------------------------------
sub _replacement {
sub process {
my ($temp, $tree, @param);
@param = WebGUI::Macro::getParams($_[0]);
$tree = WebGUI::Navigation::tree(1,1);
@ -26,14 +26,6 @@ sub _replacement {
return $temp;
}
#-------------------------------------------------------------------
sub process {
my ($output, $temp, @data, $sth, $first);
$output = $_[0];
$output =~ s/\^t\((.*?)\)\;/_replacement($1)/ge;
$output =~ s/\^t\;/_replacement()/ge;
return $output;
}
1;

5
lib/WebGUI/Macro/u_companyUrl.pm
View file

@ -15,10 +15,7 @@ use WebGUI::Session;
#-------------------------------------------------------------------
sub process {
my ($output);
$output = $_[0];
$output =~ s/\^u\;/$session{setting}{companyURL}/g;
return $output;
return $session{setting}{companyURL};
}
1;