--- loncom/publisher/loncfile.pm	2013/06/04 22:20:16	1.119
+++ loncom/publisher/loncfile.pm	2016/05/22 01:09:54	1.124
@@ -9,7 +9,7 @@
 #  and displays a page showing the results of the action.
 #
 #
-# $Id: loncfile.pm,v 1.119 2013/06/04 22:20:16 raeburn Exp $
+# $Id: loncfile.pm,v 1.124 2016/05/22 01:09:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -279,28 +279,28 @@ sub exists {
     $published=~s{^\Q$londocroot/priv/\E}{$londocroot/res/};
     my ($type,$result);
     if ( -d $construct ) {
-	return ('error','<p><span class="LC_error">'.&mt('Error: destination for operation is an existing directory.').'</span></p>');
+	return ('error','<p class="LC_error">'.&mt('Error: destination for operation is an existing directory.').'</p>');
 	
     }
 
     if ( -e $published) {
 	if ( -e $construct ) {
 	    $type = 'warning';
-	    $result.='<p><span class="LC_warning">'.&mt('Warning: target file exists, and has been published!').'</span></p>';
+	    $result.='<p class="LC_warning">'.&mt('Warning: target file exists, and has been published!').'</p>';
 	} else {
 	    my $published_type = (-d $published) ? 'directory' : 'file';
 
 	    if ($published_type eq $creating) {
 		$type = 'warning';
-		$result.='<p><span class="LC_warning">'.&mt("Warning: a published $published_type of this name exists.").'</span></p>';
+		$result.='<p class="LC_warning">'.&mt("Warning: a published $published_type of this name exists.").'</p>';
 	    } else {
 		$type = 'error';
-		$result.='<p><span class="LC_error">'.&mt("Error: a published $published_type of this name exists.").'</span></p>';
+		$result.='<p class="LC_error">'.&mt("Error: a published $published_type of this name exists.").'</p>';
 	    }
 	}
     } elsif ( -e $construct) {
 	$type = 'warning';
-	$result.='<p><span class="LC_warning">'.&mt('Warning: target file exists!').'</span></p>';
+	$result.='<p class="LC_warning">'.&mt('Warning: target file exists!').'</p>';
     }
 
     return ($type,$result);
@@ -344,7 +344,7 @@ sub checksuffix {
     if ($old=~m:(.*)/+([^/]+)\.(\w+)$:) { $oldsuffix=$3; }
     if (lc($oldsuffix) ne lc($newsuffix)) {
 	$result.=
-            '<p><span class="LC_warning">'.&mt('Warning: change of MIME type!').'</span></p>';
+            '<p class="LC_warning">'.&mt('Warning: change of MIME type!').'></p>';
     }
     return $result;
 }
@@ -367,27 +367,27 @@ sub cleanDest {
 	my ($newpath)=($dest=~m|(.*)/|);
 	($newpath,$error)=&relativeDest($fn,$newpath,$uname,$udom);
 	if (! -d "$newpath") {
-	    $request->print('<p><span class="LC_warning">'
+	    $request->print('<p class="LC_warning">'
                            .&mt("You have requested to create file in directory [_1] which doesn't exist. The requested directory path has been removed from the requested filename."
                                ,&display($newpath))
-                           .'</span></p>');
+                           .'</p>');
 	    $dest=~s|.*/||;
 	}
     }
     if ($dest =~ /\.(\d+)\.(\w+)$/){
-	$request->print('<p><span class="LC_warning">'
+	$request->print('<p class="LC_warning">'
 			.&mt('Bad filename [_1]',&display($dest))
                         .'<br />'
                         .&mt('[_1](name).(number).(extension)[_2] not allowed.','<tt>','</tt>')
                         .'<br />'
                         .&mt('Removing the [_1].number.[_2] from requested filename.','<tt>','</tt>')
-			.'</span></p>');
+			.'</p>');
 	$dest =~ s/\.(\d+)(\.\w+)$/$2/;
     }
     if ($foundbad) {
-        $request->print('<p><span class="LC_warning">'
+        $request->print('<p class="LC_warning">'
                        .&mt('Invalid characters in requested name have been removed.')
-                        .'</span></p>'
+                        .'</p>'
         );
     }
     return ($dest,$error);
@@ -700,9 +700,20 @@ sub Copy1 {
 	my ($type,$return)=&exists($user, $domain, $newfilename);
 	$request->print($return);
 	if ($type eq 'error') {
-	    $request->print('<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
+	    $request->print('<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a></form>');
 	    return;
 	}
+# Check if there is enough space.
+        my @fileinfo = stat($fn);
+        my ($dir,$fname) = ($fn =~ m{^(.+/)([^/]+)$});
+        my $filesize = $fileinfo[7];
+        $filesize = int($filesize/1000); #expressed in kb
+        my $output = &Apache::loncommon::excess_filesize_warning($user,$domain,'author',
+                                                                 $fname,$filesize,'copy');
+        if ($output) {
+            $request->print($output.'<br /><a href="'.&url($dir).'">'.&mt('Cancel').'</a></form>');
+            return;
+        }
     $request->print(
         '<input type="hidden" name="newfilename"'
        .' value="'.$newfilename.'" />'
@@ -884,16 +895,21 @@ sub NewFile1 {
                 '</span></form></p>'.
                 '<p><form action="'.&url($fn).
                 '" method="post"><p><input type="submit" value="'.&mt('Cancel').'" /></form></p>');
-            return;
+        } elsif ($type ne 'warning') {
+            my $query = "";
+            $query .= "?mode=" . $env{'form.mode'} unless (!exists($env{'form.mode'}) || !length($env{'form.mode'}));
+            $request->print('
+                <script type="text/javascript">
+                    window.location = "'.&url($newfilename). $query .'";
+                </script>');
+        } else {
+            $request->print('<p>'.&mt('Make new file').' '.&display($newfilename).'?</p>');
+            $request->print('</form>');
+            $request->print('<form action="'.&url($newfilename).
+                        '" method="post"><p><input type="submit" value="'.&mt('Continue').'" /></p></form>');
+            $request->print('<form action="'.&url($fn).
+                        '" method="post"><p><input type="submit" value="'.&mt('Cancel').'" /></p></form>');
         }
-
-	$request->print('<p>'.&mt('Make new file').' '.&display($newfilename).'?</p>');
-	$request->print('</form>');
-
-	$request->print('<form action="'.&url($newfilename).
-			'" method="post"><p><input type="submit" value="'.&mt('Continue').'" /></p></form>');
-	$request->print('<form action="'.&url($fn).
-			'" method="post"><p><input type="submit" value="'.&mt('Cancel').'" /></p></form>');
     }
     return;
 }
@@ -1410,7 +1426,7 @@ sub handler {
 
     $r=shift;
 
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['decompress','action','filename','newfilename']);
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['decompress','action','filename','newfilename','mode']);
 
     &Debug($r, "loncfile.pm - handler entered");
     &Debug($r, " filename: ".$env{'form.filename'});