--- loncom/interface/londocs.pm	2003/09/09 19:39:04	1.77
+++ 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.77 2003/09/09 19:39:04 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,10 +115,11 @@ sub dumpbutton {
     my $output='</td><td bgcolor="#DDDDCC">';
     if ($home) {
 	return '</td><td bgcolor="#DDDDCC">'.
-	    '<input type="submit" name="dumpcourse" value="Dump Course DOCS to Construction Space" />';
+	    '<input type="submit" name="dumpcourse" value="'.
+	    &mt('Dump Course DOCS to Construction Space').'" />';
     } else {
 	return'</td><td bgcolor="#DDDDCC">'.
-      '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('<h3>Copying Files</h3>');
 	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('<br /><tt>'.$_.'</tt> => <tt>'.$newfilename.'</tt>: ');
+	    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('<font color="red">fail</font>');
+	    } else {
+		$r->print('<font color="green">ok</font>');
+	    }
+	}
     } else {
 # Input form
 	unless ($home==1) {
 	    $r->print(
-		      '<h3>Select the Construction Space</h3><select name="authorspace">');
+		      '<h3>'.&mt('Select the Construction Space').'</h3><select name="authorspace">');
 	}
 	foreach (sort keys %outhash) {
 	    if ($_=~/^home_(.+)$/) {
@@ -160,17 +205,27 @@ sub dumpcourse {
 	my $title=$origcrsdata{'description'};
 	$title=~s/\s+/\_/gs;
 	$title=~s/\W//gs;
-	$r->print('<h3>Folder in Construction Space</h3><input type="text" size="50" name="authorfolder" value="'.$title.'" /><br />');
+	$r->print('<h3>'.&mt('Folder in Construction Space').'</h3><input type="text" size="50" name="authorfolder" value="'.$title.'" /><br />');
 	&tiehash();
+	$r->print('<h3>'.&mt('Filenames in Construction Space').'</h3><table border="2"><tr><th>'.&mt('Internal Filename').'</th><th>'.&mt('Title').'</th><th>'.&mt('Save as ...').'</th></tr>');
 	foreach (&Apache::loncreatecourse::crsdirlist($origcrsid,'userfiles')) {
-	    $r->print("\n<br />".$_.' '.
-  $hash{'title_'.$hash{
-'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$_}}
-		      );
+	    $r->print('<tr><td>'.$_.'</td>');
+	    my ($ext)=($_=~/\.(\w+)$/);
+	    my $title=$hash{'title_'.$hash{
+		'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$_}};
+	    $r->print('<td>'.($title?$title:'&nbsp;').'</td>');
+	    unless ($title) {
+		$title=$_;
+	    }
+	    $title=~s/\.(\w+)$//;
+	    $title=~s/\W+/\_/gs;
+	    $title.='.'.$ext;
+	    $r->print("\n<td><input type='text' size='60' name='namefor_".$_."' value='".$title."' /></td></tr>\n");
 	}
+	$r->print("</table>\n");
 	&untiehash();
 	$r->print(
-  '<input type="submit" name="dumpcourse" value="Dump Course DOCS" /></form>');
+  '<p><input type="submit" name="dumpcourse" value="'.&mt('Dump Course DOCS').'" /></p></form>');
     }
 }
 
@@ -195,7 +250,7 @@ sub group_import {
 		join ':', ($name, $url, $ext, 'normal', 'res');
 	}
     }
-    &storemap($coursenum, $coursedom, $folder);
+    &storemap($coursenum, $coursedom, $folder.'.sequence');
 }
 
 sub editor {
@@ -506,7 +561,7 @@ sub verifycontent {
        }
    }
    &untiehash();
-   $r->print('<h1>Done.</h1>');
+   $r->print('<h1>'.&mt('Done').'.</h1>');
 }
 
 # -------------------------------------------------------------- Check Versions
@@ -599,9 +654,9 @@ ENDHEADERS
           }
        }
        $r->print('</table>');
-       $r->print('<h1>Done.</h1>');
+       $r->print('<h1>'.&mt('Done').'.</h1>');
    } else {
-       $r->print('<p>No content modifications yet.</p>');
+       $r->print('<p>'.&mt('No content modifications yet.').'</p>');
    }
    &untiehash();
 }
@@ -613,6 +668,7 @@ sub handler {
     $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',
@@ -783,6 +839,28 @@ ENDNEWSCRIPT
             &Apache::loncommon::bodytag('Course Documents','',$events,
 					'','',$showdoc));
   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'
