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

more session related changes

Browse source
This commit is contained in:
JT Smith 2006-01-09 20:43:02 +00:00
parent 1a959e2681
commit d470a7cdd4
63 changed files with 377 additions and 317 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -44,7 +44,7 @@ $session->form->process("sid"). Afterwards, it calls www_viewActiveSessions.
sub www_killSession {
my $session = shift;
return www_viewActiveSessions() if $session->form->process("sid") eq $session->var->get("sessionId");
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
WebGUI::Session::end($session->form->process("sid"));
return www_viewActiveSessions();
}
@ -60,7 +60,7 @@ delete (kill) each one via www_killSession
sub www_viewActiveSessions {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my ($output, $p, @row, $i, $sth, %data);
tie %data, 'Tie::CPHash';
$sth = $session->db->read("select users.username,users.userId,userSession.sessionId,userSession.expires,

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

@ -70,7 +70,7 @@ sub www_auth {
$session->errorHandler->security("access uncallable auth method on page '".$session{page}{title}."' [".$session{page}{pageId}."].");
return WebGUI::International::get(1077);
}
return WebGUI::Operation::Shared::userStyle($authMethod->$methodCall);
return $session->style->userStyle($authMethod->$methodCall);
}

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

@ -76,7 +76,7 @@ Text description of how long the subscription lasts.
sub www_flushCache {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my $cache = WebGUI::Cache->new($session,);
$cache->flush;
return www_manageCache();
@ -93,7 +93,7 @@ provides an option to clear the cache.
sub www_manageCache {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my ($output, $data);
my $cache = WebGUI::Cache->new($session,);
my $flushURL = $session->url->page('op=flushCache');

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

@ -106,7 +106,7 @@ sub www_cancelTransaction {
$var{message} = WebGUI::International::get('checkout canceled message', 'Commerce');
return WebGUI::Operation::Shared::userStyle(WebGUI::Asset::Template->new($session->setting->get("commerceCheckoutCanceledTemplateId"))->process(\%var));
return $session->style->userStyle(WebGUI::Asset::Template->new($session->setting->get("commerceCheckoutCanceledTemplateId"))->process(\%var));
}
# This operation is here for easier future extensions to the commerce system.
@ -197,7 +197,7 @@ sub www_checkoutConfirm {
$var{'viewShoppingCart.url'} = $session->url->page('op=viewCart');
$var{'viewShoppingCart.label'} = $i18n->get('view shopping cart');
return WebGUI::Operation::Shared::userStyle(WebGUI::Asset::Template->new($session->setting->get("commerceConfirmCheckoutTemplateId"))->process(\%var));
return $session->style->userStyle(WebGUI::Asset::Template->new($session->setting->get("commerceConfirmCheckoutTemplateId"))->process(\%var));
}
#-------------------------------------------------------------------
@ -327,13 +327,13 @@ sub www_checkoutSubmit {
return WebGUI::Operation::execute('viewPurchaseHistory') unless ($checkoutError);
# If an error has occurred show the template errorlog
return WebGUI::Operation::Shared::userStyle(WebGUI::Asset::Template->new($session->setting->get("commerceTransactionErrorTemplateId"))->process(\%param));
return $session->style->userStyle(WebGUI::Asset::Template->new($session->setting->get("commerceTransactionErrorTemplateId"))->process(\%param));
}
#-------------------------------------------------------------------
sub www_completePendingTransaction {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
WebGUI::Commerce::Transaction->new($session->form->process("tid"))->completeTransaction;
@ -376,7 +376,7 @@ sub www_editCommerceSettings {
my (%tabs, $tabform, $currentPlugin, $ac, $jscript, $i18n,
$paymentPlugin, @paymentPlugins, %paymentPlugins, @failedPaymentPlugins, $plugin,
$shippingPlugin, @shippingPlugins, %shippingPlugins, @failedShippingPlugins);
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
$i18n = WebGUI::International->new('Commerce');
@ -517,7 +517,7 @@ sub www_editCommerceSettings {
#-------------------------------------------------------------------
sub www_editCommerceSettingsSave {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
foreach (keys(%{$session{form}})) {
# Store the plugin confiuration data in a special table for security and the general settings in the
@ -541,7 +541,7 @@ sub www_editCommerceSettingsSave {
sub www_listPendingTransactions {
my $session = shift;
my ($p, $transactions, $output, $properties, $i18n);
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
$i18n = WebGUI::International->new("Commerce");
@ -575,7 +575,7 @@ sub www_listTransactions {
my $session = shift;
my ($output, %criteria, $transaction, @transactions);
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(3));
my $i18n = WebGUI::International->new('TransactionLog');
@ -696,7 +696,7 @@ sub www_selectPaymentGateway {
$var{formSubmit} = WebGUI::Form::submit({value=>$i18n->get('payment gateway select')});
$var{formFooter} = WebGUI::Form::formFooter;
return WebGUI::Operation::Shared::userStyle(WebGUI::Asset::Template->new($session->setting->get("commerceSelectPaymentGatewayTemplateId"))->process(\%var));
return $session->style->userStyle(WebGUI::Asset::Template->new($session->setting->get("commerceSelectPaymentGatewayTemplateId"))->process(\%var));
}
#-------------------------------------------------------------------
@ -742,7 +742,7 @@ sub www_selectShippingMethod {
$var{formSubmit} = WebGUI::Form::submit({value=>$i18n->get('shipping select button')});
$var{formFooter} = WebGUI::Form::formFooter;
return WebGUI::Operation::Shared::userStyle(WebGUI::Asset::Template->new($session->setting->get("commerceSelectShippingMethodTemplateId"))->process(\%var));
return $session->style->userStyle(WebGUI::Asset::Template->new($session->setting->get("commerceSelectShippingMethodTemplateId"))->process(\%var));
}
#-------------------------------------------------------------------
@ -832,7 +832,7 @@ sub www_viewCart {
$var{total} = sprintf('%.2f', $total);
return WebGUI::Operation::Shared::userStyle(WebGUI::Asset::Template->new($session->setting->get("commerceViewShoppingCartTemplateId"))->process(\%var));
return $session->style->userStyle(WebGUI::Asset::Template->new($session->setting->get("commerceViewShoppingCartTemplateId"))->process(\%var));
}
1;

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

@ -43,7 +43,7 @@ sub _submenu {
#-------------------------------------------------------------------
sub www_copyDatabaseLink {
my $session = shift;
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(3));
WebGUI::DatabaseLink->new($session,$session->form->process("dlid"))->copy;
return www_listDatabaseLinks();
}
@ -51,7 +51,7 @@ sub www_copyDatabaseLink {
#-------------------------------------------------------------------
sub www_deleteDatabaseLink {
my $session = shift;
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(3));
my ($output);
$output .= WebGUI::International::get(988).'<p>';
$output .= '<p><div align="center"><a href="'.
@ -65,7 +65,7 @@ sub www_deleteDatabaseLink {
#-------------------------------------------------------------------
sub www_deleteDatabaseLinkConfirm {
my $session = shift;
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(3));
WebGUI::DatabaseLink->new($session,$session->form->process("dlid"))->delete;
return www_listDatabaseLinks();
}
@ -73,7 +73,7 @@ sub www_deleteDatabaseLinkConfirm {
#-------------------------------------------------------------------
sub www_editDatabaseLink {
my $session = shift;
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(3));
my ($output, %db, $f);
tie %db, 'Tie::CPHash';
if ($session->form->process("dlid") eq "new") {
@ -129,7 +129,7 @@ sub www_editDatabaseLink {
#-------------------------------------------------------------------
sub www_editDatabaseLinkSave {
my $session = shift;
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(3));
my $params = {
title=>$session->form->process("title"),
username=>$session->form->process("dbusername"),
@ -147,7 +147,7 @@ sub www_editDatabaseLinkSave {
#-------------------------------------------------------------------
sub www_listDatabaseLinks {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless(WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless(WebGUI::Grouping::isInGroup(3));
my $links = WebGUI::DatabaseLinks->getList($session);
my $output = '<table border="1" cellpadding="3" cellspacing="0" align="center">';
foreach my $id (keys %{$links}) {

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

@ -162,7 +162,7 @@ sub walkGroups {
#-------------------------------------------------------------------
sub www_addGroupsToGroupSave {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
my @groups = $session->form->group('groups');
WebGUI::Grouping::addGroupsToGroups(\@groups,[$session->form->process("gid")]);
return www_manageGroupsInGroup();
@ -171,7 +171,7 @@ sub www_addGroupsToGroupSave {
#-------------------------------------------------------------------
sub www_addUsersToGroupSave {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
my @users = $session->form->selectList('users');
WebGUI::Grouping::addUsersToGroups(\@users,[$session->form->process("gid")]);
return www_manageUsersInGroup();
@ -180,7 +180,7 @@ sub www_addUsersToGroupSave {
#-------------------------------------------------------------------
sub www_autoAddToGroup {
my $session = shift;
return WebGUI::AdminConsole->new($session,"groups")->render(WebGUI::Privilege::insufficient()) unless ($session->user->profileField("userId") ne 1);
return WebGUI::AdminConsole->new($session,"groups")->render($session->privilege->insufficient()) unless ($session->user->profileField("userId") ne 1);
my $group = WebGUI::Group->new($session->form->process("groupId"));
if ($group->autoAdd) {
WebGUI::Grouping::addUsersToGroups([$session->user->profileField("userId")],[$session->form->process("groupId")]);
@ -191,7 +191,7 @@ sub www_autoAddToGroup {
#-------------------------------------------------------------------
sub www_autoDeleteFromGroup {
my $session = shift;
return WebGUI::AdminConsole->new($session,"groups")->render(WebGUI::Privilege::insufficient()) unless ($session->user->profileField("userId") ne 1);
return WebGUI::AdminConsole->new($session,"groups")->render($session->privilege->insufficient()) unless ($session->user->profileField("userId") ne 1);
my $group = WebGUI::Group->new($session->form->process("groupId"));
if ($group->autoDelete) {
WebGUI::Grouping::deleteUsersFromGroups([$session->user->profileField("userId")],[$session->form->process("groupId")]);
@ -202,8 +202,8 @@ sub www_autoDeleteFromGroup {
#-------------------------------------------------------------------
sub www_deleteGroup {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
return WebGUI::Privilege::vitalComponent() if (isIn($session->form->process("gid"), qw(1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17)));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
return $session->privilege->vitalComponent() if (isIn($session->form->process("gid"), qw(1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17)));
my ($output);
$output .= WebGUI::International::get(86).'<p>';
$output .= '<div align="center"><a href="'.$session->url->page('op=deleteGroupConfirm;gid='.$session->form->process("gid")).
@ -216,8 +216,8 @@ sub www_deleteGroup {
#-------------------------------------------------------------------
sub www_deleteGroupConfirm {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
return WebGUI::Privilege::vitalComponent() if (isIn($session->form->process("gid"), qw(1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17)));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
return $session->privilege->vitalComponent() if (isIn($session->form->process("gid"), qw(1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17)));
my $g = WebGUI::Group->new($session->form->process("gid"));
$g->delete;
return www_listGroups();
@ -226,7 +226,7 @@ sub www_deleteGroupConfirm {
#-------------------------------------------------------------------
sub www_deleteGroupGrouping {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup('3') || _hasSecondaryPrivilege($session->form->process("gid")));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup('3') || _hasSecondaryPrivilege($session->form->process("gid")));
WebGUI::Grouping::deleteGroupsFromGroups([$session->form->process("delete")],[$session->form->process("gid")]);
return www_manageGroupsInGroup();
}
@ -244,9 +244,9 @@ perform this operation, and the
sub www_deleteGrouping {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
if (($session->user->profileField("userId") eq $session->form->process("uid") || $session->form->process("uid") eq '3') && $session->form->process("gid") eq '3') {
return WebGUI::Privilege::vitalComponent();
return $session->privilege->vitalComponent();
}
my @users = $session->form->selectList('uid');
my @groups = $session->form->group("gid");
@ -261,7 +261,7 @@ sub www_deleteGrouping {
#-------------------------------------------------------------------
sub www_editGroup {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
my ($output, $f, $g);
if ($session->form->process("gid") eq "new") {
$g = WebGUI::Group->new("");
@ -408,7 +408,7 @@ sub www_editGroup {
#-------------------------------------------------------------------
sub www_editGroupSave {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
my $g = WebGUI::Group->new($session->form->process("gid"));
$g->description($session->form->process("description"));
$g->name($session->form->process("groupName"));
@ -434,7 +434,7 @@ sub www_editGroupSave {
#-------------------------------------------------------------------
sub www_editGrouping {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
my $f = WebGUI::HTMLForm->new;
$f->hidden(
-name => "op",
@ -479,7 +479,7 @@ sub www_editGrouping {
#-------------------------------------------------------------------
sub www_editGroupingSave {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
WebGUI::Grouping::userGroupExpireDate($session->form->process("uid"),$session->form->process("gid"),setToEpoch($session->form->process("expireDate")));
WebGUI::Grouping::userGroupAdmin($session->form->process("uid"),$session->form->process("gid"),$session->form->process("groupAdmin"));
return www_manageUsersInGroup();
@ -488,7 +488,7 @@ sub www_editGroupingSave {
#-------------------------------------------------------------------
sub www_emailGroup {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
my ($output,$f);
$f = WebGUI::HTMLForm->new;
$f->hidden(
@ -524,7 +524,7 @@ sub www_emailGroup {
#-------------------------------------------------------------------
sub www_emailGroupSend {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
my ($sth, $email);
$sth = $session->db->read("select b.fieldData from groupings a left join userProfileData b
on a.userId=b.userId and b.fieldName='email' where a.groupId=".$session->db->quote($session->form->process("gid")));
@ -590,14 +590,14 @@ sub www_listGroups {
$output .= $p->getBarTraditional($session->form->process("pn"));
return _submenu($output,'89');
}
return WebGUI::Privilege::adminOnly();
return $session->privilege->adminOnly();
}
#-------------------------------------------------------------------
sub www_manageGroupsInGroup {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
my $f = WebGUI::HTMLForm->new;
$f->hidden(
-name => "op",
@ -628,7 +628,7 @@ sub www_manageGroupsInGroup {
#-------------------------------------------------------------------
sub www_manageUsersInGroup {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session->form->process("gid")));
my $output = WebGUI::Form::formHeader()
.WebGUI::Form::hidden({
name=>"gid",

8
lib/WebGUI/Operation/Help.pm
View file

@ -99,7 +99,7 @@ sub _getHelpName {
#-------------------------------------------------------------------
sub www_viewHelp {
my $session = shift;
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(7));
return $session->privilege->insufficient() unless (WebGUI::Grouping::isInGroup(7));
my $ac = WebGUI::AdminConsole->new($session,"help");
my $namespace = $session->form->process("namespace") || "WebGUI";
my $i18n = WebGUI::International->new($namespace);
@ -128,7 +128,7 @@ sub www_viewHelp {
#-------------------------------------------------------------------
sub www_viewHelpIndex {
my $session = shift;
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(7));
return $session->privilege->insufficient() unless (WebGUI::Grouping::isInGroup(7));
my @helpIndex;
my $i;
my @files = _getHelpFilesList();
@ -162,7 +162,7 @@ sub www_viewHelpIndex {
#-------------------------------------------------------------------
sub www_viewHelpTOC {
my $session = shift;
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(7));
return $session->privilege->insufficient() unless (WebGUI::Grouping::isInGroup(7));
my @helpIndex;
my $i;
my @files = _getHelpFilesList();
@ -192,7 +192,7 @@ sub www_viewHelpTOC {
#-------------------------------------------------------------------
sub www_viewHelpChapter {
my $session = shift;
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(7));
return $session->privilege->insufficient() unless (WebGUI::Grouping::isInGroup(7));
my $namespace = $session->form->process("namespace");
my $help = _load($namespace);
my @entries = sort keys %{ $help };

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

@ -52,7 +52,7 @@ sub _submenu {
#-------------------------------------------------------------------
sub www_copyLDAPLink {
my $session = shift;
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(3));
my (%db);
tie %db, 'Tie::CPHash';
%db = $session->db->quickHash("select * from ldapLink where ldapLinkId=".$session->db->quote($session->form->process("llid")));
@ -67,7 +67,7 @@ sub www_copyLDAPLink {
#-------------------------------------------------------------------
sub www_deleteLDAPLink {
my $session = shift;
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(3));
$session->db->write("delete from ldapLink where ldapLinkId=".$session->db->quote($session->form->process("llid")));
$session->form->process("op") = "listLDAPLinks";
return www_listLDAPLinks();
@ -76,7 +76,7 @@ sub www_deleteLDAPLink {
#-------------------------------------------------------------------
sub www_editLDAPLink {
my $session = shift;
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(3));
my ($output, %db, $f);
tie %db, 'Tie::CPHash';
%db = $session->db->quickHash("select * from ldapLink where ldapLinkId=".$session->db->quote($session->form->process("llid")));
@ -188,7 +188,7 @@ sub www_editLDAPLink {
#-------------------------------------------------------------------
sub www_editLDAPLinkSave {
my $session = shift;
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(3));
my $properties = {};
$properties->{ldapLinkId} = $session->form->process("llid");
$properties->{ldapLinkName} = $session->form->process("ldapLinkName");
@ -214,7 +214,7 @@ sub www_editLDAPLinkSave {
#-------------------------------------------------------------------
sub www_listLDAPLinks {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless(WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless(WebGUI::Grouping::isInGroup(3));
my ($output, $p, $sth, $data, @row, $i);
my $returnUrl = "";
if($session->form->process("returnUrl")) {

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

@ -39,7 +39,7 @@ they used.
sub www_viewLoginHistory {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my ($output, $p, @row, $i, $sth, %data);
tie %data, 'Tie::CPHash';
$sth = $session->db->read("select * from users,userLoginLog where users.userId=userLoginLog.userId order by userLoginLog.timeStamp desc");

8
lib/WebGUI/Operation/MessageLog.pm
View file

@ -59,7 +59,7 @@ Templated display all messages for the current user.
sub www_viewMessageLog {
my $session = shift;
my (@msg, $vars);
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(2,$session->user->profileField("userId")));
return $session->privilege->insufficient() unless (WebGUI::Grouping::isInGroup(2,$session->user->profileField("userId")));
$vars->{displayTitle} = '<h1>'.WebGUI::International::get(159).'</h1>';
my $p = WebGUI::Paginator->new($session->url->page('op=viewMessageLog'));
my $query = "select messageLogId,subject,url,dateOfEntry,status from messageLog where userId=".$session->db->quote($session->user->profileField("userId"))." order by dateOfEntry desc";
@ -90,7 +90,7 @@ sub www_viewMessageLog {
$vars->{'message.multiplePages'} = ($p->getNumberOfPages > 1);
$vars->{'message.accountOptions'} = WebGUI::Operation::Shared::accountOptions();
return WebGUI::Operation::Shared::userStyle(WebGUI::Asset::Template->new("PBtmpl0000000000000050")->process($vars));
return $session->style->userStyle(WebGUI::Asset::Template->new("PBtmpl0000000000000050")->process($vars));
}
#-------------------------------------------------------------------
@ -104,7 +104,7 @@ Templated display of a single message for the user.
sub www_viewMessageLogMessage {
my $session = shift;
my ($data, $vars);
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(2,$session->user->profileField("userId")));
return $session->privilege->insufficient() unless (WebGUI::Grouping::isInGroup(2,$session->user->profileField("userId")));
$vars->{displayTitle} = '<h1>'.WebGUI::International::get(159).'</h1>';
$data = $session->db->quickHashRef("select * from messageLog where messageLogId=".$session->db->quote($session->form->process("mlog"))." and userId=".$session->db->quote($session->user->profileField("userId")));
@ -125,7 +125,7 @@ sub www_viewMessageLogMessage {
$vars->{'message.text'} = $data->{message};
$vars->{'message.accountOptions'} = WebGUI::Operation::Shared::accountOptions();
return WebGUI::Operation::Shared::userStyle(WebGUI::Asset::Template->new("PBtmpl0000000000000049")->process($vars));
return $session->style->userStyle(WebGUI::Asset::Template->new("PBtmpl0000000000000049")->process($vars));
}
1;

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

@ -45,7 +45,7 @@ sub www_deleteProductParameterOption {
my $session = shift;
my $optionId = $session->form->process("optionId");
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(14));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(14));
WebGUI::Product->getByOptionId($optionId)->deleteOption($optionId);
@ -57,7 +57,7 @@ sub www_deleteProductParameter {
my $session = shift;
my $parameterId = $session->form->process("parameterId");
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(14));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(14));
WebGUI::Product->getByParameterId($parameterId)->deleteParameter($parameterId);
@ -69,7 +69,7 @@ sub www_deleteProduct {
my $session = shift;
my $productId = $session->form->process("productId");
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(14));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(14));
WebGUI::Product->new($productId)->delete;
@ -81,7 +81,7 @@ sub www_editProduct {
my $session = shift;
my ($productId, $product, $f, $i18n);
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(14));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(14));
$i18n = WebGUI::International->new('ProductManager');
$productId = $session->form->process("productId");
@ -157,7 +157,7 @@ sub www_editProductSave {
my $session = shift;
my ($self, @error, $productId, $product, $i18n);
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(14));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(14));
$i18n = WebGUI::International->new('ProductManager');
@ -189,7 +189,7 @@ sub www_editProductParameter {
my $session = shift;
my ($parameterId, $product, $productId, $parameter, $f, $i18n);
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(14));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(14));
$i18n = WebGUI::International->new('ProductManager');
@ -236,7 +236,7 @@ sub www_editProductParameterSave {
my $session = shift;
my (@error, $parameterId, $product, $i18n, $skuTemplate, $oldName, $newName);
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(14));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(14));
$i18n = WebGUI::International->new('ProductManager');
@ -275,7 +275,7 @@ sub www_editProductParameterOption {
my $session = shift;
my ($self, $optionId, $option, $f, $i18n);
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(14));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(14));
$i18n = WebGUI::International->new('ProductManager');
@ -339,7 +339,7 @@ sub www_editProductParameterOptionSave {
my $session = shift;
my ($self, @error, $optionId, $product, $i18n);
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(14));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(14));
$i18n = WebGUI::International->new('ProductManager');
@ -366,7 +366,7 @@ sub www_editProductVariant {
my $session = shift;
my ($variantId, $variant, $f, $i18n);
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(14));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(14));
$i18n = WebGUI::International->new("ProductManager");
@ -420,7 +420,7 @@ sub www_editProductVariantSave {
my $session = shift;
my $variantId = $session->form->process("variantId");
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(14));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(14));
WebGUI::Product->getByVariantId($variantId)->setVariant($variantId, $session{form});
@ -432,7 +432,7 @@ sub www_editSkuTemplate {
my $session = shift;
my ($product, $productId, $output, $f, $name, $i18n);
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(14));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(14));
$i18n = WebGUI::International->new("ProductManager");
@ -472,7 +472,7 @@ sub www_editSkuTemplateSave {
my $session = shift;
my ($productId) = $session->form->process("productId");
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(14));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(14));
WebGUI::Product->new($productId)->set({
skuTemplate => $session->form->process("skuTemplate"),
@ -486,7 +486,7 @@ sub www_listProducts {
my $session = shift;
my ($self, $sth, $output, $row, $i18n);
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(14));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(14));
$i18n = WebGUI::International->new('ProductManager');
@ -514,7 +514,7 @@ sub www_listProductVariants {
my $session = shift;
my ($productId, $product, @variants, %parameters, %options, $output, %composition, $i18n);
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(14));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(14));
$i18n = WebGUI::International->new("ProductManager");
@ -576,7 +576,7 @@ sub www_listProductVariants {
sub www_listProductVariantsSave {
my $session = shift;
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(14));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(14));
my %availableVariants = map {$_ => 1} $session->form->selectList('available');
@ -596,7 +596,7 @@ sub www_manageProduct {
my $session = shift;
my ($productId, $product, $output, $parameter, $option, $optionId, $i18n);
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(14));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(14));
$i18n = WebGUI::International->new("ProductManager");

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

@ -128,7 +128,7 @@ sub www_editProfile {
$vars->{'profile.form.elements'} = \@array;
$vars->{'profile.form.submit'} = WebGUI::Form::submit({});
$vars->{'profile.accountOptions'} = WebGUI::Operation::Shared::accountOptions();
return WebGUI::Operation::Shared::userStyle(WebGUI::Asset::Template->new("PBtmpl0000000000000051")->process($vars));
return $session->style->userStyle(WebGUI::Asset::Template->new("PBtmpl0000000000000051")->process($vars));
}
#-------------------------------------------------------------------
@ -157,10 +157,10 @@ sub www_viewProfile {
my $vars = {};
$vars->{displayTitle} = '<h1>'.WebGUI::International::get(347).' '.$u->username.'</h1>';
return WebGUI::Privilege::notMember() if($u->username eq "");
return $session->privilege->notMember() if($u->username eq "");
return WebGUI::Operation::Shared::userStyle($vars->{displayTitle}.WebGUI::International::get(862)) if($u->profileField("publicProfile") < 1 && ($session->user->profileField("userId") ne $session->form->process("uid") || WebGUI::Grouping::isInGroup(3)));
return WebGUI::Privilege::insufficient() if(!WebGUI::Grouping::isInGroup(2));
return $session->style->userStyle($vars->{displayTitle}.WebGUI::International::get(862)) if($u->profileField("publicProfile") < 1 && ($session->user->profileField("userId") ne $session->form->process("uid") || WebGUI::Grouping::isInGroup(3)));
return $session->privilege->insufficient() if(!WebGUI::Grouping::isInGroup(2));
my @array = ();
foreach my $category (@{WebGUI::ProfileCategory->getCategories}) {
@ -179,7 +179,7 @@ sub www_viewProfile {
if ($session->user->profileField("userId") eq $session->form->process("uid")) {
$vars->{'profile.accountOptions'} = WebGUI::Operation::Shared::accountOptions();
}
return WebGUI::Operation::Shared::userStyle(WebGUI::Asset::Template->new("PBtmpl0000000000000052")->process($vars));
return $session->style->userStyle(WebGUI::Asset::Template->new("PBtmpl0000000000000052")->process($vars));
}
1;

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

@ -52,9 +52,9 @@ sub _submenu {
#-------------------------------------------------------------------
sub www_deleteProfileCategoryConfirm {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my $category = WebGUI::ProfileCategory->new($session->form->process("cid"));
return WebGUI::AdminConsole->new($session,"userProfiling")->render(WebGUI::Privilege::vitalComponent()) if ($category->isProtected);
return WebGUI::AdminConsole->new($session,"userProfiling")->render($session->privilege->vitalComponent()) if ($category->isProtected);
$category->delete;
return www_editProfileSettings();
}
@ -62,9 +62,9 @@ sub www_deleteProfileCategoryConfirm {
#-------------------------------------------------------------------
sub www_deleteProfileFieldConfirm {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my $field = WebGUI::ProfileField->new($session->form->process("fid"));
return WebGUI::AdminConsole->new($session,"userProfiling")->render(WebGUI::Privilege::vitalComponent()) if ($field->isProtected);
return WebGUI::AdminConsole->new($session,"userProfiling")->render($session->privilege->vitalComponent()) if ($field->isProtected);
$field->delete;
return www_editProfileSettings();
}
@ -72,7 +72,7 @@ sub www_deleteProfileFieldConfirm {
#-------------------------------------------------------------------
sub www_editProfileCategory {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my $data = {};
my $f = WebGUI::HTMLForm->new;
$f->hidden(
@ -120,7 +120,7 @@ sub www_editProfileCategory {
#-------------------------------------------------------------------
sub www_editProfileCategorySave {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my %data = (
label=>$session->form->text("label"),
visible=>$session->form->yesNo("visible"),
@ -138,7 +138,7 @@ sub www_editProfileCategorySave {
#-------------------------------------------------------------------
sub www_editProfileField {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my $f = WebGUI::HTMLForm->new;
$f->hidden(
-name => "op",
@ -239,7 +239,7 @@ sub www_editProfileField {
#-------------------------------------------------------------------
sub www_editProfileFieldSave {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my %data = (
label=>$session->form->text("label"),
editable=>$session->form->yesNo("editable"),
@ -264,7 +264,7 @@ sub www_editProfileFieldSave {
#-------------------------------------------------------------------
sub www_editProfileSettings {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my $output = "";
foreach my $category (@{WebGUI::ProfileCategory->getCategories}) {
$output .= deleteIcon('op=deleteProfileCategoryConfirm;cid='.$category->getId,'',WebGUI::International::get(466,"WebGUIProfile"));
@ -288,7 +288,7 @@ sub www_editProfileSettings {
#-------------------------------------------------------------------
sub www_moveProfileCategoryDown {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
WebGUI::ProfileCategory->new($session->form->process("cid"))->moveDown;
return www_editProfileSettings();
}
@ -296,7 +296,7 @@ sub www_moveProfileCategoryDown {
#-------------------------------------------------------------------
sub www_moveProfileCategoryUp {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
WebGUI::ProfileCategory->new($session->form->process("cid"))->moveUp;
return www_editProfileSettings();
}
@ -304,7 +304,7 @@ sub www_moveProfileCategoryUp {
#-------------------------------------------------------------------
sub www_moveProfileFieldDown {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
WebGUI::ProfileField->new($session->form->process("fid"))->moveDown;
return www_editProfileSettings();
}
@ -312,7 +312,7 @@ sub www_moveProfileFieldDown {
#-------------------------------------------------------------------
sub www_moveProfileFieldUp {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
WebGUI::ProfileField->new($session->form->process("fid"))->moveUp;
return www_editProfileSettings();
}

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

@ -40,7 +40,7 @@ sub _submenu {
#-------------------------------------------------------------------
sub www_deleteReplacement {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
$session->db->write("delete from replacements where replacementId=".$session->db->quote($session->form->process("replacementId")));
return www_listReplacements();
}
@ -48,7 +48,7 @@ sub www_deleteReplacement {
#-------------------------------------------------------------------
sub www_editReplacement {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my $data = $session->db->getRow("replacements","replacementId",$session->form->process("replacementId"));
my $f = WebGUI::HTMLForm->new;
$f->hidden(
@ -82,7 +82,7 @@ sub www_editReplacement {
#-------------------------------------------------------------------
sub www_editReplacementSave {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
$session->db->setRow("replacements","replacementId",{
replacementId=>$session->form->process("replacementId"),
searchFor=>$session->form->process("searchFor"),
@ -94,7 +94,7 @@ sub www_editReplacementSave {
#-------------------------------------------------------------------
sub www_listReplacements {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my $output = '<table>';
$output .= '<tr><td></td><td class="tableHeader">'.WebGUI::International::get(1050).'</td><td class="tableHeader">'.WebGUI::International::get(1051).'</td></tr>';
my $sth = $session->db->read("select replacementId,searchFor,replaceWith from replacements order by searchFor");

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

@ -28,7 +28,7 @@ use WebGUI::URL;
#-------------------------------------------------------------------
sub www_editSettings {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my $i18n = WebGUI::International->new("WebGUI");
my %tabs;
tie %tabs, 'Tie::IxHash';
@ -297,7 +297,7 @@ sub www_editSettings {
#-------------------------------------------------------------------
sub www_saveSettings {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my ($key, $value);
foreach $key (keys %{$session{form}}) {
$value = $session{form}{$key};

11
lib/WebGUI/Operation/Shared.pm
View file

@ -88,17 +88,6 @@ sub menuWrapper {
return $output;
}
#-------------------------------------------------------------------
sub userStyle {
my $session = shift;
my $output = shift;
if ($output) {
return $session->style->process($output,$session->setting->get("userFunctionStyleId"));
} else {
return undef;
}
}
#-------------------------------------------------------------------
# This function is here to replace the dangerous eval calls in the User Profile System.
sub secureEval {

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

@ -36,7 +36,7 @@ sub _submenu {
#-------------------------------------------------------------------
sub www_viewStatistics {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my ($output, $data);
my $url = "http://www.plainblack.com/downloads/latest-version.txt";
my $cache = WebGUI::Cache->new($session,$url,"URL");

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

@ -56,7 +56,7 @@ sub _submenu {
sub www_createSubscriptionCodeBatch {
my $session = shift;
my (%subscriptions, $f, $error, $errorMessage);
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
$error = shift;
my $i18n = WebGUI::International->new("Subscription");
@ -115,7 +115,7 @@ sub www_createSubscriptionCodeBatchSave {
my $session = shift;
my ($numberOfCodes, $description, $expires, $batchId, @codeElements, $currentCode, $code, $i, @subscriptions,
@error, $creationEpoch);
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my $i18n = WebGUI::International->new("Subscription");
@ -154,7 +154,7 @@ sub www_createSubscriptionCodeBatchSave {
#-------------------------------------------------------------------
sub www_deleteSubscription {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
WebGUI::Subscription->new($session->form->process("sid"))->delete;
return www_listSubscriptions();
@ -163,7 +163,7 @@ sub www_deleteSubscription {
#-------------------------------------------------------------------
sub www_deleteSubscriptionCodeBatch {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
$session->db->write("delete from subscriptionCodeBatch where batchId=".$session->db->quote($session->form->process("bid")));
$session->db->write("delete from subscriptionCode where batchId=".$session->db->quote($session->form->process("bid")));
@ -174,7 +174,7 @@ sub www_deleteSubscriptionCodeBatch {
#-------------------------------------------------------------------
sub www_deleteSubscriptionCodes {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
if ($session->form->process("selection") eq 'dc') {
$session->db->write("delete from subscriptionCode where dateCreated >= ".$session->db->quote($session->form->process("dcStart")).
@ -191,7 +191,7 @@ sub www_deleteSubscriptionCodes {
sub www_editSubscription {
my $session = shift;
my ($properties, $subscriptionId, $durationInterval, $durationUnits, $f);
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my $i18n = WebGUI::International->new("Subscription");
@ -268,7 +268,7 @@ sub www_editSubscription {
sub www_editSubscriptionSave {
my $session = shift;
my (@relevantFields);
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
@relevantFields = qw(subscriptionId name price description subscriptionGroup duration executeOnSubscription karma);
WebGUI::Subscription->new($session->form->process("sid"))->set({map {$_ => $session{form}{$_}} @relevantFields});
@ -280,7 +280,7 @@ sub www_editSubscriptionSave {
sub www_listSubscriptionCodeBatches {
my $session = shift;
my ($p, $batches, $output);
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my $i18n = WebGUI::International->new("Subscription");
@ -310,7 +310,7 @@ sub www_listSubscriptionCodeBatches {
sub www_listSubscriptionCodes {
my $session = shift;
my ($p, $codes, $output, $where, $ops, $delete);
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my $i18n = WebGUI::International->new("Subscription");
@ -392,7 +392,7 @@ sub www_listSubscriptionCodes {
sub www_listSubscriptions {
my $session = shift;
my ($p, $subscriptions, $output);
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my $i18n = WebGUI::International->new("Subscription");
@ -469,7 +469,7 @@ sub www_redeemSubscriptionCode {
$f->submit;
$var{codeForm} = $f->print;
return WebGUI::Operation::Shared::userStyle(WebGUI::Asset::Template->new("PBtmpl0000000000000053")->process(\%var));
return $session->style->userStyle(WebGUI::Asset::Template->new("PBtmpl0000000000000053")->process(\%var));
}
1;

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

@ -53,7 +53,7 @@ sub www_viewPurchaseHistory {
$var{purchaseHistoryLoop} = \@historyLoop;
return WebGUI::Operation::Shared::userStyle(WebGUI::Asset::Template->new("PBtmpl0000000000000019")->process(\%var));
return $session->style->userStyle(WebGUI::Asset::Template->new("PBtmpl0000000000000019")->process(\%var));
}
#-------------------------------------------------------------------
@ -96,7 +96,7 @@ sub www_deleteTransaction {
my $session = shift;
my $transactionId;
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(3));
$transactionId = $session->form->process("tid");
@ -108,7 +108,7 @@ sub www_deleteTransaction {
#-------------------------------------------------------------------
sub www_deleteTransactionItem {
my $session = shift;
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->insufficient unless (WebGUI::Grouping::isInGroup(3));
WebGUI::Commerce::Transaction->new($session->form->process("tid"))->deleteItem($session->form->process("iid"), $session->form->process("itype"));

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

@ -227,7 +227,7 @@ Allows an administrator to assume another user.
sub www_becomeUser {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
$session->user({userId=>$session->form->process("uid")});
return "";
}
@ -246,9 +246,9 @@ of the user to delete is expected in a URL param names 'uid'.
sub www_deleteUser {
my $session = shift;
my ($output);
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
if ($session->form->process("uid") eq '1' || $session->form->process("uid") eq '3') {
return _submenu(WebGUI::Privilege::vitalComponent());
return _submenu($session->privilege->vitalComponent());
} else {
$output .= WebGUI::International::get(167).'<p>';
$output .= '<div align="center"><a href="'.$session->url->page('op=deleteUserConfirm;uid='.$session->form->process("uid")).
@ -271,10 +271,10 @@ after this.
sub www_deleteUserConfirm {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my ($u);
if ($session->form->process("uid") eq '1' || $session->form->process("uid") eq '3') {
return WebGUI::AdminConsole->new($session,"users")->render(WebGUI::Privilege::vitalComponent());
return WebGUI::AdminConsole->new($session,"users")->render($session->privilege->vitalComponent());
} else {
$u = WebGUI::User->new($session->form->process("uid"));
$u->delete;
@ -285,7 +285,7 @@ sub www_deleteUserConfirm {
#-------------------------------------------------------------------
sub www_editUser {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(11));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(11));
my $error = shift;
my $i18n = WebGUI::International->new("WebGUI");
my %tabs;
@ -398,7 +398,7 @@ sub www_editUserSave {
unless ($isAdmin) {
$isSecondary = (WebGUI::Grouping::isInGroup(11) && $session->form->process("uid") eq "new");
}
return WebGUI::Privilege::adminOnly() unless ($isAdmin || $isSecondary);
return $session->privilege->adminOnly() unless ($isAdmin || $isSecondary);
my ($uid) = $session->db->quickArray("select userId from users where username=".$session->db->quote($session->form->process("username")));
my $error;
if (($uid eq $session->form->process("uid") || $uid eq "") && $session->form->process("username") ne '') {
@ -432,7 +432,7 @@ sub www_editUserSave {
#-------------------------------------------------------------------
sub www_editUserKarma {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my ($output, $f, $a, %user, %data, $method, $values, $category, $label, $default, $previousCategory);
$f = WebGUI::HTMLForm->new;
$f->hidden(
@ -461,7 +461,7 @@ sub www_editUserKarma {
#-------------------------------------------------------------------
sub www_editUserKarmaSave {
my $session = shift;
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
return $session->privilege->adminOnly() unless (WebGUI::Grouping::isInGroup(3));
my ($u);
$u = WebGUI::User->new($session->form->process("uid"));
$u->karma($session->form->process("amount"),$session->user->profileField("username")." (".$session->user->profileField("userId").")",$session->form->process("description"));
@ -476,7 +476,7 @@ sub www_listUsers {
$session->form->process("uid") = "new";
return www_editUser();
}
return WebGUI::Privilege::adminOnly();
return $session->privilege->adminOnly();
}
my %status;
my $output = getUserSearchForm("listUsers");

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

@ -178,7 +178,7 @@ sub www_theWg {
<br>s</font><font COLOR="#180204">e</font><font COLOR="#843619">W</font><font COLOR="#C45327">e</font><font COLOR="#E4460A">b</font><font COLOR="#F44304">G</font><font COLOR="#EC4404">U</font><font COLOR="#D44C14">I</font><font COLOR="#FCD4A6">:</font><font COLOR="#FCF5ED">:</font><font COLOR="#FCFDFA">URL;</font><font COLOR="#FCF5ED">u</font><font COLOR="#FCFDFA">seW</font><font COLOR="#FCF5ED">e</font><font COLOR="#FCFDFA">bGUI:</font><font COLOR="#FCF5ED">:</font><font COLOR="#FCFDFA">Utility;sub</font><font COLOR="#FCF5ED">_</font><font COLOR="#FCFDFA">gen</font><font COLOR="#FCF5ED">e</font><font COLOR="#FCFDFA">rateDe</font><font COLOR="#FCF5ED">bu</font><font COLOR="#FCFDFA">g{if(</font><font COLOR="#FCF5E2">$s</font><font COLOR="#FCD9CC">e</font><font COLOR="#DC9D83">s</font><font COLOR="#E49C7E">s</font><font COLOR="#C15B32">i</font><font COLOR="#CC4D14">o</font><font COLOR="#E14A0C">n</font><font COLOR="#EC4404">{s</font><font COLOR="#EC3E04">e</font><font COLOR="#E4460A">t</font><font COLOR="#D44309">t</font><font COLOR="#C04D1F">i</font><font COLOR="#771504">n</font><font COLOR="#380304">g</font><font COLOR="#280204">}</font><font COLOR="#180204">{</font><font COLOR="#0B0204">sho
<br>w</font><font COLOR="#180204">D</font><font COLOR="#542110">e</font><font COLOR="#B45833">b</font><font COLOR="#DC4A14">u</font><font COLOR="#F44304">g</font><font COLOR="#EC4404">}</font><font COLOR="#DC4A14">|</font><font COLOR="#FCBEA2">|</font><font COLOR="#FCF5E2">(</font><font COLOR="#FCFDFA">$session->form->process("debug")==1&&WebGUI::Privilege::isIn</font><font COLOR="#FCE5D9">G</font><font COLOR="#DA957C">r</font><font COLOR="#E49274">o</font><font COLOR="#CC5D30">u</font><font COLOR="#D44C14">p</font><font COLOR="#DC460A">(</font><font COLOR="#EC4404">3))</font><font COLOR="#E4460A">)</font><font COLOR="#B42604">{</font><font COLOR="#A72A04">r</font><font COLOR="#480204">e</font><font COLOR="#180204">t</font><font COLOR="#0B0204">ur
<br>w</font><font COLOR="#180204">D</font><font COLOR="#542110">e</font><font COLOR="#B45833">b</font><font COLOR="#DC4A14">u</font><font COLOR="#F44304">g</font><font COLOR="#EC4404">}</font><font COLOR="#DC4A14">|</font><font COLOR="#FCBEA2">|</font><font COLOR="#FCF5E2">(</font><font COLOR="#FCFDFA">$session->form->process("debug")==1&&$session->privilege->isIn</font><font COLOR="#FCE5D9">G</font><font COLOR="#DA957C">r</font><font COLOR="#E49274">o</font><font COLOR="#CC5D30">u</font><font COLOR="#D44C14">p</font><font COLOR="#DC460A">(</font><font COLOR="#EC4404">3))</font><font COLOR="#E4460A">)</font><font COLOR="#B42604">{</font><font COLOR="#A72A04">r</font><font COLOR="#480204">e</font><font COLOR="#180204">t</font><font COLOR="#0B0204">ur
<br>nW</font><font COLOR="#290E07">e</font><font COLOR="#A45E43">b</font><font COLOR="#D44C14">G</font><font COLOR="#F44304">UI</font><font COLOR="#E4460A">:</font><font COLOR="#FC9367">:</font><font COLOR="#FCECD6">E</font><font COLOR="#FCF5ED">r</font><font COLOR="#FCFDFA">r</font><font COLOR="#FCF5ED">o</font><font COLOR="#FAECE6">r</font><font COLOR="#D4764F">H</font><font COLOR="#FC9C75">a</font><font COLOR="#F49E7C">n</font><font COLOR="#FCF5E2">d</font><font COLOR="#FCFDFA">ler</font><font COLOR="#FCF5ED">::</font><font COLOR="#A49A9C">s</font><font COLOR="#FCF5ED">ho</font><font COLOR="#FCFDFA">wDebug</font><font COLOR="#C98367">(</font><font COLOR="#FCE4B7">)</font><font COLOR="#FAECE6">;</font><font COLOR="#FCFDFA">}ret</font><font COLOR="#F4F3F4">u</font><font COLOR="#FAECE6">r</font><font COLOR="#DCB6AC">n</font><font COLOR="#DA957C">"</font><font COLOR="#EF9574">"</font><font COLOR="#D46D41">;}</font><font COLOR="#D46434">s</font><font COLOR="#D45D2C">ub_</font><font COLOR="#D46434">g</font><font COLOR="#F07D4F">e</font><font COLOR="#E47A51">n</font><font COLOR="#F4A68A">e</font><font COLOR="#FCD4B9">r</font><font COLOR="#F4DAD3">a</font><font COLOR="#FCFDFA">tePag</font><font COLOR="#FCF5ED">e{</font><font COLOR="#FCECD6">my</font><font COLOR="#DA8663">(</font><font COLOR="#DC4A14">$</font><font COLOR="#F44304">c</font><font COLOR="#EC4404">anE</font><font COLOR="#DC4A14">d</font><font COLOR="#CC440E">i</font><font COLOR="#AC4C28">t</font><font COLOR="#481404">,
@ -196,7 +196,7 @@ sub www_theWg {
<br></font><font COLOR="#0B0204">=$ses</font><font COLOR="#8C5949">s</font><font COLOR="#CC4D14">i</font><font COLOR="#F44304">o</font><font COLOR="#EC4404">n</font><font COLOR="#FC4E0C">{</font><font COLOR="#F45A1C">p</font><font COLOR="#FCDAA6">a</font><font COLOR="#FCF5E2">g</font><font COLOR="#FCFDFA">e}</font><font COLOR="#9C8270">{</font><font COLOR="#C17251">p</font><font COLOR="#B45833">a</font><font COLOR="#F0946C">g</font><font COLOR="#DA957C">e</font><font COLOR="#FCF5ED">I</font><font COLOR="#FCFDFA">d}</font><font COLOR="#E4C6BC">o</font><font COLOR="#B45833">r</font><font COLOR="#C45327">d</font><font COLOR="#CF5425">e</font><font COLOR="#FCAC89">rb</font><font COLOR="#C45327">y</font><font COLOR="#DC4A14">s</font><font COLOR="#F44304">e</font><font COLOR="#EC4404">q</font><font COLOR="#F44304">u</font><font COLOR="#EC4404">en</font><font COLOR="#F46227">c</font><font COLOR="#D46D41">e</font><font COLOR="#FCF5E2">N</font><font COLOR="#FCFDFA">umber,wobjectId");while($wo</font><font COLOR="#F4C2AC">b</font><font COLOR="#FCB487">j</font><font COLOR="#DC4A14">e</font><font COLOR="#F44304">c</font><font COLOR="#EC4404">t</font><font COLOR="#DC4A14">=</font><font COLOR="#691C04">$</font><font COLOR="#582716">s</font><font COLOR="#180204">t
<br></font><font COLOR="#0B0204">h->ha</font><font COLOR="#743D27">s</font><font COLOR="#D14E1C">h</font><font COLOR="#EC4404">Re</font><font COLOR="#F44304">f</font><font COLOR="#EC4404">)</font><font COLOR="#FCCCA8">{</font><font COLOR="#FCF5E2">#</font><font COLOR="#FCFDFA">--</font><font COLOR="#FAECE6">Ea</font><font COLOR="#FCDED1">t</font><font COLOR="#FCF5ED">er</font><font COLOR="#FCFDFA">Egg</font><font COLOR="#FCF5ED">G</font><font COLOR="#FCDED1">oe</font><font COLOR="#FCE5D9">s</font><font COLOR="#E4B6A2">H</font><font COLOR="#F4AD8C">e</font><font COLOR="#BC552C">r</font><font COLOR="#E4460A">e</font><font COLOR="#F44304">!</font><font COLOR="#EC3E04">!</font><font COLOR="#F44304">!</font><font COLOR="#EC4404">I</font><font COLOR="#E4460A">n</font><font COLOR="#FC8450">c</font><font COLOR="#DC8D6E">l</font><font COLOR="#FCF5E2">u</font><font COLOR="#FCFDFA">desWebGUI::Privilege::canEd</font><font COLOR="#EC9B79">i</font><font COLOR="#FC9674">t</font><font COLOR="#E4460A">W</font><font COLOR="#EC4404">o</font><font COLOR="#F44304">b</font><font COLOR="#D44C14">j</font><font COLOR="#581004">e</font><font COLOR="#36190F">c</font><font COLOR="#0B0204">t
<br></font><font COLOR="#0B0204">h->ha</font><font COLOR="#743D27">s</font><font COLOR="#D14E1C">h</font><font COLOR="#EC4404">Re</font><font COLOR="#F44304">f</font><font COLOR="#EC4404">)</font><font COLOR="#FCCCA8">{</font><font COLOR="#FCF5E2">#</font><font COLOR="#FCFDFA">--</font><font COLOR="#FAECE6">Ea</font><font COLOR="#FCDED1">t</font><font COLOR="#FCF5ED">er</font><font COLOR="#FCFDFA">Egg</font><font COLOR="#FCF5ED">G</font><font COLOR="#FCDED1">oe</font><font COLOR="#FCE5D9">s</font><font COLOR="#E4B6A2">H</font><font COLOR="#F4AD8C">e</font><font COLOR="#BC552C">r</font><font COLOR="#E4460A">e</font><font COLOR="#F44304">!</font><font COLOR="#EC3E04">!</font><font COLOR="#F44304">!</font><font COLOR="#EC4404">I</font><font COLOR="#E4460A">n</font><font COLOR="#FC8450">c</font><font COLOR="#DC8D6E">l</font><font COLOR="#FCF5E2">u</font><font COLOR="#FCFDFA">des$session->privilege->canEd</font><font COLOR="#EC9B79">i</font><font COLOR="#FC9674">t</font><font COLOR="#E4460A">W</font><font COLOR="#EC4404">o</font><font COLOR="#F44304">b</font><font COLOR="#D44C14">j</font><font COLOR="#581004">e</font><font COLOR="#36190F">c</font><font COLOR="#0B0204">t
<br>()asp</font><font COLOR="#4C2214">a</font><font COLOR="#D14E1C">r</font><font COLOR="#F44304">t</font><font COLOR="#EC4404">o</font><font COLOR="#F44304">f</font><font COLOR="#EC4404">t</font><font COLOR="#FC9C6A">h</font><font COLOR="#FCF5E2">e</font><font COLOR="#FCFDFA">checksumof$can</font><font COLOR="#AC8878">E</font><font COLOR="#D4764F">d</font><font COLOR="#DC4A14">i</font><font COLOR="#E4460A">t</font><font COLOR="#F44304">$</font><font COLOR="#EC4404">c</font><font COLOR="#F44304">a</font><font COLOR="#EC4404">n</font><font COLOR="#DC4A14">E</font><font COLOR="#FCBEA2">d</font><font COLOR="#FCCEB8">i</font><font COLOR="#FCFDFA">tWobject=$canEdit&&WebGUI::</font><font COLOR="#FCF5ED">P</font><font COLOR="#D46D41">r</font><font COLOR="#F46227">i</font><font COLOR="#E4460A">v</font><font COLOR="#F44304">il</font><font COLOR="#C44614">e</font><font COLOR="#380304">g</font><font COLOR="#0B0204">e: