--- loncom/publisher/loncfile.pm	2012/11/30 11:36:14	1.117
+++ 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.117 2012/11/30 11:36:14 bisitz Exp $
+# $Id: loncfile.pm,v 1.123 2015/01/19 15:36:11 goltermann Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,7 +37,7 @@
 
 =head1 NAME
 
-Apache::loncfile - Construction space file management.
+Apache::loncfile - Authoring space file management.
 
 =head1 SYNOPSIS
  
@@ -235,7 +235,7 @@ sub empty_directory {
 
 =item exists($user, $domain, $file)
 
-   Determine if a resource file name has been published or exists
+   Determine if a resource filename has been published or exists
    in the construction space.
 
  Parameters:
@@ -368,7 +368,7 @@ sub cleanDest {
 	($newpath,$error)=&relativeDest($fn,$newpath,$uname,$udom);
 	if (! -d "$newpath") {
 	    $request->print('<p><span 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 file name."
+                           .&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>');
 	    $dest=~s|.*/||;
@@ -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.'" />'
@@ -825,7 +836,7 @@ Parameters:
 
 =item   $domain   - Name of the domain of the user
 
-=item   $fn      - Source file name
+=item   $fn      - Source filename
 
 =item   $newfilename
                   - Name of the file to be created; no path information
@@ -880,20 +891,25 @@ sub NewFile1 {
 		'<form name="fileaction" action="/adm/cfile" method="post">'.
                 '<input type="hidden" name="qualifiedfilename" value="'.$fn.'" />'.
 		'<input type="hidden" name="action" value="newfile" />'.
-	        '<span class ="LC_nobreak">'.&mt('Enter a file name: ').'<input type="text" name="newfilename" value="Type Name Here" onfocus="if (this.value == '."'Type Name Here') this.value=''".'" />&nbsp;<input type="submit" value="Go" />'.
+	        '<span class ="LC_nobreak">'.&mt('Enter a filename: ').'<input type="text" name="newfilename" value="Type Name Here" onfocus="if (this.value == '."'Type Name Here') this.value=''".'" />&nbsp;<input type="submit" value="Go" />'.
                 '</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'});
@@ -1488,16 +1504,16 @@ function writeDone() {
     # Breadcrumbs
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({
-        'text'  => 'Construction Space',
+        'text'  => 'Authoring Space',
         'href'  => &Apache::loncommon::authorspace($fn),
     });
     &Apache::lonhtmlcommon::add_breadcrumb({
         'text'  => 'File Operation',
-        'title' => 'Construction Space File Operation',
+        'title' => 'Authoring Space File Operation',
         'href'  => '',
     });
 
-    $r->print(&Apache::loncommon::start_page('Construction Space File Operation',
+    $r->print(&Apache::loncommon::start_page('Authoring Space File Operation',
 					     $js,
 					     {'add_entries' => \%loaditem,})
              .&Apache::lonhtmlcommon::breadcrumbs()