--- loncom/interface/londocs.pm 2003/07/24 22:06:07 1.69.2.1 +++ loncom/interface/londocs.pm 2003/09/28 00:14:25 1.84 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.69.2.1 2003/07/24 22:06:07 albertel Exp $ +# $Id: londocs.pm,v 1.84 2003/09/28 00:14:25 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,8 +35,10 @@ use Apache::loncommon; use Apache::lonratedt; use Apache::lonratsrv; use Apache::lonxml; +use Apache::loncreatecourse; use HTML::Entities; use GDBM_File; +use Apache::lonlocal; my $iconpath; @@ -72,6 +74,185 @@ sub storemap { $map,1); } +# ----------------------------------------- Return hash with valid author names + +sub authorhosts { + my %outhash=(); + my $home=0; + my $other=0; + foreach (keys %ENV) { + if ($_=~/^user\.role\.(au|ca)\.(.+)$/) { + my $role=$1; + my $realm=$2; + my ($start,$end)=split(/\./,$ENV{$_}); + if (($start) && ($start>time)) { next; } + if (($end) && (time>$end)) { next; } + my $ca; my $cd; + if ($1 eq 'au') { + $ca=$ENV{'user.name'}; + $cd=$ENV{'user.domain'}; + } else { + ($cd,$ca)=($realm=~/^\/(\w+)\/(\w+)$/); + } + if (&Apache::lonnet::homeserver($ca,$cd) eq + $Apache::lonnet::perlvar{'lonHostID'}) { + $home++; + $outhash{'home_'.$ca.'@'.$cd}=1; + } else { + $outhash{'otherhome_'.$ca.'@'.$cd}= + &Apache::lonnet::homeserver($ca,$cd); + $other++; + } + } + } + return ($home,$other,%outhash); +} +# ------------------------------------------------------ Generate "dump" button + +sub dumpbutton { + my ($home,$other,%outhash)=&authorhosts(); + if ($home+$other==0) { return ''; } + my $output=''; + if ($home) { + return ''. + ''; + } else { + return''. + &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 ($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 { + my $coursenum = shift; + my $coursedom = shift; + my $folder = shift; + while (@_) { + my $name = shift; + my $url = shift; + if ($url) { + my $idx = $#Apache::lonratedt::resources + 1; + $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=$idx; + my $ext = 'false'; + if ($url=~/^http:\/\//) { $ext = 'true'; } + $url =~ s/:/\:/g; + $name =~ s/:/\:/g; + $Apache::lonratedt::resources[$idx] = + join ':', ($name, $url, $ext, 'normal', 'res'); + } + } + &storemap($coursenum, $coursedom, $folder.'.sequence'); +} + sub editor { my ($r,$coursenum,$coursedom,$folder,$allowed)=@_; if ($ENV{'form.foldername'}) { @@ -158,26 +339,17 @@ sub editor { } # Group import/search if ($ENV{'form.importdetail'}) { - foreach (split(/\&/,$ENV{'form.importdetail'})) { - if (defined($_)) { - my ($name,$url)=split(/\=/,$_); - $name=&Apache::lonnet::unescape($name); - $url=&Apache::lonnet::unescape($url); - if ($url) { - my $idx=$#Apache::lonratedt::resources+1; - $Apache::lonratedt::order - [$#Apache::lonratedt::order+1]=$idx; - my $ext='false'; - if ($url=~/^http\:\/\//) { $ext='true'; } - $url=~s/\:/\:/g; - $name=~s/\:/\:/g; - $Apache::lonratedt::resources[$idx]= - $name.':'.$url.':'.$ext.':normal:res'; - } - } - } + my @imports; + foreach (split(/\&/,$ENV{'form.importdetail'})) { + if (defined($_)) { + my ($name,$url)=split(/\=/,$_); + $name=&Apache::lonnet::unescape($name); + $url=&Apache::lonnet::unescape($url); + push @imports, $name, $url; + } + } # Store the changed version - &storemap($coursenum,$coursedom,$folder.'.sequence'); + group_import($coursenum, $coursedom, $folder, @imports); } # Loading a complete map if (($ENV{'form.importmap'}) && ($ENV{'form.loadmap'})) { @@ -265,7 +437,7 @@ END } } $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//; - if ($residx) { + if (($residx) && ($folder!~/supplemental/)) { $url.=(($url=~/\?/)?'&':'?').'symb='. &Apache::lonnet::escape(&Apache::lonnet::symbclean( &Apache::lonnet::declutter('uploaded/'. @@ -328,7 +500,7 @@ sub checkonthis { for (my $i=0;$i<=$level*5;$i++) { $r->print(' '); } - $r->print('- Rendering: '); + $r->print('- '.&mt('Rendering').': '); my $oldpath=$ENV{'request.filename'}; $ENV{'request.filename'}=&Apache::lonnet::filelocation('',$url); &Apache::lonxml::xmlparse($r,'web', @@ -343,7 +515,8 @@ sub checkonthis { } if ($Apache::lonxml::warningcount) { $r->print(''. - $Apache::lonxml::warningcount.' warning(s)'); + $Apache::lonxml::warningcount.' '. + &mt('warning(s)').''); } } else { $r->print('ok'); @@ -358,44 +531,22 @@ sub checkonthis { } } } elsif ($result==HTTP_SERVICE_UNAVAILABLE) { - $r->print('connection down'); + $r->print(''.&mt('connection down').''); } elsif ($result==HTTP_NOT_FOUND) { - $r->print('not found'); + $r->print(''.&mt('not found').''); } else { - $r->print('access denied'); + $r->print(''.&mt('access denied').''); } } } } -# ================================================================ 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; } @@ -411,8 +562,14 @@ sub handler { } } &untiehash(); - } 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(); @@ -424,7 +581,8 @@ sub handler { unless ($ENV{'form.timerange'}) { $ENV{'form.timerange'}=604800; } - my $seltext='during the last '.$ENV{'form.timerange'}.' seconds'; + my $seltext=&mt('during the last').' '.$ENV{'form.timerange'}.' ' + .&mt('seconds'); my $startsel=''; my $monthsel=''; my $weeksel=''; @@ -436,31 +594,41 @@ sub handler { } my $starttime=time-$ENV{'form.timerange'}; if ($ENV{'form.timerange'}==2592000) { - $seltext='during the last month ('.localtime($starttime).')'; + $seltext=&mt('during the last month').' ('.localtime($starttime).')'; $monthsel='selected'; } elsif ($ENV{'form.timerange'}==604800) { - $seltext='during the last week ('.localtime($starttime).')'; + $seltext=&mt('during the last week').' ('.localtime($starttime).')'; $weeksel='selected'; } elsif ($ENV{'form.timerange'}==86400) { - $seltext='since yesterday ('.localtime($starttime).')'; + $seltext=&mt('since yesterday').' ('.localtime($starttime).')'; $daysel='selected'; } - + my %lt=&Apache::lonlocal::texthash + ('st' => 'Since Start of Course', + 'lm' => 'Last Month', + 'lw' => 'Last Week', + 'sy' => 'Since Yesterday', + 'di' => 'Display', + 'cc' => 'Content changed', + 'fi' => 'File', + 'md' => 'Modification Date', + 've' => 'Version', + 'di' => 'Differences'); $r->print(< - + -

