#include "citserver.h"
#include "support.h"
#include "config.h"
-#include "dynloader.h"
+#include "serv_extensions.h"
#include "database.h"
#include "msgbase.h"
#include "tools.h"
char artv_tempfilename2[PATH_MAX];
FILE *artv_global_message_list;
-void artv_export_users_backend(struct usersupp *usbuf, void *data) {
+void artv_export_users_backend(struct ctdluser *usbuf, void *data) {
cprintf("user\n");
cprintf("%d\n", usbuf->version);
cprintf("%ld\n", (long)usbuf->uid);
}
-void artv_export_rooms_backend(struct quickroom *qrbuf, void *data) {
+void artv_export_rooms_backend(struct ctdlroom *qrbuf, void *data) {
cprintf("room\n");
cprintf("%s\n", qrbuf->QRname);
cprintf("%s\n", qrbuf->QRpasswd);
cprintf("%u\n", qrbuf->QRflags2);
cprintf("%d\n", qrbuf->QRdefaultview);
- getroom(&CC->quickroom, qrbuf->QRname);
+ getroom(&CC->room, qrbuf->QRname);
/* format of message list export is all message numbers output
* one per line terminated by a 0.
*/
cprintf("%ld\n", vbuf.v_lastseen);
}
+ cprintf("%s\n", vbuf.v_answered);
cprintf("%u\n", vbuf.v_flags);
cprintf("%d\n", vbuf.v_view);
}
int count = 0;
artv_global_message_list = fopen(artv_tempfilename1, "r");
- lprintf(7, "Opened %s\n", artv_tempfilename1);
+ lprintf(CTDL_INFO, "Opened %s\n", artv_tempfilename1);
while (fgets(buf, sizeof(buf), artv_global_message_list) != NULL) {
msgnum = atol(buf);
if (msgnum > 0L) {
}
}
fclose(artv_global_message_list);
- lprintf(7, "Exported %d messages.\n", count);
+ lprintf(CTDL_INFO, "Exported %d messages.\n", count);
}
cprintf("%s\n", config.c_twitroom);
cprintf("%s\n", config.c_moreprompt);
cprintf("%d\n", config.c_restrict);
- cprintf("%ld\n", config.c_msgbase);
cprintf("%s\n", config.c_bbs_city);
cprintf("%s\n", config.c_sysadm);
- cprintf("%s\n", config.c_bucket_dir);
cprintf("%d\n", config.c_setup_level);
cprintf("%d\n", config.c_maxsessions);
- cprintf("%s\n", config.c_net_password);
cprintf("%d\n", config.c_port_number);
- cprintf("%d\n", config.c_ipgm_secret);
cprintf("%d\n", config.c_ep.expire_mode);
cprintf("%d\n", config.c_ep.expire_value);
cprintf("%d\n", config.c_userpurge);
cprintf("%d\n", config.c_max_workers);
cprintf("%d\n", config.c_pop3_port);
cprintf("%d\n", config.c_smtp_port);
+ cprintf("%d\n", config.c_purge_hour);
+ cprintf("%d\n", config.c_mbxep.expire_mode);
+ cprintf("%d\n", config.c_mbxep.expire_value);
+ cprintf("%s\n", config.c_ldap_host);
+ cprintf("%d\n", config.c_ldap_port);
+ cprintf("%s\n", config.c_ldap_base_dn);
+ cprintf("%s\n", config.c_ldap_bind_dn);
+ cprintf("%s\n", config.c_ldap_bind_pw);
/* Export the control file */
get_control();
void artv_import_config(void) {
char buf[SIZ];
- lprintf(9, "Importing config file\n");
+ lprintf(CTDL_DEBUG, "Importing config file\n");
client_gets(config.c_nodename);
- lprintf(9, "c_nodename = %s\n", config.c_nodename);
+ lprintf(CTDL_DEBUG, "c_nodename = %s\n", config.c_nodename);
client_gets(config.c_fqdn);
client_gets(config.c_humannode);
client_gets(config.c_phonenum);
client_gets(config.c_twitroom);
client_gets(config.c_moreprompt);
client_gets(buf); config.c_restrict = atoi(buf);
- client_gets(buf); config.c_msgbase = atol(buf);
client_gets(config.c_bbs_city);
client_gets(config.c_sysadm);
- lprintf(9, "c_sysadm = %s\n", config.c_sysadm);
- client_gets(config.c_bucket_dir);
+ lprintf(CTDL_DEBUG, "c_sysadm = %s\n", config.c_sysadm);
client_gets(buf); config.c_setup_level = atoi(buf);
client_gets(buf); config.c_maxsessions = atoi(buf);
- client_gets(config.c_net_password);
client_gets(buf); config.c_port_number = atoi(buf);
- client_gets(buf); config.c_ipgm_secret = atoi(buf);
client_gets(buf); config.c_ep.expire_mode = atoi(buf);
client_gets(buf); config.c_ep.expire_value = atoi(buf);
client_gets(buf); config.c_userpurge = atoi(buf);
client_gets(buf); config.c_max_workers = atoi(buf);
client_gets(buf); config.c_pop3_port = atoi(buf);
client_gets(buf); config.c_smtp_port = atoi(buf);
+ client_gets(buf); config.c_purge_hour = atoi(buf);
+ client_gets(buf); config.c_mbxep.expire_mode = atoi(buf);
+ client_gets(buf); config.c_mbxep.expire_value = atoi(buf);
+ client_gets(config.c_ldap_host);
+ client_gets(buf); config.c_ldap_port = atoi(buf);
+ client_gets(config.c_ldap_base_dn);
+ client_gets(config.c_ldap_bind_dn);
+ client_gets(config.c_ldap_bind_pw);
put_config();
- lprintf(7, "Imported config file\n");
+ lprintf(CTDL_INFO, "Imported config file\n");
}
void artv_import_control(void) {
char buf[SIZ];
- lprintf(9, "Importing control file\n");
+ lprintf(CTDL_DEBUG, "Importing control file\n");
client_gets(buf); CitControl.MMhighest = atol(buf);
client_gets(buf); CitControl.MMflags = atoi(buf);
client_gets(buf); CitControl.MMnextuser = atol(buf);
client_gets(buf); CitControl.MMnextroom = atol(buf);
client_gets(buf); CitControl.version = atoi(buf);
put_control();
- lprintf(7, "Imported control file\n");
+ lprintf(CTDL_INFO, "Imported control file\n");
}
void artv_import_user(void) {
char buf[SIZ];
- struct usersupp usbuf;
+ struct ctdluser usbuf;
client_gets(buf); usbuf.version = atoi(buf);
client_gets(buf); usbuf.uid = atoi(buf);
void artv_import_room(void) {
char buf[SIZ];
- struct quickroom qrbuf;
+ struct ctdlroom qrbuf;
long msgnum;
int msgcount = 0;
client_gets(buf); qrbuf.QRflags2 = atoi(buf);
client_gets(buf); qrbuf.QRdefaultview = atoi(buf);
putroom(&qrbuf);
- lprintf(7, "Imported room <%s>\n", qrbuf.QRname);
+ lprintf(CTDL_INFO, "Imported room <%s>\n", qrbuf.QRname);
/* format of message list export is all message numbers output
* one per line terminated by a 0.
*/
CtdlSaveMsgPointerInRoom(qrbuf.QRname, msgnum, 0);
++msgcount;
}
- lprintf(7, "(%d messages)\n", msgcount);
+ lprintf(CTDL_INFO, "(%d messages)\n", msgcount);
}
client_gets(buf); flbuf.f_ep.expire_mode = atoi(buf);
client_gets(buf); flbuf.f_ep.expire_value = atoi(buf);
putfloor(&flbuf, i);
- lprintf(7, "Imported floor #%d (%s)\n", i, flbuf.f_name);
+ lprintf(CTDL_INFO, "Imported floor #%d (%s)\n", i, flbuf.f_name);
}
for (i=0; i<strlen(buf); ++i) if (!isdigit(buf[i])) is_textual_seen = 1;
if (is_textual_seen) strcpy(vbuf.v_seen, buf);
+ client_gets(vbuf.v_answered);
client_gets(buf); vbuf.v_flags = atoi(buf);
client_gets(buf); vbuf.v_view = atoi(buf);
put_visit(&vbuf);
- lprintf(7, "Imported visit %ld/%ld/%ld\n",
+ lprintf(CTDL_INFO, "Imported visit %ld/%ld/%ld\n",
vbuf.v_roomnum, vbuf.v_roomgen, vbuf.v_usernum);
}
client_gets(buf); smi.meta_refcount = atoi(buf);
client_gets(smi.meta_content_type);
- lprintf(7, "message #%ld\n", msgnum);
+ lprintf(CTDL_INFO, "message #%ld\n", msgnum);
/* decode base64 message text */
strcpy(tempfile, tmpnam(NULL));
fseek(fp, 0L, SEEK_END);
msglen = ftell(fp);
fclose(fp);
- lprintf(9, "msglen = %ld\n", msglen);
+ lprintf(CTDL_DEBUG, "msglen = %ld\n", msglen);
mbuf = mallok(msglen);
fp = fopen(tempfile, "rb");
unlink(tempfile);
PutMetaData(&smi);
- lprintf(7, "Imported message %ld\n", msgnum);
+ lprintf(CTDL_INFO, "Imported message %ld\n", msgnum);
}
cprintf("%d sock it to me\n", SEND_LISTING);
while (client_gets(buf), strcmp(buf, "000")) {
- lprintf(9, "import keyword: <%s>\n", buf);
+ lprintf(CTDL_DEBUG, "import keyword: <%s>\n", buf);
if (!strcasecmp(buf, "version")) {
client_gets(s_version);
version = atoi(s_version);
- if ((version < REV_MIN) || (version > REV_LEVEL)) {
- lprintf(7, "Version mismatch - aborting\n");
+ if ((version<EXPORT_REV_MIN) || (version>REV_LEVEL)) {
+ lprintf(CTDL_ERR, "Version mismatch in ARTV import; aborting\n");
break;
}
}
else break;
}
- lprintf(7, "Invalid keyword <%s>. Flushing input.\n", buf);
+ lprintf(CTDL_INFO, "Invalid keyword <%s>. Flushing input.\n", buf);
while (client_gets(buf), strcmp(buf, "000")) ;;
}
if (CtdlAccessCheck(ac_internal)) return;
if (is_running) {
cprintf("%d The importer/exporter is already running.\n",
- ERROR);
+ ERROR + RESOURCE_BUSY);
return;
}
is_running = 1;
- strcpy(artv_tempfilename1, tmpnam(NULL));
strcpy(artv_tempfilename2, tmpnam(NULL));
extract(cmd, cmdbuf, 0);
if (!strcasecmp(cmd, "export")) artv_do_export();
else if (!strcasecmp(cmd, "import")) artv_do_import();
- else cprintf("%d illegal command\n", ERROR);
+ else cprintf("%d illegal command\n", ERROR + ILLEGAL_VALUE);
unlink(artv_tempfilename1);
unlink(artv_tempfilename2);