X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=ctdlphp%2Fctdlelements.php;h=e03b0783213f78398b89fe7c1e4dec4b0547a1d5;hb=fa2dd842abb5feedea3e2253255722fcaecc3c6f;hp=efee340007e14695e77e351c35eba94428d286a3;hpb=94912e04015f434aa68951d24a34a078771a8384;p=citadel.git

diff --git a/ctdlphp/ctdlelements.php b/ctdlphp/ctdlelements.php
index efee34000..e03b07832 100644
--- a/ctdlphp/ctdlelements.php
+++ b/ctdlphp/ctdlelements.php
@@ -26,17 +26,62 @@ 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 (isset($fields["rfca"]) && 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 (isset($fields["rcpt"]) && strlen($fields["rcpt"]) > 0) {
+		echo " to " . htmlspecialchars($fields["rcpt"]) ;
+	}
+	echo "</I></B><BR>\n" ;
+
+	// Subject
+	if (strlen($fields["subj"]) > 0) {
+		echo"<i>Subject: " .
+			htmlspecialchars($fields["subj"]) .
+			"</i><BR>\n" ;
+	}
 
 	// Do message text
-	echo $fields["text"] . "<BR>";
+	if ($fields['formatet_text'] != "")
+		echo $fields['formatet_text'] . "<BR>";
+	else 
+		echo $fields["text"] . "<BR>";
 
 	echo '</TD></TR></TABLE><BR>' ;
 }
 
+function get_message_partlist($msgnum) {
+
+	// Fetch the message from the server
+	list($ok, $response, $fields) = ctdl_fetch_message($msgnum);
+
+	// Bail out gracefully if the message isn't there.
+	if (!$ok) {
+		echo "Error: " . htmlspecialchars($response) . "<BR>" ;
+		return false;
+	}
+	if (isset($fields['part']))
+	{
+		$parts = explode('|', $fields['part']);
+		print_r($parts);
+		return $parts;
+
+	}
+	return false;
+}
+
 
 
 ?>