--- loncom/interface/londocs.pm 2007/06/29 23:25:30 1.281 +++ 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.281 2007/06/29 23:25:30 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=''; if ($home) { - return ''. + return '
'. ''. - &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs'); + &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs'). + '
'; } else { - return''. + return '
'. &mt('Dump '.$type. - ' DOCS to Construction Space: available on other servers'); + ' DOCS to Construction Space: available on other servers'). + '
'; } } @@ -199,9 +200,9 @@ sub dumpcourse { $fail=1; } if ($fail) { - $r->print('fail'); + $r->print(''.&mt('fail').''); } else { - $r->print('ok'); + $r->print(''.&mt('ok').''); } } } else { @@ -257,10 +258,10 @@ sub dumpcourse { sub exportbutton { my $type = &Apache::loncommon::course_type(); - return ''. + return '
'. ''. - &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs'); + &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'
'; } sub exportcourse { @@ -379,7 +380,7 @@ sub exportcourse { } $display .= ' />'."\n"; for (my $i=0; $i<$depth; $i++) { - $display .= ''."\n"; + $display .= ''."\n"; } if ($curRes->is_sequence()) { $display .= ' '."\n"; @@ -1255,7 +1256,7 @@ sub editor { my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain)=&breadcrumbs($folder); $r->print($breadcrumbtrail); if ($fatal) { - $r->print('

'.$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') { @@ -1577,7 +1579,7 @@ sub process_file_upload { if ($total_embedded > 0) { my $num = 0; my $state = ' - + @@ -1720,12 +1722,14 @@ sub entryline { if ($env{'form.folderpath'}) { $type = 'folder'; $container = 'sequence'; - $esc_path=&escape($path = $env{'form.folderpath'}); + $esc_path=&escape($env{'form.folderpath'}); + $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); # $htmlfoldername=&HTML::Entities::encode($env{'form.foldername'},'<>&"'); } if ($env{'form.pagepath'}) { $type = $container = 'page'; $esc_path=&escape($path = $env{'form.pagepath'}); + $path = &HTML::Entities::encode($env{'form.pagepath'},'<>&"'); $symb=&escape($env{'form.pagesymb'}); } my $cpinfo=''; @@ -1799,12 +1803,12 @@ ENDCUT
- $lt{ + $lt{
- $lt{ + $lt{
@@ -1921,10 +1925,10 @@ END $path.$pagearg.'.page'); } $url.='pagepath='.&escape($pagepath). - '&pagesymb='.&escape($symb).$cpinfo; + '&pagesymb='.&escape($symb).$cpinfo; } $line.=''. + '" class="LC_icon" />'. "".($url?"":'').$title. ($url?'':' '.&mt('(re-initialize course to access)').'').""; if (($allowed) && ($folder!~/^supplemental/)) { @@ -2009,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(); } @@ -2031,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').''); } } } @@ -2081,9 +2085,9 @@ sub verifycontent { foreach (keys %hash) { if ($hash{$_}=~/\.(page|sequence)$/) { if (($_=~/^src_/) && ($alreadyseen{&unescape($hash{$_})})) { - $r->print('
'. + $r->print('
'. &mt('The following sequence or page is included more than once in your '.$type.': '). - &unescape($hash{$_}).'
'. + &unescape($hash{$_}).'
'. &mt('Note that grading records for problems included in this sequence or folder will overlap.
')); } } @@ -2163,7 +2167,7 @@ sub checkversions { $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') { $r->print('

'.&mt('Your Version Settings have been Saved').'

'); } else { - $r->print('

'.&mt('An Error Occured while Attempting to Save your Version Settings').'

'); + $r->print('

'.&mt('An Error Occured while Attempting to Save your Version Settings').'

'); } &mark_hash_old(); } @@ -2394,11 +2398,11 @@ sub changewarning { ''."\n". '
'. '

'. +'" />

'. &mt($message,' '). -$help{'Caching'}.'

'."\n\n"); +$help{'Caching'}.'

'."\n\n"); } # =========================================== Breadcrumbs for special functions @@ -2492,8 +2496,8 @@ sub handler { $env{'form.folder'}=pop(@pagepath); $containertag = ''. ''; - $uploadtag = ''. - ''; + $uploadtag = ''. + ''; } if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) { $showdoc='/'.$1; @@ -2675,36 +2679,42 @@ sub handler { } unless ($env{'form.pagepath'}) { $containertag = ''; - $uploadtag = ''; + $uploadtag = ''; } $r->print(< - - - - -$containertag + + + + + $containertag
- -$uploadtag + + $uploadtag
- -
-$help{'Verify_Content'} - - $help{'Check_Resource_Versions'} -$dumpbut -$exportbut - - - - - -
+
+ +
+ $help{'Verify_Content'} +
+
+ $help{'Check_Resource_Versions'} +
+ $dumpbut + $exportbut +
+ +
+
+ + +
+
+
 
ENDCOURSEVERIFY $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc', &mt('Editing the Table of Contents for your '.$type))); @@ -2785,10 +2795,10 @@ $help{'Importing_LON-CAPA_Resource'}

$lt{'copm'}
-
+
+value="$lt{'selm'}" /> $help{'Load_Map'}

@@ -2811,15 +2821,15 @@ value="$lt{'extr'}" /> $help{'Adding_Ext
-
ENDFORM } $r->print(''); unless ($env{'form.pagepath'}) { + my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); $r->print(<
- + $help{'Adding_Fold

- + print(<&"'); + $r->print(< $lt{'upls'} $lt{'spec'} @@ -2989,7 +3000,7 @@ $lt{'comment'}:

- + @@ -2999,7 +3010,7 @@ $lt{'comment'}:
- + $help{'Adding_Fol

- + $help{'Adding_Ext

- + @@ -3026,7 +3037,7 @@ $help{'Syllabus'}

- +