WebGUI 3.2.0 release

This commit is contained in:
JT Smith 2002-02-11 04:15:00 +00:00
parent 71cd27d3bc
commit cb88a99e52
60 changed files with 1284 additions and 474 deletions

View file

@ -12,12 +12,13 @@ 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;
$output =~ s/\^\\\;/WebGUI::URL::page()/ge;
return $output;
}

View file

@ -12,8 +12,10 @@ package WebGUI::Macro::C_crumbTrail;
use strict;
use Tie::CPHash;
use WebGUI::Macro;
use WebGUI::Session;
use WebGUI::SQL;
use WebGUI::URL;
#-------------------------------------------------------------------
sub _recurseCrumbTrail {
@ -24,16 +26,23 @@ sub _recurseCrumbTrail {
$output .= _recurseCrumbTrail($data{parentId});
}
if ($data{title} ne "") {
$output .= '<a class="crumbTrail" href="'.$session{config}{scripturl}.
'/'.$data{urlizedTitle}.'">'.$data{title}.'</a> &gt; ';
$output .= '<a class="crumbTrail" href="'.WebGUI::URL::gateway($data{urlizedTitle})
.'">'.$data{title}.'</a>'.$_[1];
}
return $output;
}
#-------------------------------------------------------------------
sub _replacement {
my (@param, $temp);
$temp = '<span class="crumbTrail">'._recurseCrumbTrail($session{page}{parentId}).'<a href="'.$session{page}{url}.'">'.$session{page}{title}.'</a></span>';
my (@param, $temp, $delimeter);
@param = WebGUI::Macro::getParams($_[0]);
if ($param[0] eq "") {
$delimeter = " &gt; ";
} else {
$delimeter = " ".$param[0]." ";
}
$temp = '<span class="crumbTrail">'._recurseCrumbTrail($session{page}{parentId},$delimeter).
'<a href="'.WebGUI::URL::page().'">'.$session{page}{title}.'</a></span>';
return $temp;
}
@ -41,6 +50,7 @@ sub _replacement {
sub process {
my ($output, $temp);
$output = $_[0];
$output =~ s/\^C\((.*?)\)\;/_replacement($1)/ge;
$output =~ s/\^C\;/_replacement()/ge;
return $output;
}

View file

@ -14,6 +14,7 @@ use strict;
use WebGUI::Macro;
use WebGUI::Privilege;
use WebGUI::Session;
use WebGUI::URL;
#-------------------------------------------------------------------
sub _replacement {
@ -35,8 +36,8 @@ sub _reversePageTree {
if ($_[1] == $data[0]) {
$output .= '<span class="selectedMenuItem">';
}
$output .= '<a class="verticalMenu" href="'.$session{config}{scripturl}.
'/'.$data[3].'">'.$data[2].'</a><br>';
$output .= '<a class="verticalMenu" href="'.WebGUI::URL::gateway($data[3]).
'">'.$data[2].'</a><br>';
if ($_[1] == $data[0]) {
$output .= '</span>';
}

View file

@ -19,7 +19,7 @@ use WebGUI::Session;
sub _replacement {
my (@param, $temp);
@param = WebGUI::Macro::getParams($1);
$temp = '<a class="homeLink" href="'.$session{config}{scripturl}.'/home">';
$temp = '<a class="homeLink" href="'.WebGUI::URL::gateway('home').'">';
if ($param[0] ne "") {
$temp .= $param[0];
} else {

View file

@ -15,6 +15,7 @@ use WebGUI::Form;
use WebGUI::International;
use WebGUI::Macro::Backslash_pageUrl;
use WebGUI::Session;
use WebGUI::URL;
#-------------------------------------------------------------------
sub _replacement {
@ -22,11 +23,11 @@ sub _replacement {
$temp = '<div class="loginBox">';
if ($session{var}{sessionId}) {
$temp .= WebGUI::International::get(48);
$temp .= ' <a href="'.$session{page}{url}.'?op=displayAccount">'.$session{user}{username}.'</a>.';
$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 {
$temp .= '<form method="post" action="'.$session{page}{url}.'"> ';
$temp .= '<form method="post" action="'.WebGUI::URL::page().'"> ';
$temp .= WebGUI::Form::hidden("op","login").'<span class="formSubtext">';
$temp .= WebGUI::International::get(50);
$temp .= '<br></span>';
@ -36,7 +37,7 @@ sub _replacement {
$temp .= WebGUI::Form::password("identifier",12,30).'<span class="formSubtext"><br></span>';
$temp .= WebGUI::Form::submit(WebGUI::International::get(52));
$temp .= '</form>';
$temp .= '<a href="'.$session{page}{url}.'?op=createAccount">Click here to register.</a>';
$temp .= '<a href="'.WebGUI::URL::page('op=createAccount').'">Click here to register.</a>';
}
$temp .= '</div>';
return $temp;

View file

@ -14,12 +14,13 @@ use strict;
use WebGUI::Form;
use WebGUI::International;
use WebGUI::Session;
use WebGUI::URL;
#-------------------------------------------------------------------
sub process {
my ($output, $temp);
$output = $_[0];
$temp = '<form class="searchBox" method="post" action="'.$session{page}{url}.'">';
$temp = '<form class="searchBox" method="post" action="'.WebGUI::URL::page().'">';
$temp .= WebGUI::Form::hidden("op","search");
$temp .= WebGUI::Form::text("keywords",10,100,$session{form}{keywords});
$temp .= WebGUI::Form::submit(WebGUI::International::get(364));

View file

@ -15,6 +15,7 @@ use Tie::CPHash;
use WebGUI::Privilege;
use WebGUI::Session;
use WebGUI::SQL;
use WebGUI::URL;
our @ISA = qw(Exporter);
our @EXPORT = qw(&traversePageTree);
@ -40,7 +41,7 @@ sub traversePageTree {
while (@data = $sth->array) {
if (WebGUI::Privilege::canViewPage($data[2])) {
$output .= $depth.'<a class="verticalMenu" href="'.
$session{config}{scripturl}.'/'.$data[0].'">'.$data[1].'</a><br>';
WebGUI::URL::gateway($data[0]).'">'.$data[1].'</a><br>';
$output .= traversePageTree($data[2],$_[1]+1,$toLevel);
}
}

View file

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

View file

@ -14,12 +14,13 @@ use strict;
use WebGUI::International;
use WebGUI::Macro;
use WebGUI::Session;
use WebGUI::URL;
#-------------------------------------------------------------------
sub _replacement {
my (@param, $temp);
@param = WebGUI::Macro::getParams($_[0]);
$temp = '<a class="myAccountLink" href="'.$session{page}{url}.'?op=displayAccount">';
$temp = '<a class="myAccountLink" href="'.WebGUI::URL::page('op=displayAccount').'">';
if ($param[0] ne "") {
$temp .= $param[0];
} else {

View file

@ -11,13 +11,21 @@ package WebGUI::Macro::m_currentMenuHorizontal;
#-------------------------------------------------------------------
use strict;
use WebGUI::Macro;
use WebGUI::Privilege;
use WebGUI::Session;
use WebGUI::SQL;
use WebGUI::URL;
#-------------------------------------------------------------------
sub _replacement {
my ($temp, @data, $sth, $first);
my ($temp, @data, $sth, $first, @param, $delimeter);
@param = WebGUI::Macro::getParams($_[0]);
if ($param[0] eq "") {
$delimeter = " &middot; ";
} else {
$delimeter = " ".$param[0]." ";
}
$temp = '<span class="horizontalMenu">';
$first = 1;
$sth = WebGUI::SQL->read("select title,urlizedTitle,pageId from page where parentId=$session{page}{pageId} order by sequenceNumber");
@ -26,10 +34,10 @@ sub _replacement {
if ($first) {
$first = 0;
} else {
$temp .= " &middot; ";
$temp .= $delimeter;
}
$temp .= '<a class="horizontalMenu" href="'.$session{config}{scripturl}.
'/'.$data[1].'">'.$data[0].'</a>';
$temp .= '<a class="horizontalMenu" href="'.WebGUI::URL::gateway($data[1]).
'">'.$data[0].'</a>';
}
}
$sth->finish;
@ -41,6 +49,7 @@ sub _replacement {
sub process {
my ($output, $temp, @data, $sth, $first);
$output = $_[0];
$output =~ s/\^m\((.*?)\)\;/_replacement($1)/ge;
$output =~ s/\^m\;/_replacement()/ge;
return $output;
}

View file

@ -15,10 +15,17 @@ use WebGUI::Macro;
use WebGUI::Privilege;
use WebGUI::Session;
use WebGUI::SQL;
use WebGUI::URL;
#-------------------------------------------------------------------
sub _replacement {
my ($temp, @data, $sth, $first);
my ($temp, @data, $sth, $first, @param, $delimeter);
@param = WebGUI::Macro::getParams($_[0]);
if ($param[0] eq "") {
$delimeter = " &middot; ";
} else {
$delimeter = " ".$param[0]." ";
}
$temp = '<span class="horizontalMenu">';
$first = 1;
$sth = WebGUI::SQL->read("select title,urlizedTitle,pageId from page where parentId=$session{page}{parentId} order by sequenceNumber");
@ -27,9 +34,9 @@ sub _replacement {
if ($first) {
$first = 0;
} else {
$temp .= " &middot; ";
$temp .= $delimeter;
}
$temp .= '<a class="horizontalMenu" href="'.$session{config}{scripturl}.'/'.$data[1].'">'.$data[0].'</a>';
$temp .= '<a class="horizontalMenu" href="'.WebGUI::URL::gateway($data[1]).'">'.$data[0].'</a>';
}
}
$sth->finish;
@ -41,6 +48,7 @@ sub _replacement {
sub process {
my ($output, $temp, @data, $sth, $first);
$output = $_[0];
$output =~ s/\^p\((.*?)\)\;/_replacement($1)/ge;
$output =~ s/\^p\;/_replacement()/ge;
return $output;
}

View file

@ -14,13 +14,14 @@ use strict;
use WebGUI::International;
use WebGUI::Macro;
use WebGUI::Session;
use WebGUI::URL;
use WebGUI::Utility;
#-------------------------------------------------------------------
sub _replacement {
my ($temp, @param);
@param = WebGUI::Macro::getParams($_[0]);
$temp = appendToUrl($session{env}{REQUEST_URI},'makePrintable=1');
$temp = WebGUI::URL::append($session{env}{REQUEST_URI},'makePrintable=1');
$temp = '<a class="makePrintableLink" href="'.$temp.'">';
if ($param[0] ne "") {
$temp .= $param[0];

View file

@ -11,15 +11,22 @@ package WebGUI::Macro::s_specificMenuHorizontal;
#-------------------------------------------------------------------
use strict;
use WebGUI::Macro;
use WebGUI::Macro::Shared;
use WebGUI::Privilege;
use WebGUI::Session;
use WebGUI::SQL;
use WebGUI::URL;
#-------------------------------------------------------------------
sub _replacement {
my ($temp, @data, $pageTitle, $parentId, $sth, $first, @param);
my ($temp, @data, $pageTitle, $parentId, $sth, $first, @param, $delimeter);
@param = WebGUI::Macro::getParams($_[0]);
if ($param[1] eq "") {
$delimeter = " &middot; ";
} else {
$delimeter = " ".$param[1]." ";
}
$temp = '<span class="horizontalMenu">';
$first = 1;
($parentId) = WebGUI::SQL->quickArray("select pageId from page where urlizedTitle='$param[0]'");
@ -29,10 +36,10 @@ sub _replacement {
if ($first) {
$first = 0;
} else {
$temp .= " &middot; ";
$temp .= $delimeter;
}
$temp .= '<a class="horizontalMenu" href="'.$session{config}{scripturl}.
'/'.$data[1].'">'.$data[0].'</a>';
$temp .= '<a class="horizontalMenu" href="'.WebGUI::URL::gateway($data[1]).'">'.
$data[0].'</a>';
}
}
$sth->finish;
@ -45,7 +52,6 @@ sub process {
my ($output,@data, $pageTitle, $parentId, $sth, $first, $temp);
$output = $_[0];
$output =~ s/\^s\((.*?)\)\;/_replacement($1)/ge;
#$output =~ s/\^s\;/_replacement()/ge;
return $output;
}

View file

@ -11,13 +11,20 @@ package WebGUI::Macro::t_topMenuHorizontal;
#-------------------------------------------------------------------
use strict;
use WebGUI::Macro;
use WebGUI::Privilege;
use WebGUI::Session;
use WebGUI::SQL;
#-------------------------------------------------------------------
sub _replacement {
my ($temp, @data, $sth, $first);
my ($temp, @data, $sth, $first, @param, $delimeter);
@param = WebGUI::Macro::getParams($_[0]);
if ($param[0] eq "") {
$delimeter = " &middot; ";
} else {
$delimeter = " ".$param[0]." ";
}
$temp = '<span class="horizontalMenu">';
$first = 1;
$sth = WebGUI::SQL->read("select title,urlizedTitle,pageId from page where parentId=1 order by sequenceNumber");
@ -26,10 +33,10 @@ sub _replacement {
if ($first) {
$first = 0;
} else {
$temp .= " &middot; ";
$temp .= $delimeter;
}
$temp .= '<a class="horizontalMenu" href="'.$session{config}{scripturl}.'/'
.$data[1].'">'.$data[0].'</a>';
$temp .= '<a class="horizontalMenu" href="'.WebGUI::URL::gateway($data[1])
.'">'.$data[0].'</a>';
}
}
$sth->finish;
@ -41,6 +48,7 @@ sub _replacement {
sub process {
my ($output, $temp, @data, $sth, $first);
$output = $_[0];
$output =~ s/\^t\((.*?)\)\;/_replacement($1)/ge;
$output =~ s/\^t\;/_replacement()/ge;
return $output;
}