Stanislav Yordanov

[squirrelmail.git] / plugins / abook_take / setup.php

diff --git a/plugins/abook_take/setup.php b/plugins/abook_take/setup.php
index 2f45a70470b0225001cc47897b65eaa0a0043a37..dd36b66235204b93eb65e157f2819c66c811b1e8 100755 (executable)
--- a/plugins/abook_take/setup.php
+++ b/plugins/abook_take/setup.php
@@ -1,7 +1,12 @@
 <?php
 
-   require_once('../functions/url_parser.php');
+/* Path for SquirrelMail required files. */
+if (!defined('SM_PATH'))  {
+       define('SM_PATH','../../');
+}
 
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'functions/url_parser.php');
 
 /* Address Take -- steals addresses from incoming email messages.  Searches
    the To, Cc, From and Reply-To headers, also searches the body of the
@@ -58,7 +63,7 @@ function abook_take_read_array($array)
   $i = 0;
   while ($i < count($array))
   {
-    abook_take_read_string($array[$i]);
+    abook_take_read_string($array[$i]->getAddress());
     $i ++;
   }
 }
@@ -80,10 +85,14 @@ function abook_take_read()
                   html_tag( 'tr' ) .
                       html_tag( 'td' );
 
-              abook_take_read_string($message->header->from);
-              abook_take_read_array($message->header->cc);
-              abook_take_read_array($message->header->reply_to);
-              abook_take_read_array($message->header->to);
+              if (isset($message->rfc822_header->from))
+                  abook_take_read_array($message->rfc822_header->from);
+              if (isset($message->rfc822_header->cc))
+                  abook_take_read_array($message->rfc822_header->cc);
+              if (isset($message->rfc822_header->reply_to))
+                  abook_take_read_array($message->rfc822_header->reply_to);
+              if (isset($message->rfc822_header->to))
+                  abook_take_read_array($message->rfc822_header->to);
 
 
               $new_body = $body;