require_once('../src/validate.php');
require_once('../functions/imap.php');
require_once('../functions/imap_search.php');
-require_once('../functions/imap_utf7_decode_local');
+require_once('../functions/imap_utf7_decode_local.php');
require_once('../functions/array.php');
require_once('../functions/strings.php');
}
}
+function printSearchMessages($msgs,$mailbox, $cnt, $imapConnection, $usecache = false, $newsort = false) {
+ global $sort, $color;
+
+ $msort = calc_msort($msgs, $sort, $cnt, true);
+
+ if ($cnt > 0) {
+ if ( $mailbox == 'INBOX' ) {
+ $showbox = _("INBOX");
+ } else {
+ $showbox = imap_utf7_decode_local($mailbox);
+ }
+ echo html_tag( 'div', '<b><big>' . _("Folder:") . ' '. $showbox.'</big></b>','center') . "\n";
+
+ displayMessageArray($imapConnection, $cnt, 1,
+ $msgs, $msort, $mailbox, $sort, $color,
+ $cnt, true);
+
+ }
+}
+
/* ------------------------ main ------------------------ */
/* reset these arrays on each page load just in case */
$perbox_count = array ();
$recent_count = getPref($data_dir, $username, 'search_memory', 0);
+
/* get mailbox names */
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
$boxes = sqimap_mailbox_list($imapConnection);
}
if (isset($composenew) && $composenew) {
- displayPageHeader($color, $mailbox, 'comp_in_new();', $session);
+ $comp_uri = "../src/compose.php?mailbox=". urlencode($mailbox).
+ "&session=$composesession&attachedmessages=true&";
+ displayPageHeader($color, $mailbox, "comp_in_new(false,'$comp_uri');", false);
} else {
displayPageHeader($color, $mailbox);
}
do_hook('search_before_form');
-echo "<BR>\n".
- "<table width=\"100%\">\n".
- "<TR><td bgcolor=\"$color[0]\">\n".
- "<CENTER><B>" . _("Search") . "</B></CENTER>\n".
- "</TD></TR>\n".
- "</TABLE>\n";
+echo "<br>\n".
+ html_tag( 'table',
+ html_tag( 'tr', "\n" .
+ html_tag( 'td', '<b>' . _("Search") . '</b>', 'center', $color[0] )
+ ) ,
+ '', '', 'width="100%"') . "\n";
/* update the recent and saved searches from the pref files */
$attributes = get_recent($username, $data_dir);
/* Saved Search Table */
if ($saved_count > 0) {
- echo "<BR>\n"
- . "<TABLE WIDTH=\"95%\" BGCOLOR=\"$color[9]\" ALIGN=\"CENTER\" CELLPADDING=1 CELLSPACING=1>"
- . '<TR><TD align=center><B>Saved Searches</B></TD></TR><TR><TD>'
- . '<TABLE WIDTH="100%" ALIGN="CENTER" CELLPADDING=0 CELLSPACING=0>';
+ echo "<br>\n"
+ . html_tag( 'table', '', 'center', $color[9], 'width="95%" cellpadding="1" cellspacing="1" border="0"' )
+ . html_tag( 'tr',
+ html_tag( 'td', '<b>Saved Searches</b>', 'center' )
+ )
+ . html_tag( 'tr' )
+ . html_tag( 'td' )
+ . html_tag( 'table', '', 'center', '', 'width="100%" cellpadding="2" cellspacing="2" border="0"' );
for ($i=0; $i < $saved_count; ++$i) {
if ($i % 2) {
- echo "<TR BGCOLOR=\"$color[0]\">";
+ echo html_tag( 'tr', '', '', $color[0] );
} else {
- echo "<TR BGCOLOR=\"$color[4]\">";
+ echo html_tag( 'tr', '', '', $color[4] );
}
- echo "<TD WIDTH=\"35%\">".$saved_attributes['saved_folder'][$i]."</TD>"
- . "<TD ALIGN=LEFT>".$saved_attributes['saved_what'][$i]."</TD>"
- . "<TD ALIGN=CENTER>".$saved_attributes['saved_where'][$i]."</TD>"
- . '<TD ALIGN=RIGHT>'
- . '<A HREF=search.php'
+ echo html_tag( 'td', $saved_attributes['saved_folder'][$i], 'left', '', 'width="35%"' )
+ . html_tag( 'td', $saved_attributes['saved_what'][$i], 'left' )
+ . html_tag( 'td', $saved_attributes['saved_where'][$i], 'center' )
+ . html_tag( 'td', '', 'right' )
+ . '<a href=search.php'
. '?mailbox=' . urlencode($saved_attributes['saved_folder'][$i])
. '&what=' . urlencode($saved_attributes['saved_what'][$i])
. '&where=' . urlencode($saved_attributes['saved_where'][$i])
- . '>' . _("edit") . '</A>'
+ . '>' . _("edit") . '</a>'
. ' | '
- . '<A HREF=search.php'
+ . '<a href=search.php'
. '?mailbox=' . urlencode($saved_attributes['saved_folder'][$i])
. '&what=' . urlencode($saved_attributes['saved_what'][$i])
. '&where=' . urlencode($saved_attributes['saved_where'][$i])
. '&submit=Search_no_update'
- . '>' . _("search") . '</A>'
+ . '>' . _("search") . '</a>'
. ' | '
- . "<A HREF=search.php?count=$i&submit=delete>"
+ . "<a href=search.php?count=$i&submit=delete>"
. _("delete")
- . '</A>'
- . '</TD></TR>';
+ . '</a>'
+ . '</td></tr>';
}
- echo "</TABLE></TD></TR></TABLE>\n";
+ echo "</table></td></tr></table>\n";
}
-/* Recent Search Table */
if ($recent_count > 0) {
- echo "<BR>\n"
- . "<TABLE WIDTH=\"95%\" BGCOLOR=\"$color[9]\" ALIGN=\"CENTER\" CELLPADDING=1 CELLSPACING=1>\n"
- . '<TR><TD ALIGN=CENTER><B>' . _("Recent Searches") . '</B></TD></TR><TR><TD>'
- . '<TABLE WIDTH="100%" ALIGN="CENTER" CELLPADDING=0 CELLSPACING=0>';
+ echo "<br>\n"
+ . html_tag( 'table', '', 'center', $color[9], 'width="95%" cellpadding="1" cellspacing="1" border="0"' )
+ . html_tag( 'tr',
+ html_tag( 'td', '<b>' . _("Recent Searches") . '</b>', 'center' )
+ )
+ . html_tag( 'tr' )
+ . html_tag( 'td' )
+ . html_tag( 'table', '', 'center', '', 'width="100%" cellpadding="0" cellspacing="0" border="0"' );
for ($i=1; $i <= $recent_count; ++$i) {
if (isset($attributes['search_folder'][$i])) {
if ($attributes['search_folder'][$i] == "") {
}
}
if ($i % 2) {
- echo "<TR BGCOLOR=\"$color[0]\">";
+ echo html_tag( 'tr', '', '', $color[0] );
} else {
- echo "<TR BGCOLOR=\"$color[4]\">";
+ echo html_tag( 'tr', '', '', $color[0] );
}
if (isset($attributes['search_what'][$i]) &&
!empty($attributes['search_what'][$i])) {
- echo "<TD WIDTH=35%>".$attributes['search_folder'][$i]."</TD>"
- . "<TD ALIGN=LEFT>".$attributes['search_what'][$i]."</TD>"
- . "<TD ALIGN=CENTER>".$attributes['search_where'][$i]."</TD>"
- . '<TD ALIGN=RIGHT>'
- . "<A HREF=search.php?count=$i&submit=save>"
+ echo html_tag( 'td', $attributes['search_folder'][$i], 'left', '', 'width="35%"' )
+ . html_tag( 'td', $attributes['search_what'][$i], 'left' )
+ . html_tag( 'td', $attributes['search_where'][$i], 'center' )
+ . html_tag( 'td', '', 'right' )
+ . "<a href=search.php?count=$i&submit=save>"
. _("save")
- . '</A>'
+ . '</a>'
. ' | '
- . '<A HREF=search.php'
+ . '<a href=search.php'
. '?mailbox=' . urlencode($attributes['search_folder'][$i])
. '&what=' . urlencode($attributes['search_what'][$i])
. '&where=' . urlencode($attributes['search_where'][$i])
. '&submit=Search_no_update'
- . '>' . _("search") . '</A>'
+ . '>' . _("search") . '</a>'
. ' | '
- . "<A HREF=search.php?count=$i&submit=forget>"
+ . "<a href=search.php?count=$i&submit=forget>"
. _("forget")
- . '</A>'
- . '</TD></TR>';
+ . '</a>'
+ . '</td></tr>';
}
}
- echo '</TABLE></TD></TR></TABLE><BR>';
+ echo '</table></td></tr></table><br>';
+}
+
+
+if (isset($newsort)) {
+ $sort = $newsort;
+ session_register('sort');
+}
+
+/*********************************************************************
+ * Check to see if we can use cache or not. Currently the only time *
+ * when you will not use it is when a link on the left hand frame is *
+ * used. Also check to make sure we actually have the array in the *
+ * registered session data. :) *
+ *********************************************************************/
+if (! isset($use_mailbox_cache)) {
+ $use_mailbox_cache = 0;
}
+/* There is a problem with registered vars in 4.1 */
+/*
+if( substr( phpversion(), 0, 3 ) == '4.1' ) {
+ $use_mailbox_cache = FALSE;
+}
+*/
+
/* Search Form */
-echo '<B>' . _("Current Search") . '</B>'
- . '<FORM ACTION="search.php" NAME=s>'
- . ' <TABLE WIDTH="95%" CELLPADDING=0 CELLSPACING=0>'
- . ' <TR>'
- . ' <TD><SELECT NAME="mailbox">';
+echo html_tag( 'div', '<b>' . _("Current Search") . '</b>', 'left' ) . "\n"
+ . '<form action="search.php" name="s">'
+ . html_tag( 'table', '', '', '', 'width="95%" cellpadding="0" cellspacing="0" border="0"' )
+ . html_tag( 'tr' )
+ . html_tag( 'td', '', 'left' )
+ . '<select name="mailbox">';
for ($i = 0; $i < count($boxes); $i++) {
if (!in_array('noselect', $boxes[$i]['flags'])) {
$box = $boxes[$i]['unformatted'];
- $box2 = imap_utf7_decode_local(str_replace(' ', ' ', $boxes[$i]['unformatted-disp']));
+ $box2 = str_replace(' ', ' ',
+ imap_utf7_decode_local($boxes[$i]['unformatted-disp']));
if( $box2 == 'INBOX' ) {
$box2 = _("INBOX");
}
- if ($mailbox == $box) {
- echo " <OPTION VALUE=\"$box\" SELECTED>$box2</OPTION>\n";
- }
- else {
- echo " <OPTION VALUE=\"$box\">$box2</OPTION>\n";
- }
+ echo ' <option value="' . $box . '"';
+ if ($mailbox == $box) { echo ' selected'; }
+ echo '>' . $box2 . '</option>' . "\n";
}
}
- echo "<OPTION VALUE=\"All Folders\"";
- if ($mailbox == "All Folders") {
- echo "SELECTED";
+ echo '<option value="All Folders"';
+ if ($mailbox == 'All Folders') {
+ echo ' selected';
}
- echo ">All folders</OPTION>\n";
-echo ' </SELECT>'.
- " </TD>\n".
- " <TD ALIGN=\"CENTER\">\n";
+ echo ">All folders</option>\n";
+echo ' </select>'.
+ " </td>\n";
if ( !isset( $what ) ) {
$what = '';
}
$what_disp = str_replace('\\\\', '\\', $what_disp);
$what_disp = str_replace('\\"', '"', $what_disp);
$what_disp = str_replace('"', '"', $what_disp);
-echo " <INPUT TYPE=\"TEXT\" SIZE=\"35\" NAME=\"what\" VALUE=\"$what_disp\">\n".
- " </TD>\n".
- "<TD ALIGN=\"RIGHT\">\n".
- "<SELECT NAME=\"where\">";
+echo html_tag( 'td', '<input type="text" size="35" name="what" value="' . $what_disp . '">' . "\n", 'center' )
+ . html_tag( 'td', '', 'right' )
+ . "<select name=\"where\">";
s_opt( 'BODY', $where, _("Body") );
s_opt( 'TEXT', $where, _("Everywhere") );
s_opt( 'SUBJECT', $where, _("Subject") );
s_opt( 'FROM', $where, _("From") );
s_opt( 'CC', $where, _("Cc") );
s_opt( 'TO', $where, _("To") );
-echo " </SELECT>\n" .
- " </TD>\n".
- " <TD COLSPAN=\"3\" ALIGN=\"CENTER\">\n".
- " <INPUT TYPE=\"submit\" NAME=\"submit\" VALUE=\"" . _("Search") . "\">\n".
- " </TD>\n".
- " </TR>\n".
- "</FORM>\n".
- " </TABLE>\n".
- "</TD></TR></TABLE>\n";
+echo " </select>\n" .
+ " </td>\n".
+ html_tag( 'td', '<input type="submit" name="submit" value="' . _("Search") . '">' . "\n", 'center', '', 'colspan="3"' ) .
+ " </tr>\n".
+ "</form>\n".
+ " </table>\n".
+ "</td></tr></table>\n";
do_hook('search_after_form');
}
if (($submit == _("Search") || $submit == 'Search_no_update') && !empty($what)) {
sqimap_mailbox_select($imapConnection, $mailbox);
- $count_all = sqimap_search($imapConnection, $where, $what, $mailbox, $color, 0, $search_all, $count_all);
- array_push($perbox_count, $count_all);
+ $msgs = sqimap_search($imapConnection, $where, $what, $mailbox, $color, 0, $search_all, $count_all);
+ $count_all = count($msgs);
+ printSearchMessages($msgs, $mailbox, $count_all, $imapConnection);
+ array_push($perbox_count, $count_all);
}
}
for ($i=0;$i<count($perbox_count);$i++) {
- if ($perbox_count[$i] != "") {
- $count_all = "found";
+ if ($perbox_count[$i]) {
+ $count_all = true;
break;
}
}
- if ($count_all != "found") {
- echo '<br><b>' .
- _("No Messages found") .
- '</b><br>';
+ if (!$count_all) {
+ echo '<br><center>' . _("No Messages Found") . '</center>';
}
}
/* search one folder option */
else {
if (($submit == _("Search") || $submit == 'Search_no_update') && !empty($what)) {
- echo '<BR><CENTER><B>' .
- _("Search Results") .
- "</B></CENTER>\n";
+ echo '<br>'
+ . html_tag( 'div', '<b>' . _("Search Results") . '</b>', 'center' ) . "\n";
sqimap_mailbox_select($imapConnection, $mailbox);
- sqimap_search($imapConnection, $where, $what, $mailbox, $color, 0, $search_all, $count_all);
+ $msgs = sqimap_search($imapConnection, $where, $what, $mailbox, $color, 0, $search_all, $count_all);
+ if (count($msgs)) {
+ printSearchMessages($msgs, $mailbox, count($msgs), $imapConnection);
+ } else {
+ echo '<br><center>' . _("No Messages Found") . '</center>';
+ }
}
}
/* must have search terms to search */
if ($submit == _("Search") && empty($what)) {
- echo "<BR><CENTER><B>Please enter something to search for</B></CENTER>\n";
+ echo '<br>'
+ . html_tag( 'div', '<b>Please enter something to search for</b>', 'center' ) . "\n";
}
$allow_thread_sort = $old_value;
+
do_hook('search_bottom');
sqimap_logout ($imapConnection);
echo '</body></html>';
projects / squirrelmail.git / blobdiff