--- loncom/interface/lonhtmlcommon.pm 2006/04/18 22:35:41 1.124 +++ loncom/interface/lonhtmlcommon.pm 2006/05/29 16:01:22 1.129 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.124 2006/04/18 22:35:41 albertel Exp $ +# $Id: lonhtmlcommon.pm,v 1.129 2006/05/29 16:01:22 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -178,6 +178,7 @@ sub get_recent { sub textbox { my ($name,$value,$size,$special) = @_; $size = 40 if (! defined($size)); + $value = &HTML::Entities::encode($value,'<>&"'); my $Str = ''; return $Str; @@ -524,7 +525,7 @@ sub get_date_from_form { if (($year<70) || ($year>137)) { return undef; } if (defined($sec) && defined($min) && defined($hour) && defined($day) && defined($month) && defined($year) && - eval(&timelocal($sec,$min,$hour,$day,$month,$year))) { + eval('&timelocal($sec,$min,$hour,$day,$month,$year)')) { return &timelocal($sec,$min,$hour,$day,$month,$year); } else { return undef; @@ -1165,20 +1166,9 @@ returns: nothing my @Crumbs; sub breadcrumbs { - my ($color,$component,$component_help,$function,$domain,$menulink, - $helplink) = @_; - if (! defined($color)) { - if (! defined($function)) { - $function = &Apache::loncommon::get_users_function(); - } - $color = &Apache::loncommon::designparm($function.'.tabbg', - $domain); - } + my ($component,$component_help,$menulink,$helplink) = @_; # - my $Str = "\n". - ''. - '
'. - ''; + my $Str = "\n".''; + $Str .= $links.''; # if (defined($component)) { - $Str .= ''; + $Str .= ''; } $Str .= '
'; # # Make the faq and bug data cascade my $faq = ''; @@ -1233,17 +1223,19 @@ returns: nothing # $icons .= &Apache::loncommon::help_open_bug($bug); # } if ($helplink ne 'nohelp') { - $icons .= &Apache::loncommon::help_open_menu($color,$component,$component_help,$function,$faq,$bug); + $icons .= &Apache::loncommon::help_open_menu(undef,$component, + $component_help, + undef,$faq,$bug); } if ($icons ne '') { $Str .= $icons.' '; } # - $Str .= $links.''. - ''.&mt($component).''. + &mt($component).'
'."\n"; # @@ -1438,11 +1430,11 @@ sub course_select_row { |; my $courseform=''.&Apache::loncommon::selectcourse_link ($formname,'pickcourse','pickdomain','coursedesc','',1).''; + $output .= ''.&mt('All courses').'
'; if ($totcodes > 0) { - $output .= ''.&mt('All courses'); my $numtitles = @$codetitles; if ($numtitles > 0) { - $output .= '
'.&mt('Pick courses by category:').'
'; + $output .= ''.&mt('Pick courses by category:').'
'; $output .= '
'.$$codetitles[0].'
'."\n". '