/*
* $Id$
*
- * IMAP server for the Citadel/UX system
+ * IMAP server for the Citadel system
* Copyright (C) 2000-2002 by Art Cancro and others.
* This code is released under the terms of the GNU General Public License.
*
if (CC->h_command_function != imap_command_loop)
return;
+ /* If there is a mailbox selected, auto-expunge it. */
+ if (IMAP->selected) {
+ imap_do_expunge();
+ }
+
lprintf(CTDL_DEBUG, "Performing IMAP cleanup hook\n");
imap_free_msgids();
imap_free_transmitted_message();
IMAP->cached_fetch = NULL;
IMAP->cached_msgnum = (-1);
- cprintf("* OK %s Citadel/UX IMAP4rev1 server ready\r\n",
+ cprintf("* OK %s Citadel IMAP4rev1 server ready\r\n",
config.c_fqdn);
}
if (!ok) {
cprintf("%s NO ... no such room, or access denied\r\n",
parms[0]);
- /* IMAP->selected = 0; */
return;
}
int num_expunged = 0;
lprintf(CTDL_DEBUG, "imap_do_expunge() called\n");
- if (IMAP->selected == 0)
+ if (IMAP->selected == 0) {
return (0);
+ }
if (IMAP->num_msgs > 0)
for (i = 0; i < IMAP->num_msgs; ++i) {
CtdlDeleteMessages(CC->room.QRname,
IMAP->msgids[i], "");
++num_expunged;
- lprintf(CTDL_DEBUG, "%ld ... deleted\n",
- IMAP->msgids[i]);
- } else {
- lprintf(CTDL_DEBUG, "%ld ... not deleted\n",
- IMAP->msgids[i]);
}
}
imap_rescan_msgids();
}
+ lprintf(9, "Expunged %d messages.\n", num_expunged);
return (num_expunged);
}
{
/* Yes, we always expunge on close. */
- imap_do_expunge();
+ if (IMAP->selected) {
+ imap_do_expunge();
+ }
IMAP->selected = 0;
IMAP->readonly = 0;
cprintf("* NAMESPACE ");
/* All personal folders are subordinate to INBOX. */
- cprintf("((\"INBOX|\" \"|\")) ");
+ cprintf("((\"INBOX/\" \"/\")) ");
/* Other users' folders ... coming soon! FIXME */
cprintf("NIL ");
if (fl->f_flags & F_INUSE) {
if (floors > 0) cprintf(" ");
cprintf("(");
- sprintf(buf, "%s|", fl->f_name);
+ sprintf(buf, "%s/", fl->f_name);
imap_strout(buf);
- cprintf(" \"|\")");
+ cprintf(" \"/\")");
++floors;
}
}
if (fl->f_flags & F_INUSE) {
if (imap_mailbox_matches_pattern
(pattern, fl->f_name)) {
- cprintf("* %s (\\NoSelect) \"|\" ", cmd);
+ cprintf("* %s (\\NoSelect) \"/\" ", cmd);
imap_strout(fl->f_name);
cprintf("\r\n");
}
if (ra & UA_KNOWN) {
imap_mailboxname(buf, sizeof buf, qrbuf);
if (imap_mailbox_matches_pattern(pattern, buf)) {
- cprintf("* LSUB () \"|\" ");
+ cprintf("* LSUB () \"/\" ");
imap_strout(buf);
cprintf("\r\n");
}
snprintf(pattern, sizeof pattern, "%s%s", parms[2], parms[3]);
if (strlen(parms[3]) == 0) {
- cprintf("* LIST (\\Noselect) \"|\" \"\"\r\n");
+ cprintf("* LIST (\\Noselect) \"/\" \"\"\r\n");
}
else {
|| ((ra & UA_GOTOALLOWED) && (ra & UA_ZAPPED))) {
imap_mailboxname(buf, sizeof buf, qrbuf);
if (imap_mailbox_matches_pattern(pattern, buf)) {
- cprintf("* LIST () \"|\" ");
+ cprintf("* LIST () \"/\" ");
imap_strout(buf);
cprintf("\r\n");
}
snprintf(pattern, sizeof pattern, "%s%s", parms[2], parms[3]);
if (strlen(parms[3]) == 0) {
- cprintf("* LIST (\\Noselect) \"|\" \"\"\r\n");
+ cprintf("* LIST (\\Noselect) \"/\" \"\"\r\n");
}
else {
flags = (ret & 0xff00); /* upper 8 bits = flags */
if (flags & IR_MAILBOX) {
- if (strncasecmp(parms[2], "INBOX|", 6)) {
+ if (strncasecmp(parms[2], "INBOX/", 6)) {
cprintf("%s NO Personal folders must be created under INBOX\r\n", parms[0]);
lprintf(CTDL_DEBUG, "not subordinate to inbox\n");
return;
/* Rename subfolders */
if ((!strncasecmp(foldername, irlparms->oldname,
strlen(irlparms->oldname))
- && (foldername[strlen(irlparms->oldname)] == '|'))) {
+ && (foldername[strlen(irlparms->oldname)] == '/'))) {
- sprintf(newfoldername, "%s|%s",
+ sprintf(newfoldername, "%s/%s",
irlparms->newname,
&foldername[strlen(irlparms->oldname) + 1]
);
/* Ok, at this point we're in normal command mode. The first thing
* we do is print any incoming pages (yeah! we really do!)
*/
- imap_print_express_messages();
+ imap_print_instant_messages();
/*
* Before processing the command that was just entered... if we happen
}
else if (!strcasecmp(parms[1], "LOGOUT")) {
- imap_do_expunge(); /* yes, we auto-expunge */
+ if (IMAP->selected) {
+ imap_do_expunge(); /* yes, we auto-expunge */
+ }
cprintf("* BYE %s logging out\r\n", config.c_fqdn);
cprintf("%s OK thank you for using Citadel IMAP\r\n",
parms[0]);
char *serv_imap_init(void)
{
CtdlRegisterServiceHook(config.c_imap_port,
- NULL, imap_greeting, imap_command_loop);
+ NULL, imap_greeting, imap_command_loop, NULL);
CtdlRegisterSessionHook(imap_cleanup_function, EVT_STOP);
return "$Id$";
}