projects / citadel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5fab96e)
THISROOM ROOM:INFO:PRINT_NAME ROOMNAME - all are now THISROOM:NAME; they were all...
authorWilfried Goesgens <dothebart@citadel.org>
Mon, 16 Jul 2012 12:56:08 +0000 (14:56 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Mon, 16 Jul 2012 12:56:08 +0000 (14:56 +0200)
webcit/roomtokens.c patch | blob | history
webcit/static/t/head.html patch | blob | history
webcit/static/t/mailsummary_json.html patch | blob | history
webcit/static/t/room/edit/tab_access.html patch | blob | history
webcit/static/t/room/edit/tab_admin.html patch | blob | history
webcit/static/t/room/edit/tab_config.html patch | blob | history
webcit/static/t/room/edit/tab_expire.html patch | blob | history
webcit/static/t/room/edit/tab_feed.html patch | blob | history
webcit/static/t/room/edit/tab_listserv.html patch | blob | history
webcit/static/t/roombanner.html patch | blob | history

diff --git a/webcit/roomtokens.c b/webcit/roomtokens.c
index eecc1623623fe881d7cf0d2aac826d84564452d6..c7eec125728ff08f8070a4293c8282a6c2abf762 100644 (file)
--- 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 2d6e6b3cc620de84f298e3a05cb36037b9002f21..fee9ca6ebcaffa0dd4034a10efb18929a3a9ed0b 100644 (file)
--- a/webcit/static/t/head.html
+++ b/webcit/static/t/head.html
@@ -2,7 +2,7 @@
         "http://www.w3.org/TR/html4/loose.dtd">
 <html>
        <head>
-               <title><?THISROOM> - <?SERV:HUMANNODE></title>
+               <title><?THISROOM:NAME> - <?SERV:HUMANNODE></title>
                <meta name="MSSmartTagsPreventParsing" content="TRUE" >
                <meta http-equiv="X-UA-Compatible" content="IE=8" >
                <meta name="keywords" content="groupware messaging collaboration" >
diff --git a/webcit/static/t/mailsummary_json.html b/webcit/static/t/mailsummary_json.html
index d6b1c3c3439536238849f973540bc8bcfbf56cc2..4329d3ab045b9ec3ee4ff66234dae4df96da60a0 100644 (file)
--- a/webcit/static/t/mailsummary_json.html
+++ b/webcit/static/t/mailsummary_json.html
@@ -1,6 +1,6 @@
 { "nummsgs": <?BSTR("__READLOOP:TOTALMSGS")>,
 "startmsg": <?BSTR("__READLOOP:STARTMSG")>,
-"roomname": "<?ROOMNAME("J")>",
+"roomname": "<?THISROOM:NAME("J")>",
 "msgs": [ <?ITERATE("MAIL:SUMM:MSGS", ="mailsummary_json_section",
 B("startmsg"), 0, B("stopmsg"))> ]
 }
diff --git a/webcit/static/t/room/edit/tab_access.html b/webcit/static/t/room/edit/tab_access.html
index 326908351650c61c61fe7c8cddf0e6624f01254c..ad55949887c0b9be0ed97f476ef55813df315dbb 100644 (file)
--- a/webcit/static/t/room/edit/tab_access.html
+++ b/webcit/static/t/room/edit/tab_access.html
@@ -8,7 +8,7 @@
                                        <form method="post" action="do_invt_kick">
                                                <input type="hidden" name="nonce" value="<?NONCE>">
                                                <input type="hidden" name="last_tabsel" value="<?TAB:N>">
-                                               <input type="hidden" name="go" value="<?ROOM:INFO:PRINT_NAME("X")>">
+                                               <input type="hidden" name="go" value="<?THISROOM:NAME("X")>">
                                                <select name="username" size="10" style="width:100%">
                                                        <?ITERATE("ITERATE:THISROOM:WHO_KNOWS", ="room_edit_username_list", 0, 0, -1)>
                                                </select>
@@ -24,7 +24,7 @@
                                        <form method="post" action="do_invt_kick">
                                                <input type="hidden" name="last_tabsel" value="<?TAB:N>">
                                                <input type="hidden" name="nonce" value="<?NONCE>">
-                                               <input type="hidden" name="go" value="<?ROOM:INFO:PRINT_NAME("X")>">
+                                               <input type="hidden" name="go" value="<?THISROOM:NAME("X")>">
                                                <?_("Invite:")>
                                                <input type="text" name="username" id="username_id" style="width:100R"><br>
                                                <input type="hidden" name="invite_button" value="Invite">
diff --git a/webcit/static/t/room/edit/tab_admin.html b/webcit/static/t/room/edit/tab_admin.html
index 82962de8774560c8b1cba1df27e44421a6a329ea..9e0f47946e8dc04686e0330b94d380a01696d2e3 100644 (file)
--- a/webcit/static/t/room/edit/tab_admin.html
+++ b/webcit/static/t/room/edit/tab_admin.html
@@ -1,12 +1,12 @@
 <div class="tabcontent">
        <ul>
                <li>
-                       <a href="delete_room?go=<?THISROOM("U")>" onClick="return confirm('<?_("Are you sure you want to delete this room?")>')">
+                       <a href="delete_room?go=<?THISROOM:NAME("U")>" onClick="return confirm('<?_("Are you sure you want to delete this room?")>')">
                                <?_("Delete this room")>
                        </a>
                </li>
                <li>
-                       <a href="display_editroompic?which_room=<?ROOMNAME("U")>">
+                       <a href="display_editroompic?which_room=<?THISROOM:NAME("U")>">
                                <?_("Set or change the icon for this rooms banner")>
                        </a>
                </li>
diff --git a/webcit/static/t/room/edit/tab_config.html b/webcit/static/t/room/edit/tab_config.html
index 872f3ea1942245df5b7c2c92504a2c3c95e4fafb..69026fdd6d1840e72b290acf6a72125ed54e899d 100644 (file)
--- a/webcit/static/t/room/edit/tab_config.html
+++ b/webcit/static/t/room/edit/tab_config.html
@@ -1,11 +1,11 @@
 <?!("COND:THISROOM:EDIT", 1)><div class="tabcontent">
        <form method="post" action="editroom">
                <input type="hidden" name="nonce" value="<?NONCE>" />
-               <input type="hidden" name="go" value="<?ROOM:INFO:PRINT_NAME("X")>">
+               <input type="hidden" name="go" value="<?THISROOM:NAME("X")>">
                <ul>   
                        <li>
                                <?_("name of room: ")>
-                               <input type="text" name="er_name" value="<?ROOMNAME("X")>" maxlength="127" />
+                               <input type="text" name="er_name" value="<?THISROOM:NAME("X")>" maxlength="127" />
                        </li>
                        <li>
                                <?_("Resides on floor: ")>
diff --git a/webcit/static/t/room/edit/tab_expire.html b/webcit/static/t/room/edit/tab_expire.html
index a030d0b9fd1884a3848994a896dd9664ebf27230..958c0b15833df22b19af9e6274ea3bfb35bcec56 100644 (file)
--- a/webcit/static/t/room/edit/tab_expire.html
+++ b/webcit/static/t/room/edit/tab_expire.html
@@ -2,13 +2,13 @@
        <br />
        <form method="post" action="set_room_policy">
                <input type="hidden" name="nonce" value="<?NONCE>" />
-               <input type="hidden" name="go" value="<?ROOM:INFO:PRINT_NAME("X")>">
+               <input type="hidden" name="go" value="<?THISROOM:NAME("X")>">
                <table border="0" cellspacing="5">
                        <tr>
                                <td>
                                        <?_("Message expire policy for this room")>
                                        <br />
-                                       <?ROOMNAME("X")>
+                                       <?THISROOM:NAME("X")>
                                </td>
                                <td>
                                        <input type="radio" name="roompolicy" value="0" <?%("COND:EXPIRE:MODE", 1, #"roompolicy", #"EXPIRE_NEXTLEVEL" , 'checked="checked"',"")>/>&nbsp;
diff --git a/webcit/static/t/room/edit/tab_feed.html b/webcit/static/t/room/edit/tab_feed.html
index 6a11cd2d1c6d074590c228abedd4b8a9c396c386..78d3f6d23773ec1bade3cf99d63ecf6c68241477 100644 (file)
--- a/webcit/static/t/room/edit/tab_feed.html
+++ b/webcit/static/t/room/edit/tab_feed.html
@@ -6,7 +6,7 @@
         <input type="hidden" name="last_tabsel" value="<?TAB:N>" />
        <input type="hidden" name="prefix" value="pop3client|" />
        <input type="hidden" name="nonce" value="<?NONCE>">
-       <input type="hidden" name="go" value="<?ROOM:INFO:PRINT_NAME("X")>">
+       <input type="hidden" name="go" value="<?THISROOM:NAME("X")>">
 </p>
        <table class="altern" border="0" cellpadding="5">
                <tr class="even">
@@ -36,7 +36,7 @@
        <input type="hidden" name="last_tabsel" value="<?TAB:N>" />
        <input type="hidden" name="prefix" value="rssclient|" />
        <input type="hidden" name="nonce" value="<?NONCE>" />
-       <input type="hidden" name="go" value="<?ROOM:INFO:PRINT_NAME("X")>">
+       <input type="hidden" name="go" value="<?THISROOM:NAME("X")>">
 </p>
        <table class="altern" border="0" cellpadding="5">
                <tr class="even">
diff --git a/webcit/static/t/room/edit/tab_listserv.html b/webcit/static/t/room/edit/tab_listserv.html
index aecb89ed46cc08bd8250c49fbc9d4c3a002503ab..b7e64092b170f5770214028d35d7899bb1e04b1e 100644 (file)
--- a/webcit/static/t/room/edit/tab_listserv.html
+++ b/webcit/static/t/room/edit/tab_listserv.html
@@ -12,7 +12,7 @@
                                <input type="hidden" name="last_tabsel" value="<?TAB:N>">
                                <input type="hidden" name="prefix" value="listrecp|">
                                <input type="hidden" name="nonce" value="<?NONCE>">
-                               <input type="hidden" name="go" value="<?ROOM:INFO:PRINT_NAME("X")>">
+                               <input type="hidden" name="go" value="<?THISROOM:NAME("X")>">
                                <input type="text" id="add_as_listrecp" name="line">
                                <input type="submit" name="add_button" value="<?_("Add")>">
                          </p>
@@ -29,7 +29,7 @@
                                <input type="hidden" name="last_tabsel" value="<?TAB:N>">
                                <input type="hidden" name="prefix" value="digestrecp|">
                                <input type="hidden" name="nonce" value="<?NONCE>">
-                               <input type="hidden" name="go" value="<?ROOM:INFO:PRINT_NAME("X")>">
+                               <input type="hidden" name="go" value="<?THISROOM:NAME("X")>">
                                <input type="text" id="add_as_digestrecp" name="line">
                                <input type="submit" name="add_button" value="<?_("Add")>">
                          </p>
@@ -77,7 +77,7 @@
                                        <td colspan="2" align="center">
                                                <input type="hidden" name="last_tabsel" value="<?TAB:N>">
                                                <input type="hidden" name="nonce" value="<?NONCE>">
-                                               <input type="hidden" name="go" value="<?ROOM:INFO:PRINT_NAME("X")>">
+                                               <input type="hidden" name="go" value="<?THISROOM:NAME("X")>">
                                                <input type="submit" name="add_button" value="<?_("Save changes")>">
                                        </td>
                                </tr>
diff --git a/webcit/static/t/roombanner.html b/webcit/static/t/roombanner.html
index 1ffa2432fffd23649e679a844f20122ae9bacaf1..195e87d80fa0e39fd25b99bca6f201d07cd3dd33 100644 (file)
--- a/webcit/static/t/roombanner.html
+++ b/webcit/static/t/roombanner.html
@@ -4,9 +4,9 @@
                <td><?=("room_view_picture")></td>
 
                <td>
-                       <h1 id="rmname"><a href="/readnew?go=<?ROOM:INFO:PRINT_NAME("U")>"><?ROOM:INFO:PRINT_NAME("X")></a></h1>
+                       <h1 id="rmname"><a href="/readnew?go=<?THISROOM:NAME("U")>"><?THISROOM:NAME("X")></a></h1>
                        <?THISROOM:FEED:RSS>
-                       <?!("COND:ROOM:TYPE_IS", 7, #"VIEW_WIKI")><h2><a href="wiki?go=<?ROOM:INFO:PRINT_NAME("U")>?page=<?BSTR("page")>"><?BSTR("page")></a></h2><?!("X", 7)>
+                       <?!("COND:ROOM:TYPE_IS", 7, #"VIEW_WIKI")><h2><a href="wiki?go=<?THISROOM:NAME("U")>?page=<?BSTR("page")>"><?BSTR("page")></a></h2><?!("X", 7)>
                        <?!("COND:ROOM:TYPE_IS", 8, #"VIEW_BBS")><p id="nummsgs"><?THISROOM:MSGS:NEW> <?_("new of")> <?THISROOM:MSGS:TOTAL> <?_("messages")></p><?!("X", 8)>
                        <?!("COND:ROOM:TYPE_IS", 11, #"VIEW_MAILBOX")><p id="nummsgs"><?THISROOM:MSGS:NEW> <?_("new of")> <?THISROOM:MSGS:TOTAL> <?_("messages")></p><?!("X", 11)>
                        <?!("COND:THISROOM:FLAG:QR", 9, #"QR_DIRECTORY")><?!("COND:THISROOM:FLAG:QR", 10, #"QR_VISDIR")>
Citadel server, clients, utilities