From a66a2d134a16e3f44fccfaced4b0a22b4e4706fb Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Mon, 9 Jan 2006 18:02:49 +0000
Subject: [PATCH] * siteconfig.c: new "Indexing/Journaling" tab now contains
 the options   to enable the full text index, and to enable message
 journaling. * Version number is now 6.70 in order to keep parity with
 Citadel.

---
 webcit/ChangeLog     |   5 +
 webcit/README.txt    |   4 +-
 webcit/po/de.po      | 250 ++++++++++++++++++++++++++----------------
 webcit/po/it.po      | 252 ++++++++++++++++++++++++++-----------------
 webcit/po/webcit.pot | 230 ++++++++++++++++++++++++---------------
 webcit/siteconfig.c  | 167 ++++++++++++++++------------
 webcit/webcit.h      |   6 +-
 7 files changed, 563 insertions(+), 351 deletions(-)

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index dfa573c42..0e1706e30 100644
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,5 +1,10 @@
 $Id$
 
+Mon Jan  9 13:01:48 EST 2006 ajc
+* siteconfig.c: new "Indexing/Journaling" tab now contains the options
+  to enable the full text index, and to enable message journaling.
+* Version number is now 6.70 in order to keep parity with Citadel.
+
 Mon Jan  9 00:39:59 EST 2006 ajc
 * Site Configuration screen moved to tabbed dialog
 
diff --git a/webcit/README.txt b/webcit/README.txt
index 10d80d249..f99390d05 100644
--- a/webcit/README.txt
+++ b/webcit/README.txt
@@ -1,7 +1,7 @@
                         WEBCIT for the Citadel System
-                               version 6.25
+                               version 6.70
  
-   Copyright (C) 1996-2005 by the authors.  Portions written by:
+   Copyright (C) 1996-2006 by the authors.  Portions written by:
 	Art Cancro
 	Nathan Bryant
 	Wilifried Goesgens
diff --git a/webcit/po/de.po b/webcit/po/de.po
index fe4fb922a..9bd2fc0f9 100644
--- a/webcit/po/de.po
+++ b/webcit/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-06 11:21-0500\n"
+"POT-Creation-Date: 2006-01-09 12:44-0500\n"
 "PO-Revision-Date: 2005-12-05 18:59+0100\n"
 "Last-Translator: Wilfried Goesgens <w.goesgens@chaosindustries.de>\n"
 "Language-Team: German <citadel-dev@uncensored.citadel.org>\n"
@@ -156,7 +156,7 @@ msgstr "Passwort ändern"
 #: ../iconbar.c:699 ../mainmenu.c:298 ../messages.c:2659 ../messages.c:2770
 #: ../messages.c:2856 ../netconf.c:79 ../netconf.c:139 ../paging.c:56
 #: ../preferences.c:361 ../roomops.c:1175 ../roomops.c:1503 ../roomops.c:1932
-#: ../roomops.c:2081 ../roomops.c:2145 ../siteconfig.c:821 ../sysmsgs.c:52
+#: ../roomops.c:2081 ../roomops.c:2145 ../siteconfig.c:533 ../sysmsgs.c:52
 #: ../useredit.c:366 ../vcard_edit.c:330 ../who.c:268
 msgid "Cancel"
 msgstr "Abbruch"
@@ -512,7 +512,7 @@ msgstr "Teilnehmer Verfügbarkeit überprüfen"
 msgid "Add/change/delete floors"
 msgstr "Etage Neu/Ändern/Löschen"
 
-#: ../floors.c:48 ../siteconfig.c:175 ../vcard_edit.c:72
+#: ../floors.c:48 ../siteconfig.c:46 ../vcard_edit.c:72
 msgid "Error"
 msgstr "Fehler"
 
@@ -796,7 +796,7 @@ msgid "Displays the 'Powered by Citadel' icon"
 msgstr "Den Citadel-Brand anzeigen"
 
 #: ../iconbar.c:698 ../netconf.c:136 ../roomops.c:1174 ../roomops.c:1501
-#: ../siteconfig.c:819 ../sysmsgs.c:50 ../useredit.c:366 ../vcard_edit.c:329
+#: ../siteconfig.c:531 ../sysmsgs.c:50 ../useredit.c:366 ../vcard_edit.c:329
 msgid "Save changes"
 msgstr "Änderungen übernehmen"
 
@@ -1346,7 +1346,8 @@ msgstr "Die Meldung wurde nicht verschoben."
 msgid "Add a new node"
 msgstr "Neuen Knoten hinzufügen"
 
-#: ../netconf.c:68 ../netconf.c:119 ../siteconfig.c:193
+#: ../netconf.c:68 ../netconf.c:119 ../siteconfig.c:109
+#, c-format
 msgid "Node name"
 msgstr "Name des Knotens"
 
@@ -1821,19 +1822,23 @@ msgstr "Nachrichten Verfallsvorgabe für diesen Raum"
 msgid "Use the default policy for this floor"
 msgstr "Die Vorgaberichtlinie dieser Etage verwenden "
 
-#: ../roomops.c:1457 ../roomops.c:1484 ../siteconfig.c:769 ../siteconfig.c:794
+#: ../roomops.c:1457 ../roomops.c:1484 ../siteconfig.c:470 ../siteconfig.c:495
+#, c-format
 msgid "Never automatically expire messages"
 msgstr "Nachrichten nie automatisch löschen"
 
-#: ../roomops.c:1461 ../roomops.c:1488 ../siteconfig.c:773 ../siteconfig.c:798
+#: ../roomops.c:1461 ../roomops.c:1488 ../siteconfig.c:474 ../siteconfig.c:499
+#, c-format
 msgid "Expire by message count"
 msgstr "Nachrichten nach Anzahl löschen"
 
-#: ../roomops.c:1465 ../roomops.c:1492 ../siteconfig.c:777 ../siteconfig.c:802
+#: ../roomops.c:1465 ../roomops.c:1492 ../siteconfig.c:478 ../siteconfig.c:503
+#, c-format
 msgid "Expire by message age"
 msgstr "Lösche Nachrichten älter als"
 
-#: ../roomops.c:1467 ../roomops.c:1494 ../siteconfig.c:779 ../siteconfig.c:804
+#: ../roomops.c:1467 ../roomops.c:1494 ../siteconfig.c:480 ../siteconfig.c:505
+#, c-format
 msgid "Number of messages or days: "
 msgstr "Anzahl der Nachrichten pro Tag: "
 
@@ -1985,261 +1990,310 @@ msgstr "Nicht angemeldet"
 msgid "Error retrieving RSS feed: couldn't find messages\n"
 msgstr "Fehler beim laden des RSS-feeds: konnte die Meldung nicht finden\n"
 
-#: ../siteconfig.c:28
+#: ../siteconfig.c:35
 msgid "Site configuration"
 msgstr "Standortskonfiguration"
 
-#: ../siteconfig.c:51
+#: ../siteconfig.c:58
 msgid "General"
 msgstr "Allgemein"
 
-#: ../siteconfig.c:52 ../siteconfig.c:128
-msgid "General site configuration items"
-msgstr "Allgemeine Standortskonfiguration"
-
-#: ../siteconfig.c:64
+#: ../siteconfig.c:59
 msgid "Access"
 msgstr "Zugang"
 
-#: ../siteconfig.c:65 ../siteconfig.c:134
-msgid "Access controls and site policy settings"
-msgstr "Zugangskontrolle und Vorgabewerte"
-
-#: ../siteconfig.c:77
+#: ../siteconfig.c:60
 msgid "Network"
 msgstr "Netzwerk"
 
-#: ../siteconfig.c:78 ../siteconfig.c:140
-msgid "Network services"
-msgstr "Netzwerk Dienste"
-
-#: ../siteconfig.c:90
+#: ../siteconfig.c:61
 msgid "Tuning"
 msgstr "Feinabstimmung"
 
-#: ../siteconfig.c:91 ../siteconfig.c:149
-msgid "Advanced server fine-tuning controls"
-msgstr "Erweiterte Server Einstellungen"
-
-#: ../siteconfig.c:103
+#: ../siteconfig.c:62
 msgid "Directory"
 msgstr "Verzeichnisdienste"
 
-#: ../siteconfig.c:104
-msgid "Configure the LDAP connector for Citadel"
-msgstr "LDAP Verzeichnis Anbindung des Servers konfigurieren"
-
-#: ../siteconfig.c:116
+#: ../siteconfig.c:63
 msgid "Auto-purger"
 msgstr "Automatischer Nachrichtenlöscher"
 
-#: ../siteconfig.c:117
-msgid "Configure automatic expiry of old messages"
-msgstr "Automatischer Verfall alter Nachrichten konfigurieren"
+#: ../siteconfig.c:64
+msgid "Indexing/Journaling"
+msgstr ""
 
-#: ../siteconfig.c:142 ../siteconfig.c:157
+#: ../siteconfig.c:68
+msgid "General site configuration items"
+msgstr "Allgemeine Standortskonfiguration"
+
+#: ../siteconfig.c:72
+msgid "Access controls and site policy settings"
+msgstr "Zugangskontrolle und Vorgabewerte"
+
+#: ../siteconfig.c:76
+msgid "Network services"
+msgstr "Netzwerk Dienste"
+
+#: ../siteconfig.c:77 ../siteconfig.c:87
 msgid ""
 "Changes made on this screen will not take effect until you restart the "
 "Citadel server."
 msgstr ""
 "Änderungen in diesem Menü werden erst mit Neustart des Citadel-Servers aktiv"
 
-#: ../siteconfig.c:155
-msgid "Citadel LDAP connector configuration"
-msgstr "Citadel LDAP Verzeichnisserver Anbindung"
+#: ../siteconfig.c:82
+msgid "Advanced server fine-tuning controls"
+msgstr "Erweiterte Server Einstellungen"
 
-#: ../siteconfig.c:164
-msgid "Message auto-purger settings"
-msgstr "Einstellungen automatischer Nachrichtensäuberer"
+#: ../siteconfig.c:86
+msgid "Configure the LDAP connector for Citadel"
+msgstr "LDAP Verzeichnis Anbindung des Servers konfigurieren"
 
-#: ../siteconfig.c:166
+#: ../siteconfig.c:92
+msgid "Configure automatic expiry of old messages"
+msgstr "Automatischer Verfall alter Nachrichten konfigurieren"
+
+#: ../siteconfig.c:93
 msgid "These settings may be overridden on a per-floor or per-room basis."
 msgstr "Diese Einstellungen können auf Etagen- / Raum-Basis aufgehoben werden."
 
