1 $NetBSD: patch-af,v 1.3 2010/03/04 16:00:37 taca Exp $
3 --- src/search.php.orig 2009-08-12 17:29:53.000000000 +0900
5 @@ -226,7 +226,7 @@ function printSearchMessages($msgs,$mail
6 if ((!empty($allow_server_sort) && $allow_server_sort) || (!empty($allow_server_thread) && $allow_server_thread)) {
9 - $msort = calc_msort($msgs, $sort);
10 + $msort = calc_msort($msgs, $sort, $mailbox);
13 if ( $mailbox == 'INBOX' ) {
14 @@ -368,6 +368,7 @@ if ($saved_count > 0) {
15 . '?mailbox=' . urlencode($saved_attributes['saved_folder'][$i + 1])
16 . '&what=' . urlencode($saved_attributes['saved_what'][$i + 1])
17 . '&where=' . urlencode($saved_attributes['saved_where'][$i + 1])
18 + . '&smtoken=' . sm_generate_security_token()
19 . '">' . _("edit") . '</a>'
21 . '<a href="search.php'
22 @@ -375,9 +376,10 @@ if ($saved_count > 0) {
23 . '&what=' . urlencode($saved_attributes['saved_what'][$i + 1])
24 . '&where=' . urlencode($saved_attributes['saved_where'][$i + 1])
25 . '&submit=Search_no_update'
26 + . '&smtoken=' . sm_generate_security_token()
27 . '">' . _("search") . '</a>'
29 - . "<a href=\"search.php?count=$i&submit=delete\">"
30 + . "<a href=\"search.php?count=$i&submit=delete&smtoken=" . sm_generate_security_token() .'">'
34 @@ -395,7 +397,7 @@ if ($recent_count > 0) {
36 . html_tag( 'table', '', 'center', '', 'width="100%" cellpadding="0" cellspacing="0" border="0"' );
37 for ($i=1; $i <= $recent_count; ++$i) {
38 - if (isset($attributes['search_folder'][$i])) {
39 + if (isset($attributes['search_folder'][$i])) {
40 if ($attributes['search_folder'][$i] == "") {
41 $attributes['search_folder'][$i] = "INBOX";
43 @@ -411,7 +413,7 @@ if ($recent_count > 0) {
44 . html_tag( 'td', htmlspecialchars($attributes['search_what'][$i]), 'left' )
45 . html_tag( 'td', htmlspecialchars($attributes['search_where'][$i]), 'center' )
46 . html_tag( 'td', '', 'right' )
47 - . "<a href=\"search.php?count=$i&submit=save\">"
48 + . "<a href=\"search.php?count=$i&submit=save&smtoken=" . sm_generate_security_token() . '">'
52 @@ -420,9 +422,10 @@ if ($recent_count > 0) {
53 . '&what=' . urlencode($attributes['search_what'][$i])
54 . '&where=' . urlencode($attributes['search_where'][$i])
55 . '&submit=Search_no_update'
56 + . '&smtoken=' . sm_generate_security_token()
57 . '">' . _("search") . '</a>'
59 - . "<a href=\"search.php?count=$i&submit=forget\">"
60 + . "<a href=\"search.php?count=$i&submit=forget&smtoken=" . sm_generate_security_token() . '">'