From: Art Cancro <ajc@citadel.org>
Date: Tue, 5 Sep 2006 16:32:57 +0000 (+0000)
Subject: Updated the importer/exporter to include new config items
X-Git-Tag: v7.86~3952
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=794f4eb7e69d249db691bb94ed97f4947d85bbef;p=citadel.git

Updated the importer/exporter to include new config items
---

diff --git a/citadel/citadel.h b/citadel/citadel.h
index c12b99ecc..de4ded2ff 100644
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -47,7 +47,7 @@ extern "C" {
  */
 #define REV_LEVEL	684		/* This version */
 #define REV_MIN		591		/* Oldest compatible database */
-#define EXPORT_REV_MIN	655		/* Oldest compatible export files */
+#define EXPORT_REV_MIN	684		/* Oldest compatible export files */
 
 #define SERVER_TYPE 0	/* zero for stock Citadel; other developers please
 			   obtain SERVER_TYPE codes for your implementations */
diff --git a/citadel/citadel.nsi b/citadel/citadel.nsi
index b0593f81f..d9d4924a4 100644
--- a/citadel/citadel.nsi
+++ b/citadel/citadel.nsi
@@ -4,7 +4,7 @@
 
 !include "${NSISDIR}\Contrib\Modern UI\System.nsh"
 !define MUI_PRODUCT "Citadel"
-!define MUI_VERSION "6.83"
+!define MUI_VERSION "6.84"
 !define MUI_WELCOMEPAGE
 !define MUI_LICENSEPAGE
 !define MUI_COMPONENTSPAGE
@@ -18,7 +18,7 @@
 ;!define MUI_ICON "${NSISDIR}\Contrib\Icons\modern-install.ico"
 ;!define MUI_UNICON "${NSISDIR}\Contrib\Icons\modern-uninstall.ico"
 
-OutFile "citadel-6.83.exe"
+OutFile "citadel-6.84.exe"
 BGGradient off
 
 LangString DESC_Citadel ${LANG_ENGLISH} "Citadel client and core libraries (required)"
diff --git a/citadel/citadel.spec b/citadel/citadel.spec
index 969a3f490..95247a5f2 100644
--- a/citadel/citadel.spec
+++ b/citadel/citadel.spec
@@ -1,7 +1,7 @@
 # $Id$
 Summary: Citadel, the flexible, powerful way to build online communities
 Name: citadel
-Version: 6.83
+Version: 6.84
 Release: 1
 Copyright: GPL
 Group: Applications/Communications
diff --git a/citadel/serv_vandelay.c b/citadel/serv_vandelay.c
index 730eee13c..0627187a6 100644
--- a/citadel/serv_vandelay.c
+++ b/citadel/serv_vandelay.c
@@ -313,6 +313,11 @@ void artv_do_export(void) {
 	cprintf("%d\n", config.c_auto_cull);
 	cprintf("%d\n", config.c_instant_expunge);
 	cprintf("%d\n", config.c_allow_spoofing);
+	cprintf("%d\n", config.c_journal_email);
+	cprintf("%d\n", config.c_journal_pubmsgs);
+	cprintf("%s\n", config.c_journal_dest);
+	cprintf("%s\n", config.c_default_cal_zone);
+	cprintf("%d\n", config.c_pftcpdict_port);
 
 	/* Export the control file */
 	get_control();
@@ -390,6 +395,11 @@ void artv_import_config(void) {
 	client_getln(buf, sizeof buf);	config.c_auto_cull = atoi(buf);
 	client_getln(buf, sizeof buf);	config.c_instant_expunge = atoi(buf);
 	client_getln(buf, sizeof buf);	config.c_allow_spoofing = atoi(buf);
+	client_getln(buf, sizeof buf);	config.c_journal_email = atoi(buf);
+	client_getln(buf, sizeof buf);	config.c_journal_pubmsgs = atoi(buf);
+	client_getln(config.c_journal_dest, sizeof config.c_journal_dest);
+	client_getln(config.c_default_cal_zone, sizeof config.c_default_cal_zone);
+	client_getln(buf, sizeof buf);	config.c_pftcpdict_port = atoi(buf);
 	config.c_enable_fulltext = 0;	/* always disable */
 	put_config();
 	lprintf(CTDL_INFO, "Imported config file\n");