Emails!! go to /massemail as an admin.

1 files changed, 12 insertions, 6 deletions

diff --git a/includes/emails.php b/includes/emails.php
index c971f25..182749c 100644
--- a/includes/emails.php
+++ b/includes/emails.php
@@ -2,17 +2,16 @@
 /*

  * Email methods; QueueEmail and SendQueuedEmail

 */

-

+include_once('sqli.php');

 //Email sending lock

 define('FILE_EMAIL_LOCK', './emailLockFile');

 

-

 //Returns false if nothing is sent.

 function SendQueuedEmail() {

+	global $mysqli;

 	//Delay by x seconds per email:

 	$delay = 10;

-	require('sqli.php');

-	

+

 	$lock = acquireEmailLock();

 	try

 	{

@@ -57,6 +56,12 @@ function SendQueuedEmail() {
 		$subject = $response['subject'];

 		$body = $response['body'];

 		

+		$success = SendEmail($body, $subject, $to);

+		if (!$success) {

+			$res = $mysqli->query("DELETE FROM `emailQueue` WHERE `ID` = $emailID");

+			$res = $mysqli->query("UPDATE `emails` SET `error` = 'Failed to send' WHERE `ID` = $emailID");

+			return false;

+		}

 		

 		//I declare this letter sent!

 		$res = $mysqli->query("DELETE FROM `emailQueue` WHERE `ID` = $emailID");

@@ -69,14 +74,15 @@ function SendQueuedEmail() {
 	releaseEmailLock($lock);

 	

 	//TODO  !!

-	echo "<br>I DIDN'T SEND THIS: ($body, $subject, $to)<br>";

+	//echo "<br>I DIDN'T SEND THIS: ($body, $subject, $to)<br>";

+	//SendEmail($body, $subject, "snapwilliam@gmail.com");

 	//SendEmail($body, $subject, $to);

 	

 	return true;

 }

 

 function QueueEmail($fromUserID, $to, $subject, $body, $priority = 100, $fromServer = false) {

-	require('sqli.php');

+	global $mysqli;

 

 	//TODO !! allow a way for users to refer-friends via email. Here.

 	if ($fromServer == false) {