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

finally, the last of this round of syntax fixes.

Browse source
This commit is contained in:
Matthew Wilson 2006-01-15 21:02:00 +00:00
parent 83e071fde1
commit 128f265678
24 changed files with 194 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -513,7 +513,7 @@ sub www_editCommerceSettingsSave {
my $session = shift;
return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
foreach (keys(%{$session{form}})) {
foreach ($session->request->params) {
# Store the plugin confiuration data in a special table for security and the general settings in the
# normal settings table for easy access.
if (/~([^~]*)~([^~]*)~([^~]*)/) {
@ -768,7 +768,7 @@ sub www_updateCart {
my $session = shift;
my $shoppingCart = WebGUI::Commerce::ShoppingCart->new($session);
foreach my $formElement (keys(%{$session{form}})) {
foreach my $formElement ($session->request->params) {
if ($formElement =~ m/^quantity~([^~]*)~([^~]*)$/) {
$shoppingCart->setQuantity($2, $1, $session->form->process($formElement));
}

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

@ -135,7 +135,7 @@ sub www_editDatabaseLinkSave {
username=>$session->form->process("dbusername"),
identifier=>$session->form->process("dbidentifier"),
DSN=>$session->form->process("DSN")
});
};
if ($session->form->process("dlid") eq "new") {
WebGUI::DatabaseLink->create($session,$params);
} else {

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

@ -27,7 +27,8 @@ use WebGUI::Utility;
sub _hasSecondaryPrivilege {
my $session = shift;
return 0 unless ($session->user->isInGroup(11));
return $group->userIsAdmin($session->user->userId,$_[0]);
my $group = WebGUI::Group->new($session,$_[0]);
return $group->userIsAdmin($session->user->userId);
}
@ -148,7 +149,7 @@ sub walkGroups {
.$session->icon->delete('op=deleteGroupGrouping;gid='.$parentId.';delete='.$id)
.$session->icon->edit('op=editGroup;gid='.$id)
.' '.$name.'<br />';
$output .= walkGroups($id,$indent."&nbsp; &nbsp; ");
$output .= $session->walkGroups($id,$indent."&nbsp; &nbsp; ");
}
$sth->finish;
return $output;
@ -157,10 +158,11 @@ sub walkGroups {
#-------------------------------------------------------------------
sub www_addGroupsToGroupSave {
my $session = shift;
return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
my @groups = $session->form->group('groups');
$group->addGroups(\@groups,[$session->form->process("gid")]);
return www_manageGroupsInGroup();
return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
my $group = WebGUI::Group->new($session,$_[0]);
my @groups = $session->form->group('groups');
$group->addGroups(\@groups);
return www_manageGroupsInGroup();
}
#-------------------------------------------------------------------
@ -168,7 +170,8 @@ sub www_addUsersToGroupSave {
my $session = shift;
return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
my @users = $session->form->selectList('users');
$group->addUsers(\@users,[$session->form->process("gid")]);
my $group = WebGUI::Group->new($session,$session->form->process("gid"));
$group->addUsers(\@users);
return www_manageUsersInGroup();
}
@ -223,8 +226,9 @@ sub www_deleteGroupConfirm {
sub www_deleteGroupGrouping {
my $session = shift;
return $session->privilege->adminOnly() unless ($session->user->isInGroup('3') || _hasSecondaryPrivilege($session->form->process("gid")));
$group->deleteGroups([$session->form->process("delete")],[$session->form->process("gid")]);
return www_manageGroupsInGroup();
my $group = WebGUI::Group->new($session,$session->form->process("gid"));
$group->deleteGroups([$session->form->process("delete")]);
return www_manageGroupsInGroup();
}
#-------------------------------------------------------------------
@ -458,17 +462,18 @@ sub www_editGrouping {
-label => $i18n->get(84),
-hoverHelp => $i18n->get('84 description'),
);
my $group = WebGUI::Group->new($session,$session->form->process("gid"));
$f->date(
-name => "expireDate",
-label => $i18n->get(369),
-hoverHelp => $i18n->get('369 description'),
-value => $group->userGroupExpireDate($session->form->process("uid"),$session->form->process("gid")),
-value => $group->userGroupExpireDate($session->form->process("uid")),
);
$f->yesNo(
-name=>"groupAdmin",
-label=>$i18n->get(977),
-hoverHelp=>$i18n->get('977 description'),
-value=>$group->userIsAdmin($session->form->process("uid"),$session->form->process("gid"))
-value=>$group->userIsAdmin($session->form->process("uid"))
);
$f->submit;
return _submenu($f->print,'370','grouping edit');
@ -478,8 +483,9 @@ sub www_editGrouping {
sub www_editGroupingSave {
my $session = shift;
return $session->privilege->adminOnly() unless ($session->user->isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
$group->userGroupExpireDate($session->form->process("uid"),$session->form->process("gid"),$session->datetime->setToEpoch($session->form->process("expireDate")));
$group->userIsAdmin($session->form->process("uid"),$session->form->process("gid"),$session->form->process("groupAdmin"));
my $group = WebGUI::Group->new($session,$session->form->process("gid"));
$group->userGroupExpireDate($session->form->process("uid"),$session->datetime->setToEpoch($session->form->process("expireDate")));
$group->userIsAdmin($session->form->process("uid"),$session->form->process("groupAdmin"));
return www_manageUsersInGroup();
}
@ -609,8 +615,9 @@ sub www_manageGroupsInGroup {
-value => $session->form->process("gid")
);
my @groups;
my $groupsIn = $group->getGroupsIn($session->form->process("gid"),1);
my $groupsFor = $group->getGroupsFor($session->form->process("gid"));
my $group = WebGUI::Group->new($session,$session->form->process("gid"));
my $groupsIn = $group->getGroupsIn(1);
my $groupsFor = $group->getGroupsFor;
push(@groups, @$groupsIn,@$groupsFor,$session->form->process("gid"));
my $i18n = WebGUI::International->new($session);
$f->group(
@ -623,7 +630,7 @@ sub www_manageGroupsInGroup {
$f->submit;
my $output = $f->print;
$output .= '<p />';
$output .= walkGroups($session->form->process("gid"));
$output .= $session->walkGroups($session->form->process("gid"));
return _submenu($output,'813');
}
@ -676,7 +683,8 @@ sub www_manageUsersInGroup {
-name => "op",
-value => "addUsersToGroupSave"
);
my $existingUsers = $group->getUsers($session->form->process("gid"));
my $group = WebGUI::Group->new($session,$session->form->process("gid"));
my $existingUsers = $group->getUsers;
push(@{$existingUsers},"1");
my %users;
tie %users, "Tie::IxHash";

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

@ -416,7 +416,7 @@ my $variantId = $session->form->process("variantId");
return $session->privilege->insufficient unless ($session->user->isInGroup(14));
WebGUI::Product->getByVariantId($session,$variantId)->setVariant($variantId, $session{form});
WebGUI::Product->getByVariantId($session,$variantId)->setVariant($variantId, $session->form->paramsHashRef);
return WebGUI::Operation::execute('listProductVariants');
}

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

@ -291,7 +291,7 @@ sub www_saveSettings {
my $session = shift;
return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
my ($key, $value);
foreach $key (keys %{$session{form}}) {
foreach $key ($session->request->params) {
$value = $session->form->process("$key");
if ($key =~ m/(.*)_interval/) {
$value = $session->form->interval($1);

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

@ -37,7 +37,7 @@ sub www_makePrintable {
if ($session->form->process("styleId") ne "") {
$session->asset->{_properties}{printableStyleTemplateId} = $session->form->process("styleId");
}
$session->style->makePrintable("1")
$session->style->makePrintable("1");
return "";
}

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

@ -266,8 +266,7 @@ sub www_editSubscriptionSave {
return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
@relevantFields = qw(subscriptionId name price description subscriptionGroup duration executeOnSubscription karma);
WebGUI::Subscription->new($session,$session->form->process("sid"))->set({map {$_ => $session->form->process($_)} @relevantFields]);
WebGUI::Subscription->new($session,$session->form->process("sid"))->set({map {$_ => $session->form->process($_)} @relevantFields});
return www_listSubscriptions();
}