X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsearch.php;h=16aa65ef5fc9ee924fac404354544ad36559e7a5;hb=c4de3c9291874959bdafbf50d5c818b3f02791dd;hp=0b7cc54e538c996c4caafa5c8a3273531b5d1ab9;hpb=f43704ceeb266963c35798a99aa278e2ebd600a0;p=squirrelmail.git
diff --git a/src/search.php b/src/search.php
index 0b7cc54e..16aa65ef 100644
--- a/src/search.php
+++ b/src/search.php
@@ -8,15 +8,18 @@
*
* 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
- *
- * 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. */
@@ -536,7 +539,7 @@ function asearch_print_recent($data_dir, $username)
/** Build an ' . "\n";
+ return '' . "\n";
}
/** Build a ' . "\n";
/* Include Subfolders */
- echo _("and subfolders:") . '' . "\n";
+ echo _("and subfolders:") .
+ addCheckBox('sub[' . $row_num .']', $sub) . '' . "\n";
/* 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 */
- $what_disp = htmlspecialchars($what);
- echo html_tag('td', '', 'center') . "\n";
+ echo html_tag('td', addInput('what['.$row_num.']', $what, '35'), 'center') . "\n";
/* Exclude criteria */
echo html_tag('td',
- _("Exclude Criteria:") . '', 'center', '') . "\n";
+ _("Exclude Criteria:") . sm_print_r($exclude) .
+ addCheckBox('exclude['.$row_num.']', $exclude), 'center', '') . "\n";
echo "\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);
- $paginator_str = '' . _("Folder:") . ' '. $mailbox_display . '';
+ $paginator_str = '' . _("Folder:") . ' '. $mailbox_display . ' ';
echo '