--- loncom/interface/londocs.pm 2003/09/15 15:24:18 1.78
+++ loncom/interface/londocs.pm 2003/10/04 20:49:40 1.85
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.78 2003/09/15 15:24:18 www Exp $
+# $Id: londocs.pm,v 1.85 2003/10/04 20:49:40 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,10 +115,11 @@ 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');
}
}
@@ -136,13 +138,56 @@ sub dumpcourse {
# 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(
- 'Select the Construction Space ');
+ ''.&mt('Select the Construction Space').' ');
}
foreach (sort keys %outhash) {
if ($_=~/^home_(.+)$/) {
@@ -160,9 +205,9 @@ sub dumpcourse {
my $title=$origcrsdata{'description'};
$title=~s/\s+/\_/gs;
$title=~s/\W//gs;
- $r->print('Folder in Construction Space ');
+ $r->print(''.&mt('Folder in Construction Space').' ');
&tiehash();
- $r->print('Filenames in Construction Space Internal Filename Title Save as ... ');
+ $r->print(''.&mt('Filenames in Construction Space').' \n");
&untiehash();
$r->print(
- '
');
+ '
');
}
}
@@ -205,7 +250,7 @@ sub group_import {
join ':', ($name, $url, $ext, 'normal', 'res');
}
}
- &storemap($coursenum, $coursedom, $folder);
+ &storemap($coursenum, $coursedom, $folder.'.sequence');
}
sub editor {
@@ -350,7 +395,7 @@ sub entryline {
) {
$foldertitle=&Apache::lontexconvert::msgtexconverted($4);
$renametitle=$4;
- $title=''.localtime($1).' '.
+ $title=''.&Apache::lonlocal::locallocaltime($1).' '.
&Apache::loncommon::plainname($2,$3).': '.
$foldertitle;
}
@@ -455,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',
@@ -470,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 ');
@@ -485,11 +531,11 @@ 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').' ');
}
}
}
@@ -516,7 +562,7 @@ sub verifycontent {
}
}
&untiehash();
- $r->print('Done. ');
+ $r->print(''.&mt('Done').'. ');
}
# -------------------------------------------------------------- Check Versions
@@ -535,7 +581,8 @@ sub checkversions {
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='';
@@ -547,31 +594,41 @@ sub checkversions {
}
my $starttime=time-$ENV{'form.timerange'};
if ($ENV{'form.timerange'}==2592000) {
- $seltext='during the last month ('.localtime($starttime).')';
+ $seltext=&mt('during the last month').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
$monthsel='selected';
} elsif ($ENV{'form.timerange'}==604800) {
- $seltext='during the last week ('.localtime($starttime).')';
+ $seltext=&mt('during the last week').' ('.&Apache::lonlocal::locallocaltime($starttime).')';
$weeksel='selected';
} elsif ($ENV{'form.timerange'}==86400) {
- $seltext='since yesterday ('.localtime($starttime).')';
+ $seltext=&mt('since yesterday').' ('.&Apache::lonlocal::locallocaltime($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(<
-Since Start of Course
-Last Month
-Last Week
-Since Yesterday
+$lt{'st'}
+$lt{'lm'}
+$lt{'lw'}
+$lt{'sy'}
-
+
-Content changed $seltext
+$lt{'cc'} $seltext
-File Modification Date
-Version Differences
+$lt{'fi'} $lt{'md'}
+$lt{'ve'} $lt{'di'}
ENDHEADERS
foreach (keys %changes) {
if ($changes{$_}>$starttime) {
@@ -581,7 +638,7 @@ ENDHEADERS
$r->print(
''.$linkurl.
' '.
- localtime($changes{$_}).' '.$currentversion.' '.
+ &Apache::lonlocal::locallocaltime($changes{$_}).''.$currentversion.' '.
'');
my $lastold=1;
for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
@@ -594,8 +651,8 @@ ENDHEADERS
for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) {
my $url=$root.'.'.$prevvers.'.'.$extension;
$r->print('Version '.$prevvers.' ('.
- localtime(&Apache::lonnet::metadata($url,'lastrevisiondate')).
+ '">'.&mt('Version').' '.$prevvers.' ('.
+ &Apache::lonlocal::locallocaltime(&Apache::lonnet::metadata($url,'lastrevisiondate')).
') ');
if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') {
$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'; }
@@ -837,18 +917,20 @@ ENDCOURSEVERIFY
$r->print(
''.
'');
}
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:
@@ -860,7 +942,7 @@ Title:
-
+
$help{'Uploading_From_Harddrive'}
@@ -871,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'}
@@ -882,7 +964,7 @@ $help{'Importing_LON-CAPA_Resource'}
+value="$lt{'selm'}">
$help{'Load_Map'}
@@ -894,7 +976,7 @@ $help{'Load_Map'}
$help{'Adding_Folders'}
+value="$lt{'newf'}" />$help{'Adding_Folders'}
@@ -922,7 +1004,7 @@ value="Syllabus=/public/$coursedom/$cour
-
+
$help{'Navigate_Content'}
@@ -931,7 +1013,7 @@ $help{'Navigate_Content'}
- $help{'Simple Page'}
@@ -940,7 +1022,7 @@ onClick="javascript:makesmppage();" /> $
- $help{'Simple Problem'}
@@ -949,7 +1031,7 @@ onClick="javascript:makesmpproblem();" /
-
$help{'Score_Upload_Form'}
@@ -959,7 +1041,7 @@ $help{'Score_Upload_Form'}
-
$help{'Bulletin Board'}
@@ -970,7 +1052,7 @@ $help{'Bulletin Board'}
-
+
$help{'My Personal Info'}
@@ -982,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'; }
@@ -994,9 +1076,9 @@ ENDFORM
$r->print(<
-Upload a new supplemental course document
-Import a published document
-Special documents
+$lt{'upls'}
+$lt{'impp'}
+$lt{'spec'}
@@ -1019,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'}
@@ -1038,7 +1120,7 @@ value="Select Map">
$help{'Adding_Folders'}
+value="$lt{'newf'}" /> $help{'Adding_Folders'}
@@ -1067,7 +1149,7 @@ $help{'Syllabus'}
-
+
$help{'My Personal Info'}
@@ -1082,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('