From 118399c1dbb1d5c69dcbdee66cb2c3ada101e343 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Fri, 23 Jan 2009 16:44:29 +0000
Subject: [PATCH] Refactor out the check for the session-request outside of the
 nested conditionals. Use the hashref out of the request object to speed up
 param name lookups.

---
 lib/WebGUI/Session/Form.pm | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/lib/WebGUI/Session/Form.pm b/lib/WebGUI/Session/Form.pm
index 07c58d81c..0bd0332a2 100644
--- a/lib/WebGUI/Session/Form.pm
+++ b/lib/WebGUI/Session/Form.pm
@@ -103,27 +103,18 @@ The name of the field to retrieve if you want to retrieve just one specific fiel
 
 sub param {
 	my $self = shift;
+    return undef unless $self->session->request;
 	my $field = shift;
 	if ($field) {
-		if ($self->session->request) {
-			my @data = $self->session->request->param($field);
-            foreach my $value (@data) {
-                $value = Encode::decode_utf8($value);
-            }
-			return wantarray ? @data : $data[0];
-		} else {
-			return undef;
-		}
-	} else {
-		if ($self->session->request) {
-			my %params;
-			foreach ($self->session->request->param) {
-				$params{$_} = 1;
-			}
-			return keys %params;
-		} else {
-			return undef;
-		}
+        my @data = $self->session->request->param($field);
+        foreach my $value (@data) {
+            $value = Encode::decode_utf8($value);
+        }
+        return wantarray ? @data : $data[0];
+	}
+    else {
+        my $paramRef = $self->session->request->param;
+        return keys %{ $paramRef };
 	}
 }
 
@@ -154,8 +145,8 @@ A full set of form params just as you'd pass into any of the form controls when
 sub process {
 	my ($self, $name, $type, $default, $params) = @_;
 
-	$type = ucfirst($type);
 	return $self->param($name) if ($type eq "");
+	$type = ucfirst($type);
 
 	return $self->SUPER::process({
 		name	=>	$name,