Index: trunk/kernel/include/emailmessage.php
===================================================================
diff -u -r294 -r309
--- trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 294)
+++ trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 309)
@@ -157,6 +157,7 @@
     {
         global $objUsers, $objEmailQueue,$objConfig;
 
+        $conn = GetADODBConnection();
         //$this->recipient = $objUsers->GetUser($UserId);
         //$this->recipient->TagPrefix="touser";
         if(strlen($EmailAddress))
@@ -188,6 +189,12 @@
             	$body = str_replace("<br />","\n",$body);
                 $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,$body,"",$charset,NULL,$this->headers);
           }
+          
+          $time = time();
+          
+          $sql = "INSERT INTO ".GetTablePrefix()."EmailLog VALUES ('', '$FromName', '$To', '$subject', $time, '')";
+          $conn->Execute($sql);          
+          
           return TRUE;
         }
         return FALSE;
@@ -198,6 +205,7 @@
     {
         global $objUsers, $objEmailQueue, $objConfig;
 
+        $conn = GetADODBConnection();
         //echo "Handling Event ".$this->Get("Event")." for user $UserId <br>\n";
         $this->recipient = new clsPortalUser($UserId); // $objUsers->GetItem($UserId);
         //echo "<PRE>";print_r($this->recipient); echo "</PRE>";
@@ -241,6 +249,12 @@
             	$body = str_replace("<br />","\n",$body);
                 $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,$body,"",$charset,NULL,$this->headers);
             }
+            
+            $time = time();
+            
+	        $sql = "INSERT INTO ".GetTablePrefix()."EmailLog VALUES ('', '$FromName', '$To ($to_addr)', '$subject', $time, '')";
+	        $conn->Execute($sql);                          
+            
             return TRUE;
         }
         return FALSE;
@@ -666,6 +680,12 @@
         {
             
             $this->MessagesSent++;
+            
+            $time = time();
+            $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 = str_replace("\r\n","\n",$headers);
             //$headers = str_replace("\n","\r\n",$headers);