From: Wilfried Goesgens Date: Mon, 16 Jul 2012 12:56:08 +0000 (+0200) Subject: THISROOM ROOM:INFO:PRINT_NAME ROOMNAME - all are now THISROOM:NAME; they were all... X-Git-Tag: v8.13~1 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=6aecb65445185e83dbaa23263cbe3e452f2a0183 THISROOM ROOM:INFO:PRINT_NAME ROOMNAME - all are now THISROOM:NAME; they were all the same anyways. --- diff --git a/webcit/roomtokens.c b/webcit/roomtokens.c index eecc16236..c7eec1257 100644 --- a/webcit/roomtokens.c +++ b/webcit/roomtokens.c @@ -187,14 +187,7 @@ int ConditionalFloorIsVirtual(StrBuf *Target, WCTemplputParams *TP) *******************************************************************************/ /**** Name ******/ - -void tmplput_RoomName(StrBuf *Target, WCTemplputParams *TP) -{ - StrBufAppendTemplate(Target, TP, WC->CurRoom.name, 0); -} - - -void tmplput_current_room(StrBuf *Target, WCTemplputParams *TP) +void tmplput_ThisRoom(StrBuf *Target, WCTemplputParams *TP) { wcsession *WCC = WC; @@ -211,14 +204,6 @@ 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); } @@ -605,10 +590,9 @@ InitModule_ROOMTOKENS /**** Room... ******/ /**** Name ******/ - RegisterNamespace("ROOMNAME", 0, 1, tmplput_RoomName, NULL, CTX_NONE); - RegisterNamespace("THISROOM", 0, 1, tmplput_current_room, NULL, CTX_NONE); + RegisterNamespace("THISROOM:NAME", 0, 1, tmplput_ThisRoom, NULL, CTX_NONE); + RegisterNamespace("ROOM:INFO:NAME", 0, 1, tmplput_ROOM_NAME, NULL, CTX_ROOMS); - 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); RegisterConditional(HKEY("COND:ROOM:INFO:IS_INBOX"), 0, ConditionalRoomIsInbox, CTX_ROOMS); diff --git a/webcit/static/t/head.html b/webcit/static/t/head.html index 2d6e6b3cc..fee9ca6eb 100644 --- a/webcit/static/t/head.html +++ b/webcit/static/t/head.html @@ -2,7 +2,7 @@ "http://www.w3.org/TR/html4/loose.dtd"> - <?THISROOM> - <?SERV:HUMANNODE> + <?THISROOM:NAME> - <?SERV:HUMANNODE> diff --git a/webcit/static/t/mailsummary_json.html b/webcit/static/t/mailsummary_json.html index d6b1c3c34..4329d3ab0 100644 --- a/webcit/static/t/mailsummary_json.html +++ b/webcit/static/t/mailsummary_json.html @@ -1,6 +1,6 @@ { "nummsgs": , "startmsg": , -"roomname": "", +"roomname": "", "msgs": [ ] } diff --git a/webcit/static/t/room/edit/tab_access.html b/webcit/static/t/room/edit/tab_access.html index 326908351..ad5594988 100644 --- a/webcit/static/t/room/edit/tab_access.html +++ b/webcit/static/t/room/edit/tab_access.html @@ -8,7 +8,7 @@
- "> + "> @@ -24,7 +24,7 @@ - "> + ">
diff --git a/webcit/static/t/room/edit/tab_admin.html b/webcit/static/t/room/edit/tab_admin.html index 82962de87..9e0f47946 100644 --- a/webcit/static/t/room/edit/tab_admin.html +++ b/webcit/static/t/room/edit/tab_admin.html @@ -1,12 +1,12 @@
  • - " onClick="return confirm('')"> + " onClick="return confirm('')">
  • - "> + ">
    • diff --git a/webcit/static/t/room/edit/tab_config.html b/webcit/static/t/room/edit/tab_config.html index 872f3ea19..69026fdd6 100644 --- a/webcit/static/t/room/edit/tab_config.html +++ b/webcit/static/t/room/edit/tab_config.html @@ -1,11 +1,11 @@
    - "> + ">
    • - " maxlength="127" /> + " maxlength="127" />
    • diff --git a/webcit/static/t/room/edit/tab_expire.html b/webcit/static/t/room/edit/tab_expire.html index a030d0b9f..958c0b158 100644 --- a/webcit/static/t/room/edit/tab_expire.html +++ b/webcit/static/t/room/edit/tab_expire.html @@ -2,13 +2,13 @@
      - "> + ">

      - +       		/>  diff --git a/webcit/static/t/room/edit/tab_feed.html b/webcit/static/t/room/edit/tab_feed.html index 6a11cd2d1..78d3f6d23 100644 --- a/webcit/static/t/room/edit/tab_feed.html +++ b/webcit/static/t/room/edit/tab_feed.html @@ -6,7 +6,7 @@ - "> + ">

      @@ -36,7 +36,7 @@ - "> + ">

      diff --git a/webcit/static/t/room/edit/tab_listserv.html b/webcit/static/t/room/edit/tab_listserv.html index aecb89ed4..b7e64092b 100644 --- a/webcit/static/t/room/edit/tab_listserv.html +++ b/webcit/static/t/room/edit/tab_listserv.html @@ -12,7 +12,7 @@ - "> + "> ">

      @@ -29,7 +29,7 @@ - "> + "> ">

      @@ -77,7 +77,7 @@ diff --git a/webcit/static/t/roombanner.html b/webcit/static/t/roombanner.html index 1ffa2432f..195e87d80 100644 --- a/webcit/static/t/roombanner.html +++ b/webcit/static/t/roombanner.html @@ -4,9 +4,9 @@
      - "> + "> ">
      -

      ">

      +

      ">

      -

      ?page=">

      +

      ?page=">