+					  );
+# -----------------------------------------------------------------------------
     if ($allowed) {
        my $dumpbut=&dumpbutton();
        $r->print(<<ENDCOURSEVERIFY);
@@ -811,7 +889,7 @@ ENDCOURSEVERIFY
 # --------------------------------------------------------- Standard documents
     $r->print('<table border=2 cellspacing=4 cellpadding=4>');
     if (($standard) && ($allowed) && (!$forcesupplement)) {
-       $r->print('<tr><td bgcolor="#BBBBBB"><h2>Main Course Documents'.
+       $r->print('<tr><td bgcolor="#BBBBBB"><h2>'.&mt('Main Course Documents').
   ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');
        my $folder=$ENV{'form.folder'};
        unless ($folder=~/^default/) { $folder='default'; }
@@ -827,18 +905,20 @@ ENDCOURSEVERIFY
 	   $r->print(
 '<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'. 
 '<form method="post" action="/adm/roles" target="loncapaclient">'.
-'<input type="hidden" name="orgurl" value="/adm/coursedocs" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">Changes will become active for your current session after <input type="hidden" name="'.
-$ENV{'request.role'}.'" value="1" /><input type="button" value="re-initializing course" onClick="reinit(this.form)"/>, or the next time you log in.'.
+'<input type="hidden" name="orgurl" value="/adm/coursedocs" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'.
+&mt('Changes will become active for your current session after').
+' <input type="hidden" name="'.
+$ENV{'request.role'}.'" value="1" /><input type="button" value="'.
+&mt('re-initializing course').'" onClick="reinit(this.form)"/>'.&mt(', or the next time you log in.').
 $help{'Caching'}.'</font></h3></form>');
        }
        my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                      '.sequence';
-
        $r->print(<<ENDFORM);
 <table cellspacing=4 cellpadding=4><tr>
-<th bgcolor="#DDDDDD">Upload a new main course document</th>
-<th bgcolor="#DDDDDD">Import a published document</th>
-<th bgcolor="#DDDDDD">Special documents</th>
+<th bgcolor="#DDDDDD">$lt{'uplm'}</th>
+<th bgcolor="#DDDDDD">$lt{'impp'}</th>
+<th bgcolor="#DDDDDD">$lt{'spec'}</th>
 </tr>
 <tr><td bgcolor="#DDDDDD">
 File:<br />
@@ -850,7 +930,7 @@ Title:<br />
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type="hidden" name="cmd" value="upload_default">
-<input type="submit" value="Upload Document">
+<input type="submit" value="$lt{'upld'}">
 <nobr>
  $help{'Uploading_From_Harddrive'}
 </nobr>
@@ -861,10 +941,10 @@ Title:<br />
 <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=button onClick=
-"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="Search">
+"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="$lt{'srch'}">
 <nobr>
 <input type=button onClick=
-"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="Import">
+"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="$lt{'impo'}">
 $help{'Importing_LON-CAPA_Resource'}
 </nobr>
 <p>
@@ -872,7 +952,7 @@ $help{'Importing_LON-CAPA_Resource'}
 <input type="text" size="20" name="importmap"><br />
 <nobr><input type=button 
 onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
-value="Select Map"> <input type="submit" name="loadmap" value="Load Map">
+value="$lt{'selm'}"> <input type="submit" name="loadmap" value="$lt{'load'}">
 $help{'Load_Map'}</nobr>
 </p>
 </form>
@@ -884,7 +964,7 @@ $help{'Load_Map'}</nobr>
 <nobr>
 <input name="newfolder" type="button"
 onClick="javascript:makenewfolder(this.form,'$folderseq');"
-value="New Folder" />$help{'Adding_Folders'}
+value="$lt{'newf'}" />$help{'Adding_Folders'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newext">
@@ -893,7 +973,7 @@ value="New Folder" />$help{'Adding_Folde
 <input type=hidden name="importdetail" value="">
 <nobr>
 <input name="newext" type="button" onClick="javascript:makenewext('newext');"
-value="External Resource" /> $help{'Adding_External_Resource'}
+value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="newsyl">
@@ -902,7 +982,7 @@ value="External Resource" /> $help{'Addi
 <input type=hidden name="importdetail" 
 value="Syllabus=/public/$coursedom/$coursenum/syllabus">
 <nobr>
-<input name="newsyl" type="submit" value="Syllabus" /> 
+<input name="newsyl" type="submit" value="$lt{'syll'}" /> 
  $help{'Syllabus'}
 </nobr>
 </form>
@@ -912,7 +992,7 @@ value="Syllabus=/public/$coursedom/$cour
 <input type=hidden name="importdetail" 
 value="Navigate Content=/adm/navmaps">
 <nobr>
-<input name="newnav" type="submit" value="Navigate Content" />
+<input name="newnav" type="submit" value="$lt{'navc'}" />
 $help{'Navigate_Content'}
 </nobr>
 </form>
@@ -921,7 +1001,7 @@ $help{'Navigate_Content'}
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" value="">
 <nobr>
-<input name="newsmppg" type="button" value="Simple Page"
+<input name="newsmppg" type="button" value="$lt{'sipa'}"
 onClick="javascript:makesmppage();" /> $help{'Simple Page'}
 </nobr>
 </form>
@@ -930,7 +1010,7 @@ onClick="javascript:makesmppage();" /> $
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" value="">
 <nobr>
-<input name="newsmpproblem" type="button" value="Simple Problem"
+<input name="newsmpproblem" type="button" value="$lt{'sipr'}"
 onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
 </nobr>
 </form>
@@ -939,7 +1019,7 @@ onClick="javascript:makesmpproblem();" /
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" value="">
 <nobr>
-<input name="newexamupload" type="button" value="Score Upload Form"
+<input name="newexamupload" type="button" value="$lt{'scuf'}"
 onClick="javascript:makeexamupload();" />
 $help{'Score_Upload_Form'}
 </nobr>
@@ -949,7 +1029,7 @@ $help{'Score_Upload_Form'}
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" value="">
 <nobr>
-<input name="newbulletin" type="button" value="Bulletin Board"
+<input name="newbulletin" type="button" value="$lt{'bull'}"
 onClick="javascript:makebulboard();" />
 $help{'Bulletin Board'}
 </nobr>
@@ -960,7 +1040,7 @@ $help{'Bulletin Board'}
 <input type=hidden name="importdetail" 
 value="$plainname=/adm/$udom/$uname/aboutme">
 <nobr>
-<input name="newaboutme" type="submit" value="My Personal Info" />
+<input name="newaboutme" type="submit" value="$lt{'mypi'}" />
 $help{'My Personal Info'}
 </nobr>
 </form>
@@ -972,7 +1052,7 @@ ENDFORM
 # ----------------------------------------------------- Supplemental documents
     if (!$forcestandard) {
        $r->print(
-  '<tr><td bgcolor="#BBBBBB"><h2>Supplemental Course Documents'.
+  '<tr><td bgcolor="#BBBBBB"><h2>'.&mt('Supplemental Course Documents').
   ($allowed?' '.$help{'Supplemental'}:'').'</h2>');
        my $folder=$ENV{'form.folder'};
        unless ($folder=~/supplemental/) { $folder='supplemental'; }
@@ -984,9 +1064,9 @@ ENDFORM
 
           $r->print(<<ENDSUPFORM);
 <table cellspacing=4 cellpadding=4><tr>
-<th bgcolor="#DDDDDD">Upload a new supplemental course document</th>
-<th bgcolor="#DDDDDD">Import a published document</th>
-<th bgcolor="#DDDDDD">Special documents</th>
+<th bgcolor="#DDDDDD">$lt{'upls'}</th>
+<th bgcolor="#DDDDDD">$lt{'impp'}</th>
+<th bgcolor="#DDDDDD">$lt{'spec'}</th>
 </tr>
 <tr><td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
@@ -998,7 +1078,7 @@ ENDFORM
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type="hidden" name="cmd" value="upload_supplemental">
 <nobr>
-<input type="submit" value="Upload Document">
+<input type="submit" value="$lt{'upld'}">
  $help{'Uploading_From_Harddrive'}
 </nobr>
 </form>
@@ -1009,9 +1089,9 @@ ENDFORM
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail" value="">
 <input type=button onClick=
-"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="Search">
+"javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="$lt{'srch'}">
 <input type=button onClick=
-"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="Import">$help{'Importing_LON-CAPA_Resource'}
+"javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="$lt{'impo'}">$help{'Importing_LON-CAPA_Resource'}
 <p>
 <hr />
 <input type="text" size="20" name="importmap">
@@ -1028,7 +1108,7 @@ value="Select Map"><input type="submit"
 <nobr>
 <input name="newfolder" type="button"
 onClick="javascript:makenewfolder(this.form,'$folderseq');"
-value="New Folder" /> $help{'Adding_Folders'}
+value="$lt{'newf'}" /> $help{'Adding_Folders'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="supnewext">
@@ -1038,7 +1118,7 @@ value="New Folder" /> $help{'Adding_Fold
 <nobr>
 <input name="newext" type="button" 
 onClick="javascript:makenewext('supnewext');"
-value="External Resource" /> $help{'Adding_External_Resource'}
+value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
 </nobr>
 </form>
 <form action="/adm/coursedocs" method="post" name="supnewsyl">
@@ -1047,7 +1127,7 @@ value="External Resource" /> $help{'Addi
 <input type=hidden name="importdetail" 
 value="Syllabus=/public/$coursedom/$coursenum/syllabus">
 <nobr>
-<input name="newsyl" type="submit" value="Syllabus" />
+<input name="newsyl" type="submit" value="$lt{'syll'}" />
 $help{'Syllabus'}
 </nobr>
 </form>
@@ -1057,7 +1137,7 @@ $help{'Syllabus'}
 <input type=hidden name="importdetail" 
 value="$plainname=/adm/$udom/$uname/aboutme">
 <nobr>
-<input name="newaboutme" type="submit" value="My Personal Info" />
+<input name="newaboutme" type="submit" value="$lt{'mypi'}" />
 $help{'My Personal Info'}
 </nobr>
 </form>
@@ -1072,11 +1152,12 @@ ENDSUPFORM
     $r->print('</table>');
   } else {
 # -------------------------------------------------------- This is showdoc mode
-      $r->print("<h1>Uploaded Document</h1><p>It is recommended that you use an up-to-date virus scanner before handling this file.</p><p><table>".
-         &entryline(0,"Click to download or use your browser's Save Link function",$showdoc).'</table></p>');
+      $r->print("<h1>".&mt('Uploaded Document').'</h1><p>'.
+&mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."</p><p><table>".
+         &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table></p>');
   }
  }
- $r->print('</body></html>');
+ $r->print(&Apache::lonlocal::endreroutetrans().'</body></html>');
  return OK;
 }