From 2599a4c8531703f9df2b12338772fe004ae1f709 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Tue, 10 Jan 2006 17:43:38 +0000
Subject: [PATCH] converting WebGUI::Form API to use new session system

---
 docs/migration.txt                        | 11 +++++-
 lib/WebGUI/Asset.pm                       | 14 +++----
 lib/WebGUI/Asset/Post.pm                  |  8 ++--
 lib/WebGUI/Asset/Shortcut.pm              |  2 +-
 lib/WebGUI/Asset/Template.pm              | 14 +++----
 lib/WebGUI/Asset/Wobject/Collaboration.pm | 10 ++---
 lib/WebGUI/Asset/Wobject/DataForm.pm      | 12 +++---
 lib/WebGUI/Asset/Wobject/IndexedSearch.pm |  2 +-
 lib/WebGUI/Asset/Wobject/Matrix.pm        |  4 +-
 lib/WebGUI/Asset/Wobject/Poll.pm          | 10 ++---
 lib/WebGUI/Asset/Wobject/Survey.pm        |  4 +-
 lib/WebGUI/AssetBranch.pm                 | 32 +++++++--------
 lib/WebGUI/AssetClipboard.pm              |  2 +-
 lib/WebGUI/AssetTrash.pm                  |  2 +-
 lib/WebGUI/Auth.pm                        | 34 ++++++++--------
 lib/WebGUI/Auth/LDAP.pm                   |  6 +--
 lib/WebGUI/Auth/WebGUI.pm                 | 48 +++++++++++------------
 lib/WebGUI/Commerce/Payment/ITransact.pm  |  4 +-
 lib/WebGUI/Form.pm                        | 47 +++++++++++++---------
 lib/WebGUI/HTMLForm.pm                    |  2 +-
 lib/WebGUI/Macro/L_loginBox.pm            |  4 +-
 lib/WebGUI/Operation/Commerce.pm          | 40 +++++++++----------
 lib/WebGUI/Operation/Group.pm             |  4 +-
 lib/WebGUI/Operation/ProductManager.pm    |  4 +-
 lib/WebGUI/Operation/Profile.pm           | 10 ++---
 lib/WebGUI/Operation/Subscription.pm      | 16 ++++----
 lib/WebGUI/Operation/User.pm              | 18 ++++-----
 lib/WebGUI/TabForm.pm                     | 16 ++++----
 28 files changed, 199 insertions(+), 181 deletions(-)

diff --git a/docs/migration.txt b/docs/migration.txt
index 4eaeb7976..4a959169d 100644
--- a/docs/migration.txt
+++ b/docs/migration.txt
@@ -705,7 +705,7 @@ of 6.9.
 perl -pi.bak -e 's!WebGUI\:\:Privilege\:\:!\$self->session->privilege->!g' fileNameGoesHere
 
 
-5.23.10 WebGUI::DateTime API Refactored
+5.23.11 WebGUI::DateTime API Refactored
 
 WebGUI::DateTime is now accessed through $session.
 
@@ -721,6 +721,15 @@ perl -pi.bak -e 's![^\:]time\(!\$self->session->datetime->time(!g' fileNameGoesH
 perl -pi.bak -e 's!WebGUI\:\:DateTime\:\:!\$self->session->datetime->!g' fileNameGoesHere
 
 
+5.23.12 WebGUI::Form API Refactored
+
+In 6.9 the WebGUI::Form API was refactored to accept $session as the first
+parameter to each method.
+
+perl -pi.bak -e 's!WebGUI\:\:Form\:\:(\w+)\((.*)\)!WebGUI::Form::$1(\$self->session,$2)!g' fileNameGoesHere
+perl -pi.bak -e 's!WebGUI\:\:Form\:\:(\w+)\($!WebGUI::Form::$1(\$self->session,!g' fileNameGoesHere
+
+
 6.  Automatic list of Assets in Help System.
 -------------------------------------
 6.1 Starting in WebGUI 6.7, there is now an automatic list of all Assets
diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index 5499f9a24..142cfff85 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -1550,7 +1550,7 @@ sub www_manageAssets {
    <script type=\"text/javascript\">
    //<![CDATA[
      var assetManager = new AssetManager();
-         assetManager.AddColumn('".WebGUI::Form::checkbox({extras=>'onchange="toggleAssetListSelectAll(this.form);"'})."','','center','form');
+         assetManager.AddColumn('".WebGUI::Form::checkbox($self->session,{extras=>'onchange="toggleAssetListSelectAll(this.form);"'})."','','center','form');
          assetManager.AddColumn('&nbsp;','','center','');
          assetManager.AddColumn('".$i18n->get("rank")."','style=\"cursor:move\"','right','numeric');
          assetManager.AddColumn('".$i18n->get("99")."','','left','');
@@ -1640,14 +1640,14 @@ sub www_manageAssets {
         }
 	if ($hasClips) {
 		$output .= '<div style="width: 28%; float: left; padding-right: 30px; font-size: 14px;"><fieldset><legend>'.WebGUI::International::get(1082,"Asset").'</legend>'
-			.WebGUI::Form::formHeader()
-			.WebGUI::Form::hidden({name=>"func",value=>"pasteList"})
-			.WebGUI::Form::checkbox({extras=>'onchange="toggleClipboardSelectAll(this.form);"'})
+			.WebGUI::Form::formHeader($self->session,)
+			.WebGUI::Form::hidden($self->session,{name=>"func",value=>"pasteList"})
+			.WebGUI::Form::checkbox($self->session,{extras=>'onchange="toggleClipboardSelectAll(this.form);"'})
 			.' '.WebGUI::International::get("select all","Asset").'<br />'
-			.WebGUI::Form::checkList({name=>"assetId",vertical=>1,options=>\%options})
+			.WebGUI::Form::checkList($self->session,{name=>"assetId",vertical=>1,options=>\%options})
 			.'<br />'
-			.WebGUI::Form::submit({value=>"Paste"})
-			.WebGUI::Form::formFooter()
+			.WebGUI::Form::submit($self->session,{value=>"Paste"})
+			.WebGUI::Form::formFooter($self->session,)
 			.' </fieldset></div> '
 			.'<script type="text/javascript">
 			//<![CDATA[
diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm
index 3ef2c2851..5a9b0bf79 100644
--- a/lib/WebGUI/Asset/Post.pm
+++ b/lib/WebGUI/Asset/Post.pm
@@ -508,7 +508,7 @@ sub getUploadControl {
 		}
 		return $uploadControl unless ($i < $maxAttachments);
 	}
-	$uploadControl .= WebGUI::Form::file(
+	$uploadControl .= WebGUI::Form::file($self->session,
 		maxAttachments=>$maxAttachments
 		);
 	return $uploadControl;
@@ -957,7 +957,7 @@ sub www_edit {
 	my $content;
 	my $title;
 	if ($self->session->form->process("func") eq "add") { # new post
-        	$var{'form.header'} = WebGUI::Form::formHeader({action=>$self->getParent->getUrl})
+        	$var{'form.header'} = WebGUI::Form::formHeader($self->session,{action=>$self->getParent->getUrl})
 			.WebGUI::Form::hidden({
                 		name=>"func",
 				value=>"add"
@@ -1013,7 +1013,7 @@ sub www_edit {
                 $content .= "\n\n".$self->session->user->profileField("signature") if ($self->session->user->profileField("signature") && !$self->session->form->process("content"));
 	} else { # edit
 		return $self->session->privilege->insufficient() unless ($self->canEdit);
-        	$var{'form.header'} = WebGUI::Form::formHeader({action=>$self->getUrl})
+        	$var{'form.header'} = WebGUI::Form::formHeader($self->session,{action=>$self->getUrl})
 			.WebGUI::Form::hidden({
                 		name=>"func",
 				value=>"edit"
@@ -1038,7 +1038,7 @@ sub www_edit {
 			$var{'preview.userDefined'.$i} = WebGUI::HTML::filter($session{form}{'userDefined'.$i},"macros");
 		}
 	}
-	$var{'form.footer'} = WebGUI::Form::formFooter();
+	$var{'form.footer'} = WebGUI::Form::formFooter($self->session,);
 	$var{usePreview} = $self->getThread->getParent->get("usePreview");
 	$var{'user.isModerator'} = $self->getThread->getParent->canModerate;
 	$var{'user.isVisitor'} = ($self->session->user->profileField("userId") eq '1');
diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm
index b3bc59dc1..3b04918bc 100644
--- a/lib/WebGUI/Asset/Shortcut.pm
+++ b/lib/WebGUI/Asset/Shortcut.pm
@@ -94,7 +94,7 @@ sub _drawQueryBuilder {
 		});
 		# The value select field
 		my $valFieldName = "val_field".$i;
-		my $valueField = WebGUI::Form::dynamicField(
+		my $valueField = WebGUI::Form::dynamicField($self->session,
 			fieldType=>$fieldType,
 			name=>$valFieldName,
 			uiLevel=>5,
diff --git a/lib/WebGUI/Asset/Template.pm b/lib/WebGUI/Asset/Template.pm
index 74cf1e707..51e7ea0ae 100644
--- a/lib/WebGUI/Asset/Template.pm
+++ b/lib/WebGUI/Asset/Template.pm
@@ -511,26 +511,26 @@ $style .= '
 			template=>$style
 			})->www_edit;
 	} else {
-		$output = WebGUI::Form::formHeader({action=>$self->getUrl}).WebGUI::Form::hidden({name=>"func", value=>"styleWizard"});
-		$output .= WebGUI::Form::hidden({name=>"proceed", value=>"manageAssets"}) if ($self->session->form->process("proceed"));
+		$output = WebGUI::Form::formHeader($self->session,{action=>$self->getUrl}).WebGUI::Form::hidden({name=>"func", value=>"styleWizard"});
+		$output .= WebGUI::Form::hidden($self->session,{name=>"proceed", value=>"manageAssets"}) if ($self->session->form->process("proceed"));
 		$output .= '<style type="text/css">
 			.chooser { float: left; width: 150px; height: 150px; } 
 			.representation, .representation td { font-size: 12px; width: 120px; border: 1px solid black; } 
 			.representation { height: 130px; }
 			</style>';
 		$output .= "<p>Choose a layout for this style:</p>";
-		$output .= WebGUI::Form::hidden({name=>"step", value=>2});
-		$output .= '<div class="chooser">'.WebGUI::Form::radio({name=>"layout", value=>1, checked=>1}).q|<table class="representation"><tbody>
+		$output .= WebGUI::Form::hidden($self->session,{name=>"step", value=>2});
+		$output .= '<div class="chooser">'.WebGUI::Form::radio($self->session,{name=>"layout", value=>1, checked=>1}).q|<table class="representation"><tbody>
 			<tr><td>Logo</td><td>Heading</td></tr>
 			<tr><td>Menu</td><td>Body content goes here.</td></tr>
 			</tbody></table></div>|;
-		$output .= '<div class="chooser">'.WebGUI::Form::radio({name=>"layout", value=>2}).q|<table class="representation"><tbody>
+		$output .= '<div class="chooser">'.WebGUI::Form::radio($self->session,{name=>"layout", value=>2}).q|<table class="representation"><tbody>
 			<tr><td>Logo</td><td>Heading</td></tr>
 			<tr><td style="text-align: center;" colspan="2">Menu</td></tr>
 			<tr><td colspan="2">Body content goes here.</td></tr>
 			</tbody></table></div>|;
-		$output .= WebGUI::Form::submit();
-		$output .= WebGUI::Form::formFooter();
+		$output .= WebGUI::Form::submit($self->session,);
+		$output .= WebGUI::Form::formFooter($self->session,);
 	}
 	$self->getAdminConsole->addSubmenuItem($self->getUrl('func=edit'),WebGUI::International::get("edit template","Asset_Template")) if ($self->get("url"));
         return $self->getAdminConsole->render($output,WebGUI::International::get('style wizard', 'Asset_Template'));
diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm
index 16b58bb18..ef044874b 100644
--- a/lib/WebGUI/Asset/Wobject/Collaboration.pm
+++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm
@@ -960,9 +960,9 @@ sub www_search {
         $self->session->scratch->set($self->getId."_without",$self->session->form->process("without"));
         $self->session->scratch->set($self->getId."_numResults",$self->session->form->process("numResults"));
         my %var;
-        $var{'form.header'} = WebGUI::Form::formHeader({action=>$self->getUrl})
-         	.WebGUI::Form::hidden({ name=>"func", value=>"search" })
-        	.WebGUI::Form::hidden({ name=>"doit", value=>1 });
+        $var{'form.header'} = WebGUI::Form::formHeader($self->session,{action=>$self->getUrl})
+         	.WebGUI::Form::hidden($self->session,{ name=>"func", value=>"search" })
+        	.WebGUI::Form::hidden($self->session,{ name=>"doit", value=>1 });
         $var{'all.form'} = WebGUI::Form::text({
                 name=>'all',
                 value=>$session{scratch}{$self->getId."_all"},
@@ -992,8 +992,8 @@ sub www_search {
                 options=>\%results,
                 value=>[$numResults]
                 });
-        $var{'form.search'} = WebGUI::Form::submit({value=>WebGUI::International::get(170)});
-        $var{'form.footer'} = WebGUI::Form::formFooter();
+        $var{'form.search'} = WebGUI::Form::submit($self->session,{value=>WebGUI::International::get(170)});
+        $var{'form.footer'} = WebGUI::Form::formFooter($self->session,);
         $var{'back.url'} = $self->getUrl;
 	$self->appendTemplateLabels(\%var);
         $var{doit} = $self->session->form->process("doit");
diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index 71981483d..70a58eff0 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -385,14 +385,14 @@ sub getRecordTemplateVars {
 	$var->{"addTab.label"}=  WebGUI::International::get(105,"Asset_DataForm");;
 	$var->{"addTab.url"}= $self->getUrl('func=editTab');
 	$var->{"tab.init"}= _createTabInit($self->getId);
-	$var->{"form.start"} = WebGUI::Form::formHeader({action=>$self->getUrl})
-		.WebGUI::Form::hidden({name=>"func",value=>"process"});
+	$var->{"form.start"} = WebGUI::Form::formHeader($self->session,{action=>$self->getUrl})
+		.WebGUI::Form::hidden($self->session,{name=>"func",value=>"process"});
 	my @tabs;
 	my $select = "select a.name, a.DataForm_fieldId, a.DataForm_tabId,a.label, a.status, a.isMailField, a.subtext, a.type, a.defaultValue, a.possibleValues, a.width, a.rows, a.extras, a.vertical";
 	my $join;
 	my $where = "where a.assetId=".$self->session->db->quote($self->getId);
 	if ($var->{entryId}) {
-		$var->{"form.start"} .= WebGUI::Form::hidden({name=>"entryId",value=>$var->{entryId}});
+		$var->{"form.start"} .= WebGUI::Form::hidden($self->session,{name=>"entryId",value=>$var->{entryId}});
 		my $entry = $self->getCollateral("DataForm_entry","DataForm_entryId",$var->{entryId});
 		$var->{ipAddress} = $entry->{ipAddress};
 		$var->{username} = $entry->{username};
@@ -494,9 +494,9 @@ sub getRecordTemplateVars {
 	$var->{field_loop} = \@fields;
 	$tabsth->finish;
 	$var->{tab_loop} = \@tabs;
-	$var->{"form.send"} = WebGUI::Form::submit({value=>WebGUI::International::get(73, "Asset_DataForm")});
-	$var->{"form.save"} = WebGUI::Form::submit();
-	$var->{"form.end"} = WebGUI::Form::formFooter();
+	$var->{"form.send"} = WebGUI::Form::submit($self->session,{value=>WebGUI::International::get(73, "Asset_DataForm")});
+	$var->{"form.save"} = WebGUI::Form::submit($self->session,);
+	$var->{"form.end"} = WebGUI::Form::formFooter($self->session,);
 	return $var;
 }
 
diff --git a/lib/WebGUI/Asset/Wobject/IndexedSearch.pm b/lib/WebGUI/Asset/Wobject/IndexedSearch.pm
index 2aa564441..65b60e9ff 100644
--- a/lib/WebGUI/Asset/Wobject/IndexedSearch.pm
+++ b/lib/WebGUI/Asset/Wobject/IndexedSearch.pm
@@ -236,7 +236,7 @@ sub view {
 	$var{query} = $query;
  
 	# Set some standard vars
-	$var{submit} = WebGUI::Form::submit({value=>WebGUI::International::get(16, "Asset_IndexedSearch")});
+	$var{submit} = WebGUI::Form::submit($self->session,{value=>WebGUI::International::get(16, "Asset_IndexedSearch")});
 	$var{actionURL} = $self->getUrl;
 	$var{"int.search"} = WebGUI::International::get(16,"Asset_IndexedSearch");
 	$var{numberOfResults} = '0';
diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm
index edb4e88d3..c88d7e8c7 100644
--- a/lib/WebGUI/Asset/Wobject/Matrix.pm
+++ b/lib/WebGUI/Asset/Wobject/Matrix.pm
@@ -117,7 +117,7 @@ sub getCategories {
 sub getCompareForm {
 	my $self = shift;
 	my @ids = @_;
-	my $form = WebGUI::Form::formHeader({action=>$self->getUrl})
+	my $form = WebGUI::Form::formHeader($self->session,{action=>$self->getUrl})
 		.WebGUI::Form::submit({
 			value=>"compare"
 			})
@@ -804,7 +804,7 @@ sub www_search {
 		}
 	}
 	$var{'compare.form'} = $self->getCompareForm(@list);
-	$var{'form.header'} = WebGUI::Form::formHeader({action=>$self->getUrl})
+	$var{'form.header'} = WebGUI::Form::formHeader($self->session,{action=>$self->getUrl})
 		.WebGUI::Form::hidden({
 			name=>"doit",
 			value=>"1"
diff --git a/lib/WebGUI/Asset/Wobject/Poll.pm b/lib/WebGUI/Asset/Wobject/Poll.pm
index 618aa5b09..d558e950a 100644
--- a/lib/WebGUI/Asset/Wobject/Poll.pm
+++ b/lib/WebGUI/Asset/Wobject/Poll.pm
@@ -293,17 +293,17 @@ sub view {
         my ($totalResponses) = $self->session->db->quickArray("select count(*) from Poll_answer where assetId=".$self->session->db->quote($self->getId));
 	$var{"responses.label"} = WebGUI::International::get(12,"Asset_Poll");
 	$var{"responses.total"} = $totalResponses;
-	$var{"form.start"} = WebGUI::Form::formHeader({action=>$self->getUrl});
-        $var{"form.start"} .= WebGUI::Form::hidden({name=>'func',value=>'vote'});
-	$var{"form.submit"} = WebGUI::Form::submit({value=>WebGUI::International::get(11,"Asset_Poll")});
-	$var{"form.end"} = WebGUI::Form::formFooter();
+	$var{"form.start"} = WebGUI::Form::formHeader($self->session,{action=>$self->getUrl});
+        $var{"form.start"} .= WebGUI::Form::hidden($self->session,{name=>'func',value=>'vote'});
+	$var{"form.submit"} = WebGUI::Form::submit($self->session,{value=>WebGUI::International::get(11,"Asset_Poll")});
+	$var{"form.end"} = WebGUI::Form::formFooter($self->session,);
 	$totalResponses = 1 if ($totalResponses < 1);
         for (my $i=1; $i<=20; $i++) {
         	if ($self->get('a'.$i) =~ /\C/) {
                         my ($tally) = $self->session->db->quickArray("select count(*) from Poll_answer where answer='a"
 				.$i."' and assetId=".$self->session->db->quote($self->getId)." group by answer");
                 	push(@answers,{
-				"answer.form"=>WebGUI::Form::radio({name=>"answer",value=>"a".$i}),
+				"answer.form"=>WebGUI::Form::radio($self->session,{name=>"answer",value=>"a".$i}),
 				"answer.text"=>$self->get('a'.$i),
 				"answer.graphWidth"=>round($self->get("graphWidth")*$tally/$totalResponses),
 				"answer.number"=>$i,
diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm
index 86f585249..ba6336b33 100644
--- a/lib/WebGUI/Asset/Wobject/Survey.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey.pm
@@ -670,12 +670,12 @@ sub view {
 			$var->{question_loop} = $self->getQuestionsLoop($var->{'response.Id'});
 		}
 	}
-	$var->{'form.header'} = WebGUI::Form::formHeader({action=>$self->getUrl})
+	$var->{'form.header'} = WebGUI::Form::formHeader($self->session,{action=>$self->getUrl})
 		.WebGUI::Form::hidden({
 			name=>'func',
 			value=>'respond'
 			});
-	$var->{'form.footer'} = WebGUI::Form::formFooter();
+	$var->{'form.footer'} = WebGUI::Form::formFooter($self->session,);
 	$var->{'form.submit'} = WebGUI::Form::submit({
 			value=>WebGUI::International::get(50,'Asset_Survey')
 			});
diff --git a/lib/WebGUI/AssetBranch.pm b/lib/WebGUI/AssetBranch.pm
index acd0db014..136f2ebd6 100644
--- a/lib/WebGUI/AssetBranch.pm
+++ b/lib/WebGUI/AssetBranch.pm
@@ -103,7 +103,7 @@ sub www_editBranch {
         $tabform->getTab("properties")->readOnly(
                 -label=>WebGUI::International::get(104,"Asset"),
                 -uiLevel=>9,
-		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo({name=>"change_url"}),
+		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo($self->session,{name=>"change_url"}),
 		-value=>WebGUI::Form::selectBox({
                 	name=>"baseUrlBy",
 			extras=>'onchange="toggleSpecificBaseUrl()"',
@@ -137,21 +137,21 @@ sub www_editBranch {
                 -value=>$self->get("isHidden"),
                 -label=>WebGUI::International::get(886,"Asset"),
                 -uiLevel=>6,
-		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo({name=>"change_isHidden"})
+		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo($self->session,{name=>"change_isHidden"})
                 );
         $tabform->getTab("display")->yesNo(
                 -name=>"newWindow",
                 -value=>$self->get("newWindow"),
                 -label=>WebGUI::International::get(940,"Asset"),
                 -uiLevel=>6,
-		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo({name=>"change_newWindow"})
+		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo($self->session,{name=>"change_newWindow"})
                 );
 	$tabform->getTab("display")->yesNo(
                 -name=>"displayTitle",
                 -label=>WebGUI::International::get(174,"Asset"),
                 -value=>$self->getValue("displayTitle"),
                 -uiLevel=>5,
-		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo({name=>"change_displayTitle"})
+		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo($self->session,{name=>"change_displayTitle"})
                 );
          $tabform->getTab("display")->template(
 		-name=>"styleTemplateId",
@@ -159,7 +159,7 @@ sub www_editBranch {
 		-value=>$self->getValue("styleTemplateId"),
 		-namespace=>'style',
 		-afterEdit=>'op=editPage;npp='.$self->session->form->process("npp"),
-		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo({name=>"change_styleTemplateId"})
+		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo($self->session,{name=>"change_styleTemplateId"})
 		);
          $tabform->getTab("display")->template(
 		-name=>"printableStyleTemplateId",
@@ -167,21 +167,21 @@ sub www_editBranch {
 		-value=>$self->getValue("printableStyleTemplateId"),
 		-namespace=>'style',
 		-afterEdit=>'op=editPage;npp='.$self->session->form->process("npp"),
-		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo({name=>"change_printableStyleTemplateId"})
+		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo($self->session,{name=>"change_printableStyleTemplateId"})
 		);
         $tabform->getTab("display")->interval(
                 -name=>"cacheTimeout",
                 -label=>WebGUI::International::get(895,"Asset"),
                 -value=>$self->getValue("cacheTimeout"),
                 -uiLevel=>8,
-		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo({name=>"change_cacheTimeout"})
+		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo($self->session,{name=>"change_cacheTimeout"})
                 );
         $tabform->getTab("display")->interval(
                 -name=>"cacheTimeoutVisitor",
                 -label=>WebGUI::International::get(896,"Asset"),
                 -value=>$self->getValue("cacheTimeoutVisitor"),
                 -uiLevel=>8,
-		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo({name=>"change_cacheTimeoutVisitor"})
+		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo($self->session,{name=>"change_cacheTimeoutVisitor"})
                 );
 	$tabform->addTab("security",WebGUI::International::get(107,"Asset"),6);
         $tabform->getTab("security")->yesNo(
@@ -189,21 +189,21 @@ sub www_editBranch {
                 -value=>$self->get("encryptPage"),
                 -label=>WebGUI::International::get('encrypt page',"Asset"),
                 -uiLevel=>6,
-		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo({name=>"change_encryptPage"})
+		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo($self->session,{name=>"change_encryptPage"})
                 );
 	$tabform->getTab("security")->dateTime(
                 -name=>"startDate",
                 -label=>WebGUI::International::get(497,"Asset"),
                 -value=>$self->get("startDate"),
                 -uiLevel=>6,
-		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo({name=>"change_startDate"})
+		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo($self->session,{name=>"change_startDate"})
                 );
         $tabform->getTab("security")->dateTime(
                 -name=>"endDate",
                 -label=>WebGUI::International::get(498,"Asset"),
                 -value=>$self->get("endDate"),
                 -uiLevel=>6,
-		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo({name=>"change_endDate"})
+		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo($self->session,{name=>"change_endDate"})
                 );
 	my $subtext;
         if (WebGUI::Grouping::isInGroup(3)) {
@@ -227,14 +227,14 @@ sub www_editBranch {
                -value=>[$self->get("ownerUserId")],
                -subtext=>$subtext,
                -uiLevel=>6,
-		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo({name=>"change_ownerUserId"})
+		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo($self->session,{name=>"change_ownerUserId"})
                );
         $tabform->getTab("security")->group(
                -name=>"groupIdView",
                -label=>WebGUI::International::get(872,"Asset"),
                -value=>[$self->get("groupIdView")],
                -uiLevel=>6,
-		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo({name=>"change_groupIdView"})
+		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo($self->session,{name=>"change_groupIdView"})
                );
         $tabform->getTab("security")->group(
                -name=>"groupIdEdit",
@@ -242,7 +242,7 @@ sub www_editBranch {
                -value=>[$self->get("groupIdEdit")],
                -excludeGroups=>[1,7],
                -uiLevel=>6,
-		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo({name=>"change_groupIdEdit"})
+		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo($self->session,{name=>"change_groupIdEdit"})
 		);
         $tabform->addTab("meta",WebGUI::International::get("Metadata","Asset"),3);
         $tabform->getTab("meta")->textarea(
@@ -251,7 +251,7 @@ sub www_editBranch {
                 -hoverHelp=>WebGUI::International::get('extra head tags description',"Asset"),
                 -value=>$self->get("extraHeadTags"),
                 -uiLevel=>5,
-		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo({name=>"change_extraHeadTags"})
+		-subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo($self->session,{name=>"change_extraHeadTags"})
                 );
         if ($self->session->setting->get("metaDataEnabled")) {
                 my $meta = $self->getMetaDataFields();
@@ -271,7 +271,7 @@ sub www_editBranch {
                                  extras=>qq/title="$meta->{$field}{description}"/,
                                  possibleValues=>$meta->{$field}{possibleValues},
                                  options=>$options,
-				 subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo({name=>"change_metadata_".$meta->{$field}{fieldId}}),
+				 subtext=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo($self->session,{name=>"change_metadata_".$meta->{$field}{fieldId}}),
 				fieldType=>$fieldType
                                 );
                 }
diff --git a/lib/WebGUI/AssetClipboard.pm b/lib/WebGUI/AssetClipboard.pm
index fc9d7f7a6..776023277 100644
--- a/lib/WebGUI/AssetClipboard.pm
+++ b/lib/WebGUI/AssetClipboard.pm
@@ -328,7 +328,7 @@ $self->session->style->setLink($self->session->config->get("extrasURL").'/assetM
    <script type=\"text/javascript\">
    //<![CDATA[
      var assetManager = new AssetManager();
-         assetManager.AddColumn('".WebGUI::Form::checkbox({extras=>'onchange="toggleAssetListSelectAll(this.form);"'})."','','center','form');
+         assetManager.AddColumn('".WebGUI::Form::checkbox($self->session,{extras=>'onchange="toggleAssetListSelectAll(this.form);"'})."','','center','form');
          assetManager.AddColumn('".$i18n->get("99")."','','left','');
          assetManager.AddColumn('".$i18n->get("type")."','','left','');
          assetManager.AddColumn('".$i18n->get("last updated")."','','center','');
diff --git a/lib/WebGUI/AssetTrash.pm b/lib/WebGUI/AssetTrash.pm
index a1b470f1c..d9838a4c7 100644
--- a/lib/WebGUI/AssetTrash.pm
+++ b/lib/WebGUI/AssetTrash.pm
@@ -201,7 +201,7 @@ sub www_manageTrash {
 	my $output = "
    <script type=\"text/javascript\">
      var assetManager = new AssetManager();
-         assetManager.AddColumn('".WebGUI::Form::checkbox({extras=>'onchange="toggleAssetListSelectAll(this.form);"'})."','','center','form');
+         assetManager.AddColumn('".WebGUI::Form::checkbox($self->session,{extras=>'onchange="toggleAssetListSelectAll(this.form);"'})."','','center','form');
          assetManager.AddColumn('".$i18n->get("99")."','','left','');
          assetManager.AddColumn('".$i18n->get("type")."','','left','');
          assetManager.AddColumn('".$i18n->get("last updated")."','','center','');
diff --git a/lib/WebGUI/Auth.pm b/lib/WebGUI/Auth.pm
index c4c54a02e..d4751d441 100644
--- a/lib/WebGUI/Auth.pm
+++ b/lib/WebGUI/Auth.pm
@@ -191,15 +191,15 @@ sub createAccount {
 	my $vars = $_[1];
 	$vars->{title} = WebGUI::International::get(54);
    	
-	$vars->{'create.form.header'} = WebGUI::Form::formHeader({});
-	$vars->{'create.form.header'} .= WebGUI::Form::hidden({"name"=>"op","value"=>"auth"});
-    $vars->{'create.form.header'} .= WebGUI::Form::hidden({"name"=>"method","value"=>$method});
+	$vars->{'create.form.header'} = WebGUI::Form::formHeader($self->session,{});
+	$vars->{'create.form.header'} .= WebGUI::Form::hidden($self->session,{"name"=>"op","value"=>"auth"});
+    $vars->{'create.form.header'} .= WebGUI::Form::hidden($self->session,{"name"=>"method","value"=>$method});
 	
 	#User Defined Options
     $vars->{'create.form.profile'} = WebGUI::Operation::Profile::getRequiredProfileFields();
 	
-	$vars->{'create.form.submit'} = WebGUI::Form::submit({});
-    $vars->{'create.form.footer'} = WebGUI::Form::formFooter();
+	$vars->{'create.form.submit'} = WebGUI::Form::submit($self->session,{});
+    $vars->{'create.form.footer'} = WebGUI::Form::formFooter($self->session,);
 	
     $vars->{'login.url'} = $self->session->url->page('op=auth;method=init');
     $vars->{'login.label'} = WebGUI::International::get(58);
@@ -343,15 +343,15 @@ sub displayAccount {
    
    $vars->{title} = WebGUI::International::get(61);
    
-   $vars->{'account.form.header'} = WebGUI::Form::formHeader({});
-   $vars->{'account.form.header'} .= WebGUI::Form::hidden({"name"=>"op","value"=>"auth"});
-   $vars->{'account.form.header'} .= WebGUI::Form::hidden({"name"=>"method","value"=>$method});
+   $vars->{'account.form.header'} = WebGUI::Form::formHeader($self->session,{});
+   $vars->{'account.form.header'} .= WebGUI::Form::hidden($self->session,{"name"=>"op","value"=>"auth"});
+   $vars->{'account.form.header'} .= WebGUI::Form::hidden($self->session,{"name"=>"method","value"=>$method});
    if($self->session->setting->get("useKarma")){
       $vars->{'account.form.karma'} = $self->session->user->karma;
 	  $vars->{'account.form.karma.label'} = WebGUI::International::get(537);
    }
-   $vars->{'account.form.submit'} = WebGUI::Form::submit({});
-   $vars->{'account.form.footer'} = WebGUI::Form::formFooter();
+   $vars->{'account.form.submit'} = WebGUI::Form::submit($self->session,{});
+   $vars->{'account.form.footer'} = WebGUI::Form::formFooter($self->session,);
    
    $vars->{'account.options'} = WebGUI::Operation::Shared::accountOptions();
    return WebGUI::Asset::Template->new($self->session,$self->getAccountTemplateId)->process($vars);
@@ -386,15 +386,15 @@ sub displayLogin {
                 $action = $self->session->url->page(undef,1);
                 $action =~ s/http:/https:/;
         }
-	$vars->{'login.form.header'} = WebGUI::Form::formHeader({action=>$action});
-    	$vars->{'login.form.hidden'} = WebGUI::Form::hidden({"name"=>"op","value"=>"auth"});
-	$vars->{'login.form.hidden'} .= WebGUI::Form::hidden({"name"=>"method","value"=>$method});
-	$vars->{'login.form.username'} = WebGUI::Form::text({"name"=>"username"});
+	$vars->{'login.form.header'} = WebGUI::Form::formHeader($self->session,{action=>$action});
+    	$vars->{'login.form.hidden'} = WebGUI::Form::hidden($self->session,{"name"=>"op","value"=>"auth"});
+	$vars->{'login.form.hidden'} .= WebGUI::Form::hidden($self->session,{"name"=>"method","value"=>$method});
+	$vars->{'login.form.username'} = WebGUI::Form::text($self->session,{"name"=>"username"});
     	$vars->{'login.form.username.label'} = WebGUI::International::get(50);
-    	$vars->{'login.form.password'} = WebGUI::Form::password({"name"=>"identifier"});
+    	$vars->{'login.form.password'} = WebGUI::Form::password($self->session,{"name"=>"identifier"});
     	$vars->{'login.form.password.label'} = WebGUI::International::get(51);
-	$vars->{'login.form.submit'} = WebGUI::Form::submit({"value"=>WebGUI::International::get(52)});
-	$vars->{'login.form.footer'} = WebGUI::Form::formFooter();
+	$vars->{'login.form.submit'} = WebGUI::Form::submit($self->session,{"value"=>WebGUI::International::get(52)});
+	$vars->{'login.form.footer'} = WebGUI::Form::formFooter($self->session,);
 	$vars->{'anonymousRegistration.isAllowed'} = ($self->session->setting->get("anonymousRegistration"));
 	$vars->{'createAccount.url'} = $self->session->url->page('op=auth;method=createAccount');
 	$vars->{'createAccount.label'} = WebGUI::International::get(67);
diff --git a/lib/WebGUI/Auth/LDAP.pm b/lib/WebGUI/Auth/LDAP.pm
index 0d19d68f3..2f3e6355e 100644
--- a/lib/WebGUI/Auth/LDAP.pm
+++ b/lib/WebGUI/Auth/LDAP.pm
@@ -222,12 +222,12 @@ sub createAccount {
 					value=>[$connection->{ldapLinkId}],
 					extras=>qq|onchange="location.href='$url'+this.options[this.selectedIndex].value"|
 				  });
-    $vars->{'create.form.ldapId'} = WebGUI::Form::text({"name"=>"authLDAP_ldapId","value"=>$session{form}{"authLDAP_ldapId"}});
+    $vars->{'create.form.ldapId'} = WebGUI::Form::text($self->session,{"name"=>"authLDAP_ldapId","value"=>$session{form}{"authLDAP_ldapId"}});
     $vars->{'create.form.ldapId.label'} = $connection->{ldapIdentityName};
-    $vars->{'create.form.password'} = WebGUI::Form::password({"name"=>"authLDAP_identifier","value"=>$session{form}{"authLDAP_identifier"}});
+    $vars->{'create.form.password'} = WebGUI::Form::password($self->session,{"name"=>"authLDAP_identifier","value"=>$session{form}{"authLDAP_identifier"}});
     $vars->{'create.form.password.label'} = $connection->{ldapPasswordName};
     
-    $vars->{'create.form.hidden'} = WebGUI::Form::hidden({"name"=>"confirm","value"=>$self->session->form->process("confirm")});
+    $vars->{'create.form.hidden'} = WebGUI::Form::hidden($self->session,{"name"=>"confirm","value"=>$self->session->form->process("confirm")});
     return $self->SUPER::createAccount("createAccountSave",$vars);
 }
 
diff --git a/lib/WebGUI/Auth/WebGUI.pm b/lib/WebGUI/Auth/WebGUI.pm
index a1baee4d3..dd0f558e7 100644
--- a/lib/WebGUI/Auth/WebGUI.pm
+++ b/lib/WebGUI/Auth/WebGUI.pm
@@ -169,18 +169,18 @@ sub createAccount {
 	my ($filename, $challenge) = $storage->addFileFromCaptcha;
 	$vars->{useCaptcha} = $self->session->setting->get("webguiUseCaptcha");
 	if ($vars->{useCaptcha}) {
-   		$vars->{'create.form.captcha'} = WebGUI::Form::text({"name"=>"authWebGUI.captcha", size=>6, maxlength=>6})
-			.WebGUI::Form::hidden({name=>"authWebGUI.captcha.validation", value=>Digest::MD5::md5_base64(lc($challenge))})
+   		$vars->{'create.form.captcha'} = WebGUI::Form::text($self->session,{"name"=>"authWebGUI.captcha", size=>6, maxlength=>6})
+			.WebGUI::Form::hidden($self->session,{name=>"authWebGUI.captcha.validation", value=>Digest::MD5::md5_base64(lc($challenge))})
 			.'<img src="'.$storage->getUrl($filename).'" border="0" alt="captcha" align="middle" />';
    		$vars->{'create.form.captcha.label'} = WebGUI::International::get("captcha label","AuthWebGUI");
 	}
-   $vars->{'create.form.username'} = WebGUI::Form::text({"name"=>"authWebGUI.username","value"=>$session{form}{"authWebGUI.username"}});
+   $vars->{'create.form.username'} = WebGUI::Form::text($self->session,{"name"=>"authWebGUI.username","value"=>$session{form}{"authWebGUI.username"}});
    $vars->{'create.form.username.label'} = WebGUI::International::get(50);
-   $vars->{'create.form.password'} = WebGUI::Form::password({"name"=>"authWebGUI.identifier"});
+   $vars->{'create.form.password'} = WebGUI::Form::password($self->session,{"name"=>"authWebGUI.identifier"});
    $vars->{'create.form.password.label'} = WebGUI::International::get(51);
-   $vars->{'create.form.passwordConfirm'} = WebGUI::Form::password({"name"=>"authWebGUI.identifierConfirm"});
+   $vars->{'create.form.passwordConfirm'} = WebGUI::Form::password($self->session,{"name"=>"authWebGUI.identifierConfirm"});
    $vars->{'create.form.passwordConfirm.label'} = WebGUI::International::get(2,'AuthWebGUI');
-   $vars->{'create.form.hidden'} = WebGUI::Form::hidden({"name"=>"confirm","value"=>$self->session->form->process("confirm")});
+   $vars->{'create.form.hidden'} = WebGUI::Form::hidden($self->session,{"name"=>"confirm","value"=>$self->session->form->process("confirm")});
  	$vars->{'recoverPassword.isAllowed'} = $self->getSetting("passwordRecovery");
 	   $vars->{'recoverPassword.url'} = $self->session->url->page('op=auth;method=recoverPassword');
 	   $vars->{'recoverPassword.label'} = WebGUI::International::get(59);
@@ -266,14 +266,14 @@ sub displayAccount {
    $vars->{'account.message'} = $_[0] if ($_[0]);
    $vars->{'account.noform'} = 1;
    if($userData->{changeUsername}  || (!defined $userData->{changeUsername} && $self->session->setting->get("webguiChangeUsername"))){
-      $vars->{'account.form.username'} = WebGUI::Form::text({"name"=>"authWebGUI.username","value"=>$self->username});
+      $vars->{'account.form.username'} = WebGUI::Form::text($self->session,{"name"=>"authWebGUI.username","value"=>$self->username});
       $vars->{'account.form.username.label'} = WebGUI::International::get(50);
       $vars->{'account.noform'} = 0;
    }
    if($userData->{changePassword} || (!defined $userData->{changePassword} && $self->session->setting->get("webguiChangePassword"))){
-      $vars->{'account.form.password'} = WebGUI::Form::password({"name"=>"authWebGUI.identifier","value"=>"password"});
+      $vars->{'account.form.password'} = WebGUI::Form::password($self->session,{"name"=>"authWebGUI.identifier","value"=>"password"});
       $vars->{'account.form.password.label'} = WebGUI::International::get(51);
-      $vars->{'account.form.passwordConfirm'} = WebGUI::Form::password({"name"=>"authWebGUI.identifierConfirm","value"=>"password"});
+      $vars->{'account.form.passwordConfirm'} = WebGUI::Form::password($self->session,{"name"=>"authWebGUI.identifierConfirm","value"=>"password"});
       $vars->{'account.form.passwordConfirm.label'} = WebGUI::International::get(2,'AuthWebGUI');
       $vars->{'account.noform'} = 0;
    }
@@ -505,12 +505,12 @@ sub recoverPassword {
    my $template = 'Auth/WebGUI/Recovery';
    my $vars;
    $vars->{title} = WebGUI::International::get(71);
-   $vars->{'recover.form.header'} = "\n\n".WebGUI::Form::formHeader({});
-   $vars->{'recover.form.hidden'} = WebGUI::Form::hidden({"name"=>"op","value"=>"auth"});
-   $vars->{'recover.form.hidden'} .= WebGUI::Form::hidden({"name"=>"method","value"=>"recoverPasswordFinish"});
+   $vars->{'recover.form.header'} = "\n\n".WebGUI::Form::formHeader($self->session,{});
+   $vars->{'recover.form.hidden'} = WebGUI::Form::hidden($self->session,{"name"=>"op","value"=>"auth"});
+   $vars->{'recover.form.hidden'} .= WebGUI::Form::hidden($self->session,{"name"=>"method","value"=>"recoverPasswordFinish"});
 
-   $vars->{'recover.form.submit'} = WebGUI::Form::submit({});
-   $vars->{'recover.form.footer'} = WebGUI::Form::formFooter();
+   $vars->{'recover.form.submit'} = WebGUI::Form::submit($self->session,{});
+   $vars->{'recover.form.footer'} = WebGUI::Form::formFooter($self->session,);
     $vars->{'login.url'} = $self->session->url->page('op=auth;method=init');
     $vars->{'login.label'} = WebGUI::International::get(58);
 
@@ -518,7 +518,7 @@ sub recoverPassword {
            $vars->{'createAccount.url'} = $self->session->url->page('op=auth=;method=createAccount');
            $vars->{'createAccount.label'} = WebGUI::International::get(67);
    $vars->{'recover.message'} = $_[0] if ($_[0]);
-   $vars->{'recover.form.email'} = WebGUI::Form::text({"name"=>"email"});
+   $vars->{'recover.form.email'} = WebGUI::Form::text($self->session,{"name"=>"email"});
    $vars->{'recover.form.email.label'} = WebGUI::International::get(56);
    return WebGUI::Asset::Template->new($self->session,$self->getPasswordRecoveryTemplateId)->process($vars);
 }
@@ -562,19 +562,19 @@ sub resetExpiredPassword {
 	
 	$vars->{displayTitle} = '<h3>'.WebGUI::International::get(8,'AuthWebGUI').'</h3>';
     $vars->{'expired.message'} = $_[0] if($_[0]);
-    $vars->{'expired.form.header'} = "\n\n".WebGUI::Form::formHeader({});
-    $vars->{'expired.form.hidden'} = WebGUI::Form::hidden({"name"=>"op","value"=>"auth"});
-	$vars->{'expired.form.hidden'} .= WebGUI::Form::hidden({"name"=>"method","value"=>"resetExpiredPasswordSave"});
-   	$vars->{'expired.form.hidden'} .= WebGUI::Form::hidden({"name"=>"uid","value"=>$self->session->form->process("uid")});
+    $vars->{'expired.form.header'} = "\n\n".WebGUI::Form::formHeader($self->session,{});
+    $vars->{'expired.form.hidden'} = WebGUI::Form::hidden($self->session,{"name"=>"op","value"=>"auth"});
+	$vars->{'expired.form.hidden'} .= WebGUI::Form::hidden($self->session,{"name"=>"method","value"=>"resetExpiredPasswordSave"});
+   	$vars->{'expired.form.hidden'} .= WebGUI::Form::hidden($self->session,{"name"=>"uid","value"=>$self->session->form->process("uid")});
     
-    $vars->{'expired.form.oldPassword'} = WebGUI::Form::password({"name"=>"oldPassword"});
+    $vars->{'expired.form.oldPassword'} = WebGUI::Form::password($self->session,{"name"=>"oldPassword"});
     $vars->{'expired.form.oldPassword.label'} = WebGUI::International::get(10,'AuthWebGUI');
-    $vars->{'expired.form.password'} = WebGUI::Form::password({"name"=>"identifier"});
+    $vars->{'expired.form.password'} = WebGUI::Form::password($self->session,{"name"=>"identifier"});
     $vars->{'expired.form.password.label'} = WebGUI::International::get(11,'AuthWebGUI');
-    $vars->{'expired.form.passwordConfirm'} = WebGUI::Form::password({"name"=>"identifierConfirm"});
+    $vars->{'expired.form.passwordConfirm'} = WebGUI::Form::password($self->session,{"name"=>"identifierConfirm"});
     $vars->{'expired.form.passwordConfirm.label'} = WebGUI::International::get(2,'AuthWebGUI');
-    $vars->{'expired.form.submit'} = WebGUI::Form::submit({});
-    $vars->{'expired.form.footer'} = WebGUI::Form::formFooter();
+    $vars->{'expired.form.submit'} = WebGUI::Form::submit($self->session,{});
+    $vars->{'expired.form.footer'} = WebGUI::Form::formFooter($self->session,);
 	
 	return WebGUI::Asset::Template->new($self->session,$self->getExpiredPasswordTemplateId)->process($vars);
 }
diff --git a/lib/WebGUI/Commerce/Payment/ITransact.pm b/lib/WebGUI/Commerce/Payment/ITransact.pm
index ff9d6a5d1..4915746bf 100644
--- a/lib/WebGUI/Commerce/Payment/ITransact.pm
+++ b/lib/WebGUI/Commerce/Payment/ITransact.pm
@@ -416,9 +416,9 @@ sub checkoutForm {
 	$f->readOnly(
 		-label	=> $i18n->get('expiration date'),
 		-value	=> 
-		WebGUI::Form::selectBox({name => 'expMonth', options => \%months, value => [$self->session->form->process("expMonth")]}).
+		WebGUI::Form::selectBox($self->session,{name => 'expMonth', options => \%months, value => [$self->session->form->process("expMonth")]}).
 		" / ".
-		WebGUI::Form::selectBox({name => 'expYear', options => \%years, value => [$self->session->form->process("expYear")]})
+		WebGUI::Form::selectBox($self->session,{name => 'expYear', options => \%years, value => [$self->session->form->process("expYear")]})
 	);
 	$f->integer(
 		-name	=> 'cvv2',
diff --git a/lib/WebGUI/Form.pm b/lib/WebGUI/Form.pm
index bf243b081..b027e25b3 100644
--- a/lib/WebGUI/Form.pm
+++ b/lib/WebGUI/Form.pm
@@ -19,12 +19,7 @@ use Tie::IxHash;
 use WebGUI::Asset;
 use WebGUI::Asset::RichEdit;
 use WebGUI::Asset::Template;
-use WebGUI::DateTime;
 use WebGUI::International;
-use WebGUI::Session;
-use WebGUI::SQL;
-use WebGUI::Style;
-use WebGUI::URL;
 use WebGUI::Utility;
 
 =head1 NAME
@@ -39,14 +34,14 @@ This is a convenience package which provides a simple interface to use all of th
 
  use WebGUI::Form;
 
- $html = WebGUI::Form::formFooter();
- $html = WebGUI::Form::formHeader();
+ $html = WebGUI::Form::formFooter($self->session,);
+ $html = WebGUI::Form::formHeader($self->session,);
 
- $html = WebGUI::Form::anyFieldType(%properties);
+ $html = WebGUI::Form::anyFieldType($self->session,%properties);
 
  Example:
 
- $html = WebGUI::Form::text(%properties);
+ $html = WebGUI::Form::text($self->session,%properties);
 
 =head1 METHODS 
 
@@ -65,24 +60,29 @@ Dynamically creates functions on the fly for all the different form control type
 sub AUTOLOAD {
 	our $AUTOLOAD;
 	my $name = ucfirst((split /::/, $AUTOLOAD)[-1]);	
+	my $session = shift;
 	my @params = @_;
 	my $cmd = "use WebGUI::Form::".$name;
         eval ($cmd);
         if ($@) {
-        	$self->session->errorHandler->error("Couldn't compile form control: ".$name.". Root cause: ".$@);
+        	$session->errorHandler->error("Couldn't compile form control: ".$name.". Root cause: ".$@);
                 return undef;
         }
 	my $class = "WebGUI::Form::".$name;
-	return $class->new(@params)->toHtml;
+	return $class->new($session,@params)->toHtml;
 }
 
 
 #-------------------------------------------------------------------
 
-=head2 formFooter ( )
+=head2 formFooter ( session )
 
 Returns a form footer.
 
+=head3 session
+
+A reference to the current session.
+
 =cut
 
 sub formFooter {
@@ -92,31 +92,40 @@ sub formFooter {
 
 #-------------------------------------------------------------------
 
-=head2 formHeader ( hashRef )
+=head2 formHeader ( session, hashRef )
 
 Returns a form header.
 
-=head3 action
+=head3 session
+
+A reference to the current session.
+
+=head3 hashRef
+
+A hash reference that contains one or more of the following parameters.
+
+=head4 action
 
 The form action. Defaults to the current page.
 
-=head3 method
+=head4 method
 
 The form method. Defaults to "post".
 
-=head3 enctype
+=head4 enctype
 
 The form enctype. Defaults to "multipart/form-data".
 
-=head3 extras
+=head4 extras
 
 If you want to add anything special to the form header like javascript actions or stylesheet info, then use this.
 
 =cut
 
 sub formHeader {
+	my $session = shift;
 	my $params = shift;
-        my $action = $params->{action} || $self->session->url->page();
+        my $action = $params->{action} || $session->url->page();
 	my $hidden;
 	if ($action =~ /\?/) {
 		my ($path,$query) = split(/\?/,$action);
@@ -125,7 +134,7 @@ sub formHeader {
 		foreach my $param (@params) {
 			$param =~ s/amp;(.*)/$1/;
 			my ($name,$value) = split(/\=/,$param);
-			$hidden .= hidden({name=>$name,value=>$value});
+			$hidden .= hidden($session,{name=>$name,value=>$value});
 		}
 	}
         my $method = $params->{method} || "post";
diff --git a/lib/WebGUI/HTMLForm.pm b/lib/WebGUI/HTMLForm.pm
index 755250220..60d891d53 100644
--- a/lib/WebGUI/HTMLForm.pm
+++ b/lib/WebGUI/HTMLForm.pm
@@ -155,7 +155,7 @@ sub new {
 		});
 	$header .= "\n<table ".$param{tableExtras}.'><tbody>';
 	$footer = "</tbody></table>\n" ;
-	$footer .= WebGUI::Form::formFooter();
+	$footer .= WebGUI::Form::formFooter($self->session,);
         bless {_uiLevelOverride=>$param{uiLevelOverride},  _header => $header, _footer => $footer, _data => ''}, $class;
 }
 
diff --git a/lib/WebGUI/Macro/L_loginBox.pm b/lib/WebGUI/Macro/L_loginBox.pm
index 2f93814ea..db0b23e30 100644
--- a/lib/WebGUI/Macro/L_loginBox.pm
+++ b/lib/WebGUI/Macro/L_loginBox.pm
@@ -82,7 +82,7 @@ sub process {
                 $action = $session->url->page(undef,1);
                 $action =~ s/http:/https:/;
         }
-	$var{'form.header'} = WebGUI::Form::formHeader({action=>$action})
+	$var{'form.header'} = WebGUI::Form::formHeader($session,{action=>$action})
 		.WebGUI::Form::hidden({
 			name=>"op",
 			value=>"auth"
@@ -109,7 +109,7 @@ sub process {
 		});
         $var{'account.create.url'} = $session->url->page('op=auth;method=createAccount');
 	$var{'account.create.label'} = WebGUI::International::get(407);
-	$var{'form.footer'} = WebGUI::Form::formFooter();
+	$var{'form.footer'} = WebGUI::Form::formFooter($session,);
         return WebGUI::Asset::Template->new($session,$templateId)->process(\%var); 
 }
 
diff --git a/lib/WebGUI/Operation/Commerce.pm b/lib/WebGUI/Operation/Commerce.pm
index 0ddc1cc9f..46fe160d5 100644
--- a/lib/WebGUI/Operation/Commerce.pm
+++ b/lib/WebGUI/Operation/Commerce.pm
@@ -600,28 +600,28 @@ sub www_listTransactions {
 	$output .= $i18n->get('selection message');
 	
 	$output .= WebGUI::Form::formHeader;
-	$output .= WebGUI::Form::hidden({name=>'op', value=>'listTransactions'});
+	$output .= WebGUI::Form::hidden($session,{name=>'op', value=>'listTransactions'});
 	$output .= '<table>';
-	$output .= '<td>'.WebGUI::Form::radio({name=>'selection', value => 'init', checked=>($session->form->process("selection") eq 'init')}).'</td>';
+	$output .= '<td>'.WebGUI::Form::radio($session,{name=>'selection', value => 'init', checked=>($session->form->process("selection") eq 'init')}).'</td>';
 	$output .= '<td align="left">'.$i18n->get('init date').'</td>';
-	$output .= '<td>'.WebGUI::Form::date({name=>'initStart', value=>$initStart}).' '.$i18n->get('and').' '.WebGUI::Form::date({name=>'initStop', value=>$initStop}).'</td>';
+	$output .= '<td>'.WebGUI::Form::date($session,{name=>'initStart', value=>$initStart}).' '.$i18n->get('and').' '.WebGUI::Form::date({name=>'initStop', value=>$initStop}).'</td>';
 	$output .= '</tr><tr>';
-	$output .= '<td>'.WebGUI::Form::radio({name=>'selection', value => 'completion', checked=>($session->form->process("selection") eq 'completion')}).'</td>';
+	$output .= '<td>'.WebGUI::Form::radio($session,{name=>'selection', value => 'completion', checked=>($session->form->process("selection") eq 'completion')}).'</td>';
 	$output .= '<td align="left">'.$i18n->get('completion date').'</td>';
-	$output .= '<td>'.WebGUI::Form::date({name=>'completionStart', value=>$completionStart}).' '.$i18n->get('and').' '.WebGUI::Form::date({name=>'completionStop', value=>$completionStop}).'</td>';
+	$output .= '<td>'.WebGUI::Form::date($session,{name=>'completionStart', value=>$completionStart}).' '.$i18n->get('and').' '.WebGUI::Form::date({name=>'completionStop', value=>$completionStop}).'</td>';
 	$output .= '</tr><tr>';
 	$output .= '<td></td>';
 	$output .= '<td align="left">'.$i18n->get('transaction status').'</td>';
-	$output .= '<td>'.WebGUI::Form::selectBox({name => 'tStatus', value => [$session->form->process("tStatus")], options => $transactionOptions});
+	$output .= '<td>'.WebGUI::Form::selectBox($session,{name => 'tStatus', value => [$session->form->process("tStatus")], options => $transactionOptions});
 	$output .= '</tr><tr>';
 	
 	$output .= '<td></td>';
 	$output .= '<td align="left">'.$i18n->get('shipping status').'</td>';
-	$output .= '<td>'.WebGUI::Form::selectBox({name => 'sStatus', value => [$session->form->process("sStatus")], options => $shippingOptions});
+	$output .= '<td>'.WebGUI::Form::selectBox($session,{name => 'sStatus', value => [$session->form->process("sStatus")], options => $shippingOptions});
 	$output .= '</tr><tr>';
 
 	$output .= '<td></td>';
-	$output .= '<td>'.WebGUI::Form::submit({value=>$i18n->get('select')}).'</td>';
+	$output .= '<td>'.WebGUI::Form::submit($session,{value=>$i18n->get('select')}).'</td>';
 	$output .= '</tr>';
 	$output .= '</table>';
 	$output .= WebGUI::Form::formFooter;
@@ -680,7 +680,7 @@ sub www_selectPaymentGateway {
 			push(@pluginLoop, {
 				name		=> $_->name,
 				namespace	=> $_->namespace,
-				formElement	=> WebGUI::Form::radio({name=>'paymentGateway', value=>$_->namespace})
+				formElement	=> WebGUI::Form::radio($session,{name=>'paymentGateway', value=>$_->namespace})
 				});
 		}
 	} elsif (scalar(@$plugins) == 1) {
@@ -692,8 +692,8 @@ sub www_selectPaymentGateway {
 	$var{message} = $i18n->get('select payment gateway');
 	$var{pluginsAvailable} = @$plugins;
 	$var{noPluginsMessage} = $i18n->get('no payment gateway');
-	$var{formHeader} = WebGUI::Form::formHeader.WebGUI::Form::hidden({name=>'op', value=>'selectPaymentGatewaySave'});
-	$var{formSubmit} = WebGUI::Form::submit({value=>$i18n->get('payment gateway select')});
+	$var{formHeader} = WebGUI::Form::formHeader.WebGUI::Form::hidden($session,{name=>'op', value=>'selectPaymentGatewaySave'});
+	$var{formSubmit} = WebGUI::Form::submit($session,{value=>$i18n->get('payment gateway select')});
 	$var{formFooter} = WebGUI::Form::formFooter;		
 	
 	return $session->style->userStyle(WebGUI::Asset::Template->new($session->setting->get("commerceSelectPaymentGatewayTemplateId"))->process(\%var));
@@ -726,7 +726,7 @@ sub www_selectShippingMethod {
 			push(@pluginLoop, {
 				name		=> $_->name,
 				namespace	=> $_->namespace,
-				formElement	=> WebGUI::Form::radio({name=>'shippingMethod', value=>$_->namespace})
+				formElement	=> WebGUI::Form::radio($session,{name=>'shippingMethod', value=>$_->namespace})
 				});
 		}
 	} elsif (scalar(@$plugins) == 1) {
@@ -738,8 +738,8 @@ sub www_selectShippingMethod {
 	$var{message} = $i18n->get('select shipping method');
 	$var{pluginsAvailable} = @$plugins;
 	$var{noPluginsMessage} = $i18n->get('no shipping methods available');
-	$var{formHeader} = WebGUI::Form::formHeader.WebGUI::Form::hidden({name=>'op', value=>'selectShippingMethodSave'});
-	$var{formSubmit} = WebGUI::Form::submit({value=>$i18n->get('shipping select button')});
+	$var{formHeader} = WebGUI::Form::formHeader.WebGUI::Form::hidden($session,{name=>'op', value=>'selectShippingMethodSave'});
+	$var{formSubmit} = WebGUI::Form::submit($session,{value=>$i18n->get('shipping select button')});
 	$var{formFooter} = WebGUI::Form::formFooter;		
 	
 	return $session->style->userStyle(WebGUI::Asset::Template->new($session->setting->get("commerceSelectShippingMethodTemplateId"))->process(\%var));
@@ -816,13 +816,13 @@ sub www_viewCart {
 	$var{'cartEmpty'} = !(scalar(@$normal) || scalar(@$recurring));
 	$var{'cartEmpty.message'} = $i18n->get('shopping cart empty');
 	
-	$var{'updateForm.header'} = WebGUI::Form::formHeader().
-		WebGUI::Form::hidden({name => 'op', value => 'updateCart'});
-	$var{'updateForm.button'} = WebGUI::Form::submit({value => $i18n->get('update cart')});
+	$var{'updateForm.header'} = WebGUI::Form::formHeader($session,).
+		WebGUI::Form::hidden($session,{name => 'op', value => 'updateCart'});
+	$var{'updateForm.button'} = WebGUI::Form::submit($session,{value => $i18n->get('update cart')});
 	$var{'updateForm.footer'} = WebGUI::Form::formFooter;
-	$var{'checkoutForm.header'} = WebGUI::Form::formHeader().
-		WebGUI::Form::hidden({name => 'op', value => 'checkout'});
-	$var{'checkoutForm.button'} = WebGUI::Form::submit({value => $i18n->get('checkout')});
+	$var{'checkoutForm.header'} = WebGUI::Form::formHeader($session,).
+		WebGUI::Form::hidden($session,{name => 'op', value => 'checkout'});
+	$var{'checkoutForm.button'} = WebGUI::Form::submit($session,{value => $i18n->get('checkout')});
 	$var{'checkoutForm.footer'} = WebGUI::Form::formFooter;
 	
 	$var{normalItemsLoop} = $normal;
diff --git a/lib/WebGUI/Operation/Group.pm b/lib/WebGUI/Operation/Group.pm
index 6a88997d9..bb30ff842 100644
--- a/lib/WebGUI/Operation/Group.pm
+++ b/lib/WebGUI/Operation/Group.pm
@@ -629,7 +629,7 @@ sub www_manageGroupsInGroup {
 sub www_manageUsersInGroup {
 	my $session = shift;
         return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
-	my $output = WebGUI::Form::formHeader()
+	my $output = WebGUI::Form::formHeader($session,)
 		.WebGUI::Form::hidden({
 			name=>"gid",
 			value=>$session->form->process("gid")
@@ -658,7 +658,7 @@ sub www_manageUsersInGroup {
                 $output .= '<td class="tableData"><a href="'.$session->url->page('op=editUser;uid='.$row->{userId}).'">'.$row->{username}.'</a></td>';
                 $output .= '<td class="tableData">'$session->datetime->epochToHuman($row->{expireDate},"%z").'</td></tr>';
         }
-        $output .= '</table>'.WebGUI::Form::formFooter();
+        $output .= '</table>'.WebGUI::Form::formFooter($session,);
 	$output .= $p->getBarTraditional;
 	$output .= '<p><h1>'.WebGUI::International::get(976).'</h1>';
 	$output .= WebGUI::Operation::User::getUserSearchForm("manageUsersInGroup",{gid=>$session->form->process("gid")});
diff --git a/lib/WebGUI/Operation/ProductManager.pm b/lib/WebGUI/Operation/ProductManager.pm
index decab9cfd..619cf8cba 100755
--- a/lib/WebGUI/Operation/ProductManager.pm
+++ b/lib/WebGUI/Operation/ProductManager.pm
@@ -566,8 +566,8 @@ sub www_listProductVariants {
 		$output .= "</tr>";
 	}
 	$output .= "</table>";
-	$output .= WebGUI::Form::submit();
-	$output .= WebGUI::Form::formFooter();
+	$output .= WebGUI::Form::submit($session,);
+	$output .= WebGUI::Form::formFooter($session,);
 
 	return _submenu($output, 'list variants label', 'list variants', 'ProductManager');
 }
diff --git a/lib/WebGUI/Operation/Profile.pm b/lib/WebGUI/Operation/Profile.pm
index e106709f9..898d1b740 100644
--- a/lib/WebGUI/Operation/Profile.pm
+++ b/lib/WebGUI/Operation/Profile.pm
@@ -102,11 +102,11 @@ sub www_editProfile {
 	my $vars = {};
 	$vars->{displayTitle} .= '<h1>'.WebGUI::International::get(338).'</h1>';
 	$vars->{'profile.message'} = $_[0] if($_[0]);
-	$vars->{'profile.form.header'} = "\n\n".WebGUI::Form::formHeader({});
-	$vars->{'profile.form.footer'} = WebGUI::Form::formFooter();
+	$vars->{'profile.form.header'} = "\n\n".WebGUI::Form::formHeader($session,{});
+	$vars->{'profile.form.footer'} = WebGUI::Form::formFooter($session,);
 
-	$vars->{'profile.form.hidden'} = WebGUI::Form::hidden({"name"=>"op","value"=>"editProfileSave"});
-	$vars->{'profile.form.hidden'} .= WebGUI::Form::hidden({"name"=>"uid","value"=>$session->user->profileField("userId")});
+	$vars->{'profile.form.hidden'} = WebGUI::Form::hidden($session,{"name"=>"op","value"=>"editProfileSave"});
+	$vars->{'profile.form.hidden'} .= WebGUI::Form::hidden($session,{"name"=>"uid","value"=>$session->user->profileField("userId")});
 	my @array = ();
 	foreach my $category (@{WebGUI::ProfileCategory->getCategories}) {
 		next unless $category->isEditable;
@@ -126,7 +126,7 @@ sub www_editProfile {
 			});
 	}
 	$vars->{'profile.form.elements'} = \@array;
-	$vars->{'profile.form.submit'} = WebGUI::Form::submit({});
+	$vars->{'profile.form.submit'} = WebGUI::Form::submit($session,{});
 	$vars->{'profile.accountOptions'} = WebGUI::Operation::Shared::accountOptions();
 	return $session->style->userStyle(WebGUI::Asset::Template->new("PBtmpl0000000000000051")->process($vars));
 }
diff --git a/lib/WebGUI/Operation/Subscription.pm b/lib/WebGUI/Operation/Subscription.pm
index facc88913..e760822ba 100644
--- a/lib/WebGUI/Operation/Subscription.pm
+++ b/lib/WebGUI/Operation/Subscription.pm
@@ -323,22 +323,22 @@ sub www_listSubscriptionCodes {
 	$output .= $i18n->get('selection message');
 	
 	$output .= WebGUI::Form::formHeader;
-	$output .= WebGUI::Form::hidden({name=>'op', value=>'listSubscriptionCodes'});
+	$output .= WebGUI::Form::hidden($session,{name=>'op', value=>'listSubscriptionCodes'});
 	$output .= '<table>';
-	$output .= '<td>'.WebGUI::Form::radio({name=>'selection', value => 'du', checked=>($session->form->process("selection") eq 'du')}).'</td>';
+	$output .= '<td>'.WebGUI::Form::radio($session,{name=>'selection', value => 'du', checked=>($session->form->process("selection") eq 'du')}).'</td>';
 	$output .= '<td align="left">'.$i18n->get('selection used').'</td>';
-	$output .= '<td>'.WebGUI::Form::date({name=>'duStart', value=>$duStart}).' '.$i18n->get('and').' '.WebGUI::Form::date({name=>'duStop', value=>$duStop}).'</td>';
+	$output .= '<td>'.WebGUI::Form::date($session,{name=>'duStart', value=>$duStart}).' '.$i18n->get('and').' '.WebGUI::Form::date({name=>'duStop', value=>$duStop}).'</td>';
 	$output .= '</tr><tr>';
-	$output .= '<td>'.WebGUI::Form::radio({name=>'selection', value => 'dc', checked=>($session->form->process("selection") eq 'dc')}).'</td>';
+	$output .= '<td>'.WebGUI::Form::radio($session,{name=>'selection', value => 'dc', checked=>($session->form->process("selection") eq 'dc')}).'</td>';
 	$output .= '<td align="left">'.$i18n->get('selection created').'</td>';
-	$output .= '<td>'.WebGUI::Form::date({name=>'dcStart', value=>$dcStart}).' '.$i18n->get('and').' '.WebGUI::Form::date({name=>'dcStop', value=>$dcStop}).'</td>';
+	$output .= '<td>'.WebGUI::Form::date($session,{name=>'dcStart', value=>$dcStart}).' '.$i18n->get('and').' '.WebGUI::Form::date({name=>'dcStop', value=>$dcStop}).'</td>';
 	$output .= '</tr><tr>';
-	$output .= '<td>'.WebGUI::Form::radio({name=>'selection', value => 'b', checked=>($session->form->process("selection") eq 'b')}).'</td>';
+	$output .= '<td>'.WebGUI::Form::radio($session,{name=>'selection', value => 'b', checked=>($session->form->process("selection") eq 'b')}).'</td>';
 	$output .= '<td align="left">'.$i18n->get('selection batch id').'</td>';
-	$output .= '<td>'.WebGUI::Form::selectList({name => 'bid', value => [$session->form->process("bid")], options => $batches});
+	$output .= '<td>'.WebGUI::Form::selectList($session,{name => 'bid', value => [$session->form->process("bid")], options => $batches});
 	$output .= '</tr><tr>';
 	$output .= '<td></td>';
-	$output .= '<td>'.WebGUI::Form::submit({value=>$i18n->get('select')}).'</td>';
+	$output .= '<td>'.WebGUI::Form::submit($session,{value=>$i18n->get('select')}).'</td>';
 	$output .= '</tr>';
 	$output .= '</table>';
 	$output .= WebGUI::Form::formFooter;
diff --git a/lib/WebGUI/Operation/User.pm b/lib/WebGUI/Operation/User.pm
index a87c068c6..2da8c0044 100644
--- a/lib/WebGUI/Operation/User.pm
+++ b/lib/WebGUI/Operation/User.pm
@@ -171,22 +171,22 @@ sub getUserSearchForm {
 	$session->scratch->set("userSearchStatus",$session->form->process("status"));
 	$session->scratch->set("userSearchModifier",$session->form->process("modifier"));
 	my $output = '<div align="center">'
-		.WebGUI::Form::formHeader()
-		.WebGUI::Form::hidden(
+		.WebGUI::Form::formHeader($session,)
+		.WebGUI::Form::hidden($session,
 			name => "op",
 			value => $op
 			);
 	foreach my $key (keys %{$params}) {
-		$output .= WebGUI::Form::hidden(
+		$output .= WebGUI::Form::hidden($session,
 			name=>$key,
 			value=>$params->{$key}
 			);
 	}
-	$output .= WebGUI::Form::hidden(
+	$output .= WebGUI::Form::hidden($session,
 		-name=>"doit",
 		-value=>1
 		)
-	.WebGUI::Form::selectBox(
+	.WebGUI::Form::selectBox($session,
 		-name=>"modifier",
 		-value=>($session->scratch->get("userSearchModifier") || "contains"),
 		-options=>{
@@ -195,12 +195,12 @@ sub getUserSearchForm {
 			endsWith=>WebGUI::International::get("ends with")
 			}
 		)
-	.WebGUI::Form::text(
+	.WebGUI::Form::text($session,
 		-name=>"keyword",
 		-value=>$session->scratch->get("userSearchKeyword"),
 		-size=>15
 		)
-	.WebGUI::Form::selectBox(
+	.WebGUI::Form::selectBox($session,
 		-name	=> "status",
 		-value	=> ($session->scratch->get("userSearchStatus") || "users.status like '%'"),
 		-options=> { 
@@ -210,8 +210,8 @@ sub getUserSearchForm {
 			Selfdestructed	=> WebGUI::International::get(819)
 			}
 	)
-	.WebGUI::Form::submit(value=>WebGUI::International::get(170))
-	.WebGUI::Form::formFooter();
+	.WebGUI::Form::submit($session,value=>WebGUI::International::get(170))
+	.WebGUI::Form::formFooter($session,);
 	$output .= '</div>';
 	return $output;
 }
diff --git a/lib/WebGUI/TabForm.pm b/lib/WebGUI/TabForm.pm
index a7648b5d7..cad9db6ca 100644
--- a/lib/WebGUI/TabForm.pm
+++ b/lib/WebGUI/TabForm.pm
@@ -109,14 +109,14 @@ sub addTab {
 
 Replaces the default form header with a new definition.
 
-B<NOTE:> This uses the same syntax of the WebGUI::Form::formHeader() method.
+B<NOTE:> This uses the same syntax of the WebGUI::Form::formHeader($self->session,) method.
 
 =cut
 
 sub formHeader {
 	my $self = shift;
 	my $form = shift;
-        $self->{_form} = WebGUI::Form::formHeader($form);
+        $self->{_form} = WebGUI::Form::formHeader($self->session,$form);
 }
 
 
@@ -145,14 +145,14 @@ sub getTab {
 
 Adds a hidden field to the form.
 
-B<NOTE:> This uses the same syntax of the WebGUI::Form::hidden() method.
+B<NOTE:> This uses the same syntax of the WebGUI::Form::hidden($self->session,) method.
 
 =cut
 
 sub hidden {
 	my $self = shift;
 	my $params = shift;
-	$self->{_hidden} .= WebGUI::Form::Hidden($params);
+	$self->{_hidden} .= WebGUI::Form::Hidden($self->session,$params);
 }
 
 
@@ -205,7 +205,7 @@ sub new {
 			value=>WebGUI::International::get('cancel'),
 			extras=>q|onclick="history.go(-1);"|
 			});
-	bless {	_uiLevelOverride=>$uiLevelOverride, _cancel=>$cancel, _submit=>WebGUI::Form::submit(), _form=>WebGUI::Form::formHeader(), _hidden=>"", _tab=>\%tabs, _css=>$css }, $class;
+	bless {	_uiLevelOverride=>$uiLevelOverride, _cancel=>$cancel, _submit=>WebGUI::Form::submit($self->session,), _form=>WebGUI::Form::formHeader(), _hidden=>"", _tab=>\%tabs, _css=>$css }, $class;
 }
 
 
@@ -239,7 +239,7 @@ sub print {
 	}
 	$output .= '<div class="tabs">'.$tabs.$self->{_submit}."&nbsp;&nbsp;".$self->{_cancel}.'</div>';
 	$output .= $form;
-	$output .= WebGUI::Form::formFooter();
+	$output .= WebGUI::Form::formFooter($self->session,);
 	$output .= '<script type="text/javascript">var numberOfTabs = '.($i-1).'; initTabs();</script>';
 	$output .= '<script type="text/javascript" src="'.$self->session->config->get("extrasURL").'/wz_tooltip.js"></script>';
 	return $output;
@@ -252,14 +252,14 @@ sub print {
 
 Replaces the default submit button with a new definition.
 
-B<NOTE:> This uses the same syntax of the WebGUI::Form::submit() method.
+B<NOTE:> This uses the same syntax of the WebGUI::Form::submit($self->session,) method.
 
 =cut
 
 sub submit {
 	my $self = shift;
 	my $submit = shift;
-	$self->{_submit} = WebGUI::Form::Submit($submit);
+	$self->{_submit} = WebGUI::Form::Submit($self->session,$submit);
 }