--- loncom/interface/londocs.pm 2003/09/08 18:56:09 1.74 +++ loncom/interface/londocs.pm 2003/09/17 23:40:25 1.81 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.74 2003/09/08 18:56:09 www Exp $ +# $Id: londocs.pm,v 1.81 2003/09/17 23:40:25 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,6 +38,7 @@ use Apache::lonxml; use Apache::loncreatecourse; use HTML::Entities; use GDBM_File; +use Apache::lonlocal; my $iconpath; @@ -114,22 +115,121 @@ sub dumpbutton { my $output=''; if ($home) { return ''. - ''; + ''; } else { return''. - 'Dump Course DOCS to Construction Space: available on other servers'; + &mt('Dump Course DOCS to Construction Space: available on other servers'); } } # -------------------------------------------------------- Actually dump course sub dumpcourse { + my $r=shift; + $r->print('Dump DOCS'. + &Apache::loncommon::bodytag('Dump Course DOCS to Construction Space'). + '
'); my ($home,$other,%outhash)=&authorhosts(); - unless ($outhash{'home_'.$ENV{'form.authorspace'}}) { return ''; } - my ($ca,$cd)=split(/\@/,$ENV{'form.authorspace'}); - + unless ($home) { return ''; } + my $origcrsid=$ENV{'request.course.id'}; + my %origcrsdata=&Apache::lonnet::coursedescription($origcrsid); + if (($ENV{'form.authorspace'}) && ($ENV{'form.authorfolder'}=~/\w/)) { +# Do the dumping + unless ($outhash{'home_'.$ENV{'form.authorspace'}}) { return ''; } + my ($ca,$cd)=split(/\@/,$ENV{'form.authorspace'}); + $r->print('

Copying Files

'); + my $title=$ENV{'form.authorfolder'}; + $title=~s/[^\w\/]+/\_/g; + my %replacehash=(); + foreach (keys %ENV) { + if ($_=~/^form\.namefor\_(.+)/) { + $replacehash{$1}=$ENV{$_}; + } + } + my $crs='/uploaded/'.$ENV{'request.course.id'}.'/'; + $crs=~s/\_/\//g; + foreach (keys %replacehash) { + my $newfilename=$title.'/'.$replacehash{$_}; + $newfilename=~s/[^\w\/\.]+/\_/g; + my @dirs=split(/\//,$newfilename); + my $path='/home/'.$ca.'/public_html'; + my $makepath=$path; + my $fail=0; + for (my $i=0;$i<$#dirs;$i++) { + $makepath.='/'.$dirs[$i]; + unless (-e $makepath) { + unless(mkdir($makepath,0777)) { $fail=1; } + } + } + $r->print('
'.$_.' => '.$newfilename.': '); + if (my $fh=Apache::File->new('>'.$path.'/'.$newfilename)) { + if ($_=~/\.(sequence|page|html|htm|xml|xhtml)$/) { + print $fh &Apache::loncreatecourse::rewritefile( + &Apache::loncreatecourse::readfile($ENV{'request.course.id'},$_), + (%replacehash,$crs => '') + ); + } else { + print $fh + &Apache::loncreatecourse::readfile($ENV{'request.course.id'},$_); + } + $fh->close(); + } else { + $fail=1; + } + if ($fail) { + $r->print('fail'); + } else { + $r->print('ok'); + } + } + } else { +# Input form + unless ($home==1) { + $r->print( + '

'.&mt('Select the Construction Space').'

'); + } else { + $r->print(''); + } + } + } + unless ($home==1) { + $r->print(''); + } + my $title=$origcrsdata{'description'}; + $title=~s/\s+/\_/gs; + $title=~s/\W//gs; + $r->print('

'.&mt('Folder in Construction Space').'


'); + &tiehash(); + $r->print('

'.&mt('Filenames in Construction Space').'

'); + foreach (&Apache::loncreatecourse::crsdirlist($origcrsid,'userfiles')) { + $r->print(''); + my ($ext)=($_=~/\.(\w+)$/); + my $title=$hash{'title_'.$hash{ + 'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$_}}; + $r->print(''); + unless ($title) { + $title=$_; + } + $title=~s/\.(\w+)$//; + $title=~s/\W+/\_/gs; + $title.='.'.$ext; + $r->print("\n\n"); + } + $r->print("
'.&mt('Internal Filename').''.&mt('Title').''.&mt('Save as ...').'
'.$_.''.($title?$title:' ').'
\n"); + &untiehash(); + $r->print( + '

