--- loncom/interface/londocs.pm 2003/09/08 18:56:09 1.74 +++ loncom/interface/londocs.pm 2004/03/31 05:23:59 1.111 @@ -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.111 2004/03/31 05:23:59 albertel 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; @@ -67,10 +68,13 @@ sub mapread { sub storemap { my ($coursenum,$coursedom,$map)=@_; - $hadchanges=1; - return + my ($outtext,$errtext)= &Apache::lonratedt::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'. $map,1); + if ($errtext) { return ($errtext,2); } + + $hadchanges=1; + return ($errtext,0); } # ----------------------------------------- Return hash with valid author names @@ -93,13 +97,15 @@ sub authorhosts { } else { ($cd,$ca)=($realm=~/^\/(\w+)\/(\w+)$/); } - if (&Apache::lonnet::homeserver($ca,$cd) eq - $Apache::lonnet::perlvar{'lonHostID'}) { + my $allowed=0; + my $myhome=&Apache::lonnet::homeserver($ca,$cd); + my @ids=&Apache::lonnet::current_machine_ids(); + foreach my $id (@ids) { if ($id eq $myhome) { $allowed=1; } } + if ($allowed) { $home++; $outhash{'home_'.$ca.'@'.$cd}=1; } else { - $outhash{'otherhome_'.$ca.'@'.$cd}= - &Apache::lonnet::homeserver($ca,$cd); + $outhash{'otherhome_'.$ca.'@'.$cd}=$myhome; $other++; } } @@ -114,22 +120,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('

'.&mt('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 +255,7 @@ sub group_import { join ':', ($name, $url, $ext, 'normal', 'res'); } } - &storemap($coursenum, $coursedom, $folder); + return &storemap($coursenum, $coursedom, $folder.'.sequence'); } sub editor { @@ -195,7 +300,12 @@ sub editor { $comment.':'.$url.':'.$ext.':normal:res'; $Apache::lonratedt::order[$#Apache::lonratedt::order+1]= $newidx; - &storemap($coursenum,$coursedom,$folder.'.sequence'); + + ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.sequence'); + if ($fatal) { + $r->print('

'.$errtext.'

'); + return; + } } } if ($ENV{'form.cmd'}) { @@ -235,7 +345,12 @@ sub editor { } # Store the changed version - &storemap($coursenum,$coursedom,$folder.'.sequence'); + ($errtext,$fatal)=&storemap($coursenum,$coursedom, + $folder.'.sequence'); + if ($fatal) { + $r->print('

'.$errtext.'

'); + return; + } } # Group import/search if ($ENV{'form.importdetail'}) { @@ -249,21 +364,30 @@ sub editor { } } # Store the changed version - group_import($coursenum, $coursedom, $folder, @imports); + ($errtext,$fatal)=group_import($coursenum, $coursedom, $folder, + @imports); + if ($fatal) { + $r->print('

'.$errtext.'

'); + return; + } } # Loading a complete map if (($ENV{'form.importmap'}) && ($ENV{'form.loadmap'})) { - foreach -(&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) { + foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) { my $idx=$#Apache::lonratedt::resources; $idx++; $Apache::lonratedt::resources[$idx]=$_; $Apache::lonratedt::order - [$#Apache::lonratedt::order+1]=$idx; - } + [$#Apache::lonratedt::order+1]=$idx; + } # Store the changed version - &storemap($coursenum,$coursedom,$folder.'.sequence'); + ($errtext,$fatal)=&storemap($coursenum,$coursedom, + $folder.'.sequence'); + if ($fatal) { + $r->print('

'.$errtext.'

'); + return; + } } } # ---------------------------------------------------------------- End commands @@ -273,7 +397,7 @@ sub editor { foreach (@Apache::lonratedt::order) { my ($name,$url)=split(/\:/,$Apache::lonratedt::resources[$_]); unless ($name) { $name=(split(/\//,$url))[-1]; } - unless ($name) { $name='NO RESOURCE'; $url='/adm/notfound.html'; } + unless ($name) { next; } $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_)); $idx++; } @@ -287,48 +411,53 @@ sub entryline { my ($index,$title,$url,$folder,$allowed,$residx)=@_; $title=~s/\&colon\;/\:/g; $title=&HTML::Entities::encode(&HTML::Entities::decode( - &Apache::lonnet::unescape($title)),'\"\<\>\&\''); + &Apache::lonnet::unescape($title)),'"<>&\''); my $renametitle=$title; my $foldertitle=$title; - if ($title=~ - /^(\d+)\_\_\_\&\;\&\;\&\;\_\_\_(\w+)\_\_\_\&\;\&\;\&\;\_\_\_(\w+)\_\_\_\&\;\&\;\&\;\_\_\_(.*)$/ - ) { - $foldertitle=&Apache::lontexconvert::msgtexconverted($4); - $renametitle=$4; - $title=''.localtime($1).' '. - &Apache::loncommon::plainname($2,$3).':
'. - $foldertitle; - } + if ($title=~ /^(\d+)___&&&___(\w+)___&&&___(\w+)___&&&___(.*)$/ ) { + $foldertitle=&Apache::lontexconvert::msgtexconverted($4); + $renametitle=$4; + $title=''.&Apache::lonlocal::locallocaltime($1).' '. + &Apache::loncommon::plainname($2,$3).':
'. + $foldertitle; + } $renametitle=~s/\"\;/\\\"/g; my $line=''; # Edit commands if ($allowed) { - $line.=(< 'Move Up', + 'dw' => 'Move Down', + 'rm' => 'Remove', + 'rn' => 'Rename'); + my ($foldername,$htmlfoldername); + if ($ENV{'form.foldername'}) { + $foldername='&foldername='. + &Apache::lonnet::escape($ENV{'form.foldername'}); + $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"'); + } + $line.=(< + +$lt{ + +$lt{
- -UP
- -DOWN
- -Remove - -Rename + +$lt{'rm'} + +$lt{'rn'} END } # Figure out what kind of a resource this is my ($extension)=($url=~/\.(\w+)$/); my $uploaded=($url=~/^\/*uploaded\//); - my $icon='unknown'; - if (-e "/home/httpd/html/adm/lonIcons/$extension.gif") { - $icon=$extension; - } + my $icon=&Apache::loncommon::icon($url); my $isfolder=0; if ($uploaded) { if ($extension eq 'sequence') { - $icon='folder_closed'; + $icon=$iconpath.'/folder_closed.gif'; $url=~/\/(\w+)\.sequence/; $url='/adm/coursedocs?folder='.$1; $isfolder=1; @@ -350,8 +479,7 @@ END if ($isfolder) { $url.='&foldername='. &Apache::lonnet::escape($foldertitle); } $line.=''. + '">'. "$title"; return $line; } @@ -380,7 +508,7 @@ sub checkonthis { $alreadyseen{$url}=1; $r->rflush(); if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) { - $r->print('
'); + $r->print("\n
"); for (my $i=0;$i<=$level*5;$i++) { $r->print(' '); } @@ -390,7 +518,7 @@ sub checkonthis { my $result=&Apache::lonnet::repcopy( &Apache::lonnet::filelocation('',$url)); if ($result==OK) { - $r->print('ok'); + $r->print(''.&mt('ok').''); $r->rflush(); &Apache::lonnet::countacc($url); $url=~/\.(\w+)$/; @@ -400,25 +528,28 @@ 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', &Apache::lonnet::getfile( &Apache::lonnet::filelocation('',$url))); + undef($Apache::lonhomework::parsing_a_problem); $ENV{'request.filename'}=$oldpath; if (($Apache::lonxml::errorcount) || ($Apache::lonxml::warningcount)) { if ($Apache::lonxml::errorcount) { - $r->print(''. - $Apache::lonxml::errorcount.' error(s) '); + $r->print(''. + $Apache::lonxml::errorcount.' '. + &mt('error(s)').' '); } if ($Apache::lonxml::warningcount) { $r->print(''. - $Apache::lonxml::warningcount.' warning(s)'); + $Apache::lonxml::warningcount.' '. + &mt('warning(s)').''); } } else { - $r->print('ok'); + $r->print(''.&mt('ok').''); } $r->rflush(); } @@ -430,20 +561,303 @@ 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'); + unless ($url=~/\$/) { + $r->print(''.&mt('not found').''); + } else { + $r->print(''.&mt('unable to verify variable URL').''); + } } else { - $r->print('access denied'); + $r->print(''.&mt('access denied').''); } } } } + +# +# -------------------------------------------------------------- Verify Content +# +sub verifycontent { + my $r=shift; + my $loaderror=&Apache::lonnet::overloaderror($r); + if ($loaderror) { return $loaderror; } + + $r->print('Verify Content'. + &Apache::loncommon::bodytag('Verify Course Documents')); + $hashtied=0; + undef %alreadyseen; + %alreadyseen=(); + &tiehash(); + foreach (keys %hash) { + if (($_=~/^src\_(.+)$/) && (!$alreadyseen{$hash{$_}})) { + &checkonthis($r,$hash{$_},0,$hash{'title_'.$1}); + } + } + &untiehash(); + $r->print('

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

'.''. + &mt('Return to DOCS').''); +} + +# -------------------------------------------------------------- Check Versions + +sub checkversions { + my $r=shift; + $r->print('Check Versions'. + &Apache::loncommon::bodytag('Check Course Document Versions')); + my $header=''; + my $startsel=''; + my $monthsel=''; + my $weeksel=''; + my $daysel=''; + my $allsel=''; + my %changes=(); + my $starttime=0; + my $haschanged=0; + my %setversions=&Apache::lonnet::dump('resourceversions', + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + + $hashtied=0; + &tiehash(); + my %newsetversions=(); + if ($ENV{'form.setmostrecent'}) { + $haschanged=1; + foreach (keys %hash) { + if ($_=~/^ids\_(\/res\/.+)$/) { + $newsetversions{$1}='mostrecent'; + } + } + } elsif ($ENV{'form.setcurrent'}) { + $haschanged=1; + foreach (keys %hash) { + if ($_=~/^ids\_(\/res\/.+)$/) { + my $getvers=&Apache::lonnet::getversion($1); + if ($getvers>0) { + $newsetversions{$1}=$getvers; + } + } + } + } elsif ($ENV{'form.setversions'}) { + $haschanged=1; + foreach (keys %ENV) { + if ($_=~/^form\.set_version_(.+)$/) { + my $src=$1; + &Apache::lonnet::logthis('Found: '.$1.' '.$ENV{$_}); + if (($ENV{$_}) && ($ENV{$_} ne $setversions{$src})) { + $newsetversions{$src}=$ENV{$_}; + } + } + } + } + if ($haschanged) { + if (&Apache::lonnet::put('resourceversions',\%newsetversions, + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}) eq 'ok') { + $r->print('

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

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

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

'); + } + &changewarning($r,''); + } + if ($ENV{'form.timerange'} eq 'all') { +# show all documents + $header=&mt('All Documents in Course'); + $allsel=1; + foreach (keys %hash) { + if ($_=~/^ids\_(\/res\/.+)$/) { + my $src=$1; + $changes{$src}=1; + } + } + } else { +# show documents which changed + %changes=&Apache::lonnet::dump + ('versionupdate',$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + my $firstkey=(keys %changes)[0]; + unless ($firstkey=~/^error\:/) { + unless ($ENV{'form.timerange'}) { + $ENV{'form.timerange'}=604800; + } + my $seltext=&mt('during the last').' '.$ENV{'form.timerange'}.' ' + .&mt('seconds'); + if ($ENV{'form.timerange'}==-1) { + $seltext='since start of course'; + $startsel='selected'; + $ENV{'form.timerange'}=time; + } + $starttime=time-$ENV{'form.timerange'}; + if ($ENV{'form.timerange'}==2592000) { + $seltext=&mt('during the last month').' ('.&Apache::lonlocal::locallocaltime($starttime).')'; + $monthsel='selected'; + } elsif ($ENV{'form.timerange'}==604800) { + $seltext=&mt('during the last week').' ('.&Apache::lonlocal::locallocaltime($starttime).')'; + $weeksel='selected'; + } elsif ($ENV{'form.timerange'}==86400) { + $seltext=&mt('since yesterday').' ('.&Apache::lonlocal::locallocaltime($starttime).')'; + $daysel='selected'; + } + $header=&mt('Content changed').' '.$seltext; + } else { + $header=&mt('No content modifications yet.'); + } + } + %setversions=&Apache::lonnet::dump('resourceversions', + $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, + $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); + my %lt=&Apache::lonlocal::texthash + ('st' => 'Version changes since start of Course', + 'lm' => 'Version changes since last Month', + 'lw' => 'Version changes since last Week', + 'sy' => 'Version changes since Yesterday', + 'al' => 'All Resources (possibly large output)', + 'sd' => 'Display', + 'fi' => 'File', + 'md' => 'Modification Date', + 'mr' => 'Most recently published Version', + 've' => 'Version used in Course', + 'vu' => 'Set Version to be used in Course', +'sv' => 'Set Versions to be used in Course according to Selections below', +'sm' => 'Keep all Resources up-to-date with most recent Versions (default)', +'sc' => 'Set all Resource Versions to current Version (Fix Versions)', + 'di' => 'Differences'); + $r->print(< + + +
+ + +

$header

+ + +ENDHEADERS + foreach (sort keys %changes) { + if ($changes{$_}>$starttime) { + my ($root,$extension)=($_=~/^(.*)\.(\w+)$/); + my $currentversion=&Apache::lonnet::getversion($_); + if ($currentversion<0) { + $currentversion=&mt('Could not be determined.'); + } + my $linkurl=&Apache::lonnet::clutter($_); + $r->print( + ''. + ''. + ''. + ''. + ''. + ''. + ''); + my $lastold=1; + for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) { + my $url=$root.'.'.$prevvers.'.'.$extension; + if (&Apache::lonnet::metadata($url,'lastrevisiondate')< + $starttime) { + $lastold=$prevvers; + } + } + # + # Code to figure out how many version entries should go in + # each of the four columns + my $entries_per_col = 0; + my $num_entries = ($currentversion-$lastold); + if ($num_entries % 4 == 0) { + $entries_per_col = $num_entries/4; + } else { + $entries_per_col = $num_entries/4 + 1; + } + my $entries_count = 0; + $r->print(''); + if ($cols_output != 4) { + $r->print(''."\n"); + } + } + $r->print('


'. + &Apache::lonnet::gettitle($linkurl). + '
   '. + ''.$linkurl. + '
'. + &Apache::lonlocal::locallocaltime( + &Apache::lonnet::metadata($root.'.'.$extension, + 'lastrevisiondate') + ). + 'Most Recent: '. + ''.$currentversion.''. + 'In Course: '. + ''); +# Used in course + my $usedversion=$hash{'version_'.$linkurl}; + if (($usedversion) && ($usedversion ne 'mostrecent')) { + $r->print($usedversion); + } else { + $r->print($currentversion); + } + $r->print(''. + 'Use: '); +# Set version + $r->print(&Apache::loncommon::select_form($setversions{$linkurl}, + 'set_version_'.$linkurl, + ('' => '', + 'mostrecent' => 'most recent', + map {$_,$_} (1..$currentversion)))); + $r->print('
'); + my $cols_output = 1; + for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) { + my $url=$root.'.'.$prevvers.'.'.$extension; + $r->print(''.&mt('Version').' '.$prevvers.' ('. + &Apache::lonlocal::locallocaltime( + &Apache::lonnet::metadata($url, + 'lastrevisiondate') + ). + ')'); + if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') { + $r->print(' '.&mt('Diffs').''); + } + $r->print('
'); + if (++$entries_count % $entries_per_col == 0) { + $r->print('		'); + $cols_output++; + } + } + } + while($cols_output++ < 4) { + $r->print('') + } + $r->print('
'); + $r->print('

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

'); + + &untiehash(); +} + +sub changewarning { + my ($r,$postexec)=@_; + $r->print( +''. +'
'. +'

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

'); +} + # ================================================================ Main Handler sub handler { my $r = shift; - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only; @@ -460,6 +874,8 @@ sub handler { 'Docs_About_Syllabus,Docs_Editing_Templated_Pages'); $help{'Simple Page'} = &Apache::loncommon::help_open_topic( 'Docs_About_Simple_Page,Docs_Editing_Templated_Pages'); + $help{'Simple Problem'} = &Apache::loncommon::help_open_topic( + 'Option_Response_Simple'); $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( @@ -467,115 +883,11 @@ sub handler { $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching'); if ($ENV{'form.verify'}) { - - my $loaderror=&Apache::lonnet::overloaderror($r); - if ($loaderror) { return $loaderror; } - - $r->print('Verify Content'. - &Apache::loncommon::bodytag('Verify Course Documents')); - $hashtied=0; - undef %alreadyseen; - %alreadyseen=(); - &tiehash(); - foreach (keys %hash) { - if (($_=~/^src\_(.+)$/) && (!$alreadyseen{$hash{$_}})) { - &checkonthis($r,$hash{$_},0,$hash{'title_'.$1}); - } - } - &untiehash(); - $r->print('

Done.

'); + &verifycontent($r); } elsif ($ENV{'form.versions'}) { - $r->print('Check Versions'. - &Apache::loncommon::bodytag('Check Course Document Versions')); - $hashtied=0; - &tiehash(); - my %changes=&Apache::lonnet::dump - ('versionupdate',$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, - $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); - my $firstkey=(keys %changes)[0]; - unless ($firstkey=~/^error\:/) { - unless ($ENV{'form.timerange'}) { - $ENV{'form.timerange'}=604800; - } - my $seltext='during the last '.$ENV{'form.timerange'}.' seconds'; - my $startsel=''; - my $monthsel=''; - my $weeksel=''; - my $daysel=''; - if ($ENV{'form.timerange'}==-1) { - $seltext='since start of course'; - $startsel='selected'; - $ENV{'form.timerange'}=time; - } - my $starttime=time-$ENV{'form.timerange'}; - if ($ENV{'form.timerange'}==2592000) { - $seltext='during the last month ('.localtime($starttime).')'; - $monthsel='selected'; - } elsif ($ENV{'form.timerange'}==604800) { - $seltext='during the last week ('.localtime($starttime).')'; - $weeksel='selected'; - } elsif ($ENV{'form.timerange'}==86400) { - $seltext='since yesterday ('.localtime($starttime).')'; - $daysel='selected'; - } - - $r->print(< - - - -

Content changed $seltext

- - - - -ENDHEADERS - foreach (keys %changes) { - if ($changes{$_}>$starttime) { - my ($root,$extension)=($_=~/^(.*)\.(\w+)$/); - my $currentversion=&Apache::lonnet::getversion($_); - my $linkurl=&Apache::lonnet::clutter($_); - $r->print( - ''. - ''); - } - } - $r->print('
FileModification DateVersionDifferences
'.$linkurl. - ''. - localtime($changes{$_}).''.$currentversion.''); - my $lastold=1; - for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) { - my $url=$root.'.'.$prevvers.'.'.$extension; - if (&Apache::lonnet::metadata($url,'lastrevisiondate')< - $starttime) { - $lastold=$prevvers; - } - } - for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) { - my $url=$root.'.'.$prevvers.'.'.$extension; - $r->print('Version '.$prevvers.' ('. - localtime(&Apache::lonnet::metadata($url,'lastrevisiondate')). - ')'); - if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') { - $r->print(' Diffs'); - } - $r->print('
'); - } - $r->print('
'); - $r->print('

Done.

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

No content modifications yet.

'); - } - &untiehash(); + &checkversions($r); + } elsif ($ENV{'form.dumpcourse'}) { + &dumpcourse($r); } else { # is this a standard course? @@ -596,7 +908,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'); @@ -686,6 +998,29 @@ function makebulboard() { } } +function makeabout() { + var user=prompt("Enter user\@domain for User's 'About Me' Page"); + if (user) { + var comp=new Array(); + comp=user.split('\@'); + if ((typeof(comp[0])!=undefined) && (typeof(comp[1])!=undefined)) { + if ((comp[0]) && (comp[1])) { + this.document.forms.newaboutsomeone.importdetail.value= + 'About '+user+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme'; + this.document.forms.newaboutsomeone.submit(); + } + } + } +} + +function makeims() { + var caller = document.forms.ims.folder.value + var newlocation = "/adm/imsimportdocs?folder="+caller+"&phase=one" + newWindow = window.open("","IMSimport","HEIGHT=700,WIDTH=750,scrollbars=yes") + newWindow.location.href = newlocation +} + + function finishpick() { var title=this.document.forms.extimport.title.value; var url=this.document.forms.extimport.url.value; @@ -695,20 +1030,22 @@ function finishpick() { '";this.document.forms.'+form+'.submit();'); } -function changename(folder,index,oldtitle) { +function changename(folder,index,oldtitle,foldername) { var title=prompt('New Title',oldtitle); if (title) { this.document.forms.renameform.title.value=title; this.document.forms.renameform.cmd.value='rename_'+index; this.document.forms.renameform.folder.value=folder; + this.document.forms.renameform.foldername.value=foldername; this.document.forms.renameform.submit(); } } -function removeres(folder,index,oldtitle) { - if ((oldtitle=='NO RESOURCE') || (confirm('Remove "'+oldtitle+'"?'))) { +function removeres(folder,index,oldtitle,foldername) { + if (confirm('Remove "'+oldtitle+'"?')) { this.document.forms.renameform.cmd.value='del_'+index; this.document.forms.renameform.folder.value=folder; + this.document.forms.renameform.foldername.value=foldername; this.document.forms.renameform.submit(); } } @@ -719,37 +1056,73 @@ ENDNEWSCRIPT # -------------------------------------------------------------------- Body tag $r->print(''. &Apache::loncommon::bodytag('Course Documents','',$events, - '','',$showdoc)); + '','',$showdoc). + &Apache::loncommon::help_open_faq(273). + &Apache::loncommon::help_open_bug('RAT')); unless ($showdoc) { +# ----------------------------------------------------------------------------- + my %lt=&Apache::lonlocal::texthash( + 'uplm' => 'Upload a new main course document', + 'upls' => 'Upload a new supplemental course document', + 'impp' => 'Import a published document', + 'spec' => 'Special documents', + 'upld' => 'Upload Document', + 'srch' => 'Search', + 'impo' => 'Import', + 'selm' => 'Select Map', + 'load' => 'Load Map', + 'newf' => 'New Folder', + 'extr' => 'External Resource', + 'syll' => 'Syllabus', + 'navc' => 'Navigate Contents', + 'sipa' => 'Simple Page', + 'sipr' => 'Simple Problem', + 'scuf' => 'Score Upload Form', + 'bull' => 'Bulletin Board', + 'mypi' => 'My Personal Info', + 'abou' => 'About User', + 'imsf' => 'Import IMS package', + 'file' => 'File', + 'title' => 'Title', + 'comment' => 'Comment' + ); +# ----------------------------------------------------------------------------- if ($allowed) { my $dumpbut=&dumpbutton(); + my %lt=&Apache::lonlocal::texthash( + 'vc' => 'Verify Content', + 'cv' => 'Check/Set Resource Versions', + ); $r->print(< +
+
- + - + $dumpbut
ENDCOURSEVERIFY $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc', - 'Editing the Table of Contents for your Course')); + &mt('Editing the Table of Contents for your Course'))); } # --------------------------------------------------------- Standard documents + my $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"'); $r->print(''); if (($standard) && ($allowed) && (!$forcesupplement)) { - $r->print(' - - - + + +

Main Course Documents'. + $r->print('

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

'); my $folder=$ENV{'form.folder'}; unless ($folder=~/^default/) { $folder='default'; } @@ -762,33 +1135,27 @@ ENDCOURSEVERIFY $hadchanges=0; &editor($r,$coursenum,$coursedom,$folder,$allowed); if ($hadchanges) { - $r->print( -''. -'
'. -'

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

'); + &changewarning($r,$postexec); } my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time. '.sequence'; - $r->print(<
Upload a new main course documentImport a published documentSpecial documents$lt{'uplm'}$lt{'impp'}$lt{'spec'}
-File:
+$lt{'file'}:

-Title:
+$lt{'title'}:
- + - + $help{'Uploading_From_Harddrive'} @@ -797,12 +1164,12 @@ 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,98 +1177,112 @@ $help{'Importing_LON-CAPA_Resource'}
+value="$lt{'selm'}"> $help{'Load_Map'}

- + $help{'Adding_Folders'} +value="$lt{'newf'}" />$help{'Adding_Folders'}
- + $help{'Adding_External_Resource'} +value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
- + - + $help{'Syllabus'}
- + - + $help{'Navigate_Content'}
- + - $help{'Simple Page'}
- + -$help{'Simple Problem'}
- + - $help{'Score_Upload_Form'}
- + - $help{'Bulletin Board'}
- + - + $help{'My Personal Info'}
+
+ + + + + + +
+
+ + + +
ENDFORM @@ -910,7 +1291,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,80 +1303,62 @@ ENDFORM $r->print(< -Upload a new supplemental course document -Import a published document -Special documents +$lt{'upls'} +$lt{'spec'}
-
Comment:
+
$lt{'comment'}:
- + - + $help{'Uploading_From_Harddrive'}
-
- - - - -$help{'Importing_LON-CAPA_Resource'} -

-

- - -

-
-
- + $help{'Adding_Folders'} +value="$lt{'newf'}" /> $help{'Adding_Folders'}
- + $help{'Adding_External_Resource'} +value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
- + - + $help{'Syllabus'}
- + - + $help{'My Personal Info'}
@@ -1010,8 +1373,9 @@ 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('');