--- loncom/publisher/loncfile.pm	2009/05/26 16:29:56	1.99
+++ loncom/publisher/loncfile.pm	2011/10/23 23:46:07	1.110
@@ -9,7 +9,7 @@
 #  and displays a page showing the results of the action.
 #
 #
-# $Id: loncfile.pm,v 1.99 2009/05/26 16:29:56 bisitz Exp $
+# $Id: loncfile.pm,v 1.110 2011/10/23 23:46:07 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -161,21 +161,23 @@ sub URLToPath {
     $Url=~ s/\/+/\//g;
     $Url=~ s/^https?\:\/\/[^\/]+//;
     $Url=~ s/^\///;
-    $Url=~ s/(\~|priv\/)($match_username)\//\/home\/$2\/public_html\//;
+    $Url='/home/httpd/html/'.$Url;
     &Debug($r, "Returning $Url \n");
     return $Url;
 }
 
 sub url {
     my $fn=shift;
-    $fn=~s/^\/home\/($match_username)\/public\_html/\/priv\/$1/;
+    $fn=~s/^\/home\/httpd\/html//;
+    $fn=~s/\/\.\//\//g;
     $fn=&HTML::Entities::encode($fn,'<>"&');
     return $fn;
 }
 
 sub display {
     my $fn=shift;
-    $fn=~s-^/home/($match_username)/public_html-/priv/$1-;
+    $fn=~s/^\/home\/httpd\/html//;
+    $fn=~s/\/\.\//\//g;
     return '<span class="LC_filename">'.$fn.'</span>';
 }
 
