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/array.php');
require_once('../functions/strings.php');
+global $allow_thread_sort;
/* here are some functions, could go in imap_search.php
echo ">$tit</option>\n";
}
-/* function to get the recent searches and put them in arrays */
-function get_recent($pref_name, $username, $data_dir) {
- $array = array ();
+/* function to get the recent searches and put them in the attributes array */
+function get_recent($username, $data_dir) {
+ $attributes = array();
+ $types = array('search_what', 'search_where', 'search_folder');
$recent_count = getPref($data_dir, $username, 'search_memory', 0);
- $n = 0;
for ($x=1;$x<=$recent_count;$x++) {
- $array[$n] = getPref($data_dir, $username, "$pref_name" . "$x", "");
- $n++;
+ reset($types);
+ foreach ($types as $key) {
+ $attributes[$key][$x] = getPref($data_dir, $username, $key.$x, "");
+ }
}
- return $array;
+ return $attributes;
}
-/* function to get the saved searches and put them in arrays */
-function get_saved($pref_name, $username, $data_dir) {
- $array = array ();
- $n = 0;
- for ($x=1;;$x++) {
- $array[$n] = getPref($data_dir, $username, "$pref_name" . "$x", "");
- if ($array[$n] == "") {
- array_pop($array);
- return $array;
- }
- $n++;
+/* function to get the saved searches and put them in the saved_attributes array */
+function get_saved($username, $data_dir) {
+ $saved_attributes = array();
+ $types = array('saved_what', 'saved_where', 'saved_folder');
+ foreach ($types as $key) {
+ for ($x=1;;$x++) {
+ $saved_attributes[$key][$x] = getPref($data_dir, $username, $key."$x", "");
+ if ($saved_attributes[$key][$x] == "") {
+ array_pop($saved_attributes[$key]);
+ break;
+ }
+ }
}
- return $array;
+ return $saved_attributes;
}
/* function to update recent pref arrays */
function update_recent($what, $where, $mailbox, $username, $data_dir) {
- $what_array = get_recent('search_what', $username, $data_dir);
- $where_array = get_recent('search_where', $username, $data_dir);
- $folder_array = get_recent('search_folder', $username, $data_dir);
+ $attributes = array();
+ $types = array('search_what', 'search_where', 'search_folder');
+ $input = array($what, $where, $mailbox);
+ $attributes = get_recent( $username, $data_dir);
+ reset($types);
$dupe = 'no';
- for ($i=0;$i<count($what_array);$i++) {
- if ($what == $what_array[$i] &&
- $where == $where_array[$i] &&
- $mailbox == $folder_array[$i]) {
-
- $dupe = 'yes';
+ for ($i=1;$i<=count($attributes['search_what']);$i++) {
+ if (isset($attributes['search_what'][$i])) {
+ if ($what == $attributes['search_what'][$i] &&
+ $where == $attributes['search_where'][$i] &&
+ $mailbox == $attributes['search_folder'][$i]) {
+ $dupe = 'yes';
+ }
}
}
if ($dupe == 'no') {
- array_push ($what_array, $what);
- array_push ($where_array, $where);
- array_push ($folder_array, $mailbox);
- array_shift ($what_array);
- array_shift ($where_array);
- array_shift ($folder_array);
- $recent_count = getPref($data_dir, $username, 'search_memory', 0);
- $n=0;
- for ($i=1;$i<=$recent_count;$i++) {
- setPref($data_dir, $username, "search_what$i", $what_array[$n]);
- setPref($data_dir, $username, "search_where$i", $where_array[$n]);
- setPref($data_dir, $username, "search_folder$i", $folder_array[$n]);
- $n++;
- }
+ $i = 0;
+ foreach ($types as $key) {
+ array_push ($attributes[$key], $input[$i]);
+ array_shift ($attributes[$key]);
+ $i++;
+ }
+ $recent_count = getPref($data_dir, $username, 'search_memory', 0);
+ $n=0;
+ for ($i=1;$i<=$recent_count;$i++) {
+ reset($types);
+ foreach ($types as $key) {
+ setPref($data_dir, $username, $key.$i, $attributes[$key][$n]);
+ }
+ $n++;
+ }
}
}
/* function to forget a recent search */
function forget_recent($forget_index, $username, $data_dir) {
- $what_array = get_recent('search_what', $username, $data_dir);
- $where_array = get_recent('search_where', $username, $data_dir);
- $folder_array = get_recent('search_folder', $username, $data_dir);
- array_splice($what_array, $forget_index, 1);
- array_splice($where_array, $forget_index, 1);
- array_splice($folder_array, $forget_index, 1);
- array_unshift($what_array, '');
- array_unshift($where_array, '');
- array_unshift($folder_array, '');
+ $attributes = array();
+ $types = array('search_what', 'search_where', 'search_folder');
+ $attributes = get_recent( $username, $data_dir);
+ reset($types);
+ foreach ($types as $key) {
+ array_splice($attributes[$key], $forget_index, 1);
+ array_unshift($attributes[$key], '');
+ }
+ reset($types);
$recent_count = getPref($data_dir, $username, 'search_memory', 0);
$n=0;
for ($i=1;$i<=$recent_count;$i++) {
- setPref($data_dir, $username, "search_what$i", $what_array[$n]);
- setPref($data_dir, $username, "search_where$i", $where_array[$n]);
- setPref($data_dir, $username, "search_folder$i", $folder_array[$n]);
+ reset($types);
+ foreach ($types as $key) {
+ setPref($data_dir, $username, $key.$i, $attributes[$key][$n]);
+ }
$n++;
}
}
/* function to delete a saved search */
function delete_saved($delete_index, $username, $data_dir) {
- $saved_what_array = get_saved('saved_what', $username, $data_dir);
- $saved_where_array = get_saved('saved_where', $username, $data_dir);
- $saved_folder_array = get_saved('saved_folder', $username, $data_dir);
- array_splice($saved_what_array, $delete_index, 1);
- array_splice($saved_where_array, $delete_index, 1);
- array_splice($saved_folder_array, $delete_index, 1);
+ $types = array('saved_what', 'saved_where', 'saved_folder');
+ $attributes = get_saved($username, $data_dir);
+ foreach ($types as $key) {
+ array_splice($attributes[$key], $delete_index, 1);
+ }
+ reset($types);
$n=0;
- $saved_count = count($saved_what_array);
+ $saved_count = count($attributes['saved_what']);
$last_element = $saved_count + 1;
- if ($last_element < 1) {
for ($i=1;$i<=$saved_count;$i++) {
- setPref($data_dir, $username, "saved_what$i", $saved_what_array[$n]);
- setPref($data_dir, $username, "saved_where$i", $saved_where_array[$n]);
- setPref($data_dir, $username, "saved_folder$i", $saved_folder_array[$n]);
+ reset($types);
+ foreach ($types as $key) {
+ setPref($data_dir, $username, $key.$i, $attributes[$key][$n]);
+ }
$n++;
}
+ reset($types);
+ foreach($types as $key) {
+ removePref($data_dir, $username, $key.$last_element);
}
- removePref($data_dir, $username, "saved_what$last_element");
- removePref($data_dir, $username, "saved_where$last_element");
- removePref($data_dir, $username, "saved_folder$last_element");
}
/* function to save a search from recent to saved */
function save_recent($save_index, $username, $data_dir) {
- $what_array = get_recent('search_what', $username, $data_dir);
- $where_array = get_recent('search_where', $username, $data_dir);
- $folder_array = get_recent('search_folder', $username, $data_dir);
- $saved_what_once = array_slice($what_array, $save_index, 1);
- $saved_where_once = array_slice($where_array, $save_index, 1);
- $saved_folder_once = array_slice($folder_array, $save_index, 1);
- $saved_array = get_saved('saved_what', $username, $data_dir);
- $saved_count = (count($saved_array) + 1);
- setPref($data_dir, $username, "saved_what$saved_count", $saved_what_once[0]);
- setPref($data_dir, $username, "saved_where$saved_count", $saved_where_once[0]);
- setPref($data_dir, $username, "saved_folder$saved_count", $saved_folder_once[0]);
+ $attributes = array();
+ $types = array('search_what', 'search_where', 'search_folder');
+ $saved_types = array(0 => 'saved_what', 1 => 'saved_where', 2 => 'saved_folder');
+ $saved_array = get_saved($username, $data_dir);
+ $save_index = $save_index -1;
+ $saved_count = (count($saved_array['saved_what']) + 1);
+ $attributes = get_recent ($username, $data_dir);
+ $n = 0;
+ foreach ($types as $key) {
+ $slice = array_slice($attributes[$key], $save_index, 1);
+ $name = $saved_types[$n];
+ setPref($data_dir, $username, $name.$saved_count, $slice[0]);
+ $n++;
+ }
}
/* ------------------------ main ------------------------ */
/* reset these arrays on each page load just in case */
-$what_array = array ();
-$where_array = array ();
-$folder_array = array ();
-$saved_what_array = array ();
-$saved_where_array = array ();
-$saved_folder_array = array ();
+$attributes = array ();
+$saved_attributes = array ();
$search_all = 'none';
$perbox_count = array ();
+$recent_count = getPref($data_dir, $username, 'search_memory', 0);
/* get mailbox names */
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
$search_all = 'all';
}
-displayPageHeader($color, $mailbox);
-
+if (isset($composenew) && $composenew) {
+ displayPageHeader($color, $mailbox, 'comp_in_new();');
+} else {
+ displayPageHeader($color, $mailbox);
+}
/* See how the page was called and fire off correct function */
if ((!isset($submit) || empty($submit)) && !empty($what)) {
$submit = _("Search");
}
if ( !isset( $submit ) ) {
- /*
- Jason, leave E_ALL only on error reporting in php.ini
- Variables must contain a value befor to check them,
- or else there are compilation slow down as PHP has
- to guess.
- Remove this comment once read 8-)
- */
$submit = '';
} else if ($submit == _("Search") && !empty($what)) {
- update_recent($what, $where, $mailbox, $username, $data_dir);
+ if ($recent_count > 0) {
+ update_recent($what, $where, $mailbox, $username, $data_dir);
+ }
}
elseif ($submit == 'forget') {
forget_recent($count, $username, $data_dir);
"</TABLE>\n";
/* update the recent and saved searches from the pref files */
-$what_array = get_recent('search_what', $username, $data_dir);
-$where_array = get_recent('search_where', $username, $data_dir);
-$folder_array = get_recent('search_folder', $username, $data_dir);
-$recent_count = getPref($data_dir, $username, 'search_memory', 0);
-$saved_what_array = get_saved('saved_what', $username, $data_dir);
-$saved_where_array = get_saved('saved_where', $username, $data_dir);
-$saved_folder_array = get_saved('saved_folder', $username, $data_dir);
-$saved_count = count($saved_what_array);
+$attributes = get_recent($username, $data_dir);
+$saved_attributes = get_saved($username, $data_dir);
+$saved_count = count($saved_attributes['saved_what']);
$count_all = 0;
/* Saved Search Table */
} else {
echo "<TR BGCOLOR=\"$color[4]\">";
}
- echo "<TD WIDTH=\"35%\">$saved_folder_array[$i]</TD>"
- . "<TD ALIGN=LEFT>$saved_what_array[$i]</TD>"
- . "<TD ALIGN=CENTER>$saved_where_array[$i]</TD>"
+ 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'
- . '?mailbox=' . urlencode($saved_folder_array[$i])
- . '&what=' . urlencode($saved_what_array[$i])
- . '&where=' . urlencode($saved_where_array[$i])
+ . '?mailbox=' . urlencode($saved_attributes['saved_folder'][$i])
+ . '&what=' . urlencode($saved_attributes['saved_what'][$i])
+ . '&where=' . urlencode($saved_attributes['saved_where'][$i])
. '>' . _("edit") . '</A>'
. ' | '
. '<A HREF=search.php'
- . '?mailbox=' . urlencode($saved_folder_array[$i])
- . '&what=' . urlencode($saved_what_array[$i])
- . '&where=' . urlencode($saved_where_array[$i])
- . '&submit=Search_no_update'
+ . '?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>'
. ' | '
- . "<A HREF=search.php?count=$i&submit=delete>"
+ . "<A HREF=search.php?count=$i&submit=delete>"
. _("delete")
. '</A>'
. '</TD></TR>';
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>'
+ . '<TR><TD ALIGN=CENTER><B>' . _("Recent Searches") . '</B></TD></TR><TR><TD>'
. '<TABLE WIDTH="100%" ALIGN="CENTER" CELLPADDING=0 CELLSPACING=0>';
- for ($i=0; $i < $recent_count; ++$i) {
- if (!empty($what_array[$i])) {
- if ($folder_array[$i] == "") {
- $folder_array[$i] = "INBOX";
+ for ($i=1; $i <= $recent_count; ++$i) {
+ if (isset($attributes['search_folder'][$i])) {
+ if ($attributes['search_folder'][$i] == "") {
+ $attributes['search_folder'][$i] = "INBOX";
+ }
}
if ($i % 2) {
echo "<TR BGCOLOR=\"$color[0]\">";
} else {
echo "<TR BGCOLOR=\"$color[4]\">";
}
- echo "<TD WIDTH=35%>$folder_array[$i]</TD>"
- . "<TD ALIGN=LEFT>$what_array[$i]</TD>"
- . "<TD ALIGN=CENTER>$where_array[$i]</TD>"
+ 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>"
+ . "<A HREF=search.php?count=$i&submit=save>"
. _("save")
. '</A>'
. ' | '
. '<A HREF=search.php'
- . '?mailbox=' . urlencode($folder_array[$i])
- . '&what=' . urlencode($what_array[$i])
- . '&where=' . urlencode($where_array[$i])
- . '&submit=Search_no_update'
+ . '?mailbox=' . urlencode($attributes['search_folder'][$i])
+ . '&what=' . urlencode($attributes['search_what'][$i])
+ . '&where=' . urlencode($attributes['search_where'][$i])
+ . '&submit=Search_no_update'
. '>' . _("search") . '</A>'
. ' | '
- . "<A HREF=search.php?count=$i&submit=forget>"
+ . "<A HREF=search.php?count=$i&submit=forget>"
. _("forget")
. '</A>'
. '</TD></TR>';
}
- }
+ }
echo '</TABLE></TD></TR></TABLE><BR>';
}
for ($i = 0; $i < count($boxes); $i++) {
if (!in_array('noselect', $boxes[$i]['flags'])) {
$box = $boxes[$i]['unformatted'];
- $box2 = str_replace(' ', ' ', $boxes[$i]['unformatted-disp']);
+ $box2 = imap_utf7_decode_local(str_replace(' ', ' ', $boxes[$i]['unformatted-disp']));
if( $box2 == 'INBOX' ) {
$box2 = _("INBOX");
}
if ( !isset( $what ) ) {
$what = '';
}
+if ( !isset( $where ) ) {
+ $where = '';
+}
+
+
$what_disp = str_replace(',', ' ', $what);
$what_disp = str_replace('\\\\', '\\', $what_disp);
$what_disp = str_replace('\\"', '"', $what_disp);
folder it finds a match in.
*/
+$old_value = 0;
+if ($allow_thread_sort == TRUE) {
+ $old_value = $allow_thread_sort;
+ $allow_thread_sort = FALSE;
+}
+
if ($search_all == 'all') {
$mailbox == '';
$boxcount = count($boxes);
}
for ($i=0;$i<count($perbox_count);$i++) {
if ($perbox_count[$i] != "") {
- break;
+ $count_all = "found";
+ break;
}
- $count_all = "none";
}
- if ($count_all == "none") {
+ if ($count_all != "found") {
echo '<br><b>' .
_("No Messages found") .
'</b><br>';
echo "<BR><CENTER><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