+citadel (8.13-1) stable; urgency=low
+
+ * new upstream version
+
+ -- Wilfried Goesgens <w.goesgens@outgesourced.org> Mon, 16 Jun 2012 22:00:00 +0001
+
citadel (8.12-1) stable; urgency=low
* new upstream version
dnl Ensure that libcitadel is configured with autoconf 2.52 or newer
AC_PREREQ(2.52)
-AC_INIT(libcitadel, 2.8.12, http://uncensored.citadel.org)
+AC_INIT(libcitadel, 2.8.13, http://uncensored.citadel.org)
AC_CONFIG_SRCDIR(Makefile.in)
AC_CONFIG_AUX_DIR(conftools)
dnl
LIBCURRENT=2
-LIBREVISION=812
+LIBREVISION=813
LIBAGE=0
sinclude(conftools/libtool.m4)
+libcitadel (8.13-1) stable; urgency=low
+
+ * new release
+
+ -- Wilfried Goesgens <w.goesgens@outgesourced.org> Mon, 16 Jun 2012 22:00:00 +0001
+
libcitadel (8.12-1) stable; urgency=low
* new release
#include <sys/types.h>
#include <netinet/in.h>
-#define LIBCITADEL_VERSION_NUMBER 812
+#define LIBCITADEL_VERSION_NUMBER 813
/*
* Here's a bunch of stupid magic to make the MIME parser portable.
dnl Process this file with autoconf to produce a configure script.
dnl $Id$
-AC_INIT([WebCit], [8.12], [http://www.citadel.org/])
+AC_INIT([WebCit], [8.13], [http://www.citadel.org/])
AC_SUBST(PROG_SUBDIRS)
+webcit (8.13-1) stable; urgency=low
+
+ * new release
+
+ -- Wilfried Goesgens <w.goesgens@outgesourced.org> Mon, 16 Jun 2012 22:00:00 +0001
+
webcit (8.12-1) stable; urgency=low
* new release
else if (State == 550)
AppendImportantMessage(_("Higher access is required to access this function."), -1);
+ FreeStrBuf(&Line);
+ FreeStrBuf(&Token);
return WCC->CurRoom.IgnetCfgs[WantThisOne];
}
*******************************************************************************/
/**** 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;
{
folder *Folder = (folder *)CTX;
- if (Folder == NULL)
- {
- wcsession *WCC = WC;
-
- if (WCC == NULL)
- return;
- Folder = &WCC->CurRoom;
- }
StrBufAppendTemplate(Target, TP, Folder->name, 0);
}
/**** 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);
"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" >
{ "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"))> ]
}
<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>
<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">
<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>
<?!("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: ")>
<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"',"")>/>
<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">
<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">
<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>
<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>
<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>
<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")>
#define PORT_NUM 2000 /* port number to listen on */
#define DEVELOPER_ID 0
#define CLIENT_ID 4
-#define CLIENT_VERSION 812 /* This version of WebCit */
-#define MINIMUM_CIT_VERSION 812 /* Minimum required version of Citadel server */
-#define LIBCITADEL_MIN 812 /* Minimum required version of libcitadel */
+#define CLIENT_VERSION 813 /* This version of WebCit */
+#define MINIMUM_CIT_VERSION 813 /* Minimum required version of Citadel server */
+#define LIBCITADEL_MIN 813 /* Minimum required version of libcitadel */
#define DEFAULT_HOST "localhost" /* Default Citadel server */
#define DEFAULT_PORT "504"
#define TARGET "webcit01" /* Window target for inline URL's */