-#: ../siteconfig.c:205
+#: ../siteconfig.c:97
+msgid "Indexing and Journaling"
+msgstr ""
+
+#: ../siteconfig.c:98
+msgid "Warning: these facilities are resource intensive."
+msgstr ""
+
+#: ../siteconfig.c:116
+#, c-format
 msgid "Fully qualified domain name"
 msgstr "FQDN"
 
-#: ../siteconfig.c:217
+#: ../siteconfig.c:123
+#, c-format
 msgid "Human-readable node name"
 msgstr "Menschenlesbarer Knotenname"
 
-#: ../siteconfig.c:229
+#: ../siteconfig.c:130
+#, c-format
 msgid "Telephone number"
 msgstr "Telefonnummer"
 
-#: ../siteconfig.c:241
+#: ../siteconfig.c:137
+#, c-format
 msgid "Automatically grant room-aide status to users who create private rooms"
 msgstr ""
 "Automatisch dem Raumerzeuger administrative Rechte an dem neuen Raum geben"
 
-#: ../siteconfig.c:254
+#: ../siteconfig.c:145
+#, c-format
 msgid "Server connection idle timeout (in seconds)"
 msgstr "ungenutzte Verbindungen trennen nach: (in Sekunden)"
 
-#: ../siteconfig.c:266
+#: ../siteconfig.c:152
+#, c-format
 msgid "Initial access level for new users"
 msgstr "Netzzugangsberechtigung für neue Nutzer"
 
-#: ../siteconfig.c:285
+#: ../siteconfig.c:166
+#, c-format
 msgid "Require registration for new users"
 msgstr "Anmeldung für neue Benutzer Erforderlich"
 
-#: ../siteconfig.c:298
+#: ../siteconfig.c:174
+#, c-format
 msgid "Quarantine messages from problem users"
 msgstr "Meldungen Problematischer Nutzer moderieren"
 
-#: ../siteconfig.c:311
+#: ../siteconfig.c:182
+#, c-format
 msgid "Name of quarantine room"
 msgstr "Name des moderierungs Raums"
 
-#: ../siteconfig.c:323
+#: ../siteconfig.c:189
+#, c-format
 msgid "Paginator prompt (for text mode clients)"
 msgstr "Eingabeaufforderung (nur Für Textclients)"
 
-#: ../siteconfig.c:335
+#: ../siteconfig.c:196
+#, c-format
 msgid "Restrict access to Internet mail"
 msgstr "Zugang zu Internet Mail limitieren"
 
-#: ../siteconfig.c:348
+#: ../siteconfig.c:204
+#, c-format
 msgid "Geographic location of this system"
 msgstr "Geographische Position dieses Systems"
 
-#: ../siteconfig.c:360
+#: ../siteconfig.c:211
+#, c-format
 msgid "Name of system administrator"
 msgstr "Name des Verwalters"
 
-#: ../siteconfig.c:372
+#: ../siteconfig.c:218
+#, c-format
 msgid "Maximum concurrent sessions (0 = no limit)"
 msgstr "Maximale Anzahl gleichzeitiger Verbindungen (0 = kein Limit)"
 
-#: ../siteconfig.c:384
+#: ../siteconfig.c:225
+#, c-format
 msgid "Default user purge time (days)"
 msgstr "Automatisch inaktive Nutzer löschen nach (Tage)"
 
-#: ../siteconfig.c:396
+#: ../siteconfig.c:232
+#, c-format
 msgid "Default room purge time (days)"
 msgstr "Automatische Raum Löschung nach (Tage)"
 
-#: ../siteconfig.c:408
+#: ../siteconfig.c:239
+#, c-format
 msgid "Name of room to log pages"
 msgstr "Name des Raums zum Loggen von Kurznachrichten"
 
-#: ../siteconfig.c:420
+#: ../siteconfig.c:246
+#, c-format
 msgid "Access level required to create rooms"
 msgstr "Zugangsberechtigung um Räume zu erzeugen"
 
-#: ../siteconfig.c:439
+#: ../siteconfig.c:260
+#, c-format
 msgid "Maximum message length"
 msgstr "Maximale Nachrichten Länge"
 
-#: ../siteconfig.c:451
+#: ../siteconfig.c:267
+#, c-format
 msgid "Minimum number of worker threads"
 msgstr "Minimale Anzahl Server-Threads"
 
-#: ../siteconfig.c:463
+#: ../siteconfig.c:274
+#, c-format
 msgid "Maximum number of worker threads"
 msgstr "Maximale Anzahl Server-Threads"
 
-#: ../siteconfig.c:475
+#: ../siteconfig.c:281
+#, c-format
 msgid "POP3 listener port (-1 to disable)"
 msgstr "POP3 Server Port (-1 zum abschalten)"
 
-#: ../siteconfig.c:487
+#: ../siteconfig.c:288
+#, c-format
 msgid "SMTP MTA port (-1 to disable)"
 msgstr "SMTP MTA Server Port (-1 zum abschalten)"
 
-#: ../siteconfig.c:499
+#: ../siteconfig.c:298
+#, c-format
 msgid "Allow aides to zap (forget) rooms"
 msgstr "Moderatoren erlauben Räume zu Vergessen"
 
-#: ../siteconfig.c:512
+#: ../siteconfig.c:306
+#, c-format
 msgid "IMAP listener port (-1 to disable)"
 msgstr "IMAP4 Server Port (-1 zum abschalten)"
 
-#: ../siteconfig.c:524
+#: ../siteconfig.c:313
+#, c-format
 msgid "Network run frequency (in seconds)"
 msgstr "Knoten Synchronisierunsfrequenz (in Sekunden)"
 
-#: ../siteconfig.c:536
+#: ../siteconfig.c:320
+#, c-format
 msgid "Disable self-service user account creation"
 msgstr "Erzeugen von Accounts am Anmeldeprompt verbieten"
 
-#: ../siteconfig.c:552
+#: ../siteconfig.c:328
+#, c-format
 msgid "Hour to run database auto-purge"
 msgstr "Zeit, an der die Raumsäuberungen laufen sollen"
 
-#: ../siteconfig.c:573
+#: ../siteconfig.c:344
+#, c-format
 msgid "Host name of LDAP server (blank to disable)"
 msgstr "Hostname des LDAP Verzeichnisserver (leer zum Abschalten)"
 
-#: ../siteconfig.c:585
+#: ../siteconfig.c:351
+#, c-format
 msgid "Port number of LDAP server (blank to disable)"
 msgstr "Port des LDAP Verzeichnisservers (leer zum Abschalten)"
 
-#: ../siteconfig.c:597
+#: ../siteconfig.c:358
+#, c-format
 msgid "Base DN"
 msgstr "Base DN im Verzeichnisserver"
 
-#: ../siteconfig.c:609
+#: ../siteconfig.c:365
+#, c-format
 msgid "Bind DN"
 msgstr "Bind DN im Verzeichnisserver"
 
-#: ../siteconfig.c:621
+#: ../siteconfig.c:372
+#, c-format
 msgid "Password for bind DN"
 msgstr "Passwort für die Bind DN am Verzeichnisserver"
 
-#: ../siteconfig.c:634
+#: ../siteconfig.c:380
+#, c-format
 msgid "Server IP address (0.0.0.0 for 'any')"
 msgstr "Server IP-Adresse (0.0.0.0 um alle zu binden)"
 
-#: ../siteconfig.c:646
+#: ../siteconfig.c:387
+#, c-format
 msgid "SMTP MSA port (-1 to disable)"
 msgstr "SMTP MSA Serverport (-1 zum abschalten)"
 
-#: ../siteconfig.c:658
+#: ../siteconfig.c:394
+#, c-format
 msgid "IMAP over SSL port (-1 to disable)"
 msgstr "IMAP-SSL Serverport (-1 zum abschalten)"
 
-#: ../siteconfig.c:670
+#: ../siteconfig.c:401
+#, c-format
 msgid "POP3 over SSL port (-1 to disable)"
 msgstr "POP3s Serverport (-1 zum Abschalten)"
 
-#: ../siteconfig.c:682
+#: ../siteconfig.c:408
+#, c-format
 msgid "SMTP over SSL port (-1 to disable)"
 msgstr "SMTPS Serverport (-1 zum Abschalten)"
 
-#: ../siteconfig.c:694
-msgid "Enable full text index (warning: resource intensive)"
-msgstr "Volltext Indexdienst anschalten (Warnung: resourcenintensiv!)"
+#: ../siteconfig.c:415
+#, c-format
+msgid "Enable full text index"
+msgstr "Volltext Indexdienst anschalten"
 
-#: ../siteconfig.c:707
+#: ../siteconfig.c:423
+#, c-format
 msgid "Automatically delete committed database logs"
 msgstr "Automatisch die Datenbanktransferlogs löschen"
 
-#: ../siteconfig.c:720
+#: ../siteconfig.c:431
+#, c-format
 msgid "Instantly expunge deleted messages in IMAP"
 msgstr "Löschen via IMAP nicht cachen?"
 
-#: ../siteconfig.c:733
+#: ../siteconfig.c:439
+#, c-format
 msgid "Allow unauthenticated SMTP clients to spoof this site's domains"
 msgstr "Mail Relaying anschalten (nicht empfohlen bei öffentlichen Servern)"
 
-#: ../siteconfig.c:765
+#: ../siteconfig.c:466
+#, c-format
 msgid "Default message expire policy for public rooms"
 msgstr ""
 "Vorgabewerte für die Gültigkeitsdauer von Nachrichten in öffentlichen Räumen"
 
-#: ../siteconfig.c:786
+#: ../siteconfig.c:487
+#, c-format
 msgid "Default message expire policy for private mailboxes"
 msgstr ""
 "Vorgabewerte für die Gültigkeitsdauer von Nachrichten in privaten Mailboxen"
 
-#: ../siteconfig.c:790
+#: ../siteconfig.c:491
+#, c-format
 msgid "Same policy as public rooms"
 msgstr "Die selben Werte wie in öffentlichen Räumen"
 
-#: ../siteconfig.c:896
+#: ../siteconfig.c:611
 msgid "Your system configuration has been updated."
 msgstr "Ihre Systemkonfiguration wurde Übernommen"
 
@@ -2728,5 +2782,11 @@ msgstr "Rechnername setzen"
 msgid "Change user name"
 msgstr "Benutzername ändern"
 
+#~ msgid "Citadel LDAP connector configuration"
+#~ msgstr "Citadel LDAP Verzeichnisserver Anbindung"
+
+#~ msgid "Message auto-purger settings"
+#~ msgstr "Einstellungen automatischer Nachrichtensäuberer"
+
 #~ msgid "Instant message from "
 #~ msgstr "Kurznachricht von "
