From 6009ead2869e8945fda8e4fa346113759a9458f4 Mon Sep 17 00:00:00 2001 From: Matthew Wilson Date: Sat, 14 Jan 2006 20:01:41 +0000 Subject: [PATCH] misc. syntax fixes. --- lib/WebGUI.pm | 45 +++++++++++++++--------------- lib/WebGUI/Auth.pm | 2 +- lib/WebGUI/Session.pm | 2 +- lib/WebGUI/Session/ErrorHandler.pm | 2 +- lib/WebGUI/Session/Icon.pm | 2 +- 5 files changed, 26 insertions(+), 27 deletions(-) diff --git a/lib/WebGUI.pm b/lib/WebGUI.pm index cd95343f1..16e3a12dc 100644 --- a/lib/WebGUI.pm +++ b/lib/WebGUI.pm @@ -21,7 +21,6 @@ use WebGUI::Cache; use WebGUI::Config; use WebGUI::International; use WebGUI::Operation; -use WebGUI::Privilege; use WebGUI::Session; use WebGUI::Utility; use WebGUI::PassiveProfiling; @@ -36,7 +35,7 @@ sub handler { my $r = shift; my $s = Apache2::ServerUtil->server; $s->add_version_component("WebGUI/".$WebGUI::VERSION); - $config = WebGUI::Config->new($s->dir_config('WebguiRoot'),$r->dir_config('WebguiConfig')); + my $config = WebGUI::Config->new($s->dir_config('WebguiRoot'),$r->dir_config('WebguiConfig')); foreach my $url ($config->get("extrasURL"), @{$config->get("passthruUrls")}) { return Apache2::Const::DECLINED if ($r->uri =~ m/^$url/); } @@ -60,9 +59,9 @@ sub contentHandler { ### Open new or existing user session based on user-agent's cookie. my $session = WebGUI::Session->open($s->dir_config('WebguiRoot'),$r->dir_config('WebguiConfig'),$r, $s); ### form variables - foreach ($session->{_request}->param) { - $session{form}{$_} = $session->{_request}->body($_) || $session->{_request}->param($_); - } +# foreach ($session->{_request}->param) { +# $session{form}{$_} = $session->{_request}->body($_) || $session->{_request}->param($_); +# } if ($session->env->get("HTTP_X_MOZ") eq "prefetch") { # browser prefetch is a bad thing $session->http->setStatus("403","We don't allow prefetch, because it increases bandwidth, hurts stats, and can break web sites."); $r->print($session->http->getHeader); @@ -94,14 +93,14 @@ sub page { my $assetUrl = shift; my $output = processOperations($session); if ($output eq "") { - my $asset = eval{WebGUI::Asset->newByUrl($session,$assetUrl,$session{form}{revision})}; + my $asset = eval{WebGUI::Asset->newByUrl($session,$assetUrl,$session->form->process("revision"))}; if ($@) { $session->errorHandler->warn("Couldn't instantiate asset for url: ".$session->url->getRequestedUrl." Root cause: ".$@); } if (defined $asset) { my $method = "view"; - if (exists $session{form}{func}) { - $method = $session{form}{func}; + if ($session->form->process("func")) { + $method = $session->form->process("func"); unless ($method =~ /^[A-Za-z]+$/) { $session->security("tried to call a non-existent method $method on $assetUrl"); $method = "view"; @@ -130,23 +129,23 @@ sub page { sub processOperations { my $session = shift; my ($cmd, $output); - my $op = $session{form}{op}; - my $opNumber = shift || 1; + my $op = $session->form->process("op"); +# my $opNumber = shift || 1; if ($op) { $output = WebGUI::Operation::execute($session,$op); } - $opNumber++; - if ($output eq "" && exists $session{form}{"op".$opNumber}) { - my $urlString = $session->url->unescape($session->form->get("op".$opNumber)); - my @pairs = split(/\;/,$urlString); - my %form; - foreach my $pair (@pairs) { - my @param = split(/\=/,$pair); - $form{$param[0]} = $param[1]; - } - $session{form} = \%form; - $output = processOperations($session,$opNumber); - } +# $opNumber++; +# if ($output eq "" && $session->form->process("op".$opNumber)) { +# my $urlString = $session->url->unescape($session->form->process("op".$opNumber)); +# my @pairs = split(/\;/,$urlString); +# my %form; +# foreach my $pair (@pairs) { +# my @param = split(/\=/,$pair); +# $form{$param[0]} = $param[1]; +# } +# $session{form} = \%form; +# $output = processOperations($session,$opNumber); +# } return $output; } @@ -168,7 +167,7 @@ sub tryAssetMethod { my $methodToTry = "www_".$method; my $output = eval{$asset->$methodToTry()}; if ($@) { - $session->errorHandler->warn("Couldn't call method ".$method." on asset for url: ".$session{requestedUrl}." Root cause: ".$@); + $session->errorHandler->warn("Couldn't call method ".$method." on asset for url: ".$session->url->getRequestedUrl." Root cause: ".$@); $output = tryAssetMethod($session,$asset,'view') if ($method ne "view"); } return $output; diff --git a/lib/WebGUI/Auth.pm b/lib/WebGUI/Auth.pm index 538be62c0..cfe7bc421 100644 --- a/lib/WebGUI/Auth.pm +++ b/lib/WebGUI/Auth.pm @@ -618,7 +618,7 @@ Array reference of methods allowed to be called externally; sub new { my $self = {}; my $class = shift; - my $self->{_session} = shift; + $self->{_session} = shift; $self->{authMethod} = shift; my $userId = shift || $self->{_session}->user->userId; $self->{user} = $self->{_session}->user; diff --git a/lib/WebGUI/Session.pm b/lib/WebGUI/Session.pm index f9b081e05..2f3269b6f 100644 --- a/lib/WebGUI/Session.pm +++ b/lib/WebGUI/Session.pm @@ -530,7 +530,7 @@ sub user { my $option = shift; if (defined $option) { $self->{_var}{userId} = $option->{userId} || $option->{user}->userId; - $self->db-setRow("userSession","sessionId", $self->{_var}); + $self->db->setRow("userSession","sessionId", $self->{_var}); if ($self->setting("passiveProfilingEnabled")) { $self->db->write("update passiveProfileLog set userId = ".$self->db->quote($self->{_var}{userId})." where sessionId = ".$self->db->quote($self->getId)); } diff --git a/lib/WebGUI/Session/ErrorHandler.pm b/lib/WebGUI/Session/ErrorHandler.pm index 6c1f27862..3f69e5f8f 100644 --- a/lib/WebGUI/Session/ErrorHandler.pm +++ b/lib/WebGUI/Session/ErrorHandler.pm @@ -176,7 +176,7 @@ Adds a FATAL type message to the log, outputs an error message to the user, and sub fatal { my $self = shift; my $message = shift; - my $self->{_session}->http->setStatus("500","Server Error"); + $self->{_session}->http->setStatus("500","Server Error"); Apache2::RequestUtil->request->content_type('text/html') if ($self->{_session}->request); $self->getLogger->fatal($message); $self->getLogger->debug("Stack trace for FATAL ".$message."\n".$self->getStackTrace()); diff --git a/lib/WebGUI/Session/Icon.pm b/lib/WebGUI/Session/Icon.pm index e3f3042a5..4dd133824 100644 --- a/lib/WebGUI/Session/Icon.pm +++ b/lib/WebGUI/Session/Icon.pm @@ -267,7 +267,7 @@ sub help { my $urlParams = shift; my $pageURL = shift || $self->session->url->getRequestedUrl; my ($output, $namespace); - my $output = 'session->url->page('op=viewHelp;hid='.$urlParams.';namespace='.$namespace). '" target="_blank">'.WebGUI::International->new($self->session,'Icon')->get('Help').''; return $output; }