Changeset 346 for trunk/lib

Timestamp:

Mar 3, 2009 1:20:34 AM (15 years ago)

Author:

dan

Message:

Cleaned up recent changes.

File:

• trunk/lib/Email.inc.php (modified) (1 diff)

trunk/lib/Email.inc.php

@@ -308 +308 @@
             return false;
         }
-    
+
+        // Send email without 5th parameter if safemode is enabled. 
         if (ini_get('safe_mode')) {
-            // Ensure message was successfully accepted for delivery.
-            if (mb_send_mail($final_to, $this->_params['subject'], $final_body, $final_headers)) {
-                $app->logMsg(sprintf('Email successfully sent to %s', $final_to), LOG_INFO, __FILE__, __LINE__);
-                return true;
-            } else {
-                $app->logMsg(sprintf('Email failure with parameters: %s, %s, %s, %s', $final_to, $this->_params['subject'], str_replace("\r\n", '\r\n', $final_headers), $envelope_sender_header), LOG_NOTICE, __FILE__, __LINE__);
-                return false;
-            }
-    } else {
-            // Ensure message was successfully accepted for delivery.
-            if (mb_send_mail($final_to, $this->_params['subject'], $final_body, $final_headers, $envelope_sender_header)) {
-                $app->logMsg(sprintf('Email successfully sent to %s', $final_to), LOG_INFO, __FILE__, __LINE__);
-                return true;
-            } else {
-                $app->logMsg(sprintf('Email failure with parameters: %s, %s, %s, %s', $final_to, $this->_params['subject'], str_replace("\r\n", '\r\n', $final_headers), $envelope_sender_header), LOG_NOTICE, __FILE__, __LINE__);
-                return false;
-            }
-    }
+            $ret = mb_send_mail($final_to, $this->_params['subject'], $final_body, $final_headers);
+        } else {
+`           $ret = mb_send_mail($final_to, $this->_params['subject'], $final_body, $final_headers, $envelope_sender_header);
+        }
+        // Ensure message was successfully accepted for delivery.
+        if ($ret) {
+            $app->logMsg(sprintf('Email successfully sent to %s', $final_to), LOG_INFO, __FILE__, __LINE__);
+            return true;
+        } else {
+            $app->logMsg(sprintf('Email failure with parameters: %s, %s, %s, %s', $final_to, $this->_params['subject'], str_replace("\r\n", '\r\n', $final_headers), $envelope_sender_header), LOG_NOTICE, __FILE__, __LINE__);
+            return false;
+        }
         
     }