--- loncom/interface/londocs.pm 2007/07/02 23:43:36 1.282 +++ loncom/interface/londocs.pm 2007/07/03 00:17:42 1.283 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.282 2007/07/02 23:43:36 albertel Exp $ +# $Id: londocs.pm,v 1.283 2007/07/03 00:17:42 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -122,16 +122,17 @@ sub dumpbutton { my ($home,$other,%outhash)=&authorhosts(); my $type = &Apache::loncommon::course_type(); if ($home+$other==0) { return ''; } - my $output='
'.$errtext.'
'); + $r->print(''.$errtext.'
'); } else { # ------------------------------------------------------------ Process commands @@ -1296,7 +1297,7 @@ sub editor { # store the changed version ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container); if ($fatal) { - $r->print(''.$errtext.'
'); + $r->print(''.$errtext.'
'); return; } } @@ -1336,7 +1337,7 @@ sub editor { # store the changed version ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container); if ($fatal) { - $r->print(''.$errtext.'
'); + $r->print(''.$errtext.'
'); return; } } @@ -1370,7 +1371,7 @@ sub editor { # Store the result ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container); if ($fatal) { - $r->print(''.$errtext.'
'); + $r->print(''.$errtext.'
'); return; } @@ -1427,7 +1428,7 @@ sub editor { ($errtext,$fatal)=&storemap($coursenum,$coursedom, $folder.'.'.$container); if ($fatal) { - $r->print(''.$errtext.'
'); + $r->print(''.$errtext.'
'); return; } } @@ -1447,7 +1448,7 @@ sub editor { ($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder, $container,'londocs',@imports); if ($fatal) { - $r->print(''.$errtext.'
'); + $r->print(''.$errtext.'
'); return; } } @@ -1464,11 +1465,12 @@ sub editor { ($errtext,$fatal)=&storemap($coursenum,$coursedom, $folder.'.'.$container); if ($fatal) { - $r->print(''.$errtext.'
'); + $r->print(''.$errtext.'
'); return; } } else { - $r->print(''.&mt('No map selected.').'
'); + $r->print(''.&mt('No map selected.').'
'); + } } &log_differences($plain); @@ -1569,7 +1571,7 @@ sub process_file_upload { ($errtext,$fatal)=&storemap($coursenum,$coursedom, $folder.'.'.$container); if ($fatal) { - $$upload_output .= ''.$errtext.'
'; + $$upload_output .= ''.$errtext.'
'; return 'failed'; } else { if ($parseaction eq 'parse') { @@ -2011,17 +2013,17 @@ sub checkonthis { if (($errorcount) || ($warningcount)) { if ($errorcount) { - $r->print(''. + $r->print(''. $errorcount.' '. - &mt('error(s)').' '); + &mt('error(s)').' '); } if ($warningcount) { - $r->print(''. + $r->print(''. $warningcount.' '. - &mt('warning(s)').''); + &mt('warning(s)').''); } } else { - $r->print(''.&mt('ok').''); + $r->print(''.&mt('ok').''); } $r->rflush(); } @@ -2033,15 +2035,15 @@ sub checkonthis { } } } elsif ($result eq 'unavailable') { - $r->print(''.&mt('connection down').''); + $r->print(''.&mt('connection down').''); } elsif ($result eq 'not_found') { unless ($url=~/\$/) { - $r->print(''.&mt('not found').''); + $r->print(''.&mt('not found').''); } else { - $r->print(''.&mt('unable to verify variable URL').''); + $r->print(''.&mt('unable to verify variable URL').''); } } else { - $r->print(''.&mt('access denied').''); + $r->print(''.&mt('access denied').''); } } } @@ -2083,9 +2085,9 @@ sub verifycontent { foreach (keys %hash) { if ($hash{$_}=~/\.(page|sequence)$/) { if (($_=~/^src_/) && ($alreadyseen{&unescape($hash{$_})})) { - $r->print('