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

finally, the last of this round of syntax fixes.

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

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

@ -40,11 +40,11 @@ sub definition {
},
eventStartDate => {
fieldType=>"dateTime",
defaultValue=$session->datetime->time()
defaultValue=>$session->datetime->time()
},
eventEndDate => {
fieldType=>"dateTime",
defaultValue=$session->datetime->time()
defaultValue=>$session->datetime->time()
},
EventsCalendar_recurringId => {
fieldType=>"hidden",

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

@ -159,7 +159,7 @@ sub getEditForm {
);
$tabform->getTab("properties")->text (
-name=>"showPage",
-label=$i18n->get('show page'),
-label=>$i18n->get('show page'),
-value=>$self->getValue("showPage"),
-hoverHelp=>$i18n->get('show page description'),
);

7
lib/WebGUI/Asset/FilePile.pm
View file

@ -106,7 +106,8 @@ sub edit {
}
my $clause;
if ($self->session->user->isInGroup(3)) {
my $contentManagers = $group->getUsers(4,1);
my $group = WebGUI::Group->new($self->session,4);
my $contentManagers = $group->getUsers(1);
push (@$contentManagers, $self->session->user->userId);
$clause = "userId in (".$self->session->db->quoteAndJoin($contentManagers).")";
} else {
@ -160,7 +161,7 @@ sub editSave {
$className = "WebGUI::Asset::File::Image" if ($storage->isImage($filename));
foreach my $definition (@{$className->definition}) {
foreach my $property (keys %{$definition->{properties}}) {
$data{$property} = $self->session->form->process(
$data{$property} = $class->session->form->process(
$property,
$definition->{properties}{$property}{fieldType},
$definition->{properties}{$property}{defaultValue}
@ -180,7 +181,7 @@ sub editSave {
$newAsset->commit;
}
$tempStorage->delete;
return $class->getParent->www_manageAssets if ($self->session->form->process("proceed") eq "manageAssets");
return $class->getParent->www_manageAssets if ($class->session->form->process("proceed") eq "manageAssets");
return $class->getParent->www_view;
}

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

@ -663,7 +663,7 @@ sub www_getUserPrefsForm {
$f->submit({extras=>'className="nothing"'});
$f->raw('</table>');
my $tags;
foreach my $tag (@{$session{page}{head}{javascript}}) {
foreach my $tag (@{$self->session->style->{_javascript}}) {
$tags .= '<script';
foreach my $name (keys %{$tag}) {
$tags .= ' '.$name.'="'.$tag->{$name}.'"';
@ -708,7 +708,7 @@ sub www_saveUserPrefs {
$self->uncacheOverrides;
my $i18n = WebGUI::International->new($self->session);
my $u = WebGUI::User->new($self->discernUserId);
foreach my $fieldId (keys %{$session{form}}) {
foreach my $fieldId ($self->request->params) {
my $field = WebGUI::ProfileField->new($self->session,$fieldId);
next unless $field;
$data{$field->getId} = $field->formProcess;

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

@ -98,7 +98,7 @@ Returns the TabForm object that will be used in generating the edit page for thi
sub getEditForm {
my $self = shift;
my $tabform = $self->SUPER::getEditForm();
my $i18n = WebGUI::International->new($session,"Asset_Snippet");
my $i18n = WebGUI::International->new($self->session,"Asset_Snippet");
my %mimeTypes;
foreach ('text/html','text/css','text/javascript','text/plain','text/xml','application/xml') {
$mimeTypes{$_}=$_;

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

@ -575,8 +575,8 @@ sub processPropertiesFromFormPost {
});
}
if ($self->session->form->process("fid") eq "new") { # hack to get proceed to work.
$session->stow->set('whatNext',$self->session->form->process("proceed"));
} else { $session->stow->set('whatNext','nothing'); }
$self->session->stow->set('whatNext',$self->session->form->process("proceed"));
} else { $self->session->stow->set('whatNext','nothing'); }
}
#-------------------------------------------------------------------
@ -1054,7 +1054,7 @@ sub www_process {
userId=>$self->session->user->userId,
username=>$self->session->user->username,
ipAddress=>$self->session->env->get("REMOTE_ADDR"),
submissionDate=$self->session->datetime->time()
submissionDate=>$self->session->datetime->time()
},0);
my ($var, %row, @errors, $updating, $hadErrors);
$var->{entryId} = $entryId;

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

@ -147,7 +147,7 @@ sub getEditForm {
%options = (
"last"=>$i18n->get(85),
"after12"=>$i18n->get(86),
"after9"=$i18n->get(87),
"after9"=>$i18n->get(87),
"after6"=>$i18n->get(88),
"after3"=>$i18n->get(89),
"current"=>$i18n->get(82)

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

@ -51,6 +51,7 @@ where users.userId=?";
#-------------------------------------------------------------------
sub _fetchDepartments {
my $self = shift;
return $self->session->db->buildArray("select fieldData from userProfileData where fieldName='department' GROUP by fieldData");
}
@ -404,7 +405,7 @@ sub www_viewReport {
-value=>$endDate
);
my %depHash;
%depHash = map { $_ => $_ } (_fetchDepartments(),
%depHash = map { $_ => $_ } ($self->_fetchDepartments(),
$i18n->get('all departments'));
my $defaultDepartment = $self->session->form->process("selectDepartment")
|| $i18n->get('all departments');

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

@ -540,12 +540,13 @@ sub _getContentTypes {
#-------------------------------------------------------------------
sub _getSearchablePages {
my $self = shift;
my $searchRoot = shift;
my %pages;
my $sth = $self->session->db->read("select assetId from asset where parentId = ".$self->session->db->quote($searchRoot));
while (my %data = $sth->hash) {
$pages{$data{assetId}} = 1;
%pages = (%pages, _getSearchablePages($data{assetId}) );
%pages = (%pages, $self->_getSearchablePages($data{assetId}) );
}
return %pages;
}

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

@ -154,6 +154,7 @@ sub hasRated {
#-------------------------------------------------------------------
sub incrementCounter {
my $self = shift;
my $listingId = shift;
my $counter = shift;
my ($lastIp) = $self->session->db->quickArray("select ".$counter."LastIp from Matrix_listing where listingId = ".$self->session->db->quote($listingId));
@ -211,7 +212,7 @@ sub www_approveListing {
#-------------------------------------------------------------------
sub www_click {
my $self = shift;
incrementCounter($self->session->form->process("listingId"),"clicks");
$self->incrementCounter($self->session->form->process("listingId"),"clicks");
my $listing = $self->session->db->getRow("Matrix_listing","listingId",$self->session->form->process("listingId"));
if ($self->session->form->process("m")) {
$self->session->http->setRedirect($listing->{manufacturerUrl});
@ -238,7 +239,7 @@ sub www_compare {
return $self->processStyle($self->processTemplate(\%var,$self->get("compareTemplateId")));
}
foreach my $cms (@cmsList) {
incrementCounter($cms,"compares");
$self->incrementCounter($cms,"compares");
my $data = $self->session->db->quickHashRef("select listingId, productName, versionNumber, lastUpdated
from Matrix_listing where listingId=".$self->session->db->quote($cms));
push(@prodcol, {
@ -305,6 +306,7 @@ sub www_compare {
#-------------------------------------------------------------------
sub www_copy {
my $self = shift;
my $i18n = WebGUI::International->new($self->session,'Asset_Matrix');
return $i18n->get('no copy');
}
@ -593,8 +595,8 @@ sub www_editListingSave {
url=>$self->session->form->process("productName"),
groupIdView=>7,
groupIdEdit=>3,
startDate=$self->session->datetime->time(),
endDate=$self->session->datetime->time()+60*60*24*365*15,
startDate=>$self->session->datetime->time(),
endDate=>$self->session->datetime->time()+60*60*24*365*15,
displayLastReply => 0,
allowReplies => 1,
threadsPerPage => 30,
@ -766,7 +768,7 @@ sub www_rate {
$lastRating = $self->session->form->process($category);
}
return $self->www_viewDetail("",1) if ($hasRated || $sameRating); # Throw out ratings that are all the same number, or if the user rates twice.
$self->setRatings($self->session->form->process("listingId"),$session{form});
$self->setRatings($self->session->form->process("listingId"),$self->session->form->paramsHashRef);
return $self->www_viewDetail;
}
@ -977,7 +979,7 @@ sub www_viewDetail {
}
$var{'email.wasSent'} = 1;
} else {
incrementCounter($listingId,"views");
$self->incrementCounter($listingId,"views");
}
$var{'edit.url'} = $self->formatURL("editListing",$listingId);
$var{id} = $listingId;

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

@ -23,7 +23,7 @@ our @ISA = qw(WebGUI::Asset::Wobject);
#-------------------------------------------------------------------
sub addAnswer {
my $i18n = WebGUI::International->new($self->session,'Asset_Survey');
my $i18n = WebGUI::International->new($_[0]->session,'Asset_Survey');
$_[0]->setCollateral("Survey_answer","Survey_answerId",{
Survey_id=>$_[0]->get("Survey_id"),
Survey_questionId=>$_[2],
@ -571,12 +571,12 @@ sub processPropertiesFromFormPost {
}
#-------------------------------------------------------------------
sub purge {
my ($count) = $self->session->db->quickArray("select count(*) from Survey where Survey_id=".$self->session->db->quote($_[0]->get("Survey_id")));
my ($count) = $_[0]->session->db->quickArray("select count(*) from Survey where Survey_id=".$_[0]->session->db->quote($_[0]->get("Survey_id")));
if ($count < 2) { ### Check for other wobjects using this survey.
$self->session->db->write("delete from Survey_question where Survey_id=".$self->session->db->quote($_[0]->get("Survey_id")));
$self->session->db->write("delete from Survey_answer where Survey_id=".$self->session->db->quote($_[0]->get("Survey_id")));
$self->session->db->write("delete from Survey_response where Survey_id=".$self->session->db->quote($_[0]->get("Survey_id")));
$self->session->db->write("delete from Survey_section where Survey_id=".$self->session->db->quote($_[0]->get("Survey_id")));
$_[0]->session->db->write("delete from Survey_question where Survey_id=".$_[0]->session->db->quote($_[0]->get("Survey_id")));
$_[0]->session->db->write("delete from Survey_answer where Survey_id=".$_[0]->session->db->quote($_[0]->get("Survey_id")));
$_[0]->session->db->write("delete from Survey_response where Survey_id=".$_[0]->session->db->quote($_[0]->get("Survey_id")));
$_[0]->session->db->write("delete from Survey_section where Survey_id=".$_[0]->session->db->quote($_[0]->get("Survey_id")));
}
$_[0]->SUPER::purge();
}
@ -694,79 +694,79 @@ sub view {
#-------------------------------------------------------------------
sub www_deleteAnswerConfirm {
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]->session->privilege->insufficient() unless ($_[0]->canEdit);
my ($answerCount) = $_[0]->session->db->quickArray("select count(*) from Survey_answer where Survey_questionId=".$_[0]->session->db->quote($_[0]->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")));
$_[0]->deleteCollateral("Survey_answer","Survey_answerId",$self->session->form->process("aid"));
$_[0]->session->db->write("delete from Survey_questionResponse where Survey_answerId=".$_[0]->session->db->quote($_[0]->session->form->process("aid")));
$_[0]->deleteCollateral("Survey_answer","Survey_answerId",$_[0]->session->form->process("aid"));
$_[0]->reorderCollateral("Survey_answer","Survey_answerId","Survey_id");
return $_[0]->www_editQuestion;
}
#-------------------------------------------------------------------
sub www_deleteQuestionConfirm {
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"));
return $_[0]->session->privilege->insufficient() unless ($_[0]->canEdit);
$_[0]->session->db->write("delete from Survey_answer where Survey_questionId=".$_[0]->session->db->quote($_[0]->session->form->process("qid")));
$_[0]->session->db->write("delete from Survey_questionResponse where Survey_questionId=".$_[0]->session->db->quote($_[0]->session->form->process("qid")));
$_[0]->deleteCollateral("Survey_question","Survey_questionId",$_[0]->session->form->process("qid"));
$_[0]->reorderCollateral("Survey_question","Survey_questionId","Survey_id");
return "";
}
#-------------------------------------------------------------------
sub www_deleteSectionConfirm {
return $self->session->privilege->insufficient() unless ($_[0]->canEdit);
my $i18n = WebGUI::International->new($self->session,'Asset_Survey');
return $_[0]->session->privilege->insufficient() unless ($_[0]->canEdit);
my $i18n = WebGUI::International->new($_[0]->session,'Asset_Survey');
my $none = $i18n->get(107);
my ($sectionName) = $self->session->db->quickArray("select sectionName from Survey_section where Survey_sectionId="
.$self->session->db->quote($self->session->form->process("sid")));
my ($sectionName) = $_[0]->session->db->quickArray("select sectionName from Survey_section where Survey_sectionId="
.$_[0]->session->db->quote($_[0]->session->form->process("sid")));
if ($sectionName =~ /$none/) {
return $self->session->privilege->vitalComponent();
return $_[0]->session->privilege->vitalComponent();
}
$self->session->db->write("delete from Survey_section where Survey_sectionId=".$self->session->db->quote($self->session->form->process("sid")));
$_[0]->deleteCollateral("Survey_section","Survey_sectionId",$self->session->form->process("sid"));
$_[0]->session->db->write("delete from Survey_section where Survey_sectionId=".$_[0]->session->db->quote($_[0]->session->form->process("sid")));
$_[0]->deleteCollateral("Survey_section","Survey_sectionId",$_[0]->session->form->process("sid"));
$_[0]->reorderCollateral("Survey_section","Survey_sectionId","Survey_id");
return "";
}
#-------------------------------------------------------------------
sub www_deleteResponse {
return "" unless ($self->session->user->isInGroup($_[0]->get("groupToViewReports")));
my $i18n = WebGUI::International->new($self->session, 'Asset_Survey');
return $self->session->style->process($_[0]->confirm($i18n->get(72),
$_[0]->getUrl('func=deleteResponseConfirm;responseId='.$self->session->form->process("responseId"))),$_[0]->getValue("styleTemplateId"));
return "" unless ($_[0]->session->user->isInGroup($_[0]->get("groupToViewReports")));
my $i18n = WebGUI::International->new($_[0]->session, 'Asset_Survey');
return $_[0]->session->style->process($_[0]->confirm($i18n->get(72),
$_[0]->getUrl('func=deleteResponseConfirm;responseId='.$_[0]->session->form->process("responseId"))),$_[0]->getValue("styleTemplateId"));
}
#-------------------------------------------------------------------
sub www_deleteResponseConfirm {
return "" unless ($self->session->user->isInGroup($_[0]->get("groupToViewReports")));
$self->session->db->write("delete from Survey_response where Survey_responseId=".$self->session->db->quote($self->session->form->process("responseId")));
$self->session->db->write("delete from Survey_questionResponse where Survey_responseId=".$self->session->db->quote($self->session->form->process("responseId")));
return "" unless ($_[0]->session->user->isInGroup($_[0]->get("groupToViewReports")));
$_[0]->session->db->write("delete from Survey_response where Survey_responseId=".$_[0]->session->db->quote($_[0]->session->form->process("responseId")));
$_[0]->session->db->write("delete from Survey_questionResponse where Survey_responseId=".$_[0]->session->db->quote($_[0]->session->form->process("responseId")));
return $_[0]->www_viewGradebook;
}
#-------------------------------------------------------------------
sub www_deleteAllResponses {
return "" unless ($self->session->user->isInGroup($_[0]->get("groupToViewReports")));
my $i18n = WebGUI::International->new($self->session,'Asset_Survey');
return $self->session->style->process($_[0]->confirm($i18n->get(74),$_[0]->getUrl('func=deleteAllResponsesConfirm')),$_[0]->getValue("styleTemplateId"));
return "" unless ($_[0]->session->user->isInGroup($_[0]->get("groupToViewReports")));
my $i18n = WebGUI::International->new($_[0]->session,'Asset_Survey');
return $_[0]->session->style->process($_[0]->confirm($i18n->get(74),$_[0]->getUrl('func=deleteAllResponsesConfirm')),$_[0]->getValue("styleTemplateId"));
}
#-------------------------------------------------------------------
sub www_deleteAllResponsesConfirm {
return "" unless ($self->session->user->isInGroup($_[0]->get("groupToViewReports")));
$self->session->db->write("delete from Survey_response where Survey_id=".$self->session->db->quote($_[0]->get("Survey_id")));
$self->session->db->write("delete from Survey_questionResponse where Survey_id=".$self->session->db->quote($_[0]->get("Survey_id")));
return "" unless ($_[0]->session->user->isInGroup($_[0]->get("groupToViewReports")));
$_[0]->session->db->write("delete from Survey_response where Survey_id=".$_[0]->session->db->quote($_[0]->get("Survey_id")));
$_[0]->session->db->write("delete from Survey_questionResponse where Survey_id=".$_[0]->session->db->quote($_[0]->get("Survey_id")));
return "";
}
#-------------------------------------------------------------------
sub www_editSave {
return $self->session->privilege->insufficient() unless ($_[0]->canEdit);
return $_[0]->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";
if ($_[0]->session->form->process("proceed") eq "addQuestion") {
$_[0]->session->form->process("qid") = "new";
return $_[0]->www_editQuestion;
}
return $output;
@ -774,17 +774,15 @@ sub www_editSave {
#-------------------------------------------------------------------
sub www_editAnswer {
my ($question, $f, $answer, $self);
$self = shift;
return $self->session->privilege->insufficient() unless ($self->canEdit);
my ($question, $f, $answer);
return $_[0]->session->privilege->insufficient() unless ($_[0]->canEdit);
my $i18n = WebGUI::International->new($self->session,'Asset_Survey');
$answer = $self->getCollateral("Survey_answer","Survey_answerId",$self->session->form->process("aid"));
$f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
my $i18n = WebGUI::International->new($_[0]->session,'Asset_Survey');
$answer = $_[0]->getCollateral("Survey_answer","Survey_answerId",$_[0]->session->form->process("aid"));
$f = WebGUI::HTMLForm->new($_[0]->session,-action=>$_[0]->getUrl);
$f->hidden(
-name => "assetId",
-value => $self->session->form->process("assetId")
-value => $_[0]->session->form->process("assetId")
);
$f->hidden(
-name => "func",
@ -792,7 +790,7 @@ sub www_editAnswer {
);
$f->hidden(
-name => "qid",
-value => $self->session->form->process("qid")
-value => $_[0]->session->form->process("qid")
);
$f->hidden(
-name => "aid",
@ -804,7 +802,7 @@ sub www_editAnswer {
-label=>$i18n->get(19),
-hoverHelp=>$i18n->get('19 description')
);
if ($self->get("mode") eq "quiz") {
if ($_[0]->get("mode") eq "quiz") {
$f->yesNo(
-name=>"isCorrect",
-value=>$answer->{isCorrect},
@ -817,9 +815,9 @@ sub www_editAnswer {
-value => 0
);
}
if ($self->get("questionOrder") eq "response") {
$question = $self->session->db->buildHashRef("select Survey_questionId,question
from Survey_question where Survey_id=".$self->session->db->quote($self->get("Survey_id"))." order by sequenceNumber");
if ($_[0]->get("questionOrder") eq "response") {
$question = $_[0]->session->db->buildHashRef("select Survey_questionId,question
from Survey_question where Survey_id=".$_[0]->session->db->quote($_[0]->get("Survey_id"))." order by sequenceNumber");
$question = { ('-1' => $i18n->get(82),%$question) };
$f->selectBox(
-name=>"gotoQuestion",
@ -846,28 +844,28 @@ sub www_editAnswer {
}
$f->submit;
# $self->getAdminConsole->setHelp("answer add/edit","Asset_Survey");
return $self->getAdminConsole->render($f->print, $i18n->get(18));
# $_[0]->getAdminConsole->setHelp("answer add/edit","Asset_Survey");
return $_[0]->getAdminConsole->render($f->print, $i18n->get(18));
}
#-------------------------------------------------------------------
sub www_editAnswerSave {
return $self->session->privilege->insufficient() unless ($_[0]->canEdit);
return $_[0]->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"),
answer => $self->session->form->process("answer"),
isCorrect => $self->session->form->process("isCorrect"),
Survey_answerId => $_[0]->session->form->process("aid"),
Survey_questionId => $_[0]->session->form->process("qid"),
answer => $_[0]->session->form->process("answer"),
isCorrect => $_[0]->session->form->process("isCorrect"),
Survey_id=>$_[0]->get("Survey_id"),
gotoQuestion => $self->session->form->process("gotoQuestion")
gotoQuestion => $_[0]->session->form->process("gotoQuestion")
},1,0,"Survey_Id");
if ($self->session->form->process("proceed") eq "addQuestion") {
$self->session->form->process("qid") = "new";
} elsif ($self->session->form->process("proceed") eq "addAnswer") {
$self->session->form->process("aid") = "new";
if ($_[0]->session->form->process("proceed") eq "addQuestion") {
$_[0]->session->form->process("qid") = "new";
} elsif ($_[0]->session->form->process("proceed") eq "addAnswer") {
$_[0]->session->form->process("aid") = "new";
return $_[0]->www_editAnswer();
} elsif ($self->session->form->process("proceed") eq "backToPage") {
} elsif ($_[0]->session->form->process("proceed") eq "backToPage") {
return "";
}
return $_[0]->www_editQuestion();
@ -1045,7 +1043,7 @@ sub www_editQuestionSave {
sub www_editSection {
my ($f, $section, $sectionName, $self);
$self = shift;
my $i18n = WebGUI::International->new($self->sessionet(107, 'Asset_Survey');
my $i18n = WebGUI::International->new($self->session, 'Asset_Survey');
my $none = $i18n->get(107);
return $self->session->privilege->insufficient() unless ($self->canEdit);
$section = $self->getCollateral("Survey_section","Survey_sectionId",$self->session->form->process("sid"));
@ -1080,10 +1078,10 @@ sub www_editSection {
#-------------------------------------------------------------------
sub www_editSectionSave {
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"),
return $_[0]->session->privilege->insufficient() unless ($_[0]->canEdit);
$_[0]->session->form->process("sid") = $_[0]->setCollateral("Survey_section", "Survey_sectionId", {
sectionName => $_[0]->session->form->process("sectionName"),
Survey_sectionId=>$_[0]->session->form->process("sid"),
Survey_id=>$_[0]->get("Survey_id"),
},1,0,"Survey_id");
return "";
@ -1091,74 +1089,74 @@ sub www_editSectionSave {
#-------------------------------------------------------------------
sub www_exportAnswers {
return "" unless ($self->session->user->isInGroup($_[0]->get("groupToViewReports")));
$self->session->http->setFilename($self->session->url->escape($_[0]->get("title")."_answers.tab"),"text/tab");
return $self->session->db->quickTab("select * from Survey_answer where Survey_id=".$self->session->db->quote($_[0]->get("Survey_id")));
return "" unless ($_[0]->session->user->isInGroup($_[0]->get("groupToViewReports")));
$_[0]->session->http->setFilename($_[0]->session->url->escape($_[0]->get("title")."_answers.tab"),"text/tab");
return $_[0]->session->db->quickTab("select * from Survey_answer where Survey_id=".$_[0]->session->db->quote($_[0]->get("Survey_id")));
}
#-------------------------------------------------------------------
sub www_exportComposite {
return "" unless ($self->session->user->isInGroup($_[0]->get("groupToViewReports")));
$self->session->http->setFilename($self->session->url->escape($_[0]->get("title")."_composite.tab"),"text/tab");
return $self->session->db->quickTab("select b.question, c.response, a.userId, a.username, a.ipAddress, c.comment, c.dateOfResponse from Survey_response a
return "" unless ($_[0]->session->user->isInGroup($_[0]->get("groupToViewReports")));
$_[0]->session->http->setFilename($_[0]->session->url->escape($_[0]->get("title")."_composite.tab"),"text/tab");
return $_[0]->session->db->quickTab("select b.question, c.response, a.userId, a.username, a.ipAddress, c.comment, c.dateOfResponse from Survey_response a
left join Survey_questionResponse c on a.Survey_responseId=c.Survey_responseId
left join Survey_question b on c.Survey_questionId=b.Survey_questionId
where a.Survey_id=".$self->session->db->quote($_[0]->get("Survey_id"))." order by a.userId, a.ipAddress, b.sequenceNumber");
where a.Survey_id=".$_[0]->session->db->quote($_[0]->get("Survey_id"))." order by a.userId, a.ipAddress, b.sequenceNumber");
}
#-------------------------------------------------------------------
sub www_exportQuestions {
return "" unless ($self->session->user->isInGroup($_[0]->get("groupToViewReports")));
$self->session->http->setFilename($self->session->url->escape($_[0]->get("title")."_questions.tab"),"text/tab");
return $self->session->db->quickTab("select * from Survey_question where Survey_id=".$self->session->db->quote($_[0]->get("Survey_id")));
return "" unless ($_[0]->session->user->isInGroup($_[0]->get("groupToViewReports")));
$_[0]->session->http->setFilename($_[0]->session->url->escape($_[0]->get("title")."_questions.tab"),"text/tab");
return $_[0]->session->db->quickTab("select * from Survey_question where Survey_id=".$_[0]->session->db->quote($_[0]->get("Survey_id")));
}
#-------------------------------------------------------------------
sub www_exportResponses {
return "" unless ($self->session->user->isInGroup($_[0]->get("groupToViewReports")));
$self->session->http->setFilename($self->session->url->escape($_[0]->get("title")."_responses.tab"),"text/tab");
return $self->session->db->quickTab("select * from Survey_response where Survey_id=".$self->session->db->quote($_[0]->get("Survey_id")));
return "" unless ($_[0]->session->user->isInGroup($_[0]->get("groupToViewReports")));
$_[0]->session->http->setFilename($_[0]->session->url->escape($_[0]->get("title")."_responses.tab"),"text/tab");
return $_[0]->session->db->quickTab("select * from Survey_response where Survey_id=".$_[0]->session->db->quote($_[0]->get("Survey_id")));
}
#-------------------------------------------------------------------
sub www_moveAnswerDown {
return $self->session->privilege->insufficient() unless ($_[0]->canEdit);
$_[0]->moveCollateralDown("Survey_answer","Survey_answerId",$self->session->form->process("aid"),"Survey_id");
return $_[0]->session->privilege->insufficient() unless ($_[0]->canEdit);
$_[0]->moveCollateralDown("Survey_answer","Survey_answerId",$_[0]->session->form->process("aid"),"Survey_id");
return $_[0]->www_editQuestion;
}
#-------------------------------------------------------------------
sub www_moveAnswerUp {
return $self->session->privilege->insufficient() unless ($_[0]->canEdit);
$_[0]->moveCollateralUp("Survey_answer","Survey_answerId",$self->session->form->process("aid"),"Survey_id");
return $_[0]->session->privilege->insufficient() unless ($_[0]->canEdit);
$_[0]->moveCollateralUp("Survey_answer","Survey_answerId",$_[0]->session->form->process("aid"),"Survey_id");
return $_[0]->www_editQuestion;
}
#-------------------------------------------------------------------
sub www_moveQuestionDown {
return $self->session->privilege->insufficient() unless ($_[0]->canEdit);
$_[0]->moveCollateralDown("Survey_question","Survey_questionId",$self->session->form->process("qid"),"Survey_id");
return $_[0]->session->privilege->insufficient() unless ($_[0]->canEdit);
$_[0]->moveCollateralDown("Survey_question","Survey_questionId",$_[0]->session->form->process("qid"),"Survey_id");
return "";
}
#-------------------------------------------------------------------
sub www_moveQuestionUp {
return $self->session->privilege->insufficient() unless ($_[0]->canEdit);
$_[0]->moveCollateralUp("Survey_question","Survey_questionId",$self->session->form->process("qid"),"Survey_id");
return $_[0]->session->privilege->insufficient() unless ($_[0]->canEdit);
$_[0]->moveCollateralUp("Survey_question","Survey_questionId",$_[0]->session->form->process("qid"),"Survey_id");
return "";
}
#-------------------------------------------------------------------
sub www_moveSectionDown {
return $self->session->privilege->insufficient() unless ($_[0]->canEdit);
$_[0]->moveCollateralDown("Survey_section","Survey_sectionId",$self->session->form->process("sid"),"Survey_id");
return $_[0]->session->privilege->insufficient() unless ($_[0]->canEdit);
$_[0]->moveCollateralDown("Survey_section","Survey_sectionId",$_[0]->session->form->process("sid"),"Survey_id");
return "";
}
#-------------------------------------------------------------------
sub www_moveSectionUp {
return $self->session->privilege->insufficient() unless ($_[0]->canEdit);
$_[0]->moveCollateralUp("Survey_section","Survey_sectionId",$self->session->form->process("sid"),"Survey_id");
return $_[0]->session->privilege->insufficient() unless ($_[0]->canEdit);
$_[0]->moveCollateralUp("Survey_section","Survey_sectionId",$_[0]->session->form->process("sid"),"Survey_id");
return "";
}
@ -1170,7 +1168,7 @@ sub www_respond {
return "" unless ($self->session->scratch->get($varname));
my $userId = ($self->get("anonymous")) ? substr(md5_hex($self->session->user->userId),0,8) : $self->session->user->userId;
my $terminate = 0;
foreach my $key (keys %{$session{form}}) {
foreach my $key ($self->session->request->params) {
if ($key =~ /^answerId_(.+)$/) {
my $id = $1;
my ($previousResponse) = $self->session->db->quickArray("select count(*) from Survey_questionResponse
@ -1180,9 +1178,9 @@ sub www_respond {
if ($self->get("questionOrder") eq "response" && $answer->{gotoQuestion} eq "") {
$terminate = 1;
}
my $response = $self->session->form->process("textResponse_".$id) || $answer->{answer});
my $response = $self->session->form->process("textResponse_".$id) || $answer->{answer};
$self->session->db->write("insert into Survey_questionResponse (Survey_answerId,Survey_questionId,Survey_responseId,Survey_id,comment,response,dateOfResponse) values (
".$self->session->db->quote($answer->{Survey_answerId}).", ".$self->session->db->quote($answer->{Survey_questionId}).", ".$self->session->db->quote($self->session->scratch->get($varname).", ".$self->session->db->quote($answer->{Survey_id}).",
".$self->session->db->quote($answer->{Survey_answerId}).", ".$self->session->db->quote($answer->{Survey_questionId}).", ".$self->session->db->quote($self->session->scratch->get($varname)).", ".$self->session->db->quote($answer->{Survey_id}).",
".$self->session->db->quote($self->session->form->process("comment_".$id)).", ".$self->session->db->quote($response).", ".$self->session->datetime->time().")");
}
}

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

@ -245,7 +245,7 @@ sub view {
# this page, with important params
@seen{@exclude_params} = ();
for ($session->request->params) {
foreach ($self->session->request->params) {
unless (exists $seen{$_}) {
$query_string .= $self->session->url->escape($_) . '='
. $self->session->url->escape($self->session->form->process($_)) . ';';
@ -287,7 +287,7 @@ sub view {
# check to see if this exact query has already been cached, using either
# a cache specific to this session, or a shared global cache
if ($self->session->form->process('cache')) {
if ($self->session->form->process('targetWobjects')}
if ($self->session->form->process('targetWobjects')
&& grep /^$call$/, @targetWobjects) {
$cache_key = $self->session->form->process('cache');
@ -465,7 +465,7 @@ sub view {
$self->session->errorHandler->debug($i18n->get(26) . $@) if $self->get('debugMode');
}
# did they request a funky http header?
if ($self->session->config->get('soapHttpHeaderOverride')} &&
if ($self->session->config->get('soapHttpHeaderOverride') &&
$self->get("httpHeader")) {
$self->session->http->setMimeType($self->get("httpHeader"));