1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
|
--- libs/sqwebmail/folder.c.orig 2008-07-20 19:00:33.000000000 +0200
+++ libs/sqwebmail/folder.c 2009-06-04 08:32:54.000000000 +0200
@@ -331,6 +331,18 @@
return rc ? "quota":"";
}
+static int groupmark(const char *folder, const char *file, size_t pos)
+{
+ maildir_msgmarkfile(folder, file, pos);
+ return (0);
+}
+
+static int groupunmark(const char *folder, const char *file, size_t pos)
+{
+ maildir_msgunmarkfile(folder, file, pos);
+ return (0);
+}
+
void folder_delmsgs(const char *dir, size_t pos)
{
const char *status=do_folder_delmsgs(dir, pos);
@@ -392,6 +404,16 @@
}
fclose(fp);
}
+ else if (*cgi("cmdmark"))
+ {
+ rc=group_movedel( dir, &groupmark );
+ maildir_savefoldermsgs(dir);
+ }
+ else if (*cgi("cmdunmark"))
+ {
+ rc=group_movedel( dir, &groupunmark );
+ maildir_savefoldermsgs(dir);
+ }
fprintf(ofp, "%s\n%s\n", maildir, path);
fclose(ofp);
@@ -510,7 +532,7 @@
folder_navigate(dir, pos, highend, morebefore, moreafter,
last_message_searched_ptr);
- printf("<table width=\"100%%\" border=\"0\" cellspacing=\"0\" cellpadding=\"4\"><tr class=\"folder-index-header\"><th align=\"center\">%s</th><th> </th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n",
+ printf("<table width=\"100%%\" border=\"0\" cellspacing=\"0\" cellpadding=\"4\"><tr class=\"folder-index-header\"><th align=\"center\">%s</th><th> </th><th> </th><th> </th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n",
getarg("NUM"),
getarg("DATE"),
(strncmp(dir, INBOX "." SENT, sizeof(INBOX)+sizeof(SENT)-1) &&
@@ -531,9 +553,9 @@
if (found)
{
- puts("<tr class=\"folder-index-bg-1\"><td colspan=\"6\"><hr /></td></tr>");
- puts("<tr class=\"folder-index-bg-2\"><td> </td>");
- puts("<td colspan=\"5\">");
+ puts("<tr class=\"folder-index-bg-3\"><td colspan=\"8\"><hr /></td></tr>");
+ puts("<tr class=\"folder-index-bg-4\"><td> </td>");
+ puts("<td colspan=\"7\">");
puts("<script type=\"text/javascript\">");
puts("/* <![CDATA[ */");
@@ -565,7 +587,7 @@
}
if (!found && nomsg)
{
- puts("<tr class=\"folder-index-bg-1\"><td colspan=\"6\" align=\"left\"><p>");
+ puts("<tr class=\"folder-index-bg-1\"><td colspan=\"8\" align=\"left\"><p>");
puts(nomsg);
puts("<br /></p></td></tr>");
printf("</table>\n");
@@ -630,12 +652,13 @@
if ((q=strrchr(p, '/')) != 0)
p=q+1;
- printf("<tr class=\"folder-index-bg-%d\" id=\"row%d\"><td align=\"right\" class=\"message-number\">%s%ld.%s</td><td class=\"message-status\"><input type=\"checkbox\" name=\"MOVE-%ld\" id=\"MOVE-%ld",
+ printf("<tr class=\"folder-index-bg-%d\" id=\"row%d\"><td align=\"right\" class=\"message-number\">%s%ld.%s</td><td class=\"message-flag\">%s</td><td class=\"message-select\"><input type=\"checkbox\" name=\"MOVE-%ld\" id=\"MOVE-%ld",
(row & 1)+1,
row,
folder_index_entry_start,
(long)(msgnum+1),
folder_index_entry_end,
+ maildirfile_flag(MSGINFO_FILENAME(contents[i])) ? "<font color=\"red\">!</font>" : "",
(long) (msgnum),
(long) (msgnum));
printf("\" onchange=\"setsel('MOVE-%ld', 'row%d', 'folder-index-bg-%d');\"%s /><input type=\"hidden\" name=\"MOVEFILE-%ld\" value=\"",
@@ -643,7 +666,7 @@
(type[0] == MSGTYPE_DELETED ? " disabled=\"disabled\"":""),
(long)(msgnum));
output_attrencoded(p);
- printf("\" /> %s%s%s</td><td class=\"message-date\">%s",
+ printf("\" /></td><td class=\"message-status\">%s%s%s</td><td class=\"message-date\">%s",
folder_index_entry_start,
type,
folder_index_entry_end,
@@ -3645,7 +3668,7 @@
if ((strcmp(sqwebmail_folder, INBOX "." TRASH) == 0) && (strlen(getarg("PURGEALL"))))
printf("<input type=\"submit\" name=\"cmdpurgeall\" value=\"%s\" onclick=\"javascript: return deleteAll();\" />",
getarg("PURGEALL"));
- printf("<input type=\"submit\" name=\"cmddel\" value=\"%s\" />%s<select name=\"moveto\">",
+ printf("<input type=\"submit\" name=\"cmddel\" value=\"%s\" />, <input type=\"submit\" name=\"cmdmark\" value=\"Mark\" />, <input type=\"submit\" name=\"cmdunmark\" value=\"Unmark\" />%s<select name=\"moveto\">",
strcmp(sqwebmail_folder, INBOX "." TRASH) == 0
? purgelab:deletelab,
movelab);
|
