--- docman.php 2001/02/15 21:20:53 1.32
+++ docman.php 2001/02/23 11:51:39 1.34
@@ -222,7 +222,11 @@
Error("Creation denied",$relDir) ;
$text = "Use this page to view, modify or " ;
- $text .= "delete a single document on this " ;
+ if (is_dir($fsPath)) {
+ $text .="delete a directory on this " ;
+ } else {
+ $text .= "delete a single document on this " ;
+ };
$text .= "web site." ;
$title = "(Detail Page)" ;
StartHTML($title, $text) ;
@@ -232,18 +236,21 @@
$fsize = filesize($fsPath) ;
$fmodified = date("$GLOBALS[gblDateFmt] $GLOBALS[gblTimeFmt]", filemtime($fsPath)) ;
$faccessed = date("$GLOBALS[gblDateFmt] $GLOBALS[gblTimeFmt]", fileatime($fsPath)) ;
- echo "
file size: " . $fsize . " Bytes
" ;
+ $userinfo = posix_getpwuid(fileowner($fsPath));
+ $grpinfo = posix_getgrgid(filegroup($fsPath));
+ echo "";
+ if (!is_dir($fsPath)) echo "file size: " . $fsize . " Bytes
" ;
echo "last modified: " . $fmodified . "
" ;
echo "last accessed: " . $faccessed . "
" ;
- echo " owner: " . fileowner($fsPath) . "
" ;
- echo " group: " . filegroup($fsPath) . "
" ;
+ echo " owner: " . $userinfo["name"] . "
" ;
+ echo " group: " . $grpinfo["name"] . "
" ;
echo " permissions: " ;
echo printf( "%o", fileperms($fsPath) ) . "" ;
echo "
" ;
}
- if ( $editable && ($writable || !$exists) && !$file_lock ) {
+ if ( !is_dir($fsPath) && $editable && ($writable || !$exists) && !$file_lock ) {
$fh = fopen($fsPath,"a+") ;
rewind($fh) ;
$fstr = fread($fh,filesize($fsPath)) ;
@@ -350,7 +357,12 @@
array_unshift($logarr,array($cl,$line[0],$line[1],$line[2],$line[3]));
}
fclose($log);
- print "
CHANGES TO THIS FILE
\n";
+ if (is_dir("$fsDir/$fn")) {
+ $whatis="DIRECTORY";
+ } else {
+ $whatis="FILE";
+ }
+ print "
CHANGES TO THIS $whatis
\n";
$bakcount = 0; // start from 0, skip fist backup (it's current)
while ($e = array_shift($logarr)) {
if (strstr($e[4],"upload")) {
@@ -685,18 +697,23 @@
sort($dirList) ;
?>
- | DIRECTORY NAME |
+ | DIRECTORY NAME | DIRECTORY NOTE |
" . $dir . "/" ;
+ $note_html="".$gblIcon("note")."".ReadNote($fsDir.$dir);
?>
-= $gblIcon("fldr") ?> |
-= $tstr ?> |
+
+
+= $gblIcon("fldr") ?> |
+= $tstr ?> |
+= $note_html ?> |
$to\n";
+ if (file_exists($from) && is_writable(dirname($to))) {
+ rename($from,$to);
+ }
+ }
+
+ function try_dir($todir) {
+ if (! file_exists($todir)) {
+ mkdir($todir,0700);
+ }
+ }
+
+ $to="$fromdir/$tofile";
+ $todir=dirname($to);
+ $tofile=basename($to);
+
+ print "$fromdir / $fromfile -> $todir / $tofile\n\n";
+
+ try_rename("$fromdir/$fromfile","$todir/$tofile");
+ try_dir("$todir/.log");
+ try_rename("$fromdir/.log/$fromfile","$todir/.log/$tofile");
+ try_dir("$todir/.note");
+ try_rename("$fromdir/.note/$fromfile","$todir/.note/$tofile");
+ try_dir("$todir/.lock");
+ try_rename("$fromdir/.lock/$fromfile","$todir/.lock/$tofile");
+ try_dir("$todir/.bak");
+ for($i=0;$i<=$GLOBALS[gblNumBackups];$i++) {
+ try_rename("$fromdir/.bak/$i/$fromfile","$todir/.bak/$i/$tofile");
}
}
+
//////////////////////////////////////////////////////////////////
// recursivly delete directory
@@ -1348,14 +1393,7 @@
if ( $CONFIRM != "on" ) break ;
Logit("$fsDir/$FN","renamed $FN to $NEWNAME");
- safe_rename("$fsDir/$FN","$fsDir/$NEWNAME");
- safe_rename("$fsDir/.log/$FN","$fsDir/.log/$NEWNAME");
- safe_rename("$fsDir/.note/$FN","$fsDir/.note/$NEWNAME");
- safe_rename("$fsDir/.lock/$FN","$fsDir/.lock/$NEWNAME");
- for($i=0;$i<=$GLOBALS[gblNumBackups];$i++) {
- safe_rename("$fsDir/.bak/$i/$FN","$fsDir/.bak/$i/$NEWNAME");
- }
-
+ safe_rename($fsDir,$FN,$NEWNAME);
break ;
case "NOTE" :
@@ -1401,7 +1439,7 @@
case "E" :
$F=stripSlashes($F);
// detail of $relDir/$F
- if (is_file("$gblFsRoot/$relDir/$F")) DetailPage($gblFsRoot, $relDir, $F) ;
+ if (is_file("$gblFsRoot/$relDir/$F") || is_dir("$gblFsRoot/$relDir/$F")) DetailPage($gblFsRoot, $relDir, $F) ;
exit ;
case "C" :
$F=stripSlashes($F);