Logging of SMTP (PHPMailer) class errors added, old lost removed

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 278c570375f636a7c09022d03a7fcadb2c1d0c32..eb0ba63455b268642061309e2d03b24b16963fac 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -599,13 +599,13 @@ Message : ' . htmlentities(utf8_decode($message)) . '
 </pre>');
        } elseif (($isHtml == 'Y') && (isExtensionActive('html_mail'))) {
                // Send mail as HTML away
-               sendHtmlEmail($toEmail, $subject, $message, $mailHeader);
+               return sendHtmlEmail($toEmail, $subject, $message, $mailHeader);
        } elseif (!empty($toEmail)) {
                // Send Mail away
-               sendRawEmail($toEmail, $subject, $message, $mailHeader);
+               return sendRawEmail($toEmail, $subject, $message, $mailHeader);
        } elseif ($isHtml != 'Y') {
                // Problem found!
-               sendRawEmail(getConfig('WEBMASTER'), '[PROBLEM:]' . $subject, $message, $mailHeader);
+               return sendRawEmail(getConfig('WEBMASTER'), '[PROBLEM:]' . $subject, $message, $mailHeader);
        }
 }
 
@@ -634,7 +634,7 @@ function sendRawEmail ($toEmail, $subject, $message, $from) {
                $mail = new PHPMailer();
 
                // Set charset to UTF-8
-               $mail->CharSet('UTF-8');
+               $mail->CharSet = 'UTF-8';
 
                // Path for PHPMailer
                $mail->PluginDir  = sprintf("%sinc/phpmailer/", getConfig('PATH'));
@@ -665,9 +665,21 @@ function sendRawEmail ($toEmail, $subject, $message, $from) {
                $mail->AddCustomHeader('Errors-To:' . getConfig('WEBMASTER'));
                $mail->AddCustomHeader('X-Loop:' . getConfig('WEBMASTER'));
                $mail->Send();
+
+               // Has an error occured?
+               if (!empty($mail->ErrorInfo)) {
+                       // Log message
+                       logDebugMessage(__FUNCTION__, __LINE__, 'Error while sending mail: ' . $mail->ErrorInfo);
+
+                       // Raise an error
+                       return false;
+               } else {
+                       // All fine!
+                       return true;
+               }
        } else {
                // Use legacy mail() command
-               mail($toEmail, $subject, decodeEntities($message), $from);
+               return mail($toEmail, $subject, decodeEntities($message), $from);
        }
 }
 
@@ -1837,14 +1849,26 @@ function sendRawRequest ($host, $request) {
                $useProxy = true;
        } // END - if
 
+       // Load include
+       loadIncludeOnce('inc/classes/resolver.class.php');
+
+       // Get resolver instance
+       $resolver = new HostnameResolver();
+
        // Open connection
        //* DEBUG: */ die("SCRIPT=" . $script.'<br />');
        if ($useProxy === true) {
+               // Resolve hostname into IP address
+               $ip = $resolver->resolveHostname(compileRawCode(getConfig('proxy_host')));
+
                // Connect to host through proxy connection
-               $fp = fsockopen(compileRawCode(getConfig('proxy_host')), bigintval(getConfig('proxy_port')), $errno, $errdesc, 30);
+               $fp = fsockopen($ip, bigintval(getConfig('proxy_port')), $errno, $errdesc, 30);
        } else {
+               // Resolve hostname into IP address
+               $ip = $resolver->resolveHostname($host);
+
                // Connect to host directly
-               $fp = fsockopen($host, 80, $errno, $errdesc, 30);
+               $fp = fsockopen($ip, 80, $errno, $errdesc, 30);
        }
 
        // Is there a link?
