Long and short headers

diff --git a/daphne/includes.hpp b/daphne/includes.hpp
index b3c1c75d27c83d3ff1be0f3b75062ca1b5f3fedb..200f13cc588f2ee48fe0952ec434bd853fc08611 100644 (file)
--- a/daphne/includes.hpp
+++ b/daphne/includes.hpp
@@ -300,6 +300,10 @@ void load_roomlist(RoomTree *tree, CitClient *citsock);
 void variformat_to_html(wxString& outputbuf,
                         wxString inputbuf,
                         bool add_header_and_footer);
+wxString generate_html_header(CitMessage *, wxString, wxString);
+
+
+
 void cleanup(int);
 
 

diff --git a/daphne/roomview.cpp b/daphne/roomview.cpp
index 6ae41ca09fd63d79e93448ecbb9e121f8688384f..80f387ccb56d6ab2d41f6d671e4e97b3f4d7e809 100644 (file)
--- a/daphne/roomview.cpp
+++ b/daphne/roomview.cpp
@@ -1,5 +1,4 @@
 #include "includes.hpp"
-#include <time.h>
 
 
 enum {
@@ -219,16 +218,8 @@ void RoomView::do_readloop(wxString readcmd) {
                sendcmd = "MSG0 " + buf;
                message = new CitMessage(citsock, sendcmd, ThisRoom);
 
-               allmsgs += "&nbsp;&nbsp;&nbsp;<H3>";
-               allmsgs += asctime(localtime(&message->timestamp));
-               allmsgs += " from " + message->author;
-               if (message->room.CmpNoCase(ThisRoom))
-                       allmsgs += " in " + message->room + "> ";
-               if (message->nodename.CmpNoCase(citsock->NodeName))
-                       allmsgs += " @ " + message->nodename;
-               if (message->recipient.Length() > 0)
-                       allmsgs += " to " + message->recipient;
-               allmsgs += "</h3><br>";
+               allmsgs += generate_html_header(message, ThisRoom,
+                                               citsock->NodeName);
                allmsgs += message->msgtext;
 
                delete message;

diff --git a/daphne/utils.cpp b/daphne/utils.cpp
index c4db15295b0d2aa75286dd6bac0c5de9eb357bc6..c54381eb1245e31a5f5df4733ab7156f2321bd21 100644 (file)
--- a/daphne/utils.cpp
+++ b/daphne/utils.cpp
@@ -1,6 +1,7 @@
 // utility functions not belonging to any particular class
 
 #include "includes.hpp"
+#include <time.h>
 
 
 // Extract a field from a string returned by the server
@@ -61,6 +62,46 @@ void variformat_to_html(wxString& outputbuf,
 }
 
 
+wxString generate_html_header(CitMessage *message,
+                       wxString ThisRoom,
+                       wxString ThisNode) {
+
+       wxString ret;
+       int verbosity = 3;
+
+       switch(verbosity) {
+
+       case 2:
+               ret = "&nbsp;&nbsp;&nbsp;<H3>";
+               ret += asctime(localtime(&message->timestamp));
+               ret += " from " + message->author;
+               if (message->room.CmpNoCase(ThisRoom))
+                       ret += " in " + message->room + "> ";
+               if (message->nodename.CmpNoCase(ThisNode))
+                       ret += " @ " + message->nodename;
+               if (message->recipient.Length() > 0)
+                       ret += " to " + message->recipient;
+               ret += "</h3><br>";
+               return ret;
+
+       case 3:
+               ret = "" ;
+               ret += "<TT>Date: </TT>";
+               ret += asctime(localtime(&message->timestamp));
+               ret += "<BR>";
+               ret += "<TT>From: </TT>" + message->author;
+               ret += " @ " + message->nodename + "<BR>";
+               if (message->recipient.Length() > 0)
+                       ret += "<TT>To:   </TT>" + message->recipient + "<BR>";
+               ret += "<BR>\n";
+               return ret;
+               
+       }
+}
+
+
+
+
 
 
 // Generic exit stuff