--- loncom/interface/portfolio.pm	2010/04/12 17:27:24	1.223
+++ loncom/interface/portfolio.pm	2010/10/27 01:02:29	1.226
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # portfolio browser
 #
-# $Id: portfolio.pm,v 1.223 2010/04/12 17:27:24 bisitz Exp $
+# $Id: portfolio.pm,v 1.226 2010/10/27 01:02:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1913,111 +1913,201 @@ ENDSMP
     );
 }
 
-
-sub check_for_upload {
-    my ($path,$fname,$group,$element) = @_;
-    my $disk_quota = &get_quota($group);
-    my $filesize = (length($env{'form.'.$element})) / 1000; #express in k (1024?)
-    my $portfolio_root = &get_portfolio_root();
-    my $port_path = &get_port_path();
-    my ($uname,$udom) = &get_name_dom($group);
-    # Fixme --- Move the checking for existing file to LOND error return
-    my @dir_list=&get_dir_list($portfolio_root,$path,$group);
-    my $found_file = 0;
-    my $locked_file = 0;
-    foreach my $line (@dir_list) {
-        my ($file_name)=split(/\&/,$line,2);
-        if ($file_name eq $fname){
-            $file_name = $path.$file_name;
-            $file_name = &prepend_group($file_name);
-            $found_file = 1;
-            if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
-                $locked_file = 1;
-            } 
-        }
-    }
-    my $getpropath = 1;
-    my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
-
-    if (($current_disk_usage + $filesize) > $disk_quota){
-        my $msg = '<span class="LC_error">'.
-                &mt('Unable to upload [_1]. (size = [_2] kilobytes). Disk quota will be exceeded.','<span class="LC_filename">'.$fname.'</span>',$filesize).'</span>'.
-                  '<br />'.&mt('Disk quota is [_1] kilobytes. Your current disk usage is [_2] kilobytes.',$disk_quota,$current_disk_usage);
-	return ('will_exceed_quota',$msg);
-    } elsif ($found_file) {
-        if ($locked_file) {
-            my $msg = '<span class="LC_error">';
-            $msg .= &mt('Unable to upload [_1]. A locked file by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>','<span class="LC_filename">'.$port_path.$env{'form.currentpath'}.'</span>');
-            $msg .= '</span><br />';
-            $msg .= &mt('You will be able to rename or delete existing [_1] after a grade has been assigned.','<span class="LC_filename">'.$fname.'</span>');
-	    return ('file_locked',$msg);
-	} else {
-            my $msg = '<span class="LC_error">';
-            $msg .= &mt('Unable to upload [_1]. A file by that name was found in [_2].','<span class="LC_filename">'.$fname.'</span>',$port_path.$env{'form.currentpath'});
-            $msg .= '</span>';
-            $msg .= '<br />';
-            $msg .= &mt('To upload, rename or delete existing [_1] in [_2].','<span class="LC_filename">'.$fname.'</span>', $port_path.$env{'form.currentpath'});
-	    return ('file_exists',$msg);
-	}
-    }
-}
-
 sub upload {
     my ($r,$url,$group)=@_;
-    my $fname=&Apache::lonnet::clean_filename($env{'form.uploaddoc.filename'});
+    my $formname = 'uploaddoc';
+    my $fname = &Apache::lonnet::clean_filename($env{'form.'.$formname.'.filename'});
+    my ($state,$msg);
+    if ($fname eq '') {
+        my $msg = &mt('Invalid filename: [_1]; the name of the uploaded file did not contain any letters, '.
+                      'so after eliminating special characters there was nothing left.',
+                      '<span class="LC_filename">'.$env{'form.uploaddoc.filename'}.'</span>'); 
+        $r->print($msg.&done('Back',$url));
+        return;
+    }
     my $disk_quota = &get_quota($group);
     my $portfolio_root = &get_portfolio_root();
     my $port_path = &get_port_path();
     my ($uname,$udom) = &get_name_dom($group);
     my $getpropath = 1;
     my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
-    my ($state,$msg) = 
+    ($state,$msg) = 
         &Apache::loncommon::check_for_upload($env{'form.currentpath'},$fname,
-		                             $group,'uploaddoc',$portfolio_root,
+		                             $group,$formname,$portfolio_root,
                                              $port_path,$disk_quota,
                                              $current_disk_usage,$uname,$udom);
     if ($state eq 'will_exceed_quota'
-	|| $state eq 'file_locked'
-	|| $state eq 'file_exists' ) {
+	|| $state eq 'file_locked') {
 	$r->print($msg.&done('Back',$url));
 	return;
     }
 
     my (%allfiles,%codebase,$mode);
-    if ($env{'form.uploaddoc.filename'} =~ m/(\.htm|\.html|\.shtml)$/i) {
+    if ($env{'form.'.$formname.'.filename'} =~ m/(\.htm|\.html|\.shtml)$/i) {
         if ($env{'form.parserflag'}) {
 	    $mode = 'parse';
         }
     }
-    my $result=
-	&Apache::lonnet::userfileupload('uploaddoc','',
+    my $context;
+    if ($state eq 'existingfile') {
+        $context = $state;
+    }
+    my ($result,$timestamp) =
+	&Apache::lonnet::userfileupload($formname,$context,
 					$port_path.$env{'form.currentpath'},
 					$mode,\%allfiles,\%codebase);
-    if ($result !~ m|^/uploaded/|) {
+    if ($state eq 'existingfile') {
+        my $group_elem;
+        my $rootdir = $r->dir_config('lonDaemons').'/tmp/overwrites';
+        if ($group eq '') {
+            $rootdir .= '/'.$env{'user.domain'}.'/'.$env{'user.name'};
+        } else {
+            $rootdir .= '/'.$env{'course.'.$env{'request.course.id'}.'.domain'}.
+                        '/'.$env{'course.'.$env{'request.course.id'}.'.num'};
+            $group_elem = '<input type="hidden" name="group" value="'.$group.'" />';
+        }
+        if (($result eq $rootdir.'/'.$port_path.$env{'form.currentpath'}.$fname) && ($timestamp =~ /^\d+$/)) {
+            my $showfname = &HTML::Entities::encode($fname,'&<>"');
+            my %lt = &Apache::lonlocal::texthash (
+                                                   over => 'Overwrite existing file?',
+                                                   yes  => 'Yes',
+                                                   no   => 'No',
+                                                   undo => 'This action can not be undone.',
+                                                   conf => 'Are you sure you want to overwrite an existing file?',
+                                                   cont => 'Continue',
+                                                 );
+            $r->print(<<"END");
+<script type="text/javascript">
+// <![CDATA[
+function confirmOverwrite() {
+    if (confirm('$lt{'conf'}')) {
+        document.existingfile.action.value = "process_overwrite";
+    } else {
+        if (document.existingfile.overwrite.length) {
+            for (var i=0; i<document.existingfile.overwrite.length; i++) { 
+                if (document.existingfile.overwrite[i].value == "0") { 
+                    document.existingfile.overwrite[i].checked = true;
+                }
+            }
+        }
+        document.existingfile.action.value = "cancel_overwrite";
+    }
+    document.existingfile.submit();
+    return;
+}
+function cancelOverwrite() {
+    document.existingfile.action.value = "cancel_overwrite";
+    document.existingfile.submit();
+}
+// ]]>
+</script>
+$msg
+<br /><div class="LC_warning"><form method="post" action="$url" name="existingfile">
+<span class="LC_nobreak">$lt{'over'}
+<label><input type="radio" name="overwrite" value="1" onclick="javascript:confirmOverwrite();" />
+$lt{'yes'}</label>&nbsp;
+<label><input type="radio" name="overwrite" value="0" onclick="javascript:cancelOverwrite()" />$lt{'no'}</label></span>
+<input type="hidden" name="action" value="cancel_overwrite" />
+<input type="hidden" name="currentpath" value="$env{'form.currentpath'}" />
+<input type="hidden" name="filename" value="$showfname" />
+<input type="hidden" name="fieldname" value="$env{'form.fieldname'}" />
+<input type="hidden" name="mode" value="$mode" />
+<input type="hidden" name="timestamp" value="$timestamp" />
+<input type="hidden" name="showversions" value="$env{'form.showversions'}" /> 
+$group_elem
+<br /><br />
+<input type="submit" name="process" value="$lt{'cont'}" />
+</form></div>
+END
+        } else {
+            $r->print('<span class="LC_error">'.&mt('An error occurred ([_1]) while trying to upload [_2].'
+                      ,$result,&display_file(undef,$fname)).'</span><br />');
+            $r->print(&done('Back',$url));
+        }
+    } elsif ($result !~ m|^/uploaded/|) {
 	$r->print('<span class="LC_error">'.&mt('An error occurred ([_1]) while trying to upload [_2].'
-                  ,$result,&display_file()).'</span><br />');
+                  ,$result,&display_file(undef,$fname)).'</span><br />');
 	$r->print(&done('Back',$url));
     } else {
 	if (%allfiles) {
             if (!&suppress_embed_prompt()) {
-	        my $state = <<STATE;
+                &print_dependency_form($r,$url,\%allfiles,\%codebase);
+            }
+	} else {
+	    $r->print(&done(undef,$url));
+	}
+    }
+}
+
+sub print_dependency_form {
+    my ($r,$url,$allfiles,$codebase) = @_;
+    my $state = <<STATE;
     <input type="hidden" name="action"      value="upload_embedded" />
     <input type="hidden" name="currentpath" value="$env{'form.currentpath'}" />
     <input type="hidden" name="fieldname"   value="$env{'form.fieldname'}" />
     <input type="hidden" name="mode"        value="$env{'form.mode'}" />
 STATE
-                $r->print("<h2>".&mt("Reference Warning")."</h2>");
-                $r->print("<p>".&mt("Completed upload of the file. This file contained references to other files. You must upload the referenced files or else the uploaded file may not work properly.")."</p>");
-                $r->print("<p>".&mt("Please select the locations from which the referenced files are to be uploaded.")."</p>");
-	        $r->print(&Apache::loncommon::ask_for_embedded_content('/adm/portfolio',$state,\%allfiles,\%codebase,
-				      {'error_on_invalid_names'   => 1,
-				       'ignore_remote_references' => 1,}));
-	        $r->print('<p>Or '.&done('Return to directory',$url).'</p>');
+    if ($env{'form.group'} ne '') {
+        $state .= '<input type="hidden" name="group" value="'.$env{'form.group'}.'" />'."\n";
+    }
+    my $embedded = &Apache::loncommon::ask_for_embedded_content($url,$state,$allfiles,$codebase,
+                                  {'error_on_invalid_names'   => 1,
+                                   'ignore_remote_references' => 1,});
+    if ($embedded) {
+        $r->print('<h2>'.&mt("Reference Warning").'</h2>'.
+                  '<p>'.&mt("Completed upload of the file. This file contained references to other files. You must upload the referenced files or else the uploaded file may not work properly.").'</p>'.
+                  '<p>'.&mt("Please select the locations from which the referenced files are to be uploaded.").'</p>'.
+                  $embedded.
+                  '<p>Or '.&done('Return to directory',$url).'</p>');
+    } else {
+        $r->print(&done(undef,$url));
+    }
+    return;
+}
+
+sub overwrite {
+    my ($r,$url,$group)=@_;
+    my $formname = 'existingfile';
+    my $port_path = &get_port_path();
+    my $fname = &Apache::lonnet::clean_filename($env{'form.filename'});
+    my (%allfiles,%codebase,$mode);
+    $mode = $env{'form.mode'};
+    if ($mode eq 'parse') {
+        if ($fname !~ /\.s?html?$/i) {
+            undef($mode);
+        }
+    }
+    if ($fname eq '') {
+        my $msg = &mt('Invalid filename: [_1]; the name of the uploaded file did not contain any letters, '.
+                      'so after eliminating special characters there was nothing left.',
+                      '<span class="LC_filename">'.$env{'form.filename'}.'</span>');
+        $r->print($msg.&done('Back',$url));
+        return;
+    }
+    $env{'form.'.$formname.'.filename'} = $fname;
+    my $result=
+        &Apache::lonnet::userfileupload($formname,'overwrite',
+                                        $port_path.$env{'form.currentpath'},
+                                        $mode,\%allfiles,\%codebase);
+    if ($result !~ m|^/uploaded/|) {
+        $r->print('<span class="LC_error">'.&mt('An error occurred ([_1]) while trying to overwrite [_2].'
+                  ,$result,&display_file(undef,$fname)).'</span><br />');
+        $r->print(&done('Back',$url));
+    } else {
+        if (%allfiles) {
+            if (!&suppress_embed_prompt()) {
+                foreach my $file (keys(%allfiles)) {
+                    print STDERR "got $file\n";
+                }
+                &print_dependency_form($r,$url,\%allfiles,\%codebase);
+            } else {
+                $r->print(&done(undef,$url));
             }
-	} else {
-	    $r->print(&done(undef,$url));
-	}
+        } else {
+            $r->print(&done(undef,$url));
+        }
     }
+    return;
 }
 
 sub lock_info {
@@ -2214,7 +2304,6 @@ sub missing_priv {
     }
     $rtnlink .= '">'.&mt('Return to directory').'</a>';
     $r->print('<br />'.$rtnlink);
-    $r->print(&Apache::loncommon::end_page());
     return;
 }
 