@@ -270,8 +272,7 @@ sub exists {
     $creating ||= 'file';
 
     my $published=$construct;
-    $published=~
-	s{^/home/$user/public_html/}{/home/httpd/html/res/$domain/$user/};
+    $published=~s{^/home/httpd/html/priv/}{/home/httpd/html/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>');
@@ -345,9 +346,10 @@ sub checksuffix {
 }
 
 sub cleanDest {
-    my ($request,$dest,$subdir,$fn,$uname)=@_;
+    my ($request,$dest,$subdir,$fn,$uname,$udom)=@_;
     #remove bad characters
     my $foundbad=0;
+    my $error='';
     if ($subdir && $dest =~/\./) {
 	$foundbad=1;
 	$dest=~s/\.//g;
@@ -359,36 +361,40 @@ sub cleanDest {
     }
     if ($dest=~m|/|) {
 	my ($newpath)=($dest=~m|(.*)/|);
-	$newpath=&relativeDest($fn,$newpath,$uname);
+	($newpath,$error)=&relativeDest($fn,$newpath,$uname,$udom);
 	if (! -d "$newpath") {
-	    $request->print('<p><span class="LC_error">'
+	    $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."
-                               ,'"'.&display($newpath).'"')
+                               ,&display($newpath))
                            .'</span></p>');
 	    $dest=~s|.*/||;
 	}
     }
     if ($dest =~ /\.(\d+)\.(\w+)$/){
-	$request->print('<span class="LC_error">'
-			.&mt('Bad filename [_1]','<span class="LC_filename">'.&display($dest).'</span>')
+	$request->print('<p><span 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>');
+			.'</span></p>');
 	$dest =~ s/\.(\d+)(\.\w+)$/$2/;
     }
     if ($foundbad) {
-	$request->print("<p><span class=\"LC_error\">".&mt('Invalid characters in requested name have been removed.')."</span></p>");
+        $request->print('<p><span class="LC_warning">'
+                       .&mt('Invalid characters in requested name have been removed.')
+                        .'</span></p>'
+        );
     }
-    return $dest;
+    return ($dest,$error);
 }
 
 sub relativeDest {
-    my ($fn,$newfilename,$uname)=@_;
+    my ($fn,$newfilename,$uname,$udom)=@_;
+    my $error = '';
     if ($newfilename=~/^\//) {
 # absolute, simply add path
-	$newfilename='/home/'.$uname.'/public_html/';
+	$newfilename='/home/httpd/html/res/'.$udom.'/'.$uname.'/';
     } else {
 	my $dir=$fn;
 	$dir=~s/\/[^\/]+$//;
@@ -398,7 +404,18 @@ sub relativeDest {
     while ($newfilename=~m:/\.\./:) {
 	$newfilename=~ s:/[^/]+/\.\./:/:g; #remove dir/..
     }
-    return $newfilename;
+    if ($newfilename =~ m{^/home/($match_username)/(?:public\_html|priv)/}) {
+        my $otheruname = $1;
+        unless ($otheruname eq $uname) {
+            my ($authorname,$authordom)=
+                &Apache::loncacc::constructaccess($newfilename,$env{'request.role.domain'});
+            unless (($authorname eq $otheruname) && ($authordom ne '')) {
+                my $otherdir = &display($newfilename);
+                $error = &mt('Access denied to [_1]',$otherdir);
+            }
+        }
+    }
+    return ($newfilename,$error);
 }
 
 =pod
@@ -514,10 +531,10 @@ sub Rename1 {
 	    if (-d $fn) {
 		$newfilename=~/\.(\w+)$/;
 		if (&Apache::loncommon::fileembstyle($1) eq 'ssi') {
-		    $request->print('<br /><span classr="LC_warning">'.
-				    &mt('Cannot change MIME type of a directory').
+		    $request->print('<p><span class="LC_error">'.
+				    &mt('Cannot change MIME type of a directory.').
 				    '</span>'.
-				    '<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
+				    '<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a></p>');
 		    return;
 		}
 		$newfilename=~s/\/[^\/]+\/([^\/]+)$/\/$1/;
@@ -533,27 +550,38 @@ sub Rename1 {
 		return;
 	    }
 	    unless (&obsolete_unpub($user,$domain,$fn)) {
-		$request->print('<h3>'.&mt('Cannot rename or move non-obsolete published file').'</h3>'.
-				'<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
+                $request->print('<p><span class="LC_error">'
+                               .&mt('Cannot rename or move non-obsolete published file.')
+                               .'</span><br />'
+                               .'<a href="'.&url($fn).'">'.&mt('Cancel').'</a></p>'
+                );
 		return;
 	    }
 	    my $action;
 	    if ($style eq 'rename') {
-		$action=&mt('Rename');
+		$action='Rename';
 	    } else {
-		$action=&mt('Move');
+		$action='Move';
 	    }
-	    $request->print('<input type="hidden" name="newfilename" value="'.
-			    $newfilename.
-			    '" /><p>'.$action.' '.&display($fn).
-			    '</p><br />to '.&display($newfilename).'?</p>');
+            $request->print('<input type="hidden" name="newfilename" value="'
+                           .$newfilename.'" />'
+                           .'<p>'
+                           .&mt($action.' [_1] to [_2]?',
+                                &display($fn),
+                                &display($newfilename))
+                           .'</p>'
+        );
 	    &CloseForm1($request, $fn);
 	} else {
-	    $request->print('<p>'.&mt('No new filename specified.').'</p></form>');
+	    $request->print('<p class="LC_error">'.&mt('No new filename specified.').'</p></form>');
 	    return;
 	}
     } else {
-	$request->print('<p> '.&mt('No such file').': '.&display($fn).'</p></form>');
+        $request->print('<p class="LC_error">'
+                       .&mt('No such file: [_1]',
+                            &display($fn))
+                       .'</p></form>'
+        );
 	return;
     }
     
@@ -591,22 +619,38 @@ sub Delete1 {
 			$fn.'" />');
         if (-d $fn) {
             unless (&empty_directory($fn,'Delete1')) {
-                $request->print('<h3>'.&mt('Only empty directories may be deleted.').'</h3>'.
-                            'You must delete the contents of the directory first.<br />'.
-                            '<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
+                $request->print('<p>'
+                               .'<span class="LC_error">'
+                               .&mt('Only empty directories may be deleted.')
+                               .'</span><br />'
+                               .&mt('You must delete the contents of the directory first.')
+                               .'</p>'
+                               .'<p><a href="'.&url($fn).'">'.&mt('Cancel').'</a></p>'
+                );
                 return;
             }
         } else { 
 	    unless (&obsolete_unpub($user,$domain,$fn)) {
-	        $request->print('<h3>'.&mt('Cannot delete non-obsolete published file').'</h3>'.
-			    '<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
+                $request->print('<p><span class="LC_error">'
+                               .&mt('Cannot delete non-obsolete published file.')
+                               .'</span><br />'
+                               .'<a href="'.&url($fn).'">'.&mt('Cancel').'</a></p>'
+                );
 	        return;
 	    }
         }
-	$request->print('<p>'.&mt('Delete').' '.&display($fn).'?</p>');
+        $request->print('<p>'
+                       .&mt('Delete [_1]?',
+                            &display($fn))
+                       .'</p>'
+        );
 	&CloseForm1($request, $fn);
     } else {
-	$request->print('<p>'.&mt('No such file').': '.&display($fn).'</p></form>');
+        $request->print('<p class="LC_error">'
+                       .&mt('No such file: [_1]',
+                            &display($fn))
+                       .'</p></form>'
+        );
     }
 }
 
@@ -660,13 +704,22 @@ sub Copy1 {
 	    $request->print('<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
 	    return;
 	}
-	$request->print('<input type="hidden" name="newfilename" value="'.
-			$newfilename.
-			'" /><p>'.&mt('Copy').' '.&display($fn).'<br />to '.
-			&display($newfilename).'?</p>');
+    $request->print(
+        '<input type="hidden" name="newfilename"'
+       .' value="'.$newfilename.'" />'
+       .'<p>'
+       .&mt('Copy [_1] to [_2]?',
+            &display($fn),
+            &display($newfilename))
+       .'</p>'
+        );
 	&CloseForm1($request, $fn);
     } else {
-	$request->print('<p>'.&mt('No such file').': '.&display($fn).'</p></form>');
+        $request->print('<p class="LC_error">'
+                       .&mt('No such file: [_1]',
+                            &display($fn))
+                       .'</p></form>'
+        );
     }
 }
 
@@ -717,14 +770,17 @@ sub NewDir1 {
     if ($type eq 'error') {
 	$request->print('</form>');
     } else {
-	if ($mode eq 'testbank') {
-	    $request->print('<input type="hidden" name="callingmode" value="testbank" />');
-	} elsif ($mode eq 'imsimport') {
-	    $request->print('<input type="hidden" name="callingmode" value="imsimport" />');
-	}
-	$request->print('<input type="hidden" name="newfilename" value="'.
-			$newfilename.'" /><p>'.&mt('Make new directory').' '.
-			&display($newfilename).'?</p>');
+	if (($mode eq 'testbank') || ($mode eq 'imsimport')) {
+	    $request->print('<input type="hidden" name="callingmode" value="'.$mode.'" />'."\n".
+                            '<input type="hidden" name="inhibitmenu" value="yes" />');
+	}
+        $request->print('<input type="hidden" name="newfilename" value="'
+                       .$newfilename.'" />'
+                       .'<p>'
+                       .&mt('Make new directory [_1]?',
+                            &display($newfilename))
+                       .'</p>'
+        );
 	&CloseForm1($request, $fn);
     }
 }
@@ -734,10 +790,18 @@ sub Decompress1 {
     my ($request, $user, $domain, $fn) = @_;
     if( -e $fn) {
    	$request->print('<input type="hidden" name="newfilename" value="'.$fn.'" />');
-   	$request->print('<p>'.&mt('Decompress').' '.&display($fn).'?</p>');
+   	$request->print('<p>'
+                   .&mt('Decompress [_1]?',
+                        &display($fn))
+                   .'</p>'
+    );
    	&CloseForm1($request, $fn);
     } else {
-	$request->print('<p>'.&mt('No such file').': '.&display($fn).'</p></form>');
+        $request->print('<p class="LC_error">'
+                       .&mt('No such file: [_1]',
+                            &display($fn))
+                       .'</p></form>'
+        );
     }
 }
 
@@ -806,7 +870,7 @@ sub NewFile1 {
             $extension = $1;
         }
 
-        my @okexts = qw(xml html xhtml htm xhtm problem page sequence rights sty library js css txt);
+        my @okexts = qw(xml html xhtml htm xhtm problem page sequence rights sty task library js css txt);
         if (($extension eq '') || (!grep(/^\Q$extension\E/,@okexts))) {
             my $validexts = '.'.join(', .',@okexts);
             $request->print('<p class="LC_warning">'.
@@ -886,8 +950,23 @@ sub phaseone {
   
     my $doingdir=0;
     if ($env{'form.action'} eq 'newdir') { $doingdir=1; }
-    my $newfilename=&cleanDest($r,$env{'form.newfilename'},$doingdir,$fn,$uname);
-    $newfilename=&relativeDest($fn,$newfilename,$uname);
+    my ($newfilename,$error) = 
+        &cleanDest($r,$env{'form.newfilename'},$doingdir,$fn,$uname,$udom);
+    unless ($error) {
+        ($newfilename,$error)=&relativeDest($fn,$newfilename,$uname,$udom);
+    }
+    if ($error) {
+        my $dirlist;
+        if ($fn=~m{^(.*/)[^/]+$}) {
+            $dirlist=$1;
+        } else {
+            $dirlist=$fn; 
+        }
+        $r->print('<div class="LC_error">'.$error.'</div>'.
+                  '<h3><a href="'.&url($dirlist).'">'.&mt('Return to Directory').
+                  '</a></h3>');
+        return;
+    }
     $r->print('<form action="/adm/cfile" method="post">'.
 	      '<input type="hidden" name="qualifiedfilename" value="'.$fn.'" />'.
 	      '<input type="hidden" name="phase" value="two" />'.
@@ -905,7 +984,10 @@ sub phaseone {
 	if($newfilename) {
 	    &Copy1($r, $uname, $udom, $fn, $newfilename);
 	} else {
-	    $r->print('<p>'.&mt('No new filename specified.').'</p></form>');
+            $r->print('<p class="LC_error">'
+                     .&mt('No new filename specified.')
+                     .'</p></form>'
+            );
 	}
     } elsif ($env{'form.action'} eq 'newdir') {
 	my $mode = '';
@@ -927,7 +1009,10 @@ sub phaseone {
 	if (($newfilename!~/\/$/) && ($newfilename!~/$empty$/)) {
 	    &NewFile1($r, $uname, $udom, $fn, $newfilename);
 	} else {
-	    $r->print('<p>'.&mt('No new filename specified.').'</p></form>');
+            $r->print('<p class="LC_error">'
+                     .&mt('No new filename specified.')
+                     .'</p></form>'
+            );
 	}
     }
 }
@@ -1014,7 +1099,12 @@ sub Rename2 {
 	    unlink $tmp2;
 	}
     } else {
-	$request->print("<p> ".&mt('No such file').": ".&display($oldfile).'</p></form>');
+        $request->print(
+            '<p>'
+           .&mt('No such file: [_1]',
+                &display($oldfile))
+           .'</p></form>'
+        );
 	return 0;
     }
     return 1;
@@ -1062,7 +1152,7 @@ sub Delete2 {
 		    return 0;
 		}
 	    } else {
-		$request->print('<p> '.&mt('No such file').'. </p></form>');
+        	$request->print('<p class="LC_error">'.&mt('No such file').'</p></form>');
 		return 0;
 	    }
 	}
@@ -1073,7 +1163,7 @@ sub Delete2 {
 		return 0;
 	    }
 	} else {
-	    $request->print('<p> '.&mt('No such file').'. </p></form>');
+            $request->print('<p class="LC_error">'.&mt('No such file').'</p></form>');
 	    return 0;
 	}
     }
@@ -1132,7 +1222,7 @@ sub Copy2 {
 	    return 1;
 	}
     } else {
-	$request->print('<p> '.&mt('No such file').' </p>');
+        $request->print('<p class="LC_error">'.&mt('No such file').'</p>');
 	return 0;
     }
     return 1;
@@ -1286,7 +1376,7 @@ sub phasetwo {
 	    }
 	    $dest = $env{'form.newfilename'};
      	} else {
-	    $r->print('<p>'.&mt('No New filename specified').'</p></form>');
+            $r->print('<p class="LC_error">'.&mt('No New filename specified').'</p></form>');
 	    return;
 	}
 	
@@ -1391,7 +1481,7 @@ function writeDone() {
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({
         'text'  => 'Construction Space',
-        'href'  => '', # FIXME Add link to /priv/[user]
+        'href'  => &Apache::loncommon::authorspace(),
     });
     &Apache::lonhtmlcommon::add_breadcrumb({
         'text'  => 'File Operation',
@@ -1410,7 +1500,7 @@ function writeDone() {
     $r->print('<h3>'.&mt('Location').': '.&display($fn).'</h3>');
   
     if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
-        $r->print('<p class="LC_warning">'
+        $r->print('<p class="LC_info">'
                  .&mt('Co-Author [_1]',$uname.':'.$udom)
                  .'</p>'
         );
@@ -1442,8 +1532,11 @@ function writeDone() {
 	     $env{'form.action'} eq 'Select Action' ) {
 	$r->print('<h3>'.&mt('New Resource').'</h3>');
     } else {
-	$r->print('<p>'.&mt('Unknown Action').' '.$env{'form.action'}.' </p>'.
-		  &Apache::loncommon::end_page());
+        $r->print('<p class="LC_error">'
+                 .&mt('Unknown Action').' '.$env{'form.action'}
+                 .'</p>'
+                 .&Apache::loncommon::end_page()
+        );
 	return OK;  
     }
     if ($env{'form.phase'} eq 'two') {