--- docman.php	2002/07/29 13:53:56	1.31
+++ docman.php	2002/07/29 14:17:05	1.32
@@ -244,8 +244,10 @@
 		include("$html/DetailPage-undelete.html");
 		include("$html/DetailPage-rename.html");
 
-	} elseif (check_perm($relDir.$fn,$gblPermNote)) {
-			include("$html/DetailPage-note.html");
+	}
+	
+	if (check_perm($relDir.$fn,$gblPermNote)) {
+		include("$html/DetailPage-note.html");
 	}
 
 	print "</FORM>";
@@ -533,6 +535,7 @@
 	global $gblEditable, $gblIcon, $gblModDays, $webRoot, $gblHide,
 		$gblIgnoreUnknownFileType, $gblRepositoryDir,
 		$gblLogin, $gblUserName, $gblDateFmt, $gblTimeFmt,
+		$gblPermNote,
 		$fsRealmDir, $realm, $realm_sep,
 		$html, $realm_config,
 		$HTTP_GET_VARS, $HTTP_SERVER_VARS;
@@ -607,8 +610,7 @@
 	$text .= "<br>Examine list of files <a href=\"$self?A=Ch1\">changed in last day</a> or <a href=\"$self?A=Ch\">all changes</a>.";
 	StartHTML("(Navigate)",$text) ;
 
-	echo "<TABLE BORDER=0 CELLPADDING=2 
-		CELLSPACING=3 WIDTH=\"100%\">" ;
+	print "<TABLE BORDER=0 CELLPADDING=2 CELLSPACING=3 WIDTH=\"100%\">" ;
 
 	// updir (parent) bar	
 	if (chopsl($fsDir) != chopsl($fsRoot)) {
@@ -626,7 +628,8 @@
 		return $out;
 	}
 
-	if (! HTTP_GET_VAR("dsort")) $dsort = "name"; // default directory sort
+	$dsort = HTTP_GET_VAR("dsort");
+	if (! isset($dsort)) $dsort = "name"; // default directory sort
 
 	$dsort_arr = array(
 		"name" => array ("rname", "note"),
@@ -635,7 +638,8 @@
 		"rnote" => array ("name", "note")
 		);
 
-	if (! HTTP_GET_VAR("fsort")) $fsort = "name"; // default directory sort
+	$fsort = HTTP_GET_VAR("fsort");
+	if (! isset($fsort)) $fsort = "name"; // default directory sort
 
 	$fsort_arr = array(
 		"name" => array ("rname", "note", "date", "size"),
@@ -697,6 +701,12 @@
 			}
 	
 			$dir_url=$self."?D=".urlencode(chopsl($relDir)."/".$dir);
+			if (check_perm($relDir.$dir,$gblPermNote)) {
+				$note_html="<a href=\"$info_url#note\">".$gblIcon("note")."</a>".$dirNote[$key];
+			} else {
+				$note_html=$dirNote[$key];
+			}
+
 			include("$html/Navigate-dirEntry.html");
 
 		}  // iterate over dirs
@@ -777,7 +787,11 @@
 			$file_url_html .= substr($file,5,strlen($file)-5) . "</a> <a href=\"$info_url#undelete\"><SPAN CLASS=deleted TITLE=\"deleted\">deleted</span></a>";
 		}
 
-		$note_html="<a href=\"$info_url#note\">".$gblIcon("note")."</a>".ReadNote($path);
+		if (check_perm($relDir.$file,$gblPermNote)) {
+			$note_html="<a href=\"$info_url#note\">".$gblIcon("note")."</a>".$fileNote[$key];
+		} else {
+			$note_html=$fileNote[$key];
+		}
 
 		$ext = strtolower(strrchr($file,".")) ;
 
@@ -818,61 +832,31 @@
 
 	  }  // iterate over files
 	} else {  // end if no files
-?>
- <TR><TD></TD><TD COLSPAN=5 CLASS=LST>
-  No files in this directory
- </TD></TR>
-<?
+		include("$html/Navigate-noFiles.html");
 	}
 
 	if ($emptyDir && $relDir != "") {
-?>
-
-<FORM METHOD="POST" ACTION="<?= $self ?>">
- <TR><TD></TD><TD COLSPAN=5 CLASS=BAR>
-  <INPUT TYPE="HIDDEN" NAME="DIR" VALUE="<?= $relDir ?>">
-  OK TO DELETE THIS EMPTY FOLDER?
-  <INPUT TYPE="CHECKBOX" NAME="CONFIRM"> 
-  <INPUT TYPE="SUBMIT" NAME="POSTACTION" VALUE="DELETE">
- </TD></TR>
-</FORM>
-
-<?php
+		include("$html/Navigate-emptyDir.html");
 	} // end if emptyDir
-?>
 
-<TR><TD></TD><TD COLSPAN=5><HR></TD></TR>
+	include("$html/Navigate-hr.html");	
+
+	if (file_exists("$fsRealmDir/$realm".$realm_sep."info.inc")) {
+		print "<TR><TD></TD><TD COLSPAN=5>";
+		include("$fsRealmDir/$realm".$realm_sep."info.inc");
+		print "</TD></TR>";
+		include("$html/Navigate-hr.html");	
+	} elseif (file_exists("$gblRepositoryDir/.info.inc")) {
+		print "<TR><TD></TD><TD COLSPAN=5>";
+		include("$gblRepositoryDir/.info.inc");
+		print "</TD></TR>";
+		include("$html/Navigate-hr.html");	
+	}
 
-<?
+	include("$html/Navigate-createNew.html");
 
-if (file_exists("$fsRealmDir/$realm".$realm_sep."info.inc")) {
-	print "<TR><TD></TD><TD COLSPAN=5>";
-	include("$fsRealmDir/$realm".$realm_sep."info.inc");
-	print "</TD></TR><TR><TD></TD><TD COLSPAN=5><HR></TD></TR>";
-} elseif (file_exists("$gblRepositoryDir/.info.inc")) {
-	print "<TR><TD></TD><TD COLSPAN=5>";
-	include("$gblRepositoryDir/.info.inc");
-	print "</TD></TR><TR><TD></TD><TD COLSPAN=5><HR></TD></TR>";
-}
-
-
-?>
-
-<FORM METHOD="POST" ACTION="<?= $self ?>">
-<TR><TD></TD><TD COLSPAN=5 CLASS=BAR>CREATE NEW
- <INPUT TYPE="RADIO" NAME="T" VALUE="D" CHECKED>DIRECTORY -OR- 
- <INPUT TYPE="RADIO" NAME="T" VALUE="F">FILE : &nbsp;&nbsp;
- <NOBR>NAME <INPUT TYPE="TEXT" NAME="FN" SIZE=14>
- <INPUT TYPE="HIDDEN" NAME="POSTACTION" VALUE="CREATE">
- <INPUT TYPE="HIDDEN" NAME="DIR" VALUE="<?= $relDir ?>">
- <INPUT TYPE="SUBMIT" VALUE="CREATE" NAME="CREATE">
- </NOBR> 
- <NOBR>OR <A HREF="<?= $self ?>?A=U&D=<?= urlencode($relDir) ?>">UPLOAD</A> A FILE</NOBR>
-</TD></TR>
-</FORM>
-</TABLE>
+	print "</TABLE>";
 
-<?php
 	EndHTML() ;
 } // end function Navigate