--- docman.php 2002/07/27 19:45:28 1.7 +++ docman.php 2002/07/27 20:30:45 1.10 @@ -571,7 +571,7 @@ function Navigate($fsRoot,$relDir) { global $gblEditable, $gblIcon, $gblModDays, $webRoot, $gblHide, - $gblIgnoreUnknownFileType, + $gblIgnoreUnknownFileType, $gblRepositoryDir, $HTTP_GET_VARS, $html, $realm_config; $self = $HTTP_SERVER_VARS["PHP_SELF"] ; @@ -859,12 +859,13 @@
"; - include(".info.inc"); - print " -
"; + include("$gblRepositoryDir/.info.inc"); + print "
"; } + ?>
@@ -1076,13 +1077,15 @@ function try_rename($from,$to) { # print "$from -> $to\n"; if (file_exists($from) && is_writeable(dirname($to))) { - rename($from,$to); + return rename($from,$to); + } else { + return 0; } } function try_dir($todir) { if (! file_exists($todir)) { - mkdir($todir,0700); + @mkdir($todir,0700); } } @@ -1092,7 +1095,7 @@ # print "
$fromdir / $fromfile -> $todir / $tofile\n\n";
 
-	try_rename("$fromdir/$fromfile","$todir/$tofile");
+	if (! try_rename("$fromdir/$fromfile","$todir/$tofile")) Error("Rename error","Can't rename file $fromfile to $tofile",1);
 	try_dir("$todir/.log");
 	try_rename("$fromdir/.log/$fromfile","$todir/.log/$tofile");
 	try_dir("$todir/.note");
@@ -1618,7 +1621,7 @@
 		if (strstr($FILENAME,"/")) 
 			Error("Upload error","Non-conforming filename. Filename $FILENAME has slashes (/) in it.") ;
 		if (! isset($FILENAME)) { 	// from update file
-			$target = "$fsDir/".basename($FN_name);
+			$target = "$fsDir/".basename($FN);
 		} else {
 			$target = "$fsDir/$FILENAME";
 		}
@@ -1751,11 +1754,13 @@
 	case "RENAME" :  
 		if ( $CONFIRM != "on" ) break ;
 
+		$NEWNAME=stripSlashes($HTTP_POST_VARS["NEWNAME"]);
 		LogIt("$fsDir/$FN","renamed $FN to $NEWNAME",trperm_r);
 		safe_rename($fsDir,$FN,$NEWNAME);
 		break ;
 
 	case "NOTE" :  
+		$NOTE=stripSlashes($HTTP_POST_VARS["NOTE"]);
 		WriteNote("$fsDir/$FN","$NOTE");
 		break ;