From 9bebe8a4ce2d41e7730759ddc9fedd35d36625b8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Mon, 9 Aug 2010 21:13:39 +0000 Subject: [PATCH] * fix ROOM:INFO:PRINT_NAME * add the_mgt's templatizations to roombanner.html --- webcit/roomlist.c | 10 +++++++++- webcit/static/t/roombanner.html | 21 +++++++++++++-------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/webcit/roomlist.c b/webcit/roomlist.c index c692236f0..f4edff91b 100644 --- a/webcit/roomlist.c +++ b/webcit/roomlist.c @@ -527,6 +527,14 @@ void tmplput_ROOM_NAME(StrBuf *Target, WCTemplputParams *TP) { folder *Folder = (folder *)CTX; + if (Folder == NULL) + { + wcsession *WCC = WC; + + if (WCC == NULL) + return; + Folder = &WCC->CurRoom; + } StrBufAppendTemplate(Target, TP, Folder->name, 0); } void tmplput_ROOM_BASENAME(StrBuf *Target, WCTemplputParams *TP) @@ -838,7 +846,7 @@ InitModule_ROOMLIST RegisterNamespace("ROOM:INFO:FLOORID", 0, 1, tmplput_ROOM_FLOORID, NULL, CTX_ROOMS); RegisterNamespace("ROOM:INFO:NAME", 0, 1, tmplput_ROOM_NAME, NULL, CTX_ROOMS); - RegisterNamespace("ROOM:INFO:PRINT_NAME", 0, 1, tmplput_ROOM_NAME, NULL, CTX_ROOMS);/// TODO! + RegisterNamespace("ROOM:INFO:PRINT_NAME", 0, 1, tmplput_ROOM_NAME, NULL, CTX_NONE); RegisterNamespace("ROOM:INFO:BASENAME", 0, 1, tmplput_ROOM_BASENAME, NULL, CTX_ROOMS); RegisterNamespace("ROOM:INFO:LEVELNTIMES", 1, 2, tmplput_ROOM_LEVEL_N_TIMES, NULL, CTX_ROOMS); diff --git a/webcit/static/t/roombanner.html b/webcit/static/t/roombanner.html index 7bcee6b6b..c7963fec1 100644 --- a/webcit/static/t/roombanner.html +++ b/webcit/static/t/roombanner.html @@ -2,22 +2,27 @@