--- loncom/interface/londocs.pm	2004/12/23 17:50:42	1.161
+++ loncom/interface/londocs.pm	2005/02/02 22:15:06	1.166
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.161 2004/12/23 17:50:42 albertel Exp $
+# $Id: londocs.pm,v 1.166 2005/02/02 22:15:06 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -132,6 +132,11 @@ sub dumpbutton {
     }
 }
 
+sub clean {
+    my ($title)=@_;
+    $title=~s/[^\w\/\!\$\%\^\*\-\_\=\+\;\:\,\\\|\`\~]+/\_/gs;
+    return $title;	
+}
 # -------------------------------------------------------- Actually dump course
 
 sub dumpcourse {
@@ -149,7 +154,7 @@ sub dumpcourse {
 	my ($ca,$cd)=split(/\@/,$ENV{'form.authorspace'});
 	$r->print('<h3>'.&mt('Copying Files').'</h3>');
 	my $title=$ENV{'form.authorfolder'};
-	$title=~s/[^\w\/]+/\_/g;
+	$title=&clean($title);
 	my %replacehash=();
 	foreach (keys %ENV) {
 	    if ($_=~/^form\.namefor\_(.+)/) {
@@ -160,7 +165,7 @@ sub dumpcourse {
 	$crs=~s/\_/\//g;
 	foreach (keys %replacehash) {
 	    my $newfilename=$title.'/'.$replacehash{$_};
-	    $newfilename=~s/[^\w\/\.\/]+/\_/g;
+	    $newfilename=&clean($newfilename);
 	    my @dirs=split(/\//,$newfilename);
 	    my $path='/home/'.$ca.'/public_html';
 	    my $makepath=$path;
@@ -214,7 +219,7 @@ sub dumpcourse {
 	}
 	my $title=$origcrsdata{'description'};
 	$title=~s/\s+/\_/gs;
-	$title=~s/\W//gs;
+	$title=&clean($title);
 	$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>');
@@ -223,12 +228,13 @@ sub dumpcourse {
 	    my ($ext)=($_=~/\.(\w+)$/);
 	    my $title=$hash{'title_'.$hash{
 		'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$_}};
+	    $title=~s/&colon;/:/g;
 	    $r->print('<td>'.($title?$title:'&nbsp;').'</td>');
 	    unless ($title) {
 		$title=$_;
 	    }
 	    $title=~s/\.(\w+)$//;
-	    $title=~s/[^\w\/]+/\_/gs;
+	    $title=&clean($title);
 	    $title.='.'.$ext;
 	    $r->print("\n<td><input type='text' size='60' name='namefor_".$_."' value='".$title."' /></td></tr>\n");
 	}
@@ -705,12 +711,9 @@ sub process_content {
         if ($contents) {
             $$content_file = &store_template($contents,$tempexport,$count,$content_type);
         }
-    } elsif ($symb =~ m-uploaded/$cdom/$cnum-) {
-        $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'uploaded');
     } elsif ($symb =~ m-\.(sequence|page)___\d+___uploaded/$cdom/$cnum/-) {
         $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'uploaded');
-    } elsif ($symb =~ m-\.(sequence|page)___\d+___([^/])/([^/])-) {
-        my $coauth = $3.':'.$2.':ca';
+    } elsif ($symb =~ m-\.(sequence|page)___\d+___([^/]+)/([^/]+)-) {
         my $canedit = 0;
         if ($2 eq $ENV{'user.domain'} && $3 eq $ENV{'user.name'})  {
             $canedit= 1;
@@ -720,6 +723,8 @@ sub process_content {
         } else {
             $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'noedit');
         }
+    } elsif ($symb =~ m-uploaded/$cdom/$cnum-) {
+        $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'uploaded');
     }
     if (@uploads > 0) {
         foreach my $item (@uploads) {
@@ -761,14 +766,14 @@ sub replicate_content {
         if ($copiedfile = Apache::File->new('>'.$destination)) {
             my $content;
             if ($caller eq 'resource') {
-                $content = &Apache::lonnet::getfile($url);
+                $content = &Apache::lonnet::getfile('/home/httpd/html/res/'.$url);
                 if ($content eq -1) {
                     $$message = 'Could not copy file '.$filename;
                 } else {
                     &extract_media($content,$count,$tempexport,$href,'resource');
                     $repstatus = 'ok';
                 }
-            } elsif ($caller eq 'noedit' || $caller eq 'uploaded' || $caller eq 'templateupload') {
+            } elsif ($caller eq 'uploaded' || $caller eq 'templateupload') {
                 my $rtncode;
                 $repstatus = &Apache::lonnet::getuploaded('GET',$url,$cdom,$cnum,\$content,$rtncode);
                 if ($repstatus eq 'ok') {
@@ -778,6 +783,10 @@ sub replicate_content {
                 } else {
                     $$message = 'Could not render '.$url.' server message - '.$rtncode;
                 }
+            } elsif ($caller eq 'noedit') {
+# Need to render the resource without the LON-CAPA Internal header and the Post discussion footer, and then set $content equal to this. 
+                $repstatus = 'ok';
+                $content = 'Not the owner of this resource'; 
             }
             if ($repstatus eq 'ok') {
                 print $copiedfile $content;
@@ -997,7 +1006,8 @@ sub editor {
 	    if ( ($folder=~/^$1/) || ($1 eq 'default') ) {
 # this is for a course, not a user, so set coursedoc flag
 # probably the only place in the system where this should be "1"
-	      my $url=&Apache::lonnet::userfileupload('uploaddoc',1,'docs');
+              my $newidx=$#Apache::lonratedt::resources+1;
+	      my $url=&Apache::lonnet::userfileupload('uploaddoc',1,'docs/'.$newidx);
               my $ext='false';
               if ($url=~/^http\:\/\//) { $ext='true'; }
               $url=~s/\:/\&colon;/g;
@@ -1009,7 +1019,6 @@ sub editor {
 		  $comment=time.'___&&&___'.$ENV{'user.name'}.'___&&&___'.
 		      $ENV{'user.domain'}.'___&&&___'.$comment;
               }
-              my $newidx=$#Apache::lonratedt::resources+1;
               $Apache::lonratedt::resources[$newidx]=
                   $comment.':'.$url.':'.$ext.':normal:res';
               $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=
@@ -1294,10 +1303,11 @@ END
 	$folderpath.=$folderarg.'&'.$foldername;
 	$url.='folderpath='.&Apache::lonnet::escape($folderpath);
 	$parameterset='<label>'.&mt('Randomly Pick: ').
-	    '<input type="text" size="4" name="randpick_'.$orderidx.'" value="'.
+	    '<input type="text" size="4" onChange="this.form.submit()" name="randpick_'.$orderidx.'" value="'.
 	    (&Apache::lonratedt::getparameter($orderidx,
                                               'parameter_randompick'))[0].
-                                              '" />'.'</label>';
+                                              '" />'.
+'<font size="-2"><a href="javascript:void(0)">'.&mt('Store').'</a></font></label>';
        
     }
     if ($ispage) {
@@ -1324,21 +1334,17 @@ END
     if (($allowed) && ($folder!~/^supplemental/)) {
  	my %lt=&Apache::lonlocal::texthash(
  			      'hd' => 'Hidden',
- 			      'ec' => 'URL hidden',
- 			      'sp' => 'Store Parameters');
+ 			      'ec' => 'URL hidden');
 	my $enctext=
 	    ((&Apache::lonratedt::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="1"':'');
 	my $hidtext=
 	    ((&Apache::lonratedt::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':'');
 	$line.=(<<ENDPARMS);
 <td bgcolor="#BBBBFF"><font size='-2'>
-<nobr><label><input type="checkbox" name="hidprs_$orderidx" $hidtext/> $lt{'hd'}</label></nobr></td>
+<nobr><label><input type="checkbox" name="hidprs_$orderidx" onClick="this.form.submit()" $hidtext /> $lt{'hd'}</label></nobr></td>
 <td bgcolor="#BBBBFF"><font size='-2'>
-<nobr><label><input type="checkbox" name="encprs_$orderidx" $enctext/> $lt{'ec'}</label></nobr></td>
+<nobr><label><input type="checkbox" name="encprs_$orderidx" onClick="this.form.submit()" $enctext /> $lt{'ec'}</label></nobr></td>
 <td bgcolor="#BBBBFF"><font size="-2">$parameterset</font></td>
-<td bgcolor="#BBBBFF"><font size='-2'>
-<input type="submit" value="$lt{'sp'}" />
-</font></td>
 ENDPARMS
     }
     $line.="</form></tr>";
@@ -1951,16 +1957,20 @@ function makeabout() {
 	       this.document.forms.newaboutsomeone.importdetail.value=
 		   'About '+user+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
 	       this.document.forms.newaboutsomeone.submit();
-	   }
+	   } else {
+               alert("Not a valid user\@domain");
+           }
+       } else {
+           alert("Please enter both user and domain in the format user\@domain"); 
        }
    }
 }
 
 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
+    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;
 }