diff --git a/webcit/po/it.po b/webcit/po/it.po
index 319eefc4b..63a9cfa61 100644
--- a/webcit/po/it.po
+++ b/webcit/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-06 11:21-0500\n"
+"POT-Creation-Date: 2006-01-09 12:44-0500\n"
 "PO-Revision-Date: 2005-12-12 09:18+0100\n"
 "Last-Translator: Gabriele Tassoni <tasso@fastwebnet.it>\n"
 "Language-Team: italian <it@li.org>\n"
@@ -150,7 +150,7 @@ msgstr "Cambia la password"
 #: ../iconbar.c:699 ../mainmenu.c:298 ../messages.c:2659 ../messages.c:2770
 #: ../messages.c:2856 ../netconf.c:79 ../netconf.c:139 ../paging.c:56
 #: ../preferences.c:361 ../roomops.c:1175 ../roomops.c:1503 ../roomops.c:1932
-#: ../roomops.c:2081 ../roomops.c:2145 ../siteconfig.c:821 ../sysmsgs.c:52
+#: ../roomops.c:2081 ../roomops.c:2145 ../siteconfig.c:533 ../sysmsgs.c:52
 #: ../useredit.c:366 ../vcard_edit.c:330 ../who.c:268
 msgid "Cancel"
 msgstr "Cancella"
@@ -513,7 +513,7 @@ msgstr "Controlla la disponibilit&agrave; del membro."
 msgid "Add/change/delete floors"
 msgstr "Agiungi, cambia o cancella i piani"
 
-#: ../floors.c:48 ../siteconfig.c:175 ../vcard_edit.c:72
+#: ../floors.c:48 ../siteconfig.c:46 ../vcard_edit.c:72
 msgid "Error"
 msgstr "Errore"
 
@@ -801,7 +801,7 @@ msgid "Displays the 'Powered by Citadel' icon"
 msgstr "Mostra l'icona Potenziato da Citadel"
 
 #: ../iconbar.c:698 ../netconf.c:136 ../roomops.c:1174 ../roomops.c:1501
-#: ../siteconfig.c:819 ../sysmsgs.c:50 ../useredit.c:366 ../vcard_edit.c:329
+#: ../siteconfig.c:531 ../sysmsgs.c:50 ../useredit.c:366 ../vcard_edit.c:329
 msgid "Save changes"
 msgstr "Cambia i cambiamenti"
 
@@ -1354,7 +1354,8 @@ msgstr "Il messaggio non è stato spostato"
 msgid "Add a new node"
 msgstr "Aggiungi un nuovo nodo"
 
-#: ../netconf.c:68 ../netconf.c:119 ../siteconfig.c:193
+#: ../netconf.c:68 ../netconf.c:119 ../siteconfig.c:109
+#, c-format
 msgid "Node name"
 msgstr "Nome del nodo"
 
@@ -1833,19 +1834,23 @@ msgstr "Politica di cancellazione dei messaggi per questa stanza"
 msgid "Use the default policy for this floor"
 msgstr "Usa la politica di default per questo piano"
 
-#: ../roomops.c:1457 ../roomops.c:1484 ../siteconfig.c:769 ../siteconfig.c:794
+#: ../roomops.c:1457 ../roomops.c:1484 ../siteconfig.c:470 ../siteconfig.c:495
+#, c-format
 msgid "Never automatically expire messages"
 msgstr "Non permettere ai messaggi di auto cancellarsi"
 
-#: ../roomops.c:1461 ../roomops.c:1488 ../siteconfig.c:773 ../siteconfig.c:798
+#: ../roomops.c:1461 ../roomops.c:1488 ../siteconfig.c:474 ../siteconfig.c:499
+#, c-format
 msgid "Expire by message count"
 msgstr "Cancella per numero di messaggi"
 
-#: ../roomops.c:1465 ../roomops.c:1492 ../siteconfig.c:777 ../siteconfig.c:802
+#: ../roomops.c:1465 ../roomops.c:1492 ../siteconfig.c:478 ../siteconfig.c:503
+#, c-format
 msgid "Expire by message age"
 msgstr "Elimina per età del messaggio"
 
-#: ../roomops.c:1467 ../roomops.c:1494 ../siteconfig.c:779 ../siteconfig.c:804
+#: ../roomops.c:1467 ../roomops.c:1494 ../siteconfig.c:480 ../siteconfig.c:505
+#, c-format
 msgid "Number of messages or days: "
 msgstr "Numero di messaggi o giorni:"
 
@@ -1997,59 +2002,51 @@ msgid "Error retrieving RSS feed: couldn't find messages\n"
 msgstr ""
 "Errore nella ricezione del RSS: non riesco a trovare dei messaggi</br>\n"
 
-#: ../siteconfig.c:28
+#: ../siteconfig.c:35
 msgid "Site configuration"
 msgstr "Configurazione del sito"
 
-#: ../siteconfig.c:51
+#: ../siteconfig.c:58
 msgid "General"
 msgstr "Generale"
 
-#: ../siteconfig.c:52 ../siteconfig.c:128
-msgid "General site configuration items"
-msgstr "Oggetti di configurazione generali del sito"
-
-#: ../siteconfig.c:64
+#: ../siteconfig.c:59
 msgid "Access"
 msgstr "Accesso"
 
-#: ../siteconfig.c:65 ../siteconfig.c:134
-msgid "Access controls and site policy settings"
-msgstr "Controlli di accesso e impostazioni delle politiche del sito"
-
-#: ../siteconfig.c:77
+#: ../siteconfig.c:60
 msgid "Network"
 msgstr "Rete"
 
-#: ../siteconfig.c:78 ../siteconfig.c:140
-msgid "Network services"
-msgstr "Servizi di rete"
-
-#: ../siteconfig.c:90
+#: ../siteconfig.c:61
 msgid "Tuning"
 msgstr "Rifiniture"
 
-#: ../siteconfig.c:91 ../siteconfig.c:149
-msgid "Advanced server fine-tuning controls"
-msgstr "Controlli avanzati per la configurazione delle rifiniture "
-
-#: ../siteconfig.c:103
+#: ../siteconfig.c:62
 msgid "Directory"
 msgstr "Direttorio"
 
-#: ../siteconfig.c:104
-msgid "Configure the LDAP connector for Citadel"
-msgstr "Configura il connettore LDAP per Citadel"
-
-#: ../siteconfig.c:116
+#: ../siteconfig.c:63
 msgid "Auto-purger"
 msgstr "Eliminatore automatico"
 
-#: ../siteconfig.c:117
-msgid "Configure automatic expiry of old messages"
-msgstr "Configura la cancellazione automatica dei vecchi messaggi"
+#: ../siteconfig.c:64
+msgid "Indexing/Journaling"
+msgstr ""
+
+#: ../siteconfig.c:68
+msgid "General site configuration items"
+msgstr "Oggetti di configurazione generali del sito"
+
+#: ../siteconfig.c:72
+msgid "Access controls and site policy settings"
+msgstr "Controlli di accesso e impostazioni delle politiche del sito"
+
+#: ../siteconfig.c:76
+msgid "Network services"
+msgstr "Servizi di rete"
 
-#: ../siteconfig.c:142 ../siteconfig.c:157
+#: ../siteconfig.c:77 ../siteconfig.c:87
 msgid ""
 "Changes made on this screen will not take effect until you restart the "
 "Citadel server."
@@ -2057,207 +2054,262 @@ msgstr ""
 "I cambiamenti in questa schemata non avranno effetto finchè non si riavvia "
 "il server Citadel."
 
-#: ../siteconfig.c:155
-msgid "Citadel LDAP connector configuration"
-msgstr "Configuratione del connettore LDAP di Citadel"
+#: ../siteconfig.c:82
+msgid "Advanced server fine-tuning controls"
+msgstr "Controlli avanzati per la configurazione delle rifiniture "
 
-#: ../siteconfig.c:164
-msgid "Message auto-purger settings"
-msgstr "Impostazioni dell'eliminatore automatico dei messaggi"
+#: ../siteconfig.c:86
+msgid "Configure the LDAP connector for Citadel"
+msgstr "Configura il connettore LDAP per Citadel"
 
-#: ../siteconfig.c:166
+#: ../siteconfig.c:92
+msgid "Configure automatic expiry of old messages"
+msgstr "Configura la cancellazione automatica dei vecchi messaggi"
+
+#: ../siteconfig.c:93
 msgid "These settings may be overridden on a per-floor or per-room basis."
 msgstr ""
 "Queste impostazioni possono essere escluse da impostazioni specifiche alla "
 "stanza o al piano."
 
-#: ../siteconfig.c:205
+#: ../siteconfig.c:97
+msgid "Indexing and Journaling"
+msgstr ""
+
+#: ../siteconfig.c:98
+msgid "Warning: these facilities are resource intensive."
+msgstr ""
+
+#: ../siteconfig.c:116
+#, c-format
 msgid "Fully qualified domain name"
 msgstr "Nome di dominio completo"
 
-#: ../siteconfig.c:217
+#: ../siteconfig.c:123
+#, c-format
 msgid "Human-readable node name"
 msgstr "Nome del nodo leggibile da umani"
 
-#: ../siteconfig.c:229
+#: ../siteconfig.c:130
+#, c-format
 msgid "Telephone number"
 msgstr "Numero di telefono"
 
-#: ../siteconfig.c:241
+#: ../siteconfig.c:137
+#, c-format
 msgid "Automatically grant room-aide status to users who create private rooms"
 msgstr ""
 "Imposta automaticamente lo stato di aide per la stanza agli utenti che "
 "creano stanze private"
 
-#: ../siteconfig.c:254
+#: ../siteconfig.c:145
+#, c-format
 msgid "Server connection idle timeout (in seconds)"
 msgstr "Timeout della connessione per il server in attesa (in secondi)"
 
-#: ../siteconfig.c:266
+#: ../siteconfig.c:152
+#, c-format
 msgid "Initial access level for new users"
 msgstr "Livello di accesso iniziale per i nuovi utenti"
 
-#: ../siteconfig.c:285
+#: ../siteconfig.c:166
+#, c-format
 msgid "Require registration for new users"
 msgstr "Richiedi la registrazione per i nuovo utenti"
 
-#: ../siteconfig.c:298
+#: ../siteconfig.c:174
+#, c-format
 msgid "Quarantine messages from problem users"
 msgstr "Poni in quarantena i messaggi da utenti con problemi"
 
-#: ../siteconfig.c:311
+#: ../siteconfig.c:182
+#, c-format
 msgid "Name of quarantine room"
 msgstr "Nome della stanza di quarantena"
 
-#: ../siteconfig.c:323
+#: ../siteconfig.c:189
+#, c-format
 msgid "Paginator prompt (for text mode clients)"
 msgstr "Richiamo di impaginazione (per i client solo testo)"
 
