Index: trunk/kernel/include/emailmessage.php =================================================================== diff -u -r3145 -r3282 --- trunk/kernel/include/emailmessage.php (.../emailmessage.php) (revision 3145) +++ trunk/kernel/include/emailmessage.php (.../emailmessage.php) (revision 3282) @@ -191,7 +191,7 @@ $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,$body,"",$charset, $this->Get("Event"),NULL,$this->headers); } - /*$time = time(); + /*$time = adodb_mktime(); $sql = "INSERT INTO ".GetTablePrefix()."EmailLog VALUES ('', '$FromName', '$To', '$subject', $time, '')"; $conn->Execute($sql); */ @@ -251,7 +251,7 @@ $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,$body,"",$charset, $this->Get("Event"),NULL,$this->headers); } - /*$time = time(); + /*$time = adodb_mktime(); $sql = "INSERT INTO ".GetTablePrefix()."EmailLog VALUES ('', '$FromName', '$To ($to_addr)', '$subject', $time, '')"; $conn->Execute($sql); */ @@ -298,7 +298,7 @@ $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,$body,"",$charset, $this->Get("Event"),NULL,$this->headers); } - /* $time = time(); + /* $time = adodb_mktime(); $sql = "INSERT INTO ".GetTablePrefix()."EmailLog VALUES ('', '$FromName', '$To ($to_addr)', '$subject', $time, '')"; $conn->Execute($sql); @@ -723,14 +723,14 @@ $this->MessagesSent++; - $time = time(); + $time = adodb_mktime(); $conn = &GetADODBConnection(); /* $sql = "INSERT INTO ".GetTablePrefix()."EmailLog VALUES ('', '".htmlspecialchars($From)."', '".htmlspecialchars($To)."', '$Subject', $time, '')"; $conn->Execute($sql);*/ /* ensure headers are using \r\n instead of \n */ - $headers = "Date: ".date("r")."\n".$headers; + $headers = "Date: ".adodb_date("r")."\n".$headers; $headers = "Return-Path: ".$objConfig->Get("Smtp_AdminMailFrom")."\n".$headers; $headers = str_replace("\n\n","\r\n\r\n",$headers); @@ -884,7 +884,7 @@ $headers .= "MIME-Version: 1.0\r\n"; $conn = &GetADODBConnection(); - $time = time(); + $time = adodb_mktime(); $sendTo = $ToName;