projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove debug statement
[squirrelmail.git]
/
src
/
search.php
diff --git
a/src/search.php
b/src/search.php
index b99fff9c81635bcd117ece3537cb8922e02c9d75..2998d4fbeb0c048817c16c7a865c39e729e48838 100644
(file)
--- a/
src/search.php
+++ b/
src/search.php
@@
-8,15
+8,18
@@
*
* IMAP search page
*
*
* IMAP search page
*
- * $Id$
+ * Subfolder search idea from Patch #806075 by Thomas Pohl xraven at users.sourceforge.net. Thanks Thomas!
+ *
+ * @version $Id$
* @package squirrelmail
* @link http://www.ietf.org/rfc/rfc3501.txt
* @author Alex Lemaresquier - Brainstorm - alex at brainstorm.fr
* @package squirrelmail
* @link http://www.ietf.org/rfc/rfc3501.txt
* @author Alex Lemaresquier - Brainstorm - alex at brainstorm.fr
- *
- * Subfolder search idea from Patch #806075 by Thomas Pohl xraven at users.sourceforge.net. Thanks Thomas!
*/
*/
-/** Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
define('SM_PATH','../');
/** SquirrelMail required files. */
define('SM_PATH','../');
/** SquirrelMail required files. */
@@
-536,7
+539,7
@@
function asearch_print_recent($data_dir, $username)
/** Build an <option> statement */
function asearch_opt($val, $sel, $tit)
{
/** Build an <option> statement */
function asearch_opt($val, $sel, $tit)
{
- return '<option value="' . $val . '"' . ($sel == $val ? ' selected' : '') . '>' . $tit . '</option>' . "\n";
+
return '<option value="' . $val . '"' . ($sel == $val ? ' selected' : '') . '>' . $tit . '</option>' . "\n";
}
/** Build a <select> statement from an array */
}
/** Build a <select> statement from an array */
@@
-585,7
+588,8
@@
function asearch_print_form_row($imapConnection, $boxes, $mailbox, $biop, $unop,
echo '</select>' . "\n";
/* Include Subfolders */
echo '</select>' . "\n";
/* Include Subfolders */
- echo _("and subfolders:") . '<input type=checkbox name="sub[' . $row_num .']"' . ($sub ? ' CHECKED' : '') . '></td>' . "\n";
+ echo _("and subfolders:") .
+ addCheckBox('sub[' . $row_num .']', $sub) . '</td>' . "\n";
/* Unary operator and Search location */
echo html_tag('td',
/* Unary operator and Search location */
echo html_tag('td',
@@
-594,12
+598,12
@@
function asearch_print_form_row($imapConnection, $boxes, $mailbox, $biop, $unop,
'center');
/* Text input */
'center');
/* Text input */
- $what_disp = htmlspecialchars($what);
- echo html_tag('td', '<input type="text" size="35" name="what[' . $row_num . ']" value="' . $what_disp . '">', 'center') . "\n";
+ echo html_tag('td', addInput('what['.$row_num.']', $what, '35'), 'center') . "\n";
/* Exclude criteria */
echo html_tag('td',
/* Exclude criteria */
echo html_tag('td',
- _("Exclude Criteria:") . '<input type=checkbox name="exclude[' . $row_num .']"' . ($exclude ? ' CHECKED' : '') . '>', 'center', '') . "\n";
+ _("Exclude Criteria:") .
+ addCheckBox('exclude['.$row_num.']', $exclude), 'center', '') . "\n";
echo "</tr>\n";
}
echo "</tr>\n";
}
@@
-665,7
+669,7
@@
function asearch_print_mailbox_msgs($imapConnection, $mailbox, $msgs, $cnt, $sor
$mailbox_display = asearch_get_mailbox_display($mailbox);
$msg_cnt_str = get_msgcnt_str(1, $cnt, $cnt);
$mailbox_display = asearch_get_mailbox_display($mailbox);
$msg_cnt_str = get_msgcnt_str(1, $cnt, $cnt);
- $paginator_str = '<b><big>' . _("Folder:") . ' '. $mailbox_display . '</big></b>';
+ $paginator_str = '<b><big>' . _("Folder:") . ' '. $mailbox_display . '
</big></b>';
echo '<br><table border="0" width="100%" cellpadding="0" cellspacing="0">';
echo '<br><table border="0" width="100%" cellpadding="0" cellspacing="0">';