projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d73c39b
)
* Bumped internal version number to 6.31. Minimum Citadel server required
author
Art Cancro
<ajc@citadel.org>
Wed, 26 Oct 2005 20:20:05 +0000
(20:20 +0000)
committer
Art Cancro
<ajc@citadel.org>
Wed, 26 Oct 2005 20:20:05 +0000
(20:20 +0000)
is version 6.61.
webcit/ChangeLog
patch
|
blob
|
history
webcit/calendar_tools.c
patch
|
blob
|
history
webcit/groupdav_propfind.c
patch
|
blob
|
history
webcit/groupdav_put.c
patch
|
blob
|
history
webcit/html2html.c
patch
|
blob
|
history
webcit/messages.c
patch
|
blob
|
history
webcit/rss.c
patch
|
blob
|
history
webcit/webcit.h
patch
|
blob
|
history
diff --git
a/webcit/ChangeLog
b/webcit/ChangeLog
index 8d21fc31369afa16825a2d797c4bf19870fbfdb9..50dfd0af5ef0cd7d622fbe5727d0da132b2fd222 100644
(file)
--- a/
webcit/ChangeLog
+++ b/
webcit/ChangeLog
@@
-1,5
+1,9
@@
$Id$
$Id$
+Wed Oct 26 16:19:24 EDT 2005 ajc
+* Bumped internal version number to 6.31. Minimum Citadel server required
+ is version 6.61.
+
Wed Oct 26 12:09:20 EDT 2005 ajc
* webcit.c: msgesc() no longer inserts backslashes before every single-quote
appearing in the quoted or forwarded message.
Wed Oct 26 12:09:20 EDT 2005 ajc
* webcit.c: msgesc() no longer inserts backslashes before every single-quote
appearing in the quoted or forwarded message.
diff --git
a/webcit/calendar_tools.c
b/webcit/calendar_tools.c
index fa8bd902039931aeda48553b51effacdec6324ee..3fbab7eec1740aca5ef05df76bbf1ab3896c0833 100644
(file)
--- a/
webcit/calendar_tools.c
+++ b/
webcit/calendar_tools.c
@@
-250,7
+250,7
@@
void partstat_as_string(char *buf, icalproperty *attendee) {
icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
icalcomponent *encaps;
icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
icalcomponent *encaps;
- lprintf(9, "ical_encapsulate_subcomponent() called\n");
+ /* lprintf(9, "ical_encapsulate_subcomponent() called\n"); */
if (subcomp == NULL) {
lprintf(3, "ERROR: called with NULL argument!\n");
if (subcomp == NULL) {
lprintf(3, "ERROR: called with NULL argument!\n");
@@
-261,14
+261,13
@@
icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
* don't bother ... just return itself.
*/
if (icalcomponent_isa(subcomp) == ICAL_VCALENDAR_COMPONENT) {
* don't bother ... just return itself.
*/
if (icalcomponent_isa(subcomp) == ICAL_VCALENDAR_COMPONENT) {
- lprintf(9, "Already encapsulated. Returning itself.\n");
return subcomp;
}
/* Encapsulate the VEVENT component into a complete VCALENDAR */
encaps = icalcomponent_new(ICAL_VCALENDAR_COMPONENT);
if (encaps == NULL) {
return subcomp;
}
/* Encapsulate the VEVENT component into a complete VCALENDAR */
encaps = icalcomponent_new(ICAL_VCALENDAR_COMPONENT);
if (encaps == NULL) {
- lprintf(3, "
Error at %s:%d
- could not allocate component!\n",
+ lprintf(3, "
%s:%d: Error
- could not allocate component!\n",
__FILE__, __LINE__);
return NULL;
}
__FILE__, __LINE__);
return NULL;
}
@@
-280,7
+279,7
@@
icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
icalcomponent_add_property(encaps, icalproperty_new_version("2.0"));
/* Encapsulate the subcomponent inside */
icalcomponent_add_property(encaps, icalproperty_new_version("2.0"));
/* Encapsulate the subcomponent inside */
- lprintf(9, "Doing the encapsulation\n");
+ /* lprintf(9, "Doing the encapsulation\n"); */
icalcomponent_add_component(encaps, subcomp);
/* Convert all timestamps to UTC so we don't have to deal with
icalcomponent_add_component(encaps, subcomp);
/* Convert all timestamps to UTC so we don't have to deal with
diff --git
a/webcit/groupdav_propfind.c
b/webcit/groupdav_propfind.c
index 685ba410e8c5cf68b07ab793b1cb22a5130c125d..c6f1bbdd2dcf3502991e9275d31b02a639030c68 100644
(file)
--- a/
webcit/groupdav_propfind.c
+++ b/
webcit/groupdav_propfind.c
@@
-158,9
+158,11
@@
void groupdav_propfind(char *dav_pathname) {
extract_token(dav_roomname, dav_pathname, 2, '/', sizeof dav_roomname);
extract_token(dav_uid, dav_pathname, 3, '/', sizeof dav_uid);
extract_token(dav_roomname, dav_pathname, 2, '/', sizeof dav_roomname);
extract_token(dav_uid, dav_pathname, 3, '/', sizeof dav_uid);
+ /*
lprintf(9, "dav_pathname: %s\n", dav_pathname);
lprintf(9, "dav_roomname: %s\n", dav_roomname);
lprintf(9, " dav_uid: %s\n", dav_uid);
lprintf(9, "dav_pathname: %s\n", dav_pathname);
lprintf(9, "dav_roomname: %s\n", dav_roomname);
lprintf(9, " dav_uid: %s\n", dav_uid);
+ */
/*
* If the room name is blank, the client is requesting a
/*
* If the room name is blank, the client is requesting a
diff --git
a/webcit/groupdav_put.c
b/webcit/groupdav_put.c
index a968ccd57e626986d417f3c89af4b162cd525238..79a0da12966f2e824323d840fa4eba27108c633b 100644
(file)
--- a/
webcit/groupdav_put.c
+++ b/
webcit/groupdav_put.c
@@
-62,9
+62,7
@@
void groupdav_put(char *dav_pathname, char *dav_ifmatch,
* version, so we fail...
*/
if (strlen(dav_ifmatch) > 0) {
* version, so we fail...
*/
if (strlen(dav_ifmatch) > 0) {
- lprintf(9, "dav_ifmatch: %s\n", dav_ifmatch);
old_msgnum = locate_message_by_uid(dav_uid);
old_msgnum = locate_message_by_uid(dav_uid);
- lprintf(9, "old_msgnum: %ld\n", old_msgnum);
if (atol(dav_ifmatch) != old_msgnum) {
wprintf("HTTP/1.1 412 Precondition Failed\r\n");
lprintf(9, "HTTP/1.1 412 Precondition Failed (ifmatch=%ld, old_msgnum=%ld)\r\n",
if (atol(dav_ifmatch) != old_msgnum) {
wprintf("HTTP/1.1 412 Precondition Failed\r\n");
lprintf(9, "HTTP/1.1 412 Precondition Failed (ifmatch=%ld, old_msgnum=%ld)\r\n",
diff --git
a/webcit/html2html.c
b/webcit/html2html.c
index 0e6dad744306977003bf54e3249279aeaf7e18d0..f41ac542a69977a5b479c5bb3f73902998c44171 100644
(file)
--- a/
webcit/html2html.c
+++ b/
webcit/html2html.c
@@
-68,7
+68,8
@@
void output_html(char *charset) {
) {
ic = iconv_open("UTF-8", charset);
if (ic == (iconv_t)(-1) ) {
) {
ic = iconv_open("UTF-8", charset);
if (ic == (iconv_t)(-1) ) {
- lprintf(5, "%s:%d iconv_open() failed: %s\n", __FILE__, __LINE__, strerror(errno));
+ lprintf(5, "%s:%d iconv_open() failed: %s\n",
+ __FILE__, __LINE__, strerror(errno));
}
}
if (ic != (iconv_t)(-1) ) {
}
}
if (ic != (iconv_t)(-1) ) {
diff --git
a/webcit/messages.c
b/webcit/messages.c
index d48c5570661744bfd27c0ad801ad484d7dd77bd9..a02296df53adc56ece5f0d9fedec100624bd71e8 100644
(file)
--- a/
webcit/messages.c
+++ b/
webcit/messages.c
@@
-599,7
+599,6
@@
void read_message(long msgnum, int printable_view, char *section) {
}
safestrncpy(&reply_all[strlen(reply_all)], &buf[5],
(sizeof reply_all - strlen(reply_all)) );
}
safestrncpy(&reply_all[strlen(reply_all)], &buf[5],
(sizeof reply_all - strlen(reply_all)) );
- lprintf(9, "REPLY_ALL: %s\n", reply_all); // FIXME
}
if ((!strncasecmp(buf, "hnod=", 5))
&& (strcasecmp(&buf[5], serv_info.serv_humannode))) {
}
if ((!strncasecmp(buf, "hnod=", 5))
&& (strcasecmp(&buf[5], serv_info.serv_humannode))) {
@@
-855,7
+854,8
@@
void read_message(long msgnum, int printable_view, char *section) {
) {
ic = iconv_open("UTF-8", mime_charset);
if (ic == (iconv_t)(-1) ) {
) {
ic = iconv_open("UTF-8", mime_charset);
if (ic == (iconv_t)(-1) ) {
- lprintf(5, "%s:%d iconv_open(UTF-8, %s) failed: %s\n", __FILE__, __LINE__, mime_charset, strerror(errno));
+ lprintf(5, "%s:%d iconv_open(UTF-8, %s) failed: %s\n",
+ __FILE__, __LINE__, mime_charset, strerror(errno));
}
}
#endif
}
}
#endif
@@
-1208,7
+1208,8
@@
void pullquote_message(long msgnum, int forward_attachments) {
) {
ic = iconv_open("UTF-8", mime_charset);
if (ic == (iconv_t)(-1) ) {
) {
ic = iconv_open("UTF-8", mime_charset);
if (ic == (iconv_t)(-1) ) {
- lprintf(5, "%s:%d iconv_open() failed: %s\n", __FILE__, __LINE__, strerror(errno));
+ lprintf(5, "%s:%d iconv_open() failed: %s\n",
+ __FILE__, __LINE__, strerror(errno));
}
}
#endif
}
}
#endif
@@
-2799,7
+2800,6
@@
void do_stuff_to_msgs(void) {
serv_puts("MSGS ALL");
serv_getln(buf, sizeof buf);
serv_puts("MSGS ALL");
serv_getln(buf, sizeof buf);
- lprintf(9, "%s:%d fetching msgnums\n", __FILE__, __LINE__);
if (buf[0] == '1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
ptr = malloc(sizeof(struct stuff_t));
ptr->msgnum = atol(buf);
if (buf[0] == '1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
ptr = malloc(sizeof(struct stuff_t));
ptr->msgnum = atol(buf);
@@
-2817,10
+2817,8
@@
void do_stuff_to_msgs(void) {
if (!strcasecmp(bstr(buf), "yes")) {
if (delete_button_pressed) {
if (!strcasecmp(bstr(buf), "yes")) {
if (delete_button_pressed) {
- lprintf(9, "%s:%d move %d\n", __FILE__, __LINE__, stuff->msgnum);
serv_printf("MOVE %ld|_TRASH_|0", stuff->msgnum);
serv_getln(buf, sizeof buf);
serv_printf("MOVE %ld|_TRASH_|0", stuff->msgnum);
serv_getln(buf, sizeof buf);
- lprintf(9, "%s:%d %s\n", __FILE__, __LINE__, buf);
}
}
}
}
@@
-2829,7
+2827,6
@@
void do_stuff_to_msgs(void) {
free(stuff);
stuff = ptr;
}
free(stuff);
stuff = ptr;
}
- lprintf(9, "%s:%d done, moving on...\n", __FILE__, __LINE__);
readloop("readfwd");
}
readloop("readfwd");
}
diff --git
a/webcit/rss.c
b/webcit/rss.c
index fe4a5d7a01306348c076761e7c21c33c1f364cbd..0080e866d0a21b4ba251db9dc2fa84145fb88ea5 100644
(file)
--- a/
webcit/rss.c
+++ b/
webcit/rss.c
@@
-235,7
+235,8
@@
void display_rss(char *roomname, char *request_method)
if (strcasecmp(charset, "us-ascii") && strcasecmp(charset, "utf-8") && strcasecmp(charset, "") ) {
ic = iconv_open("UTF-8", charset);
if (ic == (iconv_t)(-1)) {
if (strcasecmp(charset, "us-ascii") && strcasecmp(charset, "utf-8") && strcasecmp(charset, "") ) {
ic = iconv_open("UTF-8", charset);
if (ic == (iconv_t)(-1)) {
- lprintf(5, "%s:%d iconv_open() failed: %s\n", __FILE__, __LINE__, strerror(errno));
+ lprintf(5, "%s:%d iconv_open() failed: %s\n",
+ __FILE__, __LINE__, strerror(errno));
goto ENDBODY;
}
}
goto ENDBODY;
}
}
diff --git
a/webcit/webcit.h
b/webcit/webcit.h
index 5e4732b99008b151e9e73f868c1dfa26d12ca273..cf126c41a4d21f060f66b6c75a3c96205a30d102 100644
(file)
--- a/
webcit/webcit.h
+++ b/
webcit/webcit.h
@@
-88,11
+88,11
@@
#define SLEEPING 180 /* TCP connection timeout */
#define WEBCIT_TIMEOUT 900 /* WebCit session timeout */
#define PORT_NUM 2000 /* port number to listen on */
#define SLEEPING 180 /* TCP connection timeout */
#define WEBCIT_TIMEOUT 900 /* WebCit session timeout */
#define PORT_NUM 2000 /* port number to listen on */
-#define SERVER "WebCit v6.3
0
" /* who's in da house */
+#define SERVER "WebCit v6.3
1
" /* who's in da house */
#define DEVELOPER_ID 0
#define CLIENT_ID 4
#define DEVELOPER_ID 0
#define CLIENT_ID 4
-#define CLIENT_VERSION 63
0
/* This version of WebCit */
-#define MINIMUM_CIT_VERSION 661 /* min required Citadel ver
s
*/
+#define CLIENT_VERSION 63
1
/* This version of WebCit */
+#define MINIMUM_CIT_VERSION 661 /* min required Citadel ver
.
*/
#define DEFAULT_HOST "localhost" /* Default Citadel server */
#define DEFAULT_PORT "504"
#define LB (1) /* Internal escape chars */
#define DEFAULT_HOST "localhost" /* Default Citadel server */
#define DEFAULT_PORT "504"
#define LB (1) /* Internal escape chars */