From ee4835e0d0332eb35fe03d34237aefbb33bfb92b Mon Sep 17 00:00:00 2001 From: Tijn Kuyper Date: Wed, 27 Feb 2013 16:37:49 +0100 Subject: [PATCH] System logs - code and LAN cleanup --- e107_admin/admin_log.php | 95 ++++++------------- .../English/admin/lan_admin_log.php | 2 +- 2 files changed, 31 insertions(+), 66 deletions(-) diff --git a/e107_admin/admin_log.php b/e107_admin/admin_log.php index 6afba108a..f57ef8480 100644 --- a/e107_admin/admin_log.php +++ b/e107_admin/admin_log.php @@ -2,22 +2,18 @@ /* * e107 website system * - * Copyright (C) 2008-2012 e107 Inc (e107.org) + * Copyright (C) 2008-2013 e107 Inc (e107.org) * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * * Administration Area - Admin Log * - * $URL$ - * $Id$ - * */ /** * * @package e107 * @subpackage admin - * @version $Id$; * * Handle display of the various system logs */ @@ -50,7 +46,6 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE); // Load language files for log messages include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_log_messages.php'); //... for core functions -$mes = e107::getMessage(); if(is_array($pref['lan_log_list'])) //... and for any plugins which support it { @@ -165,13 +160,17 @@ if(isset($back_count) && isset($next_action)) $qs[1] = $old_date; $qs[2] = $back_count; } - else $mes->addWarning(RL_LAN_050); - //$message = RL_LAN_050; + else + { + $mes->addWarning(RL_LAN_050); + } } if(!isset($admin_log)) +{ $mes->addWarning("Admin Log not valid"); - //$message .= " Admin Log not valid"; +} + // Actually delete back events - admin or user audit log if(($action == "backdel") && isset($_POST['backdeltype'])) @@ -206,24 +205,19 @@ if(($action == "backdel") && isset($_POST['backdeltype'])) } else { - //$message = RL_LAN_054." : ".$sql->mySQLresult; $mes->addWarning(RL_LAN_054." : ".$sql->mySQLresult); } - } else - $mes->addInfo(LAN_NO_CHANGE); + } + else + { + $mes->addInfo(LAN_NO_CHANGE); + } $action = "config"; unset($qs[1]); unset($qs[2]); } -/* -if(varsettrue($message)) -{ - $ns->tablerender("", "
$message
"); -} -*/ - // Prompt to delete back events if(($action == "confdel") || ($action == "auditdel")) { @@ -418,16 +412,7 @@ if($action == "config") ".RL_LAN_044." - - -
".RL_LAN_064."
- + ".$frm->selectbox('sys_log_perpage', array(10, 20, 30, 40, 50), $pref['sys_log_perpage'])."".RL_LAN_064." "; @@ -439,13 +424,12 @@ if($action == "config") -
".RL_LAN_026."
+ ".RL_LAN_026." ".RL_LAN_124." - - ".RL_LAN_031." + ".RL_LAN_031." "; foreach($audit_checkboxes as $k => $t) { @@ -467,15 +451,13 @@ if($action == "config") ".RL_LAN_008."
- + ".$frm->checkbox('roll_log_active', 1, varset($pref['roll_log_active'],0))."
".RL_LAN_009." - - - + ".$frm->text('roll_log_days', $pref['roll_log_days'], 5)." @@ -500,9 +482,7 @@ if($action == "config") ".RL_LAN_045." - - ".gen_log_delete('rolllog_clearadmin')." ".RL_LAN_046.$frm->admin_button('deleteoldadmin', 'no-value', 'delete', RL_LAN_049)." - + ".gen_log_delete('rolllog_clearadmin')." ".RL_LAN_046.$frm->admin_button('deleteoldadmin', 'no-value', 'delete', RL_LAN_049)." "; @@ -511,9 +491,7 @@ if($action == "config") $text .= " ".RL_LAN_066." - - ".gen_log_delete('rolllog_clearaudit')." ".RL_LAN_046.$frm->admin_button('deleteoldaudit', 'no-value', 'delete', RL_LAN_049)." - + ".gen_log_delete('rolllog_clearaudit')." ".RL_LAN_046.$frm->admin_button('deleteoldaudit', 'no-value', 'delete', RL_LAN_049)." @@ -523,7 +501,7 @@ if($action == "config") "; - $ns->tablerender(RL_LAN_121, $mes->render().$text); + $ns->tablerender(ADLAN_155.SEP.LAN_OPTIONS, $mes->render().$text); } //==================================================================== @@ -749,17 +727,10 @@ if(isset($page_title[$action])) { case 'datetimes': $text .= " - - - - - ".time_box("starttime", $start_time, $back_day_count[$action], FALSE)." - - - - - ".time_box("endtime", $end_time, $back_day_count[$action], TRUE)." - + ".$frm->checkbox('start-enabled', 1, varset($pref['start-enabled'],0))." + ".time_box("starttime", $start_time, $back_day_count[$action], FALSE)." + ".$frm->checkbox('end-enabled', 1, varset($pref['end-enabled'],0))." + ".time_box("endtime", $end_time, $back_day_count[$action], TRUE)." "; $filter_cols = 4; break; @@ -786,13 +757,7 @@ if(isset($page_title[$action])) case 'priority': $text .= " ".RL_LAN_058." - - + ".$frm->selectbox('roll_pri_cond', array('xx' => ' ', 'gt' => '>=', 'eq' => '==', 'lt' => '<='), $pri_filter_cond)." "; @@ -803,7 +768,7 @@ if(isset($page_title[$action])) ".RL_LAN_060." -
".RL_LAN_061."
+ ".RL_LAN_061." "; $filter_cols += 2; @@ -813,7 +778,7 @@ if(isset($page_title[$action])) ".RL_LAN_015." -
".RL_LAN_016."
+ ".RL_LAN_016." "; $filter_cols += 2; @@ -823,7 +788,7 @@ if(isset($page_title[$action])) ".RL_LAN_029." -
".RL_LAN_061."
+ ".RL_LAN_061." "; $filter_cols += 2; @@ -833,7 +798,7 @@ if(isset($page_title[$action])) ".RL_LAN_059." -
".RL_LAN_061."
+ ".RL_LAN_061." "; $filter_cols += 2; diff --git a/e107_languages/English/admin/lan_admin_log.php b/e107_languages/English/admin/lan_admin_log.php index f15b52f8f..03973ef7c 100644 --- a/e107_languages/English/admin/lan_admin_log.php +++ b/e107_languages/English/admin/lan_admin_log.php @@ -111,7 +111,7 @@ define('RL_LAN_118', 'Flag'); define('RL_LAN_120', 'Users on-line'); -define('RL_LAN_121', 'System Logs Options'); +//define('RL_LAN_121', 'System Logs Options'); define('RL_LAN_122', 'System Logs Configuration'); define('RL_LAN_123', 'User audit trail class'); define('RL_LAN_124', 'User audit trail actions');