\n";
$bakcount = 0; // start from 0, skip fist backup (it's current)
while ($e = array_shift($logarr)) {
if (strstr($e[4],"upload")) {
if (file_exists("$bakdir/$bakcount/$name")) {
- $e[4]="$e[4]";
+ $e[4]="$e[4]";
}
$bakcount++;
}
@@ -637,15 +630,11 @@
function Navigate($fsRoot,$relDir) {
- global $gblEditable, $gblIcon, $gblModDays ;
+ global $gblEditable, $gblIcon, $gblModDays, $webRoot ;
$self = $GLOBALS["PHP_SELF"] ;
- if (isset($GLOBALS["HTTPS"]) && $GLOBALS["HTTPS"] == "on") {
- $webRoot = "https://" . $GLOBALS["HTTP_HOST"] ;
- } else {
- $webRoot = "http://" . $GLOBALS["HTTP_HOST"] ;
- }
- $fsDir = $fsRoot . $relDir . "/" ; // current directory
+
+ $fsDir = $fsRoot . $relDir . "/" ; // current directory
if (!is_dir($fsDir)) Error("Dir not found",$relDir) ;
@@ -710,18 +699,23 @@
sort($dirList) ;
?>
- |
DIRECTORY NAME |
+ | DIRECTORY NAME | DIRECTORY NOTE |
" . $dir . "/" ;
+ $note_html="".$gblIcon("note")."".ReadNote($fsDir.$dir);
?>
- |
- |
+|
+
+ |
+ |
+ |
NAME
-
+
+
OR UPLOAD A FILE
@@ -920,29 +915,6 @@
//////////////////////////////////////////////////////////////////
-function CreateHash($user, $pw) {
-
- global $gblHash ; // hash function to use
-
- if ($user == "" || $pw == "") {
- $text = "either no password or no username supplied" ;
- Error("Create Hash",$text) ;
- }
- $title = "(Create Hash)" ;
- StartHTML($title) ;
- echo "" ;
- echo "
Copy the value below and paste it " ;
- echo "into the
value for \$gblPw in the source of " ;
- echo "this file
" . $gblHash($user.$pw) ;
- echo "
Hash function: " . $gblHash ;
- echo "
" ;
- EndHTML() ;
- exit ;
-
-} // end function CreateHash
-
-//////////////////////////////////////////////////////////////////
-
function NoEntry() {
$user = $GLOBALS["PHP_AUTH_USER"] ;
@@ -952,20 +924,7 @@
$title = "(401 Unauthorized)" ;
$text = "No trespassing !" ;
StartHTML($title,$text) ;
-?>
-
-
- $to\n";
+ if (file_exists($from) && is_writeable(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
@@ -1179,13 +1166,42 @@
// forks before authentication: style sheet and hash
// creation if password not yet set.
if ($STYLE == "get") { CSS() ; exit ; }
- if ($HASH != "") {
- CreateHash($USER, $PW) ;
- exit ;
+
+ $htusers_file=dirname($SCRIPT_FILENAME)."/.htusers";
+ if (! file_exists($htusers_file)) {
+ if (is_writeable(dirname($SCRIPT_FILENAME))) {
+ $htusers=fopen($htusers_file,"a+");
+ fputs($htusers,"# Change owner of $htusers_file to root !!\n");
+ fputs($htusers,"demo:full name:[md5_hash|auth_*]:e-mail\n");
+ fclose($htusers);
+ Error("Proto user file created!","Please edit $htusers_file and set it correct permissions (not writable by web server as it is now!). You can add users using adduser.pl script!");
+ exit;
+ } else {
+ Error("Can't create proto user file!","Please make directory ".dirname($htusers_file)." writable or create .htusers file by hand using adduser.pl script!");
+ exit;
+ }
}
+ $htusers=fopen($htusers_file,"r");
+ while($user = fgetcsv($htusers,255,":")) {
+ if ($user[0] == $GLOBALS["PHP_AUTH_USER"]) {
+ $gblUserName=$user[1];
+ $gblPw=$user[2];
+ if (substr($gblPw,0,5) == "auth_" && file_exists("$gblIncDir/$gblPw.php")) {
+ require("$gblIncDir/$gblPw.php");
+ if ($gblPw($user)) {
+ $gblPw=md5($PHP_AUTH_USER.$PHP_AUTH_PW);
+ } else {
+ $gblPw="error".md5($PHP_AUTH_USER.$PHP_AUTH_PW);
+ }
+ }
+ $gblEmail=$user[3];
+ continue ;
+ }
+ }
+ fclose($htusers);
- // authentication if $gblAuth == true
- if ( $gblAuth && $gblHash($PHP_AUTH_USER.$PHP_AUTH_PW) != $gblPw ||
+ // authentication failure
+ if ( md5($PHP_AUTH_USER.$PHP_AUTH_PW) != $gblPw ||
isset($relogin) && $gblPw == $relogin ) {
header("WWW-authenticate: basic realm=\"$HTTP_HOST\"") ;
header("HTTP/1.0 401 Unauthorized") ;
@@ -1199,6 +1215,8 @@
$relDir = urldecode($D) ; // then use GET
}
+ $relDir=stripSlashes($relDir);
+
if ($relDir == "/") $relDir = "" ;
// default : website root = ""
@@ -1224,8 +1242,19 @@
$fsDir = $gblFsRoot . $relDir ; // current directory
if ( !is_dir($fsDir) ) Error("Dir not found",$relDir) ;
+ if (isset($GLOBALS["HTTPS"]) && $GLOBALS["HTTPS"] == "on") {
+ $webRoot = "https://";
+ } else {
+ $webRoot = "http://";
+ }
+ $webRoot .= $GLOBALS["HTTP_HOST"] . $relScriptDir;
+
$FN=stripSlashes($FN);
+ if (file_exists("$fsScriptDir/.docman.conf")) {
+ include("$fsScriptDir/.docman.conf");
+ }
+
switch ($POSTACTION) {
case "UPLOAD" :
if (!is_writeable($fsDir)) Error("Write denied",$relDir) ;
@@ -1301,7 +1330,7 @@
// this functionality is doubled in DetailView().
// better keep it here altogether
// chmod perms to $gblFilePerms
- if ( file_exists($path) && !is_writable($path) )
+ if ( file_exists($path) && !is_writeable($path) )
Error("File not writable", $relPath) ;
$fh = fopen($path, "w+") ;
if ($fh) {
@@ -1373,14 +1402,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" :
@@ -1426,7 +1448,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);
@@ -1437,7 +1459,7 @@
// checkout
Lock("$gblFsRoot/$relDir/$F");
header("Content-Disposition: attachment; filename=$F" );
- Header("Location: ".urlpath("$relDir/$F"));
+ Header("Location: $webRoot".urlpath("$relDir/$F"));
exit;
case "Ci" :
$F=stripSlashes($F);
@@ -1454,7 +1476,7 @@
// view
LogIt("$gblFsRoot/$relDir/$F","viewed");
header("Content-Disposition: attachment; filename=$F" );
- Header("Location: ".urlpath("$relDir/$F"));
+ Header("Location: $webRoot".urlpath("$relDir/$F"));
exit;
case "Ch" :
StartHTML("(File changes)","All changes chronologicaly...");