From f09450da02a4925076392bf133fee33cc78c1467 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Tue, 7 Aug 2012 22:34:57 +0200
Subject: [PATCH] SMTP-Queue: display the SMTP-State

---
 webcit/static/t/view_mailq/header.html          |  6 +++++-
 webcit/static/t/who/activesmtpsessions_one.html |  3 +++
 webcit/who.c                                    | 12 +++++++++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/webcit/static/t/view_mailq/header.html b/webcit/static/t/view_mailq/header.html
index da327ea27..8b078a849 100644
--- a/webcit/static/t/view_mailq/header.html
+++ b/webcit/static/t/view_mailq/header.html
@@ -31,7 +31,11 @@
 </div>
 &nbsp;
 
-<?=("box_begin_1")><?_("Currently active mail delivery jobs; Remote Sites:")><?=("box_begin_2")>
+<?=("box_begin_1")>
+<?_("Currently active mail delivery jobs")> ; 
+<?_("Remote Sites:")>;&nbsp 
+<?_("Status:")>;
+<?=("box_begin_2")>
 <div align="center">
 <?=("who_active_smtpsessions")>
 </div>
diff --git a/webcit/static/t/who/activesmtpsessions_one.html b/webcit/static/t/who/activesmtpsessions_one.html
index e495fcb13..c11c46330 100644
--- a/webcit/static/t/who/activesmtpsessions_one.html
+++ b/webcit/static/t/who/activesmtpsessions_one.html
@@ -1,4 +1,7 @@
 <tr class="<?ITERATE:ODDEVEN>">
+	<td class="smtpstate_col">
+	  <?WHO:USERAGENT("X")><br>
+	</td>
 	<!-- hostname -->
 	<td class="host_col">
 		<?WHO:HOST("X")>
diff --git a/webcit/who.c b/webcit/who.c
index ac30cc72d..de0160e7f 100644
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -5,6 +5,7 @@ typedef struct UserStateStruct {
 	StrBuf *UserName;
 	StrBuf *Room;
 	StrBuf *Host;
+	StrBuf *UserAgent;
 	StrBuf *RealRoom;
 	StrBuf *RealHost;
 	long LastActive;
@@ -22,6 +23,7 @@ void DestroyUserStruct(void *vUser)
 	FreeStrBuf(&User->Host);
 	FreeStrBuf(&User->RealRoom);
 	FreeStrBuf(&User->RealHost);
+	FreeStrBuf(&User->UserAgent);
 	free(User);
 }
 
@@ -67,7 +69,8 @@ int GetWholistSection(HashList *List, time_t now, StrBuf *Buf, const char *Filte
 			User->Host = NewStrBufPlain(NULL, BufLen);
 			StrBufExtract_NextToken(User->Host, Buf, &Pos, '|');
 
-			StrBufSkip_NTokenS(Buf, &Pos, '|', 1);
+			User->UserAgent = NewStrBufPlain(NULL, BufLen);
+			StrBufExtract_NextToken(User->UserAgent, Buf, &Pos, '|');
 
 			User->LastActive = StrBufExtractNext_long(Buf, &Pos, '|');
 			StrBufSkip_NTokenS(Buf, &Pos, '|', 3);
@@ -218,6 +221,12 @@ void tmplput_who_username(StrBuf *Target, WCTemplputParams *TP)
 	StrBufAppendTemplate(Target, TP, User->UserName, 0);
 }
 
+void tmplput_who_UserAgent(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
+	StrBufAppendTemplate(Target, TP, User->UserAgent, 0);
+}
+
 void tmplput_who_room(StrBuf *Target, WCTemplputParams *TP)
 {
 	UserStateStruct *User = (UserStateStruct*) CTX(CTX_WHO);
@@ -306,6 +315,7 @@ InitModule_WHO
 	RegisterIterator("WHOLIST", 1, NULL, GetWholistHash, NULL, DeleteWholistHash, CTX_WHO, CTX_NONE, IT_NOFLAG);
 
 	RegisterNamespace("WHO:NAME",        0, 1, tmplput_who_username, NULL, CTX_WHO);
+	RegisterNamespace("WHO:USERAGENT",   0, 1, tmplput_who_UserAgent, NULL, CTX_WHO);
 	RegisterNamespace("WHO:ROOM",        0, 1, tmplput_who_room, NULL, CTX_WHO);
 	RegisterNamespace("WHO:HOST",        0, 1, tmplput_who_host, NULL, CTX_WHO);
 	RegisterNamespace("WHO:REALROOM",    0, 1, tmplput_who_realroom, NULL, CTX_WHO);
-- 
2.30.2