'); + } } + # Imports the given (name, url) resources into the course # coursenum, coursedom, and folder must precede the list sub group_import { @@ -150,7 +250,7 @@ sub group_import { join ':', ($name, $url, $ext, 'normal', 'res'); } } - &storemap($coursenum, $coursedom, $folder); + &storemap($coursenum, $coursedom, $folder.'.sequence'); } sub editor { @@ -440,34 +540,12 @@ sub checkonthis { } } -# ================================================================ Main Handler -sub handler { - my $r = shift; - $r->content_type('text/html'); - $r->send_http_header; - return OK if $r->header_only; -# --------------------------------------------- Initialize help topics for this - foreach ('Adding_Course_Doc','Main_Course_Documents', - 'Adding_External_Resource','Navigate_Content', - 'Adding_Folders','Docs_Overview', 'Load_Map', - 'Supplemental', 'Score_Upload_Form', - 'Importing_LON-CAPA_Resource','Uploading_From_Harddrive') { - $help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_); - } - # Composite help files - $help{'Syllabus'} = &Apache::loncommon::help_open_topic( - 'Docs_About_Syllabus,Docs_Editing_Templated_Pages'); - $help{'Simple Page'} = &Apache::loncommon::help_open_topic( - 'Docs_About_Simple_Page,Docs_Editing_Templated_Pages'); - $help{'Bulletin Board'} = &Apache::loncommon::help_open_topic( - 'Docs_About_Bulletin_Board,Docs_Editing_Templated_Pages'); - $help{'My Personal Info'} = &Apache::loncommon::help_open_topic( - 'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages'); - $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching'); - - if ($ENV{'form.verify'}) { - +# +# -------------------------------------------------------------- Verify Content +# +sub verifycontent { + my $r=shift; my $loaderror=&Apache::lonnet::overloaderror($r); if ($loaderror) { return $loaderror; } @@ -483,9 +561,14 @@ sub handler { } } &untiehash(); - $r->print('

Done.

'); - } elsif ($ENV{'form.versions'}) { - $r->print('Check Versions'. + $r->print('

'.&mt('Done').'.

'); +} + +# -------------------------------------------------------------- Check Versions + +sub checkversions { + my $r=shift; + $r->print('Check Versions'. &Apache::loncommon::bodytag('Check Course Document Versions')); $hashtied=0; &tiehash(); @@ -518,7 +601,7 @@ sub handler { $seltext='since yesterday ('.localtime($starttime).')'; $daysel='selected'; } - + $r->print(<

Changes will become active for your current session after , or the next time you log in.'. +'

'. +&mt('Changes will become active for your current session after'). +' '.&mt(', or the next time you log in.'). $help{'Caching'}.'

'); } my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time. '.sequence'; - $r->print(< -Upload a new main course document -Import a published document -Special documents +$lt{'uplm'} +$lt{'impp'} +$lt{'spec'} File:
@@ -788,7 +930,7 @@ Title:
- + $help{'Uploading_From_Harddrive'} @@ -799,10 +941,10 @@ Title:
+"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="$lt{'srch'}"> +"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="$lt{'impo'}"> $help{'Importing_LON-CAPA_Resource'}

@@ -810,7 +952,7 @@ $help{'Importing_LON-CAPA_Resource'}
+value="$lt{'selm'}"> $help{'Load_Map'}

@@ -822,7 +964,7 @@ $help{'Load_Map'} $help{'Adding_Folders'} +value="$lt{'newf'}" />$help{'Adding_Folders'}
@@ -831,7 +973,7 @@ value="New Folder" />$help{'Adding_Folde $help{'Adding_External_Resource'} +value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
@@ -840,7 +982,7 @@ value="External Resource" /> $help{'Addi - + $help{'Syllabus'}
@@ -850,7 +992,7 @@ value="Syllabus=/public/$coursedom/$cour - + $help{'Navigate_Content'} @@ -859,7 +1001,7 @@ $help{'Navigate_Content'} - $help{'Simple Page'} @@ -868,7 +1010,7 @@ onClick="javascript:makesmppage();" /> $ -$help{'Simple Problem'} @@ -877,7 +1019,7 @@ onClick="javascript:makesmpproblem();" / - $help{'Score_Upload_Form'} @@ -887,7 +1029,7 @@ $help{'Score_Upload_Form'} - $help{'Bulletin Board'} @@ -898,7 +1040,7 @@ $help{'Bulletin Board'} - + $help{'My Personal Info'} @@ -910,7 +1052,7 @@ ENDFORM # ----------------------------------------------------- Supplemental documents if (!$forcestandard) { $r->print( - '

Supplemental Course Documents'. + '

'.&mt('Supplemental Course Documents'). ($allowed?' '.$help{'Supplemental'}:'').'

'); my $folder=$ENV{'form.folder'}; unless ($folder=~/supplemental/) { $folder='supplemental'; } @@ -922,9 +1064,9 @@ ENDFORM $r->print(< -Upload a new supplemental course document -Import a published document -Special documents +$lt{'upls'} +$lt{'impp'} +$lt{'spec'}
@@ -936,7 +1078,7 @@ ENDFORM - + $help{'Uploading_From_Harddrive'}
@@ -947,9 +1089,9 @@ ENDFORM +"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="$lt{'srch'}"> $help{'Importing_LON-CAPA_Resource'} +"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="$lt{'impo'}">$help{'Importing_LON-CAPA_Resource'}

@@ -966,7 +1108,7 @@ value="Select Map"> $help{'Adding_Folders'} +value="$lt{'newf'}" /> $help{'Adding_Folders'}
@@ -976,7 +1118,7 @@ value="New Folder" /> $help{'Adding_Fold $help{'Adding_External_Resource'} +value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
@@ -985,7 +1127,7 @@ value="External Resource" /> $help{'Addi - + $help{'Syllabus'}
@@ -995,7 +1137,7 @@ $help{'Syllabus'} - + $help{'My Personal Info'} @@ -1010,11 +1152,12 @@ ENDSUPFORM $r->print(''); } else { # -------------------------------------------------------- This is showdoc mode - $r->print("

Uploaded Document

It is recommended that you use an up-to-date virus scanner before handling this file.

". - &entryline(0,"Click to download or use your browser's Save Link function",$showdoc).'

'); + $r->print("

".&mt('Uploaded Document').'

'. +&mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."

". + &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'

'); } } - $r->print(''); + $r->print(&Apache::lonlocal::endreroutetrans().''); return OK; }