X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddrbook_search_html.php;h=9862ced6c3e38c0ec2e83c83b7d77a96528269c1;hb=f7cd8eb4e788b45f94c494836eae2ac63522a672;hp=1e0f8f45d170ec39386e773496f9449109c3404e;hpb=93adc0189d6a575877d24c25dced55ffe153f22e;p=squirrelmail.git
diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index 1e0f8f45..9862ced6 100644
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -1,40 +1,40 @@
' .
- "\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] ) .
@@ -112,42 +115,42 @@ 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' ) .
+ echo html_tag( 'tr', '', '', $tr_bgcolor, 'style="white-space: 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' );
+ ' ' . _("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, 'nowrap' ) .
+ echo html_tag( 'tr', '', '', $tr_bgcolor, 'style="white-space: nowrap;"' ) .
html_tag( 'td',
- addCheckBox('send_to_search[T'.$line.']', FALSE, $email).
+ 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%" 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' );
+ 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', '', 'nowrap' );
+ echo html_tag( 'td', ' ' . $row['source'] . ' ', 'left', '', 'style="white-space: nowrap;"' );
}
echo "\n";
$line ++;
@@ -155,13 +158,15 @@ if ($javascript_on) {
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').
- '';
+ '' .
+ addHidden('html_addr_search_done', '1').
+ '';
}
/* --- End functions --- */
@@ -172,11 +177,16 @@ 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();
-echo '
' .
+echo '
' .
html_tag( 'table',
html_tag( 'tr',
html_tag( 'td', '' . _("Address Book Search") . '', 'center', $color[0] )
@@ -188,25 +198,23 @@ html_tag( 'table',
echo '