diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm index bbafc7c2b..4f0672d52 100644 --- a/lib/WebGUI/Asset/Wobject/DataForm.pm +++ b/lib/WebGUI/Asset/Wobject/DataForm.pm @@ -52,7 +52,7 @@ sub _createField { if (isIn($data->{type},qw(selectList checkList))) { my @defaultValues; if ($session{form}{$param{name}}) { - @defaultValues = $session{req}->param($param{name}); + @defaultValues = WebGUI::FormProcessor::selectList($param{name}); } else { foreach (split(/\n/, $data->{value})) { s/\s+$//; # remove trailing spaces diff --git a/lib/WebGUI/Operation/Group.pm b/lib/WebGUI/Operation/Group.pm index 87a734379..44337a298 100644 --- a/lib/WebGUI/Operation/Group.pm +++ b/lib/WebGUI/Operation/Group.pm @@ -158,7 +158,7 @@ sub walkGroups { #------------------------------------------------------------------- sub www_addGroupsToGroupSave { return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session{form}{gid})); - my @groups = $session{req}->param('groups'); + my @groups = WebGUI::FormProcessor::group('groups'); WebGUI::Grouping::addGroupsToGroups(\@groups,[$session{form}{gid}]); return www_manageGroupsInGroup(); } @@ -166,7 +166,7 @@ sub www_addGroupsToGroupSave { #------------------------------------------------------------------- sub www_addUsersToGroupSave { return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session{form}{gid})); - my @users = $session{req}->param('users'); + my @users = WebGUI::FormProcessor::selectList('users'); WebGUI::Grouping::addUsersToGroups(\@users,[$session{form}{gid}]); return www_manageUsersInGroup(); } @@ -226,8 +226,8 @@ sub www_deleteGrouping { if (($session{user}{userId} eq $session{form}{uid} || $session{form}{uid} eq '3') && $session{form}{gid} eq '3') { return WebGUI::Privilege::vitalComponent(); } - my @users = $session{req}->param('uid'); - my @groups = $session{req}->param("gid"); + my @users = WebGUI::FormProcessor::selectList('uid'); + my @groups = WebGUI::FormProcessor::group("gid"); foreach my $user (@users) { my $u = WebGUI::User->new($user); $u->deleteFromGroups(\@groups); diff --git a/lib/WebGUI/Operation/ProductManager.pm b/lib/WebGUI/Operation/ProductManager.pm index c09b2a2da..a161abf50 100755 --- a/lib/WebGUI/Operation/ProductManager.pm +++ b/lib/WebGUI/Operation/ProductManager.pm @@ -5,6 +5,7 @@ use WebGUI::Session; use WebGUI::SQL; use WebGUI::HTMLForm; use WebGUI::Form; +use WebGUI::FormProcessor; use WebGUI::Id; use WebGUI::International; use WebGUI::AdminConsole; @@ -560,7 +561,7 @@ sub www_listProductVariantsSave { return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(14)); - my %availableVariants = map {$_ => 1} $session{req}->param('available'); + my %availableVariants = map {$_ => 1} WebGUI::FormProcessor::selectList('available'); my $product = WebGUI::Product->new($session{form}{productId}); my @variants = @{$product->getVariant}; diff --git a/lib/WebGUI/Operation/Subscription.pm b/lib/WebGUI/Operation/Subscription.pm index 1f3ffe88c..3a68ea958 100644 --- a/lib/WebGUI/Operation/Subscription.pm +++ b/lib/WebGUI/Operation/Subscription.pm @@ -86,6 +86,7 @@ sub www_createSubscriptionCodeBatch { -hoverHelp => $i18n->get('codes expire description'), -value => $session{form}{expires} || WebGUI::DateTime::intervalToSeconds(1, 'months') ); + my @sub = WebGUI::FormProcessor::selectList("subscriptionId"); $f->selectList( -name => 'subscriptionId', -label => $i18n->get('association'), @@ -93,7 +94,7 @@ sub www_createSubscriptionCodeBatch { -options=> \%subscriptions, -multiple=>1, -size => 5, - -value => [ ($session{req}->param('subscriptionId'))] + -value => \@sub ); $f->textarea( -name => 'description', @@ -136,7 +137,7 @@ sub www_createSubscriptionCodeBatchSave { WebGUI::SQL->write("insert into subscriptionCode (batchId, code, status, dateCreated, dateUsed, expires, usedBy)". " values (".quote($batchId).",".quote($code).", 'Unused', ".quote($creationEpoch).", 0, ".quote($expires).", 0)"); - @subscriptions = $session{req}->param('subscriptionId'); + @subscriptions = WebGUI::FormProcessor::selectList('subscriptionId'); foreach (@subscriptions) { WebGUI::SQL->write("insert into subscriptionCodeSubscriptions (code, subscriptionId) values (". quote($code).", ".quote($_).")"); diff --git a/lib/WebGUI/Operation/User.pm b/lib/WebGUI/Operation/User.pm index 48b568bfb..a53518e90 100644 --- a/lib/WebGUI/Operation/User.pm +++ b/lib/WebGUI/Operation/User.pm @@ -15,10 +15,10 @@ use Tie::CPHash; use Tie::IxHash; use WebGUI::AdminConsole; use WebGUI::DateTime; +use WebGUI::Form; use WebGUI::FormProcessor; use WebGUI::Group; use WebGUI::Grouping; -use WebGUI::Form; use WebGUI::HTMLForm; use WebGUI::Icon; use WebGUI::International; @@ -169,8 +169,8 @@ sub www_deleteGrouping { if (($session{user}{userId} eq $session{form}{uid} || $session{form}{uid} eq '3') && $session{form}{gid} eq '3') { return _submenu(WebGUI::Privilege::vitalComponent()); } - my @users = $session{req}->param('uid'); - my @groups = $session{req}->param("gid"); + my @users = WebGUI::FormProcessor::selectList('uid'); + my @groups = WebGUI::FormProcessor::group("gid"); foreach my $user (@users) { my $u = WebGUI::User->new($user); $u->deleteFromGroups(\@groups); @@ -323,7 +323,7 @@ sub www_editUser { $previousCategory = $category; } $a->finish; - my @groupsToAdd = $session{req}->param("groupsToAdd"); + my @groupsToAdd = WebGUI::FormProcessor::group("groupsToAdd"); my @exclude = WebGUI::SQL->buildArray("select groupId from groupings where userId=".quote($u->userId)); @exclude = (@exclude,"1","2","7"); $tabform->getTab("groups")->group( @@ -345,7 +345,7 @@ sub www_editUser { } } push (@include, "0"); - my @groupsToDelete = $session{req}->param("groupsToDelete"); + my @groupsToDelete = WebGUI::FormProcessor::group("groupsToDelete"); $tabform->getTab("groups")->selectList( -name=>"groupsToDelete", -options=>WebGUI::SQL->buildHashRef("select groupId, groupName from groups @@ -385,9 +385,9 @@ sub www_editUserSave { $u->profileField($field{fieldName},WebGUI::FormProcessor::process($field{fieldName},$field{dataType})); } $a->finish; - my @groups = $session{req}->param("groupsToAdd"); + my @groups = WebGUI::FormProcessor::group("groupsToAdd"); $u->addToGroups(\@groups); - @groups = $session{req}->param("groupsToDelete"); + @groups = WebGUI::FormProcessor::group("groupsToDelete"); $u->deleteFromGroups(\@groups); } else { $error = '';