* Copyright (c) 2001-2009 by the citadel.org team and others, except for
* most of the UTF7 and UTF8 handling code which was lifted from Evolution.
*
- * This program is free software; you can redistribute it and/or modify
+ * This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*destp = 0;
string_init(&dest, destp, destend-destp);
- /* CtdlLogPrintf(CTDL_DEBUG, "toimap %s\r\n", src); */
+ /* IMAP_syslog(LOG_DEBUG, "toimap %s", src); */
for (;;)
{
if (state == 1)
utf7_closeb64(&dest, v, i);
- /* CtdlLogPrintf(CTDL_DEBUG, " -> %s\r\n", destp); */
+ /* IMAP_syslog(LOG_DEBUG, " -> %s", destp); */
return string_end(&dest);
}
*destp = 0;
string_init(&dest, destp, destend-destp);
- /* CtdlLogPrintf(CTDL_DEBUG, "fromimap %s\r\n", src); */
+ /* IMAP_syslog(LOG_DEBUG, "fromimap %s", src); */
do {
c = *p++;
}
} while (c != '\0');
- /* CtdlLogPrintf(CTDL_DEBUG, " -> %s\r\n", destp); */
+ /* IMAP_syslog(LOG_DEBUG, " -> %s", destp); */
return string_end(&dest);
}
if (qrbuf->QRflags & QR_MAILBOX)
{
if (strcasecmp(qrbuf->QRname+11, MAILROOM) == 0)
- p = toimap(p, bufend, "INBOX");
+ toimap(p, bufend, "INBOX");
else
{
p = toimap(p, bufend, "INBOX");
if (p < bufend)
*p++ = '/';
- p = toimap(p, bufend, qrbuf->QRname+11);
+ toimap(p, bufend, qrbuf->QRname+11);
}
}
else
p = toimap(p, bufend, fl->f_name);
if (p < bufend)
*p++ = '/';
- p = toimap(p, bufend, qrbuf->QRname);
+ toimap(p, bufend, qrbuf->QRname);
}
}
int imap_roomname(char *rbuf, int bufsize, const char *foldername)
{
+ struct CitContext *CCC = CC;
int levels;
char floorname[ROOMNAMELEN*2];
char roomname[ROOMNAMELEN];
ret = (0 | IR_MAILBOX);
exit:
- CtdlLogPrintf(CTDL_DEBUG, "(That translates to \"%s\")\n", rbuf);
+ IMAP_syslog(LOG_DEBUG, "(That translates to \"%s\")", rbuf);
return(ret);
}
}
return WILDMAT_TRUE;
}
- while (!IsEmptyStr(text) && (*(text - 1) != WILDMAT_DELIM)) {
+ while (!IsEmptyStr(text) &&
+ /* make shure texst - 1 isn't before lcase_p */
+ ((text == lcase_text) || (*(text - 1) != WILDMAT_DELIM)))
+ {
if ((matched = do_imap_match(text++, p))
!= WILDMAT_FALSE) {
return matched;