This should show the toggle all link into the searchs results.
This commit is contained in:
philippe_mingo
parent
0abc73d4e7
commit
d25367056c
3 changed files with 208 additions and 233 deletions
|
|
@ -11,29 +11,12 @@
|
|||
* $Id$
|
||||
*/
|
||||
|
||||
/*****************************************************************/
|
||||
/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!! ***/
|
||||
/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION. ***/
|
||||
/*** + Base level indent should begin at left margin, as ***/
|
||||
/*** the require_once below. ***/
|
||||
/*** + All identation should consist of four space blocks ***/
|
||||
/*** + Tab characters are evil. ***/
|
||||
/*** + all comments should use "slash-star ... star-slash" ***/
|
||||
/*** style -- no pound characters, no slash-slash style ***/
|
||||
/*** + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD ***/
|
||||
/*** ALWAYS USE { AND } CHARACTERS!!! ***/
|
||||
/*** + Please use ' instead of ", when possible. Note " ***/
|
||||
/*** should always be used in _( ) function calls. ***/
|
||||
/*** Thank you for your help making the SM code more readable. ***/
|
||||
/*****************************************************************/
|
||||
|
||||
require_once('../functions/imap.php');
|
||||
require_once('../functions/date.php');
|
||||
require_once('../functions/array.php');
|
||||
require_once('../functions/mailbox_display.php');
|
||||
require_once('../functions/mime.php');
|
||||
|
||||
|
||||
function sqimap_search($imapConnection,$search_where,$search_what,$mailbox,$color) {
|
||||
|
||||
global $msgs, $message_highlight_list, $squirrelmail_language, $languages, $index_order;
|
||||
|
|
@ -51,7 +34,7 @@ require_once('../functions/mime.php');
|
|||
}
|
||||
fputs($imapConnection,$ss);
|
||||
|
||||
# Read Data Back From IMAP
|
||||
/* Read Data Back From IMAP */
|
||||
$readin = sqimap_read_data ($imapConnection, $isid, false, $result, $message);
|
||||
if (isset($languages[$squirrelmail_language]['CHARSET']) && strtolower($result) == 'no') {
|
||||
$ss = $isid . " SEARCH CHARSET \"US-ASCII\" ALL $search_where \"$search_what\"\r\n";
|
||||
|
|
@ -74,7 +57,7 @@ require_once('../functions/mime.php');
|
|||
$c++;
|
||||
}
|
||||
|
||||
#If nothing is found * SEARCH should be the first error else echo errors
|
||||
/* If nothing is found * SEARCH should be the first error else echo errors */
|
||||
if (isset($errors) && strstr($errors,"* SEARCH")) {
|
||||
echo '<br><CENTER>' . _("No Messages Found") . '</CENTER>';
|
||||
return;
|
||||
|
|
@ -82,9 +65,10 @@ require_once('../functions/mime.php');
|
|||
echo "<!-- ".$errors." -->";
|
||||
}
|
||||
|
||||
# HACKED CODED FROM ANOTHER FUNCTION, Could Probably dump this and mondify
|
||||
# exsitising code with a search true/false varible.
|
||||
|
||||
/*
|
||||
HACKED CODED FROM ANOTHER FUNCTION, Could Probably dump this and mondify
|
||||
exsitising code with a search true/false varible.
|
||||
*/
|
||||
|
||||
global $sent_folder;
|
||||
for ($q = 0; $q < count($messagelist); $q++) {
|
||||
|
|
@ -138,7 +122,7 @@ require_once('../functions/mime.php');
|
|||
$j++;
|
||||
}
|
||||
|
||||
/** Find and remove the ones that are deleted */
|
||||
/* Find and remove the ones that are deleted */
|
||||
$i = 0;
|
||||
$j = 0;
|
||||
while ($j < count($messagelist)) {
|
||||
|
|
@ -153,19 +137,22 @@ require_once('../functions/mime.php');
|
|||
}
|
||||
$numMessages = $i;
|
||||
|
||||
// There's gotta be messages in the array for it to sort them.
|
||||
/* There's gotta be messages in the array for it to sort them. */
|
||||
|
||||
if (count($messagelist) > 0) {
|
||||
$j=0;
|
||||
if (!isset ($msg)) { $msg = ""; }
|
||||
|
||||
mail_message_listing_beginning( $imapConnection,
|
||||
"move_messages.php?msg=$msg&mailbox=$urlMailbox&where=" . urlencode($search_where) . "&what=".urlencode($search_what),
|
||||
$mailbox, -1, '<b>' . _("Found") . ' ' . count($messagelist) . ' ' . _("messages") . '</b>',
|
||||
' ');
|
||||
$mailbox,
|
||||
-1,
|
||||
'<b>' . _("Found") . ' ' . count($messagelist) . ' ' . _("messages") . '</b>',
|
||||
get_selectall_link($start_msg, $sort) );
|
||||
|
||||
|
||||
while ($j < count($msgs)) {
|
||||
printMessageInfo($imapConnection, $msgs[$j]["ID"], 0, $j, $mailbox, "", 0, $search_where, $search_what);
|
||||
printMessageInfo($imapConnection, $msgs[$j]["ID"], 0, $j, $mailbox, '', 0, $search_where, $search_what);
|
||||
$j++;
|
||||
}
|
||||
echo '</table></tr></td></table>';
|
||||
|
|
|
|||
|
|
@ -385,8 +385,7 @@ function displayMessageArray($imapConnection, $num_msgs, $start_msg, &$msgs, $ms
|
|||
$msg = '';
|
||||
}
|
||||
|
||||
mail_message_listing_beginning
|
||||
($imapConnection,
|
||||
mail_message_listing_beginning( $imapConnection,
|
||||
"move_messages.php?msg=$msg&mailbox=$urlMailbox&startMessage=$start_msg",
|
||||
$mailbox, $sort, $msg_cnt_str, $paginator_str, $start_msg);
|
||||
|
||||
|
|
|
|||
|
|
@ -9,22 +9,6 @@
|
|||
* $Id$
|
||||
*/
|
||||
|
||||
/*****************************************************************/
|
||||
/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!! ***/
|
||||
/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION. ***/
|
||||
/*** + Base level indent should begin at left margin, as ***/
|
||||
/*** the require_once below looks. ***/
|
||||
/*** + All identation should consist of four space blocks ***/
|
||||
/*** + Tab characters are evil. ***/
|
||||
/*** + all comments should use "slash-star ... star-slash" ***/
|
||||
/*** style -- no pound characters, no slash-slash style ***/
|
||||
/*** + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD ***/
|
||||
/*** ALWAYS USE { AND } CHARACTERS!!! ***/
|
||||
/*** + Please use ' instead of ", when possible. Note " ***/
|
||||
/*** should always be used in _( ) function calls. ***/
|
||||
/*** Thank you for your help making the SM code more readable. ***/
|
||||
/*****************************************************************/
|
||||
|
||||
require_once('../src/validate.php');
|
||||
require_once('../functions/imap.php');
|
||||
require_once('../functions/imap_search.php');
|
||||
|
|
@ -32,8 +16,9 @@ require_once('../functions/array.php');
|
|||
|
||||
function s_opt( $val, $sel, $tit ) {
|
||||
echo " <option value=\"$val\"";
|
||||
if ( $sel )
|
||||
if ( $sel ) {
|
||||
echo 'selected';
|
||||
}
|
||||
echo ">$tit</option>\n";
|
||||
}
|
||||
|
||||
|
|
@ -48,7 +33,7 @@ require_once('../functions/array.php');
|
|||
" </td></tr>\n".
|
||||
' <tr><td align=center>'.
|
||||
|
||||
"<FORM ACTION=\"search.php\" NAME=s>\n".
|
||||
"<FORM ACTION=\"$PHP_SELF\" NAME=s>\n".
|
||||
" <TABLE WIDTH=\"75%\">\n".
|
||||
" <TR>\n".
|
||||
" <TD WIDTH=\"33%\">\n".
|
||||
|
|
@ -59,17 +44,19 @@ require_once('../functions/array.php');
|
|||
if (!in_array('noselect', $boxes[$i]['flags'])) {
|
||||
$box = $boxes[$i]['unformatted'];
|
||||
$box2 = str_replace(' ', ' ', $boxes[$i]['unformatted-disp']);
|
||||
if ($mailbox == $box)
|
||||
if ($mailbox == $box) {
|
||||
echo " <OPTION VALUE=\"$box\" SELECTED>$box2</OPTION>\n";
|
||||
else
|
||||
} else {
|
||||
echo " <OPTION VALUE=\"$box\">$box2</OPTION>\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
echo ' </SELECT></SMALL></TT>'.
|
||||
" </TD>\n".
|
||||
" <TD ALIGN=\"CENTER\" WIDTH=\"33%\">\n";
|
||||
if (!isset($what))
|
||||
if (!isset($what)) {
|
||||
$what = '';
|
||||
}
|
||||
$what_disp = ereg_replace(',', ' ', $what);
|
||||
$what_disp = str_replace('\\\\', '\\', $what_disp);
|
||||
$what_disp = str_replace('\\"', '"', $what_disp);
|
||||
|
|
@ -102,5 +89,7 @@ require_once('../functions/array.php');
|
|||
}
|
||||
do_hook("search_bottom");
|
||||
sqimap_logout ($imapConnection);
|
||||
|
||||
echo '</body></html>';
|
||||
|
||||
?>
|
||||
</body></html>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue