--- loncom/interface/lonwhatsnew.pm 2006/03/04 05:59:01 1.51 +++ loncom/interface/lonwhatsnew.pm 2006/05/30 12:46:09 1.55 @@ -1,5 +1,5 @@ # -# $Id: lonwhatsnew.pm,v 1.51 2006/03/04 05:59:01 albertel Exp $ +# $Id: lonwhatsnew.pm,v 1.55 2006/05/30 12:46:09 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -39,6 +39,8 @@ use Apache::lonuserstate; use Apache::Constants qw(:common :http); use Time::Local; use GDBM_File; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; #---------------------------- # handler @@ -100,32 +102,32 @@ sub handler { ({href=>'/adm/whatsnew?command=chgthreshold&refpage='.$refpage, text=>"Change thresholds"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,"What's New?",#'Course_Action_Items_Thresholds' + ("What's New?",#'Course_Action_Items_Thresholds' )); } elsif (($command eq 'chginterval') && $checkallowed{'versionchanges'} ) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>'/adm/whatsnew?command=chginterval&refpage='.$refpage, text=>"Change interval"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,"What's New?",#'Course_Action_Items_Intervals' + ("What's New?",#'Course_Action_Items_Intervals' )); } elsif (($command eq 'chgdisc') && $checkallowed{'coursediscussion'}) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>'/adm/whatsnew?command=chgdisc&refpage='.$refpage, text=>"Change discussion display"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,"What's New?",#'Course_Action_Items_Intervals' + ("What's New?",#'Course_Action_Items_Intervals' )); } elsif ($command eq 'courseinit') { &Apache::lonhtmlcommon::add_breadcrumb ({href=>'/adm/whatsnew?command=courseinit&refpage='.$refpage, text=>"Course initialization preference"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,"What's New?",#'Course_Action_Items_Initialization' + ("What's New?",#'Course_Action_Items_Initialization' )); } else { $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,"What's New?",#'Course_Action_Items_Display' + ("What's New?",#'Course_Action_Items_Display' )); } &display_main_box($r,$command,$refpage,\%checkallowed); @@ -183,12 +185,12 @@ sub display_main_box { &display_actions_box($r,$tabbg,$command,$refpage,\%threshold_titles, \%interval_titles,\%initpage,$cdom,$crs,$checkallowed); } + my $end_page = &Apache::loncommon::end_page(); $r->print(<
- - +$end_page END_OF_BLOCK } @@ -201,8 +203,7 @@ END_OF_BLOCK sub display_header { my ($command,$checkallowed) = @_; - my $html=&Apache::lonxml::xmlbegin(); - my $bodytag=&Apache::loncommon::bodytag('Course Action Items'); + my $scripttag; unless ($command eq 'chgthreshold' || $command eq 'chginterval') { $scripttag = <<"END"; @@ -226,14 +227,7 @@ END '; } - return(< -Course Action Items -$scripttag - -$bodytag -ENDHEAD + return &Apache::loncommon::start_page('Course Action Items',$scripttag); } #------------------------------- @@ -815,7 +809,7 @@ sub check_bombed { my @bombs = split(/,/, $errors); my $errorcount = scalar(@bombs); my $errorlink = ''. + &escape($bombs[0]).'">'. $title.''; $$bombed{$symb}{errorcount} = $errorcount; $$bombed{$symb}{errorlink} = $errorlink; @@ -878,8 +872,8 @@ sub check_thresholds { $$triggered{$symb}{title} = $resource->title; foreach my $part (@parts) { if (exists($stats{$part}{users})) { - my $resetname = 'reset_'.&Apache::lonnet::escape($symb."\0".$part); - my $resettitle = 'title_'.&Apache::lonnet::escape($symb."\0".$part); + my $resetname = 'reset_'.&escape($symb."\0".$part); + my $resettitle = 'title_'.&escape($symb."\0".$part); if ($$triggered{$symb}{numparts}) { $$triggered{$symb}{text} .= ''."\n"; } @@ -895,7 +889,7 @@ sub check_thresholds { '.$stats{$part}{attempts}.' '.$stats{$part}{degdiff}.' '.$lastreset{$part}.' - + '; $$triggered{$symb}{numparts} ++; } @@ -966,8 +960,8 @@ sub process_reset { my %titles = (); foreach my $key (keys(%env)) { next if ($key !~ /^form\.reset_(.+)$/); - my $title = &Apache::lonnet::unescape($env{'form.title_'.$1}); - my $reset_item = &Apache::lonnet::unescape($1); + my $title = &unescape($env{'form.title_'.$1}); + my $reset_item = &unescape($1); my %curr_aggregates = &Apache::lonnet::dump('nohist_resourcetracker',$dom,$crs,$reset_item); my %aggregates = (); my ($symb,$part) = split(/\0/,$reset_item); @@ -1025,7 +1019,7 @@ sub getnormalmail { my @messages = sort(&Apache::lonnet::getkeys('nohist_email')); foreach my $message (@messages) { - my $msgid=&Apache::lonnet::escape($message); + my $msgid=&escape($message); my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)= &Apache::lonmsg::unpackmsgid($msgid); if (($fromcid) && ($fromcid eq $env{'request.course.id'})) { @@ -1037,7 +1031,6 @@ sub getnormalmail { if ($shortsubj eq '') { $shortsubj = &mt('No subject'); } - $shortsubj = &Apache::lonnet::unescape($shortsubj); push(@{$newmsgs}, { msgid => $msgid, sendtime => $sendtime, @@ -1069,7 +1062,6 @@ sub getcritmail { if ($shortsubj eq '') { $shortsubj = &mt('No subject'); } - $shortsubj = &Apache::lonnet::unescape($shortsubj); push(@{$critmsgs}, { msgid => $msgid, sendtime => $sendtime, @@ -1143,7 +1135,7 @@ sub display_handgrade { } my ($map,$id,$url)=&Apache::lonnet::decode_symb($res); my $linkurl=&Apache::lonnet::clutter($url); - $linkurl .= '?symb='.&Apache::lonnet::escape($res); + $linkurl .= '?symb='.&escape($res); $r->print(''.$$ungraded{$res}{title}.''.$$ungraded{$res}{count}.''); $rowNum ++; @@ -1214,7 +1206,7 @@ sub display_abovethreshold { if ($$triggered{$res}{numparts} > 1) { $rowspan = 'rowspan="'.$$triggered{$res}{numparts}.'"'; } - $linkurl .= '?symb='.&Apache::lonnet::escape($res); + $linkurl .= '?symb='.&escape($res); $r->print(''.$$triggered{$res}{title}.''.$$triggered{$res}{text}); $warningnum ++; } @@ -1248,7 +1240,7 @@ sub display_versionchanges { } my ($map,$id,$url)=&Apache::lonnet::decode_symb($item); my $linkurl=&Apache::lonnet::clutter($url); - $linkurl .= '?symb='.&Apache::lonnet::escape($item); + $linkurl .= '?symb='.&escape($item); $r->print(''.$$res_title{$item}.''.$$changed{$item}{'revdate'}.''.$$changed{$item}{'current'}.''.$$changed{$item}{'version'}.''); $changenum ++;