--- loncom/publisher/loncfile.pm	2013/06/04 22:20:16	1.119
+++ loncom/publisher/loncfile.pm	2015/01/19 15:36:11	1.123
@@ -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.123 2015/01/19 15:36:11 goltermann Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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'});