From fa125bd7bb8dd8cacfd996c974810f57318323c9 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Thu, 7 Aug 2008 20:05:26 +0000
Subject: Central: Tweaked the mailing system

---
 central/trunk/instadisc.php                  |  5 +++--
 central/trunk/language/phpmailer.lang-en.php | 25 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 central/trunk/language/phpmailer.lang-en.php

(limited to 'central/trunk')

diff --git a/central/trunk/instadisc.php b/central/trunk/instadisc.php
index c671316..34bf74e 100644
--- a/central/trunk/instadisc.php
+++ b/central/trunk/instadisc.php
@@ -163,7 +163,7 @@ function instaDisc_phpMailer()
 		$mail->Username = instaDisc_getConfig('smtpUser');
 		$mail->Password = instaDisc_getConfig('smtpPass');
 	}
-	$mail->Helo = $_SERVER['HTTP_HOST'];
+	$mail->Helo = $_SERVER['SERVER_NAME'];
 	$mail->ClearAddresses();
 
 	return $mail;
@@ -181,7 +181,8 @@ function instaDisc_sendActivationEmail($username, $password, $email)
 	$mail->Subject = 'InstaDisc Account Verification';
 	$mail->Body = "Hello, someone has recently registered an account at " . $_SERVER['HTTP_HOST'] . " with your email address. If that was you, and your chosen username IS " . $username . ", then copy the account verification code below to our Account Verification page, enter your username and press Activate!\r\n\r\n" . $penKey . "\r\n\r\nIf that was not you, copy the above code to our Account Verification page, enter the above username, and click Delete.";
 
-	return $mail->Send();
+	$mail->Send();
+	return ($mail->IsError() ? $mail->ErrorInfo : true); //$mail->Send();
 }
 
 function instaDisc_activateAccount($username, $penKey)
diff --git a/central/trunk/language/phpmailer.lang-en.php b/central/trunk/language/phpmailer.lang-en.php
new file mode 100644
index 0000000..f7d4286
--- /dev/null
+++ b/central/trunk/language/phpmailer.lang-en.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * PHPMailer language file.
+ * English Version
+ */
+
+$PHPMAILER_LANG = array();
+
+$PHPMAILER_LANG["provide_address"]      = 'You must provide at least one ' .
+                                          'recipient email address.';
+$PHPMAILER_LANG["mailer_not_supported"] = ' mailer is not supported.';
+$PHPMAILER_LANG["execute"]              = 'Could not execute: ';
+$PHPMAILER_LANG["instantiate"]          = 'Could not instantiate mail function.';
+$PHPMAILER_LANG["authenticate"]         = 'SMTP Error: Could not authenticate.';
+$PHPMAILER_LANG["from_failed"]          = 'The following From address failed: ';
+$PHPMAILER_LANG["recipients_failed"]    = 'SMTP Error: The following ' .
+                                          'recipients failed: ';
+$PHPMAILER_LANG["data_not_accepted"]    = 'SMTP Error: Data not accepted.';
+$PHPMAILER_LANG["connect_host"]         = 'SMTP Error: Could not connect to SMTP host.';
+$PHPMAILER_LANG["file_access"]          = 'Could not access file: ';
+$PHPMAILER_LANG["file_open"]            = 'File Error: Could not open file: ';
+$PHPMAILER_LANG["encoding"]             = 'Unknown encoding: ';
+$PHPMAILER_LANG["signing"]              = 'Signing Error: ';
+
+?>
-- 
cgit 1.4.1