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

- fix [ 1163407 ] Ampersand XHTML 1.0 Non-Compliant

Browse source
This commit is contained in:
JT Smith 2005-08-25 16:41:52 +00:00
parent 789263864a
commit ed161ce282
61 changed files with 244 additions and 456 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -127,7 +127,7 @@ sub view {
if ($self->get("convertCarriageReturns")) {
$var{description} =~ s/\n/\<br\>\n/g;
}
$var{"new.template"} = $self->getUrl."&overrideTemplateId=";
$var{"new.template"} = $self->getUrl.";overrideTemplateId=";
$var{"description.full"} = $var{description};
$var{"description.full"} =~ s/\^\-\;//g;
$var{"description.first.100words"} = $var{"description.full"};

5
lib/WebGUI/Asset/Wobject/Collaboration.pm
View file

@ -21,7 +21,6 @@ use WebGUI::Icon;
use WebGUI::International;
use WebGUI::Paginator;
use WebGUI::Privilege;
use WebGUI::Search;
use WebGUI::Session;
use WebGUI::SQL;
use WebGUI::Style;
@ -619,7 +618,7 @@ Formats the url to start a new thread.
sub getNewThreadUrl {
my $self = shift;
$self->getUrl("func=add&class=WebGUI::Asset::Post::Thread");
$self->getUrl("func=add;class=WebGUI::Asset::Post::Thread");
}
#-------------------------------------------------------------------
@ -1052,7 +1051,7 @@ sub www_search {
$sql .= " and " if ($sql ne "" && $without ne "");
$sql .= " ($without) " if ($without ne "");
$sql .= " group by assetData.assetId order by Post.dateSubmitted desc";
my $p = WebGUI::Paginator->new($self->getUrl("func=search&doit=1"),$numResults);
my $p = WebGUI::Paginator->new($self->getUrl("func=search;doit=1"),$numResults);
$self->appendPostListTemplateVars(\%var, $sql, $p);
}
return $self->processStyle($self->processTemplate(\%var, $self->get("searchTemplateId")));

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

@ -89,10 +89,10 @@ sub _fieldAdminIcons {
my $tid = shift;
my $cantDelete = shift;
my $output;
$output = deleteIcon('func=deleteFieldConfirm&fid='.$fid.'&tid='.$tid,$self->get("url"),WebGUI::International::get(19,"Asset_DataForm")) unless ($cantDelete);
$output .= editIcon('func=editField&fid='.$fid.'&tid='.$tid,$self->get("url"))
.moveUpIcon('func=moveFieldUp&fid='.$fid.'&tid='.$tid,$self->get("url"))
.moveDownIcon('func=moveFieldDown&fid='.$fid.'&tid='.$tid,$self->get("url"));
$output = deleteIcon('func=deleteFieldConfirm;fid='.$fid.';tid='.$tid,$self->get("url"),WebGUI::International::get(19,"Asset_DataForm")) unless ($cantDelete);
$output .= editIcon('func=editField;fid='.$fid.';tid='.$tid,$self->get("url"))
.moveUpIcon('func=moveFieldUp;fid='.$fid.';tid='.$tid,$self->get("url"))
.moveDownIcon('func=moveFieldDown;fid='.$fid.';tid='.$tid,$self->get("url"));
return $output;
}
#-------------------------------------------------------------------
@ -101,10 +101,10 @@ sub _tabAdminIcons {
my $tid = shift;
my $cantDelete = shift;
my $output;
$output = deleteIcon('func=deleteTabConfirm&tid='.$tid,$self->get("url"),WebGUI::International::get(100,"Asset_DataForm")) unless ($cantDelete);
$output .= editIcon('func=editTab&tid='.$tid,$self->get("url"))
.moveLeftIcon('func=moveTabLeft&tid='.$tid,$self->get("url"))
.moveRightIcon('func=moveTabRight&tid='.$tid,$self->get("url"));
$output = deleteIcon('func=deleteTabConfirm;tid='.$tid,$self->get("url"),WebGUI::International::get(100,"Asset_DataForm")) unless ($cantDelete);
$output .= editIcon('func=editTab;tid='.$tid,$self->get("url"))
.moveLeftIcon('func=moveTabLeft;tid='.$tid,$self->get("url"))
.moveRightIcon('func=moveTabRight;tid='.$tid,$self->get("url"));
return $output;
}
@ -325,7 +325,7 @@ sub getListTemplateVars {
$var->{"back.url"} = $self->getFormUrl;
$var->{"back.label"} = WebGUI::International::get('go to form',"Asset_DataForm");
#$var->{"entryId"} = $self->getId;
#$var->{"delete.url"} = $self->getUrl."&func=deleteAllEntries";
#$var->{"delete.url"} = $self->getUrl.";func=deleteAllEntries";
#$var->{"delete.label"} = WebGUI::International::get(91,"Asset_DataForm");
my $a = WebGUI::SQL->read("select DataForm_fieldId,name,label,isMailField,type from DataForm_field
where assetId=".quote($self->getId)." order by sequenceNumber");
@ -359,10 +359,10 @@ sub getListTemplateVars {
$b->finish;
push(@recordLoop,{
"record.ipAddress"=>$record->{ipAddress},
"record.edit.url"=>$self->getUrl("func=view&entryId=".$record->{DataForm_entryId}),
"record.edit.icon"=>editIcon("func=view&entryId=".$record->{DataForm_entryId}, $self->getUrl),
"record.delete.url"=>$self->getUrl("func=deleteEntry&entryId=".$record->{DataForm_entryId}),
"record.delete.icon"=>deleteIcon("func=deleteEntry&entryId=".$record->{Asset_DataForm_entryId}, $self->getUrl, WebGUI::International::get('Delete entry confirmation',"Asset_DataForm")),
"record.edit.url"=>$self->getUrl("func=view;entryId=".$record->{DataForm_entryId}),
"record.edit.icon"=>editIcon("func=view;entryId=".$record->{DataForm_entryId}, $self->getUrl),
"record.delete.url"=>$self->getUrl("func=deleteEntry;entryId=".$record->{DataForm_entryId}),
"record.delete.icon"=>deleteIcon("func=deleteEntry;entryId=".$record->{Asset_DataForm_entryId}, $self->getUrl, WebGUI::International::get('Delete entry confirmation',"Asset_DataForm")),
"record.username"=>$record->{username},
"record.userId"=>$record->{userId},
"record.submissionDate.epoch"=>$record->{submissionDate},
@ -412,12 +412,12 @@ sub getRecordTemplateVars {
my $var = shift;
$var->{error_loop} = [] unless (exists $var->{error_loop});
$var->{canEdit} = ($self->canEdit);
#$var->{"entryList.url"} = $self->getUrl('func=view&entryId=list');
#$var->{"entryList.url"} = $self->getUrl('func=view;entryId=list');
$var->{"entryList.url"} = $self->getListUrl;
$var->{"entryList.label"} = WebGUI::International::get(86,"Asset_DataForm");
$var->{"export.tab.url"} = $self->getUrl('func=exportTab');
$var->{"export.tab.label"} = WebGUI::International::get(84,"Asset_DataForm");
$var->{"delete.url"} = $self->getUrl('func=deleteEntry&entryId='.$var->{entryId});
$var->{"delete.url"} = $self->getUrl('func=deleteEntry;entryId='.$var->{entryId});
$var->{"delete.label"} = WebGUI::International::get(90,"Asset_DataForm");
$var->{"back.url"} = $self->getUrl;
$var->{"back.label"} = WebGUI::International::get(18,"Asset_DataForm");

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

@ -131,7 +131,7 @@ sub getEditForm {
-label=>WebGUI::International::get(80,"Asset_EventsCalendar"),
-value=>$self->getValue('eventTemplateId'),
-namespace=>"EventsCalendar/Event",
-afterEdit=>'func=edit&wid='.$self->get("wobjectId")
-afterEdit=>'func=edit;wid='.$self->get("wobjectId")
);
$tabform->getTab("display")->selectList(
-name=>"startMonth",
@ -421,7 +421,7 @@ sub view {
my %var;
$var{month_loop} = \@$monthloop;
# $var{"canManage"} = $self->canManage;
$var{"addevent.url"} = $self->getUrl().'?func=addStyledEvent&class=WebGUI::Asset::Event';
$var{"addevent.url"} = $self->getUrl().'?func=addStyledEvent;class=WebGUI::Asset::Event';
$var{"addevent.label"} = WebGUI::International::get(20,"Asset_EventsCalendar");
$var{'sunday.label'} = WebGUI::DateTime::getDayName(7);
$var{'monday.label'} = WebGUI::DateTime::getDayName(1);
@ -451,12 +451,12 @@ sub view {
}
$var{'pagination.previousPage'} = '<form method="GET" style="inline;" action="'.
$self->getUrl.'?calMonthStart='.$calMonthStart.
'&reload='.WebGUI::Id::generate().'"><a href="'.$self->getUrl.
'?calMonthStart='.$prevCalMonthStart.'&calMonthEnd='.$prevCalMonthEnd.'">'.
';reload='.WebGUI::Id::generate().'"><a href="'.$self->getUrl.
'?calMonthStart='.$prevCalMonthStart.';calMonthEnd='.$prevCalMonthEnd.'">'.
WebGUI::International::get(558,"Asset_EventsCalendar")." ".$monthRangeLength." ".
$monthLabel.'</a>';
$var{'pagination.nextPage'} = '<a href="'.$self->getUrl.
'?calMonthStart='.$nextCalMonthStart.'&calMonthEnd='.$nextCalMonthEnd.'">'.
'?calMonthStart='.$nextCalMonthStart.';calMonthEnd='.$nextCalMonthEnd.'">'.
WebGUI::International::get(559,"Asset_EventsCalendar")." ".$monthRangeLength." ".
$monthLabel.'</a></form>';
$var{'pagination.pageList.upTo20'} = '<select size="1" name="calMonthEnd">

2
lib/WebGUI/Asset/Wobject/HttpProxy/Parse.pm
View file

@ -130,7 +130,7 @@ sub start {
$val = $self->{assetUrl}; # Form Action returns to us
} else {
$val =~ s/\n//g; # Bugfix 757068
$val = WebGUI::URL::append($self->{assetUrl},'proxiedUrl='.WebGUI::URL::escape($val).'&func=view'); # return to us
$val = WebGUI::URL::append($self->{assetUrl},'proxiedUrl='.WebGUI::URL::escape($val).';func=view'); # return to us
}
}
}

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

@ -192,7 +192,7 @@ sub view {
$vars{"dragger.init"} = '
<iframe id="dragSubmitter" style="display: none;" src="'.$session{config}{extrasURL}.'/spacer.gif"></iframe>
<script>
dragable_init("'.$self->getUrl("func=setContentPositions&map=").'");
dragable_init("'.$self->getUrl("func=setContentPositions;map=").'");
</script>
<style>
.dragging, .empty {

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

@ -92,7 +92,7 @@ sub view {
});
}
$var{'default.listing'} = $first->view if ($count == 1 && defined $first);
$var{'forum.add.url'} = $self->getUrl("func=add&class=WebGUI::Asset::Wobject::Collaboration");
$var{'forum.add.url'} = $self->getUrl("func=add;class=WebGUI::Asset::Wobject::Collaboration");
$var{'forum.add.label'} = WebGUI::International::get(75,"Asset_MessageBoard");
$var{'title.label'} = WebGUI::International::get('title','Asset_MessageBoard');
$var{'views.label'} = WebGUI::International::get('views',,'Asset_MessageBoard');

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

@ -281,7 +281,7 @@ sub getToolbar {
if ($self->getToolbarState) {
my $returnUrl;
if (exists $session{asset}) {
$returnUrl = "&proceed=goBackToPage&returnUrl=".WebGUI::URL::escape($session{asset}->getUrl);
$returnUrl = ";proceed=goBackToPage;returnUrl=".WebGUI::URL::escape($session{asset}->getUrl);
}
my $toolbar;
if (!$self->isLocked || $self->get("isLockedBy") eq $session{user}{userId}) {

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

@ -627,9 +627,9 @@ sub view {
my $self = shift;
$self->logView() if ($session{setting}{passiveProfilingEnabled});
my $var = $self->getMenuVars;
$var->{'question.add.url'} = $self->getUrl('func=editQuestion&qid=new');
$var->{'question.add.url'} = $self->getUrl('func=editQuestion;qid=new');
$var->{'question.add.label'} = WebGUI::International::get(30,'Asset_Survey');
$var->{'section.add.url'} = $self->getUrl('func=editSection&sid=new');
$var->{'section.add.url'} = $self->getUrl('func=editSection;sid=new');
$var->{'section.add.label'} = WebGUI::International::get(104,'Asset_Survey');
my @sectionEdit;
@ -645,10 +645,10 @@ sub view {
while (my %data = $sth2->hash) {
push(@edit,{
'question.edit.controls'=>
deleteIcon('func=deleteQuestionConfirm&qid='.$data{Survey_questionId}, $self->get("url"), WebGUI::International::get(44,'Asset_Survey')).
editIcon('func=editQuestion&qid='.$data{Survey_questionId}, $self->get("url")).
moveUpIcon('func=moveQuestionUp&qid='.$data{Survey_questionId}, $self->get("url")).
moveDownIcon('func=moveQuestionDown&qid='.$data{Survey_questionId}, $self->get("url")),
deleteIcon('func=deleteQuestionConfirm;qid='.$data{Survey_questionId}, $self->get("url"), WebGUI::International::get(44,'Asset_Survey')).
editIcon('func=editQuestion;qid='.$data{Survey_questionId}, $self->get("url")).
moveUpIcon('func=moveQuestionUp;qid='.$data{Survey_questionId}, $self->get("url")).
moveDownIcon('func=moveQuestionDown;qid='.$data{Survey_questionId}, $self->get("url")),
'question.edit.question'=>$data{question},
'question.edit.id'=>$data{Survey_questionId}
});
@ -657,10 +657,10 @@ sub view {
push(@sectionEdit,{
'section.edit.controls'=>
deleteIcon('func=deleteSectionConfirm&sid='.$sectionData{Survey_sectionId}, $self->get("url"), WebGUI::International::get(105,'Asset_Survey')).
editIcon('func=editSection&sid='.$sectionData{Survey_sectionId}, $self->get("url")).
moveUpIcon('func=moveSectionUp&sid='.$sectionData{Survey_sectionId}, $self->get("url")).
moveDownIcon('func=moveSectionDown&sid='.$sectionData{Survey_sectionId}, $self->get("url")),
deleteIcon('func=deleteSectionConfirm;sid='.$sectionData{Survey_sectionId}, $self->get("url"), WebGUI::International::get(105,'Asset_Survey')).
editIcon('func=editSection;sid='.$sectionData{Survey_sectionId}, $self->get("url")).
moveUpIcon('func=moveSectionUp;sid='.$sectionData{Survey_sectionId}, $self->get("url")).
moveDownIcon('func=moveSectionDown;sid='.$sectionData{Survey_sectionId}, $self->get("url")),
'section.edit.sectionName'=>$sectionData{sectionName},
'section.edit.id'=>$sectionData{Survey_sectionId},
'section.questions_loop'=>\@edit
@ -701,7 +701,7 @@ sub view {
});
$var->{'questions.sofar.label'} = WebGUI::International::get(86,'Asset_Survey');
$var->{'start.newResponse.label'} = WebGUI::International::get(87,'Asset_Survey');
$var->{'start.newResponse.url'} = $self->getUrl("func=view&startNew=1");
$var->{'start.newResponse.url'} = $self->getUrl("func=view;startNew=1");
$var->{'thanks.survey.label'} = WebGUI::International::get(46,'Asset_Survey');
$var->{'thanks.quiz.label'} = WebGUI::International::get(47,'Asset_Survey');
$var->{'questions.total'} = $self->getQuestionCount;
@ -754,7 +754,7 @@ sub www_deleteSectionConfirm {
sub www_deleteResponse {
return "" unless (WebGUI::Grouping::isInGroup($_[0]->get("groupToViewReports")));
return $_[0]->confirm(WebGUI::International::get(72,'Asset_Survey'),
$_[0]->getUrl('func=deleteResponseConfirm&responseId='.$session{form}{responseId}));
$_[0]->getUrl('func=deleteResponseConfirm;responseId='.$session{form}{responseId}));
}
#-------------------------------------------------------------------
@ -997,17 +997,17 @@ sub www_editQuestion {
&& $question->{answerFieldType} ne "HTMLArea"
&& $question->{answerFieldType} ne "textArea"
) {
$output .= '<a href="'.$self->getUrl('func=editAnswer&aid=new&qid='
$output .= '<a href="'.$self->getUrl('func=editAnswer;aid=new;qid='
.$question->{Survey_questionId}).'">'.WebGUI::International::get(23,'Asset_Survey').'</a><p />';
$sth = WebGUI::SQL->read("select Survey_answerId,answer from Survey_answer
where Survey_questionId=".quote($question->{Survey_questionId})." order by sequenceNumber");
while (%data = $sth->hash) {
$output .=
deleteIcon('func=deleteAnswerConfirm&qid='.$question->{Survey_questionId}.'&aid='.$data{Survey_answerId},
deleteIcon('func=deleteAnswerConfirm;qid='.$question->{Survey_questionId}.';aid='.$data{Survey_answerId},
$self->get("url"),WebGUI::International::get(45,'Asset_Survey')).
editIcon('func=editAnswer&qid='.$question->{Survey_questionId}.'&aid='.$data{Survey_answerId}, $self->get("url")).
moveUpIcon('func=moveAnswerUp'.'&qid='.$question->{Survey_questionId}.'&aid='.$data{Survey_answerId}, $self->get("url")).
moveDownIcon('func=moveAnswerDown&qid='.$question->{Survey_questionId}.'&aid='.$data{Survey_answerId}, $self->get("url")).
editIcon('func=editAnswer;qid='.$question->{Survey_questionId}.';aid='.$data{Survey_answerId}, $self->get("url")).
moveUpIcon('func=moveAnswerUp'.';qid='.$question->{Survey_questionId}.';aid='.$data{Survey_answerId}, $self->get("url")).
moveDownIcon('func=moveAnswerDown;qid='.$question->{Survey_questionId}.';aid='.$data{Survey_answerId}, $self->get("url")).
' '.$data{answer}.'<br>';
}
$sth->finish;
@ -1243,7 +1243,7 @@ sub www_viewGradebook {
Survey_answer b on a.Survey_answerId=b.Survey_answerId where a.Survey_responseId=".quote($user->{Survey_responseId})
." and b.isCorrect=1");
push(@responseloop, {
'response.url'=>$self->getUrl('func=viewIndividualSurvey&responseId='.$user->{Survey_responseId}),
'response.url'=>$self->getUrl('func=viewIndividualSurvey;responseId='.$user->{Survey_responseId}),
'response.user.name'=>($user->{userId} eq '1') ? $user->{ipAddress} : $user->{username},
'response.count.correct' => $correctCount,
'response.percent' => round(($correctCount/$var->{'question.count'})*100)
@ -1263,7 +1263,7 @@ sub www_viewIndividualSurvey {
$self->logView() if ($session{setting}{passiveProfilingEnabled});
my $var = $self->getMenuVars;
$var->{'title'} = WebGUI::International::get(70,'Asset_Survey');
$var->{'delete.url'} = $self->getUrl('func=deleteResponse&responseId='.$session{form}{responseId});
$var->{'delete.url'} = $self->getUrl('func=deleteResponse;responseId='.$session{form}{responseId});
$var->{'delete.label'} = WebGUI::International::get(69,'Asset_Survey');
my $response = WebGUI::SQL->getRow("Survey_response","Survey_responseId",$session{form}{responseId});
$var->{'start.date.label'} = WebGUI::International::get(76,'Asset_Survey');

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

@ -290,7 +290,7 @@ sub view {
for (keys %{$session{'form'}}) {
unless (exists $seen{$_}) {
$query_string .= WebGUI::URL::escape($_) . '='
. WebGUI::URL::escape($session{'form'}{$_}) . '&';
. WebGUI::URL::escape($session{'form'}{$_}) . ';';
}
}
$url = WebGUI::URL::page($query_string);
@ -503,7 +503,7 @@ sub view {
$p->appendTemplateVars(\%var);
for ('pagination.firstPage','pagination.lastPage','pagination.nextPage','pagination.pageList',
'pagination.previousPage', 'pagination.pageList.upTo20', 'pagination.pageList.upTo10') {
$var{$_} =~ s/\?/\?cache=$cache_key\&/g;
$var{$_} =~ s/\?/\?cache=$cache_key\;/g;
}
}