<?php
/**
-* search.php
-*
-* Copyright (c) 1999-2004 The SquirrelMail Project Team
-* Licensed under the GNU GPL. For full terms see the file COPYING.
-*
-* IMAP search page
-*
-* 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
-*/
+ * search.php
+ *
+ * IMAP search page
+ *
+ * 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-2007 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
+ * @subpackage search
+ * @link http://www.ietf.org/rfc/rfc3501.txt
+ * @todo explain why references are used in function calls
+ */
/**
-* Path for SquirrelMail required files.
-* @ignore
-*/
-define('SM_PATH','../');
+ * Include the SquirrelMail initialization file.
+ */
+require('../include/init.php');
/** SquirrelMail required files.
-*/
-require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/strings.php');
+ */
require_once(SM_PATH . 'functions/imap_asearch.php');
-require_once(SM_PATH . 'functions/imap_mailbox.php');
require_once(SM_PATH . 'functions/imap_messages.php');
+require_once(SM_PATH . 'functions/imap_general.php');
require_once(SM_PATH . 'functions/mime.php');
-require_once(SM_PATH . 'functions/mailbox_display.php'); //getButton()...
+//FIXME - comment on next line seems to indicate this require is for the since removed getButton() function... the next line is thus being commented out... if this proves to be correct, please remove this and the next line completely
+//require_once(SM_PATH . 'functions/mailbox_display.php'); //getButton()
+require_once(SM_PATH . 'functions/forms.php');
+require_once(SM_PATH . 'functions/date.php');
+require_once(SM_PATH . 'functions/compose.php');
/** Prefs array ordinals. Must match $recent_prefkeys and $saved_prefkeys
-*/
+ */
define('ASEARCH_WHERE', 0);
define('ASEARCH_MAILBOX', 1);
define('ASEARCH_WHAT', 2);
define('ASEARCH_MAX', 7);
/** Name of session var
-*/
+ */
define('ASEARCH_CRITERIA', 'criteria');
-/** Builds a href with params
-* @param string $params optional parameters to GET
-*/
-function asearch_get_href($params = '')
-{
- $href = 'search.php';
- if ($params != '')
- $href .= '?' . $params;
- return $href;
-}
-
-/** Builds a [link]
-* @param string $href (reference)
-* @param string $text
-* @param string $title
-*/
-function asearch_get_link(&$href, $text, $title = '')
-{
- if ($title != '')
- $title = ' title="' . $title . '"';
- return '<a href="' . $href . '"' . $title . '>' . $text . '</a>';
-}
-
-/** Builds a toggle [link]
-* @param integer $value
-* @param string $action
-* @param array $text_array
-* @param array $title_array
-*/
-function asearch_get_toggle_link($value, $action, $text_array, $title_array = array())
-{
- return asearch_get_link(asearch_get_href($action . '=' . (int)$value), $text_array[$value], asearch_nz($title_array[$value]));
-}
/**
-* @param string $a
-* @param string $b
-* @return bool strcoll()-like result
-*/
+ * Array sort callback used to sort $imap_asearch_options
+ * @param string $a
+ * @param string $b
+ * @return bool strcoll()-like result
+ * @since 1.5.0
+ * @private
+ */
function asearch_unhtml_strcoll($a, $b)
{
+ // FIXME: Translation policy says "no html entities in translations"
return strcoll(asearch_unhtmlentities($a), asearch_unhtmlentities($b));
}
/**
-* @param string $mailbox mailbox name utf7 encoded inc. special case INBOX
-* @return string mailbox name ready to display (utf7 decoded or localized INBOX)
-*/
-function imap_get_mailbox_display($mailbox)
-{
- if (strtoupper($mailbox) == 'INBOX')
- return _("INBOX");
- return imap_utf7_decode_local($mailbox);
-}
-
-/**
-* @param string $mailbox mailbox name or special case 'All Folders'
-* @return string mailbox name ready to display (utf7 decoded or localized 'All Folders')
-*/
+ * @param string $mailbox mailbox name or special case 'All Folders'
+ * @return string mailbox name ready to display (utf7 decoded or localized 'All Folders')
+ * @since 1.5.0
+ * @private
+ */
function asearch_get_mailbox_display($mailbox)
{
- if ($mailbox == 'All Folders')
+ if ($mailbox == 'All Folders') {
return _("All Folders");
- return imap_get_mailbox_display($mailbox);
-}
-
-/**
-* @param array $color color array
-* @param string $txt text to display
-* @return string title ready to display
-*/
-function asearch_get_title_display(&$color, $txt)
-{
- return '<b><big>' . $txt . '</big></b>';
-}
-
-/**
-* @param array $color color array
-* @param string $txt text to display
-* @return string error text ready to display
-*/
-function asearch_get_error_display(&$color, $txt)
-{
- return '<font color="' . $color[2] . '">' . '<b><big>' . $txt . '</big></b></font>';
+ } elseif (strtoupper($mailbox) == 'INBOX') {
+ return _("INBOX");
+ }
+ return imap_utf7_decode_local($mailbox);
}
/**
-* @param array $input_array array to serialize
-* @return string a string containing a byte-stream representation of value that can be stored anywhere
-*/
+ * @param array $input_array array to serialize
+ * @return string a string containing a byte-stream representation of value that can be stored anywhere
+ * @since 1.5.0
+ * @private
+ */
function asearch_serialize(&$input_array)
{
global $search_advanced;
}
/**
-* @param string $input_string string to unserialize
-* @return array
-*/
+ * @param string $input_string string to unserialize
+ * @return array
+ * @since 1.5.0
+ * @private
+ */
function asearch_unserialize($input_string)
{
global $search_advanced;
}
/**
-* @param string $key the pref key
-* @param integer $index the pref key index
-* @param string $default default value
-* @return string pref value
-*/
+ * Gets user's advanced search preferences
+ *
+ * Arguments are different in 1.5.0.
+ * @param string $key the pref key
+ * @param integer $index the pref key index
+ * @param string $default default value
+ * @return string pref value
+ * @since 1.5.0
+ * @private
+ */
function asearch_getPref(&$key, $index, $default = '')
{
global $data_dir, $username, $search_advanced;
}
/**
-* @param string $key the pref key
-* @param integer $index the pref key index
-* @param string $value pref value to set
-* @return bool status
-*/
+ * Sets user's advanced search preferences
+ *
+ * Arguments are different in 1.5.0.
+ * @param string $key the pref key
+ * @param integer $index the pref key index
+ * @param string $value pref value to set
+ * @return bool status
+ * @since 1.5.0
+ * @private
+ */
function asearch_setPref(&$key, $index, $value)
{
global $data_dir, $username, $search_advanced;
}
/**
-* @param string $key the pref key
-* @param integer $index the pref key index
-* @return bool status
-*/
+ * Deletes user's advanced search preferences
+ *
+ * Arguments are different in 1.5.0.
+ * @param string $key the pref key
+ * @param integer $index the pref key index
+ * @return bool status
+ * @since 1.5.0
+ * @private
+ */
function asearch_removePref(&$key, $index)
{
global $data_dir, $username, $search_advanced;
return removePref($data_dir, $username, $key . ($index + !$search_advanced));
}
-/** Sanity checks, done before running the imap command and before calling push_recent
-*/
+/**
+ * Sanity checks, done before running the imap command and before calling push_recent
+ * @param array $where_array search location data
+ * @param array $what_array search criteria data
+ * @param array $exclude_array excluded criteria data
+ * @return string error message or empty string
+ * @since 1.5.0
+ * @private
+ */
function asearch_check_query(&$where_array, &$what_array, &$exclude_array)
{
global $imap_asearch_opcodes;
return '';
}
-/** Read the recent searches from the prefs
-*/
+/**
+ * Read the recent searches from the prefs
+ *
+ * Function arguments are different in 1.5.0
+ * @return array recent searches
+ * @since 1.5.0
+ * @private
+ */
function asearch_read_recent()
{
global $recent_prefkeys, $search_memory;
for ($pref_num = 0; $pref_num < $search_memory; $pref_num++) {
foreach ($recent_prefkeys as $prefkey) {
$pref = asearch_getPref($prefkey, $pref_num);
-/* if (!empty($pref))*/
+/* if (!empty($pref))*/
$recent_array[$prefkey][$recent_num] = $pref;
}
if (empty($recent_array[$recent_prefkeys[0]][$recent_num])) {
foreach ($recent_prefkeys as $key) {
array_pop($recent_array[$key]);
}
-// break; //Disabled to support old search code broken prefs
+// break; //Disabled to support old search code broken prefs
}
else
$recent_num++;
return $recent_array;
}
-/** Read the saved searches from the prefs
-*/
+/**
+ * Read the saved searches from the prefs
+ *
+ * Function arguments are different in 1.5.0
+ * @return array saved searches
+ * @since 1.5.0
+ * @private
+ */
function asearch_read_saved()
{
global $saved_prefkeys;
return $saved_array;
}
-/** Save a recent search to the prefs
-*/
+/**
+ * Save a recent search to the prefs
+ *
+ * Function arguments are different in 1.5.0
+ * @param integer $recent_index
+ * @since 1.5.0
+ * @private
+ */
function asearch_save_recent($recent_index)
{
global $recent_prefkeys, $saved_prefkeys;
$saved_array = asearch_read_saved();
- $saved_index = count($saved_array[$saved_prefkeys[0]]);
+ if (isset($saved_array[$saved_prefkeys[0]])) {
+ $saved_index = count($saved_array[$saved_prefkeys[0]]);
+ } else {
+ $saved_index = 0;
+ }
$recent_array = asearch_read_recent();
$n = 0;
foreach ($recent_prefkeys as $key) {
}
}
-/** Write a recent search to prefs
-*/
+/**
+ * Write a recent search to prefs
+ *
+ * Function arguments are different in 1.5.0
+ * @param array $recent_array
+ * @since 1.5.0
+ * @private
+ */
function asearch_write_recent(&$recent_array)
{
global $recent_prefkeys, $search_memory;
}
}
-/** Remove a recent search from prefs
-*/
+/**
+ * Remove a recent search from prefs
+ *
+ * Function arguments are different in 1.5.0
+ * @param integer $forget_index removed search number
+ * @since 1.5.0
+ * @private
+ */
function asearch_forget_recent($forget_index)
{
global $recent_prefkeys;
asearch_write_recent($recent_array);
}
-/** Find a recent search in the prefs (used to avoid saving duplicates)
-*/
+/**
+ * Find a recent search in the prefs (used to avoid saving duplicates)
+ * @param array $recent_array
+ * @param array $mailbox_array
+ * @param array $biop_array
+ * @param array $unop_array
+ * @param array $where_array
+ * @param array $what_array
+ * @param array $exclude_array
+ * @param array $sub_array
+ * @return integer
+ * @since 1.5.0
+ * @private
+ */
function asearch_find_recent(&$recent_array, &$mailbox_array, &$biop_array, &$unop_array, &$where_array, &$what_array, &$exclude_array, &$sub_array)
{
global $recent_prefkeys, $search_advanced;
return -1;
}
-/** Push a recent search into the prefs
-*/
+/**
+ * Push a recent search into the prefs
+ * @param array $recent_array
+ * @param array $mailbox_array
+ * @param array $biop_array
+ * @param array $unop_array
+ * @param array $where_array
+ * @param array $what_array
+ * @param array $exclude_array
+ * @param array $sub_array
+ * @since 1.5.0
+ * @private
+ */
function asearch_push_recent(&$mailbox_array, &$biop_array, &$unop_array, &$where_array, &$what_array, &$exclude_array, &$sub_array)
{
global $recent_prefkeys, $search_memory;
if ($search_memory > 0) {
$recent_array = asearch_read_recent();
$recent_found = asearch_find_recent($recent_array, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
- if ($recent_found >= 0) { // Remove identical recent
+ if ($recent_found >= 0) { // Remove identical recent
foreach ($recent_prefkeys as $key) {
array_splice($recent_array[$key], $recent_found, 1);
}
}
}
-/** Edit a recent search
-* @global array mailbox_array searched mailboxes
-*/
+/**
+ * Edit a recent search
+ *
+ * Function arguments are different in 1.5.0
+ * @global array mailbox_array searched mailboxes
+ * @param mixed $index
+ * @since 1.5.0
+ * @private
+ */
function asearch_edit_recent($index)
{
global $recent_prefkeys, $search_advanced;
}
}
-/** Get last search criteria from session or prefs
-* FIX ME, try to avoid globals
-*/
+/**
+ * Get last search criteria from session or prefs
+ *
+ * Function arguments are different in 1.5.0
+ * FIXME, try to avoid globals
+ * @param mixed $index
+ * @since 1.5.0
+ * @private
+ */
function asearch_edit_last($index) {
if (sqGetGlobalVar(ASEARCH_CRITERIA, $criteria, SQ_SESSION)) {
global $where_array, $mailbox_array, $what_array, $unop_array;
}
}
-/** Edit a saved search
-*/
+/**
+ * Edit a saved search
+ *
+ * Function arguments are different in 1.5.0
+ * @param mixed $index
+ * @since 1.5.0
+ * @private
+ */
function asearch_edit_saved($index)
{
global $saved_prefkeys, $search_advanced;
}
}
-/** Write a saved search to the prefs
-*/
+/**
+ * Write a saved search to the prefs
+ *
+ * Function arguments are different in 1.5.0
+ * @param array $saved_array
+ * @since 1.5.0
+ * @private
+ */
function asearch_write_saved(&$saved_array)
{
global $saved_prefkeys;
}
}
-/** Delete a saved search from the prefs
-*/
+/**
+ * Delete a saved search from the prefs
+ *
+ * Function arguments are different in 1.5.0
+ * @param integer $saved_index
+ * @since 1.5.0
+ * @private
+ */
function asearch_delete_saved($saved_index)
{
global $saved_prefkeys;
}
/** Translate the input date to imap date to local date display,
-* so the user can know if the date is wrong or illegal
-* @return string locally formatted date or error text
-*/
+ * so the user can know if the date is wrong or illegal
+ * @param string $what date string
+ * @return string locally formatted date or error text
+ * @since 1.5.0
+ * @private
+ */
function asearch_get_date_display(&$what)
{
$what_parts = sqimap_asearch_parse_date($what);
return _("(Wrong date)");
}
-/** Translate the query to rough natural display
-* @return string rough natural query ready to display
-*/
+/**
+ * Translate the query to rough natural display
+ * @param array $color
+ * @param array $mailbox_array
+ * @param array $biop_array
+ * @param array $unop_array
+ * @param array $where_array
+ * @param array $what_array
+ * @param array $exclude_array
+ * @param array $sub_array
+ * @return string rough natural query ready to display
+ * @since 1.5.0
+ * @private
+ */
function asearch_get_query_display(&$color, &$mailbox_array, &$biop_array, &$unop_array, &$where_array, &$what_array, &$exclude_array, &$sub_array)
{
global $imap_asearch_biops_in, $imap_asearch_biops, $imap_asearch_unops, $imap_asearch_options;
$cur_mailbox = 'INBOX';
$biop = asearch_nz($biop_array[$crit_num]);
if (($query_display == '') || ($cur_mailbox != $last_mailbox)) {
- $mailbox_display = ' <b>' . asearch_get_mailbox_display($cur_mailbox) . '</b>';
+ $mailbox_display = ' <span class="mailbox">' . htmlspecialchars(asearch_get_mailbox_display($cur_mailbox)) . '</span>';
if ($query_display == '')
$biop_display = _("In");
else
$where_display = $unop_display . asearch_nz($imap_asearch_options[$where], $where);
$what_type = $imap_asearch_opcodes[$where];
$what = $what_array[$crit_num];
- if ($what_type) { /* Check opcode parameter */
+ if ($what_type) { /* Check opcode parameter */
if ($what == '')
- $what_display = ' ' . asearch_get_error_display($color, _("(Missing argument)"));
+ $what_display = ' <span class="error">' . _("(Missing argument)") .'</span>';
else {
if ($what_type == 'adate')
$what_display = asearch_get_date_display($what);
else
$what_display = htmlspecialchars($what);
- $what_display = ' <b>' . $what_display . '</b>';
+ $what_display = ' <span class="value">' . $what_display . '</span>';
}
}
else {
if ($what)
- $what_display = ' ' . asearch_get_error_display($color, _("(Spurious argument)"));
+ $what_display = ' <span class="error">' . _("(Spurious argument)") .'</span>';
else
$what_display = '';
}
if ($mailbox_display != '')
- $query_display .= ' <u><i>' . $biop_display . '</i></u>' . $mailbox_display . ' <u><i>' . $where_display . '</i></u>' . $what_display;
+ $query_display .= ' <span class="operator">' . $biop_display . '</span>' . $mailbox_display . ' <span class="conditions">' . $where_display . '</span>' . $what_display;
else
- $query_display .= ' <u><i>' . $biop_display . ' ' . $where_display . '</i></u>' . $what_display;
+ $query_display .= ' <span class="operator">' . $biop_display . '</span> <span class="conditions">' . $where_display . '</span>' . $what_display;
}
}
return $query_display;
}
-/** Handle the alternate row colors
-* @return string color value
-*/
-function asearch_get_row_color(&$color, $row_num)
-{
-/*$color_string = ($row_num%2 ? $color[0] : $color[4]);*/
- $color_string = $color[4];
- if ($GLOBALS['alt_index_colors']) {
- if (($row_num % 2) == 0) {
- if (!isset($color[12]))
- $color[12] = '#EAEAEA';
- $color_string = $color[12];
- }
- }
- return $color_string;
-}
-
-/** Print a whole query array, recent or saved
-*/
+/**
+ * Print a whole query array, recent or saved
+ *
+ * Function arguments are different in 1.5.0
+ * @param array $boxes (unused)
+ * @param array $query_array
+ * @param mixed $query_keys
+ * @param array $action_array
+ * @param mixed $title
+ * @param string $show_pref
+ * @since 1.5.0
+ * @private
+ */
function asearch_print_query_array(&$boxes, &$query_array, &$query_keys, &$action_array, $title, $show_pref)
{
- global $color;
global $data_dir, $username;
- global $use_icons, $icon_theme;
+ global $icon_theme_path;
+ global $oTemplate;
$show_flag = getPref($data_dir, $username, $show_pref, 0) & 1;
- $use_icons_flag = ($use_icons) && ($icon_theme != 'none');
- if ($use_icons_flag)
- $text_array = array('<img src="' . SM_PATH . 'images/minus.png" border="0" height="7" width="7" />',
- '<img src="' . SM_PATH . 'images/plus.png" border="0" height="7" width="7" />');
- else
- $text_array = array('-', '+');
- $toggle_link = asearch_get_toggle_link(!$show_flag, $show_pref, $text_array, array(_("Fold"), _("Unfold")));
- if (!$use_icons_flag)
- $toggle_link = '<small>[' . $toggle_link . ']</small>';
-
- echo "<br />\n";
- echo html_tag('table', '', 'center', $color[9], 'width="95%" cellpadding="1" cellspacing="1" border="0"');
- echo html_tag('tr',
- html_tag('td', $toggle_link, 'center', $color[5], 'width="5%"')
- . html_tag('td', asearch_get_title_display($color, $title), 'center', $color[5], 'colspan=4'));
- if ($show_flag) {
- $main_key = $query_keys[ASEARCH_WHERE];
- $query_count = count($query_array[$main_key]);
- for ($query_num = 0, $row_num = 0; $query_num < $query_count; $query_num++) {
- if (!empty($query_array[$main_key][$query_num])) {
- echo html_tag('tr', '', '', asearch_get_row_color($color, $row_num));
-
- unset($search_array);
- foreach ($query_keys as $query_key) {
- $search_array[] = asearch_unserialize($query_array[$query_key][$query_num]);
- }
- $where_array = $search_array[ASEARCH_WHERE];
- $mailbox_array = $search_array[ASEARCH_MAILBOX];
- $what_array = $search_array[ASEARCH_WHAT];
- $unop_array = $search_array[ASEARCH_UNOP];
- $biop_array = asearch_nz($search_array[ASEARCH_BIOP], array());
- $exclude_array = asearch_nz($search_array[ASEARCH_EXCLUDE], array());
- $sub_array = asearch_nz($search_array[ASEARCH_SUB], array());
- $query_display = asearch_get_query_display($color, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
-
- echo html_tag('td', $query_num + 1, 'right');
- echo html_tag('td', $query_display, 'center', '', 'width="80%"');
- foreach ($action_array as $action => $action_display) {
- echo html_tag('td', '<a href="' . asearch_get_href('submit=' . $action . '&rownum=' . $query_num) . '">' . $action_display . '</a>', 'center');
- }
-
- echo '</tr>' . "\n";
- $row_num++;
+ $a = array();
+ $main_key = $query_keys[ASEARCH_WHERE];
+ $query_count = count($query_array[$main_key]);
+ for ($query_num = 0, $row_num = 0; $query_num < $query_count; $query_num++) {
+ if (!empty($query_array[$main_key][$query_num])) {
+ unset($search_array);
+ foreach ($query_keys as $query_key) {
+ $search_array[] = asearch_unserialize($query_array[$query_key][$query_num]);
}
+
+ $where_array = $search_array[ASEARCH_WHERE];
+ $mailbox_array = $search_array[ASEARCH_MAILBOX];
+ $what_array = $search_array[ASEARCH_WHAT];
+ $unop_array = $search_array[ASEARCH_UNOP];
+ $biop_array = asearch_nz($search_array[ASEARCH_BIOP], array());
+ $exclude_array = asearch_nz($search_array[ASEARCH_EXCLUDE], array());
+ $sub_array = asearch_nz($search_array[ASEARCH_SUB], array());
+ $query_display = asearch_get_query_display($color, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
+
+ $a[$query_num] = $query_display;
}
}
- echo '</table>' . "\n";
+
+ $oTemplate->assign('list_title', $title);
+ $oTemplate->assign('show_list', $show_flag==1);
+ $oTemplate->assign('is_recent_list', $title==_("Recent Searches"));
+ $oTemplate->assign('expand_collapse_toggle', '../src/search.php?'.$show_pref.'='.($show_flag==1 ? 0 : 1));
+ $oTemplate->assign('query_list', $a);
+
+ $oTemplate->assign('save_recent', '../src/search.php?submit=save_recent&rownum=');
+ $oTemplate->assign('do_recent', '../src/search.php?submit=search_recent&rownum=');
+ $oTemplate->assign('forget_recent', '../src/search.php?submit=forget_recent&rownum=');
+
+ $oTemplate->assign('edit_saved', '../src/search.php?submit=edit_saved&rownum=');
+ $oTemplate->assign('do_saved', '../src/search.php?submit=search_saved&rownum=');
+ $oTemplate->assign('delete_saved', '../src/search.php?submit=delete_saved&rownum=');
+
+ $oTemplate->display('search_list.tpl');
}
/** Print the saved array
-*/
+ *
+ * Function arguments are different in 1.5.0
+ * @param array $boxes (unused, see asearch_print_query_array())
+ * @since 1.5.0
+ * @private
+ */
function asearch_print_saved(&$boxes)
{
global $saved_prefkeys;
if (isset($saved_array[$saved_prefkeys[0]])) {
$saved_count = count($saved_array[$saved_prefkeys[0]]);
if ($saved_count > 0) {
- $saved_actions = array('edit_saved' => _("edit"), 'search_saved' => _("search"), 'delete_saved' => _("delete"));
+ $saved_actions = array('edit_saved' => _("Edit"), 'search_saved' => _("Search"), 'delete_saved' => _("Delete"));
asearch_print_query_array($boxes, $saved_array, $saved_prefkeys, $saved_actions, _("Saved Searches"), 'search_show_saved');
}
}
}
/**
-* Print the recent array
-*/
+ * Print the recent array
+ *
+ * Function arguments are different in 1.5.0
+ * @param array $boxes (unused, see asearch_print_query_array())
+ * @since 1.5.0
+ * @private
+ */
function asearch_print_recent(&$boxes)
{
global $recent_prefkeys, $search_memory;
}
}
-/** Build an <option> statement
-*/
-function asearch_opt($val, $sel, $tit)
-{
- return '<option value="' . $val . '"' . ($sel == $val ? ' selected' : '') . '>' . $tit . '</option>' . "\n";
-}
-
-/** Build a <select> statement from an array
-*/
-function asearch_opt_array($var_name, $opt_array, $cur_val)
-{
- $output = '<select name="' . $var_name . '">' . "\n";
- foreach($opt_array as $val => $display)
- $output .= asearch_opt($val, $cur_val, asearch_nz($display, $val));
- $output .= '</select>' . "\n";
- return $output;
-}
-
/** Verify that a mailbox exists
-* @return bool mailbox exists
-*/
+ * @param string $mailbox
+ * @param array $boxes
+ * @return bool mailbox exists
+ * @deprecated FIXME use standard functions
+ * @since 1.5.0
+ * @private
+ */
function asearch_mailbox_exists($mailbox, &$boxes)
{
foreach ($boxes as $box) {
return FALSE;
}
-/** Build the mailbox select
-*/
-function asearch_get_form_mailbox($imapConnection, &$boxes, $mailbox, $row_num = 0)
-{
- if (($mailbox != 'All Folders') && (!asearch_mailbox_exists($mailbox, $boxes))) {
- $missing = asearch_opt($mailbox, $mailbox, '[' . _("Missing") . '] ' . asearch_get_mailbox_display($mailbox));
- } else {
- $missing = '';
- }
- return '<select name="mailbox[' . $row_num . ']">'
- . $missing
- . asearch_opt('All Folders', $mailbox, '[' . asearch_get_mailbox_display('All Folders') . ']')
- . sqimap_mailbox_option_list($imapConnection, array(strtolower($mailbox)), 0, $boxes, NULL)
- . '</select>';
-}
-
-/** Build the Include subfolders checkbox
-*/
-function asearch_get_form_sub($sub, $row_num = 0)
-{
- return function_exists('addCheckBox') ? addCheckBox('sub[' . $row_num .']', $sub)
- : '<input type="checkbox" name="sub[' . $row_num .']"' . ($sub ? ' checked="checked"' : '') . ' />';
-}
-
-/** Build the 2 unop and where selects
-*/
-function asearch_get_form_location($unop, $where, $row_num = 0)
-{
- global $imap_asearch_unops, $imap_asearch_options;
-
- return asearch_opt_array('unop[' . $row_num . ']', $imap_asearch_unops, $unop)
- . asearch_opt_array('where[' . $row_num . ']', $imap_asearch_options, $where);
-}
-
-/** Build the what text input
-*/
-function asearch_get_form_what($what, $row_num = 0)
-{
- return function_exists('addInput') ? addInput('what[' . $row_num . ']', $what, '35')
- : '<input type="text" size="35" name="what[' . $row_num . ']" value="' . htmlspecialchars($what) . '" />';
-}
-
-/** Build the Exclude criteria checkbox
-*/
-function asearch_get_form_exclude($exclude, $row_num = 0)
-{
- return function_exists('addCheckBox') ? addCheckBox('exclude['.$row_num.']', $exclude)
- : '<input type="checkbox" name="exclude[' . $row_num .']"' . ($exclude ? ' checked="checked"' : '') . ' />';
-}
-
-/** Print one advanced form row
-*/
-function asearch_print_form_row($imapConnection, &$boxes, $mailbox, $biop, $unop, $where, $what, $exclude, $sub, $row_num)
-{
- global $imap_asearch_biops_in;
- global $color;
-
- echo html_tag('tr', '', '', $color[4]);
-
-//Binary operator
- echo html_tag('td', $row_num ?
- asearch_opt_array('biop[' . $row_num . ']', $imap_asearch_biops_in, $biop)
- : '<b>' . _("In") . '</b>', 'center') . "\n";
-
-//Mailbox list and Include Subfolders
- echo html_tag('td',
- asearch_get_form_mailbox($imapConnection, $boxes, $mailbox, $row_num)
- . _("and subfolders:") . asearch_get_form_sub($sub, $row_num), 'center') . "\n";
-
-//Unary operator and Search location
- echo html_tag('td', asearch_get_form_location($unop, $where, $row_num), 'center') . "\n";
-
-//Text input
- echo html_tag('td', asearch_get_form_what($what, $row_num), 'center') . "\n";
-
-//Exclude criteria
- echo html_tag('td', _("Exclude Criteria:") . asearch_get_form_exclude($exclude, $row_num), 'center') . "\n";
-
- echo "</tr>\n";
-}
-
/** Print the advanced search form
-*/
+ * @param stream $imapConnection
+ * @param array $boxes
+ * @param array $mailbox_array
+ * @param array $biop_array
+ * @param array $unop_array
+ * @param array $where_array
+ * @param array $what_array
+ * @param array $exclude_array
+ * @param array $sub_array
+ * @since 1.5.0
+ * @private
+ */
function asearch_print_form($imapConnection, &$boxes, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array)
{
- global $search_button_html, $add_criteria_button_html, $del_excluded_button_html, $del_all_button_html;
- global $color;
-
-//Search Form
- echo "<br />\n";
- echo '<form action="' . asearch_get_href() . '" name="form_asearch">' . "\n";
+ global $oTemplate, $allow_advanced_search, $search_advanced,
+ $imap_asearch_unops, $imap_asearch_biops_in, $imap_asearch_options;
- echo html_tag('table', '', 'center', $color[9], 'width="100%" cellpadding="1" cellspacing="1" border="0"');
- echo html_tag('tr', html_tag('td', asearch_get_title_display($color, _("Search Criteria")), 'center', $color[5], 'colspan=5'));
- $row_count = count($where_array);
- for ($row_num = 0; $row_num < $row_count; $row_num++) {
+ # Build the criteria array
+ $c = array();
+ for ($row_num = 0; $row_num < count($where_array); $row_num++) {
$mailbox = asearch_nz($mailbox_array[$row_num]);
- $biop = strip_tags(asearch_nz($biop_array[$row_num]));
- $unop = strip_tags(asearch_nz($unop_array[$row_num]));
- $where = strip_tags(asearch_nz($where_array[$row_num]));
- $what = asearch_nz($what_array[$row_num]);
- $exclude = strip_tags(asearch_nz($exclude_array[$row_num]));
- $sub = strip_tags(asearch_nz($sub_array[$row_num]));
- asearch_print_form_row($imapConnection, $boxes, $mailbox, $biop, $unop, $where, $what, $exclude, $sub, $row_num);
+ $a = array();
+ $a['MailboxSel'] = asearch_nz($mailbox_array[$row_num]);
+ $a['LogicSel'] = strip_tags(asearch_nz($biop_array[$row_num]));
+ $a['UnarySel'] = strip_tags(asearch_nz($unop_array[$row_num]));
+ $a['WhereSel'] = strip_tags(asearch_nz($where_array[$row_num]));
+ $a['What'] = asearch_nz($what_array[$row_num]);
+ $a['Exclude'] = strip_tags(asearch_nz($exclude_array[$row_num])) == 'on';
+ $a['IncludeSubfolders'] = strip_tags(asearch_nz($sub_array[$row_num])) == 'on';
+
+ $c[$row_num] = $a;
}
- echo '</table>' . "\n";
-
-//Submit buttons
- echo html_tag('table', '', 'center', $color[9], 'width="100%" cellpadding="1" cellspacing="0" border="0"');
- echo html_tag('tr',
- html_tag('td', getButton('SUBMIT', 'submit', $search_button_html), 'center') . "\n"
- . html_tag('td', getButton('SUBMIT', 'submit', $add_criteria_button_html), 'center') . "\n"
- . html_tag('td', getButton('SUBMIT', 'submit', $del_all_button_html), 'center') . "\n"
- . html_tag('td', getButton('SUBMIT', 'submit', $del_excluded_button_html), 'center') . "\n"
- );
- echo '</table>' . "\n";
- echo '</form>' . "\n";
-}
-
-/** Print one basic form row
-*/
-function asearch_print_form_row_basic($imapConnection, &$boxes, $mailbox, $biop, $unop, $where, $what, $exclude, $sub, $row_num)
-{
- global $search_button_html;
- global $color;
-
- echo html_tag('tr', '', '', $color[4]);
-
-//Mailbox list
- echo html_tag('td', '<b>' . _("In") . '</b> ' . asearch_get_form_mailbox($imapConnection, $boxes, $mailbox), 'center') . "\n";
-
-//Unary operator and Search location
- echo html_tag('td', asearch_get_form_location($unop, $where), 'center') . "\n";
-
-//Text input
- echo html_tag('td', asearch_get_form_what($what), 'center') . "\n";
-
-//Submit button
- echo html_tag('td', getButton('SUBMIT', 'submit', $search_button_html), 'center') . "\n";
-
- echo "</tr>\n";
+
+ # Build the mailbox array
+ $a = array();
+ if (($mailbox != 'All Folders') && (!asearch_mailbox_exists($mailbox, $boxes))) {
+ $a[$mailbox] = '[' . _("Missing") . '] ' . htmlspecialchars(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));
+
+ if ($allow_advanced_search > 1) {
+ $link = '../src/search.php?advanced='.($search_advanced ? 0 : 1);
+ $txt = $search_advanced ? _("Standard Search") : _("Advanced search");
+ } else {
+ $link = NULL;
+ $txt = NULL;
+ }
+
+ $oTemplate->assign('allow_advanced_search', $allow_advanced_search > 1);
+ $oTemplate->assign('adv_toggle_text', $txt);
+ $oTemplate->assign('adv_toggle_link', $link);
+
+ $oTemplate->assign('mailbox_options', $a);
+ $oTemplate->assign('logical_options', $imap_asearch_biops_in);
+ $oTemplate->assign('unary_options', $imap_asearch_unops);
+ $oTemplate->assign('where_options', $imap_asearch_options);
+
+ $oTemplate->assign('criteria', $c);
+
+ echo '<form action="../src/search.php" name="form_asearch">' . "\n";
+ $oTemplate->display('search_advanced.tpl');
+ echo "</form>\n";
}
/** Print the basic search form
-*/
+ * @param stream $imapConnection
+ * @param array $boxes
+ * @param array $mailbox_array
+ * @param array $biop_array
+ * @param array $unop_array
+ * @param array $where_array
+ * @param array $what_array
+ * @param array $exclude_array
+ * @param array $sub_array
+ * @since 1.5.1
+ * @private
+ */
function asearch_print_form_basic($imapConnection, &$boxes, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array)
{
- global $color;
-
-//Search Form
- echo "<br />\n";
- echo '<form action="' . asearch_get_href() . '" name="form_asearch">' . "\n";
-
- echo html_tag('table', '', 'center', $color[9], 'width="100%" cellpadding="1" cellspacing="1" border="0"');
- //echo html_tag('tr', html_tag('td', asearch_get_title_display($color, _("Search Criteria")), 'center', $color[5], 'colspan=4'));
- $row_count = count($where_array);
- for ($row_num = 0; $row_num < $row_count; $row_num++) {
- $mailbox = asearch_nz($mailbox_array[$row_num]);
- $biop = strip_tags(asearch_nz($biop_array[$row_num]));
- $unop = strip_tags(asearch_nz($unop_array[$row_num]));
- $where = strip_tags(asearch_nz($where_array[$row_num]));
- $what = asearch_nz($what_array[$row_num]);
- $exclude = strip_tags(asearch_nz($exclude_array[$row_num]));
- $sub = strip_tags(asearch_nz($sub_array[$row_num]));
- asearch_print_form_row_basic($imapConnection, $boxes, $mailbox, $biop, $unop, $where, $what, $exclude, $sub, $row_num);
+ global $allow_advanced_search, $search_advanced, $oTemplate, $imap_asearch_unops, $imap_asearch_options;
+
+ $row_num = 0;
+ $mailbox = asearch_nz($mailbox_array[$row_num]);
+ $biop = strip_tags(asearch_nz($biop_array[$row_num]));
+ $unop = strip_tags(asearch_nz($unop_array[$row_num]));
+ $where = strip_tags(asearch_nz($where_array[$row_num]));
+ $what = asearch_nz($what_array[$row_num]);
+ $exclude = strip_tags(asearch_nz($exclude_array[$row_num]));
+ $sub = strip_tags(asearch_nz($sub_array[$row_num]));
+
+ # Build the mailbox array
+ $a = array();
+ if (($mailbox != 'All Folders') && (!asearch_mailbox_exists($mailbox, $boxes))) {
+ $a[$mailbox] = '[' . _("Missing") . '] ' . htmlspecialchars(asearch_get_mailbox_display($mailbox));
}
- echo '</table>' . "\n";
- echo '</form>' . "\n";
-}
-
-/** Print the $msgs messages from $mailbox mailbox
-*/
-
-function asearch_print_mailbox_msgs($imapConnection, &$aMailbox, $color)
-{
- if (fetchMessageHeaders($imapConnection, $aMailbox)) {
- /**
- * A mailbox can contain different sets with uid's. Default, for normal
- * message list view we use '0' as setindex and for search a different
- * setindex.
- */
- $iSetIndx = $aMailbox['SETINDEX'];
-
- $mailbox_display = asearch_get_mailbox_display($aMailbox['NAME']);
- $mailbox_title = '<b><big>' . _("Folder:") . ' '. $mailbox_display . ' </big></b>';
-
- /**
- * UIDSET contains the array with uid's returned by a search
- */
- $cnt = count($aMailbox['UIDSET'][$iSetIndx]);
-
- $iLimit = ($aMailbox['SHOWALL'][$iSetIndx]) ? $cnt : $aMailbox['LIMIT'];
- $iEnd = ($aMailbox['PAGEOFFSET'] + ($iLimit - 1) < $aMailbox['EXISTS']) ?
- $aMailbox['PAGEOFFSET'] + $iLimit - 1 : $cnt;
-
- $paginator_str = get_paginator_str($aMailbox['NAME'], $aMailbox['PAGEOFFSET'],
- $cnt, $aMailbox['LIMIT'], $aMailbox['SHOWALL'][$iSetIndx]);
-
- $msg_cnt_str = get_msgcnt_str($aMailbox['PAGEOFFSET'], $iEnd,$cnt);
-
- echo '<table border="0" width="100%" cellpadding="0" cellspacing="0">';
-
- echo '<tr><td>';
- mail_message_listing_beginning($imapConnection, $aMailbox, $msg_cnt_str, $mailbox_title . " $paginator_str");
- echo '</td></tr>';
-
- echo '<tr><td HEIGHT="5" BGCOLOR="'.$color[4].'"></td></tr>';
-
- echo '<tr><td>';
- echo ' <table width="100%" cellpadding="1" cellspacing="0" align="center"'.' border="0" bgcolor="'.$color[9].'">';
- echo ' <tr><td>';
-
- echo ' <table width="100%" cellpadding="1" cellspacing="0" align="center" border="0" bgcolor="'.$color[5].'">';
- echo ' <tr><td>';
- printHeader($aMailbox);
- displayMessageArray($imapConnection, $aMailbox);
- echo ' </td></tr>';
- echo ' </table>';
- echo ' </td></tr>';
- echo ' </table>';
- mail_message_listing_end($cnt, '', $msg_cnt_str);
- echo '</td></tr>';
-
- echo '</table>';
+ $a['All Folders'] = '[' . asearch_get_mailbox_display('All Folders') . ']';
+ $a = array_merge($a, sqimap_mailbox_option_array($imapConnection, 0, $boxes, NULL));
+
+ if ($allow_advanced_search > 1) {
+ $link = '../src/search.php?advanced='.($search_advanced ? 0 : 1);
+ $txt = $search_advanced ? _("Standard Search") : _("Advanced search");
} else {
- echo '<br />' . html_tag('div', asearch_get_error_display($color, _("No Messages Found")), 'center') . "\n";
+ $link = NULL;
+ $txt = NULL;
}
+
+ $oTemplate->assign('allow_advanced_search', $allow_advanced_search > 1);
+ $oTemplate->assign('adv_toggle_text', $txt);
+ $oTemplate->assign('adv_toggle_link', $link);
+
+ $oTemplate->assign('mailbox_options', $a);
+ $oTemplate->assign('unary_options', $imap_asearch_unops);
+ $oTemplate->assign('where_options', $imap_asearch_options);
+
+ $oTemplate->assign('mailbox_sel', strtolower(htmlspecialchars($mailbox)));
+ $oTemplate->assign('unary_sel', $unop);
+ $oTemplate->assign('where_sel', $where);
+ $oTemplate->assign('what_val', $what);
+
+ echo '<form action="../src/search.php" name="form_asearch">' . "\n";
+ $oTemplate->display('search.tpl');
+ echo "</form>\n";
}
+
/**
-* @param array $boxes mailboxes array (reference)
-* @return array selectable unformatted mailboxes names
-*/
+ * @param array $boxes mailboxes array (reference)
+ * @return array selectable unformatted mailboxes names
+ * @since 1.5.0
+ * @private
+ */
function sqimap_asearch_get_selectable_unformatted_mailboxes(&$boxes)
{
$mboxes_array = array();
/* ------------------------ main ------------------------ */
/* get globals we will need */
-sqgetGlobalVar('username', $username, SQ_SESSION);
-sqgetGlobalVar('key', $key, SQ_COOKIE);
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
-sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
if ( sqgetGlobalVar('checkall', $temp, SQ_GET) ) {
$checkall = (int) $temp;
*/
sqgetGlobalVar('mailbox_cache',$mailbox_cache,SQ_SESSION);
-
$search_button_html = _("Search");
$search_button_text = asearch_unhtmlentities($search_button_html);
$add_criteria_button_html = _("Add New Criteria");
$del_all_button_text = asearch_unhtmlentities($del_all_button_html);
/** Maximum number of recent searches to handle
-* Default 0
-* @global integer $search_memory
-*/
+ * Default 0
+ * @global integer $search_memory
+ */
$search_memory = getPref($data_dir, $username, 'search_memory', 0);
/** Advanced search control
-* - 0 => allow basic interface only
-* - 1 => allow advanced interface only
-* - 2 => allow both
-* Default 2
-*/
+ * - 0 => allow basic interface only
+ * - 1 => allow advanced interface only
+ * - 2 => allow both
+ * Default 2
+ */
$allow_advanced_search = asearch_nz($allow_advanced_search, 2);
/**
-* Toggle advanced/basic search
-*/
+ * Toggle advanced/basic search
+ */
if (sqgetGlobalVar('advanced', $search_advanced, SQ_GET)) {
setPref($data_dir, $username, 'search_advanced', $search_advanced & 1);
}
/** If 1, show advanced search interface
-* Default from allow_advanced_search pref
-* @global integer $search_advanced
-*/
+ * Default from allow_advanced_search pref
+ * @global integer $search_advanced
+ */
if ($allow_advanced_search > 1) {
$search_advanced = getPref($data_dir, $username, 'search_advanced', 0);
} else {
}
if ($search_advanced) {
/** Set recent prefkeys according to $search_advanced
-* @global array $recent_prefkeys
-*/
+ * @global array $recent_prefkeys
+ */
$recent_prefkeys = array('asearch_recent_where', 'asearch_recent_mailbox', 'asearch_recent_what', 'asearch_recent_unop', 'asearch_recent_biop', 'asearch_recent_exclude', 'asearch_recent_sub');
/** Set saved prefkeys according to $search_advanced
-* @global array $saved_prefkeys
-*/
+ * @global array $saved_prefkeys
+ */
$saved_prefkeys = array('asearch_saved_where', 'asearch_saved_mailbox', 'asearch_saved_what', 'asearch_saved_unop', 'asearch_saved_biop', 'asearch_saved_exclude', 'asearch_saved_sub');
/*$asearch_prefkeys = array('where', 'mailbox', 'what', 'biop', 'unop', 'exclude', 'sub');*/
}
/** How we did enter the form
-* - unset : Enter key, or called from outside (eg read_body)
-* - $search_button_text : Search button
-* - 'Search_no_update' : Search but don't update recent
-* - 'Search_last' : Same as no_update but reload and search last
-* - 'Search_silent' : Same as no_update but only display results
-* - $add_criteria_button_text : Add New Criteria button
-* - $del_excluded_button_text : Remove Excluded Criteria button
-* - $del_all_button_text : Remove All Criteria button
-* - 'save_recent'
-* - 'search_recent'
-* - 'forget_recent'
-* - 'edit_saved'
-* - 'search_saved'
-* - 'delete_saved'
-* @global string $submit
-*/
+ * - unset : Enter key, or called from outside (eg read_body)
+ * - $search_button_text : Search button
+ * - 'Search_no_update' : Search but don't update recent
+ * - 'Search_last' : Same as no_update but reload and search last
+ * - 'Search_silent' : Same as no_update but only display results
+ * - $add_criteria_button_text : Add New Criteria button
+ * - $del_excluded_button_text : Remove Excluded Criteria button
+ * - $del_all_button_text : Remove All Criteria button
+ * - 'save_recent'
+ * - 'search_recent'
+ * - 'forget_recent'
+ * - 'edit_saved'
+ * - 'search_saved'
+ * - 'delete_saved'
+ * @global string $submit
+ */
+$searchpressed = false;
+//FIXME: Why is there so much access to $_GET in this file? What's wrong with sqGetGlobalVar?
if (isset($_GET['submit'])) {
$submit = strip_tags($_GET['submit']);
}
+
/** Searched mailboxes
-* @global array $mailbox_array
-*/
-if (isset($_GET['mailbox'])) {
- $mailbox_array = $_GET['mailbox'];
- $targetmailbox = $_GET['mailbox'];
+ * @global array $mailbox_array
+ */
+/* when using compact paginator, mailbox might be indicated in $startMessage, so look for it now ($startMessage is then processed farther below) */
+$mailbox = '';
+$startMessage = '';
+if (sqGetGlobalVarMultiple('startMessage', $temp, 'paginator_submit', SQ_FORM)) {
+ if (strstr($temp, '_')) list($startMessage, $mailbox) = explode('_', $temp);
+ else $startMessage = $temp;
+}
+if (empty($mailbox)) sqGetGlobalVar('mailbox', $mailbox, SQ_GET, '');
+if (!empty($mailbox)) {
+ $mailbox_array = $mailbox;
+ $targetmailbox = $mailbox;
if (!is_array($mailbox_array)) {
$mailbox_array = array($mailbox_array);
}
} else {
$mailbox_array = array();
+ $targetmailbox = array();
}
$aMailboxGlobalPref = array(
MBX_PREF_SORT => 0,
* system wide admin settings and incoming vars.
*/
$aConfig = array(
- 'allow_thread_sort' => $allow_thread_sort,
- 'allow_server_sort' => $allow_server_sort,
+// 'allow_thread_sort' => $allow_thread_sort,
+// 'allow_server_sort' => $allow_server_sort,
'user' => $username,
- 'max_cache_size'
+ 'setindex' => 1
);
/** Binary operators
-* @global array $biop_array
-*/
+ * @global array $biop_array
+ */
+//FIXME: Why is there so much access to $_GET in this file? What's wrong with sqGetGlobalVar?
if (isset($_GET['biop'])) {
$biop_array = $_GET['biop'];
if (!is_array($biop_array))
$biop_array = array();
}
/** Unary operators
-* @global array $unop_array
-*/
+ * @global array $unop_array
+ */
+//FIXME: Why is there so much access to $_GET in this file? What's wrong with sqGetGlobalVar?
if (isset($_GET['unop'])) {
$unop_array = $_GET['unop'];
if (!is_array($unop_array))
$unop_array = array();
}
/** Where to search
-* @global array $where_array
-*/
+ * @global array $where_array
+ */
+//FIXME: Why is there so much access to $_GET in this file? What's wrong with sqGetGlobalVar?
if (isset($_GET['where'])) {
$where_array = $_GET['where'];
if (!is_array($where_array)) {
$where_array = array();
}
/** What to search
-* @global array $what_array
-*/
+ * @global array $what_array
+ */
+//FIXME: Why is there so much access to $_GET in this file? What's wrong with sqGetGlobalVar?
if (isset($_GET['what'])) {
$what_array = $_GET['what'];
if (!is_array($what_array)) {
$what_array = array();
}
/** Whether to exclude this criteria from search
-* @global array $exclude_array
-*/
+ * @global array $exclude_array
+ */
+//FIXME: Why is there so much access to $_GET in this file? What's wrong with sqGetGlobalVar?
if (isset($_GET['exclude'])) {
$exclude_array = $_GET['exclude'];
} else {
$exclude_array = array();
}
/** Search within subfolders
-* @global array $sub_array
-*/
+ * @global array $sub_array
+ */
+//FIXME: Why is there so much access to $_GET in this file? What's wrong with sqGetGlobalVar?
if (isset($_GET['sub'])) {
$sub_array = $_GET['sub'];
} else {
$sub_array = array();
}
/** Row number used by recent and saved stuff
-*/
+ */
+//FIXME: Why is there so much access to $_GET in this file? What's wrong with sqGetGlobalVar?
if (isset($_GET['rownum'])) {
$submit_rownum = strip_tags($_GET['rownum']);
}
/** Change global sort
-*/
+ */
if (sqgetGlobalVar('srt', $temp, SQ_GET)) {
$srt = (int) $temp;
asearch_edit_last(1);
- asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
+// asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
}
-if (sqgetGlobalVar('startMessage', $temp, SQ_GET)) {
- $startMessage = (int) $temp;
+/* already retrieved startMessage above */
+if (!empty($startMessage)) {
+ $startMessage = (int) $startMessage;
asearch_edit_last(1);
- asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
+// asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
}
if ( sqgetGlobalVar('showall', $temp, SQ_GET) ) {
$showall = (int) $temp;
asearch_edit_last(1);
- asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
+// asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
}
+
+if ( sqgetGlobalVar('account', $temp, SQ_GET) ) {
+ $iAccount = (int) $temp;
+} else {
+ $iAccount = 0;
+}
+
/**
* Incoming submit buttons from the message list with search results
*/
/** Toggle show/hide saved searches
-*/
+ */
if (sqgetGlobalVar('search_show_saved', $search_show_saved, SQ_GET)) {
setPref($data_dir, $username, 'search_show_saved', $search_show_saved & 1);
}
/** Toggle show/hide recent searches
-*/
+ */
if (sqgetGlobalVar('search_show_recent', $search_show_recent, SQ_GET)) {
setPref($data_dir, $username, 'search_show_recent', $search_show_recent & 1);
}
// end of get globals
/** If TRUE, do not show search interface
-* Default FALSE
-* @global bool $search_silent
-*/
+ * Default FALSE
+ * @global bool $search_silent
+ */
$search_silent = FALSE;
/* See how the page was called and fire off correct function */
array_splice($unop_array, $delrow, 1);
array_splice($where_array, $delrow, 1);
array_splice($what_array, $delrow, 1);
- /* array_splice($exclude_array, $delrow, 1);*/ /* There is still some php magic that eludes me */
+ /* array_splice($exclude_array, $delrow, 1);*/ /* There is still some php magic that eludes me */
array_splice($sub_array, $delrow, 1);
}
$exclude_array = array();
asearch_edit_recent($submit_rownum);
asearch_push_recent($mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array);
break;
- case 'edit_recent': /* no link to do this, yet */
+ case 'edit_recent': /* no link to do this, yet */
asearch_edit_recent($submit_rownum);
break;
case 'forget_recent':
'BCC' => _("Bcc"),
'BEFORE' => _("Before"),
'BODY' => _("Message Body"),
- 'CC' => _("CC"),
+ 'CC' => _("Cc"),
'DELETED' => _("Deleted"),
'DRAFT' => _("Draft"),
'FLAGGED' => _("Flagged"),
'TEXT' => _("Header and Body"),
'TO' => _("Sent To"),
//'UID' => 'anum',
-/* 'UNANSWERED' => '',
+/* 'UNANSWERED' => '',
'UNDELETED' => '',
'UNDRAFT' => '',
'UNFLAGGED' => '',
uasort($imap_asearch_options, 'asearch_unhtml_strcoll');
/* open IMAP connection */
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+$imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0);
/* get mailboxes once here */
$boxes = sqimap_mailbox_list($imapConnection);
/* ensure we have a valid default mailbox name */
$mailbox = asearch_nz($mailbox_array[0]);
-if (($mailbox == '') || ($mailbox == 'None')) //Workaround for sm quirk IMHO (what if I really have a mailbox called None?)
- $mailbox = $boxes[0]['unformatted']; //Usually INBOX ;)
+if (($mailbox == '') || ($mailbox == 'None')) //Workaround for sm quirk IMHO (what if I really have a mailbox called None?)
+ $mailbox = $boxes[0]['unformatted']; //Usually INBOX ;)
-if (isset($composenew) && $composenew) {
- $comp_uri = "../src/compose.php?mailbox=" . urlencode($mailbox)
- . "&session=$composesession&attachedmessages=true&";
- displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri');", false);
+
+/**
+* Handle form actions like flag / unflag, seen / unseen, delete
+*/
+if (sqgetGlobalVar('mailbox',$postMailbox,SQ_POST)) {
+ if ($postMailbox) {
+ /**
+ * system wide admin settings and incoming vars.
+ */
+ $aConfig = array(
+ 'user' => $username,
+ );
+ $aConfig['setindex'] = 1; // $what $where = 'search'
+ /**
+ * Set the max cache size to the number of mailboxes to avoid cache cleanups
+ * when searching all mailboxes
+ */
+ $aConfig['max_cache_size'] = count($boxes) +1;
+
+ $aMailbox = sqm_api_mailbox_select($imapConnection, $iAccount, $postMailbox,$aConfig,array());
+ $sError = handleMessageListForm($imapConnection,$aMailbox);
+ /* add the mailbox to the cache */
+ $mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox;
+
+ if ($sError) {
+ $note = $sError;
+ }
+ }
+}
+
+if (isset($aMailbox['FORWARD_SESSION'])) {
+ /* add the mailbox to the cache */
+ $mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox;
+ sqsession_register($mailbox_cache,'mailbox_cache');
+
+ if ($compose_new_win) {
+ // write the session in order to make sure that the compose window has
+ // access to the composemessages array which is stored in the session
+ session_write_close();
+ // restart the session. Do not use sqsession_is_active because the session_id
+ // isn't empty after a session_write_close
+ sqsession_start();
+
+ if (!preg_match("/^[0-9]{3,4}$/", $compose_width)) {
+ $compose_width = '640';
+ }
+ if (!preg_match("/^[0-9]{3,4}$/", $compose_height)) {
+ $compose_height = '550';
+ }
+ // do not use &, it will break the query string and $session will not be detected!!!
+ $comp_uri = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox).
+ '&session='.$aMailbox['FORWARD_SESSION'];
+ displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri', $compose_width, $compose_height);", false);
+ } else {
+ // save mailboxstate
+ sqsession_register($aMailbox,'aLastSelectedMailbox');
+ session_write_close();
+ // we have to redirect to the compose page
+ $location = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox).
+ '&session='.$aMailbox['FORWARD_SESSION'];
+ header("Location: $location");
+ exit;
+ }
} else {
displayPageHeader($color, $mailbox);
+// $compose_uri = $base_uri.'src/compose.php?newmessage=1';
+}
+
+if (isset($note)) {
+ $oTemplate->assign('note', $note);
+ $oTemplate->display('note.tpl');
}
-do_hook('search_before_form');
+
+do_hook('search_before_form', $null);
if (!$search_silent) {
- //Add a link to the other search mode if allowed
- if ($allow_advanced_search > 1)
- $toggle_link = ' - <small>['
- . asearch_get_toggle_link(!$search_advanced, 'advanced', array(_("Standard search"), _("Advanced search")))
- . ']</small>';
- else
- $toggle_link = '';
-
- echo html_tag('table',
- html_tag('tr', "\n"
- . html_tag('td', asearch_get_title_display($color, _("Search")) . $toggle_link, 'center', $color[0])
- ) ,
- '', '', 'width="100%"') . "\n";
asearch_print_saved($boxes);
asearch_print_recent($boxes);
if (empty($where_array)) {
}
}
-do_hook('search_after_form');
+do_hook('search_after_form', $null);
if ($submit == $search_button_text) {
- echo html_tag('table', '', 'center', $color[9], 'width="100%" cellpadding="1" cellspacing="0" border="0"');
- echo html_tag('tr', html_tag('td', asearch_get_title_display($color, _("Search Results")), 'center', $color[5]));
- echo html_tag('tr', html_tag('td', asearch_get_query_display($color, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array), 'center', $color[4]));
- echo '</table>' . "\n";
+ $msgsfound = false;
- flush();
+ $err = asearch_check_query($where_array, $what_array, $exclude_array);
- $query_error = asearch_check_query($where_array, $what_array, $exclude_array);
- if ($query_error != '') {
- echo '<br />' . html_tag('div', asearch_get_error_display($color, $query_error), 'center') . "\n";
- } else {
+ $oTemplate->assign('query_has_error', $err!='');
+ $oTemplate->assign('query_error', $err=='' ? NULL : $err);
+ $oTemplate->assign('query', asearch_get_query_display($color, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array));
+
+ $oTemplate->display('search_result_top.tpl');
+
+ flush();
+ $iMsgCnt = 0;
+ if ($err == '') {
$mboxes_array = sqimap_asearch_get_selectable_unformatted_mailboxes($boxes);
/**
* Retrieve the search queries
*/
$mboxes_mailbox = sqimap_asearch($imapConnection, $mailbox_array, $biop_array, $unop_array, $where_array, $what_array, $exclude_array, $sub_array, $mboxes_array);
foreach($mboxes_mailbox as $mbx => $search) {
- $aMailboxPrefSer=getPref($data_dir, $username, "pref_$mbx");
+ /**
+ * until there is no per mailbox option screen to set prefs we override
+ * the mailboxprefs by the default ones
+ */
+
+ $aMailboxPrefSer=getPref($data_dir, $username,'pref_'.$iAccount.'_'.$mbx);
if ($aMailboxPrefSer) {
$aMailboxPref = unserialize($aMailboxPrefSer);
+ $aMailboxPref[MBX_PREF_COLUMNS] = $index_order;
} else {
- setUserPref($username,"pref_$mbx",serialize($aMailboxGlobalPref));
- $aMailboxPref = $aMailboxGlobalPref;
+ setUserPref($username,'pref_'.$iAccount.'_'.$mbx,serialize($default_mailbox_pref));
+ $aMailboxPref = $default_mailbox_pref;
}
if (isset($srt) && $targetmailbox == $mbx) {
$aMailboxPref[MBX_PREF_SORT] = (int) $srt;
}
- if (isset($startMessage) && $targetmailbox == $mbx) {
- $aConfig['offset'] = $startMessage;
- } else if (isset($aConfig['offset'])) {
- unset($aConfig['offset']);
- }
- if (isset($showall) && $targetmailbox == $mbx) {
- $aConfig['showall'] = $showall;
- } else if (isset($aConfig['showall'])) {
- unset($aConfig['showall']);
- }
- /**
- * Set the max cache size to the number of mailboxes to avoid cache cleanups
- * when searching all mailboxes
- */
- $aConfig['max_cache_size'] = count($mboxes_mailbox) +1;
+
+ $trash_folder = (isset($trash_folder)) ? $trash_folder : false;
+ $sent_folder = (isset($sent_folder)) ? $sent_folder : false;
+ $draft_folder = (isset($draft_folder)) ? $draft_folder : false;
+
/**
* until there is no per mailbox option screen to set prefs we override
$aMailboxPref[MBX_PREF_LIMIT] = (int) $show_num;
$aMailboxPref[MBX_PREF_AUTO_EXPUNGE] = (bool) $auto_expunge;
$aMailboxPref[MBX_PREF_INTERNALDATE] = (bool) getPref($data_dir, $username, 'internal_date_sort');
+ $aMailboxPref[MBX_PREF_COLUMNS] = $index_order;
+
+ /**
+ * Replace From => To in case it concerns a draft or sent folder
+ */
+ if (($mbx == $sent_folder || $mbx == $draft_folder) &&
+ !in_array(SQM_COL_TO,$aMailboxPref[MBX_PREF_COLUMNS])) {
+ $aNewOrder = array(); // nice var name ;)
+ foreach($aMailboxPref[MBX_PREF_COLUMNS] as $iCol) {
+ if ($iCol == SQM_COL_FROM) {
+ $iCol = SQM_COL_TO;
+ }
+ $aNewOrder[] = $iCol;
+ }
+ $aMailboxPref[MBX_PREF_COLUMNS] = $aNewOrder;
+ setUserPref($username,'pref_'.$iAccount.'_'.$mbx,serialize($aMailboxPref));
+ }
- echo '<br />';
$aConfig['search'] = $search['search'];
$aConfig['charset'] = $search['charset'];
- $aConfig['setindex'] = 1; // $what $where = 'search'
- $aMailbox = sqm_api_mailbox_select($imapConnection,$mbx,$aConfig,$aMailboxPref);
/**
- * Handle form actions like flag / unflag, seen / unseen, delete
+ * Set the max cache size to the number of mailboxes to avoid cache cleanups
+ * when searching all mailboxes
+ */
+ $aConfig['max_cache_size'] = count($mboxes_mailbox) +1;
+ if (isset($startMessage) && $targetmailbox == $mbx) {
+ $aConfig['offset'] = $startMessage;
+ } else {
+ $aConfig['offset'] = 0;
+ }
+ if (isset($showall) && $targetmailbox == $mbx) {
+ $aConfig['showall'] = $showall;
+ } else {
+ if (isset($aConfig['showall'])) {
+ unset($aConfig['showall']);
+ }
+ $showall = false;
+ }
+
+ /**
+ * Set the config options for the messages list
*/
- if (sqgetGlobalVar('mailbox',$postMailbox,SQ_POST)) {
- if ($postMailbox === $mbx) {
- handleMessageListForm($imapConnection,$aMailbox);
+ $aColumns = array();
+ foreach ($aMailboxPref[MBX_PREF_COLUMNS] as $iCol) {
+ $aColumns[$iCol] = array();
+ switch ($iCol) {
+ case SQM_COL_SUBJ:
+ if ($truncate_subject) {
+ $aColumns[$iCol]['truncate'] = $truncate_subject;
+ }
+ break;
+ case SQM_COL_FROM:
+ case SQM_COL_TO:
+ case SQM_COL_CC:
+ case SQM_COL_BCC:
+ if ($truncate_sender) {
+ $aColumns[$iCol]['truncate'] = $truncate_sender;
+ }
+ break;
+ }
+ }
+
+
+ $aProps = array(
+ 'columns' => $aColumns,
+ 'config' => array('alt_index_colors' => $alt_index_colors,
+ 'highlight_list' => $message_highlight_list,
+ 'fancy_index_highlite' => $fancy_index_highlite,
+ 'show_flag_buttons' => (isset($show_flag_buttons)) ? $show_flag_buttons : true,
+ 'lastTargetMailbox' => (isset($lastTargetMailbox)) ? $lastTargetMailbox : '',
+ 'trash_folder' => $trash_folder,
+ 'sent_folder' => $sent_folder,
+ 'draft_folder' => $draft_folder,
+ 'enablesort' => true,
+ 'color' => $color
+ ),
+ 'mailbox' => $mbx,
+ 'account' => (isset($iAccount)) ? $iAccount : 0,
+ 'module' => 'read_body',
+ 'email' => false);
+
+
+ $aMailbox = sqm_api_mailbox_select($imapConnection, $iAccount, $mbx,$aConfig,$aMailboxPref);
+
+ $iError = 0;
+ $aTemplate = showMessagesForMailbox($imapConnection, $aMailbox,$aProps, $iError);
+
+ // in th future we can make use of multiple message sets, now set it to 1 for search.
+ $iSetIndex = 1;
+ if (isset($aMailbox['UIDSET'][$iSetIndex])) {
+ $iMsgCnt += count($aMailbox['UIDSET'][$iSetIndex]);
+ }
+ if ($iError) {
+ // error handling
+ } else {
+ /**
+ * In the future, move this the the initialisation area
+ */
+ sqgetGlobalVar('align',$align,SQ_SESSION);
+
+ /**
+ * TODO: Clean up handling of message list once the template is cleaned up.
+ */
+ if ($aMailbox['EXISTS'] > 0) {
+ if ($iError) {
+ // TODO
+ echo "ERROR occured, errorhandler will be implemented very soon";
+ } else {
+ foreach ($aTemplate as $k => $v) {
+ $oTemplate->assign($k, $v);
+ }
+
+ $mailbox_display = asearch_get_mailbox_display($aMailbox['NAME']);
+ if (strtoupper($mbx) == 'INBOX') {
+ $mailbox_display = _("INBOX");
+ } else {
+ $mailbox_display = imap_utf7_decode_local($mbx);
+ }
+
+ $oTemplate->assign('mailbox_name', htmlspecialchars($mailbox_display));
+ $oTemplate->display('search_result_mailbox.tpl');
+
+ $oTemplate->assign('page_selector', $page_selector);
+ $oTemplate->assign('page_selector_max', $page_selector_max);
+ $oTemplate->assign('compact_paginator', $compact_paginator);
+ $oTemplate->assign('javascript_on', checkForJavascript());
+ $oTemplate->assign('base_uri', sqm_baseuri());
+ $oTemplate->assign('enablesort', (isset($aProps['config']['enablesort'])) ? $aProps['config']['enablesort'] : false);
+ $oTemplate->assign('icon_theme_path', $icon_theme_path);
+ $oTemplate->assign('use_icons', (isset($use_icons)) ? $use_icons : false);
+ $oTemplate->assign('aOrder', array_keys($aColumns));
+ $oTemplate->assign('alt_index_colors', isset($alt_index_colors) ? $alt_index_colors: false);
+ $oTemplate->assign('color', $color);
+ $oTemplate->assign('align', $align);
+
+ $oTemplate->display('message_list.tpl');
+ }
}
}
- asearch_print_mailbox_msgs($imapConnection, $aMailbox, $color);
+
/* add the mailbox to the cache */
- $mailbox_cache[$aMailbox['NAME']] = $aMailbox;
+ $mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox;
}
}
+ if(!$iMsgCnt) {
+ $oTemplate->display('search_result_empty.tpl');
+ }
}
-do_hook('search_bottom');
+do_hook('search_bottom', $null);
sqimap_logout($imapConnection);
-echo '</body></html>';
+
+$oTemplate->display('footer.tpl');
sqsession_register($mailbox_cache,'mailbox_cache');
-?>
\ No newline at end of file
+?>
projects / squirrelmail.git / blobdiff