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

refactored WebGUI::HTMLForm api to use new session system

Browse source
This commit is contained in:
JT Smith 2006-01-11 16:53:02 +00:00
parent 45c7e7876d
commit b3974c0cd5
33 changed files with 92 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

7
docs/migration.txt
View file

@ -756,6 +756,13 @@ processReplacements functions.
perl -pi.bak -e 's!WebGUI\:\:HTML\:\:makeAbsolute\(!WebGUI::HTML::makeAbsolute(\$self->session,!g' fileNameGoesHere perl -pi.bak -e 's!WebGUI\:\:HTML\:\:makeAbsolute\(!WebGUI::HTML::makeAbsolute(\$self->session,!g' fileNameGoesHere
perl -pi.bak -e 's!WebGUI\:\:HTML\:\:processReplacements\(!WebGUI::HTML::processReplacements(\$self->session,!g' fileNameGoesHere perl -pi.bak -e 's!WebGUI\:\:HTML\:\:processReplacements\(!WebGUI::HTML::processReplacements(\$self->session,!g' fileNameGoesHere
5.23.15 WebGUI::HTMLForm API Refactored
You now need to pass in a reference to session to the constructor.
perl -pi.bak -e 's!WebGUI\:\:HTMLForm\-\>new\(!WebGUI::HTMLForm->new(\$self->session,!g' fileNameGoesHere
perl -pi.bak -e 's!WebGUI\:\:HTMLForm\-\>new\;!WebGUI::HTMLForm->new(\$self->session);!g' fileNameGoesHere
6. Automatic list of Assets in Help System. 6. Automatic list of Assets in Help System.

2
lib/WebGUI/Asset/File/Image.pm
View file

