X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddrbook_search_html.php;h=e884f24f667ae274694183245d708a0ace5e4d3d;hb=1977ab5587905d225c6288141b82f7a6e3d29d02;hp=31b6da9fa7923bfb4aab2250a19cdc3b9f1ed031;hpb=f265009a3bf872cf6c9d9aaefe7949e1688555a0;p=squirrelmail.git
diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index 31b6da9f..e884f24f 100644
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -6,7 +6,7 @@
*
* This file is included from compose.php
*
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright 1999-2010 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
@@ -14,26 +14,26 @@
*/
/**
- * Path for SquirrelMail required files.
- * @ignore
+ * Include the SquirrelMail initialization file.
+ * Because this file can also be included within compose we check for the $bInit
+ * var which is set inside ini.php. It's needed because compose already includes
+ * init.php.
*/
-if (! defined('SM_PATH') ) {
- define('SM_PATH','../');
+if (!isset($bInit)) {
+ /** This is the addrbook_search_html page */
+ define('PAGE_NAME', 'addrbook_search_html');
+
+ include('../include/init.php');
}
/** SquirrelMail required files. */
-include_once(SM_PATH . 'include/validate.php');
-include_once(SM_PATH . 'functions/global.php');
include_once(SM_PATH . 'functions/date.php');
-include_once(SM_PATH . 'functions/display_messages.php');
include_once(SM_PATH . 'functions/addressbook.php');
-include_once(SM_PATH . 'functions/plugin.php');
-include_once(SM_PATH . 'functions/strings.php');
-include_once(SM_PATH . 'functions/html.php');
+include_once(SM_PATH . 'templates/util_addressbook.php');
sqgetGlobalVar('session', $session, SQ_POST);
sqgetGlobalVar('mailbox', $mailbox, SQ_POST);
-if (! sqgetGlobalVar('addrquery', $addrquery, SQ_POST))
+if (! sqgetGlobalVar('query', $addrquery, SQ_POST))
$addrquery='';
sqgetGlobalVar('listall', $listall, SQ_POST);
sqgetGlobalVar('backend', $backend, SQ_POST);
@@ -42,20 +42,27 @@ sqgetGlobalVar('backend', $backend, SQ_POST);
* Insert hidden data
*/
function addr_insert_hidden() {
- global $body, $subject, $send_to, $send_to_cc, $send_to_bcc, $mailbox,
- $identity, $session;
+ global $body, $subject, $send_to, $send_to_cc, $send_to_bcc, $mailbox, $mailprio,
+ $request_mdn, $request_dr, $identity, $session, $composeMessage;
+//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 {
echo addHidden('body', $body);
}
+ if (is_object($composeMessage) && $composeMessage->entities)
+ echo addHidden('attachments', urlencode(serialize($composeMessage->entities)));
+
echo addHidden('session', $session).
addHidden('subject', $subject).
addHidden('send_to', $send_to).
addHidden('send_to_bcc', $send_to_bcc).
addHidden('send_to_cc', $send_to_cc).
+ addHidden('mailprio', $mailprio).
+ addHidden('request_mdn', $request_mdn).
+ addHidden('request_dr', $request_dr).
addHidden('identity', $identity).
addHidden('mailbox', $mailbox).
addHidden('from_htmladdr_search', 'true');
@@ -68,105 +75,21 @@ function addr_insert_hidden() {
* @param bool $includesource If true, adds backend column to address listing
*/
function addr_display_result($res, $includesource = true) {
- global $color, $javascript_on, $PHP_SELF, $squirrelmail_language;
+ global $PHP_SELF, $oTemplate, $oErrorHandler;
+
- if (sizeof($res) <= 0) return;
-
- echo addForm($PHP_SELF, 'post', 'addrbook').
+//FIXME: no HTML output from core
+ echo addForm($PHP_SELF, 'post', 'addressbook', '', '', array(), TRUE).
addHidden('html_addr_search_done', 'true');
addr_insert_hidden();
- $line = 0;
-
- if ($javascript_on) {
- print
- '\n";
- $chk_all = ''._("All").' '._("To").''.
- ' '.
- '' . _("All") . ' '._("Cc").''.
- ' '.
- '' . _("All") . '';
- } else {
- // check_all links are used only in JavaScript. disable links in js=off environment.
- $chk_all = '';
- }
- echo html_tag( 'table', '', 'center', '', 'border="0" width="98%"' ) .
- html_tag( 'tr', '', '', $color[9] ) .
- html_tag( 'th', ' ' . $chk_all, 'left' ) .
- html_tag( 'th', ' ' . _("Name"), 'left' ) .
- html_tag( 'th', ' ' . _("E-mail"), 'left' ) .
- html_tag( 'th', ' ' . _("Info"), 'left' );
-
- if ($includesource) {
- echo html_tag( 'th', ' ' . _("Source"), 'left', '', 'width="10%"' );
- }
-
- echo "\n";
-
- foreach ($res as $row) {
- $email = AddressBook::full_address($row);
- if ($line % 2) {
- $tr_bgcolor = $color[12];
- } else {
- $tr_bgcolor = $color[4];
- }
- if ($squirrelmail_language == 'ja_JP')
- {
- echo html_tag( 'tr', '', '', $tr_bgcolor, 'style="white-space: nowrap;"' ) .
- html_tag( 'td',
- ' ' . _("To") . ' ' .
- ' ' . _("Cc") . ' ' .
- ' ' . _("Bcc") . ' ' ,
- 'center', '', 'width="5%" style="white-space: nowrap;"' ) .
- html_tag( 'td', ' ' . htmlspecialchars($row['lastname']) . ' ' . htmlspecialchars($row['firstname']) . ' ', 'left', '', 'style="white-space: nowrap;"' ) .
- html_tag( 'td', ' ' . htmlspecialchars($row['email']) . ' ', 'left', '', 'style="white-space: nowrap;"' ) .
- html_tag( 'td', ' ' . htmlspecialchars($row['label']) . ' ', 'left', '', 'style="white-space: nowrap;"' );
- } else {
- echo html_tag( 'tr', '', '', $tr_bgcolor, 'style="white-space: nowrap;"' ) .
- html_tag( 'td',
- addCheckBox('send_to_search[T'.$line.']', FALSE, $email).
- ' ' . _("To") . ' ' .
- addCheckBox('send_to_search[C'.$line.']', FALSE, $email).
- ' ' . _("Cc") . ' ' .
- addCheckBox('send_to_search[B'.$line.']', FALSE, $email).
- ' ' . _("Bcc") . ' ' ,
- 'center', '', 'width="5%" style="white-space: nowrap;"' ) .
- html_tag( 'td', ' ' . htmlspecialchars($row['name']) . ' ', 'left', '', 'style="white-space: nowrap;"' ) .
- html_tag( 'td', ' ' . htmlspecialchars($row['email']) . ' ', 'left', '', 'style="white-space: nowrap;"' ) .
- html_tag( 'td', ' ' . htmlspecialchars($row['label']) . ' ', 'left', '', 'style="white-space: nowrap;"' );
- }
-
- if ($includesource) {
- echo html_tag( 'td', ' ' . $row['source'] . ' ', 'left', '', 'style="white-space: nowrap;"' );
- }
- echo "\n";
- $line ++;
- }
- if ($includesource) { $td_colspan = '5'; } else { $td_colspan = '4'; }
- echo html_tag( 'tr',
- html_tag( 'td',
- ' ' .
- '',
- 'center', '', 'colspan="'. $td_colspan .'"' )
- ) .
- '' .
- addHidden('html_addr_search_done', '1').
- '';
+
+ $oTemplate->assign('compose_addr_pop', false);
+ $oTemplate->assign('include_abook_name', $includesource);
+ $oTemplate->assign('addresses', formatAddressList($res));
+
+ $oTemplate->display('addrbook_search_list.tpl');
+
+ echo '';
}
/* --- End functions --- */
@@ -179,57 +102,26 @@ else {
}
/** set correct value of $default_charset */
-global $default_charset;
set_my_charset();
/* Initialize addressbook */
$abook = addressbook_init();
-echo '
' .
-html_tag( 'table',
- html_tag( 'tr',
- html_tag( 'td', '' . _("Address Book Search") . '', 'center', $color[0] )
- ) ,
-'center', '', 'width="95%" cellpadding="2" cellspacing="2" border="0"' );
-
-
/* Search form */
-echo '