" -> '

[squirrelmail.git] / src / addrbook_search_html.php

diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index 63b3e4daa960e4bc27bbcb38474236c3d3f36163..abe09e9f68ffcdcbf8cdb7fdd4d30e62ea469d12 100644 (file)
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -16,18 +16,17 @@
     **  $Id$
     **/
 
-   include('../src/validate.php');
-   include('../functions/page_header.php');
-   include('../functions/date.php');
-   include('../functions/smtp.php');
-   include('../functions/display_messages.php');
-   include('../functions/addressbook.php');
-   include('../functions/plugin.php');
-   include('../src/load_prefs.php');
+   require_once('../src/validate.php');
+   require_once('../functions/date.php');
+   require_once('../functions/smtp.php');
+   require_once('../functions/display_messages.php');
+   require_once('../functions/addressbook.php');
+   require_once('../functions/plugin.php');
 
    // Insert hidden data
    function addr_insert_hidden() {
-      global $body, $subject, $send_to, $send_to_cc, $send_to_bcc;
+      global $body, $subject, $send_to, $send_to_cc, $send_to_bcc, $mailbox,
+         $identity;
       
       echo '<input type=hidden value="';
       if (substr($body, 0, 1) == "\r")
@@ -41,6 +40,10 @@
           . '" name=send_to_cc>' . "\n";
       echo "<input type=hidden value=\"" . htmlspecialchars($send_to_bcc)
           . '" name=send_to_bcc>' . "\n";
+      echo "<input type=hidden value=\"" . htmlspecialchars($identity)
+          . '" name=identity>' . "\n";
+      echo "<input type=hidden name=mailbox value=\"" .
+          htmlspecialchars($mailbox) . "\">\n";
       echo "<input type=hidden value=\"true\" name=from_htmladdr_search>\n";
    }
 
@@ -97,7 +100,8 @@
 
    // --- End functions ---
 
-   displayPageHeader($color, 'None');
+   global $mailbox;
+   displayPageHeader($color, $mailbox);
    
    // Initialize addressbook
    $abook = addressbook_init();