From 3ba044b14cdbf5270beed99b44d202abf6b3fb16 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Sun, 29 Aug 2010 16:56:53 +0000
Subject: [PATCH] * used wrong conditionals, fixed * add conditional which was
 done wrong via SUBST

---
 webcit/static/t/who/section.html         | 3 +--
 webcit/static/t/who/summary_section.html | 6 +++---
 webcit/who.c                             | 6 ++++++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/webcit/static/t/who/section.html b/webcit/static/t/who/section.html
index cfa97bd6a..e5896bf09 100644
--- a/webcit/static/t/who/section.html
+++ b/webcit/static/t/who/section.html
@@ -26,7 +26,6 @@
    <td class="host_col">
 <!-- hostname -->
 <?WHO:HOST("X")>
-<?!("COND:SUBST", 8, "WHO:REALHOST", "")> <br /><i> <?WHO:REALHOST("X")></i>
-<?!("X", 8)>
+<?!("WHO:REALHOST", 8)> <br /><i> <?WHO:REALHOST("X")></i><?!("X", 8)>
 </td>
 </tr>
diff --git a/webcit/static/t/who/summary_section.html b/webcit/static/t/who/summary_section.html
index 94fea8215..540da8ec8 100644
--- a/webcit/static/t/who/summary_section.html
+++ b/webcit/static/t/who/summary_section.html
@@ -5,13 +5,13 @@
 </td>
 <!-- idle flag -->
 <td width="5%">
-<?!("COND:SUBST", 4, "WHO:IDLE")>  <img align="middle" src="static/inactiveuser_24x.gif" alt="(<?_("idle since")>s <?WHO:IDLESINCE> <?_("Minutes")>)" border="0" />  <?!("X", 4)>
-<??("COND:SUBST", 5, "WHO:IDLE")>  <img align="middle" src="static/activeuser_24x.gif" alt="(<?_("active")>)" border="0" />  <?!("X", 5)>
+<?!("WHO:IDLE", 4)>  <img align="middle" src="static/inactiveuser_24x.gif" alt="(<?_("idle since")>s <?WHO:IDLESINCE> <?_("Minutes")>)" border="0" />  <?!("X", 4)>
+<??("WHO:IDLE", 5)>  <img align="middle" src="static/activeuser_24x.gif" alt="(<?_("active")>)" border="0" />  <?!("X", 5)>
 </td>
 <td>
 <!--  username (link to user bio/photo page)  -->
 <a href="showuser?who=<?WHO:NAME("U")>"> <?WHO:NAME("X")></a> 
-<??("COND:SUBST", 6, "WHO:NSESSIONS", 1)>[<?WHO:NSESSIONS>] </a><?!("X", 6)>
+<??("WHO:NSESSIONS", 6, 0, 1)>[<?WHO:NSESSIONS>] </a><?!("X", 6)>
 <!-- room -->
 </td><td>
 <?WHO:ROOM>
diff --git a/webcit/who.c b/webcit/who.c
index 692481e38..cb9cfd4b2 100644
--- a/webcit/who.c
+++ b/webcit/who.c
@@ -274,6 +274,11 @@ void tmplput_who_realhost(StrBuf *Target, WCTemplputParams *TP)
 	UserStateStruct *User = (UserStateStruct*) CTX;
 	StrBufAppendTemplate(Target, TP, User->RealHost, 0);
 }
+int conditional_who_realhost(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserStateStruct *User = (UserStateStruct*) CTX;
+	return StrLength(User->RealHost) > 0;
+}
 
 void tmplput_who_lastactive(StrBuf *Target, WCTemplputParams *TP)
 {
@@ -343,4 +348,5 @@ InitModule_WHO
 	RegisterConditional(HKEY("WHO:NSESSIONS"), 1, conditional_who_nsessions, CTX_WHO);
 	RegisterConditional(HKEY("WHO:ISME"),      1, conditional_who_isme, CTX_WHO);
 	RegisterConditional(HKEY("WHO:REALROOM"),  1, conditional_who_realroom, CTX_WHO);
+	RegisterConditional(HKEY("WHO:REALHOST"),  1, conditional_who_realhost, CTX_WHO);
 }
-- 
2.30.2