From 2b807b216b5ea6c195872d0250164287d56df594 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Thu, 8 Jul 2004 03:03:02 +0000 Subject: [PATCH] * Added global settings for THE DREADED AUTO-PURGER to the site-wide configuration (public rooms default and mailboxes default). Still need to add floor and room policy screens. --- webcit/ChangeLog | 6 +++ webcit/siteconfig.c | 96 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 96 insertions(+), 6 deletions(-) diff --git a/webcit/ChangeLog b/webcit/ChangeLog index 6b92698e6..24f2b0035 100644 --- a/webcit/ChangeLog +++ b/webcit/ChangeLog @@ -1,4 +1,9 @@ $Log$ +Revision 522.11 2004/07/08 03:03:01 ajc +* Added global settings for THE DREADED AUTO-PURGER to the site-wide + configuration (public rooms default and mailboxes default). Still need + to add floor and room policy screens. + Revision 522.10 2004/07/02 03:28:08 ajc * Much-improved alphabet tabs for Address Book view. Now divides the total number of names by (names per page, currently 60) and sets up @@ -1954,3 +1959,4 @@ Sun Dec 6 19:50:55 EST 1998 Art Cancro 1998-12-03 Nathan Bryant * webserver.c: warning fix + diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c index 793869f58..a2ac49c1a 100644 --- a/webcit/siteconfig.c +++ b/webcit/siteconfig.c @@ -35,6 +35,12 @@ void display_siteconfig(void) char *whichmenu; int i, j; + /* expire policy settings */ + int sitepolicy = 0; + int sitevalue = 0; + int mboxpolicy = 0; + int mboxvalue = 0; + output_headers(3); whichmenu = bstr("whichmenu"); @@ -46,7 +52,6 @@ void display_siteconfig(void) wprintf("\n"); wprintf("\n" ); + wprintf("\n" + ); + wprintf("
" - "" "" "\" \"" @@ -58,7 +63,6 @@ void display_siteconfig(void) ); wprintf("
" - "" "" "\" \"" @@ -70,7 +74,6 @@ void display_siteconfig(void) ); wprintf("
" - "" "" "\" \"" @@ -82,7 +85,6 @@ void display_siteconfig(void) ); wprintf("
" - "" "" "\" \"" @@ -94,7 +96,6 @@ void display_siteconfig(void) ); wprintf("
" - "" "" "\" \"" @@ -105,6 +106,17 @@ void display_siteconfig(void) "
" + "" + "\" \"" + "" + "" + "Auto-purger
" + "Configure automatic expiry of old messages" + "
"); do_template("endbox"); @@ -136,6 +148,12 @@ void display_siteconfig(void) "\n"); } + if (!strcasecmp(whichmenu, "purger")) { + wprintf("

Message auto-purger settings

" + "These settings may be overridden on a per-floor or per-room basis." + "
\n"); + } + serv_printf("CONF get"); serv_gets(buf); if (buf[0] != '1') { @@ -148,7 +166,6 @@ void display_siteconfig(void) return; } - wprintf("
\n"); wprintf("\n"); @@ -534,6 +551,67 @@ void display_siteconfig(void) } } + serv_puts("GPEX site"); + serv_gets(buf); + if (buf[0] == '2') { + sitepolicy = extract_int(&buf[4], 0); + sitevalue = extract_int(&buf[4], 1); + } + + serv_puts("GPEX mailboxes"); + serv_gets(buf); + if (buf[0] == '2') { + mboxpolicy = extract_int(&buf[4], 0); + mboxvalue = extract_int(&buf[4], 1); + } + + if (!strcasecmp(whichmenu, "purger")) { + + wprintf("\n"); + + wprintf("\n"); + + wprintf("\n"); + + wprintf("\n"); + + wprintf("\n"); + + } + else { + wprintf("\n", sitepolicy); + wprintf("\n", sitevalue); + wprintf("\n", mboxpolicy); + wprintf("\n", mboxvalue); + } + wprintf("
Default message expire policy for public rooms"); + wprintf("", + ((sitepolicy == 1) ? "CHECKED" : "") ); + wprintf("Never automatically expire messages
\n"); + wprintf("", + ((sitepolicy == 2) ? "CHECKED" : "") ); + wprintf("Expire by message count
\n"); + wprintf("", + ((sitepolicy == 3) ? "CHECKED" : "") ); + wprintf("Expire by message age
"); + wprintf("Number of messages or days: "); + wprintf("", sitevalue); + wprintf("
Default message expire policy for private mailboxes"); + wprintf("", + ((mboxpolicy == 0) ? "CHECKED" : "") ); + wprintf("Same policy as public rooms
\n"); + wprintf("", + ((mboxpolicy == 1) ? "CHECKED" : "") ); + wprintf("Never automatically expire messages
\n"); + wprintf("", + ((mboxpolicy == 2) ? "CHECKED" : "") ); + wprintf("Expire by message count
\n"); + wprintf("", + ((mboxpolicy == 3) ? "CHECKED" : "") ); + wprintf("Expire by message age
"); + wprintf("Number of messages or days: "); + wprintf("", mboxvalue); + wprintf("
"); wprintf(""); wprintf("\n"); @@ -597,6 +675,12 @@ void siteconfig(void) serv_printf("%s", bstr("c_ldap_bind_pw")); serv_printf("%s", bstr("c_ip_addr")); serv_printf("000"); + + serv_printf("SPEX site|%d|%d", atoi(bstr("sitepolicy")), atoi(bstr("sitevalue"))); + serv_gets(buf); + serv_printf("SPEX mailboxes|%d|%d", atoi(bstr("mboxpolicy")), atoi(bstr("mboxvalue"))); + serv_gets(buf); + strcpy(WC->ImportantMessage, "System configuration has been updated."); display_siteconfig(); } -- 2.30.2