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

a ton of $session fixes (thanks to Colin), and a new $session checker, that supposedly, shouldn't be needed now. It can be backed out, however, easily.

Browse source
This commit is contained in:
Matthew Wilson 2006-01-16 22:45:21 +00:00
parent 5fadc70eac
commit 09483e18c5
208 changed files with 505 additions and 533 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/WebGUI/Operation/Help.pm
View file

@ -20,7 +20,7 @@ use WebGUI::Utility;
#-------------------------------------------------------------------
sub _load {
my $session = shift;
my $session = shift; use WebGUI; WebGUI::dumpSession($session);
my $namespace = shift;
$namespace =~ s/[^\w\d\s]//g;
my $cmd = "WebGUI::Help::".$namespace;
@ -37,7 +37,7 @@ sub _load {
#-------------------------------------------------------------------
sub _get {
my $session = shift;
my $session = shift; use WebGUI; WebGUI::dumpSession($session);
my $id = shift;
my $namespace = shift;
my $help = _load($namespace);
@ -51,19 +51,19 @@ sub _get {
#-------------------------------------------------------------------
sub _link {
my $session = shift;
my $session = shift; use WebGUI; WebGUI::dumpSession($session);
return $session->url->page('op=viewHelp;hid='.$session->url->escape($_[0]).';namespace='.$_[1]);
}
#-------------------------------------------------------------------
sub _linkTOC {
my $session = shift;
my $session = shift; use WebGUI; WebGUI::dumpSession($session);
return $session->url->page('op=viewHelpChapter;namespace='.$_[0]);
}
#-------------------------------------------------------------------
sub _getHelpFilesList {
my $session = shift;
my $session = shift; use WebGUI; WebGUI::dumpSession($session);
my $dir = join '/', $session->config->getWebguiRoot,"lib","WebGUI","Help";
opendir (DIR,$dir) or $session->errorHandler->fatal("Can't open Help directory!");
my @files;
@ -79,7 +79,7 @@ sub _getHelpFilesList {
#-------------------------------------------------------------------
sub _getHelpName {
my $session = shift;
my $session = shift; use WebGUI; WebGUI::dumpSession($session);
my $file = shift;
my $helpName;
if ($file =~ /^Asset_/) {
@ -108,7 +108,7 @@ sub _related {
#-------------------------------------------------------------------
sub www_viewHelp {
my $session = shift;
my $session = shift; use WebGUI; WebGUI::dumpSession($session);
return $session->privilege->insufficient() unless ($session->user->isInGroup(7));
my $ac = WebGUI::AdminConsole->new($session,"help");
my $namespace = $session->form->process("namespace") || "WebGUI";
@ -126,7 +126,7 @@ sub www_viewHelp {
{ 'title' => $i18n->get($row->{title},$row->{namespace}),
'description' => $i18n->get($row->{description},$row->{namespace}), }
}
my $body = WebGUI::Asset::Template->new("PBtmplHelp000000000001")->process(\%vars);
my $body = WebGUI::Asset::Template->new($session,"PBtmplHelp000000000001")->process(\%vars);
$ac->addSubmenuItem($session->url->page('op=viewHelpIndex'),$i18n->get(95, 'WebGUI'));
$ac->addSubmenuItem($session->url->page('op=viewHelpTOC'),$i18n->get('help contents', 'WebGUI'));
WebGUI::Macro::process($session,\$body);
@ -138,7 +138,7 @@ sub www_viewHelp {
#-------------------------------------------------------------------
sub www_viewHelpIndex {
my $session = shift;
my $session = shift; use WebGUI; WebGUI::dumpSession($session);
return $session->privilege->insufficient() unless ($session->user->isInGroup(7));
my $i18n = WebGUI::International->new($session);
my @helpIndex;
@ -173,7 +173,7 @@ sub www_viewHelpIndex {
#-------------------------------------------------------------------
sub www_viewHelpTOC {
my $session = shift;
my $session = shift; use WebGUI; WebGUI::dumpSession($session);
return $session->privilege->insufficient() unless ($session->user->isInGroup(7));
my @helpIndex;
my $i;
@ -204,7 +204,7 @@ sub www_viewHelpTOC {
#-------------------------------------------------------------------
sub www_viewHelpChapter {
my $session = shift;
my $session = shift; use WebGUI; WebGUI::dumpSession($session);
return $session->privilege->insufficient() unless ($session->user->isInGroup(7));
my $namespace = $session->form->process("namespace");
my $help = _load($namespace);