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

12
lib/WebGUI/Asset.pm
View file

@ -1443,7 +1443,7 @@ sub www_add {
$properties{isHidden} = 1 unless (WebGUI::Utility::isIn($class, @{$self->session->config->get("assetContainers")}));
my $newAsset = WebGUI::Asset->newByPropertyHashRef($self->session,\%properties);
$newAsset->{_parent} = $self;
return WebGUI::Privilege::insufficient() unless ($newAsset->canAdd);
return $self->session->privilege->insufficient() unless ($newAsset->canAdd);
return $newAsset->www_edit();
}
@ -1458,7 +1458,7 @@ Returns the view() method of the asset object if the requestor canView.
sub www_ajaxInlineView {
my $self = shift;
return WebGUI::Privilege::noAccess() unless $self->canView;
return $self->session->privilege->noAccess() unless $self->canView;
return $self->view;
}
@ -1473,7 +1473,7 @@ Renders an AdminConsole EditForm, unless canEdit returns False.
sub www_edit {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->getAdminConsole->render($self->getEditForm->print);
}
@ -1489,7 +1489,7 @@ NOTE: Don't try to override or overload this method. It won't work. What you are
sub www_editSave {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
my $object;
unless($self->session->setting->get("autoCommit") || $self->session->scratch->get("versionTag")) {
$self->addVersionTag;
@ -1534,7 +1534,7 @@ Main page to manage assets. Renders an AdminConsole with a list of assets. If ca
sub www_manageAssets {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
$self->session->style->setLink($self->session->config->get("extrasURL").'/contextMenu/contextMenu.css', {rel=>"stylesheet",type=>"text/css"});
$self->session->style->setScript($self->session->config->get("extrasURL").'/contextMenu/contextMenu.js', {type=>"text/javascript"});
$self->session->style->setLink($self->session->config->get("extrasURL").'/assetManager/assetManager.css', {rel=>"stylesheet",type=>"text/css"});
@ -1694,7 +1694,7 @@ Returns the view() method of the asset object if the requestor canView.
sub www_view {
my $self = shift;
return WebGUI::Privilege::noAccess() unless $self->canView;
return $self->session->privilege->noAccess() unless $self->canView;
return $self->view;
}

8
lib/WebGUI/Asset/Event.pm
View file

@ -237,7 +237,7 @@ sub view {
#-------------------------------------------------------------------
sub www_deleteEvent {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
my ($output);
$output = '<h1>'.WebGUI::International::get(42,"Asset_Event").'</h1>';
$output .= WebGUI::International::get(75,"Asset_Event").'<p><blockquote>';
@ -253,7 +253,7 @@ sub www_deleteEvent {
#-------------------------------------------------------------------
sub www_deleteEventConfirm {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
if (($self->session->form->process("rid") ne "") and ($self->session->form->process("rid") ne "0")) {
my $series = $self->getParent->getLineage(["descendants"],{returnObjects=>1});
foreach my $event (@{$series}) {
@ -269,7 +269,7 @@ sub www_deleteEventConfirm {
#-------------------------------------------------------------------
sub www_edit {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
$self->getAdminConsole->setHelp("event add/edit","Asset_Event");
return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get('13', 'Asset_Event'));
}
@ -277,7 +277,7 @@ sub www_edit {
#-------------------------------------------------------------------
sub www_view {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canView);
return $self->session->privilege->insufficient() unless ($self->canView);
return $self->session->style->process($self->view,$self->getParent->getValue("styleTemplateId"));
}

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

@ -276,7 +276,7 @@ sub view {
#-------------------------------------------------------------------
sub www_edit {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
my $tabform = $self->getEditForm;
$tabform->getTab("display")->template(
-value=>$self->getValue("templateId"),
@ -291,7 +291,7 @@ sub www_edit {
#-------------------------------------------------------------------
sub www_view {
my $self = shift;
return WebGUI::Privilege::noAccess() unless $self->canView;
return $self->session->privilege->noAccess() unless $self->canView;
if ($self->session->var->get("adminOn")) {
return $self->getContainer->www_view;
}

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

@ -225,7 +225,7 @@ sub view {
#-------------------------------------------------------------------
sub www_edit {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
$self->getAdminConsole->addSubmenuItem($self->getUrl('func=resize'),WebGUI::International::get("resize image","Asset_Image")) if ($self->get("filename"));
my $tabform = $self->getEditForm;
$tabform->getTab("display")->template(
@ -241,7 +241,7 @@ sub www_edit {
#-------------------------------------------------------------------
sub www_resize {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
if ($self->session->form->process("newWidth") || $self->session->form->process("newHeight")) {
$self->getStorageLocation->resize($self->get("filename"),$self->session->form->process("newWidth"),$self->session->form->process("newHeight"));
$self->setSize($self->getStorageLocation->getFileSize($self->get("filename")));

4
lib/WebGUI/Asset/File/ZipArchive.pm
View file

@ -283,7 +283,7 @@ Web facing method which is the default edit page
sub www_edit {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
$self->getAdminConsole->setHelp("zip archive add/edit", "Asset_ZipArchive");
return $self->getAdminConsole->render($self->getEditForm->print,
WebGUI::International::get('zip archive add/edit title',"Asset_ZipArchive"));
@ -299,7 +299,7 @@ Web facing method which is the default view page. This method does a
sub www_view {
my $self = shift;
return WebGUI::Privilege::noAccess() unless $self->canView;
return $self->session->privilege->noAccess() unless $self->canView;
if (WebGUI::Session::isAdminOn()) {
return $self->getContainer->www_view;
}

6
lib/WebGUI/Asset/Post.pm
View file

@ -975,7 +975,7 @@ sub www_edit {
$title = $self->session->form->process("title");
if ($self->session->form->process("class") eq "WebGUI::Asset::Post") { # new reply
$self->{_thread} = $self->getParent->getThread;
return WebGUI::Privilege::insufficient() unless ($self->getThread->canReply);
return $self->session->privilege->insufficient() unless ($self->getThread->canReply);
$var{isReply} = 1;
$var{'reply.title'} = $self->getParent->get("title");
$var{'reply.synopsis'} = $self->getParent->get("synopsis");
@ -993,7 +993,7 @@ sub www_edit {
value=>$self->session->form->process("subscribe")
});
} elsif ($self->session->form->process("class") eq "WebGUI::Asset::Post::Thread") { # new thread
return WebGUI::Privilege::insufficient() unless ($self->getThread->getParent->canPost);
return $self->session->privilege->insufficient() unless ($self->getThread->getParent->canPost);
$var{isNewThread} = 1;
if ($self->getThread->getParent->canModerate) {
$var{'sticky.form'} = WebGUI::Form::yesNo({
@ -1012,7 +1012,7 @@ sub www_edit {
}
$content .= "\n\n".$self->session->user->profileField("signature") if ($self->session->user->profileField("signature") && !$self->session->form->process("content"));
} else { # edit
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
$var{'form.header'} = WebGUI::Form::formHeader({action=>$self->getUrl})
.WebGUI::Form::hidden({
name=>"func",

2
lib/WebGUI/Asset/Post/Thread.pm
View file

@ -790,7 +790,7 @@ sub www_unsubscribe {
sub www_view {
my $self = shift;
my $postId = shift;
return WebGUI::Privilege::noAccess() unless $self->canView;
return $self->session->privilege->noAccess() unless $self->canView;
my $cache;
my $output;
my $useCache = (

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

@ -101,7 +101,7 @@ sub getEditForm {
#-------------------------------------------------------------------
sub www_edit {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
$self->getAdminConsole->setHelp("redirect add/edit", "Asset_Redirect");
return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get('redirect add/edit title', 'Asset_Redirect'));
}
@ -116,7 +116,7 @@ A web executable method that redirects the user to the specified page, or displa
sub www_view {
my $self = shift;
return WebGUI::Privilege::noAccess() unless $self->canView;
return $self->session->privilege->noAccess() unless $self->canView;
if ($self->session->var->isAdminOn() && $self->canEdit) {
my $i18n = WebGUI::International->new("Asset_Redirect");
return $self->getAdminConsole->render($i18n->get("what do you want to do with this redirect").'

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

@ -496,7 +496,7 @@ sub view {
#-------------------------------------------------------------------
sub www_edit {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("rich edit edit config","Asset_RichEdit"));
}

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

@ -626,7 +626,7 @@ sub view {
#-------------------------------------------------------------------
sub www_edit {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
$self->getAdminConsole->setHelp("shortcut add/edit","Asset_Shortcut");
$self->getAdminConsole->addSubmenuItem($self->getUrl("func=manageOverrides"),WebGUI::International::get("Manage Shortcut Overrides","Asset_Shortcut"));
return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get(2,"Asset_Shortcut"));
@ -676,14 +676,14 @@ sub www_getUserPrefsForm {
#-------------------------------------------------------------------
sub www_manageOverrides {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->_submenu($self->getOverridesList,WebGUI::International::get("Manage Shortcut Overrides","Asset_Shortcut"));
}
#-------------------------------------------------------------------
sub www_purgeOverrideCache {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
$self->uncacheOverrides;
return $self->www_manageOverrides;
}
@ -691,7 +691,7 @@ sub www_purgeOverrideCache {
#-------------------------------------------------------------------
sub www_deleteOverride {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
$self->session->db->write('delete from Shortcut_overrides where assetId='.$self->session->db->quote($self->getId).' and fieldName='.$self->session->db->quote($self->session->form->process("fieldName")));
$self->uncacheOverrides;
return $self->www_manageOverrides;
@ -731,7 +731,7 @@ sub www_getNewTitle {
#-------------------------------------------------------------------
sub www_editOverride {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
my $i18n = WebGUI::International->new("Asset_Shortcut");
my $fieldName = $self->session->form->process("fieldName");
my %overrides = $self->getOverrides;
@ -772,7 +772,7 @@ sub www_editOverride {
#-------------------------------------------------------------------
sub www_saveOverride {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
my $fieldName = $self->session->form->process("overrideFieldName");
my %overrides = $self->getOverrides;
my $output = '';
@ -793,7 +793,7 @@ sub www_saveOverride {
sub www_view {
my $self = shift;
if ($self->isDashlet) {
return WebGUI::Privilege::noAccess() unless $self->canView;
return $self->session->privilege->noAccess() unless $self->canView;
$self->session->asset = $self->getParent;
return $self->session->asset->www_view;
} else {

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

@ -158,7 +158,7 @@ sub view {
#-------------------------------------------------------------------
sub www_edit {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
$self->getAdminConsole->setHelp("snippet add/edit","Asset_Snippet");
return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get('snippet add/edit title',"Asset_Snippet"));
}

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

@ -326,7 +326,7 @@ sub view {
#-------------------------------------------------------------------
sub www_edit {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
$self->getAdminConsole->setHelp("template add/edit","Asset_Template");
$self->getAdminConsole->addSubmenuItem($self->getUrl('func=styleWizard'),WebGUI::International::get("style wizard","Asset_Template")) if ($self->get("namespace") eq "style");
return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get('edit template', 'Asset_Template'));
@ -354,7 +354,7 @@ sub www_manage {
sub www_styleWizard {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
my $output = "";
if ($self->session->form->process("step") == 2) {
my $f = WebGUI::HTMLForm->new({action=>$self->getUrl});

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

@ -195,7 +195,7 @@ A comparison expression to be used when checking whether the action should be al
=cut
sub confirm {
return WebGUI::Privilege::vitalComponent() if ($_[4]);
return $self->session->privilege->vitalComponent() if ($_[4]);
my $noURL = $_[3] || $_[0]->getUrl;
my $output = '<h1>'.WebGUI::International::get(42,'Wobject').'</h1>';
$output .= $_[1].'<p>';
@ -553,7 +553,7 @@ sub setCollateral {
sub www_edit {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
my ($tag) = ($self->get("className") =~ /::(\w+)$/);
my $tag2 = $tag;
$tag =~ s/([a-z])([A-Z])/$1 $2/g; #Separate studly caps
@ -576,7 +576,7 @@ sub www_view {
my $disableCache = shift;
unless ($self->canView) {
if ($self->get("state") eq "published") { # no privileges, make em log in
return WebGUI::Privilege::noAccess();
return $self->session->privilege->noAccess();
} elsif ($self->session->var->get("adminOn") && $self->get("state") =~ /^trash/) { # show em trash
WebGUI::HTTP::setRedirect($self->getUrl("func=manageTrash"));
return "";

2
lib/WebGUI/Asset/Wobject/Dashboard.pm
View file

@ -277,7 +277,7 @@ sub view {
sub www_setContentPositions {
my $self = shift;
return 'Visitors cannot save settings' if($self->session->user->profileField("userId") eq '1');
return WebGUI::Privilege::insufficient() unless ($self->canPersonalize);
return $self->session->privilege->insufficient() unless ($self->canPersonalize);
return 'empty' unless $self->get("isInitialized");
my $dummy = $self->initialize unless $self->get("isInitialized");
my $u = WebGUI::User->new($self->discernUserId);

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

@ -671,7 +671,7 @@ sub viewForm {
#-------------------------------------------------------------------
sub www_deleteAllEntries {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
my $assetId = $self->session->form->process("entryId");
$self->deleteCollateral("DataForm_entry","assetId",$assetId);
$self->session->form->process("entryId") = 'list';
@ -681,7 +681,7 @@ sub www_deleteAllEntries {
#-------------------------------------------------------------------
sub www_deleteAllEntriesConfirm {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit && $self->session->form->process("entryId")==$self->getId);
return $self->session->privilege->insufficient() unless ($self->canEdit && $self->session->form->process("entryId")==$self->getId);
$self->session->db->write("delete from DataForm_entry where assetId=".$self->session->db->quote($self->getId));
return $self->www_view;
}
@ -690,7 +690,7 @@ sub www_deleteAllEntriesConfirm {
#-------------------------------------------------------------------
sub www_deleteEntry {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
my $entryId = $self->session->form->process("entryId");
$self->deleteCollateral("DataForm_entry","DataForm_entryId",$entryId);
$self->session->form->process("entryId") = 'list';
@ -700,7 +700,7 @@ sub www_deleteEntry {
#-------------------------------------------------------------------
sub www_deleteFieldConfirm {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
$self->deleteCollateral("DataForm_field","DataForm_fieldId",$self->session->form->process("fid"));
$self->reorderCollateral("DataForm_field","DataForm_fieldId");
return "";
@ -709,7 +709,7 @@ sub www_deleteFieldConfirm {
#-------------------------------------------------------------------
sub www_deleteTabConfirm {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
$self->deleteCollateral("DataForm_tab","DataForm_tabId",$self->session->form->process("tid"));
$self->deleteCollateral("DataForm_field","DataForm_tabId",$self->session->form->process("tid"));
$self->reorderCollateral("DataForm_tab","DataForm_tabId");
@ -719,7 +719,7 @@ sub www_deleteTabConfirm {
#-------------------------------------------------------------------
#sub www_edit {
# my $self = shift;
# return WebGUI::Privilege::insufficient() unless $self->canEdit;
# return $self->session->privilege->insufficient() unless $self->canEdit;
# $self->getAdminConsole->setHelp("data form add/edit","Asset_DataForm");
# return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("7","Asset_DataForm"));
#}
@ -727,7 +727,7 @@ sub www_deleteTabConfirm {
#-------------------------------------------------------------------
sub www_editField {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
my (%field, $f, %fieldStatus,$tab);
tie %field, 'Tie::CPHash';
tie %fieldStatus, 'Tie::IxHash';
@ -857,7 +857,7 @@ sub www_editField {
#-------------------------------------------------------------------
sub www_editFieldSave {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
$self->session->form->process("name") = $self->session->form->process("label") if ($self->session->form->process("name") eq "");
$self->session->form->process("tid") = "0" if ($self->session->form->process("tid") eq "");
$self->session->form->process("name") = $self->session->url->urlize($self->session->form->process("name"));
@ -893,7 +893,7 @@ sub www_editFieldSave {
#-------------------------------------------------------------------
sub www_editTab {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
my (%tab, $f);
tie %tab, 'Tie::CPHash';
$self->session->form->process("tid") = "new" if ($self->session->form->process("tid") eq "");
@ -938,7 +938,7 @@ sub www_editTab {
#-------------------------------------------------------------------
sub www_editTabSave {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
$self->session->form->process("name") = $self->session->form->process("label") if ($self->session->form->process("name") eq "");
$self->session->form->process("name") = $self->session->url->urlize($self->session->form->process("name"));
$self->session->form->process("name") =~ s/\-//g;
@ -958,7 +958,7 @@ sub www_editTabSave {
#-------------------------------------------------------------------
sub www_exportTab {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
WebGUI::HTTP::setFilename($self->get("url").".tab","text/plain");
my %fields = $self->session->db->buildHash("select DataForm_fieldId,name from DataForm_field where
assetId=".$self->session->db->quote($self->getId)." order by sequenceNumber");
@ -1008,7 +1008,7 @@ sub www_exportTab {
#-------------------------------------------------------------------
sub www_moveFieldDown {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
$self->moveCollateralDown("DataForm_field","DataForm_fieldId",$self->session->form->process("fid"),_tonull("DataForm_tabId",$self->session->form->process("tid")));
return "";
}
@ -1016,7 +1016,7 @@ sub www_moveFieldDown {
#-------------------------------------------------------------------
sub www_moveFieldUp {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
$self->moveCollateralUp("DataForm_field","DataForm_fieldId",$self->session->form->process("fid"),_tonull("DataForm_tabId",$self->session->form->process("tid")));
return "";
}
@ -1024,7 +1024,7 @@ sub www_moveFieldUp {
#-------------------------------------------------------------------
sub www_moveTabRight {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
$self->moveCollateralDown("DataForm_tab","DataForm_tabId",$self->session->form->process("tid"));
return "";
}
@ -1032,7 +1032,7 @@ sub www_moveTabRight {
#-------------------------------------------------------------------
sub www_moveTabLeft {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
$self->moveCollateralUp("DataForm_tab","DataForm_tabId",$self->session->form->process("tid"));
return "";
}

2
lib/WebGUI/Asset/Wobject/EventsCalendar.pm
View file

@ -459,7 +459,7 @@ sub view {
#-------------------------------------------------------------------
#sub www_edit {
# my $self = shift;
# return WebGUI::Privilege::insufficient() unless $self->canEdit;
# return $self->session->privilege->insufficient() unless $self->canEdit;
# $self->getAdminConsole->setHelp("events calendar add/edit","Asset_EventsCalendar");
# return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("12","Asset_EventsCalendar"));
#}

2
lib/WebGUI/Asset/Wobject/Folder.pm
View file

@ -150,7 +150,7 @@ sub view {
#sub www_edit {
# my $self = shift;
# return WebGUI::Privilege::insufficient() unless $self->canEdit;
# return $self->session->privilege->insufficient() unless $self->canEdit;
# $self->getAdminConsole->setHelp("folder add/edit","Asset_Folder");
# return $self->getAdminConsole->render($self->getEditForm->print,"Edit Folder");
#}

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

@ -344,7 +344,7 @@ sub view {
#-------------------------------------------------------------------
#sub www_edit {
# my $self = shift;
# return WebGUI::Privilege::insufficient() unless $self->canEdit;
# return $self->session->privilege->insufficient() unless $self->canEdit;
# $self->getAdminConsole->setHelp("http proxy add/edit","Asset_HttpProxy");
# return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("2","Asset_HttpProxy"));
#}
@ -354,7 +354,7 @@ sub view {
sub www_view {
my $self = shift;
my $output = $self->view;
return WebGUI::Privilege::noAccess() unless $self->canView;
return $self->session->privilege->noAccess() unless $self->canView;
# this is s a stop gap. we need to do something here that deals with the real www_view and caching, etc.
if (WebGUI::HTTP::getMimeType() ne "text/html") {
return $output;

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

@ -271,7 +271,7 @@ order by department, lastName, firstName";
#-------------------------------------------------------------------
sub www_edit {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("18","Asset_InOutBoard"));
}

2
lib/WebGUI/Asset/Wobject/IndexedSearch.pm
View file

@ -380,7 +380,7 @@ sub view {
#-------------------------------------------------------------------
sub www_edit {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
$self->getAdminConsole->setHelp("search add/edit", "Asset_IndexedSearch");
my $form = $self->getEditForm;
my $output = $form;

2
lib/WebGUI/Asset/Wobject/Layout.pm
View file

@ -219,7 +219,7 @@ sub view {
sub www_setContentPositions {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
$self->addRevision({
contentPositions=>$self->session->form->process("map")
});

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

@ -202,7 +202,7 @@ sub setRatings {
#-------------------------------------------------------------------
sub www_approveListing {
my $self = shift;
return WebGUI::Privilege::insufficient() unless($self->canEdit);
return $self->session->privilege->insufficient() unless($self->canEdit);
my $listing = $self->session->db->getRow("Matrix_listing","listingId",$self->session->form->process("listingId"));
$self->session->db->write("update Matrix_listing set status='approved' where listingId=".$self->session->db->quote($self->session->form->process("listingId")));
WebGUI::MessageLog::addEntry($listing->{maintainerId},"","New Listing Approved","Your new listing, ".$listing->{productName}.", has been approved.",
@ -324,7 +324,7 @@ sub www_deleteListing {
#-------------------------------------------------------------------
sub www_deleteListingConfirm {
my $self = shift;
return WebGUI::Privilege::insufficient() unless($self->canEdit);
return $self->session->privilege->insufficient() unless($self->canEdit);
my $listing = $self->session->db->getRow("Matrix_listing","listingId",$self->session->form->process("listingId"));
WebGUI::Asset::Wobject::Collaboration->new($listing->{forumId})->purge;
$self->session->db->write("delete from Matrix_listing where listingId=".$self->session->db->quote($self->session->form->process("listingId")));
@ -430,7 +430,7 @@ sub getEditForm {
#-------------------------------------------------------------------
sub www_edit {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->getAdminConsole->render($self->getEditForm->print,
WebGUI::International::get("edit matrix",'Asset_Matrix'));
}
@ -643,7 +643,7 @@ sub www_editListingSave {
#-------------------------------------------------------------------
sub www_editField {
my $self = shift;
return WebGUI::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 $f = WebGUI::HTMLForm->new(-action=>$self->getUrl);
$f->hidden(
@ -704,7 +704,7 @@ sub www_editField {
#-------------------------------------------------------------------
sub www_editFieldSave {
my $self = shift;
return WebGUI::Privilege::insufficient() unless($self->canEdit);
return $self->session->privilege->insufficient() unless($self->canEdit);
$self->session->db->setRow("Matrix_field","fieldId",{
fieldId=>$self->session->form->process("fieldId"),
name=>$self->session->form->process("name"),
@ -721,7 +721,7 @@ sub www_editFieldSave {
#-------------------------------------------------------------------
sub www_listFields {
my $self = shift;
return WebGUI::Privilege::insufficient() unless($self->canEdit);
return $self->session->privilege->insufficient() unless($self->canEdit);
my $output = sprintf WebGUI::International::get('list fields','Asset_Matrix'),
$self->getUrl("func=editField&amp;fieldId=new");
my $sth = $self->session->db->read("select fieldId, label from Matrix_field where assetId=".$self->session->db->quote($self->getId)." order by label");

2
lib/WebGUI/Asset/Wobject/Navigation.pm
View file

@ -450,7 +450,7 @@ sub www_goBackToPage {
sub www_preview {
my $self = shift;
$self->session->var->get("adminOn") = 0;
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(3));
return $self->session->privilege->insufficient() unless (WebGUI::Grouping::isInGroup(3));
my $nav = WebGUI::Navigation->new( depth=>$self->session->form->process("depth"),
method=>$self->session->form->process("method"),
startAt=>$self->session->form->process("startAt"),

2
lib/WebGUI/Asset/Wobject/Poll.pm
View file

@ -321,7 +321,7 @@ sub view {
#-------------------------------------------------------------------
#sub www_edit {
# my $self = shift;
# return WebGUI::Privilege::insufficient() unless $self->canEdit;
# return $self->session->privilege->insufficient() unless $self->canEdit;
# $self->getAdminConsole->setHelp("poll add/edit","Asset_Poll");
# return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("9","Asset_Poll"));
#}

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

@ -310,7 +310,7 @@ sub purgeRevision {
#-------------------------------------------------------------------
sub www_addAccessory {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
my ($f, $accessory, @usedAccessories);
$f = WebGUI::HTMLForm->new(-action=>$self->getUrl);
$f->hidden(
@ -338,7 +338,7 @@ sub www_addAccessory {
#-------------------------------------------------------------------
sub www_addAccessorySave {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
return "" unless ($self->session->form->process("accessoryAccessId"));
my ($seq) = $self->session->db->quickArray("select max(sequenceNumber) from Product_accessory where assetId=".$self->session->db->quote($self->getId()));
$self->session->db->write("insert into Product_accessory (assetId,accessoryAssetId,sequenceNumber) values (".$self->session->db->quote($self->getId()).",".$self->session->db->quote($self->session->form->process("accessoryAccessId")).",".($seq+1).")");
@ -349,7 +349,7 @@ sub www_addAccessorySave {
#-------------------------------------------------------------------
sub www_addRelated {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
my ($f, $related, @usedRelated);
$f = WebGUI::HTMLForm->new(-action=>$self->getUrl);
$f->hidden(
@ -377,7 +377,7 @@ sub www_addRelated {
#-------------------------------------------------------------------
sub www_addRelatedSave {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
return "" unless ($self->session->form->process("relatedAssetId"));
my ($seq) = $self->session->db->quickArray("select max(sequenceNumber) from Product_related where assetId=".$self->session->db->quote($self->getId));
$self->session->db->write("insert into Product_related (assetId,relatedAssetId,sequenceNumber) values (".$self->session->db->quote($self->getId).",".$self->session->db->quote($self->session->form->process("relatedAssetId")).",".($seq+1).")");
@ -388,7 +388,7 @@ sub www_addRelatedSave {
#-------------------------------------------------------------------
sub www_deleteAccessoryConfirm {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
$self->session->db->write("delete from Product_accessory where assetId=".$self->session->db->quote($self->getId())." and accessoryAssetId=".$self->session->db->quote($self->session->form->process("aid")));
$self->reorderCollateral("Product_accessory","accessoryAssetId");
return "";
@ -397,7 +397,7 @@ sub www_deleteAccessoryConfirm {
#-------------------------------------------------------------------
sub www_deleteBenefitConfirm {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
$self->deleteCollateral("Product_benefit","Product_benefitId",$self->session->form->process("bid"));
$self->reorderCollateral("Product_benefit","Product_benefitId");
return "";
@ -406,7 +406,7 @@ sub www_deleteBenefitConfirm {
#-------------------------------------------------------------------
sub www_deleteFeatureConfirm {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
$self->deleteCollateral("Product_feature","Product_featureId",$self->session->form->process("fid"));
$self->reorderCollateral("Product_feature","Product_featureId");
return "";
@ -416,7 +416,7 @@ sub www_deleteFeatureConfirm {
sub www_deleteFileConfirm {
my $self = shift;
my $column = $self->session->form->process("file");
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
my $store = $self->get($column);
my $file = WebGUI::Storage->get($store);
$file->delete;
@ -427,7 +427,7 @@ sub www_deleteFileConfirm {
#-------------------------------------------------------------------
sub www_deleteRelatedConfirm {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
$self->session->db->write("delete from Product_related where assetId=".$self->session->db->quote($self->getId)." and relatedAssetId=".$self->session->db->quote($self->session->form->process("rid")));
$self->reorderCollateral("Product_related","relatedAssetId");
return "";
@ -436,7 +436,7 @@ sub www_deleteRelatedConfirm {
#-------------------------------------------------------------------
sub www_deleteSpecificationConfirm {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
$self->deleteCollateral("Product_specification","Product_specificationId",$self->session->form->process("sid"));
$self->reorderCollateral("Product_specification","Product_specificationId");
return "";
@ -445,7 +445,7 @@ sub www_deleteSpecificationConfirm {
#-------------------------------------------------------------------
#sub www_edit {
# my $self = shift;
# return WebGUI::Privilege::insufficient() unless $self->canEdit;
# return $self->session->privilege->insufficient() unless $self->canEdit;
# $self->getAdminConsole->setHelp("product add/edit","Asset_Product");
# return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("6","Asset_Product"));
#}
@ -466,7 +466,7 @@ sub processPropertiesFromFormPost {
#-------------------------------------------------------------------
sub www_editBenefit {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
my ($data, $f, $benefits);
$data = $self->getCollateral("Product_benefit","Product_benefitId",$self->session->form->process("bid"));
$f = WebGUI::HTMLForm->new(-action=>$self->getUrl);
@ -498,7 +498,7 @@ sub www_editBenefit {
#-------------------------------------------------------------------
sub www_editBenefitSave {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
$self->session->form->process("benefit") = $self->session->form->process("benefit_new") if ($self->session->form->process("benefit_new") ne "");
$self->setCollateral("Product_benefit", "Product_benefitId", {
Product_benefitId => $self->session->form->process("bid"),
@ -513,7 +513,7 @@ sub www_editBenefitSave {
#-------------------------------------------------------------------
sub www_editFeature {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
my ($data, $f, $features);
$data = $self->getCollateral("Product_feature","Product_featureId",$self->session->form->process("fid"));
$f = WebGUI::HTMLForm->new(-action=>$self->getUrl);
@ -545,7 +545,7 @@ sub www_editFeature {
#-------------------------------------------------------------------
sub www_editFeatureSave {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
$self->session->form->process("feature") = $self->session->form->process("feature_new") if ($self->session->form->process("feature_new") ne "");
$self->setCollateral("Product_feature", "Product_featureId", {
Product_featureId => $self->session->form->process("fid"),
@ -559,7 +559,7 @@ sub www_editFeatureSave {
#-------------------------------------------------------------------
sub www_editSpecification {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
my ($data, $f, $hashRef);
$data = $self->getCollateral("Product_specification","Product_specificationId",$self->session->form->process("sid"));
$f = WebGUI::HTMLForm->new(-action=>$self->getUrl);
@ -605,7 +605,7 @@ sub www_editSpecification {
#-------------------------------------------------------------------
sub www_editSpecificationSave {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
$self->session->form->process("name") = $self->session->form->process("name_new") if ($self->session->form->process("name_new") ne "");
$self->session->form->process("units") = $self->session->form->process("units_new") if ($self->session->form->process("units_new") ne "");
$self->setCollateral("Product_specification", "Product_specificationId", {
@ -623,7 +623,7 @@ sub www_editSpecificationSave {
#-------------------------------------------------------------------
sub www_moveAccessoryDown {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
$self->moveCollateralDown("Product_accessory","accessoryAssetId",$self->session->form->process("aid"));
return "";
}
@ -631,7 +631,7 @@ sub www_moveAccessoryDown {
#-------------------------------------------------------------------
sub www_moveAccessoryUp {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
$self->moveCollateralUp("Product_accessory","accessoryAssetId",$self->session->form->process("aid"));
return "";
}
@ -639,7 +639,7 @@ sub www_moveAccessoryUp {
#-------------------------------------------------------------------
sub www_moveBenefitDown {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
$self->moveCollateralDown("Product_benefit","Product_benefitId",$self->session->form->process("bid"));
return "";
}
@ -647,7 +647,7 @@ sub www_moveBenefitDown {
#-------------------------------------------------------------------
sub www_moveBenefitUp {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
$self->moveCollateralUp("Product_benefit","Product_benefitId",$self->session->form->process("bid"));
return "";
}
@ -655,7 +655,7 @@ sub www_moveBenefitUp {
#-------------------------------------------------------------------
sub www_moveFeatureDown {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
$self->moveCollateralDown("Product_feature","Product_featureId",$self->session->form->process("fid"));
return "";
}
@ -663,7 +663,7 @@ sub www_moveFeatureDown {
#-------------------------------------------------------------------
sub www_moveFeatureUp {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
$self->moveCollateralUp("Product_feature","Product_featureId",$self->session->form->process("fid"));
return "";
}
@ -671,7 +671,7 @@ sub www_moveFeatureUp {
#-------------------------------------------------------------------
sub www_moveRelatedDown {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
$self->moveCollateralDown("Product_related","relatedAssetId",$self->session->form->process("rid"));
return "";
}
@ -679,7 +679,7 @@ sub www_moveRelatedDown {
#-------------------------------------------------------------------
sub www_moveRelatedUp {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
$self->moveCollateralUp("Product_related","relatedAssetId",$self->session->form->process("rid"));
return "";
}
@ -687,7 +687,7 @@ sub www_moveRelatedUp {
#-------------------------------------------------------------------
sub www_moveSpecificationDown {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
$self->moveCollateralDown("Product_specification","Product_specificationId",$self->session->form->process("sid"));
return "";
}
@ -695,7 +695,7 @@ sub www_moveSpecificationDown {
#-------------------------------------------------------------------
sub www_moveSpecificationUp {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
$self->moveCollateralUp("Product_specification","Product_specificationId",$self->session->form->process("sid"));
return "";
}

2
lib/WebGUI/Asset/Wobject/SQLReport.pm
View file

@ -256,7 +256,7 @@ sub view {
#-------------------------------------------------------------------
#sub www_edit {
# my $self = shift;
# return WebGUI::Privilege::insufficient() unless $self->canEdit;
# return $self->session->privilege->insufficient() unless $self->canEdit;
# $self->getAdminConsole->setHelp("sql report add/edit", "Asset_SQLReport");
# return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("8","Asset_SQLReport"));
#}

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

@ -430,7 +430,7 @@ Web facing method which allows users to view details about their stocks
sub www_displayStock {
my $self = shift;
my $var = {};
return WebGUI::Privilege::noAccess() unless $self->canView();
return $self->session->privilege->noAccess() unless $self->canView();
$var->{'extrasFolder'} = $self->session->config->get("extrasURL")."/wobject/StockData";
@ -457,7 +457,7 @@ sub www_displayStock {
#sub www_edit {
# my $self = shift;
# return WebGUI::Privilege::insufficient() unless $self->canEdit;
# return $self->session->privilege->insufficient() unless $self->canEdit;
# $self->getAdminConsole->setHelp("stock list add/edit","Asset_StockData");
# return $self->getAdminConsole->render($self->getEditForm->print,
# WebGUI::International::get("edit_title","Asset_StockData"));

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

@ -695,7 +695,7 @@ sub view {
#-------------------------------------------------------------------
sub www_deleteAnswerConfirm {
return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit);
return $self->session->privilege->insufficient() unless ($_[0]->canEdit);
my ($answerCount) = $self->session->db->quickArray("select count(*) from Survey_answer where Survey_questionId=".$self->session->db->quote($self->session->form->process("qid")));
return $_[0]->i18n("cannot delete the last answer") unless($answerCount);
$self->session->db->write("delete from Survey_questionResponse where Survey_answerId=".$self->session->db->quote($self->session->form->process("aid")));
@ -706,7 +706,7 @@ sub www_deleteAnswerConfirm {
#-------------------------------------------------------------------
sub www_deleteQuestionConfirm {
return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit);
return $self->session->privilege->insufficient() unless ($_[0]->canEdit);
$self->session->db->write("delete from Survey_answer where Survey_questionId=".$self->session->db->quote($self->session->form->process("qid")));
$self->session->db->write("delete from Survey_questionResponse where Survey_questionId=".$self->session->db->quote($self->session->form->process("qid")));
$_[0]->deleteCollateral("Survey_question","Survey_questionId",$self->session->form->process("qid"));
@ -716,12 +716,12 @@ sub www_deleteQuestionConfirm {
#-------------------------------------------------------------------
sub www_deleteSectionConfirm {
return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit);
return $self->session->privilege->insufficient() unless ($_[0]->canEdit);
my $none = WebGUI::International::get(107, 'Asset_Survey');
my ($sectionName) = $self->session->db->quickArray("select sectionName from Survey_section where Survey_sectionId="
.$self->session->db->quote($self->session->form->process("sid")));
if ($sectionName =~ /$none/) {
return WebGUI::Privilege::vitalComponent();
return $self->session->privilege->vitalComponent();
}
$self->session->db->write("delete from Survey_section where Survey_sectionId=".$self->session->db->quote($self->session->form->process("sid")));
@ -761,7 +761,7 @@ sub www_deleteAllResponsesConfirm {
#-------------------------------------------------------------------
sub www_editSave {
return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit);
return $self->session->privilege->insufficient() unless ($_[0]->canEdit);
my $output = $_[0]->SUPER::www_editSave();
if ($self->session->form->process("proceed") eq "addQuestion") {
$self->session->form->process("qid") = "new";
@ -775,7 +775,7 @@ sub www_editAnswer {
my ($question, $f, $answer, $self);
$self = shift;
return WebGUI::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"));
$f = WebGUI::HTMLForm->new(-action=>$self->getUrl);
@ -850,7 +850,7 @@ sub www_editAnswer {
#-------------------------------------------------------------------
sub www_editAnswerSave {
return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit);
return $self->session->privilege->insufficient() unless ($_[0]->canEdit);
$_[0]->setCollateral("Survey_answer", "Survey_answerId", {
Survey_answerId => $self->session->form->process("aid"),
Survey_questionId => $self->session->form->process("qid"),
@ -875,7 +875,7 @@ sub www_editQuestion {
my ($f, $question, $answerFieldType, $sth, %data, $self);
$self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
tie %data, 'Tie::CPHash';
$question = $self->getCollateral("Survey_question","Survey_questionId",$self->session->form->process("qid"));
@ -988,7 +988,7 @@ sub www_editQuestion {
#-------------------------------------------------------------------
sub www_editQuestionSave {
return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit);
return $self->session->privilege->insufficient() unless ($_[0]->canEdit);
$self->session->form->process("qid") = $_[0]->setCollateral("Survey_question", "Survey_questionId", {
question=>$self->session->form->process("question"),
@ -1041,11 +1041,11 @@ sub www_editSection {
my ($f, $section, $sectionName, $self);
$self = shift;
my $none = WebGUI::International::get(107, 'Asset_Survey');
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
$section = $self->getCollateral("Survey_section","Survey_sectionId",$self->session->form->process("sid"));
if ($section->{sectionName} =~ /$none/) {
return WebGUI::Privilege::vitalComponent;
return $self->session->privilege->vitalComponent;
}
$f = WebGUI::HTMLForm->new(-action=>$self->getUrl);
@ -1074,7 +1074,7 @@ sub www_editSection {
#-------------------------------------------------------------------
sub www_editSectionSave {
return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit);
return $self->session->privilege->insufficient() unless ($_[0]->canEdit);
$self->session->form->process("sid") = $_[0]->setCollateral("Survey_section", "Survey_sectionId", {
sectionName => $self->session->form->process("sectionName"),
Survey_sectionId=>$self->session->form->process("sid"),
@ -1116,42 +1116,42 @@ sub www_exportResponses {
#-------------------------------------------------------------------
sub www_moveAnswerDown {
return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit);
return $self->session->privilege->insufficient() unless ($_[0]->canEdit);
$_[0]->moveCollateralDown("Survey_answer","Survey_answerId",$self->session->form->process("aid"),"Survey_id");
return $_[0]->www_editQuestion;
}
#-------------------------------------------------------------------
sub www_moveAnswerUp {
return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit);
return $self->session->privilege->insufficient() unless ($_[0]->canEdit);
$_[0]->moveCollateralUp("Survey_answer","Survey_answerId",$self->session->form->process("aid"),"Survey_id");
return $_[0]->www_editQuestion;
}
#-------------------------------------------------------------------
sub www_moveQuestionDown {
return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit);
return $self->session->privilege->insufficient() unless ($_[0]->canEdit);
$_[0]->moveCollateralDown("Survey_question","Survey_questionId",$self->session->form->process("qid"),"Survey_id");
return "";
}
#-------------------------------------------------------------------
sub www_moveQuestionUp {
return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit);
return $self->session->privilege->insufficient() unless ($_[0]->canEdit);
$_[0]->moveCollateralUp("Survey_question","Survey_questionId",$self->session->form->process("qid"),"Survey_id");
return "";
}
#-------------------------------------------------------------------
sub www_moveSectionDown {
return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit);
return $self->session->privilege->insufficient() unless ($_[0]->canEdit);
$_[0]->moveCollateralDown("Survey_section","Survey_sectionId",$self->session->form->process("sid"),"Survey_id");
return "";
}
#-------------------------------------------------------------------
sub www_moveSectionUp {
return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit);
return $self->session->privilege->insufficient() unless ($_[0]->canEdit);
$_[0]->moveCollateralUp("Survey_section","Survey_sectionId",$self->session->form->process("sid"),"Survey_id");
return "";
}

2
lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
View file

@ -585,7 +585,7 @@ sub _createRSSURLs{
#sub www_edit {
# my $self = shift;
# return WebGUI::Privilege::insufficient() unless $self->canEdit;
# return $self->session->privilege->insufficient() unless $self->canEdit;
# $self->getAdminConsole->setHelp('syndicated content add/edit','Asset_SyndicatedContent');
# return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get('4','Asset_SyndicatedContent'));
#}

2
lib/WebGUI/Asset/Wobject/WSClient.pm
View file

@ -221,7 +221,7 @@ sub getEditForm {
#-------------------------------------------------------------------
#sub www_edit {
# my $self = shift;
# return WebGUI::Privilege::insufficient() unless $self->canEdit;
# return $self->session->privilege->insufficient() unless $self->canEdit;
# $self->getAdminConsole->setHelp("ws client add/edit","Asset_WSClient");
# return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("20","Asset_WSClient"));
#}

4
lib/WebGUI/AssetBranch.pm
View file

@ -96,7 +96,7 @@ Creates a tabform to edit the Asset Tree. If canEdit returns False, returns insu
sub www_editBranch {
my $self = shift;
my $ac = WebGUI::AdminConsole->new($self->session,"assets");
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
my $tabform = WebGUI::TabForm->new;
$tabform->hidden({name=>"func",value=>"editBranchSave"});
$tabform->addTab("properties",WebGUI::International::get("properties","Asset"),9);
@ -289,7 +289,7 @@ Verifies proper inputs in the Asset Tree and saves them. Returns ManageAssets me
sub www_editBranchSave {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
return $self->session->privilege->insufficient() unless ($self->canEdit);
my %data;
$data{isHidden} = $self->session->form->yesNo("isHidden") if ($self->session->form->yesNo("change_isHidden"));
$data{newWindow} = $self->session->form->yesNo("newWindow") if ($self->session->form->yesNo("change_newWindow"));

16
lib/WebGUI/AssetClipboard.pm
View file

@ -170,7 +170,7 @@ Duplicates self, cuts duplicate, returns self->getContainer->www_view if canEdit
sub www_copy {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
my $newAsset = $self->duplicate;
$newAsset->update({ title=>$self->getTitle.' (copy)'});
$newAsset->cut;
@ -187,7 +187,7 @@ Copies to clipboard assets in a list, then returns self calling method www_manag
sub www_copyList {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
foreach my $assetId ($self->session->request->param("assetId")) {
my $asset = WebGUI::Asset->newByDynamicClass($assetId);
if ($asset->canEdit) {
@ -247,7 +247,7 @@ Cuts (removes to clipboard) self, returns the www_view of the Parent if canEdit.
sub www_cut {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
$self->cut;
$self->session->asset = $self->getParent;
return $self->getParent->www_view;
@ -263,7 +263,7 @@ Cuts assets in a list (removes to clipboard), then returns self calling method w
sub www_cutList {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
foreach my $assetId ($self->session->request->param("assetId")) {
my $asset = WebGUI::Asset->newByDynamicClass($assetId);
if ($asset->canEdit) {
@ -288,7 +288,7 @@ Moves assets in clipboard to trash. Returns www_manageClipboard() when finished.
sub www_emptyClipboard {
my $self = shift;
my $ac = WebGUI::AdminConsole->new($self->session,"clipboard");
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(4));
return $self->session->privilege->insufficient() unless (WebGUI::Grouping::isInGroup(4));
foreach my $asset (@{$self->getAssetsInClipboard(!($self->session->form->process("systemClipboard") && WebGUI::Grouping::isInGroup(3)))}) {
$asset->trash;
}
@ -307,7 +307,7 @@ Returns an AdminConsole to deal with assets in the Clipboard. If isInGroup(12) i
sub www_manageClipboard {
my $self = shift;
my $ac = WebGUI::AdminConsole->new($self->session,"clipboard");
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(12));
return $self->session->privilege->insufficient() unless (WebGUI::Grouping::isInGroup(12));
my ($header,$limit);
$ac->setHelp("clipboard manage");
if ($self->session->form->process("systemClipboard") && WebGUI::Grouping::isInGroup(3)) {
@ -374,7 +374,7 @@ Returns "". Pastes an asset. If canEdit is False, returns an insufficient privil
sub www_paste {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
$self->paste($self->session->form->process("assetId"));
return "";
}
@ -389,7 +389,7 @@ Returns a www_manageAssets() method. Pastes a selection of assets. If canEdit is
sub www_pasteList {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
foreach my $clipId ($self->session->request->param("assetId")) {
$self->paste($clipId);
}

6
lib/WebGUI/AssetExportHtml.pm
View file

@ -137,7 +137,7 @@ Displays the export page administrative interface
sub www_export {
my $self = shift;
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(13));
return $self->session->privilege->insufficient() unless (WebGUI::Grouping::isInGroup(13));
$self->getAdminConsole->setHelp("page export", "Asset");
my $f = WebGUI::HTMLForm->new(-action=>$self->getUrl);
$f->hidden(
@ -190,7 +190,7 @@ Displays the export status page
sub www_exportStatus {
my $self = shift;
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(13));
return $self->session->privilege->insufficient() unless (WebGUI::Grouping::isInGroup(13));
my $iframeUrl = $self->getUrl('func=exportGenerate');
$iframeUrl = $self->session->url->append($iframeUrl, 'index='.$self->session->form->process("index"));
$iframeUrl = $self->session->url->append($iframeUrl, 'depth='.$self->session->form->process("depth"));
@ -211,7 +211,7 @@ Executes the export process and displays real time status. This operation is dis
sub www_exportGenerate {
my $self = shift;
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(13));
return $self->session->privilege->insufficient() unless (WebGUI::Grouping::isInGroup(13));
# This routine is called in an IFRAME and prints status output directly to the browser.
$|++; # Unbuffered data output
$session{page}{empty} = 1; # Write directly to the browser

8
lib/WebGUI/AssetLineage.pm
View file

@ -657,7 +657,7 @@ Demotes self and returns www_view method of getContainer of self if canEdit, oth
sub www_demote {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
$self->demote;
return $self->getContainer->www_view;
}
@ -673,7 +673,7 @@ Returns www_view method of getContainer of self. Promotes self. If canEdit is Fa
sub www_promote {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
$self->promote;
return $self->getContainer->www_view;
}
@ -689,7 +689,7 @@ Returns a www_manageAssets() method. Sets a new parent via the results of a form
sub www_setParent {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
my $newParent = WebGUI::Asset->newByDynamicClass($self->session->form->process("assetId"));
$self->setParent($newParent) if (defined $newParent);
return $self->www_manageAssets();
@ -706,7 +706,7 @@ Returns a www_manageAssets() method. Sets a new rank via the results of a form.
sub www_setRank {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
my $newRank = $self->session->form->process("rank");
$self->setRank($newRank) if (defined $newRank);
$self->session->asset = $self->getParent;

8
lib/WebGUI/AssetMetaData.pm
View file

@ -142,7 +142,7 @@ Deletes a MetaDataField and returns www_manageMetaData on self, if user isInGrou
sub www_deleteMetaDataField {
my $self = shift;
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(4));
return $self->session->privilege->insufficient() unless (WebGUI::Grouping::isInGroup(4));
$self->deleteMetaDataField($self->session->form->process("fid"));
return $self->www_manageMetaData;
}
@ -159,7 +159,7 @@ Returns a rendered page to edit MetaData. Will return an insufficient Privilege
sub www_editMetaDataField {
my $self = shift;
my $ac = WebGUI::AdminConsole->new($self->session,"contentProfiling");
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(4));
return $self->session->privilege->insufficient() unless (WebGUI::Grouping::isInGroup(4));
my $fieldInfo;
if($self->session->form->process("fid") && $self->session->form->process("fid") ne "new") {
$fieldInfo = $self->getMetaDataFields($self->session->form->process("fid"));
@ -218,7 +218,7 @@ Verifies that MetaData fields aren't duplicated or blank, assigns default values
sub www_editMetaDataFieldSave {
my $self = shift;
my $ac = WebGUI::AdminConsole->new($self->session,"content profiling");
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(4));
return $self->session->privilege->insufficient() unless (WebGUI::Grouping::isInGroup(4));
$ac->setHelp("metadata edit property","Asset");
# Check for duplicate field names
my $sql = "select count(*) from metaData_properties where fieldName = ".
@ -268,7 +268,7 @@ Returns an AdminConsole to deal with MetaDataFields. If isInGroup(4) is False, r
sub www_manageMetaData {
my $self = shift;
my $ac = WebGUI::AdminConsole->new($self->session,"contentProfiling");
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(4));
return $self->session->privilege->insufficient() unless (WebGUI::Grouping::isInGroup(4));
$ac->addSubmenuItem($self->getUrl('func=editMetaDataField'), WebGUI::International::get("Add new field","Asset"));
my $output;
my $fields = $self->getMetaDataFields();

2
lib/WebGUI/AssetPackage.pm
View file

@ -81,7 +81,7 @@ Returns "". Deploys a Package. If canEdit is Fales, renders an insufficient Priv
sub www_deployPackage {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
my $packageMasterAssetId = $self->session->form->process("assetId");
if (defined $packageMasterAssetId) {
my $packageMasterAsset = WebGUI::Asset->newByDynamicClass($packageMasterAssetId);

10
lib/WebGUI/AssetTrash.pm
View file

@ -142,8 +142,8 @@ Moves self to trash, returns www_view() method of Parent if canEdit. Otherwise r
sub www_delete {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return WebGUI::Privilege::vitalComponent() if (isIn($self->getId, $self->session->setting->get("defaultPage"), $self->session->setting->get("notFoundPage")));
return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->session->privilege->vitalComponent() if (isIn($self->getId, $self->session->setting->get("defaultPage"), $self->session->setting->get("notFoundPage")));
$self->trash;
$self->session->asset = $self->getParent;
return $self->getParent->www_view;
@ -159,7 +159,7 @@ Moves list of assets to trash, returns www_manageAssets() method of self if canE
sub www_deleteList {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
foreach my $assetId ($self->session->request->param("assetId")) {
my $asset = WebGUI::Asset->newByDynamicClass($assetId);
if ($asset->canEdit) {
@ -185,7 +185,7 @@ Returns an AdminConsole to deal with assets in the Trash. If isInGroup(4) is Fal
sub www_manageTrash {
my $self = shift;
my $ac = WebGUI::AdminConsole->new($self->session,"trash");
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(12));
return $self->session->privilege->insufficient() unless (WebGUI::Grouping::isInGroup(12));
my ($header, $limit);
$ac->setHelp("trash manage");
if ($self->session->form->process("systemTrash") && WebGUI::Grouping::isInGroup(3)) {
@ -244,7 +244,7 @@ Restores a piece of content from the trash back to it's original location.
sub www_restoreList {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
foreach my $id ($self->session->request->param("assetId")) {
my $asset = WebGUI::Asset->newByDynamicClass($id);
$asset->publish;

26
lib/WebGUI/AssetVersioning.pm
View file

@ -345,7 +345,7 @@ Displays the add version tag form.
sub www_addVersionTag {
my $self = shift;
my $ac = WebGUI::AdminConsole->new($self->session,"versions");
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(12));
return $self->session->privilege->insufficient() unless (WebGUI::Grouping::isInGroup(12));
my $i18n = WebGUI::International->new("Asset");
$ac->addSubmenuItem($self->getUrl('func=manageVersions'), $i18n->get("manage versions"));
my $f = WebGUI::HTMLForm->new(-action=>$self->getUrl);
@ -375,7 +375,7 @@ Adds a version tag and sets the user's default version tag to that.
sub www_addVersionTagSave {
my $self = shift;
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(12));
return $self->session->privilege->insufficient() unless (WebGUI::Grouping::isInGroup(12));
$self->addVersionTag($self->session->form->process("name"));
return $self->www_manageVersions();
}
@ -385,7 +385,7 @@ sub www_addVersionTagSave {
sub www_commitRevision {
my $self = shift;
return WebGUI::Privilege::adminOnly() unless $self->canEdit;
return $self->session->privilege->adminOnly() unless $self->canEdit;
$self->commit;
return $self->getContainer->www_manageAssets if ($self->session->form->process("proceed") eq "manageAssets");
return $self->getContainer->www_view;
@ -394,7 +394,7 @@ sub www_commitRevision {
sub www_commitVersionTag {
my $self = shift;
return WebGUI::Privilege::adminOnly() unless WebGUI::Grouping::isInGroup(3);
return $self->session->privilege->adminOnly() unless WebGUI::Grouping::isInGroup(3);
my $tagId = $self->session->form->process("tagId");
if ($tagId) {
$self->commitVersionTag($tagId);
@ -413,7 +413,7 @@ Shows a list of the currently available asset version tags.
sub www_manageCommittedVersions {
my $self = shift;
my $ac = WebGUI::AdminConsole->new($self->session,"versions");
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(3));
return $self->session->privilege->insufficient() unless (WebGUI::Grouping::isInGroup(3));
my $i18n = WebGUI::International->new("Asset");
my $rollback = $i18n->get('rollback');
my $rollbackPrompt = $i18n->get('rollback version tag confirm');
@ -447,7 +447,7 @@ Shows a list of the revisions for this asset.
sub www_manageRevisions {
my $self = shift;
my $ac = WebGUI::AdminConsole->new("versions");
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(3));
return $self->session->privilege->insufficient() unless (WebGUI::Grouping::isInGroup(3));
my $i18n = WebGUI::International->new("Asset");
my $output = '<table width=100% class="content">
<tr><th></th><th>Revision Date</th><th>Revised By</th><th>Tag Name</th></tr> ';
@ -478,7 +478,7 @@ Shows a list of the currently available asset version tags.
sub www_manageVersions {
my $self = shift;
my $ac = WebGUI::AdminConsole->new("versions");
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(3));
return $self->session->privilege->insufficient() unless (WebGUI::Grouping::isInGroup(3));
my $i18n = WebGUI::International->new("Asset");
$ac->setHelp("versions manage");
$ac->addSubmenuItem($self->getUrl('func=addVersionTag'), $i18n->get("add a version tag"));
@ -515,7 +515,7 @@ sub www_manageVersions {
sub www_manageRevisionsInTag {
my $self = shift;
my $ac = WebGUI::AdminConsole->new("versions");
return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(3));
return $self->session->privilege->insufficient() unless (WebGUI::Grouping::isInGroup(3));
my $i18n = WebGUI::International->new("Asset");
$ac->addSubmenuItem($self->getUrl('func=addVersionTag'), $i18n->get("add a version tag"));
$ac->addSubmenuItem($self->getUrl('func=manageCommittedVersions'), $i18n->get("manage committed versions"));
@ -545,7 +545,7 @@ sub www_manageRevisionsInTag {
sub www_purgeRevision {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->session->privilege->insufficient() unless $self->canEdit;
my $revisionDate = $self->session->form->process("revisionDate");
return undef unless $revisionDate;
WebGUI::Asset->new($self->getId,$self->get("className"),$revisionDate)->purgeRevision;
@ -560,8 +560,8 @@ sub www_purgeRevision {
sub www_rollbackVersionTag {
my $self = shift;
return WebGUI::Privilege::adminOnly() unless WebGUI::Grouping::isInGroup(3);
return WebGUI::Privilege::vitalComponent() if ($self->session->form->process("tagId") eq "pbversion0000000000001" || $self->session->form->process("tagId") eq "pbversion0000000000002");
return $self->session->privilege->adminOnly() unless WebGUI::Grouping::isInGroup(3);
return $self->session->privilege->vitalComponent() if ($self->session->form->process("tagId") eq "pbversion0000000000001" || $self->session->form->process("tagId") eq "pbversion0000000000002");
my $tagId = $self->session->form->process("tagId");
if ($tagId) {
$self->rollbackVersionTag($tagId);
@ -576,7 +576,7 @@ sub www_rollbackVersionTag {
sub www_rollbackSiteToTime {
my $self = shift;
return WebGUI::Privilege::adminOnly() unless WebGUI::Grouping::isInGroup(3);
return $self->session->privilege->adminOnly() unless WebGUI::Grouping::isInGroup(3);
}
@ -591,7 +591,7 @@ Sets the current user's working version tag.
sub www_setVersionTag () {
my $self = shift;
return WebGUI::Privilege::insufficient() unless WebGUI::Grouping::isInGroup(12);
return $self->session->privilege->insufficient() unless WebGUI::Grouping::isInGroup(12);
$self->session->scratch->set("versionTag",$self->session->form->process("tagId"));
return $self->www_manageVersions();
}

6
lib/WebGUI/Auth.pm
View file

@ -278,8 +278,8 @@ Auth method that the form for creating users should call
sub deactivateAccount {
my $self = shift;
my $method = $_[0];
return WebGUI::Privilege::vitalComponent() if($self->userId eq '1' || $self->userId eq '3');
return WebGUI::Privilege::adminOnly() if(!$self->session->setting->get("selfDeactivation"));
return $self->session->privilege->vitalComponent() if($self->userId eq '1' || $self->userId eq '3');
return $self->session->privilege->adminOnly() if(!$self->session->setting->get("selfDeactivation"));
my %var;
$var{title} = WebGUI::International::get(42);
$var{question} = WebGUI::International::get(60);
@ -300,7 +300,7 @@ Superclass method that performs general functionality for deactivating accounts.
sub deactivateAccountConfirm {
my $self = shift;
return WebGUI::Privilege::vitalComponent() if($self->userId eq '1' || $self->userId eq '3');
return $self->session->privilege->vitalComponent() if($self->userId eq '1' || $self->userId eq '3');
my $u = $self->user;
$u->status("Selfdestructed");
$self->session->var->end();

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:

85
lib/WebGUI/Privilege.pm → lib/WebGUI/Session/Privilege.pm
View file

@ -1,4 +1,4 @@
package WebGUI::Privilege;
package WebGUI::Session::Privilege;
=head1 LEGAL
@ -15,14 +15,11 @@ package WebGUI::Privilege;
=cut
use strict;
use WebGUI::HTTP;
use WebGUI::International;
use WebGUI::Operation::Shared;
use WebGUI::Session;
=head1 NAME
Package WebGUI::Privilege
Package WebGUI::Session::Privilege
=head1 DESCRIPTION
@ -30,16 +27,22 @@ This package provides access to the WebGUI security system and security messages
=head1 SYNOPSIS
use WebGUI::Privilege;
$html = WebGUI::Privilege::adminOnly();
$html = WebGUI::Privilege::insufficient();
$html = WebGUI::Privilege::noAccess();
$html = WebGUI::Privilege::notMember();
$html = WebGUI::Privilege::vitalComponent();
use WebGUI::Session::Privilege;
$privilege = $session->privilege;
$privilege = WebGUI::Session::Privilege->new($session);
$html = $privilege->adminOnly();
$html = $privilege->insufficient();
$html = $privilege->noAccess();
$html = $privilege->notMember();
$html = $privilege->vitalComponent();
=head1 METHODS
These functions are available from this package:
These methods are available from this class:
=cut
@ -52,11 +55,12 @@ Returns a message stating that this functionality can only be used by administra
=cut
sub adminOnly {
WebGUI::HTTP::setStatus("401", "Admin Only");
my $self = shift;
$self->session->http->setStatus("401", "Admin Only");
my ($output, $sth, @data);
$output = '<h1>'.WebGUI::International::get(35).'</h1>';
$output .= WebGUI::International::get(36);
return WebGUI::Operation::Shared::userStyle($output);
return $self->session->style->userStyle($output);
}
@ -69,12 +73,32 @@ Returns a message stating that the user does not have the required privileges to
=cut
sub insufficient {
WebGUI::HTTP::setStatus("401", "Insufficient Privileges");
my $self = shift;
$self->session->http->setStatus("401", "Insufficient Privileges");
my ($output);
$output = '<h1>'.WebGUI::International::get(37).'</h1>';
$output .= WebGUI::International::get(38);
$output .= '<p>';
return WebGUI::Operation::Shared::userStyle($output);
return $self->session->style->userStyle($output);
}
#-------------------------------------------------------------------
=head2 new ( session )
Constructor.
=head3 session
A reference to the current session.
=cut
sub new {
my $class = shift;
my $session = shift;
bless {_session=>$session}, $class;
}
@ -87,14 +111,15 @@ Returns a message stating that the user does not have the privileges necessary t
=cut
sub noAccess {
WebGUI::HTTP::setStatus("401", "No Access");
my $self = shift;
$self->session->http->setStatus("401", "No Access");
if ($self->session->user->profileField("userId") eq '1') {
return WebGUI::Operation::Auth::www_auth("init");
} else {
my $output = '<h1>'.WebGUI::International::get(37).'</h1>';
$output .= WebGUI::International::get(39);
$output .= '<p>';
return WebGUI::Operation::Shared::userStyle($output);
return $self->session->style->userStyle($output);
}
}
@ -107,14 +132,29 @@ Returns a message stating that the user they requested information about is no l
=cut
sub notMember {
WebGUI::HTTP::setStatus("400", "Not A Member");
my $self = shift;
$self->session->http->setStatus("400", "Not A Member");
my ($output);
$output = '<h1>'.WebGUI::International::get(345).'</h1>';
$output .= WebGUI::International::get(346);
$output .= '<p>';
return WebGUI::Operation::Shared::userStyle($output);
return $self->session->style->userStyle($output);
}
#-------------------------------------------------------------------
=head2 session
Returns a reference to the current session.
=cut
sub session {
my $self = shift;
return $self->{_session};
}
#-------------------------------------------------------------------
=head2 vitalComponent ( )
@ -124,12 +164,13 @@ Returns a message stating that the user made a request to delete something that
=cut
sub vitalComponent {
WebGUI::HTTP::setStatus("403", "Vital Component");
my $self = shift;
$self->session->http->setStatus("403", "Vital Component");
my ($output);
$output = '<h1>'.WebGUI::International::get(40).'</h1>';
$output .= WebGUI::International::get(41);
$output .= '<p>';
return WebGUI::Operation::Shared::userStyle($output);
return $self->session->style->userStyle($output);
}

21
lib/WebGUI/Session/Style.pm
View file

@ -331,5 +331,26 @@ sub useEmptyStyle {
$self->{_useEmptyStyle} = shift;
}
#-------------------------------------------------------------------
=head2 userStyle ( content )
Wrapper's the content in the user style defined in the settings.
=head3 content
The content to be wrappered.
=cut
sub userStyle {
my $self = shift;
my $output = shift;
if ($output) {
return $self->process($output,$self->session->setting->get("userFunctionStyleId"));
} else {
return undef;
}
}
1;