require_once('../functions/display_messages.php');
require_once('../functions/addressbook.php');
require_once('../functions/plugin.php');
-include_once('../functions/strings.php');
+require_once('../functions/strings.php');
/* Insert hidden data */
function addr_insert_hidden() {
$identity;
echo '<input type=hidden value="';
- if (substr($body, 0, 1) == "\r")
+ if (substr($body, 0, 1) == "\r") {
echo "\n";
+ }
echo htmlspecialchars($body) . '" name=body>' . "\n" .
'<input type=hidden value="' . htmlspecialchars($subject) .
'" name=subject>' . "\n" .
if ($line % 2) { echo ' bgcolor="' . $color[0] . '"'; }
echo ' nowrap><td nowrap align=center width="5%">' .
'<input type=checkbox name="send_to_search[T' . $line . ']" value = "' .
- htmlspecialchars($row['email']) . '"> To ' .
+ htmlspecialchars($row['email']) . '"> ' . _("To") . ' ' .
'<input type=checkbox name="send_to_search[C' . $line . ']" value = "' .
- htmlspecialchars($row['email']) . '"> Cc ' .
+ htmlspecialchars($row['email']) . '"> ' . _("Cc") . ' ' .
'<input type=checkbox name="send_to_search[B' . $line . ']" value = "' .
- htmlspecialchars($row['email']) . '"> Bcc ' .
+ htmlspecialchars($row['email']) . '"> ' . _("Bcc") . ' ' .
'</td><td nowrap> ' . $row['name'] . ' </td>' .
'<td nowrap> ' . $row['email'] . ' </td>' .
'<td nowrap> ' . $row['label'] . ' </td>';
/* --- End functions --- */
global $mailbox;
-displayPageHeader($color, $mailbox);
-
+if ($compose_new_win == '1') {
+ compose_Header($color, $mailbox);
+}
+else {
+ displayPageHeader($color, $mailbox);
+}
/* Initialize addressbook */
$abook = addressbook_init();
/* End search form */
/* Show personal addressbook */
-if ($addrquery == '' || !empty($listall)) {
+
+if ( !empty( $listall ) ){
+ $addrquery = '*';
+}
+
+if ($addrquery == '' && empty($listall)) {
if (! isset($backend) || $backend != -1 || $addrquery == '') {
if ($addrquery == '') {
addr_display_result($res, true);
}
exit;
-
-} else {
+}
+else {
/* Do the search */
- if (!empty($addrquery) && empty($listall)) {
+ if (!empty($addrquery)) {
if ($backend == -1) {
$res = $abook->s_search($addrquery);