@@ -2386,26 +2475,29 @@ sub handler {
          $r->print(&Apache::loncommon::end_page());
          return OK;
     }
-	if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){
-   	    $r->print('<span class="LC_error">');
-   	    $r->print(&mt('No file was selected to upload.').' ');
-	    $r->print(&mt('To upload a file, click <strong>Browse...</strong> and select a file, then click <strong>Upload</strong>.'));
-	    $r->print('</span>');
-	}
+    if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){
+   	$r->print('<span class="LC_error">');
+   	$r->print(&mt('No file was selected to upload.').' ');
+	$r->print(&mt('To upload a file, click <strong>Browse...</strong> and select a file, then click <strong>Upload</strong>.'));
+	$r->print('</span>');
+    }
     if ($env{'form.meta'}) {
         &open_form($r,$url);
         $r->print(&mt('Edit the meta data').'<br />');
         &close_form($r,$url);
     }
-    if ($env{'form.store'}) {
-    }
-
     if ($env{'form.uploaddoc.filename'}) {
         if ($can_upload) {
 	    &upload($r,$url,$group);
         } else {
             &missing_priv($r,$url,'upload');
         }
+    } elsif ($env{'form.action'} eq 'process_overwrite') {
+        if ($can_upload) {
+            &overwrite($r,$url,$group);
+        } else {
+            &missing_priv($r,$url,'existingfile');
+        }
     } elsif ($env{'form.action'} eq 'upload_embedded') {
 	if ($can_upload) {
             my $disk_quota = &get_quota($group);
@@ -2485,6 +2577,15 @@ sub handler {
     } elsif ($env{'form.lockinfo'}) {
         &lock_info($r,$url,$group);
     } else {
+        if ($env{'form.action'} eq 'cancel_overwrite') {
+            if ($can_upload) {
+                my $formname = 'existingfile';
+                my $fname = &Apache::lonnet::clean_filename($env{'form.filename'});
+                $env{'form.'.$formname.'.filename'} = $fname;
+                &Apache::lonnet::userfileupload($formname,'canceloverwrite',
+                                                $port_path.$env{'form.currentpath'});
+            }
+        }
 	my $current_path='/';
 	if ($env{'form.currentpath'}) {
 	    $current_path = $env{'form.currentpath'};
@@ -2517,8 +2618,8 @@ sub handler {
 			$can_upload,$group);
         &display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group,
                            $can_upload,$can_modify,$can_delete,$can_setacl);
-	$r->print(&Apache::loncommon::end_page());
     }
+    $r->print(&Apache::loncommon::end_page());
     return OK;
 }