[Phpgroupware-cvs] [19077] Allow to send an email correctly

[Caeies]

Revision: 19077
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=19077
Author:   Caeies
Date:     2009-02-18 17:10:46 +0000 (Wed, 18 Feb 2009)

Log Message:
-----------
Allow to send an email correctly

Modified Paths:
--------------
    core/trunk/email/inc/class.bosend.inc.php

Modified: core/trunk/email/inc/class.bosend.inc.php
===================================================================
--- core/trunk/email/inc/class.bosend.inc.php   2009-02-16 10:38:43 UTC (rev 
19076)
+++ core/trunk/email/inc/class.bosend.inc.php   2009-02-18 17:10:46 UTC (rev 
19077)
@@ -71,16 +71,18 @@
                */
                function get_originating_ip()
                {
-                       $got_ip = '';
+                       $got_ip = phpgw::get_var('HTTP_X_FORWARDED_FOR', 'ip', 
'SERVER', phpgw::get_var('REMOTE_ADDR', 'ip', 'SERVER'));
+                       /* XXX Caeies 02/09, old code
                        if (is_object($GLOBALS['phpgw']->session))
                        {
-                               $got_ip = 
$GLOBALS['phpgw']->session->getuser_ip();
+                                       //XXX Caeies 02/09 This method is now 
protected ...
+                                       //$got_ip = 
$GLOBALS['phpgw']->session->_get_user_ip();
                        }
                        elseif (isset($_SERVER['REMOTE_ADDR']))
                        {
                                $got_ip = $_SERVER['REMOTE_ADDR'];
                        }
-                       
+                       */
                        // did we get anything useful ?
                        if (trim((string)$got_ip) == '')
                        {
@@ -365,6 +367,7 @@
                        
                        if ($returnccode)
                        {
+                               /* XXX Caeies 02/09 This is old legacy code ... 
what to do with it ?
                                // Success
                                if ($GLOBALS['phpgw']->mail_send->trace_flag > 
0)
                                {
@@ -380,7 +383,7 @@
                                        echo '</body></html>';
                                        $this->send_message_cleanup();
                                }
-                               else
+                               else*/
                                {
                                        // unset some vars (is this necessary?)
                                        $this->send_message_cleanup();
@@ -506,7 +509,7 @@
                        i.e. with NO ENCODED HTML ENTITIES, so use > instead of 
$rt; and " instead of &quot; . etc...
                        it's up to the endusers MUA to handle any 
htmlspecialchars, whether to encode them or leave as it, the MUA should decide 
                        */
-                       $body = 
$GLOBALS['phpgw']->msg->htmlspecialchars_decode($body);
+                       $this->smtp->Body = 
$GLOBALS['phpgw']->msg->htmlspecialchars_decode($this->smtp->Body);
                        
                        // ----  Add Email Sig to Body   -----
                        if 
(($GLOBALS['phpgw']->msg->get_isset_pref('email_sig'))
@@ -520,7 +523,7 @@
                                $user_sig = 
$GLOBALS['phpgw']->msg->get_pref_value('email_sig');
                                // html_quotes_decode may be obsoleted someday: 
 workaround for a preferences database issue (<=pgpgw ver 0.9.13)
                                $user_sig = 
$GLOBALS['phpgw']->msg->html_quotes_decode($user_sig);
-                               $body = $body."\r\n"
+                               $this->smtp->Body = $this->smtp->Body."\r\n"
                                                ."\r\n"
                                                .'-- '."\r\n" 
                                                .$user_sig ."\r\n";