X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Faddrbook_search_html.php;h=e8faf646111a4b7d1016bab100f9c220156f3314;hb=6c84ba1ec45ab854c37b6f65c5b4d84ab1c7aad4;hp=81997272da00d67e403b94e26d6f1d7c3063f3fd;hpb=30967a1e09679c395b31929cbdb1a0e88b13f01e;p=squirrelmail.git
diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index 81997272..e8faf646 100644
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -3,7 +3,7 @@
/**
* addrbook_search_html.php
*
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Handle addressbook searching with pure html.
@@ -12,14 +12,15 @@
*
* @version $Id$
* @package squirrelmail
+ * @subpackage addressbook
*/
-/**
+/**
* Path for SquirrelMail required files.
* @ignore
*/
if (! defined('SM_PATH') ) {
- define('SM_PATH','../');
+ define('SM_PATH','../');
}
/** SquirrelMail required files. */
@@ -53,12 +54,12 @@ function addr_insert_hidden() {
echo addHidden('session', $session).
addHidden('subject', $subject).
- addHidden('send_to', $send_to).
- addHidden('send_to_bcc', $send_to_bcc).
- addHidden('send_to_cc', $send_to_cc).
- addHidden('identity', $identity).
- addHidden('mailbox', $mailbox).
- addHidden('from_htmladdr_search', 'true');
+ addHidden('send_to', $send_to).
+ addHidden('send_to_bcc', $send_to_bcc).
+ addHidden('send_to_cc', $send_to_cc).
+ addHidden('identity', $identity).
+ addHidden('mailbox', $mailbox).
+ addHidden('from_htmladdr_search', 'true');
}
@@ -72,7 +73,7 @@ function addr_display_result($res, $includesource = true) {
if (sizeof($res) <= 0) return;
- echo addForm($PHP_SELF, 'POST', 'addrbook').
+ echo addForm($PHP_SELF, 'post', 'addrbook').
addHidden('html_addr_search_done', 'true');
addr_insert_hidden();
$line = 0;
@@ -91,11 +92,11 @@ if ($javascript_on) {
"}\n" .
"//-->\n" .
"\n";
- $chk_all = '' . _("All") . ' To'.
+ $chk_all = '' . _("All") . ' '._("To").''.
' '.
- '' . _("All") . ' Cc'.
+ '' . _("All") . ' '._("Cc").''.
' '.
- '' . _("All") . '';
+ '' . _("All") . '';
}
echo html_tag( 'table', '', 'center', '', 'border="0" width="98%"' ) .
html_tag( 'tr', '', '', $color[9] ) .
@@ -111,40 +112,43 @@ if ($javascript_on) {
echo "\n";
foreach ($res as $row) {
- $tr_bgcolor = '';
$email = AddressBook::full_address($row);
- if ($line % 2) { $tr_bgcolor = $color[0]; }
+ 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 ++;
@@ -152,13 +156,13 @@ 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 --- */
@@ -173,7 +177,7 @@ else {
$abook = addressbook_init();
-echo '
' .
+echo '
' .
html_tag( 'table',
html_tag( 'tr',
html_tag( 'td', '' . _("Address Book Search") . '', 'center', $color[0] )
@@ -185,10 +189,10 @@ html_tag( 'table',
echo '' .
html_tag( 'table', '', 'center', '', 'border="0"' ) .
html_tag( 'tr' ) .
- html_tag( 'td', '', 'left', '', 'nowrap valign="middle"' ) . "\n" .
- addForm($PHP_SELF.'?html_addr_search=true', 'POST', 'f').
- "\n\n" .
- ' ' . _("Search for") . "\n";
+ html_tag( 'td', '', 'left', '', 'style="white-space: nowrap;" valign="middle"' ) . "\n" .
+ addForm($PHP_SELF.'?html_addr_search=true', 'post', 'f').
+ "\n\n" .
+ ' ' . _("Search for") . "\n";
addr_insert_hidden();
if (! isset($addrquery))
$addrquery = '';
@@ -197,13 +201,13 @@ echo addInput('addrquery', $addrquery, 26);
/* List all backends to allow the user to choose where to search */
if (!isset($backend)) { $backend = ''; }
if ($abook->numbackends > 1) {
- echo '' . _("in") . ' ';
-
- $selopts['-1'] = _("All address books");
+ echo '' . _("in") . ' ';
+
+ $selopts['-1'] = _("All address books");
$ret = $abook->get_backend_list();
-
+
while (list($undef,$v) = each($ret)) {
- $selopts[$v->bnum] = $v->sname;
+ $selopts[$v->bnum] = $v->sname;
}
echo addSelect('backend', $selopts, $backend, TRUE);
} else {
@@ -213,10 +217,10 @@ if (isset($session)) {
echo addHidden('session', $session);
}
-echo '' .
- ' | ' . "\n" .
- '' . "\n";
+echo '' .
+ ' | ' . "\n" .
+ '' . "\n";
addr_insert_hidden();
echo '';
do_hook('addrbook_html_search_below');
@@ -235,7 +239,7 @@ if ($addrquery == '' && empty($listall)) {
$backend = $abook->localbackend;
}
- /* echo '' . $abook->backends[$backend]->sname) . "
\n"; */
+ /* echo '' . $abook->backends[$backend]->sname) . "
\n"; */
$res = $abook->list_addr($backend);
@@ -243,8 +247,8 @@ if ($addrquery == '' && empty($listall)) {
usort($res,'alistcmp');
addr_display_result($res, false);
} else {
- echo html_tag( 'p', '
' .
- sprintf(_("Unable to list addresses from %s"),
+ echo html_tag( 'p', '
' .
+ sprintf(_("Unable to list addresses from %s"),
$abook->backends[$backend]->sname) . "\n" ,
'center' );
}
@@ -268,17 +272,17 @@ else {
}
if (!is_array($res)) {
- echo html_tag( 'p', '
' .
+ echo html_tag( 'p', '
' .
_("Your search failed with the following error(s)") .
- ':
' . $abook->error . "\n" ,
+ ':
' . $abook->error . "\n" ,
'center' ) .
- "\n