*
* This file is included from compose.php
*
- * @copyright © 1999-2007 The SquirrelMail Project Team
+ * @copyright 1999-2021 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
* init.php.
*/
if (!isset($bInit)) {
+ /** This is the addrbook_search_html page */
+ define('PAGE_NAME', 'addrbook_search_html');
+
include('../include/init.php');
}
* Insert hidden data
*/
function addr_insert_hidden() {
- global $body, $subject, $send_to, $send_to_cc, $send_to_bcc, $mailbox,
- $request_mdn, $request_dr, $identity, $session;
-
- if (substr($body, 0, 1) == "\r") {
- echo addHidden('body', "\n".$body);
- } else {
+ global $body, $subject, $send_to, $send_to_cc, $send_to_bcc, $mailbox, $mailprio,
+ $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?!?
+ // 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);
- }
+ // }
+
+ 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).
global $PHP_SELF, $oTemplate, $oErrorHandler;
- echo addForm($PHP_SELF, 'post', 'addressbook').
+//FIXME: no HTML output from core
+ echo addForm($PHP_SELF, 'post', 'addressbook', '', '', array(), TRUE).
addHidden('html_addr_search_done', 'true');
addr_insert_hidden();
- $oTemplate->assign('use_js', false);
+ $oTemplate->assign('compose_addr_pop', false);
$oTemplate->assign('include_abook_name', $includesource);
$oTemplate->assign('addresses', formatAddressList($res));
echo addHidden('session', $session);
}
-$oTemplate->assign('use_js', false);
+$oTemplate->assign('compose_addr_pop', false);
$oTemplate->assign('backends', getBackends());
$oTemplate->display('addressbook_search_form.tpl');
}
if (!is_array($res)) {
- plain_error_message(_("Your search failed with the following error(s)") .':<br />'. nl2br(htmlspecialchars($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');
}
if ($addrquery == '' || sizeof($res) == 0) {
+//FIXME don't echo HTML from core -- especially convoluted given that there is template code immediately above AND below this block
echo '<div style="text-align: center;">'.
- addForm('compose.php','post','k');
+ addForm('compose.php','post','k', '', '', array(), TRUE);
addr_insert_hidden();
echo '<input type="submit" value="' . _("Return") . '" name="return" />' . "\n" .
'</form></div></nobr>';