summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sqwebmail/autoresponse.c14
-rw-r--r--sqwebmail/folder.c10
-rw-r--r--sqwebmail/maildir.c8
-rw-r--r--sqwebmail/maildir.h6
-rw-r--r--sqwebmail/mailfilter.c18
-rw-r--r--sqwebmail/sqwebmail.c4
6 files changed, 30 insertions, 30 deletions
diff --git a/sqwebmail/autoresponse.c b/sqwebmail/autoresponse.c
index 447355c..2ed3f06 100644
--- a/sqwebmail/autoresponse.c
+++ b/sqwebmail/autoresponse.c
@@ -72,7 +72,7 @@ const char *autoresp_text2=getarg("TEXT2");
char *p;
FILE *fp;
- p=folder_toutf7(name);
+ p=folder_toutf8(name);
if (!p || maildir_autoresponse_validate(NULL, p))
{
@@ -107,7 +107,7 @@ const char *autoresp_text2=getarg("TEXT2");
{
const char *autorespname=cgi("autoresponse_choose");
FILE *fp;
- char *s=folder_fromutf7(autorespname);
+ char *s=folder_fromutf8(autorespname);
const char *pp;
if (!s)
@@ -282,7 +282,7 @@ void autoresponsedelete()
if (mailfilter_autoreplyused(autorespname))
{
- char *s=folder_fromutf7(autorespname);
+ char *s=folder_fromutf8(autorespname);
printf(getarg("INUSE"), s ? s:"");
if (s)
free(s);
@@ -539,8 +539,8 @@ static int comp_autorespname(const void *a, const void *b)
const char *ca=*(const char **)a;
const char *cb=*(const char **)b;
- char *sa=folder_fromutf7(ca);
- char *sb=folder_fromutf7(cb);
+ char *sa=folder_fromutf8(ca);
+ char *sb=folder_fromutf8(cb);
int i=sa && sb ? strcoll(sa, sb):0;
@@ -573,7 +573,7 @@ void autoresponselist()
output_attrencoded(list[i]);
printf("\">");
- s=folder_fromutf7(list[i]);
+ s=folder_fromutf8(list[i]);
output_attrencoded(s);
printf("</option>");
free(s);
@@ -608,7 +608,7 @@ void autoresponsepick()
output_attrencoded(list[i]);
printf("\">");
- s=folder_fromutf7(list[i]);
+ s=folder_fromutf8(list[i]);
output_attrencoded(s);
printf("</option>");
free(s);
diff --git a/sqwebmail/folder.c b/sqwebmail/folder.c
index bf31d36..fa2c2b1 100644
--- a/sqwebmail/folder.c
+++ b/sqwebmail/folder.c
@@ -193,7 +193,7 @@ int in_utf8;
unicode_convert_fromutf8(f,
sqwebmail_content_charset,
NULL)
- : folder_fromutf7(f);
+ : folder_fromutf8(f);
if (strcmp(ff, NEWSHAREDSP) == 0 ||
strncmp(ff, NEWSHAREDSP ".", sizeof(NEWSHAREDSP)) == 0)
@@ -1322,7 +1322,7 @@ void folder_nextprev()
void list_folder(const char *p)
{
- char *s=folder_fromutf7(p);
+ char *s=folder_fromutf8(p);
print_safe(s);
free(s);
}
@@ -2630,8 +2630,8 @@ void folder_list()
if (!*folderdir)
folderdir=INBOX;
- futf7=folder_toutf7(newfoldername);
- dutf7=folder_toutf7(newdirname);;
+ futf7=folder_toutf8(newfoldername);
+ dutf7=folder_toutf8(newdirname);;
if (!*newfoldername ||
strchr(futf7, '.') ||
@@ -2755,7 +2755,7 @@ void folder_list()
char *s;
char *rutf7;
- rutf7=folder_toutf7(r);
+ rutf7=folder_toutf8(r);
s=malloc(strlen(qutf7)+strlen(rutf7)+1);
diff --git a/sqwebmail/maildir.c b/sqwebmail/maildir.c
index 9c09813..e19cbcb 100644
--- a/sqwebmail/maildir.c
+++ b/sqwebmail/maildir.c
@@ -3907,13 +3907,13 @@ void matches_free(MATCHEDSTR **p, unsigned n)
** Convert folder names to modified-UTF7 encoding.
*/
-char *folder_toutf7(const char *foldername)
+char *folder_toutf8(const char *foldername)
{
char *p;
int converr;
p=unicode_convert_tobuf(foldername, sqwebmail_content_charset,
- unicode_x_imap_modutf7, &converr);
+ unicode_x_smap_modutf8, &converr);
if (p && converr)
{
@@ -3930,13 +3930,13 @@ char *folder_toutf7(const char *foldername)
return (p);
}
-char *folder_fromutf7(const char *foldername)
+char *folder_fromutf8(const char *foldername)
{
char *p;
int converr;
p=unicode_convert_tobuf(foldername,
- unicode_x_imap_modutf7,
+ unicode_x_smap_modutf8,
sqwebmail_content_charset,
&converr);
diff --git a/sqwebmail/maildir.h b/sqwebmail/maildir.h
index 7628d1f..1c4be46 100644
--- a/sqwebmail/maildir.h
+++ b/sqwebmail/maildir.h
@@ -99,11 +99,11 @@ extern unsigned maildir_countof(const char *);
extern void maildir_savefoldermsgs(const char *);
/*
-** Convert folder names to modified-UTF7.
+** Convert folder names to modified-UTF8.
*/
-extern char *folder_toutf7(const char *);
-extern char *folder_fromutf7(const char *);
+extern char *folder_toutf8(const char *);
+extern char *folder_fromutf8(const char *);
/*
** Cache kept in the Maildir directory of the sorted contents of the cur
diff --git a/sqwebmail/mailfilter.c b/sqwebmail/mailfilter.c
index d0f8c70..71b8123 100644
--- a/sqwebmail/mailfilter.c
+++ b/sqwebmail/mailfilter.c
@@ -99,12 +99,12 @@ struct maildirfilterrule *r;
if (*cgi("internalerr"))
{
- const char *p=internal_err;
+ const char *p=internal_err;
- if (*cgi("currentfilternum"))
- printf("<input name=\"currentfilternum\""
- " type=\"hidden\""
- " value=\"%s\" />", cgi("currentfilternum"));
+ if (*cgi("currentfilternum"))
+ printf("<input name=\"currentfilternum\""
+ " type=\"hidden\""
+ " value=\"%s\" />", cgi("currentfilternum"));
if (p)
printf("%s", getarg(p));
}
@@ -176,7 +176,7 @@ struct maildirfilterrule *r;
" value=\"%s\" />", p);
cgi_put("filtertype",
- r->type == startswith ||
+ r->type == startswith ||
r->type == endswith ||
r->type == contains ?
r->flags & MFR_BODY ? "body":"header":
@@ -308,7 +308,7 @@ struct maildirfilterrule *r;
cgi_put("autoresponse_choose", autoresp_name_buf);
cgi_put("autoresponse_dsn",
mfai.dsnflag ? "1":"");
-
+
cgi_put("autoresponse_dupe",
mfai.days > 0 ? "1":"");
@@ -345,8 +345,8 @@ struct maildirfilterrule *r;
" type=\"hidden\""
" value=\"%s\" />", p);
}
-
-
+
+
maildir_filter_freerules(&mf);
}
diff --git a/sqwebmail/sqwebmail.c b/sqwebmail/sqwebmail.c
index 91c1013..9a77bc6 100644
--- a/sqwebmail/sqwebmail.c
+++ b/sqwebmail/sqwebmail.c
@@ -1080,7 +1080,7 @@ static void do_output_form_loop(FILE *f)
char *origc, *c;
const char *sep="";
- origc=c=folder_fromutf7(f);
+ origc=c=folder_fromutf8(f);
if (*c && strcmp(c, INBOX))
{
@@ -2096,7 +2096,7 @@ void rename_sent_folder(int really)
if (strftime (buf, sizeof(buf), "." SENT ".%Y.%m-%b", tm) == 0)
return;
- pp=folder_toutf7(buf);
+ pp=folder_toutf8(buf);
if (really)
rename("." SENT, pp);
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 11:11:34 +0000