bug fixes

This commit is contained in:
JT Smith 2005-02-23 16:43:08 +00:00
parent 54e2b5f8ea
commit 1dc555e078
35 changed files with 152 additions and 153 deletions

View file

@ -431,7 +431,7 @@ sub www_editSave {
if ($session{form}{assetId} eq "new") {
$self = $self->getParent() if ($self->getValue("className") eq "WebGUI::Asset::Event");
return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless ($self->canEdit);
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
my (@startDate, @endDate, @regStartDate, @regEndDate, @reminderStartDate,
@reminderEndDate, $until, @eventId, $i, $recurringEventId);
$startDate[0] = WebGUI::DateTime::setToEpoch($session{form}{eventStartDate});

View file

@ -85,13 +85,6 @@ sub definition {
}
#-------------------------------------------------------------------
sub DESTROY {
my $self = shift;
$self->{_storageLocation}->DESTROY if (exists $self->{_storageLocation});
$self->SUPER::DESTROY;
}
#-------------------------------------------------------------------
sub duplicate {

View file

@ -801,14 +801,14 @@ sub www_deny {
sub www_edit {
my $self = shift;
my %var = %{$self->getTemplateVars};
$var{'form.header'} = WebGUI::Form::formHeader({action=>$self->getParent->getUrl})
.WebGUI::Form::hidden({
name=>"func",
value=>"add"
});
my $content;
my $title;
if ($session{form}{func} eq "add") { # new post
$var{'form.header'} = WebGUI::Form::formHeader({action=>$self->getParent->getUrl})
.WebGUI::Form::hidden({
name=>"func",
value=>"add"
});
$var{'isNewPost'} = 1;
$var{'form.header'} .= WebGUI::Form::hidden({
name=>"assetId",
@ -819,7 +819,7 @@ sub www_edit {
});
if ($session{form}{class} eq "WebGUI::Asset::Post") { # new reply
$self->{_thread} = $self->getParent->getThread;
return $self->getThread->getParent->processStyle(WebGUI::Privilege::insufficient()) unless ($self->getThread->canReply);
return WebGUI::Privilege::insufficient() unless ($self->getThread->canReply);
$var{isReply} = 1;
if ($session{form}{content} || $session{form}{title}) {
$content = $session{form}{content};
@ -834,7 +834,7 @@ sub www_edit {
value=>$session{form}{subscribe}
});
} elsif ($session{form}{class} eq "WebGUI::Asset::Post::Thread") { # new thread
return $self->getThread->getParent->processStyle(WebGUI::Privilege::insufficient()) unless ($self->getThread->getParent->canPost);
return WebGUI::Privilege::insufficient() unless ($self->getThread->getParent->canPost);
$var{isNewThread} = 1;
if ($self->getThread->getParent->canModerate) {
$var{'sticky.form'} = WebGUI::Form::yesNo({
@ -853,7 +853,12 @@ sub www_edit {
}
$content .= "\n\n".$session{user}{signature} if ($session{user}{signature});
} else { # edit
return $self->getThread->getParent->processStyle(WebGUI::Privilege::insufficient()) unless ($self->canEdit);
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
$var{'form.header'} = WebGUI::Form::formHeader({action=>$self->getUrl})
.WebGUI::Form::hidden({
name=>"func",
value=>"edit"
});
$var{isEdit} = 1;
$content = $self->getValue("content");
$title = $self->getValue("title");

View file

@ -702,7 +702,7 @@ sub www_unsubscribe {
#-------------------------------------------------------------------
sub www_view {
my $self = shift;
return $self->getParent->processStyle(WebGUI::Privilege::noAccess()) unless $self->canView;
return WebGUI::Privilege::noAccess() unless $self->canView;
return $self->getParent->processStyle($self->view);
}

View file

@ -560,8 +560,8 @@ Renders self->view based upon current style, subject to timeouts. Returns Privil
=cut
sub www_view {
my $self = shift;
return WebGUI::Privilege::noAccess() unless $self->canView;
$self->logView();
return $self->processStyle(WebGUI::Privilege::noAccess()) unless $self->canView;
my $cache;
my $output;
my $useCache = (

View file

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

View file

@ -817,7 +817,7 @@ sub view {
#-------------------------------------------------------------------
sub www_edit {
my $self = shift;
return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
# $self->getAdminConsole->setHelp("user submission system add/edit");
return $self->getAdminConsole->render($self->getEditForm->print,"Edit Collaboration System");
}
@ -873,6 +873,7 @@ sub www_search {
$var{'form.search'} = WebGUI::Form::submit({value=>WebGUI::International::get(170)});
$var{'form.end'} = WebGUI::Form::formFooter();
$var{'back.url'} = $self->getUrl;
$self->appendTemplateLabels(\%var);
$var{doit} = $session{form}{doit};
if ($session{form}{doit}) {
my @fieldsToSearch = qw(asset.title asset.synopsis Post.content Post.username Post.userDefined1 Post.userDefined2 Post.userDefined3 Post.userDefined4 Post.userDefined5);

View file

@ -617,7 +617,7 @@ sub view {
#-------------------------------------------------------------------
sub www_deleteEntry {
my $self = shift;
return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
my $entryId = $session{form}{entryId};
$self->deleteCollateral("DataForm_entry","DataForm_entryId",$entryId);
$session{form}{entryId} = 'list';
@ -627,7 +627,7 @@ sub www_deleteEntry {
#-------------------------------------------------------------------
sub www_deleteFieldConfirm {
my $self = shift;
return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
$self->deleteCollateral("DataForm_field","DataForm_fieldId",$session{form}{fid});
$self->reorderCollateral("DataForm_field","DataForm_fieldId");
return "";
@ -636,7 +636,7 @@ sub www_deleteFieldConfirm {
#-------------------------------------------------------------------
sub www_deleteTabConfirm {
my $self = shift;
return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
$self->deleteCollateral("DataForm_tab","DataForm_tabId",$session{form}{tid});
$self->deleteCollateral("DataForm_field","DataForm_tabId",$session{form}{tid});
$self->reorderCollateral("DataForm_tab","DataForm_tabId");
@ -646,7 +646,7 @@ sub www_deleteTabConfirm {
#-------------------------------------------------------------------
sub www_edit {
my $self = shift;
return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
$self->getAdminConsole->setHelp("data form add/edit");
return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("7","DataForm"));
}
@ -654,7 +654,7 @@ sub www_edit {
#-------------------------------------------------------------------
sub www_editField {
my $self = shift;
return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
my (%field, $f, %fieldStatus,$tab);
tie %field, 'Tie::CPHash';
tie %fieldStatus, 'Tie::IxHash';
@ -764,7 +764,7 @@ sub www_editField {
#-------------------------------------------------------------------
sub www_editFieldSave {
my $self = shift;
return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
$session{form}{name} = $session{form}{label} if ($session{form}{name} eq "");
$session{form}{tid} = "0" if ($session{form}{tid} eq "");
$session{form}{name} = WebGUI::URL::urlize($session{form}{name});
@ -800,7 +800,7 @@ sub www_editFieldSave {
#-------------------------------------------------------------------
sub www_editTab {
my $self = shift;
return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
my (%tab, $f);
tie %tab, 'Tie::CPHash';
$session{form}{tid} = "new" if ($session{form}{tid} eq "");
@ -840,7 +840,7 @@ sub www_editTab {
#-------------------------------------------------------------------
sub www_editTabSave {
my $self = shift;
return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
$session{form}{name} = $session{form}{label} if ($session{form}{name} eq "");
$session{form}{name} = WebGUI::URL::urlize($session{form}{name});
$session{form}{name} =~ s/\-//g;
@ -860,7 +860,7 @@ sub www_editTabSave {
#-------------------------------------------------------------------
sub www_exportTab {
my $self = shift;
return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
WebGUI::HTTP::setFilename($self->get("url").".tab","text/plain");
my %fields = WebGUI::SQL->buildHash("select DataForm_fieldId,name from DataForm_field where assetId=".quote($self->getId)." order by sequenceNumber");
my $select = "select a.DataForm_entryId as entryId, a.ipAddress, a.username, a.userId, a.submissionDate";
@ -883,7 +883,7 @@ sub www_exportTab {
#-------------------------------------------------------------------
sub www_moveFieldDown {
my $self = shift;
return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
$self->moveCollateralDown("DataForm_field","DataForm_fieldId",$session{form}{fid},_tonull("DataForm_tabId",$session{form}{tid}));
return "";
}
@ -891,7 +891,7 @@ sub www_moveFieldDown {
#-------------------------------------------------------------------
sub www_moveFieldUp {
my $self = shift;
return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
$self->moveCollateralUp("DataForm_field","DataForm_fieldId",$session{form}{fid},_tonull("DataForm_tabId",$session{form}{tid}));
return "";
}
@ -899,7 +899,7 @@ sub www_moveFieldUp {
#-------------------------------------------------------------------
sub www_moveTabRight {
my $self = shift;
return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
$self->moveCollateralDown("DataForm_tab","DataForm_tabId",$session{form}{tid});
return "";
}
@ -907,7 +907,7 @@ sub www_moveTabRight {
#-------------------------------------------------------------------
sub www_moveTabLeft {
my $self = shift;
return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
$self->moveCollateralUp("DataForm_tab","DataForm_tabId",$session{form}{tid});
return "";
}

View file

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

View file

@ -175,7 +175,7 @@ sub view {
sub www_edit {
my $self = shift;
return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->getAdminConsole->render($self->getEditForm->print,"Edit Folder");
}

View file

@ -344,7 +344,7 @@ sub view {
#-------------------------------------------------------------------
sub www_edit {
my $self = shift;
return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
$self->getAdminConsole->setHelp("http proxy add/edit");
return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("2","HttpProxy"));
}

View file

@ -390,7 +390,7 @@ sub view {
#-------------------------------------------------------------------
sub www_edit {
my $self = shift;
return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
$self->getAdminConsole->setHelp("search add/edit");
return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("26","Article"));
}

View file

@ -198,13 +198,13 @@ sub view {
sub www_edit {
my $self = shift;
return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
return $self->getAdminConsole->render($self->getEditForm->print,"Edit Layout");
}
sub www_setContentPositions {
my $self = shift;
return WebGUI::Style::process(WebGUI::Privilege::insufficient(),$self->get("styleTemplateId")) unless ($self->canEdit);
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
$self->update({
contentPositions=>$session{form}{map}
});

View file

@ -119,7 +119,7 @@ sub view {
#-------------------------------------------------------------------
sub www_edit {
my $self = shift;
return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
$self->getAdminConsole->setHelp("message board add/edit");
return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("6","MessageBoard"));
}

View file

@ -356,7 +356,7 @@ sub view {
sub www_edit {
my $self = shift;
return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
$self->getAdminConsole->setHelp("navigation add/edit");
return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("22","Navigation"));
}

View file

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

View file

@ -452,7 +452,7 @@ sub www_deleteSpecificationConfirm {
#-------------------------------------------------------------------
sub www_edit {
my $self = shift;
return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
$self->getAdminConsole->setHelp("product add/edit");
return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("6","Product"));
}

View file

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

View file

@ -666,7 +666,7 @@ sub www_deleteAllResponsesConfirm {
#-------------------------------------------------------------------
sub www_edit {
my $self = shift;
return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
$self->getAdminConsole->setHelp("survey add/edit");
return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get(2,'Survey'));
}
@ -687,7 +687,7 @@ sub www_editAnswer {
my ($question, $f, $answer, $self);
$self = shift;
return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless ($self->canEdit);
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
$answer = $self->getCollateral("Survey_answer","Survey_answerId",$session{form}{aid});
$f = WebGUI::HTMLForm->new(-action=>$self->getUrl);
@ -768,7 +768,7 @@ sub www_editQuestion {
my ($f, $question, $answerFieldType, $sth, %data, $self);
$self = shift;
return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless ($self->canEdit);
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
tie %data, 'Tie::CPHash';
$question = $self->getCollateral("Survey_question","Survey_questionId",$session{form}{qid});

View file

@ -389,7 +389,7 @@ sub view {
#-------------------------------------------------------------------
sub www_edit {
my $self = shift;
return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
$self->getAdminConsole->setHelp("syndicated content add/edit");
return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("4","SyndicatedContent"));
}

View file

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