@ -247,7 +247,7 @@ sub www_resize {
$self->setSize($self->getStorageLocation->getFileSize($self->get("filename"))); $self->setSize($self->getStorageLocation->getFileSize($self->get("filename")));
} }
$self->getAdminConsole->addSubmenuItem($self->getUrl('func=edit'),WebGUI::International::get("edit image","Asset_Image")); $self->getAdminConsole->addSubmenuItem($self->getUrl('func=edit'),WebGUI::International::get("edit image","Asset_Image"));
my $f = WebGUI::HTMLForm->new(-action=>$self->getUrl); my $f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
$f->hidden( $f->hidden(
-name=>"func", -name=>"func",
-value=>"resize" -value=>"resize"

4
lib/WebGUI/Asset/Shortcut.pm
View file

@ -640,7 +640,7 @@ sub www_getUserPrefsForm {
return 'You are not allowed to personalize this Dashboard.' unless $self->getParent->canPersonalize; return 'You are not allowed to personalize this Dashboard.' unless $self->getParent->canPersonalize;
my $output; my $output;
my @fielden = $self->getPrefFieldsToShow; my @fielden = $self->getPrefFieldsToShow;
my $f = WebGUI::HTMLForm->new(extras=>' onSubmit="submitForm(this,\''.$self->getId.'\',\''.$self->getUrl.'\');return false;"'); my $f = WebGUI::HTMLForm->new($self->session,extras=>' onSubmit="submitForm(this,\''.$self->getId.'\',\''.$self->getUrl.'\');return false;"');
$f->raw('<table cellspacing="0" cellpadding="3" border="0">'); $f->raw('<table cellspacing="0" cellpadding="3" border="0">');
$f->hidden( $f->hidden(
-name => 'func', -name => 'func',
@ -741,7 +741,7 @@ sub www_editOverride {
%props = (%props,%{$def->{properties}}); %props = (%props,%{$def->{properties}});
} }
$output .= '</table>'; $output .= '</table>';
my $f = WebGUI::HTMLForm->new(-action=>$self->getUrl); my $f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
$f->hidden(-name=>"func",-value=>"saveOverride"); $f->hidden(-name=>"func",-value=>"saveOverride");
$f->hidden(-name=>"overrideFieldName",-value=>$self->session->form->process("fieldName")); $f->hidden(-name=>"overrideFieldName",-value=>$self->session->form->process("fieldName"));
$f->readOnly(-label=>$i18n->get("fieldName"),-value=>$self->session->form->process("fieldName")); $f->readOnly(-label=>$i18n->get("fieldName"),-value=>$self->session->form->process("fieldName"));

2
lib/WebGUI/Asset/Template.pm
View file

@ -357,7 +357,7 @@ sub www_styleWizard {
return $self->session->privilege->insufficient() unless $self->canEdit; return $self->session->privilege->insufficient() unless $self->canEdit;
my $output = ""; my $output = "";
if ($self->session->form->process("step") == 2) { if ($self->session->form->process("step") == 2) {
my $f = WebGUI::HTMLForm->new({action=>$self->getUrl}); my $f = WebGUI::HTMLForm->new($self->session,{action=>$self->getUrl});
$f->hidden(name=>"func", value=>"styleWizard"); $f->hidden(name=>"func", value=>"styleWizard");
$f->hidden(name=>"proceed", value=>"manageAssets") if ($self->session->form->process("proceed")); $f->hidden(name=>"proceed", value=>"manageAssets") if ($self->session->form->process("proceed"));
$f->hidden(name=>"step", value=>3); $f->hidden(name=>"step", value=>3);

4
lib/WebGUI/Asset/Wobject/DataForm.pm
View file

@ -757,7 +757,7 @@ sub www_editField {
} }
$tab = $self->session->db->buildHashRef("select DataForm_tabId,label from DataForm_tab where assetId=".$self->session->db->quote($self->getId)); $tab = $self->session->db->buildHashRef("select DataForm_tabId,label from DataForm_tab where assetId=".$self->session->db->quote($self->getId));
$tab->{0} = WebGUI::International::get("no tab","Asset_DataForm"); $tab->{0} = WebGUI::International::get("no tab","Asset_DataForm");
$f = WebGUI::HTMLForm->new(-action=>$self->getUrl); $f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
$f->hidden( $f->hidden(
-name => "fid", -name => "fid",
-value => $self->session->form->process("fid") -value => $self->session->form->process("fid")
@ -914,7 +914,7 @@ sub www_editTab {
unless ($self->session->form->process("tid") eq "new") { unless ($self->session->form->process("tid") eq "new") {
%tab = $self->session->db->quickHash("select * from DataForm_tab where DataForm_tabId=".$self->session->db->quote($self->session->form->process("tid"))); %tab = $self->session->db->quickHash("select * from DataForm_tab where DataForm_tabId=".$self->session->db->quote($self->session->form->process("tid")));
} }
$f = WebGUI::HTMLForm->new(-action=>$self->getUrl); $f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
$f->hidden( $f->hidden(
-name => "tid", -name => "tid",
-value => $self->session->form->process("tid") -value => $self->session->form->process("tid")

6
lib/WebGUI/Asset/Wobject/InOutBoard.pm
View file

@ -172,7 +172,7 @@ sub view {
##Find all the users for which I am a delegate ##Find all the users for which I am a delegate
my @users = $self->session->db->buildArray("select userId from InOutBoard_delegates where assetId=".$self->session->db->quote($self->getId)." and delegateUserId=".$self->session->db->quote($self->session->user->profileField("userId"))); my @users = $self->session->db->buildArray("select userId from InOutBoard_delegates where assetId=".$self->session->db->quote($self->getId)." and delegateUserId=".$self->session->db->quote($self->session->user->profileField("userId")));
my $f = WebGUI::HTMLForm->new(-action=>$self->getUrl); my $f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
if (@users) { if (@users) {
my %nameHash; my %nameHash;
tie %nameHash, "Tie::IxHash"; tie %nameHash, "Tie::IxHash";
@ -311,7 +311,7 @@ group by userId", $self->session->db->quote($self->getId), $self->session->db->q
$sql = sprintf "select delegateUserId from InOutBoard_delegates where userId=%s and assetId=%s", $sql = sprintf "select delegateUserId from InOutBoard_delegates where userId=%s and assetId=%s",
$self->session->db->quote($self->session->user->profileField("userId")), $self->session->db->quote($self->getId); $self->session->db->quote($self->session->user->profileField("userId")), $self->session->db->quote($self->getId);
my $delegates = $self->session->db->buildArrayRef($sql); my $delegates = $self->session->db->buildArrayRef($sql);
my $f = WebGUI::HTMLForm->new(-action=>$self->getUrl); my $f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
$f->hidden( $f->hidden(
-name => "func", -name => "func",
-value => "selectDelegatesEditSave" -value => "selectDelegatesEditSave"
@ -379,7 +379,7 @@ sub www_viewReport {
my $self = shift; my $self = shift;
return "" unless ($self->session->user->isInGroup($self->getValue("reportViewerGroup"))); return "" unless ($self->session->user->isInGroup($self->getValue("reportViewerGroup")));
my %var; my %var;
my $f = WebGUI::HTMLForm->new(-action=>$self->getUrl, -method=>"GET"); my $f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl, -method=>"GET");
my %changedBy = (); my %changedBy = ();
$f->hidden( $f->hidden(
-name=>"func", -name=>"func",

8
lib/WebGUI/Asset/Wobject/Matrix.pm
View file

@ -442,7 +442,7 @@ sub www_editListing {
my $self = shift; my $self = shift;
my $listing= $self->session->db->getRow("Matrix_listing","listingId",$self->session->form->process("listingId")); my $listing= $self->session->db->getRow("Matrix_listing","listingId",$self->session->form->process("listingId"));
return WebGUI::International('no edit rights','Asset_Matrix') unless (($self->session->form->process("listingId") eq "new" && $self->session->user->isInGroup($self->get("groupToAdd"))) || $self->session->user->profileField("userId") eq $listing->{maintainerId} || $self->canEdit); return WebGUI::International('no edit rights','Asset_Matrix') unless (($self->session->form->process("listingId") eq "new" && $self->session->user->isInGroup($self->get("groupToAdd"))) || $self->session->user->profileField("userId") eq $listing->{maintainerId} || $self->canEdit);
my $f = WebGUI::HTMLForm->new(-action=>$self->getUrl); my $f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
$f->hidden( $f->hidden(
-name=>"func", -name=>"func",
-value=>"editListingSave" -value=>"editListingSave"
@ -650,7 +650,7 @@ sub www_editField {
my $self = shift; my $self = shift;
return $self->session->privilege->insufficient() unless($self->canEdit); return $self->session->privilege->insufficient() unless($self->canEdit);
my $field = $self->session->db->getRow("Matrix_field","fieldId",$self->session->form->process("fieldId")); my $field = $self->session->db->getRow("Matrix_field","fieldId",$self->session->form->process("fieldId"));
my $f = WebGUI::HTMLForm->new(-action=>$self->getUrl); my $f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
$f->hidden( $f->hidden(
-name=>"func", -name=>"func",
-value=>"editFieldSave" -value=>"editFieldSave"
@ -986,7 +986,7 @@ sub www_viewDetail {
$var{manufacturerUrl} = $listing->{manufacturerUrl}; $var{manufacturerUrl} = $listing->{manufacturerUrl};
$var{'manufacturerUrl.click'} = $self->getUrl("m=1&amp;func=click&amp;listingId=".$listingId); $var{'manufacturerUrl.click'} = $self->getUrl("m=1&amp;func=click&amp;listingId=".$listingId);
$var{versionNumber} = $listing->{versionNumber}; $var{versionNumber} = $listing->{versionNumber};
my $f = WebGUI::HTMLForm->new( my $f = WebGUI::HTMLForm->new($self->session,
-extras=>'class="content"', -extras=>'class="content"',
-tableExtras=>'class="content"' -tableExtras=>'class="content"'
); );
@ -1061,7 +1061,7 @@ sub www_viewDetail {
10=>"10 - Best" 10=>"10 - Best"
); );
my $ratingsTable = '<table class="ratingForm"><tbody><tr><th></th><th>Mean</th><th>Median</th><th>Count</th></tr>'; my $ratingsTable = '<table class="ratingForm"><tbody><tr><th></th><th>Mean</th><th>Median</th><th>Count</th></tr>';
$f = WebGUI::HTMLForm->new( $f = WebGUI::HTMLForm->new($self->session,
-extras=>'class="ratingForm"', -extras=>'class="ratingForm"',
-tableExtras=>'class="ratingForm"' -tableExtras=>'class="ratingForm"'
); );

10
lib/WebGUI/Asset/Wobject/Product.pm
View file

@ -312,7 +312,7 @@ sub www_addAccessory {
my $self = shift; my $self = shift;
return $self->session->privilege->insufficient() unless ($self->canEdit); return $self->session->privilege->insufficient() unless ($self->canEdit);
my ($f, $accessory, @usedAccessories); my ($f, $accessory, @usedAccessories);
$f = WebGUI::HTMLForm->new(-action=>$self->getUrl); $f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
$f->hidden( $f->hidden(
-name => "func", -name => "func",
-value => "addAccessorySave", -value => "addAccessorySave",
@ -351,7 +351,7 @@ sub www_addRelated {
my $self = shift; my $self = shift;
return $self->session->privilege->insufficient() unless ($self->canEdit); return $self->session->privilege->insufficient() unless ($self->canEdit);
my ($f, $related, @usedRelated); my ($f, $related, @usedRelated);
$f = WebGUI::HTMLForm->new(-action=>$self->getUrl); $f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
$f->hidden( $f->hidden(
-name => "func", -name => "func",
-value => "addRelatedSave", -value => "addRelatedSave",
@ -469,7 +469,7 @@ sub www_editBenefit {
return $self->session->privilege->insufficient() unless ($self->canEdit); return $self->session->privilege->insufficient() unless ($self->canEdit);
my ($data, $f, $benefits); my ($data, $f, $benefits);
$data = $self->getCollateral("Product_benefit","Product_benefitId",$self->session->form->process("bid")); $data = $self->getCollateral("Product_benefit","Product_benefitId",$self->session->form->process("bid"));
$f = WebGUI::HTMLForm->new(-action=>$self->getUrl); $f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
$f->hidden( $f->hidden(
-name => "bid", -name => "bid",
-value => $data->{Product_benefitId}, -value => $data->{Product_benefitId},
@ -516,7 +516,7 @@ sub www_editFeature {
return $self->session->privilege->insufficient() unless ($self->canEdit); return $self->session->privilege->insufficient() unless ($self->canEdit);
my ($data, $f, $features); my ($data, $f, $features);
$data = $self->getCollateral("Product_feature","Product_featureId",$self->session->form->process("fid")); $data = $self->getCollateral("Product_feature","Product_featureId",$self->session->form->process("fid"));
$f = WebGUI::HTMLForm->new(-action=>$self->getUrl); $f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
$f->hidden( $f->hidden(
-name => "fid", -name => "fid",
-value => $data->{Product_featureId}, -value => $data->{Product_featureId},
@ -562,7 +562,7 @@ sub www_editSpecification {
return $self->session->privilege->insufficient() unless ($self->canEdit); return $self->session->privilege->insufficient() unless ($self->canEdit);
my ($data, $f, $hashRef); my ($data, $f, $hashRef);
$data = $self->getCollateral("Product_specification","Product_specificationId",$self->session->form->process("sid")); $data = $self->getCollateral("Product_specification","Product_specificationId",$self->session->form->process("sid"));
$f = WebGUI::HTMLForm->new(-action=>$self->getUrl); $f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
$f->hidden( $f->hidden(
-name => "sid", -name => "sid",
-value => $data->{Product_specificationId}, -value => $data->{Product_specificationId},

6
lib/WebGUI/Asset/Wobject/Survey.pm
View file

@ -778,7 +778,7 @@ sub www_editAnswer {
return $self->session->privilege->insufficient() unless ($self->canEdit); return $self->session->privilege->insufficient() unless ($self->canEdit);
$answer = $self->getCollateral("Survey_answer","Survey_answerId",$self->session->form->process("aid")); $answer = $self->getCollateral("Survey_answer","Survey_answerId",$self->session->form->process("aid"));
$f = WebGUI::HTMLForm->new(-action=>$self->getUrl); $f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
$f->hidden( $f->hidden(
-name => "assetId", -name => "assetId",
-value => $self->session->form->process("assetId") -value => $self->session->form->process("assetId")
@ -881,7 +881,7 @@ sub www_editQuestion {
$question = $self->getCollateral("Survey_question","Survey_questionId",$self->session->form->process("qid")); $question = $self->getCollateral("Survey_question","Survey_questionId",$self->session->form->process("qid"));
$answerFieldType = $question->{answerFieldType} || "radioList"; $answerFieldType = $question->{answerFieldType} || "radioList";
$f = WebGUI::HTMLForm->new(-action=>$self->getUrl); $f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
$f->hidden( $f->hidden(
-name => "assetId", -name => "assetId",
-value => $self->get("assetId") -value => $self->get("assetId")
@ -1048,7 +1048,7 @@ sub www_editSection {
return $self->session->privilege->vitalComponent; return $self->session->privilege->vitalComponent;
} }
$f = WebGUI::HTMLForm->new(-action=>$self->getUrl); $f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
$f->hidden( $f->hidden(
-name => "assetId", -name => "assetId",
-value => $self->get("assetId") -value => $self->get("assetId")

2
lib/WebGUI/AssetExportHtml.pm
View file

@ -139,7 +139,7 @@ sub www_export {
my $self = shift; my $self = shift;
return $self->session->privilege->insufficient() unless ($self->session->user->isInGroup(13)); return $self->session->privilege->insufficient() unless ($self->session->user->isInGroup(13));
$self->getAdminConsole->setHelp("page export", "Asset"); $self->getAdminConsole->setHelp("page export", "Asset");
my $f = WebGUI::HTMLForm->new(-action=>$self->getUrl); my $f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
$f->hidden( $f->hidden(
-name => "func", -name => "func",
-value => "exportStatus" -value => "exportStatus"

2
lib/WebGUI/AssetMetaData.pm
View file

@ -165,7 +165,7 @@ sub www_editMetaDataField {
$fieldInfo = $self->getMetaDataFields($self->session->form->process("fid")); $fieldInfo = $self->getMetaDataFields($self->session->form->process("fid"));
} }
my $fid = $self->session->form->process("fid") || "new"; my $fid = $self->session->form->process("fid") || "new";
my $f = WebGUI::HTMLForm->new(-action=>$self->getUrl); my $f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
$f->hidden( $f->hidden(
-name => "func", -name => "func",
-value => "editMetaDataFieldSave" -value => "editMetaDataFieldSave"

2
lib/WebGUI/AssetVersioning.pm
View file

@ -348,7 +348,7 @@ sub www_addVersionTag {
return $self->session->privilege->insufficient() unless ($self->session->user->isInGroup(12)); return $self->session->privilege->insufficient() unless ($self->session->user->isInGroup(12));
my $i18n = WebGUI::International->new("Asset"); my $i18n = WebGUI::International->new("Asset");
$ac->addSubmenuItem($self->getUrl('func=manageVersions'), $i18n->get("manage versions")); $ac->addSubmenuItem($self->getUrl('func=manageVersions'), $i18n->get("manage versions"));
my $f = WebGUI::HTMLForm->new(-action=>$self->getUrl); my $f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
my $tag = $self->session->db->getRow("assetVersionTag","tagId",$self->session->form->process("tagId")); my $tag = $self->session->db->getRow("assetVersionTag","tagId",$self->session->form->process("tagId"));
$f->hidden( $f->hidden(
-name=>"func", -name=>"func",

4
lib/WebGUI/Auth/LDAP.pm
View file

@ -96,7 +96,7 @@ sub addUserForm {
my $connectDN = $session{form}{'authLDAP_connectDN'} || $userData->{connectDN}; my $connectDN = $session{form}{'authLDAP_connectDN'} || $userData->{connectDN};
my $ldapConnection = $session{form}{'authLDAP_ldapConnection'} || $userData->{ldapConnection}; my $ldapConnection = $session{form}{'authLDAP_ldapConnection'} || $userData->{ldapConnection};
my $ldapLinks = $self->session->db->buildHashRef("select ldapLinkId,ldapUrl from ldapLink"); my $ldapLinks = $self->session->db->buildHashRef("select ldapLinkId,ldapUrl from ldapLink");
my $f = WebGUI::HTMLForm->new; my $f = WebGUI::HTMLForm->new($self->session);
my $jscript = ""; my $jscript = "";
if(scalar(keys %{$ldapLinks}) > 0) { if(scalar(keys %{$ldapLinks}) > 0) {
my $jsArray = ""; my $jsArray = "";
@ -359,7 +359,7 @@ sub editUserFormSave {
sub editUserSettingsForm { sub editUserSettingsForm {
my $self = shift; my $self = shift;
my $f = WebGUI::HTMLForm->new; my $f = WebGUI::HTMLForm->new($self->session);
my $ldapConnection = WebGUI::Form::selectBox({ my $ldapConnection = WebGUI::Form::selectBox({
name=>"ldapConnection", name=>"ldapConnection",
options=>WebGUI::LDAPLink::getList(), options=>WebGUI::LDAPLink::getList(),

4
lib/WebGUI/Auth/WebGUI.pm
View file

@ -80,7 +80,7 @@ sub _logSecurityMessage {
sub addUserForm { sub addUserForm {
my $self = shift; my $self = shift;
my $userData = $self->getParams; my $userData = $self->getParams;
my $f = WebGUI::HTMLForm->new; my $f = WebGUI::HTMLForm->new($self->session);
$f->password( $f->password(
name=>"authWebGUI.identifier", name=>"authWebGUI.identifier",
label=>WebGUI::International::get(51), label=>WebGUI::International::get(51),
@ -348,7 +348,7 @@ sub editUserFormSave {
sub editUserSettingsForm { sub editUserSettingsForm {
my $self = shift; my $self = shift;
my $f = WebGUI::HTMLForm->new; my $f = WebGUI::HTMLForm->new($self->session);
$f->text( $f->text(
-name=>"webguiPasswordLength", -name=>"webguiPasswordLength",
-value=>$self->session->setting->get("webguiPasswordLength"), -value=>$self->session->setting->get("webguiPasswordLength"),

4
lib/WebGUI/Commerce/Payment.pm
View file

@ -81,7 +81,7 @@ sub configurationForm {
$self = shift; $self = shift;
$form = shift; $form = shift;
$f = WebGUI::HTMLForm->new; $f = WebGUI::HTMLForm->new($self->session);
$f->yesNo( $f->yesNo(
-name => $self->prepend('enabled'), -name => $self->prepend('enabled'),
-value => $self->enabled, -value => $self->enabled,
@ -386,7 +386,7 @@ the database. Use it on all fields in the configurationForm method.
For instance: For instance:
$f = WebGUI::HTMLForm->new; $f = WebGUI::HTMLForm->new($self->session);
$f->text( $f->text(
-name => $self->prepend('MyField'); -name => $self->prepend('MyField');
-label => 'MyField' -label => 'MyField'

4
lib/WebGUI/Commerce/Payment/ITransact.pm
View file

@ -110,7 +110,7 @@ sub checkoutForm {
$u = WebGUI::User->new($self->session->user->profileField("userId")); $u = WebGUI::User->new($self->session->user->profileField("userId"));
$f = WebGUI::HTMLForm->new; $f = WebGUI::HTMLForm->new($self->session);
$f->text( $f->text(
-name => 'firstName', -name => 'firstName',
-label => $i18n->get('firstName'), -label => $i18n->get('firstName'),
@ -435,7 +435,7 @@ sub configurationForm {
$self = shift; $self = shift;
$i18n = WebGUI::International->new('CommercePaymentITransact'); $i18n = WebGUI::International->new('CommercePaymentITransact');
$f = WebGUI::HTMLForm->new; $f = WebGUI::HTMLForm->new($self->session);
$f->text( $f->text(
-name => $self->prepend('vendorId'), -name => $self->prepend('vendorId'),
-label => $i18n->get('vendorId'), -label => $i18n->get('vendorId'),

4
lib/WebGUI/Commerce/Shipping.pm
View file

@ -47,7 +47,7 @@ sub configurationForm {
$self = shift; $self = shift;
$form = shift; $form = shift;
$f = WebGUI::HTMLForm->new; $f = WebGUI::HTMLForm->new($self->session);
$f->yesNo( $f->yesNo(
-name => $self->prepend('enabled'), -name => $self->prepend('enabled'),
-value => $self->enabled, -value => $self->enabled,
@ -262,7 +262,7 @@ the database. Use it on all fields in the configurationForm method.
For instance: For instance:
$f = WebGUI::HTMLForm->new; $f = WebGUI::HTMLForm->new($self->session);
$f->text( $f->text(
-name => $self->prepend('MyField'); -name => $self->prepend('MyField');
-label => 'MyField' -label => 'MyField'

2
lib/WebGUI/Commerce/Shipping/ByPrice.pm
View file

@ -23,7 +23,7 @@ sub configurationForm {
my ($self, $f); my ($self, $f);
$self = shift; $self = shift;
$f = WebGUI::HTMLForm->new; $f = WebGUI::HTMLForm->new($self->session);
$f->float( $f->float(
-name => $self->prepend('percentageOfPrice'), -name => $self->prepend('percentageOfPrice'),
-label => WebGUI::International::get('percentage of price', 'CommerceShippingByPrice'), -label => WebGUI::International::get('percentage of price', 'CommerceShippingByPrice'),

2
lib/WebGUI/Commerce/Shipping/ByWeight.pm
View file

@ -23,7 +23,7 @@ sub configurationForm {
my ($self, $f); my ($self, $f);
$self = shift; $self = shift;
$f = WebGUI::HTMLForm->new; $f = WebGUI::HTMLForm->new($self->session);
$f->float( $f->float(
-name => $self->prepend('pricePerUnitWeight'), -name => $self->prepend('pricePerUnitWeight'),
-label => WebGUI::International::get('price per weight', 'CommerceShippingByWeight'), -label => WebGUI::International::get('price per weight', 'CommerceShippingByWeight'),

2
lib/WebGUI/Commerce/Shipping/PerTransaction.pm
View file

@ -19,7 +19,7 @@ sub configurationForm {
my ($self, $f); my ($self, $f);
$self = shift; $self = shift;
$f = WebGUI::HTMLForm->new; $f = WebGUI::HTMLForm->new($self->session);
$f->float( $f->float(
-name => $self->prepend('pricePerTransaction'), -name => $self->prepend('pricePerTransaction'),
-label => WebGUI::International::get('price', 'CommerceShippingPerTransaction'), -label => WebGUI::International::get('price', 'CommerceShippingPerTransaction'),

32
lib/WebGUI/HTMLForm.pm
View file

@ -16,13 +16,9 @@ package WebGUI::HTMLForm;
use CGI::Util qw(rearrange); use CGI::Util qw(rearrange);
use strict qw(vars refs); use strict qw(vars refs);
use WebGUI::DateTime;
use WebGUI::Form; use WebGUI::Form;
use WebGUI::Icon; use WebGUI::Icon;
use WebGUI::International; use WebGUI::International;
use WebGUI::Grouping;
use WebGUI::Session;
use WebGUI::SQL;
use WebGUI::Utility; use WebGUI::Utility;
=head1 NAME =head1 NAME
@ -36,7 +32,7 @@ Package that makes HTML forms typed data and significantly reduces the code need
=head1 SYNOPSIS =head1 SYNOPSIS
use WebGUI::HTMLForm; use WebGUI::HTMLForm;
$f = WebGUI::HTMLForm->new; $f = WebGUI::HTMLForm->new($self->session);
$f->someFormControlType( $f->someFormControlType(
name=>"someName", name=>"someName",
@ -65,6 +61,7 @@ These methods are available from this class:
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub _uiLevelChecksOut { sub _uiLevelChecksOut {
my $self = shift;
if ($_[0] <= $self->session->user->profileField("uiLevel")) { if ($_[0] <= $self->session->user->profileField("uiLevel")) {
return 1; return 1;
} else { } else {
@ -146,17 +143,18 @@ If you want to add anything special to the form's table like a name or styleshee
sub new { sub new {
my ($header, $footer); my ($header, $footer);
my $class = shift; my $class = shift;
my $session = shift;
my %param = @_; my %param = @_;
$header = "\n\n".WebGUI::Form::formHeader({ $header = "\n\n".WebGUI::Form::formHeader($session,{
action=>($param{action} || $param{'-action'}), action=>($param{action} || $param{'-action'} || $session->url->page),
extras=>($param{extras} || $param{'-extras'}), extras=>($param{extras} || $param{'-extras'}),
method=>($param{method} || $param{'-method'}), method=>($param{method} || $param{'-method'}),
enctype=>($param{enctype} || $param{'-enctype'}) enctype=>($param{enctype} || $param{'-enctype'})
}); });
$header .= "\n<table ".$param{tableExtras}.'><tbody>'; $header .= "\n<table ".$param{tableExtras}.'><tbody>';
$footer = "</tbody></table>\n" ; $footer = "</tbody></table>\n" ;
$footer .= WebGUI::Form::formFooter($self->session,); $footer .= WebGUI::Form::formFooter($session);
bless {_uiLevelOverride=>$param{uiLevelOverride}, _header => $header, _footer => $footer, _data => ''}, $class; bless {_session=>$session, _uiLevelOverride=>$param{uiLevelOverride}, _header => $header, _footer => $footer, _data => ''}, $class;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -168,7 +166,8 @@ Returns the HTML for this form object.
=cut =cut
sub print { sub print {
return $_[0]->{_header}.$_[0]->{_data}.$_[0]->{_footer}.'<script type="text/javascript" src="'.$self->session->config->get("extrasURL").'/wz_tooltip.js"></script>'; my $self = shift;
return $self->{_header}.$self->{_data}.$self->{_footer}.'<script type="text/javascript" src="'.$self->session->config->get("extrasURL").'/wz_tooltip.js"></script>';
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -207,6 +206,19 @@ sub raw {
} }
#-------------------------------------------------------------------
=head2 session ( )
Returns a reference to the current session.
=cut
sub session {
my $self = shift;
return $self->{_session};
}
#------------------------------------------------------------------- #-------------------------------------------------------------------
=head2 trClass ( ) =head2 trClass ( )

2
lib/WebGUI/Operation/Commerce.pm
View file

@ -179,7 +179,7 @@ sub www_checkoutConfirm {
$plugin = WebGUI::Commerce::Payment->load($session->scratch->get('paymentGateway')); $plugin = WebGUI::Commerce::Payment->load($session->scratch->get('paymentGateway'));
$f = WebGUI::HTMLForm->new; $f = WebGUI::HTMLForm->new($session);
$f->hidden( $f->hidden(
-name => 'op', -name => 'op',
-value => 'checkoutSubmit' -value => 'checkoutSubmit'

2
lib/WebGUI/Operation/DatabaseLink.pm
View file

@ -81,7 +81,7 @@ sub www_editDatabaseLink {
} else { } else {
%db = %{WebGUI::DatabaseLink->new($session,$session->form->process("dlid"))->get}; %db = %{WebGUI::DatabaseLink->new($session,$session->form->process("dlid"))->get};
} }
$f = WebGUI::HTMLForm->new( $f = WebGUI::HTMLForm->new($session,
-extras=>'autocomplete="off"' -extras=>'autocomplete="off"'
); );
$f->hidden( $f->hidden(

2
lib/WebGUI/Operation/FormHelpers.pm
View file

@ -49,7 +49,7 @@ sub www_formAssetTree {
sub www_richEditPageTree { sub www_richEditPageTree {
my $session = shift; my $session = shift;
my $f = WebGUI::HTMLForm->new(-action=>"#",-extras=>'name"linkchooser"'); my $f = WebGUI::HTMLForm->new($session,-action=>"#",-extras=>'name"linkchooser"');
$f->text( $f->text(
-name=>"url", -name=>"url",
-label=>WebGUI::International::get(104), -label=>WebGUI::International::get(104),

12
lib/WebGUI/Operation/Group.pm
View file

@ -105,7 +105,7 @@ sub getGroupSearchForm {
$session->scratch->set("groupSearchKeyword",$session->form->process("keyword")); $session->scratch->set("groupSearchKeyword",$session->form->process("keyword"));
$session->scratch->set("groupSearchModifier",$session->form->process("modifier")); $session->scratch->set("groupSearchModifier",$session->form->process("modifier"));
my $output = '<div align="center">'; my $output = '<div align="center">';
my $f = WebGUI::HTMLForm->new(1); my $f = WebGUI::HTMLForm->new($session,1);
foreach my $key (keys %{$params}) { foreach my $key (keys %{$params}) {
$f->hidden( $f->hidden(
-name=>$key, -name=>$key,
@ -268,7 +268,7 @@ sub www_editGroup {
} else { } else {
$g = WebGUI::Group->new($session->form->process("gid")); $g = WebGUI::Group->new($session->form->process("gid"));
} }
$f = WebGUI::HTMLForm->new; $f = WebGUI::HTMLForm->new($session);
$f->hidden( $f->hidden(
-name => "op", -name => "op",
-value => "editGroupSave", -value => "editGroupSave",
@ -435,7 +435,7 @@ sub www_editGroupSave {
sub www_editGrouping { sub www_editGrouping {
my $session = shift; my $session = shift;
return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid"))); return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
my $f = WebGUI::HTMLForm->new; my $f = WebGUI::HTMLForm->new($session);
$f->hidden( $f->hidden(
-name => "op", -name => "op",
-value => "editGroupingSave" -value => "editGroupingSave"
@ -490,7 +490,7 @@ sub www_emailGroup {
my $session = shift; my $session = shift;
return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid"))); return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
my ($output,$f); my ($output,$f);
$f = WebGUI::HTMLForm->new; $f = WebGUI::HTMLForm->new($session);
$f->hidden( $f->hidden(
-name => "op", -name => "op",
-value => "emailGroupSend" -value => "emailGroupSend"
@ -598,7 +598,7 @@ sub www_listGroups {
sub www_manageGroupsInGroup { sub www_manageGroupsInGroup {
my $session = shift; my $session = shift;
return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid"))); return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
my $f = WebGUI::HTMLForm->new; my $f = WebGUI::HTMLForm->new($session);
$f->hidden( $f->hidden(
-name => "op", -name => "op",
-value => "addGroupsToGroupSave" -value => "addGroupsToGroupSave"
@ -664,7 +664,7 @@ sub www_manageUsersInGroup {
$output .= WebGUI::Operation::User::getUserSearchForm("manageUsersInGroup",{gid=>$session->form->process("gid")}); $output .= WebGUI::Operation::User::getUserSearchForm("manageUsersInGroup",{gid=>$session->form->process("gid")});
my ($userCount) = $session->db->quickArray("select count(*) from users"); my ($userCount) = $session->db->quickArray("select count(*) from users");
return _submenu($output) unless ($session->form->process("doit") || $userCount < 250 || $session->form->process("pn") > 1); return _submenu($output) unless ($session->form->process("doit") || $userCount < 250 || $session->form->process("pn") > 1);
my $f = WebGUI::HTMLForm->new; my $f = WebGUI::HTMLForm->new($session);
$f->hidden( $f->hidden(
-name => "gid", -name => "gid",
-value => $session->form->process("gid") -value => $session->form->process("gid")

2
lib/WebGUI/Operation/LDAPLink.pm
View file

@ -81,7 +81,7 @@ sub www_editLDAPLink {
tie %db, 'Tie::CPHash'; tie %db, 'Tie::CPHash';
%db = $session->db->quickHash("select * from ldapLink where ldapLinkId=".$session->db->quote($session->form->process("llid"))); %db = $session->db->quickHash("select * from ldapLink where ldapLinkId=".$session->db->quote($session->form->process("llid")));
$f = WebGUI::HTMLForm->new( -extras=>'autocomplete="off"' ); $f = WebGUI::HTMLForm->new($session, -extras=>'autocomplete="off"' );
$f->hidden( $f->hidden(
-name => "op", -name => "op",
-value => "editLDAPLinkSave", -value => "editLDAPLinkSave",

10
lib/WebGUI/Operation/ProductManager.pm
View file

@ -90,7 +90,7 @@ sub www_editProduct {
$product = WebGUI::Product->new($productId)->get; $product = WebGUI::Product->new($productId)->get;
} }
$f = WebGUI::HTMLForm->new; $f = WebGUI::HTMLForm->new($session);
$f->hidden( $f->hidden(
-name => 'op', -name => 'op',
-value => 'editProductSave' -value => 'editProductSave'
@ -202,7 +202,7 @@ sub www_editProductParameter {
$productId = $product->get('productId'); $productId = $product->get('productId');
} }
$f = WebGUI::HTMLForm->new; $f = WebGUI::HTMLForm->new($session);
$f->hidden( $f->hidden(
-name => 'op', -name => 'op',
-value => 'editProductParameterSave', -value => 'editProductParameterSave',
@ -284,7 +284,7 @@ sub www_editProductParameterOption {
$option = WebGUI::Product->getByOptionId($optionId)->getOption($optionId); $option = WebGUI::Product->getByOptionId($optionId)->getOption($optionId);
} }
$f = WebGUI::HTMLForm->new; $f = WebGUI::HTMLForm->new($session);
$f->hidden( $f->hidden(
-name => 'op', -name => 'op',
-value => 'editProductParameterOptionSave', -value => 'editProductParameterOptionSave',
@ -373,7 +373,7 @@ sub www_editProductVariant {
$variantId = $session->form->process("variantId"); $variantId = $session->form->process("variantId");
$variant = WebGUI::Product->getByVariantId($variantId)->getVariant($variantId); $variant = WebGUI::Product->getByVariantId($variantId)->getVariant($variantId);
$f = WebGUI::HTMLForm->new; $f = WebGUI::HTMLForm->new($session);
$f->hidden( $f->hidden(
-name => 'op', -name => 'op',
-value => 'editProductVariantSave' -value => 'editProductVariantSave'
@ -447,7 +447,7 @@ sub www_editSkuTemplate {
} }
$output .= "</ul><br />"; $output .= "</ul><br />";
$f = WebGUI::HTMLForm->new; $f = WebGUI::HTMLForm->new($session);
$f->hidden( $f->hidden(
-name => 'op', -name => 'op',
-value => 'editSkuTemplateSave' -value => 'editSkuTemplateSave'

4
lib/WebGUI/Operation/ProfileSettings.pm
View file

@ -74,7 +74,7 @@ sub www_editProfileCategory {
my $session = shift; my $session = shift;
return $session->privilege->adminOnly() unless ($session->user->isInGroup(3)); return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
my $data = {}; my $data = {};
my $f = WebGUI::HTMLForm->new; my $f = WebGUI::HTMLForm->new($session);
$f->hidden( $f->hidden(
-name => "op", -name => "op",
-value => "editProfileCategorySave", -value => "editProfileCategorySave",
@ -139,7 +139,7 @@ sub www_editProfileCategorySave {
sub www_editProfileField { sub www_editProfileField {
my $session = shift; my $session = shift;
return $session->privilege->adminOnly() unless ($session->user->isInGroup(3)); return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
my $f = WebGUI::HTMLForm->new; my $f = WebGUI::HTMLForm->new($session);
$f->hidden( $f->hidden(
-name => "op", -name => "op",
-value => "editProfileFieldSave", -value => "editProfileFieldSave",

2
lib/WebGUI/Operation/Replacements.pm
View file

@ -50,7 +50,7 @@ sub www_editReplacement {
my $session = shift; my $session = shift;
return $session->privilege->adminOnly() unless ($session->user->isInGroup(3)); return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
my $data = $session->db->getRow("replacements","replacementId",$session->form->process("replacementId")); my $data = $session->db->getRow("replacements","replacementId",$session->form->process("replacementId"));
my $f = WebGUI::HTMLForm->new; my $f = WebGUI::HTMLForm->new($session);
$f->hidden( $f->hidden(
-name=>"op", -name=>"op",
-value=>"editReplacementSave" -value=>"editReplacementSave"

6
lib/WebGUI/Operation/Subscription.pm
View file

@ -66,7 +66,7 @@ sub www_createSubscriptionCodeBatch {
tie %subscriptions, "Tie::IxHash"; tie %subscriptions, "Tie::IxHash";
%subscriptions = $session->db->buildHash("select subscriptionId, name from subscription where deleted != 1 order by name"); %subscriptions = $session->db->buildHash("select subscriptionId, name from subscription where deleted != 1 order by name");
$f = WebGUI::HTMLForm->new; $f = WebGUI::HTMLForm->new($session);
$f->hidden( $f->hidden(
-name => 'op', -name => 'op',
-value => 'createSubscriptionCodeBatchSave' -value => 'createSubscriptionCodeBatchSave'
@ -201,7 +201,7 @@ sub www_editSubscription {
$subscriptionId = $session->form->process("sid") || 'new'; $subscriptionId = $session->form->process("sid") || 'new';
$f = WebGUI::HTMLForm->new; $f = WebGUI::HTMLForm->new($session);
$f->hidden( $f->hidden(
-name => 'op', -name => 'op',
-value => 'editSubscriptionSave' -value => 'editSubscriptionSave'
@ -454,7 +454,7 @@ sub www_redeemSubscriptionCode {
$var{message} = $i18n->get('redeem code ask for code'); $var{message} = $i18n->get('redeem code ask for code');
} }
$f = WebGUI::HTMLForm->new; $f = WebGUI::HTMLForm->new($session);
$f->hidden( $f->hidden(
-name => 'op', -name => 'op',
-value => 'redeemSubscriptionCode' -value => 'redeemSubscriptionCode'

2
lib/WebGUI/Operation/User.pm
View file

@ -434,7 +434,7 @@ sub www_editUserKarma {
my $session = shift; my $session = shift;
return $session->privilege->adminOnly() unless ($session->user->isInGroup(3)); return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
my ($output, $f, $a, %user, %data, $method, $values, $category, $label, $default, $previousCategory); my ($output, $f, $a, %user, %data, $method, $values, $category, $label, $default, $previousCategory);
$f = WebGUI::HTMLForm->new; $f = WebGUI::HTMLForm->new($session);
$f->hidden( $f->hidden(
-name => "op", -name => "op",
-value => "editUserKarmaSave", -value => "editUserKarmaSave",

4
lib/WebGUI/Operation/WebGUI.pm
View file

@ -77,7 +77,7 @@ sub www_setup {
$u->username($session->form->process("username","text","Admin")); $u->username($session->form->process("username","text","Admin"));
$u->profileField("email",$session->form->email("email")); $u->profileField("email",$session->form->email("email"));
$u->identifier(Digest::MD5::md5_base64($session->form->process("identifier","password","123qwe"))); $u->identifier(Digest::MD5::md5_base64($session->form->process("identifier","password","123qwe")));
my $f = WebGUI::HTMLForm->new(action=>$session->url->gateway()); my $f = WebGUI::HTMLForm->new($session,action=>$session->url->gateway());
$f->hidden( $f->hidden(
-name=>"op", -name=>"op",
-value=>"setup" -value=>"setup"
@ -116,7 +116,7 @@ sub www_setup {
} else { } else {
$output .= '<legend align="left">Admin Account</legend>'; $output .= '<legend align="left">Admin Account</legend>';
my $u = WebGUI::User->new('3'); my $u = WebGUI::User->new('3');
my $f = WebGUI::HTMLForm->new(action=>$session->url->gateway()); my $f = WebGUI::HTMLForm->new($session,action=>$session->url->gateway());
$f->hidden( $f->hidden(
-name=>"op", -name=>"op",
-value=>"setup" -value=>"setup"

4
lib/WebGUI/TabForm.pm
View file

@ -98,7 +98,7 @@ sub addTab {
my $name = shift; my $name = shift;
my $label = shift; my $label = shift;
my $uiLevel = shift || 0; my $uiLevel = shift || 0;
$self->{_tab}{$name}{form} = WebGUI::HTMLForm->new(uiLevelOverride=>$self->{_uiLevelOverride}); $self->{_tab}{$name}{form} = WebGUI::HTMLForm->new($self->session,uiLevelOverride=>$self->{_uiLevelOverride});
$self->{_tab}{$name}{label} = $label; $self->{_tab}{$name}{label} = $label;
$self->{_tab}{$name}{uiLevel} = $uiLevel; $self->{_tab}{$name}{uiLevel} = $uiLevel;
} }
@ -197,7 +197,7 @@ sub new {
my %tabs; my %tabs;
tie %tabs, 'Tie::IxHash'; tie %tabs, 'Tie::IxHash';
foreach my $key (keys %{$startingTabs}) { foreach my $key (keys %{$startingTabs}) {
$tabs{$key}{form} = WebGUI::HTMLForm->new(uiLevelOverride=>$uiLevelOverride); $tabs{$key}{form} = WebGUI::HTMLForm->new($self->session,uiLevelOverride=>$uiLevelOverride);
$tabs{$key}{label} = $startingTabs->{$key}->{label}; $tabs{$key}{label} = $startingTabs->{$key}->{label};
$tabs{$key}{uiLevel} = $startingTabs->{$key}->{uiLevel}; $tabs{$key}{uiLevel} = $startingTabs->{$key}->{uiLevel};
} }