--- docman.php 2002/07/28 17:31:03 1.19
+++ docman.php 2002/07/29 12:34:18 1.29
@@ -90,8 +90,8 @@
if ($fsDocumentRoot == "") Error("Configuration error","Can't get SCRIPT_FILENAME from your web server. Please set \$fsDocumentRoot in \$",1);
// globals for later
- $gblLogin = $HTTP_SERVER_VARS["PHP_AUTH_USER"];
- $gblPasswd = $HTTP_SERVER_VARS["PHP_AUTH_PW"];
+ $gblLogin = HTTP_SERVER_VAR("PHP_AUTH_USER");
+ $gblPasswd = HTTP_SERVER_VAR("PHP_AUTH_PW");
//////////////////////////////////////////////////////////////////
@@ -155,7 +155,10 @@
function DetailPage($fsRoot,$relDir,$fn) {
- global $gblEditable, $gblImages, $webRoot, $html, $HTTP_SERVER_VARS ;
+ global $gblEditable, $gblImages,
+ $gblDateFmt, $gblTimeFmt,
+ $webRoot, $html,
+ $HTTP_SERVER_VARS ;
$self = $HTTP_SERVER_VARS["PHP_SELF"] ;
$relPath = $relDir . "/" . $fn ;
@@ -185,11 +188,12 @@
$title = "("._("Detail Page").")" ;
StartHTML($title, $text) ;
- echo "" . $relDir . "/" . $fn . "
" ;
+ print "".$relDir.$fn."
";
+
if ($exists) { // get file info
$fsize = filesize($fsPath) ;
- $fmodified = date("$GLOBALS[gblDateFmt] $GLOBALS[gblTimeFmt]", filemtime($fsPath)) ;
- $faccessed = date("$GLOBALS[gblDateFmt] $GLOBALS[gblTimeFmt]", fileatime($fsPath)) ;
+ $fmodified = date("$gblDateFmt $gblTimeFmt", filemtime($fsPath)) ;
+ $faccessed = date("$gblDateFmt $gblTimeFmt", fileatime($fsPath)) ;
$fuid=fileowner($fsPath);
$fgid=filegroup($fsPath);
$userinfo = posix_getpwuid($fuid);
@@ -226,7 +230,7 @@
}
if ( !$file_lock && $ext!="" && strstr(join(' ',$gblImages),$ext) ) {
$info = getimagesize($fsPath) ;
- $tstr = "![\""](\"$webRoot".urlpath($relPath)."\")
" ;
// echo htmlentities($tstr) . "
" . $tstr ;
@@ -477,18 +481,10 @@
//////////////////////////////////////////////////////////////////
-function GifIcon($txt) {
- global $gblIconLocation ;
+function GifIcon($txt = "") {
+ global $gblIconLocation, $gblImages ;
switch (strtolower($txt)) {
- case ".bmp" :
- case ".gif" :
- case ".jpg" :
- case ".jpeg":
- case ".tif" :
- case ".tiff":
- $d = "image2.gif" ;
- break ;
case ".doc" :
$d = "layout.gif" ;
break ;
@@ -566,9 +562,14 @@
$d = "quill.gif";
break;
default :
- $d = "generic.gif" ;
+ if (in_array(strtolower($txt),$gblImages)) {
+ $d = "image2.gif" ;
+ } else {
+ $d = "generic.gif" ;
+ }
}
+
return "![](\"$gblIconLocation")
" ;
} // end function GifIcon
@@ -578,7 +579,7 @@
global $gblEditable, $gblIcon, $gblModDays, $webRoot, $gblHide,
$gblIgnoreUnknownFileType, $gblRepositoryDir,
- $gblLogin,
+ $gblLogin, $gblUserName, $gblDateFmt, $gblTimeFmt,
$fsRealmDir, $realm, $realm_sep,
$html, $realm_config,
$HTTP_GET_VARS, $HTTP_SERVER_VARS;
@@ -593,7 +594,7 @@
global $debug;
$debug .= "[$gblLogin|$relDir] before >";
- if (! check_perm($relDir,(trperm_b | trperm_r)))
+ if (! check_perm($relDir,trperm_b))
Error("Access denied","User $gblLogin tried to access $relDir without valid trustee.",1);
$debug .= "< afeter";
@@ -629,10 +630,15 @@
if ( HTTP_GET_VAR("show_deleted") == 1 && ($dir = @opendir("$fsDir/.del")) ) {
while ($item = readdir($dir)) {
if ( substr($item,0,1) == "." || strstr($hide_items,",$item,") || !check_perm($relDir.$item,trperm_w) ) continue ;
- $fileList[$item] = ".del/$item" ;
- $fileDate[$item] = filemtime($fsDir.".del/$path") ;
- $fileSize[$item] = filesize($fsDir.".del/$path") ;
- $fileNote[$item] = ReadNote($fsDir.".del/$item");
+ if (is_file($fsDir.".del/$item")) {
+ $fileList[$item] = ".del/$item" ;
+ $fileDate[$item] = filemtime($fsDir.".del/$item") ;
+ $fileSize[$item] = filesize($fsDir.".del/$item") ;
+ $fileNote[$item] = ReadNote($fsDir.".del/$item");
+ } else {
+ $dirList[$item] = ".del/$item" ;
+ $dirNote[$item] = ReadNote($fsDir.".del/$item");
+ }
}
closedir($dir) ;
}
@@ -730,6 +736,13 @@
$dir = $dirList[$key];
$info_url=self_args(array("A"=>"A=E", "F"=>"F=".urlencode($dir), "D"=>$D));
+ if (substr($dir,0,5) == ".del/") {
+ $dir = substr($dir,5,strlen($dir)-5);
+ $deleted = " deleted";
+ } else {
+ $deleted = "";
+ }
+
$dir_url=$self."?D=".urlencode(chopsl($relDir)."/".$dir);
include("$html/Navigate-dirEntry.html");
@@ -808,7 +821,7 @@
if (substr($file,0,5) != ".del/") {
$file_url_html .= $file . "" . $a ;
} else {
- $file_url_html .= substr($file,5,strlen($file)-5) . " deleted ";
+ $file_url_html .= substr($file,5,strlen($file)-5) . " deleted";
}
$note_html="".$gblIcon("note")."".ReadNote($path);
@@ -816,7 +829,7 @@
$ext = strtolower(strrchr($file,".")) ;
if ($file_lock) {
- if ($file_lock == $GLOBALS[gblUserName]) {
+ if ($file_lock == $gblUserName) {
$b.="" ;
$file_url_html=$b;
@@ -844,7 +857,7 @@
}
}
- $mod = date("$GLOBALS[gblDateFmt] $GLOBALS[gblTimeFmt]",$mod);
+ $mod = date("$gblDateFmt $gblTimeFmt",$mod);
include("$html/Navigate-fileEntry.html");
@@ -956,6 +969,8 @@
function LogIt($target,$msg, $changelog=0) {
+ global $gblDateFmt, $gblTimeFmt, $gblUserName, $gblFsRoot;
+
$dir=dirname($target);
if (! file_exists($dir."/.log")) {
if (! @mkdir($dir."/.log",0700)) Error("docman installation problem","can't create log directory $dir/.log",1);
@@ -963,18 +978,17 @@
$file=basename($target);
$log=fopen("$dir/.log/$file","a+");
- fputs($log,date("$GLOBALS[gblDateFmt]\t$GLOBALS[gblTimeFmt]").
- "\t$GLOBALS[gblUserName]\t$msg\n");
+ fputs($log,date("$gblDateFmt\t$gblTimeFmt").
+ "\t$gblUserName\t$msg\n");
fclose($log);
if (! $changelog) return;
- global $gblFsRoot;
$log=fopen("$gblFsRoot/.changelog","a+");
if (substr($target,0,strlen($gblFsRoot)) == $gblFsRoot)
$target=substr($target,strlen($gblFsRoot),strlen($target)-strlen($gblFsRoot));
$msg=str_replace("\t"," ",$msg);
- fputs($log,time()."\t$target\t$GLOBALS[gblUserName]\t$msg\n");
+ fputs($log,time()."\t$target\t$gblUserName\t$msg\n");
fclose($log);
// FIX: implement e-mail notification based on $changelog
@@ -1034,6 +1048,8 @@
function Lock($target) {
+ global $gblUserName;
+
$target=stripSlashes($target);
$dir=dirname($target);
if (! file_exists($dir."/.lock")) {
@@ -1045,7 +1061,7 @@
LogIt($target,"attempt to locked allready locked file!");
} else {
$lock=fopen("$dir/.lock/$file","w");
- fputs($lock,"$GLOBALS[gblUserName]\n");
+ fputs($lock,"$gblUserName\n");
fclose($lock);
LogIt($target,"file locked");
@@ -1094,6 +1110,9 @@
//////////////////////////////////////////////////////////////////
function safe_rename($fromdir,$fromfile,$tofile) {
+
+ global $gblNumBackups;
+
function try_rename($from,$to) {
# print "$from -> $to\n";
if (file_exists($from) && is_writeable(dirname($to))) {
@@ -1123,7 +1142,7 @@
try_dir("$todir/.lock");
try_rename("$fromdir/.lock/$fromfile","$todir/.lock/$tofile");
try_dir("$todir/.bak");
- for($i=0;$i<=$GLOBALS[gblNumBackups];$i++) {
+ for($i=0;$i<=$gblNumBackups;$i++) {
try_rename("$fromdir/.bak/$i/$fromfile","$todir/.bak/$i/$tofile");
}
}
@@ -1151,7 +1170,10 @@
function DisplayChangeLog($day) {
- global $gblFsRoot,$HTTP_SERVER_VARS;
+ global $gblFsRoot, $gblDateFmt, $gblTimeFmt,
+ $HTTP_SERVER_VARS;
+
+ $self = $HTTP_SERVER_VARS["PHP_SELF"];
if (!file_exists("$gblFsRoot/.changelog")) return;
$log=fopen("$gblFsRoot/.changelog","r");
@@ -1170,14 +1192,14 @@
print "\n";
while ($e = array_shift($logarr)) {
$cl=$cl1; $cl1=$cl2; $cl2=$cl;
- $date = date("$GLOBALS[gblDateFmt]", $e[0]);
- $time = date("$GLOBALS[gblTimeFmt]", $e[0]);
+ $date = date($gblDateFmt, $e[0]);
+ $time = date($gblTimeFmt, $e[0]);
$dir = dirname($e[1]);
$file = basename($e[1]);
print "$date$time$dir/$file$e[2]$e[3]
\n";
}
print "
";
- print "".GifIcon(up)." Back to front page.
";
+ print "".GifIcon("up")." Back to front page.
";
}
//////////////////////////////////////////////////////////////////
@@ -1199,7 +1221,7 @@
$ext_arr = explode(".",$file);
$ext = array_pop($ext_arr);
- if ($encoding_ext[$ext]) {
+ if (isset($encoding_ext[$ext])) {
$encoding = $encoding_ext[$ext];
$ext = array_pop($ext_arr);
}
@@ -1211,7 +1233,7 @@
}
// IE5.5 just downloads index.php if we don't do this
- if(preg_match("/MSIE 5.5/", $HTTP_SERVER_VARS[HTTP_USER_AGENT])) {
+ if(preg_match("/MSIE 5.5/", $HTTP_SERVER_VARS["HTTP_USER_AGENT"])) {
header("Content-Disposition: filename=$file");
} else {
header("Content-Disposition: attachment; filename=$file");
@@ -1393,11 +1415,9 @@
}
// helper function
-function unroll_perm($u,$t,$user,$perm) {
+function unroll_perm($u,$t,$perm,$one_level) {
- // check user FIX
- if ($t & trmask_not && ($u==$user)) continue;
- if (!($t & trmask_not) && ($u!=$user)) continue;
+ if ($t & trmask_one_level && !$one_level) return $perm;
if ($t & trmask_deny) {
if ($t & trmask_clear) {
@@ -1414,11 +1434,14 @@
}// end of helper function
function check_trustee($user,$path) {
- global $trustees;
+ global $trustees,$HAVE_TRUSTEE;
$perm['allow'] = 0;
$perm['deny'] = 0;
- if (! isset($trustees)) Error("Trustees not found","Can't find in-memory trustee structure \$trustees. Probably bug in code. Contact dpavlin@rot13.org",1);
+ // do we use trustees?
+ if (! $HAVE_TRUSTEE) return $perm;
+
+ if (! isset($trustees)) Error("Trustees not found","Can't find in-memory trustee structure \$trustees. Probably bug in code. Contact dpavlin@rot13.org",1);
global $debug;
$debug .= "
check_trustee $path ... ";
@@ -1429,31 +1452,35 @@
$tmppath.=array_shift($path_arr);
$debug.= ">> $tmppath ";
- # clear one level flag
- $perm['allow'] &= ~trmask_one_level;
- $perm['deny'] &= ~trmask_one_level;
-
if (! isset($trustees[$tmppath])) continue;
$tr = $trustees[$tmppath];
+ $one_level = (!count($path_arr));
+$debug.=" O($one_level) ";
+
if (isset($tr)) {
// first apply trustee for all
- if (isset($tr['*'])) {
- $perm = unroll_perm($user,$tr['*'],$user, $perm);
+ if (isset($tr['*']) && $user!="anonymous") {
+ $perm = unroll_perm($user,$tr['*'],$perm, $one_level);
unset($tr['*']);
}
- // then apply group policies
+ // then apply not and group policies
foreach ($tr as $g=>$t) {
- if ($t & trmask_group && in_group($user,$g)) {
+ if ($t & trmask_not && $g != $user) {
+ $t = $t & ~trmask_not;
+ $perm = unroll_perm($user,$t,$perm, $one_level);
+ unset($tr[$g]);
+
+ } elseif ($t & trmask_group && in_group($user,$g)) {
// resolv user
$t = $t & ~trmask_group;
- $perm = unroll_perm($user,$t,$user, $perm);
+ $perm = unroll_perm($user,$t,$perm, $one_level);
unset($tr[$g]);
}
}
// then apply user policy
if (isset($tr[$user])) {
- $perm = unroll_perm($user,$tr[$user],$user, $perm);
+ $perm = unroll_perm($user,$tr[$user],$perm,$one_level);
unset($tr[$user]);
}
}
@@ -1470,6 +1497,8 @@
function check_perm($path,$trperm) {
global $gblLogin,$HAVE_TRUSTEE;
+ $path = str_replace("//","/",$path);
+
global $debug;
$debug.="
check_perm: on $path for perm ".display_trustee($trperm)."
\n";
@@ -1519,27 +1548,46 @@
function check_filename($file) {
if (strstr($file,"..")) Error("Security violation","No parent dir .. allowed in file name $file",1);
+ // remove deleted directory (for undelete to work)
+ $file = str_replace(".del/","",$file);
if (strstr($file,"/")) Error("Security violation","No slashes / allowed in file name $file",1);
}
+// bla/blo/../foo will return bla/foo
+function remove_parent($path) {
+ while (preg_match(",/[^/]+/\.\./,",$path)) {
+ $path = preg_replace(",/[^/]+/\.\./,","",$path);
+ }
+ if (substr($path,0,1) != "/") $path = "/".$path;
+ return $path;
+}
+
//////////////////////////////////////////////////////////////////
// functions to move HTTP server variables to global namespace
// [replacement for register_globals in php.ini]
function HTTP_GET_VAR($var) {
- global $HTTP_GET_VARS, $GLOBALS;
+ global $HTTP_GET_VARS, ${$var};
if (isset($HTTP_GET_VARS[$var])) {
- $GLOBALS[$var] = stripSlashes($HTTP_GET_VARS[$var]);
- return $GLOBALS[$var];
+ $$var = stripSlashes($HTTP_GET_VARS[$var]);
+ return $$var;
}
}
function HTTP_POST_VAR($var) {
- global $HTTP_GET_VARS, $GLOBALS;
- if (isset($HTTP_GET_VARS[$var])) {
- $GLOBALS[$var] = stripSlashes($HTTP_GET_VARS[$var]);
- return $GLOBALS[$var];
+ global $HTTP_POST_VARS, ${$var};
+ if (isset($HTTP_POST_VARS[$var])) {
+ $$var = $HTTP_POST_VARS[$var];
+ return $$var;
+ }
+}
+
+function HTTP_SERVER_VAR($var) {
+ global $HTTP_SERVER_VARS, ${$var};
+ if (isset($HTTP_SERVER_VARS[$var])) {
+ $$var = $HTTP_SERVER_VARS[$var];
+ return $$var;
}
}
@@ -1562,7 +1610,7 @@
// location of master docman configuration file
$docman_conf = "/etc/docman.conf";
if (! file_exists($docman_conf)) {
- $error = "Can't find master configuration file $docman_conf. See docman2/doc/upgrade.html#docman_conf for more informations";
+ $error = "Can't find master configuration file $docman_conf. See docman2/doc/upgrade.html#docman_conf for more informations";
error_log("docman: $error");
Error("docman not installed completly",$error);
@@ -1650,19 +1698,22 @@
// read mime.types
readMime();
+HTTP_POST_VAR("FN");
+
if ($HTTP_SERVER_VARS["REQUEST_METHOD"] == "POST") {
// take variables from server
- if (HTTP_POST_VAR("FN")) check_filename($FN);
+ if (HTTP_POST_VAR("FN"))
+ check_filename($FN);
if (HTTP_POST_VAR("DIR")) {
check_dirname($DIR);
$relDir = $DIR;
} else {
trigger_error("Can't get DIR",E_USER_WARNING);
+ $relDir = "/";
}
if (HTTP_POST_VAR("RELPATH")) check_dirname($RELPATH);
HTTP_POST_VAR("T");
HTTP_POST_VAR("CONFIRM");
-
} else {
// get
HTTP_GET_VAR("A");
@@ -1707,8 +1758,7 @@
Error("You must select file with browse to upload it!");
}
- $FILENAME = $HTTP_POST_VARS["FILENAME"];
- check_filename($FILENAME);
+ if (HTTP_POST_VAR("FILENAME")) check_filename($FILENAME);
if (! isset($FILENAME)) { // from update file
$target = "$fsDir/".basename($FN);
@@ -1716,16 +1766,19 @@
$target = "$fsDir/$FILENAME";
}
+ if (! check_perm("$relDir/".basename($target), trperm_w))
+ Error("Access denied","User $gblLogin tried to upload $relDir/".basename($target)." without valid trustee.",1);
+
// backup old files first
$dir=dirname($target);
if (! file_exists($dir."/.bak")) {
mkdir($dir."/.bak",0700);
}
- if (! file_exists($dir."/.bak/$GLOBALS[gblNumBackups]")) {
- mkdir($dir."/.bak/$GLOBALS[gblNumBackups]",0700);
+ if (! file_exists($dir."/.bak/$gblNumBackups")) {
+ mkdir($dir."/.bak/$gblNumBackups",0700);
}
$file=basename($target);
- for($i=$GLOBALS[gblNumBackups]-1;$i>0;$i--) {
+ for($i=$gblNumBackups-1;$i>0;$i--) {
MoveTo("$dir/.bak/$i/$file","$dir/.bak/".($i+1)."/");
}
MoveTo($target,$dir."/.bak/1/");
@@ -1744,14 +1797,18 @@
case "SAVE" :
$path = $gblFsRoot . $RELPATH ;
$path=stripSlashes($path);
+
+ if (! check_perm("$RELPATH", trperm_w))
+ Error("Access denied","User $gblLogin tried to save $RELPATH without valid trustee.",1);
+
$writable = is_writeable($path) ;
$legaldir = is_writeable(dirname($path)) ;
$exists = (file_exists($path)) ? 1 : 0 ;
-// check for legal extension here as well
+ // FIX: more verbose error message
if (!($writable || (!$exists && $legaldir)))
Error("Write denied",$RELPATH) ;
$fh = fopen($path, "w") ;
- $FILEDATA=stripSlashes($FILEDATA);
+ HTTP_POST_VAR("FILEDATA");
fwrite($fh,$FILEDATA) ;
fclose($fh) ;
clearstatcache() ;
@@ -1760,10 +1817,18 @@
case "CREATE" :
// we know $fsDir exists
- if ($FN == "") break; // no filename!
- if (!is_writeable($fsDir)) Error("Write denied",$relDir) ;
- $path = $fsDir . "/" . $FN ; // file or dir to create
- $relPath = $relDir . "/" . $FN ;
+ if (! check_perm($relDir, trperm_w))
+ Error("Write access denied","You don't have permission to write in $relDir");
+ if ($T == "D") $type = "directory";
+ else $type ="file";
+ if ($FN == "") Error("Can't create $type","You must enter name of $type to create it.");
+ if (!is_writeable($fsDir)) Error("Write denied","User $gblLogin has trustee to write in $relDir but permissions on $fsDir are wrong!", 1) ;
+ $path = "$fsDir/$FN"; // file or dir to create
+ $relPath = "$relDir/$FN";
+
+ if (file_exists($path))
+ Error("Can't create $type","Object $relPath allready exists");
+
switch ( $T ) {
case "D" : // create a directory
if ( ! @mkdir($path,$gblDirPerms) )
@@ -1777,53 +1842,54 @@
// better keep it here altogether
// chmod perms to $gblFilePerms
if ( file_exists($path) && !is_writeable($path) )
- Error("File not writable", $relPath) ;
+ Error("File not writable", "User $gblLogin has trustee to write in $relPath but permissions on $path are wrong!", 1) ;
$fh = fopen($path, "w+") ;
if ($fh) {
fputs($fh,"\n");
fclose($fh) ;
LogIt($path,"file created",trperm_r | trperm_w);
} else {
- Error("Creation of file $relPath failed -- $path");
+ Error("Creation of file $relPath failed", "User $gblLogin has trustee to write in $relPath but creation of $path failed!", 1) ;
}
- $tstr = "$PHP_SELF?A=E&D=".urlencode($relDir)."&F=".urlencode($FN) ;
+ $tstr = $HTTP_SERVER_VARS["PHP_SELF"]."?A=E&D=".urlencode($relDir)."&F=".urlencode($FN) ;
header("Location: " . $tstr) ;
exit ;
}
break ;
case "DELETE" :
- if ( $CONFIRM != "on" ) break ;
+ if ( $CONFIRM != "on" ) break;
- $tstr = "Attempt to delete non-existing object or " ;
- $tstr .= "insufficient privileges: " ;
+ if ( isset($FN) && $FN != "") {
+ $path=$fsDir."/".$FN;
+ $what = "file";
+ } elseif (isset($DIR)) {
+ $path=$gblFsRoot."/".$DIR;
+ $what = "directory";
+ } else {
+ Error("Can't delete object","Can't find filename \$FN or dirname in \$DIR",1);
+ }
- if ( $FN != "") { // delete file
- $path = $fsDir . "/" . $FN ;
-
- $dir=dirname($path);
- $file=basename($path);
- if (! file_exists("$dir/.del")) {
- mkdir("$dir/.del",0700);
- }
+ if (! check_perm("$relDir/$FN", trperm_w))
+ Error("Access denied","User $gblLogin tried to erase $what $relDir/$FN without valid trustee.",1);
-// if ( ! @unlink($path) ) {
- if ( ! rename($path,"$dir/.del/$file") ) {
- LogIt($path,"file delete failed");
- Error("File delete failed", $tstr . $path) ;
- } else {
- LogIt($path,"file deleted",trperm_w);
- MoveTo("$dir/.log/$file","$dir/.del/.log/");
- MoveTo("$dir/.note/$file","$dir/.del/.note/");
- MoveTo("$dir/.lock/$file","$dir/.del/.lock/");
- }
- } else { // delete directory
- if ( ! @rrmdir($fsDir) ) {
- Error("Rmdir failed", $tstr . $fsDir) ;
- } else {
- LogIt($path,"dir deleted",trperm_w);
- $relDir = dirname($relDir) ; // move up
- }
+ $tstr = "Attempt to delete non-existing object or insufficient privileges: " ;
+
+ $dir=dirname($path);
+ $file=basename($path);
+
+ if (! file_exists("$dir/.del")) {
+ mkdir("$dir/.del",0700);
+ }
+
+ if ( ! @rename($path,"$dir/.del/$file") ) {
+ LogIt($path,"$what delete failed");
+ Error("Can't delete $what",$tstr."".$relDir."/".$FN."") ;
+ } else {
+ LogIt($path,"$what deleted",trperm_w);
+ MoveTo("$dir/.log/$file","$dir/.del/.log/");
+ MoveTo("$dir/.note/$file","$dir/.del/.note/");
+ MoveTo("$dir/.lock/$file","$dir/.del/.lock/");
}
break ;
@@ -1833,6 +1899,9 @@
if (substr($FN,0,4) != ".del") break ;
$file=substr($FN,4,strlen($FN)-4);
+ if (! check_perm("$relDir/$file", trperm_w))
+ Error("Access denied","User $gblLogin tried to undelete $relDir/$file without valid trustee.",1);
+
LogIt("$fsDir/.del/$file","undeleted",trperm_w);
MoveTo("$fsDir/.del/$file","$fsDir/");
MoveTo("$fsDir/.del/.log/$file","$fsDir/.log/");
@@ -1844,7 +1913,14 @@
case "RENAME" :
if ( $CONFIRM != "on" ) break ;
- $NEWNAME=stripSlashes($HTTP_POST_VARS["NEWNAME"]);
+ if (HTTP_POST_VAR("NEWNAME")) {
+ $dest = remove_parent($relDir.$NEWNAME);
+ if (! check_perm($relDir.$FN, trperm_w) ||
+ ! check_perm($dest, trperm_w) )
+ Error("Access denied","User $gblLogin tried to rename $relDir$FN to $dest without valid trustee.",1);
+ } else {
+ Error("Rename error","Can't find new name in var \$NEWNAME",1);
+ }
LogIt("$fsDir/$FN","renamed $FN to $NEWNAME",trperm_r);
safe_rename($fsDir,$FN,$NEWNAME);
break ;
@@ -1865,8 +1941,8 @@
// common to all POSTs : redirect to directory view ($relDir)
if (isset($POSTACTION)) {
- $tstr = $PHP_SELF . "?D=" . urlencode($relDir) ;
- header("Location: " . $tstr) ;
+ $tstr = $HTTP_SERVER_VARS["PHP_SELF"]."?D=".urlencode($relDir);
+ header("Location: ".$tstr) ;
exit ;
}