* don't overrun our room list.

diff --git a/webcit/Makefile.in b/webcit/Makefile.in
index 07ebf02ccfc2fc64fbc833d46fac27cfaff7bce5..6b2a321b9be78e6a9eb4f9ba5f68b9e3e4a7c5c3 100644 (file)
--- a/webcit/Makefile.in
+++ b/webcit/Makefile.in
@@ -28,7 +28,7 @@ all: all-progs-recursive webserver setup
 .SUFFIXES: .cpp .c .o
 
 clean:
-       rm -f *.o webcit webserver
+       rm -f *.o webcit webserver setup
        rm -fr locale/*
 
 distclean: clean

diff --git a/webcit/buildpackages b/webcit/buildpackages
index bdd78929ce3450d49fff52cb7953284062f02910..2a1cd657bc4f69e1a6e257df6d8b11beab5d40e1 100755 (executable)
--- a/webcit/buildpackages
+++ b/webcit/buildpackages
@@ -9,6 +9,8 @@ PACKAGE_VERSION=`cat packageversion`
 DATE=`date '+%a, %d %b %Y %H:%I:00 %z'`
 ACTUAL_DIR=`pwd`
 
+
+rm -rf debian/citadel-webcit debian/tmp/
 if echo "$ACTUAL_DIR" |grep -q "$WEBCIT_VERSION"; then
        echo "directory ($ACTUAL_DIR) naming scheme seems right. nothing done."
 else

diff --git a/webcit/messages.c b/webcit/messages.c
index 5320051374e363bc84d50d5b2a40a197b027e7e2..79d39fdf68c3754cb8abb6e30a036326569e5d6e 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -1655,7 +1655,12 @@ void display_summarized(int num) {
        );
 
        wprintf("<td width=%d%%>", SUBJ_COL_WIDTH_PCT);
-       escputs(WC->summ[num].subj);
+
+#ifdef HAVE_ICONV
+       utf8ify_rfc822_string(WC->summ[num].subj);
+       utf8ify_rfc822_string(WC->summ[num].from);
+#endif 
+       escputs(WC->summ[num].subj);//////////////////////////////////TODO: QP DECODE
        wprintf("</td>");
 
        wprintf("<td width=%d%%>", SENDER_COL_WIDTH_PCT);

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 8a03c30bb39e9fb3fbb8b148f6dfeeefd468e259..6c8ba2c534f2ec23659e680df79c66d375377066 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -5,7 +5,8 @@
 
 #include "webcit.h"
 
-char floorlist[128][SIZ]; /**< list of our floor names */
+#define MAX_FLOORS 128
+char floorlist[MAX_FLOORS][SIZ]; /**< list of our floor names */
 
 char *viewdefs[9]; /**< the different kinds of available views */
 
@@ -52,7 +53,7 @@ void load_floorlist(void)
        int a;
        char buf[SIZ];
 
-       for (a = 0; a < 128; ++a)
+       for (a = 0; a < MAX_FLOORS; ++a)
                floorlist[a][0] = 0;
 
        serv_puts("LFLR");
@@ -2864,7 +2865,13 @@ void room_to_folder(char *folder, char *room, int floor, int is_mailbox)
         * Otherwise, prefix the floor name as a "public folders" moniker
         */
        else {
-               sprintf(folder, "%s|%s", floorlist[floor], room);
+               if (floor > MAX_FLOORS) {
+                       wc_backtrace ();
+                       sprintf(folder, "%%%%%|%s", room);
+               }
+               else {
+                       sprintf(folder, "%s|%s", floorlist[floor], room);
+               }
        }
 
        /**