-#: ../siteconfig.c:335
+#: ../siteconfig.c:196
+#, c-format
 msgid "Restrict access to Internet mail"
 msgstr "Restringi l'accesso alla posta internet"
 
-#: ../siteconfig.c:348
+#: ../siteconfig.c:204
+#, c-format
 msgid "Geographic location of this system"
 msgstr "Località geografica di questo server"
 
-#: ../siteconfig.c:360
+#: ../siteconfig.c:211
+#, c-format
 msgid "Name of system administrator"
 msgstr "Nome dell'amministratore di sistema"
 
-#: ../siteconfig.c:372
+#: ../siteconfig.c:218
+#, c-format
 msgid "Maximum concurrent sessions (0 = no limit)"
 msgstr "Numero massimo di sessioni concorrenti (0 = nessun limite)"
 
-#: ../siteconfig.c:384
+#: ../siteconfig.c:225
+#, c-format
 msgid "Default user purge time (days)"
 msgstr "Tempo di eliminazione di default degli utenti (in giorni)"
 
-#: ../siteconfig.c:396
+#: ../siteconfig.c:232
+#, c-format
 msgid "Default room purge time (days)"
 msgstr "Tempo di eliminazioni di default delle stanze (in giorni)"
 
-#: ../siteconfig.c:408
+#: ../siteconfig.c:239
+#, c-format
 msgid "Name of room to log pages"
 msgstr "Nome delle stanze per il log delle pagine"
 
-#: ../siteconfig.c:420
+#: ../siteconfig.c:246
+#, c-format
 msgid "Access level required to create rooms"
 msgstr "Livello di accesso richiesto per creare le stanze"
 
-#: ../siteconfig.c:439
+#: ../siteconfig.c:260
+#, c-format
 msgid "Maximum message length"
 msgstr "Massima lunghezza dei messaggi"
 
-#: ../siteconfig.c:451
+#: ../siteconfig.c:267
+#, c-format
 msgid "Minimum number of worker threads"
 msgstr "Numero minimo di discussioni attive"
 
-#: ../siteconfig.c:463
+#: ../siteconfig.c:274
+#, c-format
 msgid "Maximum number of worker threads"
 msgstr "Massimo numero di discussioni attive"
 
-#: ../siteconfig.c:475
+#: ../siteconfig.c:281
+#, c-format
 msgid "POP3 listener port (-1 to disable)"
 msgstr "Porta POP3 (-1 per disabilitare)"
 
-#: ../siteconfig.c:487
+#: ../siteconfig.c:288
+#, c-format
 msgid "SMTP MTA port (-1 to disable)"
 msgstr "Porta SMTP MTA (-1 per disabilitare)"
 
-#: ../siteconfig.c:499
+#: ../siteconfig.c:298
+#, c-format
 msgid "Allow aides to zap (forget) rooms"
 msgstr "Permetti agli aide di dimenticare le stanze"
 
-#: ../siteconfig.c:512
+#: ../siteconfig.c:306
+#, c-format
 msgid "IMAP listener port (-1 to disable)"
 msgstr "Porta IMAP (-1 per disabilitare)"
 
-#: ../siteconfig.c:524
+#: ../siteconfig.c:313
+#, c-format
 msgid "Network run frequency (in seconds)"
 msgstr "Velocità della rete (in secondi)"
 
-#: ../siteconfig.c:536
+#: ../siteconfig.c:320
+#, c-format
 msgid "Disable self-service user account creation"
 msgstr "Disabilita l'autocreazione degli account utente"
 
-#: ../siteconfig.c:552
+#: ../siteconfig.c:328
+#, c-format
 msgid "Hour to run database auto-purge"
 msgstr "Ora in cui lanciare la pulizia del database"
 
-#: ../siteconfig.c:573
+#: ../siteconfig.c:344
+#, c-format
 msgid "Host name of LDAP server (blank to disable)"
 msgstr "Nome del server LDAP (vuoto per disabilitare)"
 
-#: ../siteconfig.c:585
+#: ../siteconfig.c:351
+#, c-format
 msgid "Port number of LDAP server (blank to disable)"
 msgstr "Nuero di porta del server LDAP (vuoto per disabilitare)"
 
-#: ../siteconfig.c:597
+#: ../siteconfig.c:358
+#, c-format
 msgid "Base DN"
 msgstr "DN di base"
 
-#: ../siteconfig.c:609
+#: ../siteconfig.c:365
+#, c-format
 msgid "Bind DN"
 msgstr "DN bind"
 
-#: ../siteconfig.c:621
+#: ../siteconfig.c:372
+#, c-format
 msgid "Password for bind DN"
 msgstr "Password per il DN bind"
 
-#: ../siteconfig.c:634
+#: ../siteconfig.c:380
+#, c-format
 msgid "Server IP address (0.0.0.0 for 'any')"
 msgstr "Indirizzo ip del server (0.0.0.0 per 'qualsiasi')"
 
-#: ../siteconfig.c:646
+#: ../siteconfig.c:387
+#, c-format
 msgid "SMTP MSA port (-1 to disable)"
 msgstr "Porta SMTP MSA (-1 per disabilitare)"
 
-#: ../siteconfig.c:658
+#: ../siteconfig.c:394
+#, c-format
 msgid "IMAP over SSL port (-1 to disable)"
 msgstr "Porta IMAP SSL (-1 per disabiliare)"
 
-#: ../siteconfig.c:670
+#: ../siteconfig.c:401
+#, c-format
 msgid "POP3 over SSL port (-1 to disable)"
 msgstr "Porta POP3 SSL (-1 per disabilitare)"
 
-#: ../siteconfig.c:682
+#: ../siteconfig.c:408
+#, c-format
 msgid "SMTP over SSL port (-1 to disable)"
 msgstr "Porta SMTP SSL (-1 per disabilitare)"
 
-#: ../siteconfig.c:694
-msgid "Enable full text index (warning: resource intensive)"
-msgstr ""
-"Abilita l'indicizzazione completa dei testi (attenzione: richiede molte "
-"risorse)"
+#: ../siteconfig.c:415
+#, c-format
+msgid "Enable full text index"
+msgstr "Abilita l'indicizzazione completa dei testi"
 
-#: ../siteconfig.c:707
+#: ../siteconfig.c:423
+#, c-format
 msgid "Automatically delete committed database logs"
 msgstr "Cancella automaticamente i log del database approvati"
 
-#: ../siteconfig.c:720
+#: ../siteconfig.c:431
+#, c-format
 msgid "Instantly expunge deleted messages in IMAP"
 msgstr "Elimina automaticamente i messaggi cancellati nelle cartelle IMAP"
 
-#: ../siteconfig.c:733
+#: ../siteconfig.c:439
+#, c-format
 msgid "Allow unauthenticated SMTP clients to spoof this site's domains"
 msgstr ""
 "Permetti ai client SMTP non autenticati lo spoofing dei domini del server"
 
-#: ../siteconfig.c:765
+#: ../siteconfig.c:466
+#, c-format
 msgid "Default message expire policy for public rooms"
 msgstr "Politica di default per la cancellazione delle stanze publiche"
 
-#: ../siteconfig.c:786
+#: ../siteconfig.c:487
+#, c-format
 msgid "Default message expire policy for private mailboxes"
 msgstr ""
 "Politica di default per la cancellazione delle cassette postali private"
 
-#: ../siteconfig.c:790
+#: ../siteconfig.c:491
+#, c-format
 msgid "Same policy as public rooms"
 msgstr "Stessa politica delle stanze private"
 
-#: ../siteconfig.c:896
+#: ../siteconfig.c:611
 msgid "Your system configuration has been updated."
 msgstr "La configurazione del tuo sistema è stata aggiornata"
 
@@ -2749,5 +2801,11 @@ msgstr "Cambia il nome dell'host"
 msgid "Change user name"
 msgstr "Cambia nome utente"
 
+#~ msgid "Citadel LDAP connector configuration"
+#~ msgstr "Configuratione del connettore LDAP di Citadel"
+
+#~ msgid "Message auto-purger settings"
+#~ msgstr "Impostazioni dell'eliminatore automatico dei messaggi"
+
 #~ msgid "Instant message from "
 #~ msgstr "Messaggio Istantaneo da"
diff --git a/webcit/po/webcit.pot b/webcit/po/webcit.pot
index 7a9232a65..defa34b6d 100644
--- a/webcit/po/webcit.pot
+++ b/webcit/po/webcit.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-06 11:21-0500\n"
+"POT-Creation-Date: 2006-01-09 12:44-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -140,7 +140,7 @@ msgstr ""
 #: ../iconbar.c:699 ../mainmenu.c:298 ../messages.c:2659 ../messages.c:2770
 #: ../messages.c:2856 ../netconf.c:79 ../netconf.c:139 ../paging.c:56
 #: ../preferences.c:361 ../roomops.c:1175 ../roomops.c:1503 ../roomops.c:1932
-#: ../roomops.c:2081 ../roomops.c:2145 ../siteconfig.c:821 ../sysmsgs.c:52
+#: ../roomops.c:2081 ../roomops.c:2145 ../siteconfig.c:533 ../sysmsgs.c:52
 #: ../useredit.c:366 ../vcard_edit.c:330 ../who.c:268
 msgid "Cancel"
 msgstr ""
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Add/change/delete floors"
 msgstr ""
 
-#: ../floors.c:48 ../siteconfig.c:175 ../vcard_edit.c:72
+#: ../floors.c:48 ../siteconfig.c:46 ../vcard_edit.c:72
 msgid "Error"
 msgstr ""
 
@@ -754,7 +754,7 @@ msgid "Displays the 'Powered by Citadel' icon"
 msgstr ""
 
 #: ../iconbar.c:698 ../netconf.c:136 ../roomops.c:1174 ../roomops.c:1501
-#: ../siteconfig.c:819 ../sysmsgs.c:50 ../useredit.c:366 ../vcard_edit.c:329
+#: ../siteconfig.c:531 ../sysmsgs.c:50 ../useredit.c:366 ../vcard_edit.c:329
 msgid "Save changes"
 msgstr ""
 
@@ -1293,7 +1293,8 @@ msgstr ""
 msgid "Add a new node"
 msgstr ""
 
-#: ../netconf.c:68 ../netconf.c:119 ../siteconfig.c:193
+#: ../netconf.c:68 ../netconf.c:119 ../siteconfig.c:109
+#, c-format
 msgid "Node name"
 msgstr ""
 
@@ -1752,19 +1753,23 @@ msgstr ""
 msgid "Use the default policy for this floor"
 msgstr ""
 
