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 @@ > - "> + "> Index: trunk/admin/icons/icon24_email_log.gif =================================================================== diff -u -N Binary files differ Index: trunk/admin/icons/icon46_email_log.gif =================================================================== diff -u -N Binary files differ Index: trunk/kernel/action.php =================================================================== diff -u -N -r358 -r361 --- trunk/kernel/action.php (.../action.php) (revision 358) +++ trunk/kernel/action.php (.../action.php) (revision 361) @@ -76,7 +76,7 @@ $dupe_user = ''; //$user_pending = (int)$_POST["user_pending"]; //$user_enabled = (int)$_POST["user_enabled"]; - $CreatedOn = DateTimestamp($_POST["user_date"],GetDateFormat()); + $CreatedOn = time();//DateCurrTimeTimstamp($_POST["user_date"],GetDateFormat()); $dob = DateTimestamp($_POST["user_dob"],GetDateFormat()); $objEditItems = new clsUserManager(); Index: trunk/admin/email/do_send.php =================================================================== diff -u -N -r313 -r361 --- trunk/admin/email/do_send.php (.../do_send.php) (revision 313) +++ trunk/admin/email/do_send.php (.../do_send.php) (revision 361) @@ -233,7 +233,7 @@ $PageTitle = admin_language($Pagetitle); $ToAddr = $_POST["sendaddrs"]; - $SendQueue->SendMail($FromAddr,$FromName,$ToAddr,"",$Subject,$Text,$Html,$charset,$FileName,$FileLoc,0, NULL); + $SendQueue->SendMail($FromAddr,$FromName,$ToAddr,"",$Subject,$Text,$Html,$charset, "",$FileName,$FileLoc,0, NULL); $o = ""; $o .= int_subsection_title_ret($PageTitle); $o .= ""; @@ -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)."
\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\n"; int_header($objListToolBar,NULL, $title,NULL,$h); Index: trunk/admin/icons/icon24_server_info.gif =================================================================== diff -u -N Binary files differ Index: trunk/admin/icons/icon46_server_info.gif =================================================================== diff -u -N Binary files differ Index: trunk/kernel/admin/include/navmenu.php =================================================================== diff -u -N -r341 -r361 --- trunk/kernel/admin/include/navmenu.php (.../navmenu.php) (revision 341) +++ trunk/kernel/admin/include/navmenu.php (.../navmenu.php) (revision 361) @@ -95,9 +95,9 @@ NULL,"in-portal:tools",NULL,$admin."/icons/icon46_list_tool_import.gif","la_running_query"); $objSections->AddSection("in-portal:server_info","la_tab_ServerInfo","la_tab_ServerInfo",$admin."/tools/","server_info.php", - $admin."/icons/icon46_tool_import.gif",$admin."/icons/icon24_tool_import.gif", + $admin."/icons/icon46_server_info.gif",$admin."/icons/icon24_server_info.gif", NULL,"in-portal:tools","in-portal:sql_query",NULL,0,"",1, - NULL,"in-portal:tools",NULL,$admin."/icons/icon46_list_tool_import.gif","la_tab_ServerInfo"); + NULL,"in-portal:tools",NULL,$admin."/icons/icon46_server_info.gif","la_tab_ServerInfo"); $objSections->AddSection("in-portal:system","la_tab_Sys_Config","la_title_Sys_Config",$admin."/","subitems.php", $admin."/icons/icon46_conf.gif",$admin."/icons/icon24_conf.gif",NULL, Index: trunk/admin/install/upgrades/inportal_upgrade_v1.0.7.sql =================================================================== diff -u -N -r325 -r361 --- trunk/admin/install/upgrades/inportal_upgrade_v1.0.7.sql (.../inportal_upgrade_v1.0.7.sql) (revision 325) +++ trunk/admin/install/upgrades/inportal_upgrade_v1.0.7.sql (.../inportal_upgrade_v1.0.7.sql) (revision 361) @@ -20,7 +20,7 @@ PRIMARY KEY (is_id) ) -INSERT INTO ConfigurationValues VALUES ('EmailsL_SortField', 'timestamp', 'In-Portal', ''); +INSERT INTO ConfigurationValues VALUES ('EmailsL_SortField', 'time_sent', 'In-Portal', ''); INSERT INTO ConfigurationValues VALUES ('Perpage_EmailsL', '20', 'In-Portal', ''); UPDATE Modules SET Version = '1.0.7' WHERE Name = 'In-Portal'; \ No newline at end of file Index: trunk/kernel/include/dates.php =================================================================== diff -u -N -r13 -r361 --- trunk/kernel/include/dates.php (.../dates.php) (revision 13) +++ trunk/kernel/include/dates.php (.../dates.php) (revision 361) @@ -99,7 +99,21 @@ return $ticks; } + +function DateCurrTimeTimstamp($data, $SourceFormat) +{ + if(strlen($date)) + { + $d = GetDateArray($date,$SourceFormat); + $ticks = adodb_mktime(date("H"),date("i"), date("s"),$d["month"],$d["day"],$d["year"]); + } + else + $ticks = 0; + return $ticks; +} + + /** * convert date from one string format to another * Index: trunk/kernel/include/modules.php =================================================================== diff -u -N -r315 -r361 --- trunk/kernel/include/modules.php (.../modules.php) (revision 315) +++ trunk/kernel/include/modules.php (.../modules.php) (revision 361) @@ -896,7 +896,7 @@ } } -if (strstr($_SERVER['SCRIPT_NAME'], 'install')) { +if (strstr($_SERVER['SCRIPT_NAME'], 'install') && $objSession->Get("PortalUserId") == 0) { $objSession->Delete(); } Index: trunk/admin/install/inportal_data.sql =================================================================== diff -u -N -r313 -r361 --- trunk/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 313) +++ trunk/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 361) @@ -148,7 +148,7 @@ INSERT INTO ConfigurationValues VALUES ('Perpage_Modules', '20', 'In-Portal', ''); INSERT INTO ConfigurationValues VALUES ('Perpage_Grouplist', '20', 'In-Portal', ''); INSERT INTO ConfigurationValues VALUES ('Perpage_Images', '20', 'In-Portal', ''); -INSERT INTO ConfigurationValues VALUES ('EmailsL_SortField', 'timestamp', 'In-Portal', ''); +INSERT INTO ConfigurationValues VALUES ('EmailsL_SortField', 'time_sent', 'In-Portal', ''); INSERT INTO ConfigurationValues VALUES ('Perpage_EmailsL', '20', 'In-Portal', ''); INSERT INTO Events VALUES (30, 'USER.ADD', 1, 0, 'In-Portal:Users', 'la_event_user.add', 0)
".admin_language("la_prompt_EmailInitMessage")."