[LON-CAPA-cvs] cvs: loncom /interface lonaboutme.pm londocs.pm lonmenu.pm lonsyllabus.pm
raeburn
raeburn at source.lon-capa.org
Sat Oct 29 10:47:00 EDT 2022
raeburn Sat Oct 29 14:47:00 2022 EDT
Modified files:
/loncom/interface lonaboutme.pm lonmenu.pm lonsyllabus.pm
londocs.pm
Log:
- Entity encoding for last item in breadcrumbs trail.
Index: loncom/interface/lonaboutme.pm
diff -u loncom/interface/lonaboutme.pm:1.162 loncom/interface/lonaboutme.pm:1.163
--- loncom/interface/lonaboutme.pm:1.162 Thu Oct 27 20:33:31 2022
+++ loncom/interface/lonaboutme.pm Sat Oct 29 14:47:00 2022
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Personal Information Page
#
-# $Id: lonaboutme.pm,v 1.162 2022/10/27 20:33:31 raeburn Exp $
+# $Id: lonaboutme.pm,v 1.163 2022/10/29 14:47:00 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -230,6 +230,7 @@
if ($title eq '') {
$title = &mt('Personal Information Page');
}
+ $title = &HTML::Entities::encode($title,'\'"<>&');
my $brcrum =
&Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
if (ref($brcrum) eq 'ARRAY') {
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.528 loncom/interface/lonmenu.pm:1.529
--- loncom/interface/lonmenu.pm:1.528 Thu Oct 27 20:33:31 2022
+++ loncom/interface/lonmenu.pm Sat Oct 29 14:47:00 2022
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.528 2022/10/27 20:33:31 raeburn Exp $
+# $Id: lonmenu.pm,v 1.529 2022/10/29 14:47:00 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -943,13 +943,14 @@
}
if ($env{'form.folderpath'}) {
&prepare_functions($resurl,$forcereg,$group,undef,undef,1,$hostname);
+ $title = &HTML::Entities::encode($title,'\'"<>&');
($trail) =
&Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,1);
} else {
&Apache::lonhtmlcommon::add_breadcrumb(
{text => "Supplemental $crstype Content",
href => "javascript:gopost('/adm/supplemental','')"});
- $title = &mt('View Resource');
+ $title = &HTML::Entities::encode(&mt('View Resource'),'\'"<>&');
($trail) =
&Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,1);
}
@@ -961,7 +962,7 @@
&Apache::lonhtmlcommon::clear_breadcrumbs();
&prepare_functions('/public'.$courseurl."/syllabus",
$forcereg,$group,undef,undef,1,$hostname);
- $title = &mt('Syllabus File');
+ $title = &HTML::Entities::encode(&mt('Syllabus File'),'\'"<>&');
my ($trail) =
&Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,1);
if (ref($showncrumbsref)) {
Index: loncom/interface/lonsyllabus.pm
diff -u loncom/interface/lonsyllabus.pm:1.152 loncom/interface/lonsyllabus.pm:1.153
--- loncom/interface/lonsyllabus.pm:1.152 Thu Oct 27 20:33:31 2022
+++ loncom/interface/lonsyllabus.pm Sat Oct 29 14:47:00 2022
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.152 2022/10/27 20:33:31 raeburn Exp $
+# $Id: lonsyllabus.pm,v 1.153 2022/10/29 14:47:00 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -211,6 +211,7 @@
if ($title eq '') {
$title = &mt('Syllabus');
}
+ $title = &HTML::Entities::encode($title,'\'"<>&');
$brcrum =
&Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
}
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.686 loncom/interface/londocs.pm:1.687
--- loncom/interface/londocs.pm:1.686 Thu Oct 27 21:35:30 2022
+++ loncom/interface/londocs.pm Sat Oct 29 14:47:00 2022
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.686 2022/10/27 21:35:30 raeburn Exp $
+# $Id: londocs.pm,v 1.687 2022/10/29 14:47:00 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -3992,11 +3992,13 @@
my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom,
$crstype,$pathitem,$supplementalflag,$container,$filtersref,$currgroups,
$ltitoolsref,$canedit,$isencrypted,$ishidden,$navmapref,$hostname)=@_;
- my ($foldertitle,$renametitle,$oldtitle);
+ my ($foldertitle,$renametitle,$oldtitle,$encodedtitle);
if (&is_supplemental_title($title)) {
($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title);
+ $encodedtitle=$title;
} else {
$title=&HTML::Entities::encode($title,'"<>&\'');
+ $encodedtitle=$title;
$renametitle=$title;
$foldertitle=$title;
}
@@ -4483,7 +4485,7 @@
$url .= ($url =~ /\?/) ? '&':'?';
$url .= 'folderpath='.&HTML::Entities::encode($esc_path,'<>&"');
if ($title) {
- $url .= '&title='.&HTML::Entities::encode($renametitle,'<>&"');
+ $url .= '&title='.$encodedtitle;
}
if ((($isexternal) || ($isexttool)) && $orderidx) {
$url .= '&idx='.$orderidx;
@@ -5784,7 +5786,7 @@
}
# If allowed and user's role is not advanced check folderpath is not hidden
my $hidden_and_empty;
- if (($allowed) && (!$env{'request.role.adv'}) && ($env{'form.folderpath'} ne '')) {
+ if (($allowed) && (!$env{'request.role.adv'}) && ($env{'form.folderpath'} ne '')) {
my ($folderurl,$foldername,$hiddenfolder);
my @pathitems = split(/\&/,$env{'form.folderpath'});
my $folder = $pathitems[-2];
@@ -5989,7 +5991,8 @@
if ($showdoc) {
my $args;
if ($supplementalflag) {
- my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$env{'form.title'},1);
+ my $title = &HTML::Entities::encode($env{'form.title'},'\'"<>&');
+ my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
$args = {'bread_crumbs' => $brcrum};
} else {
$args = {'force_register' => $showdoc};
More information about the LON-CAPA-cvs
mailing list