Changeset 38 for trunk/lib

Timestamp:

Dec 15, 2005 1:28:09 AM (19 years ago)

Author:

scdev

Message:

added extra headers option to Email:: and fixed confusion over \r\n

Location:

trunk/lib

Files:

• App.inc.php (modified) (1 diff)
• Email.inc.php (modified) (6 diffs)
• MCVE.inc.php (modified) (1 diff)

trunk/lib/App.inc.php

@@ -1003 +1003 @@
         }
         
-        if ('on' != getenv('HTTPS') && $this->getParam('ssl_enabled') && preg_match('/mod_ssl/i', getenv('SERVER_SOFTWARE'))) {
+        if (function_exists('apache_get_modules')) {
+            $modules = apache_get_modules();
+        } else {
+            // It's safe to assume we have mod_ssl if we can't determine otherwise.
+            $modules = array('mod_ssl');
+        }
+        
+        if ('on' != getenv('HTTPS') && $this->getParam('ssl_enabled') && in_array('mod_ssl', $modules)) {
             $this->raiseMsg(sprintf(_("Secure SSL connection made to %s"), $this->getParam('ssl_domain')), MSG_NOTICE, __FILE__, __LINE__);
             // Always append session because some browsers do not send cookie when crossing to SSL URL.

trunk/lib/Email.inc.php

@@ -36 +36 @@
         'from' => null,
         'subject' => null,
+        'headers' => null,
         'regex' => null
     );
@@ -207 +208 @@
      * @since   28 Nov 2005 12:56:09
      */
-    function send($to=null, $from=null, $subject=null)
+    function send($to=null, $from=null, $subject=null, $headers=null)
     {
         // Use arguments if provided.
@@ -219 +220 @@
              $this->setParam(array('subject' => $subject));
         }
+        if (isset($headers)) {
+             $this->setParam(array('headers' => $headers));
+        }
 
         // Ensure required values exist.
@@ -248 +252 @@
         
         // From headers are custom headers.
-        $headers = sprintf("From: %s\r\n\r\n", $this->_params['from']); 
+        $headers = array('From' => $this->_params['from']);
+
+        // Additional headers.
+        if (isset($this->_params['headers']) && is_array($this->_params['headers'])) {
+            $headers = array_merge($this->_params['headers'], $headers);
+        }
+        
+        // Process headers.
+        $final_headers = array();
+        foreach ($headers as $key => $val) {
+            $final_headers[] = sprintf('%s: %s', $key, $val);
+        }
+        $final_headers = join("\r\n", $final_headers);
         
         // This is the address where delivery problems are sent to. We must strip off everything except the local@domain part.
@@ -254 +270 @@
         
         // Check for mail header injection attacks.
-        $full_mail_content = join("\n", array($final_to, $this->_params['subject'], $final_body, $headers, $envelope_sender_header));
+        $full_mail_content = join("\n", array($final_to, $this->_params['subject'], $final_body, $final_headers, $envelope_sender_header));
         if (preg_match("/(Content-Type:|MIME-Version:|Content-Transfer-Encoding:|[\n\r]Bcc:|[\n\r]Cc:)/i", $full_mail_content)) {
             App::logMsg(sprintf('Mail header injection attack in content: %s', $full_mail_content), LOG_WARNING, __FILE__, __LINE__);
@@ -262 +278 @@
 
         // Ensure message was successfully accepted for delivery.
-        if (!mail($final_to, $this->_params['subject'], $final_body, $headers, $envelope_sender_header)) {
-            App::logMsg(sprintf('Email failure with parameters: %s, %s, %s, %s', $this->_params['to'], $this->_params['subject'], str_replace("\r\n", '', $headers), $envelope_sender_header), LOG_NOTICE, __FILE__, __LINE__);
+        if (!mail($final_to, $this->_params['subject'], $final_body, $final_headers, $envelope_sender_header)) {
+            App::logMsg(sprintf('Email failure with parameters: %s, %s, %s, %s', $this->_params['to'], $this->_params['subject'], str_replace("\r\n", '', $final_headers), $envelope_sender_header), LOG_NOTICE, __FILE__, __LINE__);
             return false;
         }

trunk/lib/MCVE.inc.php

@@ -26 +26 @@
             trigger_error('MCVE class instantiation failed: MCVE extension not available.', E_USER_WARNING);
             die;
+        }
+        if ('' == $username || '' == $password) {
+            App::logMsg(sprintf('Empty username or password provided.', null), LOG_ERR, __FILE__, __LINE__);
         }
         $this->username = $username;