X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddrbook_search.php;h=5a4529e8887bddf88bc13c4ff17a0dd3d12b43a8;hb=f027a8827fabca634602f1404eb48b29afc7f195;hp=45e1ed2ea133ba4389689191f53eef15735b3a46;hpb=623662614b34b6f05a5ba6330bc5a624c8e9b731;p=squirrelmail.git diff --git a/src/addrbook_search.php b/src/addrbook_search.php index 45e1ed2e..5a4529e8 100644 --- a/src/addrbook_search.php +++ b/src/addrbook_search.php @@ -3,41 +3,32 @@ /** * addrbook_search.php * - * Copyright (c) 1999-2004 The SquirrelMail Project Team - * Licensed under the GNU GPL. For full terms see the file COPYING. - * * Handle addressbook searching in the popup window. * * NOTE: A lot of this code is similar to the code in * addrbook_search_html.html -- If you change one, * change the other one too! * - * $Id$ + * @copyright © 1999-2006 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id$ * @package squirrelmail + * @subpackage addressbook */ /** * Path for SquirrelMail required files. + * @ignore */ define('SM_PATH','../'); /** SquirrelMail required files. */ -require_once(SM_PATH . 'include/validate.php'); -require_once(SM_PATH . 'functions/strings.php'); -require_once(SM_PATH . 'functions/global.php'); -require_once(SM_PATH . 'functions/html.php'); -require_once(SM_PATH . 'functions/forms.php'); - -/** 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); - -sqgetGlobalVar('show' , $show); -sqgetGlobalVar('query', $query, SQ_POST); -sqgetGlobalVar('listall', $listall, SQ_POST); -sqgetGlobalVar('backend', $backend, SQ_POST); +include_once(SM_PATH . 'include/validate.php'); +include_once(SM_PATH . 'functions/strings.php'); +include_once(SM_PATH . 'functions/global.php'); +include_once(SM_PATH . 'functions/html.php'); +include_once(SM_PATH . 'functions/forms.php'); +include_once(SM_PATH . 'functions/addressbook.php'); /** * Function to include JavaScript code @@ -45,7 +36,7 @@ sqgetGlobalVar('backend', $backend, SQ_POST); */ function insert_javascript() { ?> - +// --> \n"; - + while (list($undef, $row) = each($res)) { - $tr_bgcolor = ''; $email = htmlspecialchars(addcslashes(AddressBook::full_address($row), "'"), ENT_QUOTES); - if ($line % 2) { $tr_bgcolor = $color[0]; } - echo html_tag( 'tr', '', '', $tr_bgcolor, 'nowrap' ) . + 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%" nowrap' ) . - html_tag( 'td', ' ' . htmlspecialchars($row['name']), 'left', '', 'valign="top" nowrap' ) . + '"._("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']) . '' + "'" . $email . "');\">" . htmlspecialchars($row['email']) . '' , 'left', '', 'valign="top"' ) . - html_tag( 'td', htmlspecialchars($row['label']), 'left', '', 'valign="top" nowrap' ); + html_tag( 'td', htmlspecialchars($row['label']), 'left', '', 'valign="top" style="white-space: nowrap;"' ); if ($includesource) { - echo html_tag( 'td', ' ' . $row['source'], 'left', '', 'valign="top" nowrap' ); + echo html_tag( 'td', ' ' . $row['source'], 'left', '', 'valign="top" style="white-space: nowrap;"' ); } echo "\n"; @@ -164,81 +158,102 @@ function display_result($res, $includesource = true) { } /* ================= End of functions ================= */ - -require_once('../functions/strings.php'); -require_once('../functions/addressbook.php'); - + +/** 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 = ''; +} +if (! sqgetGlobalVar('query', $query, SQ_POST)) { + $query = ''; +} +if (! sqgetGlobalVar('listall', $listall, SQ_POST)) { + unset($listall); +} +if (! sqgetGlobalVar('backend', $backend, SQ_POST)) { + $backend = ''; +} + displayHtmlHeader(); - -/* Initialize vars */ -if (!isset($query)) { $query = ''; } -if (!isset($show)) { $show = ''; } -if (!isset($backend)) { $backend = ''; } + +/** 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"; + echo '\n"; } /* Empty search */ -if (empty($query) && empty($show) && empty($listall)) { - echo html_tag( 'p', '