--- loncom/publisher/lonunauthorized.pm	2013/06/04 22:20:16	1.16
+++ loncom/publisher/lonunauthorized.pm	2018/11/26 13:07:41	1.17.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Unauthorized to access construction space
 #
-# $Id: lonunauthorized.pm,v 1.16 2013/06/04 22:20:16 raeburn Exp $
+# $Id: lonunauthorized.pm,v 1.17.2.1 2018/11/26 13:07:41 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -85,7 +85,7 @@ sub handler {
                 my $switchlink = '/adm/switchserver?otherserver='.$ownerhome.
                                  '&origurl='.&HTML::Entities::encode($env{'request.editurl'},'<>&"');
 	        $r->print('<p class="LC_warning">'.
-                          &mt('The construction space for this resource is located on a different server: [_1]',
+                          &mt('The Authoring Space for this resource is located on a different server: [_1]',
                           '<b><tt>'.&Apache::lonnet::hostname($ownerhome).'</b></tt>').
                           '</p>'.
                           '<p class="LC_error"><a href="'.$switchlink.'">'.
@@ -102,7 +102,8 @@ sub handler {
         if ($ENV{'REDIRECT_URL'} =~ m{^/adm/([^/]+)}) {
             my $action = $1;   
             my ($option,$filename,$filename1,$filename2,$decompress,
-                $qualifiedfilename);
+                $qualifiedfilename,$warning);
+            my %deniedactions = &get_denied_action_text();
             if ($ENV{'REDIRECT_QUERY_STRING'} ne '') {
                 foreach my $pair (split(/&/,$ENV{'REDIRECT_QUERY_STRING'})) {
                     my ($name,$value) = split(/=/,$pair);
@@ -130,11 +131,11 @@ sub handler {
                             $option = 'cstr';
                         }
                     } elsif ($name eq 'filetwo') {
-                        $option = $value; 
+                        $option = $value;
                     }
                 }
                 if (($action eq 'upload') || ($action eq 'testbank')) {
-                    if (($filename1 ne '') && ($filename ne '')) {
+                    if (($filename1 ne '') && ($filename2 ne '')) {
                         $filename = $filename1.$filename2;
                     }
                 } elsif ($action eq 'cfile') {
@@ -144,8 +145,6 @@ sub handler {
                         $filename = $qualifiedfilename;
                     }
                 }
-                my %deniedactions = &get_denied_action_text();
-                my $warning;
                 if ($option eq 'decompress') {
                     $warning = $deniedactions{$option};
                 } else {
@@ -173,13 +172,40 @@ sub handler {
                               &mt('You are not permitted to take this action.').
                               '</p>');
                 }
+            } elsif (($action eq 'upload') || ($action eq 'testbank')) {
+                $filename1 = $env{'form.filename1'};
+                $filename2 = $env{'form.filename2'};
+                if (($filename1 ne '') && ($filename2 ne '')) {
+                    $filename = $filename1.$filename2;
+                }
+                $warning = $deniedactions{$action};
+                if ($warning) {
+                    if ($filename =~ m{^/priv/.+\.\d+\.[^.]+$}) {
+                        $r->print('<p class="LC_error">'.
+                                  &mt('There is a problem with the filename').' '.
+                                  '<span class="LC_filename">'.$filename.'</span></p>'.
+                                  '<p class="LC_warning">'.
+                                  &mt('The suggested filename may not include the pattern ".number.extension" as LON-CAPA reserves that pattern for its internal versioning mechanism.').
+                                  '</p>');
+                    } else {
+                        $r->print('<p class="LC_error">'.
+                                  $deniedactions{$action}.'</p><p class="LC_warning">'.
+                                  &mt('You do not have authoring privileges for this resource').' '.
+                                      '<span class="LC_filename">'.$filename.'</span>'.
+                                  '</p>');
+                    }
+                } else {
+                    $r->print('<p class="LC_error">'.
+                              &mt('You are not permitted to take this action.').
+                              '</p>');
+                }
             }
         } elsif ($r->uri =~ m{priv/.+\.\d+\.[^.]+$}) {
             $r->print('<p class="LC_error">'.
                       &mt('There is a problem with the filename').' '.
                       '<span class="LC_filename">'.$r->uri.'</span></p>'.
                       '<p class="LC_warning">'.
-                      &mt('You may be attempting to edit a versioned file (files in construction space may not include a version number before the extension).').
+                      &mt('You may be attempting to edit a versioned file (files in Authoring Space may not include a version number before the extension).').
                       '</p>');
         } else {
             $r->print('<p class="LC_error">'.
@@ -191,7 +217,7 @@ sub handler {
                   &mt('There is a problem with the filename').' '.
                   '<span class="LC_filename">'.$env{'request.editurl'}.'</span></p>'.
                   '<p class="LC_warning">'.
-                  &mt('You may be attempting to edit a versioned file (files in construction space may not include a version number before the extension).').
+                  &mt('You may be attempting to edit a versioned file (files in Authoring Space may not include a version number before the extension).').
                   '</p>');
     } else {
         $r->print('<p class="LC_error">'