-#: ../roomops.c:1457 ../roomops.c:1484 ../siteconfig.c:769 ../siteconfig.c:794
+#: ../roomops.c:1457 ../roomops.c:1484 ../siteconfig.c:470 ../siteconfig.c:495
+#, c-format
 msgid "Never automatically expire messages"
 msgstr ""
 
-#: ../roomops.c:1461 ../roomops.c:1488 ../siteconfig.c:773 ../siteconfig.c:798
+#: ../roomops.c:1461 ../roomops.c:1488 ../siteconfig.c:474 ../siteconfig.c:499
+#, c-format
 msgid "Expire by message count"
 msgstr ""
 
-#: ../roomops.c:1465 ../roomops.c:1492 ../siteconfig.c:777 ../siteconfig.c:802
+#: ../roomops.c:1465 ../roomops.c:1492 ../siteconfig.c:478 ../siteconfig.c:503
+#, c-format
 msgid "Expire by message age"
 msgstr ""
 
-#: ../roomops.c:1467 ../roomops.c:1494 ../siteconfig.c:779 ../siteconfig.c:804
+#: ../roomops.c:1467 ../roomops.c:1494 ../siteconfig.c:480 ../siteconfig.c:505
+#, c-format
 msgid "Number of messages or days: "
 msgstr ""
 
@@ -1905,257 +1910,306 @@ msgstr ""
 msgid "Error retrieving RSS feed: couldn't find messages\n"
 msgstr ""
 
-#: ../siteconfig.c:28
+#: ../siteconfig.c:35
 msgid "Site configuration"
 msgstr ""
 
-#: ../siteconfig.c:51
+#: ../siteconfig.c:58
 msgid "General"
 msgstr ""
 
-#: ../siteconfig.c:52 ../siteconfig.c:128
-msgid "General site configuration items"
-msgstr ""
-
-#: ../siteconfig.c:64
+#: ../siteconfig.c:59
 msgid "Access"
 msgstr ""
 
-#: ../siteconfig.c:65 ../siteconfig.c:134
-msgid "Access controls and site policy settings"
-msgstr ""
-
-#: ../siteconfig.c:77
+#: ../siteconfig.c:60
 msgid "Network"
 msgstr ""
 
-#: ../siteconfig.c:78 ../siteconfig.c:140
-msgid "Network services"
+#: ../siteconfig.c:61
+msgid "Tuning"
 msgstr ""
 
-#: ../siteconfig.c:90
-msgid "Tuning"
+#: ../siteconfig.c:62
+msgid "Directory"
 msgstr ""
 
-#: ../siteconfig.c:91 ../siteconfig.c:149
-msgid "Advanced server fine-tuning controls"
+#: ../siteconfig.c:63
+msgid "Auto-purger"
 msgstr ""
 
-#: ../siteconfig.c:103
-msgid "Directory"
+#: ../siteconfig.c:64
+msgid "Indexing/Journaling"
 msgstr ""
 
-#: ../siteconfig.c:104
-msgid "Configure the LDAP connector for Citadel"
+#: ../siteconfig.c:68
+msgid "General site configuration items"
 msgstr ""
 
-#: ../siteconfig.c:116
-msgid "Auto-purger"
+#: ../siteconfig.c:72
+msgid "Access controls and site policy settings"
 msgstr ""
 
-#: ../siteconfig.c:117
-msgid "Configure automatic expiry of old messages"
+#: ../siteconfig.c:76
+msgid "Network services"
 msgstr ""
 
-#: ../siteconfig.c:142 ../siteconfig.c:157
+#: ../siteconfig.c:77 ../siteconfig.c:87
 msgid ""
 "Changes made on this screen will not take effect until you restart the "
 "Citadel server."
 msgstr ""
 
-#: ../siteconfig.c:155
-msgid "Citadel LDAP connector configuration"
+#: ../siteconfig.c:82
+msgid "Advanced server fine-tuning controls"
 msgstr ""
 
-#: ../siteconfig.c:164
-msgid "Message auto-purger settings"
+#: ../siteconfig.c:86
+msgid "Configure the LDAP connector for Citadel"
 msgstr ""
 
-#: ../siteconfig.c:166
+#: ../siteconfig.c:92
+msgid "Configure automatic expiry of old messages"
+msgstr ""
+
+#: ../siteconfig.c:93
 msgid "These settings may be overridden on a per-floor or per-room basis."
 msgstr ""
 
-#: ../siteconfig.c:205
+#: ../siteconfig.c:97
+msgid "Indexing and Journaling"
+msgstr ""
+
+#: ../siteconfig.c:98
+msgid "Warning: these facilities are resource intensive."
+msgstr ""
+
+#: ../siteconfig.c:116
+#, c-format
 msgid "Fully qualified domain name"
 msgstr ""
 
-#: ../siteconfig.c:217
+#: ../siteconfig.c:123
+#, c-format
 msgid "Human-readable node name"
 msgstr ""
 
-#: ../siteconfig.c:229
+#: ../siteconfig.c:130
+#, c-format
 msgid "Telephone number"
 msgstr ""
 
-#: ../siteconfig.c:241
+#: ../siteconfig.c:137
+#, c-format
 msgid "Automatically grant room-aide status to users who create private rooms"
 msgstr ""
 
-#: ../siteconfig.c:254
+#: ../siteconfig.c:145
+#, c-format
 msgid "Server connection idle timeout (in seconds)"
 msgstr ""
 
-#: ../siteconfig.c:266
+#: ../siteconfig.c:152
+#, c-format
 msgid "Initial access level for new users"
 msgstr ""
 
-#: ../siteconfig.c:285
+#: ../siteconfig.c:166
+#, c-format
 msgid "Require registration for new users"
 msgstr ""
 
-#: ../siteconfig.c:298
+#: ../siteconfig.c:174
+#, c-format
 msgid "Quarantine messages from problem users"
 msgstr ""
 
-#: ../siteconfig.c:311
+#: ../siteconfig.c:182
+#, c-format
 msgid "Name of quarantine room"
 msgstr ""
 
-#: ../siteconfig.c:323
+#: ../siteconfig.c:189
+#, c-format
 msgid "Paginator prompt (for text mode clients)"
 msgstr ""
 
-#: ../siteconfig.c:335
+#: ../siteconfig.c:196
+#, c-format
 msgid "Restrict access to Internet mail"
 msgstr ""
 
-#: ../siteconfig.c:348
+#: ../siteconfig.c:204
+#, c-format
 msgid "Geographic location of this system"
 msgstr ""
 
-#: ../siteconfig.c:360
+#: ../siteconfig.c:211
+#, c-format
 msgid "Name of system administrator"
 msgstr ""
 
-#: ../siteconfig.c:372
+#: ../siteconfig.c:218
+#, c-format
 msgid "Maximum concurrent sessions (0 = no limit)"
 msgstr ""
 
-#: ../siteconfig.c:384
+#: ../siteconfig.c:225
+#, c-format
 msgid "Default user purge time (days)"
 msgstr ""
 
-#: ../siteconfig.c:396
+#: ../siteconfig.c:232
+#, c-format
 msgid "Default room purge time (days)"
 msgstr ""
 
-#: ../siteconfig.c:408
+#: ../siteconfig.c:239
+#, c-format
 msgid "Name of room to log pages"
 msgstr ""
 
-#: ../siteconfig.c:420
+#: ../siteconfig.c:246
+#, c-format
 msgid "Access level required to create rooms"
 msgstr ""
 
-#: ../siteconfig.c:439
+#: ../siteconfig.c:260
+#, c-format
 msgid "Maximum message length"
 msgstr ""
 
-#: ../siteconfig.c:451
+#: ../siteconfig.c:267
+#, c-format
 msgid "Minimum number of worker threads"
 msgstr ""
 
-#: ../siteconfig.c:463
+#: ../siteconfig.c:274
+#, c-format
 msgid "Maximum number of worker threads"
 msgstr ""
 
-#: ../siteconfig.c:475
+#: ../siteconfig.c:281
+#, c-format
 msgid "POP3 listener port (-1 to disable)"
 msgstr ""
 
-#: ../siteconfig.c:487
+#: ../siteconfig.c:288
+#, c-format
 msgid "SMTP MTA port (-1 to disable)"
 msgstr ""
 
-#: ../siteconfig.c:499
+#: ../siteconfig.c:298
+#, c-format
 msgid "Allow aides to zap (forget) rooms"
 msgstr ""
 
-#: ../siteconfig.c:512
+#: ../siteconfig.c:306
+#, c-format
 msgid "IMAP listener port (-1 to disable)"
 msgstr ""
 
-#: ../siteconfig.c:524
+#: ../siteconfig.c:313
+#, c-format
 msgid "Network run frequency (in seconds)"
 msgstr ""
 
-#: ../siteconfig.c:536
+#: ../siteconfig.c:320
+#, c-format
 msgid "Disable self-service user account creation"
 msgstr ""
 
-#: ../siteconfig.c:552
+#: ../siteconfig.c:328
+#, c-format
 msgid "Hour to run database auto-purge"
 msgstr ""
 
-#: ../siteconfig.c:573
+#: ../siteconfig.c:344
+#, c-format
 msgid "Host name of LDAP server (blank to disable)"
 msgstr ""
 
-#: ../siteconfig.c:585
+#: ../siteconfig.c:351
+#, c-format
 msgid "Port number of LDAP server (blank to disable)"
 msgstr ""
 
-#: ../siteconfig.c:597
+#: ../siteconfig.c:358
+#, c-format
 msgid "Base DN"
 msgstr ""
 
-#: ../siteconfig.c:609
+#: ../siteconfig.c:365
+#, c-format
 msgid "Bind DN"
 msgstr ""
 
-#: ../siteconfig.c:621
+#: ../siteconfig.c:372
+#, c-format
 msgid "Password for bind DN"
 msgstr ""
 
-#: ../siteconfig.c:634
+#: ../siteconfig.c:380
+#, c-format
 msgid "Server IP address (0.0.0.0 for 'any')"
 msgstr ""
 
-#: ../siteconfig.c:646
+#: ../siteconfig.c:387
+#, c-format
 msgid "SMTP MSA port (-1 to disable)"
 msgstr ""
 
-#: ../siteconfig.c:658
+#: ../siteconfig.c:394
+#, c-format
 msgid "IMAP over SSL port (-1 to disable)"
 msgstr ""
 
-#: ../siteconfig.c:670
+#: ../siteconfig.c:401
+#, c-format
 msgid "POP3 over SSL port (-1 to disable)"
 msgstr ""
 
-#: ../siteconfig.c:682
+#: ../siteconfig.c:408
+#, c-format
 msgid "SMTP over SSL port (-1 to disable)"
 msgstr ""
 
-#: ../siteconfig.c:694
-msgid "Enable full text index (warning: resource intensive)"
+#: ../siteconfig.c:415
+#, c-format
+msgid "Enable full text index"
 msgstr ""
 
