Index: trunk/admin/include/sections.php
===================================================================
diff -u -N -r309 -r361
--- trunk/admin/include/sections.php (.../sections.php) (revision 309)
+++ trunk/admin/include/sections.php (.../sections.php) (revision 361)
@@ -558,8 +558,8 @@
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");
+ $admin."/icons/icon46_email_log.gif",$admin."/icons/icon24_email_log.gif",
+ NULL,"in-portal:reports","in-portal:emaillog",NULL,0,"",1,NULL,NULL,NULL,$admin."/icons/icon46_email_log.gif");
/* Help */
$objSections->AddSection("in-portal:help","la_tab_Help","la_title_Help",$admin."/help/","manual.pdf",
Index: trunk/kernel/include/emailmessage.php
===================================================================
diff -u -N -r315 -r361
--- trunk/kernel/include/emailmessage.php (.../emailmessage.php) (revision 315)
+++ trunk/kernel/include/emailmessage.php (.../emailmessage.php) (revision 361)
@@ -182,13 +182,13 @@
$charset = "ascii-us";
if($this->Get("MessageType")=="html")
{
- $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,"",$body,$charset,NULL,$this->headers);
+ $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,"",$body,$charset, $this->Get("Event"),NULL,$this->headers);
}
else
{
$body = nl2br($body);
$body = str_replace("
","\n",$body);
- $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,$body,"",$charset,NULL,$this->headers);
+ $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,$body,"",$charset, $this->Get("Event"),NULL,$this->headers);
}
/*$time = time();
@@ -238,17 +238,17 @@
$FromName = $objConfig->Get("Site_Name");
$FromAddr = $objConfig->Get("Smtp_AdminMailFrom");
}
+ echo $this->Event;
-
if($this->Get("MessageType")=="html")
{
- $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,"",$body,$charset,NULL,$this->headers);
+ $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,"",$body,$charset, $this->Get("Event"),NULL,$this->headers);
}
else
{
$body = nl2br($body);
$body = str_replace("
","\n",$body);
- $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,$body,"",$charset,NULL,$this->headers);
+ $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,$body,"",$charset, $this->Get("Event"),NULL,$this->headers);
}
/*$time = time();
@@ -284,13 +284,13 @@
$charset = "ascii-us";
if($this->Get("MessageType")=="html")
{
- $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,"",$body,$charset,NULL,$this->headers);
+ $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,"",$body,$charset,$this->Get("Event"),NULL,$this->headers);
}
else
{
$body=nl2br($body);
$body = str_replace("
","\n",$body);
- $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,$body,"",$charset,NULL,$this->headers);
+ $objEmailQueue->SendMail($FromAddr,$FromName,$to_addr,$To,$subject,$body,"",$charset, $this->Get("Event"),NULL,$this->headers);
}
/* $time = time();
@@ -830,7 +830,7 @@
}
}
- function SendMail($From, $FromName, $ToAddr, $ToName, $Subject, $Text, $Html, $charset,
+ function SendMail($From, $FromName, $ToAddr, $ToName, $Subject, $Text, $Html, $charset, $SendEvent,
$FileName="",$FileLoc="",$QueueOnly=0,$extra_headers = array())
{
$HasFile = FALSE;
@@ -843,8 +843,17 @@
$conn = GetADODBConnection();
$time = time();
+
+ $sendTo = $ToName;
+
+ if (strlen($sendTo) > 0) {
+ $sendTo .= "($ToAddr)";
+ }
+ else {
+ $sendTo = $ToAddr;
+ }
- $sql = "INSERT INTO ".GetTablePrefix()."EmailLog VALUES ('', '$FromName', '$ToName ($ToAddr)', '$Subject', $time, '')";
+ $sql = "INSERT INTO ".GetTablePrefix()."EmailLog VALUES ('', '$FromName', '$sendTo', '$Subject', $time, '$SendEvent')";
$conn->Execute($sql);
if($HasFile)
Index: trunk/admin/users/adduser.php
===================================================================
diff -u -N -r278 -r361
--- trunk/admin/users/adduser.php (.../adduser.php) (revision 278)
+++ trunk/admin/users/adduser.php (.../adduser.php) (revision 361)
@@ -299,7 +299,7 @@
".admin_language("la_prompt_EmailInitMessage")." | "; @@ -257,7 +257,7 @@ { $ToAddr = $UserList[$i]; //$From,$FromName,$To,$ToName,$Subject,$Text,$Html,$charset,$AttmFiles,$QueueOnly=0 - $SendQueue->SendMail($FromAddr,$FromName,$ToAddr,"",$Subject,$Text,$Html,$charset,$FileName,$FileLoc,1, NULL); + $SendQueue->SendMail($FromAddr,$FromName,$ToAddr,"",$Subject,$Text,$Html,$charset, "",$FileName,$FileLoc,1, NULL); } break; case "email_send_progress": Index: trunk/admin/users/user_list.php =================================================================== diff -u -N -r326 -r361 --- trunk/admin/users/user_list.php (.../user_list.php) (revision 326) +++ trunk/admin/users/user_list.php (.../user_list.php) (revision 361) @@ -297,7 +297,7 @@ $objListView->ColumnHeaders->Add("FirstName",admin_language("la_prompt_First_Name"),1,0,$order,"width=\"15%\"",$SortFieldVar,$SortOrderVar,"FirstName"); $objListView->ColumnHeaders->Add("Email",admin_language("la_prompt_Email"),1,0,$order,"width=\"20%\"",$SortFieldVar,$SortOrderVar,"Email"); $objListView->ColumnHeaders->Add("GroupName",admin_language("la_prompt_PrimaryGroup"),1,0,$order,"width=\"20%\"",$SortFieldVar,$SortOrderVar,"GroupName"); -$objListView->ColumnHeaders->Add("DateCreated",admin_language("la_prompt_CreatedOn"),1,0,$order,"width=\"15%\"",$SortFieldVar,$SortOrderVar,"u.CreatedOn"); +$objListView->ColumnHeaders->Add("DateCreated",admin_language("la_prompt_CreatedOn"),1,0,$order,"width=\"15%\"",$SortFieldVar,$SortOrderVar,"u.DateCreated"); $objListView->ColumnHeaders->SetSort($objConfig->Get($SortFieldVar), $objConfig->Get($SortOrderVar)); Index: trunk/admin/logs/email_log.php =================================================================== diff -u -N -r352 -r361 --- trunk/admin/logs/email_log.php (.../email_log.php) (revision 352) +++ trunk/admin/logs/email_log.php (.../email_log.php) (revision 361) @@ -121,9 +121,9 @@ "swap('log_refresh', 'toolbar/tool_refresh.gif');","window.location.reload(true);", "tool_refresh.gif"); -$objListToolBar->Add("log_reset","la_ToolTip_Reset","#", "swap('log_reset','toolbar/tool_disconnect_f2.gif');", - "swap('log_reset', 'toolbar/tool_disconnect.gif');","$CheckClass.check_submit('email_log', 'm_purge_email_log');", - "tool_disconnect.gif",TRUE,TRUE); +$objListToolBar->Add("log_reset","la_ToolTip_Reset","#", "swap('log_reset','toolbar/tool_reset_f2.gif');", + "swap('log_reset', 'toolbar/tool_reset.gif');","$CheckClass.check_submit('email_log', 'm_purge_email_log');", + "tool_reset.gif",TRUE,TRUE); //$listImages[] = "$CheckClass.addImage('log_reset','$imagesURL/toolbar/tool_disconnect.gif','$imagesURL/toolbar/tool_disconnect_f3.gif',1);\n "; //$listImages[] = "$CheckClass.addImage('log_reset','$imagesURL/toolbar/tool_disconnect.gif','$imagesURL/toolbar/tool_disconnect_f3.gif',1);\n "; @@ -140,57 +140,10 @@ $objListToolBar->AddToInitScript($listImages); $objListToolBar->AddToInitScript("fwLoadMenus();"); -/* ----------------------------------------- Set the View Filter ---------------------------------------- */ - -/* bit place holders for category view menu */ -/*$Bit_Active=1; -$Bit_Inactive=2; -$Bit_Guest=4; -$Bit_All = 7; - -$FilterLabels = array(); - -$FilterLabels[0] = admin_language("la_Text_Active"); -$FilterLabels[1] = admin_language("la_Text_Expired"); -$FilterLabels[2] = admin_language("la_Text_Guest"); -*/ if($_GET["resetpage"]==1) $objSession->SetVariable("Page_EmailsL","1"); -/* determine current view menu settings */ -$SessionView = $objConfig->Get("EmailsL_View"); -if(!is_numeric($SessionView)) -{ - $SessionView = $Bit_All; //Set all bits ON - $SessionFilter = ""; -} - -/*$filter = array(); -$status=array(); - -if($SessionView & $Bit_Active) -{ - $status[] = 1; -} -if($SessionView & Bit_Inactive) -{ - $status[] = 0; -} - - -if(count($status>0)) -{ - $filter[] = "us.Status IN (".join($status,",").")"; -} - - -if(!($SessionView & $Bit_Guest)) - $filter[] = "p.Login IS NOT NULL"; - -$SessionFilter = join(" AND ",$filter); -*/ - $order = $objConfig->Get("EmailsL_SortOrder"); $SearchWords = $objSession->GetVariable("EmailsLSearchWord"); if(strlen($SearchWords)) @@ -207,29 +160,27 @@ $where.=$SessionFilter; } -//echo $where; -/*$sql = "SELECT us.*,if (p.Login IS NULL,'".admin_language("la_Text_Guest")."',p.Login) as UserName, "; -$sql .="if(g.Name IS NULL,'".admin_language("la_Text_GuestUsers")."',g.Name) as GroupName, "; -$sql .="ELT(us.Status+1,'".admin_language("la_Text_Expired")."','".admin_language("la_Text_Active")."') as SessionStatus, "; -$sql .="FROM_UNIXTIME(us.LastAccessed,'%m-%d-%Y') as DateCreated "; -$sql .="FROM ".GetTablePrefix()."UserSession "; -$sql .=" as us LEFT JOIN ".GetTablePrefix()."PortalUser as p USING (PortalUserId) "; -$sql .="LEFT JOIN ".GetTablePrefix()."UserGroup as u ON (p.PortalUserId=u.PortalUserId AND u.PrimaryGroup=1) "; -$sql .="LEFT JOIN ".GetTablePrefix()."PortalGroup as g ON (u.GroupId=g.GroupId) "; -$sql .= " WHERE us.Status = 1 "; -*/ $sql = "SELECT EmailLogId, fromuser, addressto, subject, event, FROM_UNIXTIME(timestamp,'%m-%d-%Y %H:%i:%s') as time_sent FROM ".GetTablePrefix()."EmailLog"; if(strlen($where)) { $sql .= "AND ".$where; } $orderBy = trim($objConfig->Get("EmailsL_SortField")." ".$objConfig->Get("EmailsL_SortOrder")); +if ($orderBy == 'asc') { + $objConfig->Set("EmailsL_SortField", "time_sent"); + $orderBy = "time_sent ".$orderBy; +} +if ($orderBy == 'desc') { + $objConfig->Set("EmailsL_SortField", "time_sent"); + $orderBy = "time_sent ".$orderBy; +} + + if(strlen($orderBy)) $sql .=" ORDER BY ".$orderBy; -//$sql .=" ".GetLimitSQL($objSession->GetVariable("Page_Sessionlist"),$objConfig->Get("Perpage_Sessionlist")); if($objSession->HasSystemPermission("DEBUG.LIST")) echo htmlentities($sql,ENT_NOQUOTES)."