Index: trunk/admin/logs/email_log.php
===================================================================
diff -u -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)."<br>\n";
@@ -238,16 +189,16 @@
 $objListView->PerPageVar = "Perpage_EmailsL";
 
 $objUsers->Query_Item( $sql, $objListView->GetLimitSQL() );
-$itemcount = TableCount(GetTablePrefix()."UserSession", $where,0);
+$itemcount = TableCount(GetTablePrefix()."EmailLog", $where,0);
 
 $objListView->SetListItems($objUsers);
 $objListView->IdField = "EmailLogId";
 $objListView->PageLinkTemplate = $pathtoroot.$admin."/templates/user_page_link.tpl";
 
-$objListView->ColumnHeaders->Add("fromuser",admin_language("la_prompt_FromUsername"),1,0,$order,"width=\"35%\"","EmailsL_SortField","EmailsL_SortOrder","UserName");
-$objListView->ColumnHeaders->Add("addressto",admin_language("la_prompt_AddressTo"),1,0,$order,"width=\"20%\"","EmailsL_SortField","EmailsL_SortOrder","GroupName");
-$objListView->ColumnHeaders->Add("subject",admin_language("la_prompt_Subject"),1,0,$order,"width=\"10%\"","EmailsL_SortField","EmailsL_SortOrder","SessionStatus");
-$objListView->ColumnHeaders->Add("event",admin_language("la_prompt_Event"),1,0,$order,"width=\"15%\"","EmailsL_SortField","EmailsL_SortOrder","IPAddress");
+$objListView->ColumnHeaders->Add("fromuser",admin_language("la_prompt_FromUsername"),1,0,$order,"width=\"35%\"","EmailsL_SortField","EmailsL_SortOrder","fromuser");
+$objListView->ColumnHeaders->Add("addressto",admin_language("la_prompt_AddressTo"),1,0,$order,"width=\"20%\"","EmailsL_SortField","EmailsL_SortOrder","addressto");
+$objListView->ColumnHeaders->Add("subject",admin_language("la_prompt_Subject"),1,0,$order,"width=\"10%\"","EmailsL_SortField","EmailsL_SortOrder","subject");
+$objListView->ColumnHeaders->Add("event",admin_language("la_prompt_Event"),1,0,$order,"width=\"15%\"","EmailsL_SortField","EmailsL_SortOrder","event");
 $objListView->ColumnHeaders->Add("time_sent",admin_language("la_prompt_SentOn"),1,0,$order,"width=\"20%\"","EmailsL_SortField","EmailsL_SortOrder","time_sent");
 $objListView->ColumnHeaders->SetSort($objConfig->Get("EmailsL_SortField"),$order);
 
@@ -261,11 +212,6 @@
   $objListView->ConfigureViewMenu($SortFieldVar,$SortOrderVar,$DefaultSortField,
   								  $CurrentFilterVar,$SessionView,$Bit_All);
 
-  foreach($FilterLabels as $Bit=>$Label)
-  {
-  	$objListView->AddViewMenuFilter($Label,$Bit);
-  }		
-
 $title = admin_language("la_Show_EmailLog")." (".$objUsers->NumItems().")";
 $h = "\n\n<SCRIPT Language=\"JavaScript1.2\">\n".$objListView->GetViewMenu($imagesURL)."\n</SCRIPT>\n";
 int_header($objListToolBar,NULL, $title,NULL,$h);