Content changed $seltext

+

$lt{'cc'} $seltext

- - + + ENDHEADERS foreach (keys %changes) { if ($changes{$_}>$starttime) { @@ -498,10 +666,46 @@ ENDHEADERS } } $r->print('
FileModification DateVersionDifferences
$lt{'fi'}$lt{'md'}$lt{'ve'}$lt{'di'}
'); + $r->print('

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

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

No content modifications yet.

'); + $r->print('

'.&mt('No content modifications yet.').'

'); } &untiehash(); +} + +# ================================================================ Main Handler +sub handler { + my $r = shift; + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + return OK if $r->header_only; + + &Apache::lonlocal::clearreroutetrans(); +# --------------------------------------------- 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'}) { + &verifycontent($r); + } elsif ($ENV{'form.versions'}) { + &checkversions($r); + } elsif ($ENV{'form.dumpcourse'}) { + &dumpcourse($r); } else { # is this a standard course? @@ -511,7 +715,6 @@ ENDHEADERS my $script=''; my $allowed; my $events=''; - my $buttons=''; my $showdoc=0; &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['folder','foldername']); @@ -523,7 +726,7 @@ ENDHEADERS $forcesupplement=($ENV{'form.folder'}=~/^supplemental_/); # does this user have privileges to post, etc? - $allowed=&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}); + $allowed=&Apache::lonnet::allowed('mdc',$ENV{'request.course.id'}); if ($allowed) { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']); $script=&Apache::lonratedt::editscript('simple'); @@ -533,7 +736,6 @@ ENDHEADERS $script=''.&Apache::lonmenu::registerurl(1,undef).''. '
'. -'

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:
@@ -710,7 +942,7 @@ Title:
- + $help{'Uploading_From_Harddrive'} @@ -721,10 +953,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'}

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

@@ -744,7 +976,7 @@ $help{'Load_Map'} $help{'Adding_Folders'} +value="$lt{'newf'}" />$help{'Adding_Folders'}
@@ -753,7 +985,7 @@ value="New Folder" />$help{'Adding_Folde $help{'Adding_External_Resource'} +value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
@@ -762,7 +994,7 @@ value="External Resource" /> $help{'Addi - + $help{'Syllabus'}
@@ -772,7 +1004,7 @@ value="Syllabus=/public/$coursedom/$cour - + $help{'Navigate_Content'} @@ -781,16 +1013,25 @@ $help{'Navigate_Content'} - $help{'Simple Page'} +
+ + + + +$help{'Simple Problem'} + +
- $help{'Score_Upload_Form'} @@ -800,7 +1041,7 @@ $help{'Score_Upload_Form'} - $help{'Bulletin Board'} @@ -811,7 +1052,7 @@ $help{'Bulletin Board'} - + $help{'My Personal Info'}
@@ -823,7 +1064,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'; } @@ -835,9 +1076,9 @@ ENDFORM $r->print(< -Upload a new supplemental course document -Import a published document -Special documents +$lt{'upls'} +$lt{'impp'} +$lt{'spec'}
@@ -849,7 +1090,7 @@ ENDFORM - + $help{'Uploading_From_Harddrive'}
@@ -860,15 +1101,15 @@ 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'}

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

@@ -879,7 +1120,7 @@ value="Select Map"> $help{'Adding_Folders'} +value="$lt{'newf'}" /> $help{'Adding_Folders'}
@@ -889,7 +1130,7 @@ value="New Folder" /> $help{'Adding_Fold $help{'Adding_External_Resource'} +value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
@@ -898,7 +1139,7 @@ value="External Resource" /> $help{'Addi - + $help{'Syllabus'}
@@ -908,7 +1149,7 @@ $help{'Syllabus'} - + $help{'My Personal Info'} @@ -923,11 +1164,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; }