X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Faddrbook_search.php;h=2f6dec569e9e5fd91183c9a1845f7e717865f260;hb=d8e94f0ae6733ca565035a93704d71de69b9f2e3;hp=843303cc9e5815503b5b015bb85d7fa7151d143b;hpb=828c58f18565da37215df7d138ba05485ce8c4cd;p=squirrelmail.git diff --git a/src/addrbook_search.php b/src/addrbook_search.php index 843303cc..2f6dec56 100644 --- a/src/addrbook_search.php +++ b/src/addrbook_search.php @@ -1,5 +1,4 @@ - -\n"; - - while (list($undef, $row) = each($res)) { - $email = htmlspecialchars(addcslashes(AddressBook::full_address($row), "'"), ENT_QUOTES); - if ($line % 2) { - $tr_bgcolor = $color[12]; - } else { - $tr_bgcolor = $color[4]; - } - echo html_tag( 'tr', '', '', $tr_bgcolor, 'style="white-space: nowrap;"' ) . - html_tag( 'td', - '"._("To")." | " . - '"._("Cc")." | " . - '"._("Bcc")."", - 'center', '', 'valign="top" width="5%" style="white-space: nowrap;"' ) . - html_tag( 'td', ' ' . htmlspecialchars($row['name']), 'left', '', 'valign="top" style="white-space: nowrap;"' ) . - html_tag( 'td', ' ' . - '" . htmlspecialchars($row['email']) . '' - , 'left', '', 'valign="top"' ) . - html_tag( 'td', htmlspecialchars($row['label']), 'left', '', 'valign="top" style="white-space: nowrap;"' ); - if ($includesource) { - echo html_tag( 'td', ' ' . $row['source'], 'left', '', 'valign="top" style="white-space: nowrap;"' ); - } - - echo "\n"; - $line++; - } - echo ''; + $oTemplate->assign('compose_addr_pop', true); + $oTemplate->assign('include_abook_name', $includesource); + $oTemplate->assign('addresses', formatAddressList($res)); + + $oTemplate->display('addrbook_search_list.tpl'); } /* ================= End of functions ================= */ /** lets get the global vars we may need */ -sqgetGlobalVar('key', $key, SQ_COOKIE); -sqgetGlobalVar('username', $username, SQ_SESSION); -sqgetGlobalVar('onetimepad',$onetimepad, SQ_SESSION); -sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION); if (! sqgetGlobalVar('show' , $show)) { $show = ''; @@ -173,30 +63,16 @@ if (! sqgetGlobalVar('backend', $backend, SQ_POST)) { } displayHtmlHeader(); +echo "
\n"; /** set correct value of $default_charset */ -global $default_charset; set_my_charset(); -/* Choose correct colors for top and bottom frame */ -if ($show == 'form' && !isset($listall)) { - echo ''; -} else { - echo '\n"; -} - /* Empty search */ if (empty($query) && empty($show) && !isset($listall)) { - echo html_tag( 'p', '