"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "libs/sqwebmail/folder.c" between
sqwebmail-5.9.3.tar.bz2 and sqwebmail-6.0.0.tar.bz2

About: SqWebMail is a CGI Webmail client for Maildir mailboxes (module of the Courier mail server).

folder.c  (sqwebmail-5.9.3.tar.bz2):folder.c  (sqwebmail-6.0.0.tar.bz2)
skipping to change at line 195 skipping to change at line 195
if (lab) if (lab)
{ {
char *ff, *origff; char *ff, *origff;
printf("%s", lab); printf("%s", lab);
origff=ff=in_utf8 ? origff=ff=in_utf8 ?
unicode_convert_fromutf8(f, unicode_convert_fromutf8(f,
sqwebmail_content_charset, sqwebmail_content_charset,
NULL) NULL)
: folder_fromutf7(f); : folder_fromutf8(f);
if (strcmp(ff, NEWSHAREDSP) == 0 || if (strcmp(ff, NEWSHAREDSP) == 0 ||
strncmp(ff, NEWSHAREDSP ".", sizeof(NEWSHAREDSP)) == 0) strncmp(ff, NEWSHAREDSP ".", sizeof(NEWSHAREDSP)) == 0)
{ {
printf("%s", getarg("PUBLICFOLDERS")); printf("%s", getarg("PUBLICFOLDERS"));
ff=strchr(ff, '.'); ff=strchr(ff, '.');
if (!ff) if (!ff)
ff=""; ff="";
} }
output_attrencoded(ff); output_attrencoded(ff);
skipping to change at line 1320 skipping to change at line 1320
printf("<td width=\"100%%\"></td></tr></table></td><td align=\"right\" valig n=\"middle\">"); printf("<td width=\"100%%\"></td></tr></table></td><td align=\"right\" valig n=\"middle\">");
printf("<table border=\"0\" cellspacing=\"4\"><tr><td class=\"message-x-o f-y\">&nbsp;"); printf("<table border=\"0\" cellspacing=\"4\"><tr><td class=\"message-x-o f-y\">&nbsp;");
printf(msg_msglab, (int)msg_pos+1, (int)msg_count); printf(msg_msglab, (int)msg_pos+1, (int)msg_count);
printf("&nbsp;</td></tr></table>"); printf("&nbsp;</td></tr></table>");
printf("</td></tr></table>\n"); printf("</td></tr></table>\n");
} }
void list_folder(const char *p) void list_folder(const char *p)
{ {
char *s=folder_fromutf7(p); char *s=folder_fromutf8(p);
print_safe(s); print_safe(s);
free(s); free(s);
} }
void list_folder_xlate(const char *p, void list_folder_xlate(const char *p,
const char *path, const char *path,
const char *n_inbox, const char *n_inbox,
const char *n_drafts, const char *n_drafts,
const char *n_sent, const char *n_sent,
const char *n_trash) const char *n_trash)
skipping to change at line 2624 skipping to change at line 2624
char *dutf7; char *dutf7;
/* /*
** New folder names cannot contain .s, and must be considered ** New folder names cannot contain .s, and must be considered
** as valid by maildir_folderpath. ** as valid by maildir_folderpath.
*/ */
if (!*folderdir) if (!*folderdir)
folderdir=INBOX; folderdir=INBOX;
futf7=folder_toutf7(newfoldername); futf7=folder_toutf8(newfoldername);
dutf7=folder_toutf7(newdirname);; dutf7=folder_toutf8(newdirname);;
if (!*newfoldername || if (!*newfoldername ||
strchr(futf7, '.') || strchr(futf7, '.') ||
strchr(dutf7, '.')) strchr(dutf7, '.'))
{ {
free(futf7); free(futf7);
free(dutf7); free(dutf7);
folder_err_msg=err_invalid; folder_err_msg=err_invalid;
} }
else else
skipping to change at line 2749 skipping to change at line 2749
if (*cgi("do.rename")) if (*cgi("do.rename"))
{ {
const char *p=cgi("DELETE"); const char *p=cgi("DELETE");
char *pp=strdup(p); char *pp=strdup(p);
struct maildir_info mifrom, mito; struct maildir_info mifrom, mito;
const char *qutf7=cgi("renametofolder"); const char *qutf7=cgi("renametofolder");
const char *r=trim_spaces(cgi("renametoname")); const char *r=trim_spaces(cgi("renametoname"));
char *s; char *s;
char *rutf7; char *rutf7;
rutf7=folder_toutf7(r); rutf7=folder_toutf8(r);
s=malloc(strlen(qutf7)+strlen(rutf7)+1); s=malloc(strlen(qutf7)+strlen(rutf7)+1);
if (!s) enomem(); if (!s) enomem();
strcat(strcpy(s, qutf7), rutf7); strcat(strcpy(s, qutf7), rutf7);
if (strchr(r, '.') == NULL if (strchr(r, '.') == NULL
&& maildir_info_imap_find(&mifrom, pp, && maildir_info_imap_find(&mifrom, pp,
login_returnaddr()) == 0) login_returnaddr()) == 0)
 End of changes. 4 change blocks. 
5 lines changed or deleted 5 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)