X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddrbook_search_html.php;h=ac0be5609901293ef996935f7239efd147327d13;hb=7111b0daa5f74c1c96d3bcf87da7a05e4ba6e189;hp=1f145a5e0e5ccce77c1f2d6bf921f33730254f8e;hpb=de00443c7d9770fbae65402e6beabde8a3db302a;p=squirrelmail.git diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php index 1f145a5e..ac0be560 100644 --- a/src/addrbook_search_html.php +++ b/src/addrbook_search_html.php @@ -1,41 +1,36 @@ ' . - "\n\n" . - "\n"; - $chk_all = '' . _("All") . ' '._("To").''. + if ($javascript_on) { + print + '\n"; + $chk_all = ''._("All").' '._("To").''. ' '. - '' . _("All") . ' '._("Cc").''. + '' . _("All") . ' '._("Cc").''. ' '. - '' . _("All") . ''; + '' . _("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] ) . @@ -113,27 +111,13 @@ if ($javascript_on) { foreach ($res as $row) { $email = AddressBook::full_address($row); - if ($line % 2) { + if ($line % 2) { $tr_bgcolor = $color[12]; } else { $tr_bgcolor = $color[4]; } - if ($squirrelmail_language == 'ja_JP') - { - echo html_tag( 'tr', '', '', $tr_bgcolor, 'nowrap' ) . - html_tag( 'td', - ' ' . _("To") . ' ' . - ' ' . _("Cc") . ' ' . - ' ' . _("Bcc") . ' ' , - 'center', '', 'width="5%" nowrap' ) . - html_tag( 'td', ' ' . htmlspecialchars($row['lastname']) . ' ' . htmlspecialchars($row['firstname']) . ' ', 'left', '', 'nowrap' ) . - html_tag( 'td', ' ' . htmlspecialchars($row['email']) . ' ', 'left', '', 'nowrap' ) . - html_tag( 'td', ' ' . htmlspecialchars($row['label']) . ' ', 'left', '', 'nowrap' ); - } else { - echo html_tag( 'tr', '', '', $tr_bgcolor, 'nowrap' ) . + + echo html_tag( 'tr', '', '', $tr_bgcolor, 'style="white-space: nowrap;"' ) . html_tag( 'td', addCheckBox('send_to_search[T'.$line.']', FALSE, $email). ' ' . _("To") . ' ' . @@ -141,23 +125,24 @@ if ($javascript_on) { ' ' . _("Cc") . ' ' . addCheckBox('send_to_search[B'.$line.']', FALSE, $email). ' ' . _("Bcc") . ' ' , - 'center', '', 'width="5%" nowrap' ) . - html_tag( 'td', ' ' . htmlspecialchars($row['name']) . ' ', 'left', '', 'nowrap' ) . - html_tag( 'td', ' ' . htmlspecialchars($row['email']) . ' ', 'left', '', 'nowrap' ) . - html_tag( 'td', ' ' . htmlspecialchars($row['label']) . ' ', 'left', '', 'nowrap' ); - } - - if ($includesource) { - echo html_tag( 'td', ' ' . $row['source'] . ' ', 'left', '', 'nowrap' ); - } - echo "\n"; - $line ++; + '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', '' , + _("Use Addresses") . '" /> ' . + '', 'center', '', 'colspan="'. $td_colspan .'"' ) ) . '' . @@ -173,6 +158,11 @@ if ($compose_new_win == '1') { else { displayPageHeader($color, $mailbox); } + +/** set correct value of $default_charset */ +global $default_charset; +set_my_charset(); + /* Initialize addressbook */ $abook = addressbook_init(); @@ -186,26 +176,24 @@ html_tag( 'table', /* Search form */ -echo '