-#: ../siteconfig.c:707
+#: ../siteconfig.c:423
+#, c-format
 msgid "Automatically delete committed database logs"
 msgstr ""
 
-#: ../siteconfig.c:720
+#: ../siteconfig.c:431
+#, c-format
 msgid "Instantly expunge deleted messages in IMAP"
 msgstr ""
 
-#: ../siteconfig.c:733
+#: ../siteconfig.c:439
+#, c-format
 msgid "Allow unauthenticated SMTP clients to spoof this site's domains"
 msgstr ""
 
-#: ../siteconfig.c:765
+#: ../siteconfig.c:466
+#, c-format
 msgid "Default message expire policy for public rooms"
 msgstr ""
 
-#: ../siteconfig.c:786
+#: ../siteconfig.c:487
+#, c-format
 msgid "Default message expire policy for private mailboxes"
 msgstr ""
 
-#: ../siteconfig.c:790
+#: ../siteconfig.c:491
+#, c-format
 msgid "Same policy as public rooms"
 msgstr ""
 
-#: ../siteconfig.c:896
+#: ../siteconfig.c:611
 msgid "Your system configuration has been updated."
 msgstr ""
 
diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index 1b866524e..5c3445dc5 100644
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -20,6 +20,7 @@ void display_siteconfig(void)
 	char tuning[SIZ];
 	char directory[SIZ];
 	char purger[SIZ];
+	char idxjnl[SIZ];
 
 	/* expire policy settings */
 	int sitepolicy = 0;
@@ -59,7 +60,8 @@ void display_siteconfig(void)
 		_("Network"),
 		_("Tuning"),
 		_("Directory"),
-		_("Auto-purger")
+		_("Auto-purger"),
+		_("Indexing/Journaling")
 	};
 
 	sprintf(general, "<center><h1>%s</h1><table border=\"0\">",
@@ -91,41 +93,46 @@ void display_siteconfig(void)
 			_("These settings may be overridden on a per-floor or per-room basis.")
 	);
 
+	sprintf(idxjnl, "<center><h1>%s</h1><h2>%s</h2><table border=\"0\">",
+			_("Indexing and Journaling"),
+			_("Warning: these facilities are resource intensive.")
+	);
+
 
 	wprintf("<form method=\"post\" action=\"siteconfig\">\n");
 
 	i = 0;
 	while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-		switch (++i) {
-		case 1:
+		switch (i++) {
+		case 0:
 			sprintf(&general[strlen(general)], "<TR><TD>");
 			sprintf(&general[strlen(general)], _("Node name"));
 			sprintf(&general[strlen(general)], "</TD><TD>");
 			sprintf(&general[strlen(general)], "<input type=\"text\" NAME=\"c_nodename\" MAXLENGTH=\"15\" VALUE=\"%s\">", buf);
 			sprintf(&general[strlen(general)], "</TD></TR>\n");
 			break;
-		case 2:
+		case 1:
 			sprintf(&general[strlen(general)], "<TR><TD>");
 			sprintf(&general[strlen(general)], _("Fully qualified domain name"));
 			sprintf(&general[strlen(general)], "</TD><TD>");
 			sprintf(&general[strlen(general)], "<input type=\"text\" NAME=\"c_fqdn\" MAXLENGTH=\"63\" VALUE=\"%s\">", buf);
 			sprintf(&general[strlen(general)], "</TD></TR>\n");
 			break;
-		case 3:
+		case 2:
 			sprintf(&general[strlen(general)], "<TR><TD>");
 			sprintf(&general[strlen(general)], _("Human-readable node name"));
 			sprintf(&general[strlen(general)], "</TD><TD>");
 			sprintf(&general[strlen(general)], "<input type=\"text\" NAME=\"c_humannode\" MAXLENGTH=\"20\" VALUE=\"%s\">", buf);
 			sprintf(&general[strlen(general)], "</TD></TR>\n");
 			break;
-		case 4:
+		case 3:
 			sprintf(&general[strlen(general)], "<TR><TD>");
 			sprintf(&general[strlen(general)], _("Telephone number"));
 			sprintf(&general[strlen(general)], "</TD><TD>");
 			sprintf(&general[strlen(general)], "<input type=\"text\" NAME=\"c_phonenum\" MAXLENGTH=\"15\" VALUE=\"%s\">", buf);
 			sprintf(&general[strlen(general)], "</TD></TR>\n");
 			break;
-		case 5:
+		case 4:
 			sprintf(&access[strlen(access)], "<TR><TD>");
 			sprintf(&access[strlen(access)], _("Automatically grant room-aide status to users who create private rooms"));
 			sprintf(&access[strlen(access)], "</TD><TD>");
@@ -133,14 +140,14 @@ void display_siteconfig(void)
 				((atoi(buf) != 0) ? "CHECKED" : ""));
 			sprintf(&access[strlen(access)], "</TD></TR>\n");
 			break;
-		case 6:
+		case 5:
 			sprintf(&tuning[strlen(tuning)], "<TR><TD>");
 			sprintf(&tuning[strlen(tuning)], _("Server connection idle timeout (in seconds)"));
 			sprintf(&tuning[strlen(tuning)], "</TD><TD>");
 			sprintf(&tuning[strlen(tuning)], "<input type=\"text\" NAME=\"c_sleeping\" MAXLENGTH=\"15\" VALUE=\"%s\">", buf);
 			sprintf(&tuning[strlen(tuning)], "</TD></TR>\n");
 			break;
-		case 7:
+		case 6:
 			sprintf(&access[strlen(access)], "<TR><TD>");
 			sprintf(&access[strlen(access)], _("Initial access level for new users"));
 			sprintf(&access[strlen(access)], "</TD><TD>");
@@ -154,7 +161,7 @@ void display_siteconfig(void)
 			sprintf(&access[strlen(access)], "</SELECT>");
 			sprintf(&access[strlen(access)], "</TD></TR>\n");
 			break;
-		case 8:
+		case 7:
 			sprintf(&access[strlen(access)], "<TR><TD>");
 			sprintf(&access[strlen(access)], _("Require registration for new users"));
 			sprintf(&access[strlen(access)], "</TD><TD>");
@@ -162,7 +169,7 @@ void display_siteconfig(void)
 				((atoi(buf) != 0) ? "CHECKED" : ""));
 			sprintf(&access[strlen(access)], "</TD></TR>\n");
 			break;
-		case 9:
+		case 8:
 			sprintf(&access[strlen(access)], "<TR><TD>");
 			sprintf(&access[strlen(access)], _("Quarantine messages from problem users"));
 			sprintf(&access[strlen(access)], "</TD><TD>");
@@ -170,21 +177,21 @@ void display_siteconfig(void)
 				((atoi(buf) != 0) ? "CHECKED" : ""));
 			sprintf(&access[strlen(access)], "</TD></TR>\n");
 			break;
-		case 10:
+		case 9:
 			sprintf(&access[strlen(access)], "<TR><TD>");
 			sprintf(&access[strlen(access)], _("Name of quarantine room"));
 			sprintf(&access[strlen(access)], "</TD><TD>");
 			sprintf(&access[strlen(access)], "<input type=\"text\" NAME=\"c_twitroom\" MAXLENGTH=\"63\" VALUE=\"%s\">", buf);
 			sprintf(&access[strlen(access)], "</TD></TR>\n");
 			break;
-		case 11:
+		case 10:
 			sprintf(&general[strlen(general)], "<TR><TD>");
 			sprintf(&general[strlen(general)], _("Paginator prompt (for text mode clients)"));
 			sprintf(&general[strlen(general)], "</TD><TD>");
 			sprintf(&general[strlen(general)], "<input type=\"text\" NAME=\"c_moreprompt\" MAXLENGTH=\"79\" VALUE=\"%s\">", buf);
 			sprintf(&general[strlen(general)], "</TD></TR>\n");
 			break;
-		case 12:
+		case 11:
 			sprintf(&access[strlen(access)], "<TR><TD>");
 			sprintf(&access[strlen(access)], _("Restrict access to Internet mail"));
 			sprintf(&access[strlen(access)], "</TD><TD>");
@@ -192,49 +199,49 @@ void display_siteconfig(void)
 				((atoi(buf) != 0) ? "CHECKED" : ""));
 			sprintf(&access[strlen(access)], "</TD></TR>\n");
 			break;
-		case 13:
+		case 12:
 			sprintf(&general[strlen(general)], "<TR><TD>");
 			sprintf(&general[strlen(general)], _("Geographic location of this system"));
 			sprintf(&general[strlen(general)], "</TD><TD>");
 			sprintf(&general[strlen(general)], "<input type=\"text\" NAME=\"c_bbs_city\" MAXLENGTH=\"31\" VALUE=\"%s\">", buf);
 			sprintf(&general[strlen(general)], "</TD></TR>\n");
 			break;
-		case 14:
+		case 13:
 			sprintf(&general[strlen(general)], "<TR><TD>");
 			sprintf(&general[strlen(general)], _("Name of system administrator"));
 			sprintf(&general[strlen(general)], "</TD><TD>");
 			sprintf(&general[strlen(general)], "<input type=\"text\" NAME=\"c_sysadm\" MAXLENGTH=\"25\" VALUE=\"%s\">", buf);
 			sprintf(&general[strlen(general)], "</TD></TR>\n");
 			break;
