projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding entries per Paul's request on Sat, December 29, 2001 1:22 am.
[squirrelmail.git]
/
src
/
read_body.php
diff --git
a/src/read_body.php
b/src/read_body.php
index dd69e6e2d3922fe729db8d97197d5fa13c75333a..ba9be44d45ff93026a69e16e7e22811e13af26c7 100644
(file)
--- a/
src/read_body.php
+++ b/
src/read_body.php
@@
-362,19
+362,20
@@
require_once('../functions/url_parser.php');
if ($show_more_cc == false) {
if ($i == 1) {
/* From a search... */
if ($show_more_cc == false) {
if ($i == 1) {
/* From a search... */
+ $cc_string = "$cc_string (<A HREF=\"read_body.php?mailbox=$urlMailbox&passed_id=$passed_id";
if (isset($where) && isset($what)) {
if (isset($where) && isset($what)) {
- $cc_string
= "$cc_string (<A HREF=\"read_body.php?mailbox=$urlMailbox&passed_id=$passed_id
&what=".urlencode($what)."&where=".urlencode($where)."&show_more_cc=1&show_more=$show_more\">$echo_more</A>)";
+ $cc_string
.= "
&what=".urlencode($what)."&where=".urlencode($where)."&show_more_cc=1&show_more=$show_more\">$echo_more</A>)";
} else {
} else {
- $cc_string = "
$cc_string (<A HREF=\"read_body.php?mailbox=$urlMailbox&passed_id=$passed_id
&sort=$sort&startMessage=$startMessage&show_more_cc=1&show_more=$show_more\">$echo_more</A>)";
+ $cc_string = "&sort=$sort&startMessage=$startMessage&show_more_cc=1&show_more=$show_more\">$echo_more</A>)";
}
$i = count($cc_ary);
}
} else if ($i == 1) {
/* From a search... */
if (isset($where) && isset($what)) {
}
$i = count($cc_ary);
}
} else if ($i == 1) {
/* From a search... */
if (isset($where) && isset($what)) {
- $cc_string
= "$cc_string
(<A HREF=\"read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&what=".urlencode($what)."&where=".urlencode($where)."&show_more_cc=0&show_more=$show_more\">$echo_less</A>)";
+ $cc_string
.= "
(<A HREF=\"read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&what=".urlencode($what)."&where=".urlencode($where)."&show_more_cc=0&show_more=$show_more\">$echo_less</A>)";
} else {
} else {
- $cc_string
= "$cc_string
(<A HREF=\"read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&sort=$sort&startMessage=$startMessage&show_more_cc=0&show_more=$show_more\">$echo_less</A>)";
+ $cc_string
.= "
(<A HREF=\"read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&sort=$sort&startMessage=$startMessage&show_more_cc=0&show_more=$show_more\">$echo_less</A>)";
}
}
}
}
}
}
@@
-445,8
+446,12
@@
require_once('../functions/url_parser.php');
' <TR>' . "\n" .
' <TD ALIGN="LEFT" WIDTH="33%">' . "\n" .
' <SMALL>' . "\n";
' <TR>' . "\n" .
' <TD ALIGN="LEFT" WIDTH="33%">' . "\n" .
' <SMALL>' . "\n";
+
if ($where && $what) {
if ($where && $what) {
- echo " <A HREF=\"search.php?where=".urlencode($where)."&what=".urlencode($what)."&mailbox=$urlMailbox\">";
+ if( $pos == '' ) {
+ $pos = 0;
+ }
+ echo " <A HREF=\"search.php?where$pos=".urlencode($where)."&pos=$pos&what$pos=".urlencode($what)."&mailbox=$urlMailbox\">";
} else {
echo " <A HREF=\"right_main.php?use_mailbox_cache=1&sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\">";
}
} else {
echo " <A HREF=\"right_main.php?use_mailbox_cache=1&sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\">";
}
@@
-655,4
+660,4
@@
require_once('../functions/url_parser.php');
do_hook('read_body_bottom');
do_hook('html_bottom');
sqimap_logout($imapConnection);
do_hook('read_body_bottom');
do_hook('html_bottom');
sqimap_logout($imapConnection);
-?>
+?>
\ No newline at end of file