From: Art Cancro <ajc@citadel.org>
Date: Sat, 22 Nov 2003 04:33:22 +0000 (+0000)
Subject: * fleshed out the message headers a bit
X-Git-Tag: v7.86~5694
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=7ebbdfce57fed408081f1623e98f0ef10ebd3020

* fleshed out the message headers a bit
---

diff --git a/ctdlphp/ChangeLog b/ctdlphp/ChangeLog
index 6155da42b..2156daf17 100644
--- a/ctdlphp/ChangeLog
+++ b/ctdlphp/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 1.20  2003/11/22 04:33:22  ajc
+ * fleshed out the message headers a bit
+
  Revision 1.19  2003/11/21 18:22:19  ajc
  * Replaced the two-second sleep (and associated race condition) for the
    session proxy to start, with a loop that attempts connection ten times
@@ -83,4 +86,3 @@
 
  Revision 1.1  2003/10/31 03:47:13  ajc
  * Initial CVS import
-
diff --git a/ctdlphp/ctdlelements.php b/ctdlphp/ctdlelements.php
index efee34000..a60a7b852 100644
--- a/ctdlphp/ctdlelements.php
+++ b/ctdlphp/ctdlelements.php
@@ -26,10 +26,25 @@ function display_message($msgnum) {
 	}
 
 	// Begin header
-	echo "<B><I>" .
-		strftime("%b %d %Y %I:%M%p ", $fields["time"]) .
-		" from " . htmlspecialchars($fields["from"]) .
-		"</I></B><BR>\n" ;
+	echo "<B><I>" ;
+	echo strftime("%b %d %Y %I:%M%p ", $fields["time"]) ;
+	echo " from " . htmlspecialchars($fields["from"]) ;
+	
+	if (strlen($fields["rfca"]) > 0) {
+		echo " &lt;" . htmlspecialchars($fields["rfca"]) . "&gt;" ;
+	}
+	else if ( (strlen($fields["node"]) > 0) 
+	     && (strcasecmp($fields["node"], $_SESSION["serv_nodename"])) ) {
+		echo " @" . htmlspecialchars($fields["node"]) ;
+		if (strlen($fields["hnod"]) > 0) {
+			echo " (" . htmlspecialchars($fields["hnod"]) . ")" ;
+		}
+	}
+
+	if (strlen($fields["rcpt"]) > 0) {
+		echo " to " . htmlspecialchars($fields["rcpt"]) ;
+	}
+	echo "</I></B><BR>\n" ;
 
 	// Do message text
 	echo $fields["text"] . "<BR>";
diff --git a/ctdlphp/ctdlheader.php b/ctdlphp/ctdlheader.php
index 635df8be4..94f14417d 100644
--- a/ctdlphp/ctdlheader.php
+++ b/ctdlphp/ctdlheader.php
@@ -53,12 +53,16 @@ LITERAL;
 	alink="#DD0000"
 >
 
-<div align=right>
-<A HREF="logout.php">Log out</A>
-</div>
-<HR>
 
 LITERAL;
+
+	echo '<TABLE BORDER=0 WIDTH=100%>';
+	echo '<TR>';
+	echo '<TD>' . $_SESSION["serv_humannode"] . '</TD>' ;
+	echo '<TD>' . $_SESSION["username"] . '</TD>' ;
+	echo '<TD>' . $_SESSION["room"] . '</TD>' ;
+	echo '<TD ALIGN=RIGHT><A HREF="logout.php">Log out</A></TD>' ;
+	echo '</TR></TABLE><HR>';
 }