--- loncom/interface/loncommon.pm 2013/12/30 00:34:49 1.1168 +++ loncom/interface/loncommon.pm 2014/01/21 14:38:51 1.1171 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.1168 2013/12/30 00:34:49 raeburn Exp $ +# $Id: loncommon.pm,v 1.1171 2014/01/21 14:38:51 kruse Exp $ # # Copyright Michigan State University Board of Trustees # @@ -3846,7 +3846,7 @@ sub get_previous_attempt { if (($data eq 'award') || ($data eq 'awarddetail')) { my $value = &format_previous_attempt_value($key, $returnhash{$version.':'.$key}); - $prevattempts.=''.$value.' '; + $prevattempts.=''.&HTML::Entities::encode($value, '"<>&').' '; } else { $prevattempts.=' '; } @@ -3854,7 +3854,7 @@ sub get_previous_attempt { if ($key =~ /\./) { my $value = &format_previous_attempt_value($key, $returnhash{$version.':'.$key}); - $prevattempts.=''.$value.' '; + $prevattempts.=''.&HTML::Entities::encode($value, '"<>&').' '; } else { $prevattempts.=' '; } @@ -3865,7 +3865,7 @@ sub get_previous_attempt { next if ($key =~ /\.foilorder$/); my $value = &format_previous_attempt_value($key, $returnhash{$version.':'.$key}); - $prevattempts.=''.$value.' '; + $prevattempts.=''.&HTML::Entities::encode($value, '"<>&').' '; } } $prevattempts.=&end_data_table_row(); @@ -3890,7 +3890,7 @@ sub get_previous_attempt { if ($key =~/$regexp$/ && (defined &$gradesub)) { $value = &$gradesub($value); } - $prevattempts.=''.$value.' '; + $prevattempts.=''. &HTML::Entities::encode($value, '"<>&').' '; } else { $prevattempts.=' '; } @@ -3899,14 +3899,14 @@ sub get_previous_attempt { if ($key =~/$regexp$/ && (defined &$gradesub)) { $value = &$gradesub($value); } - $prevattempts.=''.$value.' '; + $prevattempts.=''.&HTML::Entities::encode($value, '"<>&').' '; } } else { my $value = &format_previous_attempt_value($key,$lasthash{$key}); if ($key =~/$regexp$/ && (defined &$gradesub)) { $value = &$gradesub($value); } - $prevattempts.=''.$value.' '; + $prevattempts.=''.&HTML::Entities::encode($value, '"<>&').' '; } } $prevattempts.= &end_data_table_row().&end_data_table(); @@ -5228,10 +5228,11 @@ sub bodytag { } $bodytag .= qq|
$realm $dc_info
|; - #don't show menus for public users + #if directed to not display the secondary menu, don't. if ($args->{'no_secondary_menu'}) { return $bodytag; } + #don't show menus for public users if (!$public){ $bodytag .= Apache::lonmenu::secondary_menu($httphost); $bodytag .= Apache::lonmenu::serverform(); @@ -14005,6 +14006,9 @@ sub construct_course { 'categories', 'internal.uniquecode'], $$crsudom,$$crsunum); + if ($args->{'textbook'}) { + $cenv{'internal.textbook'} = $args->{'textbook'}; + } } #