-		case 15:
+		case 14:
 			sprintf(&tuning[strlen(tuning)], "<TR><TD>");
 			sprintf(&tuning[strlen(tuning)], _("Maximum concurrent sessions (0 = no limit)"));
 			sprintf(&tuning[strlen(tuning)], "</TD><TD>");
 			sprintf(&tuning[strlen(tuning)], "<input type=\"text\" NAME=\"c_maxsessions\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
 			sprintf(&tuning[strlen(tuning)], "</TD></TR>\n");
 			break;
-		case 17:
+		case 16:
 			sprintf(&tuning[strlen(tuning)], "<TR><TD>");
 			sprintf(&tuning[strlen(tuning)], _("Default user purge time (days)"));
 			sprintf(&tuning[strlen(tuning)], "</TD><TD>");
 			sprintf(&tuning[strlen(tuning)], "<input type=\"text\" NAME=\"c_userpurge\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
 			sprintf(&tuning[strlen(tuning)], "</TD></TR>\n");
 			break;
-		case 18:
+		case 17:
 			sprintf(&tuning[strlen(tuning)], "<TR><TD>");
 			sprintf(&tuning[strlen(tuning)], _("Default room purge time (days)"));
 			sprintf(&tuning[strlen(tuning)], "</TD><TD>");
 			sprintf(&tuning[strlen(tuning)], "<input type=\"text\" NAME=\"c_roompurge\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
 			sprintf(&tuning[strlen(tuning)], "</TD></TR>\n");
 			break;
-		case 19:
+		case 18:
 			sprintf(&access[strlen(access)], "<TR><TD>");
 			sprintf(&access[strlen(access)], _("Name of room to log pages"));
 			sprintf(&access[strlen(access)], "</TD><TD>");
 			sprintf(&access[strlen(access)], "<input type=\"text\" NAME=\"c_logpages\" MAXLENGTH=\"63\" VALUE=\"%s\">", buf);
 			sprintf(&access[strlen(access)], "</TD></TR>\n");
 			break;
-		case 20:
+		case 19:
 			sprintf(&access[strlen(access)], "<TR><TD>");
 			sprintf(&access[strlen(access)], _("Access level required to create rooms"));
 			sprintf(&access[strlen(access)], "</TD><TD>");
@@ -248,42 +255,45 @@ void display_siteconfig(void)
 			sprintf(&access[strlen(access)], "</SELECT>");
 			sprintf(&access[strlen(access)], "</TD></TR>\n");
 			break;
-		case 21:
+		case 20:
 			sprintf(&tuning[strlen(tuning)], "<TR><TD>");
 			sprintf(&tuning[strlen(tuning)], _("Maximum message length"));
 			sprintf(&tuning[strlen(tuning)], "</TD><TD>");
 			sprintf(&tuning[strlen(tuning)], "<input type=\"text\" NAME=\"c_maxmsglen\" MAXLENGTH=\"20\" VALUE=\"%s\">", buf);
 			sprintf(&tuning[strlen(tuning)], "</TD></TR>\n");
 			break;
-		case 22:
+		case 21:
 			sprintf(&tuning[strlen(tuning)], "<TR><TD>");
 			sprintf(&tuning[strlen(tuning)], _("Minimum number of worker threads"));
 			sprintf(&tuning[strlen(tuning)], "</TD><TD>");
 			sprintf(&tuning[strlen(tuning)], "<input type=\"text\" NAME=\"c_min_workers\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
 			sprintf(&tuning[strlen(tuning)], "</TD></TR>\n");
 			break;
-		case 23:
+		case 22:
 			sprintf(&tuning[strlen(tuning)], "<TR><TD>");
 			sprintf(&tuning[strlen(tuning)], _("Maximum number of worker threads"));
 			sprintf(&tuning[strlen(tuning)], "</TD><TD>");
 			sprintf(&tuning[strlen(tuning)], "<input type=\"text\" NAME=\"c_max_workers\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
 			sprintf(&tuning[strlen(tuning)], "</TD></TR>\n");
 			break;
-		case 24:
+		case 23:
 			sprintf(&network[strlen(network)], "<TR><TD>");
 			sprintf(&network[strlen(network)], _("POP3 listener port (-1 to disable)"));
 			sprintf(&network[strlen(network)], "</TD><TD>");
 			sprintf(&network[strlen(network)], "<input type=\"text\" NAME=\"c_pop3_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
 			sprintf(&network[strlen(network)], "</TD></TR>\n");
 			break;
-		case 25:
+		case 24:
 			sprintf(&network[strlen(network)], "<TR><TD>");
 			sprintf(&network[strlen(network)], _("SMTP MTA port (-1 to disable)"));
 			sprintf(&network[strlen(network)], "</TD><TD>");
 			sprintf(&network[strlen(network)], "<input type=\"text\" NAME=\"c_smtp_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
 			sprintf(&network[strlen(network)], "</TD></TR>\n");
 			break;
-		case 27:
+		case 25:
+			/* FIXME this is supposed to be c_rfc822_strict_from */
+			break;
+		case 26:
 			sprintf(&access[strlen(access)], "<TR><TD>");
 			sprintf(&access[strlen(access)], _("Allow aides to zap (forget) rooms"));
 			sprintf(&access[strlen(access)], "</TD><TD>");
@@ -291,21 +301,21 @@ void display_siteconfig(void)
 				((atoi(buf) != 0) ? "CHECKED" : ""));
 			sprintf(&access[strlen(access)], "</TD></TR>\n");
 			break;
-		case 28:
+		case 27:
 			sprintf(&network[strlen(network)], "<TR><TD>");
 			sprintf(&network[strlen(network)], _("IMAP listener port (-1 to disable)"));
 			sprintf(&network[strlen(network)], "</TD><TD>");
 			sprintf(&network[strlen(network)], "<input type=\"text\" NAME=\"c_imap_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
 			sprintf(&network[strlen(network)], "</TD></TR>\n");
 			break;
-		case 29:
+		case 28:
 			sprintf(&network[strlen(network)], "<TR><TD>");
 			sprintf(&network[strlen(network)], _("Network run frequency (in seconds)"));
 			sprintf(&network[strlen(network)], "</TD><TD>");
 			sprintf(&network[strlen(network)], "<input type=\"text\" NAME=\"c_net_freq\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
 			sprintf(&network[strlen(network)], "</TD></TR>\n");
 			break;
-		case 30:
+		case 29:
 			sprintf(&access[strlen(access)], "<TR><TD>");
 			sprintf(&access[strlen(access)], _("Disable self-service user account creation"));
 			sprintf(&access[strlen(access)], "</TD><TD>");
@@ -314,9 +324,6 @@ void display_siteconfig(void)
 			sprintf(&access[strlen(access)], "</TD></TR>\n");
 			break;
 		case 31:
-			/* position 31 is no longer in use */
-			break;
-		case 32:
 			sprintf(&purger[strlen(purger)], "<TR><TD>");
 			sprintf(&purger[strlen(purger)], _("Hour to run database auto-purge"));
 			sprintf(&purger[strlen(purger)], "</TD><TD>");
@@ -332,35 +339,35 @@ void display_siteconfig(void)
 			sprintf(&purger[strlen(purger)], "</SELECT>");
 			sprintf(&purger[strlen(purger)], "</TD></TR>\n");
 			break;
-		case 33:
+		case 32:
 			sprintf(&directory[strlen(directory)], "<TR><TD>");
 			sprintf(&directory[strlen(directory)], _("Host name of LDAP server (blank to disable)"));
 			sprintf(&directory[strlen(directory)], "</TD><TD>");
 			sprintf(&directory[strlen(directory)], "<input type=\"text\" NAME=\"c_ldap_host\" MAXLENGTH=\"127\" VALUE=\"%s\">", buf);
 			sprintf(&directory[strlen(directory)], "</TD></TR>\n");
 			break;
-		case 34:
+		case 33:
 			sprintf(&directory[strlen(directory)], "<TR><TD>");
 			sprintf(&directory[strlen(directory)], _("Port number of LDAP server (blank to disable)"));
 			sprintf(&directory[strlen(directory)], "</TD><TD>");
 			sprintf(&directory[strlen(directory)], "<input type=\"text\" NAME=\"c_ldap_port\" MAXLENGTH=\"127\" VALUE=\"%d\">", atoi(buf));
 			sprintf(&directory[strlen(directory)], "</TD></TR>\n");
 			break;
-		case 35:
+		case 34:
 			sprintf(&directory[strlen(directory)], "<TR><TD>");
 			sprintf(&directory[strlen(directory)], _("Base DN"));
 			sprintf(&directory[strlen(directory)], "</TD><TD>");
 			sprintf(&directory[strlen(directory)], "<input type=\"text\" NAME=\"c_ldap_base_dn\" MAXLENGTH=\"255\" VALUE=\"%s\">", buf);
 			sprintf(&directory[strlen(directory)], "</TD></TR>\n");
 			break;
-		case 36:
+		case 35:
 			sprintf(&directory[strlen(directory)], "<TR><TD>");
 			sprintf(&directory[strlen(directory)], _("Bind DN"));
 			sprintf(&directory[strlen(directory)], "</TD><TD>");
 			sprintf(&directory[strlen(directory)], "<input type=\"text\" NAME=\"c_ldap_bind_dn\" MAXLENGTH=\"255\" VALUE=\"%s\">", buf);
 			sprintf(&directory[strlen(directory)], "</TD></TR>\n");
 			break;
-		case 37:
+		case 36:
 			sprintf(&directory[strlen(directory)], "<TR><TD>");
 			sprintf(&directory[strlen(directory)], _("Password for bind DN"));
 			sprintf(&directory[strlen(directory)], "</TD><TD>");
@@ -368,50 +375,50 @@ void display_siteconfig(void)
 				buf);
 			sprintf(&directory[strlen(directory)], "</TD></TR>\n");
 			break;
-		case 38:
+		case 37:
 			sprintf(&network[strlen(network)], "<TR><TD>");
 			sprintf(&network[strlen(network)], _("Server IP address (0.0.0.0 for 'any')"));
 			sprintf(&network[strlen(network)], "</TD><TD>");
 			sprintf(&network[strlen(network)], "<input type=\"text\" NAME=\"c_ip_addr\" MAXLENGTH=\"15\" VALUE=\"%s\">", buf);
 			sprintf(&network[strlen(network)], "</TD></TR>\n");
 			break;
-		case 39:
+		case 38:
 			sprintf(&network[strlen(network)], "<TR><TD>");
 			sprintf(&network[strlen(network)], _("SMTP MSA port (-1 to disable)"));
 			sprintf(&network[strlen(network)], "</TD><TD>");
 			sprintf(&network[strlen(network)], "<input type=\"text\" NAME=\"c_msa_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
 			sprintf(&network[strlen(network)], "</TD></TR>\n");
 			break;
-		case 40:
+		case 39:
 			sprintf(&network[strlen(network)], "<TR><TD>");
 			sprintf(&network[strlen(network)], _("IMAP over SSL port (-1 to disable)"));
 			sprintf(&network[strlen(network)], "</TD><TD>");
 			sprintf(&network[strlen(network)], "<input type=\"text\" NAME=\"c_imaps_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
 			sprintf(&network[strlen(network)], "</TD></TR>\n");
 			break;
-		case 41:
+		case 40:
 			sprintf(&network[strlen(network)], "<TR><TD>");
 			sprintf(&network[strlen(network)], _("POP3 over SSL port (-1 to disable)"));
 			sprintf(&network[strlen(network)], "</TD><TD>");
 			sprintf(&network[strlen(network)], "<input type=\"text\" NAME=\"c_pop3s_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
 			sprintf(&network[strlen(network)], "</TD></TR>\n");
 			break;
-		case 42:
+		case 41:
 			sprintf(&network[strlen(network)], "<TR><TD>");
 			sprintf(&network[strlen(network)], _("SMTP over SSL port (-1 to disable)"));
 			sprintf(&network[strlen(network)], "</TD><TD>");
 			sprintf(&network[strlen(network)], "<input type=\"text\" NAME=\"c_smtps_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
 			sprintf(&network[strlen(network)], "</TD></TR>\n");
 			break;
-		case 43:
-				sprintf(&general[strlen(general)], "<TR><TD>");
-				sprintf(&general[strlen(general)], _("Enable full text index (warning: resource intensive)"));
-				sprintf(&general[strlen(general)], "</TD><TD>");
-				sprintf(&general[strlen(general)], "<input type=\"checkbox\" NAME=\"c_enable_fulltext\" VALUE=\"yes\" %s>",
+		case 42:
+				sprintf(&idxjnl[strlen(idxjnl)], "<TR><TD>");
+				sprintf(&idxjnl[strlen(idxjnl)], _("Enable full text index"));
+				sprintf(&idxjnl[strlen(idxjnl)], "</TD><TD>");
+				sprintf(&idxjnl[strlen(idxjnl)], "<input type=\"checkbox\" NAME=\"c_enable_fulltext\" VALUE=\"yes\" %s>",
 					((atoi(buf) != 0) ? "CHECKED" : ""));
-				sprintf(&general[strlen(general)], "</TD></TR>\n");
+				sprintf(&idxjnl[strlen(idxjnl)], "</TD></TR>\n");
 			break;
-		case 44:
+		case 43:
 			sprintf(&tuning[strlen(tuning)], "<TR><TD>");
 			sprintf(&tuning[strlen(tuning)], _("Automatically delete committed database logs"));
 			sprintf(&tuning[strlen(tuning)], "</TD><TD>");
@@ -419,7 +426,7 @@ void display_siteconfig(void)
 				((atoi(buf) != 0) ? "CHECKED" : ""));
 			sprintf(&tuning[strlen(tuning)], "</TD></TR>\n");
 			break;
-		case 45:
+		case 44:
 			sprintf(&network[strlen(network)], "<TR><TD>");
 			sprintf(&network[strlen(network)], _("Instantly expunge deleted messages in IMAP"));
 			sprintf(&network[strlen(network)], "</TD><TD>");
@@ -427,7 +434,7 @@ void display_siteconfig(void)
 				((atoi(buf) != 0) ? "CHECKED" : ""));
 			sprintf(&network[strlen(network)], "</TD></TR>\n");
 			break;
-		case 46:
+		case 45:
 			sprintf(&network[strlen(network)], "<TR><TD>");
 			sprintf(&network[strlen(network)], _("Allow unauthenticated SMTP clients to spoof this site's domains"));
 			sprintf(&network[strlen(network)], "</TD><TD>");
@@ -435,6 +442,29 @@ void display_siteconfig(void)
 				((atoi(buf) != 0) ? "CHECKED" : ""));
 			sprintf(&network[strlen(network)], "</TD></TR>\n");
 			break;
+		case 46:
+			sprintf(&idxjnl[strlen(idxjnl)], "<TR><TD>");
+			sprintf(&idxjnl[strlen(idxjnl)], _("Perform journaling of email messages"));
+			sprintf(&idxjnl[strlen(idxjnl)], "</TD><TD>");
+			sprintf(&idxjnl[strlen(idxjnl)], "<input type=\"checkbox\" NAME=\"c_journal_email\" VALUE=\"yes\" %s>",
+				((atoi(buf) != 0) ? "CHECKED" : ""));
+			sprintf(&idxjnl[strlen(idxjnl)], "</TD></TR>\n");
+			break;
+		case 47:
+			sprintf(&idxjnl[strlen(idxjnl)], "<TR><TD>");
+			sprintf(&idxjnl[strlen(idxjnl)], _("Perform journaling of non-email messages"));
+			sprintf(&idxjnl[strlen(idxjnl)], "</TD><TD>");
+			sprintf(&idxjnl[strlen(idxjnl)], "<input type=\"checkbox\" NAME=\"c_journal_pubmsgs\" VALUE=\"yes\" %s>",
+				((atoi(buf) != 0) ? "CHECKED" : ""));
+			sprintf(&idxjnl[strlen(idxjnl)], "</TD></TR>\n");
+			break;
+		case 48:
+			sprintf(&idxjnl[strlen(idxjnl)], "<TR><TD>");
+			sprintf(&idxjnl[strlen(idxjnl)], _("Email destination of journalized messages"));
+			sprintf(&idxjnl[strlen(idxjnl)], "</TD><TD>");
+			sprintf(&idxjnl[strlen(idxjnl)], "<input type=\"text\" NAME=\"c_journal_dest\" MAXLENGTH=\"127\" VALUE=\"%s\">", buf);
+			sprintf(&idxjnl[strlen(idxjnl)], "</TD></TR>\n");
+			break;
 		}
 	}
 
@@ -508,17 +538,19 @@ void display_siteconfig(void)
 	sprintf(&tuning[strlen(tuning)], "</table>");
 	sprintf(&directory[strlen(directory)], "</table>");
 	sprintf(&purger[strlen(purger)], "</table>");
+	sprintf(&idxjnl[strlen(idxjnl)], "</table>");
 
-	tabbed_dialog(6, tabnames);
+	tabbed_dialog(7, tabnames);
 
-	begin_tab(0, 6);	wprintf("%s", general);		 end_tab(0, 6);
-	begin_tab(1, 6);	wprintf("%s", access);		 end_tab(1, 6);
-	begin_tab(2, 6);	wprintf("%s", network);		 end_tab(2, 6);
-	begin_tab(3, 6);	wprintf("%s", tuning);		 end_tab(3, 6);
-	begin_tab(4, 6);	wprintf("%s", directory);	 end_tab(4, 6);
-	begin_tab(5, 6);	wprintf("%s", purger);		 end_tab(5, 6);
+	begin_tab(0, 7);	wprintf("%s", general);		 end_tab(0, 7);
+	begin_tab(1, 7);	wprintf("%s", access);		 end_tab(1, 7);
+	begin_tab(2, 7);	wprintf("%s", network);		 end_tab(2, 7);
+	begin_tab(3, 7);	wprintf("%s", tuning);		 end_tab(3, 7);
+	begin_tab(4, 7);	wprintf("%s", directory);	 end_tab(4, 7);
+	begin_tab(5, 7);	wprintf("%s", purger);		 end_tab(5, 7);
+	begin_tab(6, 7);	wprintf("%s", idxjnl);	 end_tab(6, 7);
 
-	wprintf("<div align=\"center\">");
+	wprintf("<div align=\"center\"><br>");
 	wprintf("<input type=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Save changes"));
 	wprintf("&nbsp;");
 	wprintf("<input type=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">\n", _("Cancel"));
@@ -533,14 +565,14 @@ void siteconfig(void)
 	char buf[256];
 
 	if (strlen(bstr("ok_button")) == 0) {
-		display_siteconfig();
+		display_aide_menu();
 		return;
 	}
 	serv_printf("CONF set");
 	serv_getln(buf, sizeof buf);
 	if (buf[0] != '4') {
 		safestrncpy(WC->ImportantMessage, &buf[4], sizeof WC->ImportantMessage);
-		display_siteconfig();
+		display_aide_menu();
 		return;
 	}
 	serv_printf("%s", bstr("c_nodename"));
@@ -558,7 +590,7 @@ void siteconfig(void)
 	serv_printf("%s", bstr("c_bbs_city"));
 	serv_printf("%s", bstr("c_sysadm"));
 	serv_printf("%s", bstr("c_maxsessions"));
-	serv_printf("");  /* networking password -- deprecated */
+	serv_printf("");  /* placeholder - this field is not in use */
 	serv_printf("%s", bstr("c_userpurge"));
 	serv_printf("%s", bstr("c_roompurge"));
 	serv_printf("%s", bstr("c_logpages"));
@@ -568,12 +600,12 @@ void siteconfig(void)
 	serv_printf("%s", bstr("c_max_workers"));
 	serv_printf("%s", bstr("c_pop3_port"));
 	serv_printf("%s", bstr("c_smtp_port"));
-	serv_printf("");  /* moderation filter level -- not yet implemented */
+	serv_printf("");  /* FIXME this is supposed to be c_rfc822_strict_from */
 	serv_printf("%s", ((!strcasecmp(bstr("c_aide_zap"), "yes") ? "1" : "0")));
 	serv_printf("%s", bstr("c_imap_port"));
 	serv_printf("%s", bstr("c_net_freq"));
 	serv_printf("%s", ((!strcasecmp(bstr("c_disable_newu"), "yes") ? "1" : "0")));
-	serv_printf("1");
+	serv_printf("1"); /* placeholder - this field is not in use */
 	serv_printf("%s", bstr("c_purge_hour"));
 	serv_printf("%s", bstr("c_ldap_host"));
 	serv_printf("%s", bstr("c_ldap_port"));
@@ -589,6 +621,9 @@ void siteconfig(void)
 	serv_printf("%s", ((!strcasecmp(bstr("c_auto_cull"), "yes") ? "1" : "0")));
 	serv_printf("%s", ((!strcasecmp(bstr("c_instant_expunge"), "yes") ? "1" : "0")));
 	serv_printf("%s", ((!strcasecmp(bstr("c_allow_spoofing"), "yes") ? "1" : "0")));
+	serv_printf("%s", ((!strcasecmp(bstr("c_journal_email"), "yes") ? "1" : "0")));
+	serv_printf("%s", ((!strcasecmp(bstr("c_journal_pubmsgs"), "yes") ? "1" : "0")));
+	serv_printf("%s", bstr("c_journal_dest"));
 	serv_printf("000");
 
 	serv_printf("SPEX site|%d|%d", atoi(bstr("sitepolicy")), atoi(bstr("sitevalue")));
@@ -598,5 +633,5 @@ void siteconfig(void)
 
 	safestrncpy(WC->ImportantMessage, _("Your system configuration has been updated."),
 		sizeof WC->ImportantMessage);
-	display_siteconfig();
+	display_aide_menu();
 }
diff --git a/webcit/webcit.h b/webcit/webcit.h
index a87133da3..331ffb37e 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -119,11 +119,11 @@
 #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.40"	/* who's in da house */
+#define SERVER			"WebCit v6.70"	/* who's in da house */
 #define DEVELOPER_ID		0
 #define CLIENT_ID		4
-#define CLIENT_VERSION		640		/* This version of WebCit */
-#define MINIMUM_CIT_VERSION	663		/* min required Citadel ver. */
+#define CLIENT_VERSION		670		/* This version of WebCit */
+#define MINIMUM_CIT_VERSION	670		/* min required Citadel ver. */
 #define DEFAULT_HOST		"localhost"	/* Default Citadel server */
 #define DEFAULT_PORT		"504"
 #define LB			(1)		/* Internal escape chars */
-- 
2.39.2