X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddrbook_search_html.php;h=a22da9a781e9bf7c165912fd06679db4b59eed5e;hb=a571cff36ff1c340cbd2130ce9c0e2ab7ef96977;hp=f8118364c81d9dbf765a90497c52c1d310740a01;hpb=f8a1ed5aa365d515e4e2ac3602f900bfb9447fce;p=squirrelmail.git
diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index f8118364..a22da9a7 100644
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -1,41 +1,37 @@
' .
- "\n\n" .
- "\n";
- $chk_all = '' . _("All") . ' '._("To").''.
- ' '.
- '' . _("All") . ' '._("Cc").''.
- ' '.
- '' . _("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('use_js', false);
+ $oTemplate->assign('include_abook_name', $includesource);
+ $oTemplate->assign('addresses', formatAddressList($res));
+
+ $oTemplate->display('addrbook_search_list.tpl');
+
+ echo '';
}
/* --- End functions --- */
@@ -184,80 +101,37 @@ set_my_charset();
$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 '