projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some browswers were not putting cursor at beginning of message body after focus
[squirrelmail.git]
/
src
/
addrbook_search_html.php
diff --git
a/src/addrbook_search_html.php
b/src/addrbook_search_html.php
index e884f24f667ae274694183245d708a0ace5e4d3d..252f4e1a67548c30e5a13d045403e15780efee78 100644
(file)
--- a/
src/addrbook_search_html.php
+++ b/
src/addrbook_search_html.php
@@
-6,7
+6,7
@@
*
* This file is included from compose.php
*
*
* This file is included from compose.php
*
- * @copyright 1999-201
0
The SquirrelMail Project Team
+ * @copyright 1999-201
9
The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
@@
-43,19
+43,21
@@
sqgetGlobalVar('backend', $backend, SQ_POST);
*/
function addr_insert_hidden() {
global $body, $subject, $send_to, $send_to_cc, $send_to_bcc, $mailbox, $mailprio,
*/
function addr_insert_hidden() {
global $body, $subject, $send_to, $send_to_cc, $send_to_bcc, $mailbox, $mailprio,
- $request_mdn, $request_dr, $identity, $session, $composeMessage;
+ $request_mdn, $request_dr, $identity, $session, $composeMessage
, $action
;
//FIXME Do not echo HTML from the core. This file already uses templates mostly, so why are we echoing here at all?!?
//FIXME Do not echo HTML from the core. This file already uses templates mostly, so why are we echoing here at all?!?
- if (substr($body, 0, 1) == "\r") {
- echo addHidden('body', "\n".$body);
- } else {
+ // someone tell me why this is needed and if so, why it isn't something like replace \r\n with \n
+ // if (substr($body, 0, 1) == "\r") {
+ // echo addHidden('body', "\n".$body);
+ // } else {
echo addHidden('body', $body);
echo addHidden('body', $body);
- }
+
//
}
if (is_object($composeMessage) && $composeMessage->entities)
echo addHidden('attachments', urlencode(serialize($composeMessage->entities)));
echo addHidden('session', $session).
if (is_object($composeMessage) && $composeMessage->entities)
echo addHidden('attachments', urlencode(serialize($composeMessage->entities)));
echo addHidden('session', $session).
+ addHidden('smaction', $action).
addHidden('subject', $subject).
addHidden('send_to', $send_to).
addHidden('send_to_bcc', $send_to_bcc).
addHidden('subject', $subject).
addHidden('send_to', $send_to).
addHidden('send_to_bcc', $send_to_bcc).
@@
-157,7
+159,7
@@
if ($addrquery == '' || ! empty($listall)) {
}
if (!is_array($res)) {
}
if (!is_array($res)) {
- plain_error_message(_("Your search failed with the following error(s)") .':<br />'. nl2br(
htmlspecial
chars($abook->error)));
+ plain_error_message(_("Your search failed with the following error(s)") .':<br />'. nl2br(
sm_encode_html_special_
chars($abook->error)));
} elseif (sizeof($res) == 0) {
$oTemplate->assign('note', _("No persons matching your search were found"));
$oTemplate->display('note.tpl');
} elseif (sizeof($res) == 0) {
$oTemplate->assign('note', _("No persons matching your search were found"));
$oTemplate->display('note.tpl');