Changeset 454 for trunk/lib/Email.inc.php

Timestamp:

Jan 4, 2014 3:25:57 AM (10 years ago)

Author:

anonymous

Message:

Improved the truncate() function.

File:

• trunk/lib/Email.inc.php (modified) (16 diffs)

trunk/lib/Email.inc.php

@@ -4 +4 @@
  * For details visit the project site: <http://trac.strangecode.com/codebase/>
  * Copyright 2001-2012 Strangecode, LLC
- * 
+ *
  * This file is part of The Strangecode Codebase.
  *
@@ -11 +11 @@
  * Free Software Foundation, either version 3 of the License, or (at your option)
  * any later version.
- * 
+ *
  * The Strangecode Codebase is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along with
  * The Strangecode Codebase. If not, see <http://www.gnu.org/licenses/>.
@@ -28 +28 @@
  * @author  Quinn Comendant <quinn@strangecode.com>
  * @version 1.0
- * 
- 
+ *
+
 // Example.
 $email = new Email(array(
@@ -50 +50 @@
 }
 
- * 
+ *
  */
 class Email {
@@ -61 +61 @@
         'headers' => null,
         'regex' => null,
-        
+
         // A single carriage return (\n) should terminate lines for locally injected mail.
         // A carriage return + line-feed (\r\n) should be used if sending mail directly with SMTP.
         'crlf' => "\n",
-        
+
         // RFC 2822 says line length MUST be no more than 998 characters, and SHOULD be no more than 78 characters, excluding the CRLF.
         // http://mailformat.dan.info/body/linelength.html
@@ -120 +120 @@
     {
         $app =& App::getInstance();
-    
+
         if (isset($params) && is_array($params)) {
             // Enforce valid email addresses.
@@ -147 +147 @@
     {
         $app =& App::getInstance();
-    
+
         if (isset($this->_params[$param])) {
             return $this->_params[$param];
@@ -167 +167 @@
     {
         $app =& App::getInstance();
-    
+
         // Load file, using include_path.
         if (!$this->_template = file_get_contents($template, true)) {
@@ -191 +191 @@
     {
         $app =& App::getInstance();
-    
+
         if ('' == trim($string)) {
             $app->logMsg(sprintf('Empty string provided.', null), LOG_ERR, __FILE__, __LINE__);
@@ -215 +215 @@
     {
         $app =& App::getInstance();
-    
+
         // Ensure template exists.
         if (!isset($this->_template)) {
@@ -285 +285 @@
         $final_body = isset($this->_template_replaced) ? $this->_template_replaced : $this->_template;
         if (false !== $this->getParam('wrap')) {
-            $final_body = wordwrap($final_body, $this->getParam('line_length'), $this->getParam('crlf'));            
+            $final_body = wordwrap($final_body, $this->getParam('line_length'), $this->getParam('crlf'));
         }
 
@@ -320 +320 @@
             $envelope_sender_header = sprintf('-f %s', $envelope_sender_address);
         } else {
-            $envelope_sender_header = '';            
+            $envelope_sender_header = '';
         }
 
@@ -331 +331 @@
         }
 
-        // Send email without 5th parameter if safemode is enabled. 
+        // Send email without 5th parameter if safemode is enabled.
         if (ini_get('safe_mode')) {
             $ret = mb_send_mail($final_to, $this->_params['subject'], $final_body, $final_headers);
@@ -337 +337 @@
             $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) {
@@ -345 +345 @@
             $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;
-        } 
+        }
     }
 
@@ -366 +366 @@
     {
         $app =& App::getInstance();
-    
+
         // If an array, check values recursively.
         if (is_array($email)) {