--- loncom/publisher/loncfile.pm 2007/03/30 20:37:31 1.81 +++ loncom/publisher/loncfile.pm 2007/10/18 21:58:21 1.87 @@ -9,7 +9,7 @@ # and displays a page showing the results of the action. # # -# $Id: loncfile.pm,v 1.81 2007/03/30 20:37:31 albertel Exp $ +# $Id: loncfile.pm,v 1.87 2007/10/18 21:58:21 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -165,7 +165,7 @@ sub url { sub display { my $fn=shift; $fn=~s-^/home/($match_username)/public_html-/priv/$1-; - return ''.$fn.''; + return ''.$fn.''; } @@ -226,12 +226,16 @@ sub empty_directory { =over 4 -=item $user - string [in] - Name of the user for which to check. +=item $user - string [in] - Name of the user for which to check. -=item $domain - string [in] - Name of the domain in which the resource +=item $domain - string [in] - Name of the domain in which the resource might have been published. -=item $file - string [in] - Name of the file. +=item $file - string [in] - Name of the file. + +=item $creating - string [in] - optional, type of object being created, + either 'directory' or 'file'. Defaults to + 'file' if unspecified. =back @@ -239,6 +243,9 @@ Returns: =over 4 +=item string - Either undef, 'warning' or 'error' depending on the + type of problem + =item string - Either where the resource exists as an html string that can be embedded in a dialog or an empty string if the resource does not exist. @@ -248,20 +255,39 @@ Returns: =cut sub exists { - my ($user, $domain, $construct) = @_; + my ($user, $domain, $construct, $creating) = @_; + $creating ||= 'file'; + my $published=$construct; $published=~ - s/^\/home\/$user\/public\_html\//\/home\/httpd\/html\/res\/$domain\/$user\//; - my $result=''; + s{^/home/$user/public_html/}{/home/httpd/html/res/$domain/$user/}; + my ($type,$result); if ( -d $construct ) { - return &mt('Error: destination for operation is an existing directory.'); + return ('error','
'.&mt('Error: destination for operation is an existing directory.').'
'); + } + if ( -e $published) { - $result.=''.&mt('Warning: target file exists, and has been published!').'
'; + if ( -e $construct ) { + $type = 'warning'; + $result.=''.&mt('Warning: target file exists, and has been published!').'
'; + } else { + my $published_type = (-d $published) ? 'directory' : 'file'; + + if ($published_type eq $creating) { + $type = 'warning'; + $result.=''.&mt("Warning: a published $published_type of this name exists.").'
'; + } else { + $type = 'error'; + $result.=''.&mt("Error: a published $published_type of this name exists.").'
'; + } + } } elsif ( -e $construct) { - $result.=''.&mt('Warning: target file exists!').'
'; + $type = 'warning'; + $result.=''.&mt('Warning: target file exists!').'
'; } - return $result; + + return ($type,$result); } =pod @@ -300,9 +326,9 @@ sub checksuffix { my $newsuffix; if ($new=~m:(.*/*)([^/]+)\.(\w+)$:) { $newsuffix=$3; } if ($old=~m:(.*)/+([^/]+)\.(\w+)$:) { $oldsuffix=$3; } - if ($oldsuffix ne $newsuffix) { + if (lc($oldsuffix) ne lc($newsuffix)) { $result.= - ''.&mt('Warning: change of MIME type!').'
'; + ''.&mt('Warning: change of MIME type!').'
'; } return $result; } @@ -315,6 +341,7 @@ sub cleanDest { $foundbad=1; $dest=~s/\.//g; } + $dest =~ s/(\s+$|^\s+)//g; if ($dest=~/[\#\?&%\":]/) { $foundbad=1; $dest=~s/[\#\?&%\":]//g; @@ -323,12 +350,18 @@ sub cleanDest { my ($newpath)=($dest=~m|(.*)/|); $newpath=&relativeDest($fn,$newpath,$uname); if (! -d "$newpath") { - $request->print("".&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.','"'.$newpath.'"')."
"); + $request->print("".&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.','"'.&display($newpath).'"')."
"); $dest=~s|.*/||; } } + if ($dest =~ /\.(\d+)\.(\w+)$/){ + $request->print('' + .&mt('Bad filename [_1].".&mt('Invalid characters in requested name have been removed.')."
"); + $request->print("".&mt('Invalid characters in requested name have been removed.')."
"); } return $dest; } @@ -463,9 +496,9 @@ sub Rename1 { if (-d $fn) { $newfilename=~/\.(\w+)$/; if (&Apache::loncommon::fileembstyle($1) eq 'ssi') { - $request->print(''.$action.' '.&display($fn).
- '
to '.&display($newfilename).'?
'.&mt('No new filename specified.').'
'); @@ -603,9 +636,9 @@ sub Copy1 { $newfilename=~ s:/[^/]+/\.\./:/:g; #remove dir/.. } $request->print(&checksuffix($fn,$newfilename)); - my $return=&exists($user, $domain, $newfilename); + my ($type,$return)=&exists($user, $domain, $newfilename); $request->print($return); - if ($return =~/^Error:/) { + if ($type eq 'error') { $request->print(''.&mt('Make new file').' '.&display($newfilename).'?
'); $request->print(''); $request->print('