@@ -1860,35 +1884,13 @@ function sendRawRequest ($host, $request) {
 
        // Do we use proxy?
        if ($useProxy === true) {
-               // Generate CONNECT request header
-               $proxyTunnel  = 'CONNECT ' . $host . ':80 HTTP/1.1' . getConfig('HTTP_EOL');
-               $proxyTunnel .= 'Host: ' . $host . getConfig('HTTP_EOL');
-
-               // Use login data to proxy? (username at least!)
-               if (getConfig('proxy_username') != '') {
-                       // Add it as well
-                       $encodedAuth = base64_encode(compileRawCode(getConfig('proxy_username')) . ':' . compileRawCode(getConfig('proxy_password')));
-                       $proxyTunnel .= 'Proxy-Authorization: Basic ' . $encodedAuth . getConfig('HTTP_EOL');
-               } // END - if
-
-               // Add last new-line
-               $proxyTunnel .= getConfig('HTTP_EOL');
-               //* DEBUG: */ print('<strong>proxyTunnel=</strong><pre>' . $proxyTunnel.'</pre>');
-
-               // Write request
-               fwrite($fp, $proxyTunnel);
-
-               // Got response?
-               if (feof($fp)) {
-                       // No response received
-                       return $response;
-               } // END - if
+               // Setup proxy tunnel
+               $response = setupProxyTunnel($host, $fp);
 
-               // Read the first line
-               $resp = trim(fgets($fp, 10240));
-               $respArray = explode(' ', $resp);
-               if ((strtolower($respArray[0]) !== 'http/1.0') || ($respArray[1] != '200')) {
+               // If the response is invalid, abort
+               if ((count($response) == 3) && (empty($response[0])) && (empty($response[1])) && (empty($response[2]))) {
                        // Invalid response!
+                       logDebugMessage(__FUNCTION__, __LINE__, 'Proxy tunnel not working?');
                        return $response;
                } // END - if
        } // END - if
@@ -1935,7 +1937,7 @@ function sendRawRequest ($host, $request) {
        // Time request if debug-mode is enabled
        if (isDebugModeEnabled()) {
                // Add debug message...
-               logDebugMessage(__FUNCTION__, __LINE__, 'Request took ' . (microtime(true) - $start) . ' seconds.');
+               logDebugMessage(__FUNCTION__, __LINE__, 'Request took ' . (microtime(true) - $start) . ' seconds and returned ' . count($response) . ' line(s).');
        } // END - if
 
        // Skip first empty lines
@@ -1961,6 +1963,7 @@ function sendRawRequest ($host, $request) {
        if (!isset($response[0])) {
                // No response, maybe timeout
                $response = array('', '', '');
+               logDebugMessage(__FUNCTION__, __LINE__, 'Invalid empty response array, maybe timed out?');
        } elseif ((substr(strtolower($response[0]), 0, 11) == 'proxy-agent') && ($useProxy === true)) {
                // Proxy header detected, so remove two lines
                array_shift($response);
@@ -1970,6 +1973,7 @@ function sendRawRequest ($host, $request) {
        // Was the request successfull?
        if ((!isInStringIgnoreCase('200 OK', $response[0])) || (empty($response[0]))) {
                // Not found / access forbidden
+               logDebugMessage(__FUNCTION__, __LINE__, 'Unexpected status code ' . $response[0] . ' detected. "200 OK" was expected.');
                $response = array('', '', '');
        } // END - if
 
@@ -1977,6 +1981,47 @@ function sendRawRequest ($host, $request) {
        return $response;
 }
 
+// Sets up a proxy tunnel for given hostname and through resource
+function setupProxyTunnel ($host, $resource) {
+       // Initialize array
+       $response = array('', '', '');
+
+       // Generate CONNECT request header
+       $proxyTunnel  = 'CONNECT ' . $host . ':80 HTTP/1.1' . getConfig('HTTP_EOL');
+       $proxyTunnel .= 'Host: ' . $host . getConfig('HTTP_EOL');
+
+       // Use login data to proxy? (username at least!)
+       if (getConfig('proxy_username') != '') {
+               // Add it as well
+               $encodedAuth = base64_encode(compileRawCode(getConfig('proxy_username')) . ':' . compileRawCode(getConfig('proxy_password')));
+               $proxyTunnel .= 'Proxy-Authorization: Basic ' . $encodedAuth . getConfig('HTTP_EOL');
+       } // END - if
+
+       // Add last new-line
+       $proxyTunnel .= getConfig('HTTP_EOL');
+       //* DEBUG: */ print('<strong>proxyTunnel=</strong><pre>' . $proxyTunnel.'</pre>');
+
+       // Write request
+       fwrite($fp, $proxyTunnel);
+
+       // Got response?
+       if (feof($fp)) {
+               // No response received
+               return $response;
+       } // END - if
+
+       // Read the first line
+       $resp = trim(fgets($fp, 10240));
+       $respArray = explode(' ', $resp);
+       if ((strtolower($respArray[0]) !== 'http/1.0') || ($respArray[1] != '200')) {
+               // Invalid response!
+               return $response;
+       } // END - if
+
+       // All fine!
+       return $respArray;
+}
+
 // Taken from www.php.net isInStringIgnoreCase() user comments
 function isEmailValid ($email) {
        // Check first part of email address