Changeset 1017

Timestamp:

04/10/06 14:57:34 (7 years ago)

Author:

dana

Message:

Added PHPMailer libraries into /include
Updated Mail.php to make use of PHPMailer library to enable configuration of how email is sent (SMTP, Auth, etc).
Added 5 settings to config.php to enable configuration of PHPMailer

Location:

trunk/wifidog-auth/wifidog

Files:

• classes/Mail.php (modified) (2 diffs)
• config.php (modified) (1 diff)
• include/class.phpmailer.php (added)
• include/class.smtp.php (added)

trunk/wifidog-auth/wifidog/classes/Mail.php

@@ -50 +50 @@
  * @copyright  2005-2006 Francois Proulx, Technologies Coeus inc.
  */
+
+require_once('include/class.phpmailer.php');
+require_once('include/class.smtp.php');
+
 class Mail
 {
@@ -308 +312 @@
         public function send()
         {
-        if ($this->getRecipientName() != "") {
-            $headers  = "To: \"" . $this->getRecipientName() . "\" <" . $this->getRecipientEmail() . ">\r\n";
-            }
-
-                $headers  = "From: \"" . $this->getSenderName() . "\" <" . $this->getSenderEmail() . ">\r\n";
-                $headers .= "Reply-To: " . $this->getSenderEmail() . "\r\n";
-                $headers .= "Content-Type: text/plain; charset=utf-8";
-
-                if (defined("WIFIDOG_NAME")) {
-                  $headers .= "\r\n" . "X-Mailer: " . WIFIDOG_NAME . defined("WIFIDOG_VERSION") ? "/" . WIFIDOG_VERSION : "";
-                }
-
-                $args = "-f" . $this->getSenderEmail();
-
-                return mail($this->getRecipientEmail(), $this->getMessageSubject(), $this->getMessageBody(), $headers, $args);
+        $mail = new PHPMailer();
+        $mail->CharSet = "utf-8";
+        
+        $mail->Mailer = EMAIL_MAILER;        
+        if (EMAIL_MAILER == 'smtp') {
+            $mail->Host = EMAIL_HOST;
+            $mail->SMTPAuth = EMAIL_AUTH;
+
+            if (EMAIL_AUTH) {
+                $mail->Username = EMAIL_USERNAME;
+                $mail->Password = EMAIL_PASSWORD;
+            }
+        }
+        
+        $mail->AddAddress($this->getRecipientEmail(), $this->getRecipientName());
+        $mail->From = $this->getSenderEmail();
+        $mail->FromName = $this->getSenderName();
+        $mail->Sender = $this->getSenderEmail(); // add Sender Name
+        $mail->Subject = $this->getMessageSubject();
+        $mail->Body = $this->getMessageBody();
+
+        $result = $mail->Send();
+        if (!$result) {
+            print $mail->ErrorInfo;
+        }
+        return $result;
         }
 

trunk/wifidog-auth/wifidog/config.php

@@ -323 +323 @@
 // define('WIFIDOG_LOGFILE', 'tmp/wifidog.log');
 
+ /**
+  * Email configuration
+  * ===============================
+  *
+  * Internal configuration values for WiFiDog - don't touch!
+  */
+
+define('EMAIL_MAILER', 'mail'); // "mail", "sendmail", or "smtp"
+  
+// Valid only for SMTP
+define('EMAIL_HOST', '');
+define('EMAIL_AUTH', false);
+
+// Valid if EMAIL_AUTH is true
+define('EMAIL_USERNAME', '');
+define('EMAIL_PASSWORD', '');
+
 /**
  * In case this is the local.config.php you should remove the next lines.