Index: trunk/admin/include/sections.php
===================================================================
diff -u -r290 -r309
--- trunk/admin/include/sections.php	(.../sections.php)	(revision 290)
+++ trunk/admin/include/sections.php	(.../sections.php)	(revision 309)
@@ -555,7 +555,11 @@
 
 $objSections->AddSection("in-portal:sessionlog","la_tab_SessionLog","la_tab_SessionLog",$admin."/logs/","session_list.php",
                          $admin."/icons/icon46_sessions_log.gif",$admin."/icons/icon24_sessions_log.gif",
-                         NULL,"in-portal:reports","in-portal:sessionlog",NULL,0,"",1,NULL,NULL,NULL,$admin."/icons/icon46_list_sessions_log.gif");
+                         NULL,"in-portal:reports","in-portal:sessionlog",'in-portal:emaillog',0,"",1,NULL,NULL,NULL,$admin."/icons/icon46_list_sessions_log.gif");
+                         
+$objSections->AddSection("in-portal:emaillog","la_tab_EmailLog","la_tab_EmailLog",$admin."/logs/","email_log.php",
+                         $admin."/icons/icon46_sessions_log.gif",$admin."/icons/icon24_sessions_log.gif",
+                         NULL,"in-portal:reports","in-portal:emaillog",NULL,0,"",1,NULL,NULL,NULL,$admin."/icons/icon46_list_sessions_log.gif");                         
 
 /* Help */
 $objSections->AddSection("in-portal:help","la_tab_Help","la_title_Help",$admin."/help/","manual.pdf",
Index: trunk/admin/install/inportal_schema.sql
===================================================================
diff -u -r13 -r309
--- trunk/admin/install/inportal_schema.sql	(.../inportal_schema.sql)	(revision 13)
+++ trunk/admin/install/inportal_schema.sql	(.../inportal_schema.sql)	(revision 309)
@@ -498,3 +498,13 @@
   Required int(11) NOT NULL default '0',
   PRIMARY KEY  (AttrId)
 )
+# --------------------------------------------------------
+CREATE TABLE EmailLog (
+  EmailLogId INT(11) NOT NULL ,
+  fromuser VARCHAR(200) NOT NULL ,
+  addressto VARCHAR(255) NOT NULL ,
+  subject VARCHAR(255) NOT NULL ,
+  timestamp BIGINT NOT NULL ,
+  event VARCHAR(100) NOT NULL ,
+PRIMARY KEY (EmailLogId) 
+)
Index: trunk/admin/install/upgrades/inportal_upgrade_v1.0.7.sql
===================================================================
diff -u
--- trunk/admin/install/upgrades/inportal_upgrade_v1.0.7.sql	(revision 0)
+++ trunk/admin/install/upgrades/inportal_upgrade_v1.0.7.sql	(revision 309)
@@ -0,0 +1,11 @@
+CREATE TABLE EmailLog (
+  EmailLogId INT(11) NOT NULL ,
+  fromuser VARCHAR(200) NOT NULL ,
+  addressto VARCHAR(255) NOT NULL ,
+  subject VARCHAR(255) NOT NULL ,
+  timestamp BIGINT NOT NULL ,
+  event VARCHAR(100) NOT NULL ,
+PRIMARY KEY (EmailLogId) 
+)
+
+UPDATE Modules SET Version = '1.0.7' WHERE Name = 'In-Portal';
\ No newline at end of file
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);