projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
When using reply-all to reply to single-recipient message, make sure we still use...
[squirrelmail.git]
/
src
/
search.php
diff --git
a/src/search.php
b/src/search.php
index c163be3c25a1eb0b7e7327ca62271728b0ba8096..e6dfe1167e21297e03e82c5cdb460fa2f6f86d1f 100644
(file)
--- a/
src/search.php
+++ b/
src/search.php
@@
-8,7
+8,7
@@
* Subfolder search idea from Patch #806075 by Thomas Pohl xraven at users.sourceforge.net. Thanks Thomas!
*
* @author Alex Lemaresquier - Brainstorm <alex at brainstorm.fr>
* Subfolder search idea from Patch #806075 by Thomas Pohl xraven at users.sourceforge.net. Thanks Thomas!
*
* @author Alex Lemaresquier - Brainstorm <alex at brainstorm.fr>
- * @copyright
© 1999-2009
The SquirrelMail Project Team
+ * @copyright
1999-2012
The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
@@
-580,7
+580,7
@@
function asearch_get_query_display(&$color, &$mailbox_array, &$biop_array, &$uno
$cur_mailbox = 'INBOX';
$biop = asearch_nz($biop_array[$crit_num]);
if (($query_display == '') || ($cur_mailbox != $last_mailbox)) {
$cur_mailbox = 'INBOX';
$biop = asearch_nz($biop_array[$crit_num]);
if (($query_display == '') || ($cur_mailbox != $last_mailbox)) {
- $mailbox_display = ' <span class="mailbox">' .
htmlspecial
chars(asearch_get_mailbox_display($cur_mailbox)) . '</span>';
+ $mailbox_display = ' <span class="mailbox">' .
sm_encode_html_special_
chars(asearch_get_mailbox_display($cur_mailbox)) . '</span>';
if ($query_display == '')
$biop_display = _("In");
else
if ($query_display == '')
$biop_display = _("In");
else
@@
-606,7
+606,7
@@
function asearch_get_query_display(&$color, &$mailbox_array, &$biop_array, &$uno
if ($what_type == 'adate')
$what_display = asearch_get_date_display($what);
else
if ($what_type == 'adate')
$what_display = asearch_get_date_display($what);
else
- $what_display =
htmlspecial
chars($what);
+ $what_display =
sm_encode_html_special_
chars($what);
$what_display = ' <span class="value">' . $what_display . '</span>';
}
}
$what_display = ' <span class="value">' . $what_display . '</span>';
}
}
@@
-782,7
+782,7
@@
function asearch_print_form($imapConnection, &$boxes, $mailbox_array, $biop_arra
# Build the mailbox array
$a = array();
if (($mailbox != 'All Folders') && (!asearch_mailbox_exists($mailbox, $boxes))) {
# Build the mailbox array
$a = array();
if (($mailbox != 'All Folders') && (!asearch_mailbox_exists($mailbox, $boxes))) {
- $a[$mailbox] = '[' . _("Missing") . '] ' .
htmlspecial
chars(asearch_get_mailbox_display($mailbox));
+ $a[$mailbox] = '[' . _("Missing") . '] ' .
sm_encode_html_special_
chars(asearch_get_mailbox_display($mailbox));
}
$a['All Folders'] = '[' . asearch_get_mailbox_display('All Folders') . ']';
$a = array_merge($a, sqimap_mailbox_option_array($imapConnection, 0, $boxes, NULL));
}
$a['All Folders'] = '[' . asearch_get_mailbox_display('All Folders') . ']';
$a = array_merge($a, sqimap_mailbox_option_array($imapConnection, 0, $boxes, NULL));
@@
-841,7
+841,7
@@
function asearch_print_form_basic($imapConnection, &$boxes, $mailbox_array, $bio
# Build the mailbox array
$a = array();
if (($mailbox != 'All Folders') && (!asearch_mailbox_exists($mailbox, $boxes))) {
# Build the mailbox array
$a = array();
if (($mailbox != 'All Folders') && (!asearch_mailbox_exists($mailbox, $boxes))) {
- $a[$mailbox] = '[' . _("Missing") . '] ' .
htmlspecial
chars(asearch_get_mailbox_display($mailbox));
+ $a[$mailbox] = '[' . _("Missing") . '] ' .
sm_encode_html_special_
chars(asearch_get_mailbox_display($mailbox));
}
$a['All Folders'] = '[' . asearch_get_mailbox_display('All Folders') . ']';
$a = array_merge($a, sqimap_mailbox_option_array($imapConnection, 0, $boxes, NULL));
}
$a['All Folders'] = '[' . asearch_get_mailbox_display('All Folders') . ']';
$a = array_merge($a, sqimap_mailbox_option_array($imapConnection, 0, $boxes, NULL));
@@
-862,7
+862,7
@@
function asearch_print_form_basic($imapConnection, &$boxes, $mailbox_array, $bio
$oTemplate->assign('unary_options', $imap_asearch_unops);
$oTemplate->assign('where_options', $imap_asearch_options);
$oTemplate->assign('unary_options', $imap_asearch_unops);
$oTemplate->assign('where_options', $imap_asearch_options);
- $oTemplate->assign('mailbox_sel', strtolower(
htmlspecial
chars($mailbox)));
+ $oTemplate->assign('mailbox_sel', strtolower(
sm_encode_html_special_
chars($mailbox)));
$oTemplate->assign('unary_sel', $unop);
$oTemplate->assign('where_sel', $where);
$oTemplate->assign('what_val', $what);
$oTemplate->assign('unary_sel', $unop);
$oTemplate->assign('where_sel', $where);
$oTemplate->assign('what_val', $what);
@@
-893,7
+893,7
@@
function sqimap_asearch_get_selectable_unformatted_mailboxes(&$boxes)
/* ------------------------ main ------------------------ */
/* get globals we will need */
/* ------------------------ main ------------------------ */
/* get globals we will need */
-sqgetGlobalVar('smtoken', $submitted_token, SQ_
GET
, '');
+sqgetGlobalVar('smtoken', $submitted_token, SQ_
FORM
, '');
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
if (!sqgetGlobalVar('checkall',$checkall,SQ_GET)) {
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
if (!sqgetGlobalVar('checkall',$checkall,SQ_GET)) {
@@
-1604,7
+1604,7
@@
if ($submit == $search_button_text) {
*/
if ($aMailbox['EXISTS'] > 0) {
if ($iError) {
*/
if ($aMailbox['EXISTS'] > 0) {
if ($iError) {
- // TODO
+ // TODO
: Implement an error handler in the search page.
echo "ERROR occured, errorhandler will be implemented very soon";
} else {
foreach ($aTemplate as $k => $v) {
echo "ERROR occured, errorhandler will be implemented very soon";
} else {
foreach ($aTemplate as $k => $v) {
@@
-1618,7
+1618,7
@@
if ($submit == $search_button_text) {
$mailbox_display = imap_utf7_decode_local($mbx);
}
$mailbox_display = imap_utf7_decode_local($mbx);
}
- $oTemplate->assign('mailbox_name',
htmlspecial
chars($mailbox_display));
+ $oTemplate->assign('mailbox_name',
sm_encode_html_special_
chars($mailbox_display));
$oTemplate->display('search_result_mailbox.tpl');
$oTemplate->assign('page_selector', $page_selector);
$oTemplate->display('search_result_mailbox.tpl');
$oTemplate->assign('page_selector', $page_selector);