From 8d8883b52c7a863df4d5c4a99e366da416d9b9ae Mon Sep 17 00:00:00 2001 From: Cameron Date: Wed, 28 Nov 2012 04:32:05 -0800 Subject: [PATCH 1/2] Theme handler fixes. --- e107_admin/theme.php | 31 ++++++++++++++++++++++- e107_handlers/theme_handler.php | 36 +++++++++++++++++++++------ e107_themes/bootstrap/admin_style.css | 5 ++++ 3 files changed, 63 insertions(+), 9 deletions(-) diff --git a/e107_admin/theme.php b/e107_admin/theme.php index 34cc20112..26f80d419 100644 --- a/e107_admin/theme.php +++ b/e107_admin/theme.php @@ -51,11 +51,37 @@ e107::css("inline"," .admin-theme-cell { width:202px; height:160px; -moz-border-radius: 5px; border-radius: 5px; } "); -require_once("auth.php"); require_once(e_HANDLER."theme_handler.php"); $themec = new themeHandler; + +if(e_AJAX_REQUEST) +{ + $data = $themec->getThemeInfo('jayya'); + echo $themec->renderThemeInfo($data); + + exit; +} + +echo ' + + '; + +require_once("auth.php"); + + $mode = (e_QUERY) ? e_QUERY :"main" ; if($_POST['selectadmin']) @@ -74,6 +100,9 @@ if($_POST['selectmain'] || varset($_POST['setUploadTheme'])) } $themec -> showThemes($mode); +// Launch demo modal + + require_once("footer.php"); diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php index 36843a63e..c0738b9ef 100644 --- a/e107_handlers/theme_handler.php +++ b/e107_handlers/theme_handler.php @@ -61,6 +61,8 @@ class themeHandler $mes = e107::getMessage(); require_once (e_HANDLER."form_handler.php"); + + //enable inner tabindex counter $this->frm = new e_form(); @@ -453,19 +455,28 @@ class themeHandler // Show All Themes if($mode == "choose") { - $text = ""; + + + // $text = ""; foreach ($this->themeArray as $key=>$theme) { $text .= $this->renderTheme(FALSE, $theme); } $text .= "
 
"; $ns->tablerender(TPVLAN_26." :: ".TPVLAN_39, $mes->render().$text); + + } echo "\n\n"; + + } + + + function renderUploadForm() { @@ -528,7 +539,7 @@ class themeHandler $preview = "".($theme['preview'] ? "" : "").""; - $text = "
".TPVLAN_7."
+ $text = "
".TPVLAN_7."
"; $text .= $author ? "" : ""; $text .= $website ? "" : ""; @@ -595,7 +606,7 @@ class themeHandler $text .= ""; $text .= $itext."
".TPVLAN_4.":".$author."
".TPVLAN_5.":".$website."
"; - $text .= "
Close
"; + // $text .= "
Close
"; return $text; } @@ -676,10 +687,19 @@ class themeHandler $previewbutton = (!$mode ? " " : ""); - $main_icon = ($pref['sitetheme'] != $theme['path']) ? "" : ""; - $info_icon = ""; - $preview_icon = ""; - $admin_icon = ($pref['admintheme'] != $theme['path']) ? "\n" : ""; + $main_icon = ($pref['sitetheme'] != $theme['path']) ? "" : ""; + // $info_icon = ""; + + $info_icon = "info"; + + + $preview_icon = ""; + // $preview_icon = "Preview"; + + // $preview_icon = "".($theme['preview'] ? "" : "").""; + + + $admin_icon = ($pref['admintheme'] != $theme['path']) ? "\n" : ""; $newpreview = "".($theme['preview'] ? "" : "").""; @@ -695,7 +715,7 @@ class themeHandler $text .= "
".$theme['name']." ".$theme['version']."
"; // $text .= "
\n\n\n".$main_icon.$admin_icon.$info_icon.$preview_icon."\n\n
"; - $text .= "
\n".$this->renderThemeInfo($theme)."
\n"; + // $text .= "
\n".$this->renderThemeInfo($theme)."
\n"; $text .= ""; return $text; diff --git a/e107_themes/bootstrap/admin_style.css b/e107_themes/bootstrap/admin_style.css index 35451cf99..647f83757 100644 --- a/e107_themes/bootstrap/admin_style.css +++ b/e107_themes/bootstrap/admin_style.css @@ -47,6 +47,11 @@ a.brand:hover img { .sidebar-nav { font-size:12px; } } + +.modal { + min-width:800px; + +} @media (min-width: 1500px) { From 289f890374fed41f6aa5a527e5397eb06dad71f8 Mon Sep 17 00:00:00 2001 From: Tijn Kuyper Date: Wed, 28 Nov 2012 13:39:38 +0100 Subject: [PATCH 2/2] GUI fixes to system logs and LAN optimization (#6) --- e107_admin/admin_log.php | 2238 ++++++++--------- .../English/admin/lan_admin_log.php | 240 +- 2 files changed, 1238 insertions(+), 1240 deletions(-) diff --git a/e107_admin/admin_log.php b/e107_admin/admin_log.php index 9ebcb5234..235ca6203 100644 --- a/e107_admin/admin_log.php +++ b/e107_admin/admin_log.php @@ -1,1121 +1,1119 @@ - $file) - { - $file = str_replace('--LAN--', e_LANGUAGE, $file); - include_lan(e_PLUGIN.$path.'/'.$file); - } -} - -unset($qs); - -require_once (e_ADMIN.'auth.php'); -require_once (e_HANDLER.'message_handler.php'); -require_once (e_HANDLER.'form_handler.php'); -$emessage = &eMessage::getInstance(); -$frm = new e_form(false); - -define('AL_DATE_TIME_FORMAT', 'y-m-d H:i:s'); - -if(isset($_POST['setoptions'])) -{ - unset($temp); - - if(in_array((string) USER_AUDIT_LOGIN, $_POST['user_audit_opts'])) - { - $_POST['user_audit_opts'][] = USER_AUDIT_LOGOUT; - } - foreach($_POST['user_audit_opts'] as $k => $v) - { - if(! is_numeric($v)) - { - unset($_POST['user_audit_opts'][$k]); - } - } - $temp['roll_log_active'] = intval($_POST['roll_log_active']); - $temp['roll_log_days'] = intval($_POST['roll_log_days']); - $temp['sys_log_perpage'] = intval($_POST['sys_log_perpage']); - $temp['user_audit_opts'] = implode(',', $_POST['user_audit_opts']); - $temp['user_audit_class'] = intval($_POST['user_audit_class']); - - if($admin_log->logArrayDiffs($temp, $pref, 'ADLOG_01') || $admin_log->logArrayDiffs($temp, $pref, 'ADLOG_04')) - { - save_prefs(); // Only save if changes - $emessage->add(RL_LAN_006, E_MESSAGE_SUCCESS); - } - else - { - $emessage->add(LAN_NO_CHANGE); - } - -} - -if(e_QUERY) -{ // Must explode after calling auth.php - $qs = explode(".", e_QUERY); -} - -$action = varset($qs[0], 'adminlog'); - -// Deprecated by Comments Manager -/* -if(isset($_POST['deleteitems']) && ($action == 'comments')) -{ - $c_list = array(); - foreach($_POST['del_item'] as $di) - { - if(intval($di) > 0) - $c_list[] = '`comment_id`='.intval($di); - } - if($count = $sql->db_Delete('comments', implode(' OR ', $c_list))) - { - //$text = str_replace('--NUMBER--', $count,RL_LAN_112); - $emessage->add(str_replace('--NUMBER--', $count, RL_LAN_112), E_MESSAGE_SUCCESS); - $admin_log->log_event('COMMENT_01', 'ID: '.implode(',', $_POST['del_item']), E_LOG_INFORMATIVE, ''); - } - else - { - //$text = RL_LAN_113; - $emessage->add(RL_LAN_113, E_MESSAGE_WARNING); - } - //$ns -> tablerender(LAN_DELETE, "
".$text."
"); - unset($c_list); -} -*/ - -// ****************** MAINTENANCE ****************** -unset($back_count); -if(isset($_POST['deleteoldadmin']) && isset($_POST['rolllog_clearadmin'])) -{ - $back_count = intval($_POST['rolllog_clearadmin']); - $next_action = 'confdel'; -} -elseif(isset($_POST['deleteoldaudit']) && isset($_POST['rolllog_clearaudit'])) -{ - $back_count = intval($_POST['rolllog_clearaudit']); - $next_action = 'auditdel'; -} - -if(isset($back_count) && isset($next_action)) -{ - if(($back_count >= 1) && ($back_count <= 90)) - { - $temp_date = getdate(); - $old_date = intval(mktime(0, 0, 0, $temp_date['mon'], $temp_date['mday'] - $back_count, $temp_date['year'])); - $old_string = strftime("%d %B %Y", $old_date); - // $message = "Back delete ".$back_count." days. Oldest date = ".$old_string; - $action = $next_action; - $qs[1] = $old_date; - $qs[2] = $back_count; - } - else $emessage->add(RL_LAN_050, E_MESSAGE_WARNING); - //$message = RL_LAN_050; -} - -if(!isset($admin_log)) - $emessage->add("Admin Log not valid", E_MESSAGE_WARNING); - //$message .= " Admin Log not valid"; - -// Actually delete back events - admin or user audit log -if(($action == "backdel") && isset($_POST['backdeltype'])) -{ - if(isset($_POST['confirmdeleteold'])) - { - $old_date = intval($qs[1]); - $old_string = strftime("%d %B %Y", $old_date); - $qry = "dblog_datestamp < ".$old_date; // Same field for both logs - switch($_POST['backdeltype']) - { - case 'confdel': - $db_table = 'admin_log'; - $db_name = RL_LAN_052; - $db_msg = "ADLOG_02"; - break; - case 'auditdel': - $db_table = 'audit_log'; - $db_name = RL_LAN_053; - $db_msg = "ADLOG_03"; - break; - default: - exit(); // Someone fooling around! - } - // $message = "Back delete, oldest date = {$old_string} Query = {$qry}"; - if($del_count = $sql->db_Delete($db_table, $qry)) - { - // Add in a log event - $message = $db_name.str_replace(array('--OLD--', '--NUM--'), array($old_string, $del_count), RL_LAN_057); - $emessage->add($message, E_MESSAGE_SUCCESS); - $admin_log->log_event($db_msg, "db_Delete - earlier than {$old_string} (past {$qs[2]} days)[!br!]".$message.'[!br!]'.$db_table.' '.$qry, E_LOG_INFORMATIVE, ''); - } - else - { - //$message = RL_LAN_054." : ".$sql->mySQLresult; - $emessage->add(RL_LAN_054." : ".$sql->mySQLresult, E_MESSAGE_WARNING); - } - } else - $emessage->add(RL_LAN_056); //info - - $action = "config"; - unset($qs[1]); - unset($qs[2]); -} - -/* -if(varsettrue($message)) -{ - $ns->tablerender("", "
$message
"); -} -*/ - -// Prompt to delete back events -if(($action == "confdel") || ($action == "auditdel")) -{ - $old_string = strftime("%d %B %Y", $qs[1]); - $text = " -
-
- ".LAN_CONFDELETE." - - - - -
- ".(($action == "confdel") ? RL_LAN_047 : RL_LAN_065).$old_string." -
-
- - - -
-
-
- - "; - - $ns->tablerender(LAN_CONFDELETE, $text); -} - -// Arrays of options for the various logs - the $page_title array is used to determine the allowable values for $action ('options' is a special case) -$log_db_table = array('adminlog' => 'admin_log', 'auditlog' => 'audit_log', 'rolllog' => 'dblog', 'downlog' => 'download_requests', 'online' => 'online'); -$back_day_count = array('adminlog' => 30, 'auditlog' => 30, 'rolllog' => max(intval($pref['roll_log_days']), 1), 'downlog' => 60, 'detailed' => 20, 'online' => 30); -$page_title = array('adminlog' => RL_LAN_030, 'auditlog' => RL_LAN_062, 'rolllog' => RL_LAN_002, 'downlog' => RL_LAN_067, 'detailed' => RL_LAN_094, 'online' => RL_LAN_120); - -// Set all the defaults for the data filter -$start_enabled = FALSE; -$end_enabled = FALSE; -$start_time = 0; -$end_time = 0; -$user_filter = ''; -$event_filter = ''; -$pri_filter_cond = "xx"; -$pri_filter_val = ""; -$sort_order = "DESC"; -$downloadid_filter = ''; - -$last_noted_time = 0; - -// Maintain the log view filter across pages -$rl_cookiename = $pref['cookie_name']."_rl_admin"; -if(isset($_POST['updatefilters']) || isset($_POST['clearfilters'])) -{ // Need to put the filter values into the cookie - if(! isset($_POST['clearfilters'])) - { // Only update filter values from $_POST[] if 'clear filters' not active - $start_time = intval($_POST['starttimedate'] + $_POST['starttimehours'] * 3600 + $_POST['starttimemins'] * 60); - $start_enabled = isset($_POST['start_enabled']); - if(isset($_POST['timelength'])) - { - $end_time = intval($_POST['timelength']) * 60 + $start_time; - } - else - { - $end_time = intval($_POST['endtimedate'] + $_POST['endtimehours'] * 3600 + $_POST['endtimemins'] * 60); - } - $end_enabled = isset($_POST['end_enabled']); - $user_filter = trim(varset($_POST['roll_user_filter'], '')); - if($user_filter != '') - $user_filter = intval($user_filter); - $event_filter = $tp->toDB($_POST['roll_event_filter']); - $pri_filter_cond = $tp->toDB($_POST['roll_pri_cond']); - $pri_filter_val = $tp->toDB($_POST['roll_pri_val']); - $caller_filter = $tp->toDB($_POST['roll_caller_filter']); - $ipaddress_filter = $e107->ipEncode($tp->toDB($_POST['roll_ipaddress_filter'])); - $downloadid_filter = $tp->toDB($_POST['roll_downloadid_filter']); - } - $cookie_string = implode("|", array($start_time, $start_enabled, $end_time, $end_enabled, $user_filter, $event_filter, $pri_filter_cond, $pri_filter_val, $caller_filter, $ipaddress_filter, $downloadid_filter)); - // echo $cookie_string."
"; - // Create session cookie to store values - cookie($rl_cookiename, $cookie_string, 0); // Use session cookie -} -else -{ - // Now try and get the filters from the cookie - if(isset($_COOKIE[$rl_cookiename])) - list($start_time, $start_enabled, $end_time, $end_enabled, $user_filter, $event_filter, $pri_filter_cond, $pri_filter_val, $caller_filter, $ipaddress_filter, $downloadid_filter) = explode("|", $_COOKIE[$rl_cookiename]); - if(isset($qs[1]) && isset($qs[2]) && ($qs[1] == 'user') && (intval($qs[2]) > 0)) - { - $user_filter = intval($qs[2]); - } -} - -$timelength = 5; -if($start_time != 0 && $end_time != 0) - $timelength = intval(($end_time - $start_time) / 60); - -function time_box($boxname, $this_time, $day_count, $inc_tomorrow = FALSE, $all_mins = FALSE) -{ // Generates boxes for date and time for today and the preceding days - // Appends 'date', 'hours', 'mins' to the specified boxname - - - $all_time = getdate(); // Date/time now - $sel_time = getdate($this_time); // Currently selected date/time - $sel_day = mktime(0, 0, 0, $sel_time['mon'], $sel_time['mday'], $sel_time['year']); - $today = mktime(0, 0, 0, $all_time['mon'], $all_time['mday'] + ($inc_tomorrow ? 1 : 0), $all_time['year']); - - // Start with day - $ret = ""; - - // Hours - $ret .= " "; - - // Minutes - $ret .= " "; - - return $ret; -} - -if(! defined("USER_WIDTH")) -{ - define("USER_WIDTH", "width:97%"); -} - -//==================================================================== -// CONFIGURATION OPTIONS MENU -//==================================================================== - - -if($action == "config") -{ - // User Audit log options (for info) - //======================= - // define('USER_AUDIT_SIGNUP',11); // User signed up - // define('USER_AUDIT_EMAILACK',12); // User responded to registration email - // define('USER_AUDIT_LOGIN',13); // User logged in - // define('USER_AUDIT_LOGOUT',14); // User logged out - // define('USER_AUDIT_NEW_DN',15); // User changed display name - // define('USER_AUDIT_NEW_PW',16); // User changed password - // define('USER_AUDIT_NEW_EML',17); // User changed email - // define('USER_AUDIT_NEW_SET',19); // User changed other settings (intentional gap in numbering) - // define('USER_AUDIT_ADD_ADMIN', 20); // User added by admin - // define('USER_AUDIT_MAIL_BOUNCE', 21); // User mail bounce - // define('USER_AUDIT_BANNED', 22); // User banned - // define('USER_AUDIT_BOUNCE_RESET', 23); // User bounce reset - // define('USER_AUDIT_TEMP_ACCOUNT', 24); // User temporary account - - - $audit_checkboxes = array(USER_AUDIT_SIGNUP => RL_LAN_071, USER_AUDIT_EMAILACK => RL_LAN_072, USER_AUDIT_LOGIN => RL_LAN_073, // USER_AUDIT_LOGOUT => RL_LAN_074, // Logout is lumped in with login - USER_AUDIT_NEW_DN => RL_LAN_075, USER_AUDIT_NEW_PW => RL_LAN_076, USER_AUDIT_PW_RES => RL_LAN_078, USER_AUDIT_NEW_EML => RL_LAN_077, USER_AUDIT_NEW_SET => RL_LAN_079, - USER_AUDIT_ADD_ADMIN => RL_LAN_080, USER_AUDIT_MAIL_BOUNCE => RL_LAN_081, USER_AUDIT_BANNED => RL_LAN_082, USER_AUDIT_BOUNCE_RESET => RL_LAN_083, - USER_AUDIT_TEMP_ACCOUNT => RL_LAN_084); - - if(! isset($e_userclass) && ! is_object($e_userclass)) - { - require_once (e_HANDLER."userclass_class.php"); - $e_userclass = new user_class(); - } - - $user_signup_opts = array_flip(explode(',', varset($pref['user_audit_opts'], ''))); - - // Common to all logs - $text = " -
- ".RL_LAN_121." -
-
- ".RL_LAN_122." - - - - - - - - - - - "; - - // User Audit Trail Options - $text .= " - - - - - - - - - "; - - - // Rolling log options - //==================== - $text .= " - - - - - - - - - -
".RL_LAN_044." - -
".RL_LAN_064."
-
".RL_LAN_123." - -
".RL_LAN_026."
-
".RL_LAN_124." - ".RL_LAN_031." - "; - foreach($audit_checkboxes as $k => $t) - { - $text .= " -
- "; - } - $text .= " -
".$frm->admin_button('check_all', 'jstarget:user_audit_opts', 'action', LAN_CHECKALL).$frm->admin_button('uncheck_all', 'jstarget:user_audit_opts', 'action', LAN_UNCHECKALL)."
-
".RL_LAN_008." -
- -
-
".RL_LAN_009." - -
-
- -
-
-
- "; - - // Admin log maintenance - //================== - $text .= " -
-
- ".RL_LAN_125." - - - - - - - - - - - "; - - // User log maintenance - //==================== - $text .= " - - - - - -
".RL_LAN_045." - ".gen_log_delete('rolllog_clearadmin').RL_LAN_046." -
".RL_LAN_066." - ".gen_log_delete('rolllog_clearaudit').RL_LAN_046." -
-
-
- -
- "; - - $ns->tablerender(RL_LAN_121, $emessage->render().$text); -} - -//==================================================================== -// LOG VIEW MENU -//==================================================================== -if(isset($page_title[$action])) -{ - $from = intval(varset($qs[1], 0)); // First entry to display - $amount = max(varset($pref['sys_log_perpage'], 20), 5); // Number of entries per page - - - // Array decides which filters are active for each log. There are 4 columns total. All but 'datetimes' occupy 2. Must specify multiple of 4 columns - add 'blank' if necessary - $active_filters = array( - 'adminlog' => array('datetimes' => 0, 'ipfilter' => 0, 'userfilter' => 0, 'eventfilter' => 0, 'priority' => 0), - 'auditlog' => array('datetimes' => 0, 'ipfilter' => 0, 'userfilter' => 0, 'eventfilter' => 0, 'blank' => 2), - 'rolllog' => array('datetimes' => 0, 'ipfilter' => 0, 'userfilter' => 0, 'eventfilter' => 0, 'priority' => 0, 'callerfilter' => 0, 'blank' => 2), - 'downlog' => array('datetimes' => 0, 'ipfilter' => 0, 'userfilter' => 0, 'downloadidfilter' => 0, 'blank' => 2), - 'detailed' => array('datestart' => 0, 'ipfilter' => 0, 'userfilter' => 0, 'eventfilter' => 0, 'blank' => 2), - 'online' => array('ipfilter' => 0, 'userfilter' => 0)); - - // Arrays determine column widths, headings, displayed fields for each log - $col_fields = array( - 'adminlog' => array('cf_datestring', 'dblog_type', 'dblog_ip', 'dblog_user_id', 'user_name', 'dblog_eventcode', 'dblog_title', 'dblog_remarks'), - 'auditlog' => array('cf_datestring', 'dblog_ip', 'dblog_user_id', 'dblog_user_name', 'dblog_eventcode', 'dblog_title', 'dblog_remarks'), - 'rolllog' => array('cf_datestring', 'dblog_type', 'dblog_ip', 'dblog_user_id', 'dblog_user_name', 'dblog_eventcode', 'dblog_caller', 'dblog_title', 'dblog_remarks'), - 'downlog' => array('cf_datestring', 'dblog_ip', 'dblog_user_id', 'user_name', 'download_request_download_id', 'download_name'), - 'detailed' => array('cf_microtime', 'cf_microtimediff', 'source', 'dblog_type', 'dblog_ip', 'dblog_user_id', 'user_name', 'dblog_eventcode', 'dblog_title', 'dblog_remarks'), - 'online' => array('cf_datestring', 'dblog_ip', 'dblog_user_id', 'user_name', 'online_location', 'online_pagecount', 'online_flag', 'online_active')); - $col_widths = array( - 'adminlog' => array(18, 4, 14, 7, 15, 8, 14, 20), // Date - Pri - IP - UID - User - Code - Event - Info - 'auditlog' => array(18, 14, 7, 15, 8, 14, 24), - 'rolllog' => array(15, 4, 12, 6, 12, 7, 13, 13, 18), // Date - Pri - IP - UID - User - Code - Caller - Event - Info - 'downlog' => array(18, 14, 7, 15, 8, 38), - 'detailed' => array(10, 8, 6, 4, 14, 6, 17, 7, 17, 21), - 'comments' => array(14, 7, 7, 7, 14, 3, 10, 12, 5, 17, 1, 1, 1), - 'online' => array(18, 15, 7, 14, 32, 6, 4, 4)); - $col_titles = array( - 'adminlog' => array(RL_LAN_019, RL_LAN_032, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_023, RL_LAN_025, RL_LAN_033), - 'auditlog' => array(RL_LAN_019, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_023, RL_LAN_025, RL_LAN_033), - 'rolllog' => array(RL_LAN_019, RL_LAN_032, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_023, RL_LAN_024, RL_LAN_025, RL_LAN_033), - 'downlog' => array(RL_LAN_019, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_068, RL_LAN_069), - 'detailed' => array(LAN_TIME, RL_LAN_096, RL_LAN_098, RL_LAN_032, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_023, RL_LAN_025, RL_LAN_033), - 'online' => array(RL_LAN_019, RL_LAN_020, RL_LAN_021, RL_LAN_022, RL_LAN_116, RL_LAN_117, RL_LAN_118, RL_LAN_116)); - - - - // Only need to define entries in this array if the base DB query is non-standard (i.e. different field names and/or joins) - $base_query = array('downlog' => "SELECT SQL_CALC_FOUND_ROWS - dbl.download_request_id as dblog_id, - dbl.download_request_userid as dblog_user_id, - dbl.download_request_ip as dblog_ip, - dbl.download_request_download_id, - dbl.download_request_datestamp as dblog_datestamp, - d.download_name, - u.user_name - FROM #download_requests AS dbl - LEFT JOIN #user AS u ON dbl.download_request_userid=u.user_id - LEFT JOIN #download AS d ON dbl.download_request_download_id=d.download_id - ", 'detailed' => "SELECT SQL_CALC_FOUND_ROWS cl.*, u.* FROM ( - SELECT dblog_datestamp + (dblog_microtime/1000000) AS dblog_time, dblog_user_id, dblog_eventcode, dblog_title, dblog_remarks, dblog_type, dblog_ip, 'roll' AS source FROM `#dblog` - UNION - SELECT dblog_datestamp + (dblog_microtime/1000000) AS dblog_time, dblog_user_id, dblog_eventcode, dblog_title, dblog_remarks, '-' AS dblog_type, dblog_ip, 'audit' AS source FROM `#audit_log` - UNION - SELECT dblog_datestamp + (dblog_microtime/1000000) AS dblog_time, dblog_user_id, dblog_eventcode, dblog_title, dblog_remarks, dblog_type, dblog_ip, 'admin' AS source FROM `#admin_log`) AS cl - LEFT JOIN `#user` AS u ON cl.dblog_user_id=u.user_id ", 'comments' => "SELECT SQL_CALC_FOUND_ROWS *, comment_datestamp AS dblog_datestamp FROM `#comments` AS c", 'online' => "SELECT SQL_CALC_FOUND_ROWS online_timestamp AS dblog_datestamp, - online_ip AS dblog_ip, - SUBSTRING_INDEX(online_user_id,'.',1) AS dblog_user_id, - SUBSTRING(online_user_id FROM LOCATE('.',online_user_id)+1) AS user_name, - `online_location`, `online_pagecount`, `online_flag`, `online_active` - FROM `#online`"); - - // The filters have to use the 'actual' db field names. So the following table sets the defaults and the exceptions which vary across the range of tables supported - $map_filters = array('default' => array('datetimes' => '`dblog_datestamp`', 'ipfilter' => '`dblog_ip`', 'userfilter' => '`dblog_user_id`', 'eventfilter' => '`dblog_eventcode`'), 'downlog' => array('datetimes' => '`download_request_datestamp`', 'ipfilter' => '`download_request_ip`', 'userfilter' => '`download_request_userid`'), 'detailed' => array('datestart' => '`dblog_time`'), 'comments' => array('datetimes' => '`comment_datestamp`', 'ipfilter' => '`comment_ip`', 'eventfilter' => 'comment_type', 'userfilter' => '`comment_author_id`'), 'online' => array('online_ip' => '`dblog_ip`', 'online_user_id' => '`dblog_user_id`')); - - // Field to sort table on - $sort_fields = array('default' => 'dblog_id', 'detailed' => 'dblog_time', 'comments' => 'comment_datestamp', 'online' => 'online_timestamp'); - - // Check things - if($start_time >= $end_time) - { // Make end time beginning of tomorrow - $tempdate = getdate(); - $end_time = mktime(0, 0, 0, $tempdate['mon'], $tempdate['mday'] + 1, $tempdate['year']); // Seems odd, but mktime will work this out OK - // (or so the manual says) - } - - // Now work out the query - only use those filters which are displayed - $qry = ''; - $and_array = array(); - foreach($active_filters[$action] as $fname => $fpars) - { - $filter_field = varset($map_filters[$action][$fname], $map_filters['default'][$fname]); - switch($fname) - { - case 'datetimes': - if($start_enabled && ($start_time > 0)) - $and_array[] = "{$filter_field} >= ".intval($start_time); - if($end_enabled && ($end_time > 0)) - $and_array[] = "{$filter_field} <= ".intval($end_time); - break; - case 'datestart': - if($start_time == 0) - { - $end_time = time(); - $start_time = $end_time - 300; // Default to last 5 mins - } - $and_array[] = "{$filter_field} >= ".intval($start_time); - $and_array[] = "{$filter_field} <= ".intval($end_time); - break; - case 'ipfilter': - if($ipaddress_filter != "") - { - if(substr($ipaddress_filter, - 1) == '*') - { // Wildcard to handle - mySQL uses % - $and_array[] = "{$filter_field} LIKE '".substr($ipaddress_filter, 0, - 1)."%' "; - } - else - { - $and_array[] = "{$filter_field}= '".$ipaddress_filter."' "; - } - } - break; - case 'userfilter': - if($user_filter != '') - $and_array[] = "{$filter_field} = ".intval($user_filter); - break; - case 'eventfilter': - if($event_filter != '') - { - if(substr($event_filter, - 1) == '*') - { // Wildcard to handle - mySQL uses % - $and_array[] = " {$filter_field} LIKE '".substr($event_filter, 0, - 1)."%' "; - } - else - { - $and_array[] = "{$filter_field}= '".$event_filter."' "; - } - } - break; - case 'callerfilter': - if($caller_filter != '') - { - if(substr($caller_filter, - 1) == '*') - { // Wildcard to handle - mySQL uses % - $and_array[] = "dblog_caller LIKE '".substr($caller_filter, 0, - 1)."%' "; - } - else - { - $and_array[] = "dblog_caller= '".$caller_filter."' "; - } - } - break; - case 'priority': - if(($pri_filter_val != "") && ($pri_filter_cond != "") && ($pri_filter_cond != "xx")) - { - switch($pri_filter_cond) - { - case "lt": - $and_array[] = "dblog_type <= '{$pri_filter_val}' "; - break; - case "eq": - $and_array[] = "dblog_type = '{$pri_filter_val}' "; - break; - case "gt": - $and_array[] = "dblog_type >= '{$pri_filter_val}' "; - break; - } - } - break; - case 'downloadidfilter': - if($downloadid_filter != '') - $and_array[] = "download_request_download_id = ".intval($downloadid_filter); - break; - } - } - - if(count($and_array)) - $qry = " WHERE ".implode(' AND ', $and_array); - - $limit_clause = " LIMIT {$from}, {$amount} "; - $sort_field = varset($sort_fields[$action], $sort_fields['default']); - - if(isset($base_query[$action])) - { - $qry = $base_query[$action].$qry." ORDER BY {$sort_field} ".$sort_order; - } - else - { - $qry = "SELECT SQL_CALC_FOUND_ROWS dbl.*,u.user_name FROM #".$log_db_table[$action]." AS dbl LEFT JOIN #user AS u ON dbl.dblog_user_id=u.user_id".$qry." ORDER BY {$sort_field} ".$sort_order; - } - - $num_entry = 0; - if($sql->db_Select_gen($qry.$limit_clause)) - { - $num_entry = $sql->total_results; - } - if($from > $num_entry) - { - $from = 0; // We may be on a later page - $limit_clause = " LIMIT {$from}, {$amount} "; - $sql->db_Select_gen($qry.$limit_clause); // Re-run query with new value of $from - $num_entry = $sql->total_results; - } - - // Start by putting up the filter boxes - $text = " -
-
- ".RL_LAN_012." - - - - - - - - "; - $filter_cols = 0; - foreach($active_filters[$action] as $fname => $fpars) - { - if($filter_cols == 0) - $text .= ''; - switch($fname) - { - case 'datetimes': - $text .= " - - - - - "; - $filter_cols = 4; - break; - case 'datestart': - $text .= " - - - - "; - $filter_cols = 4; - break; - case 'priority': - $text .= " - - - "; - $filter_cols += 2; - break; - case 'ipfilter': - $text .= " - - - "; - $filter_cols += 2; - break; - case 'userfilter': - $text .= " - - - "; - $filter_cols += 2; - break; - case 'eventfilter': - $text .= " - - - "; - $filter_cols += 2; - break; - case 'callerfilter': - $text .= " - - - "; - $filter_cols += 2; - break; - case 'downloadidfilter': - $text .= " - - "; - $filter_cols += 2; - break; - case 'blank': // Any number of blank cells - $text .= str_repeat("", $fpars); - $filter_cols += $fpars; - break; - } - if($filter_cols >= 4) - { - $text .= ''; - $filter_cols = 0; - } - } - - // $text .= ""; - $text .= " -
- - - ".time_box("starttime", $start_time, $back_day_count[$action], FALSE)." - - - ".time_box("endtime", $end_time, $back_day_count[$action], TRUE)." - ".RL_LAN_013."".time_box("starttime", $start_time, $back_day_count[$action], FALSE, TRUE)."".RL_LAN_092." - ".RL_LAN_093." - ".RL_LAN_058." - - - ".RL_LAN_060." - -
".RL_LAN_061."
- 		".RL_LAN_015." - -
".RL_LAN_016."
- 		".RL_LAN_029." - -
".RL_LAN_061."
- 		".RL_LAN_059." - -
".RL_LAN_061."
- 		".RL_LAN_090." - -  
Query = ".$qry.$limit_clause."
{$_COOKIE[$rl_cookiename]}
-
- - -
-
-
- "; - - // Next bit is the actual log display - the arrays define column widths, titles, fields etc for each log - $column_count = count($col_widths[$action]); - $text .= " -
-
- {$page_title[$action]} - - - "; - - foreach($col_widths[$action] as $i) - { - $text .= " - - "; - } - - $text .= " - - - "; - - if($num_entry == 0) - { - $text .= " - - - - "; - } - else - { // Start with header - $text .= ' - - - '; - $count = 1; - foreach($col_titles[$action] as $ct) - { - count($col_titles[$action]); - $text .= " - {$ct} - "; - $count ++; - } - $text .= " - - - - "; - - // Routine to handle the simple bbcode-like codes for log body text - function log_process($matches) - { - switch($matches[1]) - { - case 'br': - return '
'; - case 'link': - $temp = substr($matches[2], 1); - return "{$temp}"; - case 'test': - return '----TEST----'; - default: - return $matches[0]; // No change - } - } - // Now put up the events - $delete_button = FALSE; - while($row = $sql->db_Fetch()) - { - $text .= ''; - foreach($col_fields[$action] as $cf) - { - switch($cf) - { - case 'cf_datestring': - $val = date(AL_DATE_TIME_FORMAT, $row['dblog_datestamp']); - break; - case 'cf_microtime': - $val = date("H:i:s", intval($row['dblog_time']) % 86400).'.'.str_pad(100000 * round($row['dblog_time'] - floor($row['dblog_time']), 6), 6, '0'); - break; - case 'cf_microtimediff': - $val = ' '; - if($last_noted_time > 0) - { - $val = number_format($last_noted_time - $row['dblog_time'], 6, '.', ''); - } - $last_noted_time = $row['dblog_time']; - break; - case 'cf_eventcode': - $val = 'ADMIN'.$row['dblog_eventcode']; - break; - case 'dblog_title': // Look up constants to give multi-language viewing - $val = trim($row['dblog_title']); - if(defined($val)) - $val = constant($val); - break; - case 'dblog_user_name': - $val = $row['dblog_user_id'] ? $row['dblog_user_name'] : LAN_ANONYMOUS; - break; - case 'user_name': - $val = $row['dblog_user_id'] ? $row['user_name'] : LAN_ANONYMOUS; - break; - case 'dblog_caller': - $val = $row['dblog_caller']; - if((strpos($val, '|') !== FALSE) && (strpos($val, '@') !== FALSE)) - { - list($file, $rest) = explode('|', $val); - list($routine, $rest) = explode('@', $rest); - $val = $file.'
Function: '.$routine.'
Line: '.$rest; - } - break; - case 'dblog_remarks': - // Look for pseudo-code for newlines, link insertion - $val = preg_replace_callback("#\[!(\w+?)(=.+?){0,1}!]#", 'log_process', $row['dblog_remarks']); - break; - case 'dblog_ip': - $val = e107::getIPHandler()->ipDecode($row['dblog_ip']); - break; - case 'comment_ip': - $val = e107::getIPHandler()->ipDecode($row['comment_ip']); - /* if (strlen($val) == 8) // New decoder should handle this automatically - { - $hexip = explode('.', chunk_split($val, 2, '.')); - $val = hexdec($hexip[0]). '.'.hexdec($hexip[1]).'.'.hexdec($hexip[2]).'.'.hexdec($hexip[3]); - } */ - break; - case 'comment_comment': - $val = $tp->text_truncate($row['comment_comment'], 100, '...'); // Just display first bit of comment - break; - case 'online_location': - $val = str_replace($e107->base_path, '', $row['online_location']); // Just display site-specific bit of path - break; - case 'del_check': // Put up a 'delete' checkbox - $val = ""; - $delete_button = TRUE; - break; - default: - $val = $row[$cf]; - } - $text .= ""; - } - $text .= ""; - } - } - $text .= " - -
".RL_LAN_017."
{$val}
-
- - "; - if($delete_button) - { - $text .= " - - "; - } - $text .= " -
-
-
- "; - - // Next-Previous. ========================== - - $text .= sprintf(RL_LAN_126, $num_entry); - if($num_entry > $amount) - { - $parms = "{$num_entry},{$amount},{$from},".e_SELF."?".$action.".[FROM]"; - $text .= "
".$tp->parseTemplate("{NEXTPREV={$parms}}")."
"; - } - - $ns->tablerender("{$page_title[$action]}", $emessage->render().$text); -} - -function admin_log_adminmenu() -{ - if(e_QUERY) - { - $tmp = explode(".", e_QUERY); - $action = $tmp[0]; - } - if($action == "") - { - $action = "adminlog"; - } - $var['adminlog']['text'] = RL_LAN_030; - $var['adminlog']['link'] = "admin_log.php?adminlog"; - - $var['auditlog']['text'] = RL_LAN_062; - $var['auditlog']['link'] = "admin_log.php?auditlog"; - - $var['rolllog']['text'] = RL_LAN_002; - $var['rolllog']['link'] = "admin_log.php?rolllog"; - - $var['downlog']['text'] = RL_LAN_067; - $var['downlog']['link'] = "admin_log.php?downlog"; - - $var['detailed']['text'] = RL_LAN_091; - $var['detailed']['link'] = "admin_log.php?detailed"; - -// Deprecated by Comments Manager. -/* - $var['comments']['text'] = 'Comments'; - $var['comments']['link'] = "admin_log.php?comments"; -*/ - $var['config']['text'] = LAN_OPTIONS; - $var['config']['link'] = "admin_log.php?config"; - - /* XXX - why?! - if($action == 'comments') - { - $var['users']['text'] = RL_LAN_115; - $var['users']['link'] = "users.php"; - } - */ - e_admin_menu(RL_LAN_005, $action, $var); -} - -require_once (e_ADMIN."footer.php"); - -function gen_log_delete($selectname) -{ - $values = array(90, 60, 30, 21, 20, 14, 10, 7, 6, 5, 4, 3, 2, 1); - $ret = ""; - return $ret; -} - -/** - * Handle page DOM within the page header - * - * @return string JS source - */ -function headerjs() -{ - require_once(e_HANDLER.'js_helper.php'); - $ret = " - - - "; - - return $ret; -} - + $file) + { + $file = str_replace('--LAN--', e_LANGUAGE, $file); + include_lan(e_PLUGIN.$path.'/'.$file); + } +} + +unset($qs); + +require_once (e_ADMIN.'auth.php'); +require_once (e_HANDLER.'message_handler.php'); +require_once (e_HANDLER.'form_handler.php'); +$emessage = &eMessage::getInstance(); +$frm = new e_form(false); + +define('AL_DATE_TIME_FORMAT', 'y-m-d H:i:s'); + +if(isset($_POST['setoptions'])) +{ + unset($temp); + + if(in_array((string) USER_AUDIT_LOGIN, $_POST['user_audit_opts'])) + { + $_POST['user_audit_opts'][] = USER_AUDIT_LOGOUT; + } + foreach($_POST['user_audit_opts'] as $k => $v) + { + if(! is_numeric($v)) + { + unset($_POST['user_audit_opts'][$k]); + } + } + $temp['roll_log_active'] = intval($_POST['roll_log_active']); + $temp['roll_log_days'] = intval($_POST['roll_log_days']); + $temp['sys_log_perpage'] = intval($_POST['sys_log_perpage']); + $temp['user_audit_opts'] = implode(',', $_POST['user_audit_opts']); + $temp['user_audit_class'] = intval($_POST['user_audit_class']); + + if($admin_log->logArrayDiffs($temp, $pref, 'ADLOG_01') || $admin_log->logArrayDiffs($temp, $pref, 'ADLOG_04')) + { + save_prefs(); // Only save if changes + $emessage->add(RL_LAN_006, E_MESSAGE_SUCCESS); + } + else + { + $emessage->add(LAN_NO_CHANGE); + } + +} + +if(e_QUERY) +{ // Must explode after calling auth.php + $qs = explode(".", e_QUERY); +} + +$action = varset($qs[0], 'adminlog'); + +// Deprecated by Comments Manager +/* +if(isset($_POST['deleteitems']) && ($action == 'comments')) +{ + $c_list = array(); + foreach($_POST['del_item'] as $di) + { + if(intval($di) > 0) + $c_list[] = '`comment_id`='.intval($di); + } + if($count = $sql->db_Delete('comments', implode(' OR ', $c_list))) + { + //$text = str_replace('--NUMBER--', $count,RL_LAN_112); + $emessage->add(str_replace('--NUMBER--', $count, RL_LAN_112), E_MESSAGE_SUCCESS); + $admin_log->log_event('COMMENT_01', 'ID: '.implode(',', $_POST['del_item']), E_LOG_INFORMATIVE, ''); + } + else + { + //$text = RL_LAN_113; + $emessage->add(RL_LAN_113, E_MESSAGE_WARNING); + } + //$ns -> tablerender(LAN_DELETE, "
".$text."
"); + unset($c_list); +} +*/ + +// ****************** MAINTENANCE ****************** +unset($back_count); +if(isset($_POST['deleteoldadmin']) && isset($_POST['rolllog_clearadmin'])) +{ + $back_count = intval($_POST['rolllog_clearadmin']); + $next_action = 'confdel'; +} +elseif(isset($_POST['deleteoldaudit']) && isset($_POST['rolllog_clearaudit'])) +{ + $back_count = intval($_POST['rolllog_clearaudit']); + $next_action = 'auditdel'; +} + +if(isset($back_count) && isset($next_action)) +{ + if(($back_count >= 1) && ($back_count <= 90)) + { + $temp_date = getdate(); + $old_date = intval(mktime(0, 0, 0, $temp_date['mon'], $temp_date['mday'] - $back_count, $temp_date['year'])); + $old_string = strftime("%d %B %Y", $old_date); + // $message = "Back delete ".$back_count." days. Oldest date = ".$old_string; + $action = $next_action; + $qs[1] = $old_date; + $qs[2] = $back_count; + } + else $emessage->add(RL_LAN_050, E_MESSAGE_WARNING); + //$message = RL_LAN_050; +} + +if(!isset($admin_log)) + $emessage->add("Admin Log not valid", E_MESSAGE_WARNING); + //$message .= " Admin Log not valid"; + +// Actually delete back events - admin or user audit log +if(($action == "backdel") && isset($_POST['backdeltype'])) +{ + if(isset($_POST['confirmdeleteold'])) + { + $old_date = intval($qs[1]); + $old_string = strftime("%d %B %Y", $old_date); + $qry = "dblog_datestamp < ".$old_date; // Same field for both logs + switch($_POST['backdeltype']) + { + case 'confdel': + $db_table = 'admin_log'; + $db_name = RL_LAN_052; + $db_msg = "ADLOG_02"; + break; + case 'auditdel': + $db_table = 'audit_log'; + $db_name = RL_LAN_053; + $db_msg = "ADLOG_03"; + break; + default: + exit(); // Someone fooling around! + } + // $message = "Back delete, oldest date = {$old_string} Query = {$qry}"; + if($del_count = $sql->db_Delete($db_table, $qry)) + { + // Add in a log event + $message = $db_name.str_replace(array('--OLD--', '--NUM--'), array($old_string, $del_count), RL_LAN_057); + $emessage->add($message, E_MESSAGE_SUCCESS); + $admin_log->log_event($db_msg, "db_Delete - earlier than {$old_string} (past {$qs[2]} days)[!br!]".$message.'[!br!]'.$db_table.' '.$qry, E_LOG_INFORMATIVE, ''); + } + else + { + //$message = RL_LAN_054." : ".$sql->mySQLresult; + $emessage->add(RL_LAN_054." : ".$sql->mySQLresult, E_MESSAGE_WARNING); + } + } else + $emessage->add(RL_LAN_056); //info + + $action = "config"; + unset($qs[1]); + unset($qs[2]); +} + +/* +if(varsettrue($message)) +{ + $ns->tablerender("", "
$message
"); +} +*/ + +// Prompt to delete back events +if(($action == "confdel") || ($action == "auditdel")) +{ + $old_string = strftime("%d %B %Y", $qs[1]); + $text = " +
+
+ ".LAN_CONFDELETE." + + + + +
+ ".(($action == "confdel") ? RL_LAN_047 : RL_LAN_065).$old_string." +
+
+ + $frm->admin_button('confirmdeleteold', 'no-value', 'delete', RL_LAN_049); + $frm->admin_button('confirmcancelold', 'no-value', 'delete', LAN_CANCEL); +
+
+
+ + "; + + $ns->tablerender(LAN_CONFDELETE, $text); +} + +// Arrays of options for the various logs - the $page_title array is used to determine the allowable values for $action ('options' is a special case) +$log_db_table = array('adminlog' => 'admin_log', 'auditlog' => 'audit_log', 'rolllog' => 'dblog', 'downlog' => 'download_requests', 'online' => 'online'); +$back_day_count = array('adminlog' => 30, 'auditlog' => 30, 'rolllog' => max(intval($pref['roll_log_days']), 1), 'downlog' => 60, 'detailed' => 20, 'online' => 30); +$page_title = array('adminlog' => RL_LAN_030, 'auditlog' => RL_LAN_062, 'rolllog' => RL_LAN_002, 'downlog' => RL_LAN_067, 'detailed' => RL_LAN_094, 'online' => RL_LAN_120); + +// Set all the defaults for the data filter +$start_enabled = FALSE; +$end_enabled = FALSE; +$start_time = 0; +$end_time = 0; +$user_filter = ''; +$event_filter = ''; +$pri_filter_cond = "xx"; +$pri_filter_val = ""; +$sort_order = "DESC"; +$downloadid_filter = ''; + +$last_noted_time = 0; + +// Maintain the log view filter across pages +$rl_cookiename = $pref['cookie_name']."_rl_admin"; +if(isset($_POST['updatefilters']) || isset($_POST['clearfilters'])) +{ // Need to put the filter values into the cookie + if(! isset($_POST['clearfilters'])) + { // Only update filter values from $_POST[] if 'clear filters' not active + $start_time = intval($_POST['starttimedate'] + $_POST['starttimehours'] * 3600 + $_POST['starttimemins'] * 60); + $start_enabled = isset($_POST['start_enabled']); + if(isset($_POST['timelength'])) + { + $end_time = intval($_POST['timelength']) * 60 + $start_time; + } + else + { + $end_time = intval($_POST['endtimedate'] + $_POST['endtimehours'] * 3600 + $_POST['endtimemins'] * 60); + } + $end_enabled = isset($_POST['end_enabled']); + $user_filter = trim(varset($_POST['roll_user_filter'], '')); + if($user_filter != '') + $user_filter = intval($user_filter); + $event_filter = $tp->toDB($_POST['roll_event_filter']); + $pri_filter_cond = $tp->toDB($_POST['roll_pri_cond']); + $pri_filter_val = $tp->toDB($_POST['roll_pri_val']); + $caller_filter = $tp->toDB($_POST['roll_caller_filter']); + $ipaddress_filter = $e107->ipEncode($tp->toDB($_POST['roll_ipaddress_filter'])); + $downloadid_filter = $tp->toDB($_POST['roll_downloadid_filter']); + } + $cookie_string = implode("|", array($start_time, $start_enabled, $end_time, $end_enabled, $user_filter, $event_filter, $pri_filter_cond, $pri_filter_val, $caller_filter, $ipaddress_filter, $downloadid_filter)); + // echo $cookie_string."
"; + // Create session cookie to store values + cookie($rl_cookiename, $cookie_string, 0); // Use session cookie +} +else +{ + // Now try and get the filters from the cookie + if(isset($_COOKIE[$rl_cookiename])) + list($start_time, $start_enabled, $end_time, $end_enabled, $user_filter, $event_filter, $pri_filter_cond, $pri_filter_val, $caller_filter, $ipaddress_filter, $downloadid_filter) = explode("|", $_COOKIE[$rl_cookiename]); + if(isset($qs[1]) && isset($qs[2]) && ($qs[1] == 'user') && (intval($qs[2]) > 0)) + { + $user_filter = intval($qs[2]); + } +} + +$timelength = 5; +if($start_time != 0 && $end_time != 0) + $timelength = intval(($end_time - $start_time) / 60); + +function time_box($boxname, $this_time, $day_count, $inc_tomorrow = FALSE, $all_mins = FALSE) +{ // Generates boxes for date and time for today and the preceding days + // Appends 'date', 'hours', 'mins' to the specified boxname + + + $all_time = getdate(); // Date/time now + $sel_time = getdate($this_time); // Currently selected date/time + $sel_day = mktime(0, 0, 0, $sel_time['mon'], $sel_time['mday'], $sel_time['year']); + $today = mktime(0, 0, 0, $all_time['mon'], $all_time['mday'] + ($inc_tomorrow ? 1 : 0), $all_time['year']); + + // Start with day + $ret = ""; + + // Hours + $ret .= " "; + + // Minutes + $ret .= " "; + + return $ret; +} + +if(! defined("USER_WIDTH")) +{ + define("USER_WIDTH", "width:97%"); +} + +//==================================================================== +// CONFIGURATION OPTIONS MENU +//==================================================================== + + +if($action == "config") +{ + // User Audit log options (for info) + //======================= + // define('USER_AUDIT_SIGNUP',11); // User signed up + // define('USER_AUDIT_EMAILACK',12); // User responded to registration email + // define('USER_AUDIT_LOGIN',13); // User logged in + // define('USER_AUDIT_LOGOUT',14); // User logged out + // define('USER_AUDIT_NEW_DN',15); // User changed display name + // define('USER_AUDIT_NEW_PW',16); // User changed password + // define('USER_AUDIT_NEW_EML',17); // User changed email + // define('USER_AUDIT_NEW_SET',19); // User changed other settings (intentional gap in numbering) + // define('USER_AUDIT_ADD_ADMIN', 20); // User added by admin + // define('USER_AUDIT_MAIL_BOUNCE', 21); // User mail bounce + // define('USER_AUDIT_BANNED', 22); // User banned + // define('USER_AUDIT_BOUNCE_RESET', 23); // User bounce reset + // define('USER_AUDIT_TEMP_ACCOUNT', 24); // User temporary account + + + $audit_checkboxes = array(USER_AUDIT_SIGNUP => RL_LAN_071, USER_AUDIT_EMAILACK => RL_LAN_072, USER_AUDIT_LOGIN => RL_LAN_073, // USER_AUDIT_LOGOUT => RL_LAN_074, // Logout is lumped in with login + USER_AUDIT_NEW_DN => RL_LAN_075, USER_AUDIT_NEW_PW => RL_LAN_076, USER_AUDIT_PW_RES => RL_LAN_078, USER_AUDIT_NEW_EML => RL_LAN_077, USER_AUDIT_NEW_SET => RL_LAN_079, + USER_AUDIT_ADD_ADMIN => RL_LAN_080, USER_AUDIT_MAIL_BOUNCE => RL_LAN_081, USER_AUDIT_BANNED => RL_LAN_082, USER_AUDIT_BOUNCE_RESET => RL_LAN_083, + USER_AUDIT_TEMP_ACCOUNT => RL_LAN_084); + + if(! isset($e_userclass) && ! is_object($e_userclass)) + { + require_once (e_HANDLER."userclass_class.php"); + $e_userclass = new user_class(); + } + + $user_signup_opts = array_flip(explode(',', varset($pref['user_audit_opts'], ''))); + + // Common to all logs + $text = " +
+ ".RL_LAN_121." +
+
+ ".RL_LAN_122." + + + + + + + + + + + "; + + // User Audit Trail Options + $text .= " + + + + + + + + + "; + + + // Rolling log options + //==================== + $text .= " + + + + + + + + + +
".RL_LAN_044." + +
".RL_LAN_064."
+
".RL_LAN_123." + +
".RL_LAN_026."
+
".RL_LAN_124." + ".RL_LAN_031." + "; + foreach($audit_checkboxes as $k => $t) + { + $text .= " +
+ "; + } + $text .= " +
".$frm->admin_button('check_all', 'jstarget:user_audit_opts', 'action', LAN_CHECKALL).$frm->admin_button('uncheck_all', 'jstarget:user_audit_opts', 'action', LAN_UNCHECKALL)."
+
".RL_LAN_008." +
+ +
+
".RL_LAN_009." + +
+
+ ".$frm->admin_button('setoptions', 'no-value', 'update', LAN_UPDATE)." +
+
+
+ "; + + // Admin log maintenance + //================== + $text .= " +
+
+ ".RL_LAN_125." + + + + + + + + + + + "; + + // User log maintenance + //==================== + $text .= " + + + + + +
".RL_LAN_045." + ".gen_log_delete('rolllog_clearadmin').RL_LAN_046.$frm->admin_button('deleteoldadmin', 'no-value', 'delete', RL_LAN_049)." +
".RL_LAN_066." + ".gen_log_delete('rolllog_clearaudit').RL_LAN_046.$frm->admin_button('deleteoldaudit', 'no-value', 'delete', RL_LAN_049)." +
+
+
+ +
+ "; + + $ns->tablerender(RL_LAN_121, $emessage->render().$text); +} + +//==================================================================== +// LOG VIEW MENU +//==================================================================== +if(isset($page_title[$action])) +{ + $from = intval(varset($qs[1], 0)); // First entry to display + $amount = max(varset($pref['sys_log_perpage'], 20), 5); // Number of entries per page + + + // Array decides which filters are active for each log. There are 4 columns total. All but 'datetimes' occupy 2. Must specify multiple of 4 columns - add 'blank' if necessary + $active_filters = array( + 'adminlog' => array('datetimes' => 0, 'ipfilter' => 0, 'userfilter' => 0, 'eventfilter' => 0, 'priority' => 0), + 'auditlog' => array('datetimes' => 0, 'ipfilter' => 0, 'userfilter' => 0, 'eventfilter' => 0, 'blank' => 2), + 'rolllog' => array('datetimes' => 0, 'ipfilter' => 0, 'userfilter' => 0, 'eventfilter' => 0, 'priority' => 0, 'callerfilter' => 0, 'blank' => 2), + 'downlog' => array('datetimes' => 0, 'ipfilter' => 0, 'userfilter' => 0, 'downloadidfilter' => 0, 'blank' => 2), + 'detailed' => array('datestart' => 0, 'ipfilter' => 0, 'userfilter' => 0, 'eventfilter' => 0, 'blank' => 2), + 'online' => array('ipfilter' => 0, 'userfilter' => 0)); + + // Arrays determine column widths, headings, displayed fields for each log + $col_fields = array( + 'adminlog' => array('cf_datestring', 'dblog_type', 'dblog_ip', 'dblog_user_id', 'user_name', 'dblog_eventcode', 'dblog_title', 'dblog_remarks'), + 'auditlog' => array('cf_datestring', 'dblog_ip', 'dblog_user_id', 'dblog_user_name', 'dblog_eventcode', 'dblog_title', 'dblog_remarks'), + 'rolllog' => array('cf_datestring', 'dblog_type', 'dblog_ip', 'dblog_user_id', 'dblog_user_name', 'dblog_eventcode', 'dblog_caller', 'dblog_title', 'dblog_remarks'), + 'downlog' => array('cf_datestring', 'dblog_ip', 'dblog_user_id', 'user_name', 'download_request_download_id', 'download_name'), + 'detailed' => array('cf_microtime', 'cf_microtimediff', 'source', 'dblog_type', 'dblog_ip', 'dblog_user_id', 'user_name', 'dblog_eventcode', 'dblog_title', 'dblog_remarks'), + 'online' => array('cf_datestring', 'dblog_ip', 'dblog_user_id', 'user_name', 'online_location', 'online_pagecount', 'online_flag', 'online_active')); + $col_widths = array( + 'adminlog' => array(18, 4, 14, 7, 15, 8, 14, 20), // Date - Pri - IP - UID - User - Code - Event - Info + 'auditlog' => array(18, 14, 7, 15, 8, 14, 24), + 'rolllog' => array(15, 4, 12, 6, 12, 7, 13, 13, 18), // Date - Pri - IP - UID - User - Code - Caller - Event - Info + 'downlog' => array(18, 14, 7, 15, 8, 38), + 'detailed' => array(10, 8, 6, 4, 14, 6, 17, 7, 17, 21), + 'comments' => array(14, 7, 7, 7, 14, 3, 10, 12, 5, 17, 1, 1, 1), + 'online' => array(18, 15, 7, 14, 32, 6, 4, 4)); + $col_titles = array( + 'adminlog' => array(RL_LAN_019, RL_LAN_032, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_023, RL_LAN_025, RL_LAN_033), + 'auditlog' => array(RL_LAN_019, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_023, RL_LAN_025, RL_LAN_033), + 'rolllog' => array(RL_LAN_019, RL_LAN_032, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_023, RL_LAN_024, RL_LAN_025, RL_LAN_033), + 'downlog' => array(RL_LAN_019, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_068, RL_LAN_069), + 'detailed' => array(LAN_TIME, RL_LAN_096, RL_LAN_098, RL_LAN_032, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_023, RL_LAN_025, RL_LAN_033), + 'online' => array(RL_LAN_019, RL_LAN_020, RL_LAN_021, RL_LAN_022, RL_LAN_116, RL_LAN_117, RL_LAN_118, RL_LAN_116)); + + + + // Only need to define entries in this array if the base DB query is non-standard (i.e. different field names and/or joins) + $base_query = array('downlog' => "SELECT SQL_CALC_FOUND_ROWS + dbl.download_request_id as dblog_id, + dbl.download_request_userid as dblog_user_id, + dbl.download_request_ip as dblog_ip, + dbl.download_request_download_id, + dbl.download_request_datestamp as dblog_datestamp, + d.download_name, + u.user_name + FROM #download_requests AS dbl + LEFT JOIN #user AS u ON dbl.download_request_userid=u.user_id + LEFT JOIN #download AS d ON dbl.download_request_download_id=d.download_id + ", 'detailed' => "SELECT SQL_CALC_FOUND_ROWS cl.*, u.* FROM ( + SELECT dblog_datestamp + (dblog_microtime/1000000) AS dblog_time, dblog_user_id, dblog_eventcode, dblog_title, dblog_remarks, dblog_type, dblog_ip, 'roll' AS source FROM `#dblog` + UNION + SELECT dblog_datestamp + (dblog_microtime/1000000) AS dblog_time, dblog_user_id, dblog_eventcode, dblog_title, dblog_remarks, '-' AS dblog_type, dblog_ip, 'audit' AS source FROM `#audit_log` + UNION + SELECT dblog_datestamp + (dblog_microtime/1000000) AS dblog_time, dblog_user_id, dblog_eventcode, dblog_title, dblog_remarks, dblog_type, dblog_ip, 'admin' AS source FROM `#admin_log`) AS cl + LEFT JOIN `#user` AS u ON cl.dblog_user_id=u.user_id ", 'comments' => "SELECT SQL_CALC_FOUND_ROWS *, comment_datestamp AS dblog_datestamp FROM `#comments` AS c", 'online' => "SELECT SQL_CALC_FOUND_ROWS online_timestamp AS dblog_datestamp, + online_ip AS dblog_ip, + SUBSTRING_INDEX(online_user_id,'.',1) AS dblog_user_id, + SUBSTRING(online_user_id FROM LOCATE('.',online_user_id)+1) AS user_name, + `online_location`, `online_pagecount`, `online_flag`, `online_active` + FROM `#online`"); + + // The filters have to use the 'actual' db field names. So the following table sets the defaults and the exceptions which vary across the range of tables supported + $map_filters = array('default' => array('datetimes' => '`dblog_datestamp`', 'ipfilter' => '`dblog_ip`', 'userfilter' => '`dblog_user_id`', 'eventfilter' => '`dblog_eventcode`'), 'downlog' => array('datetimes' => '`download_request_datestamp`', 'ipfilter' => '`download_request_ip`', 'userfilter' => '`download_request_userid`'), 'detailed' => array('datestart' => '`dblog_time`'), 'comments' => array('datetimes' => '`comment_datestamp`', 'ipfilter' => '`comment_ip`', 'eventfilter' => 'comment_type', 'userfilter' => '`comment_author_id`'), 'online' => array('online_ip' => '`dblog_ip`', 'online_user_id' => '`dblog_user_id`')); + + // Field to sort table on + $sort_fields = array('default' => 'dblog_id', 'detailed' => 'dblog_time', 'comments' => 'comment_datestamp', 'online' => 'online_timestamp'); + + // Check things + if($start_time >= $end_time) + { // Make end time beginning of tomorrow + $tempdate = getdate(); + $end_time = mktime(0, 0, 0, $tempdate['mon'], $tempdate['mday'] + 1, $tempdate['year']); // Seems odd, but mktime will work this out OK + // (or so the manual says) + } + + // Now work out the query - only use those filters which are displayed + $qry = ''; + $and_array = array(); + foreach($active_filters[$action] as $fname => $fpars) + { + $filter_field = varset($map_filters[$action][$fname], $map_filters['default'][$fname]); + switch($fname) + { + case 'datetimes': + if($start_enabled && ($start_time > 0)) + $and_array[] = "{$filter_field} >= ".intval($start_time); + if($end_enabled && ($end_time > 0)) + $and_array[] = "{$filter_field} <= ".intval($end_time); + break; + case 'datestart': + if($start_time == 0) + { + $end_time = time(); + $start_time = $end_time - 300; // Default to last 5 mins + } + $and_array[] = "{$filter_field} >= ".intval($start_time); + $and_array[] = "{$filter_field} <= ".intval($end_time); + break; + case 'ipfilter': + if($ipaddress_filter != "") + { + if(substr($ipaddress_filter, - 1) == '*') + { // Wildcard to handle - mySQL uses % + $and_array[] = "{$filter_field} LIKE '".substr($ipaddress_filter, 0, - 1)."%' "; + } + else + { + $and_array[] = "{$filter_field}= '".$ipaddress_filter."' "; + } + } + break; + case 'userfilter': + if($user_filter != '') + $and_array[] = "{$filter_field} = ".intval($user_filter); + break; + case 'eventfilter': + if($event_filter != '') + { + if(substr($event_filter, - 1) == '*') + { // Wildcard to handle - mySQL uses % + $and_array[] = " {$filter_field} LIKE '".substr($event_filter, 0, - 1)."%' "; + } + else + { + $and_array[] = "{$filter_field}= '".$event_filter."' "; + } + } + break; + case 'callerfilter': + if($caller_filter != '') + { + if(substr($caller_filter, - 1) == '*') + { // Wildcard to handle - mySQL uses % + $and_array[] = "dblog_caller LIKE '".substr($caller_filter, 0, - 1)."%' "; + } + else + { + $and_array[] = "dblog_caller= '".$caller_filter."' "; + } + } + break; + case 'priority': + if(($pri_filter_val != "") && ($pri_filter_cond != "") && ($pri_filter_cond != "xx")) + { + switch($pri_filter_cond) + { + case "lt": + $and_array[] = "dblog_type <= '{$pri_filter_val}' "; + break; + case "eq": + $and_array[] = "dblog_type = '{$pri_filter_val}' "; + break; + case "gt": + $and_array[] = "dblog_type >= '{$pri_filter_val}' "; + break; + } + } + break; + case 'downloadidfilter': + if($downloadid_filter != '') + $and_array[] = "download_request_download_id = ".intval($downloadid_filter); + break; + } + } + + if(count($and_array)) + $qry = " WHERE ".implode(' AND ', $and_array); + + $limit_clause = " LIMIT {$from}, {$amount} "; + $sort_field = varset($sort_fields[$action], $sort_fields['default']); + + if(isset($base_query[$action])) + { + $qry = $base_query[$action].$qry." ORDER BY {$sort_field} ".$sort_order; + } + else + { + $qry = "SELECT SQL_CALC_FOUND_ROWS dbl.*,u.user_name FROM #".$log_db_table[$action]." AS dbl LEFT JOIN #user AS u ON dbl.dblog_user_id=u.user_id".$qry." ORDER BY {$sort_field} ".$sort_order; + } + + $num_entry = 0; + if($sql->db_Select_gen($qry.$limit_clause)) + { + $num_entry = $sql->total_results; + } + if($from > $num_entry) + { + $from = 0; // We may be on a later page + $limit_clause = " LIMIT {$from}, {$amount} "; + $sql->db_Select_gen($qry.$limit_clause); // Re-run query with new value of $from + $num_entry = $sql->total_results; + } + + // Start by putting up the filter boxes + $text = " +
+
+ ".RL_LAN_012." + + + + + + + + "; + $filter_cols = 0; + foreach($active_filters[$action] as $fname => $fpars) + { + if($filter_cols == 0) + $text .= ''; + switch($fname) + { + case 'datetimes': + $text .= " + + + + + "; + $filter_cols = 4; + break; + case 'datestart': + $text .= " + + + + "; + $filter_cols = 4; + break; + case 'priority': + $text .= " + + + "; + $filter_cols += 2; + break; + case 'ipfilter': + $text .= " + + + "; + $filter_cols += 2; + break; + case 'userfilter': + $text .= " + + + "; + $filter_cols += 2; + break; + case 'eventfilter': + $text .= " + + + "; + $filter_cols += 2; + break; + case 'callerfilter': + $text .= " + + + "; + $filter_cols += 2; + break; + case 'downloadidfilter': + $text .= " + + "; + $filter_cols += 2; + break; + case 'blank': // Any number of blank cells + $text .= str_repeat("", $fpars); + $filter_cols += $fpars; + break; + } + if($filter_cols >= 4) + { + $text .= ''; + $filter_cols = 0; + } + } + + // $text .= ""; + $text .= " +
+ + + ".time_box("starttime", $start_time, $back_day_count[$action], FALSE)." + + + ".time_box("endtime", $end_time, $back_day_count[$action], TRUE)." + ".RL_LAN_013."".time_box("starttime", $start_time, $back_day_count[$action], FALSE, TRUE)."".RL_LAN_092." + ".RL_LAN_093." + ".RL_LAN_058." + + + ".RL_LAN_060." + +
".RL_LAN_061."
+ 		".RL_LAN_015." + +
".RL_LAN_016."
+ 		".RL_LAN_029." + +
".RL_LAN_061."
+ 		".RL_LAN_059." + +
".RL_LAN_061."
+ 		".RL_LAN_090." + +  
Query = ".$qry.$limit_clause."
{$_COOKIE[$rl_cookiename]}
+
+ ".$frm->admin_button('clearfilters', 'no-value', 'delete', RL_LAN_114)." + ".$frm->admin_button('updatefilters', 'no-value', 'update', RL_LAN_028)." +
+
+
+ "; + + // Next bit is the actual log display - the arrays define column widths, titles, fields etc for each log + $column_count = count($col_widths[$action]); + $text .= " +
+
+ {$page_title[$action]} + + + "; + + foreach($col_widths[$action] as $i) + { + $text .= " + + "; + } + + $text .= " + + + "; + + if($num_entry == 0) + { + $text .= " + + + + "; + } + else + { // Start with header + $text .= ' + + + '; + $count = 1; + foreach($col_titles[$action] as $ct) + { + count($col_titles[$action]); + $text .= " + {$ct} + "; + $count ++; + } + $text .= " + + + + "; + + // Routine to handle the simple bbcode-like codes for log body text + function log_process($matches) + { + switch($matches[1]) + { + case 'br': + return '
'; + case 'link': + $temp = substr($matches[2], 1); + return "{$temp}"; + case 'test': + return '----TEST----'; + default: + return $matches[0]; // No change + } + } + // Now put up the events + $delete_button = FALSE; + while($row = $sql->db_Fetch()) + { + $text .= ''; + foreach($col_fields[$action] as $cf) + { + switch($cf) + { + case 'cf_datestring': + $val = date(AL_DATE_TIME_FORMAT, $row['dblog_datestamp']); + break; + case 'cf_microtime': + $val = date("H:i:s", intval($row['dblog_time']) % 86400).'.'.str_pad(100000 * round($row['dblog_time'] - floor($row['dblog_time']), 6), 6, '0'); + break; + case 'cf_microtimediff': + $val = ' '; + if($last_noted_time > 0) + { + $val = number_format($last_noted_time - $row['dblog_time'], 6, '.', ''); + } + $last_noted_time = $row['dblog_time']; + break; + case 'cf_eventcode': + $val = 'ADMIN'.$row['dblog_eventcode']; + break; + case 'dblog_title': // Look up constants to give multi-language viewing + $val = trim($row['dblog_title']); + if(defined($val)) + $val = constant($val); + break; + case 'dblog_user_name': + $val = $row['dblog_user_id'] ? $row['dblog_user_name'] : LAN_ANONYMOUS; + break; + case 'user_name': + $val = $row['dblog_user_id'] ? $row['user_name'] : LAN_ANONYMOUS; + break; + case 'dblog_caller': + $val = $row['dblog_caller']; + if((strpos($val, '|') !== FALSE) && (strpos($val, '@') !== FALSE)) + { + list($file, $rest) = explode('|', $val); + list($routine, $rest) = explode('@', $rest); + $val = $file.'
Function: '.$routine.'
Line: '.$rest; + } + break; + case 'dblog_remarks': + // Look for pseudo-code for newlines, link insertion + $val = preg_replace_callback("#\[!(\w+?)(=.+?){0,1}!]#", 'log_process', $row['dblog_remarks']); + break; + case 'dblog_ip': + $val = e107::getIPHandler()->ipDecode($row['dblog_ip']); + break; + case 'comment_ip': + $val = e107::getIPHandler()->ipDecode($row['comment_ip']); + /* if (strlen($val) == 8) // New decoder should handle this automatically + { + $hexip = explode('.', chunk_split($val, 2, '.')); + $val = hexdec($hexip[0]). '.'.hexdec($hexip[1]).'.'.hexdec($hexip[2]).'.'.hexdec($hexip[3]); + } */ + break; + case 'comment_comment': + $val = $tp->text_truncate($row['comment_comment'], 100, '...'); // Just display first bit of comment + break; + case 'online_location': + $val = str_replace($e107->base_path, '', $row['online_location']); // Just display site-specific bit of path + break; + case 'del_check': // Put up a 'delete' checkbox + $val = ""; + $delete_button = TRUE; + break; + default: + $val = $row[$cf]; + } + $text .= ""; + } + $text .= ""; + } + } + $text .= " + +
".RL_LAN_017."
{$val}
+
+ ".$frm->admin_button('refreshlog', 'no-value', 'submit', RL_LAN_018)." + "; + if($delete_button) + { + $text .= $frm->admin_button('deleteitems', 'no-value', 'delete', RL_LAN_11); + } + $text .= " +
+
+
+ "; + + // Next-Previous. ========================== + + $text .= sprintf(RL_LAN_126, $num_entry); + if($num_entry > $amount) + { + $parms = "{$num_entry},{$amount},{$from},".e_SELF."?".$action.".[FROM]"; + $text .= "
".$tp->parseTemplate("{NEXTPREV={$parms}}")."
"; + } + + $ns->tablerender("{$page_title[$action]}", $emessage->render().$text); +} + +function admin_log_adminmenu() +{ + if(e_QUERY) + { + $tmp = explode(".", e_QUERY); + $action = $tmp[0]; + } + if($action == "") + { + $action = "adminlog"; + } + $var['adminlog']['text'] = RL_LAN_030; + $var['adminlog']['link'] = "admin_log.php?adminlog"; + + $var['auditlog']['text'] = RL_LAN_062; + $var['auditlog']['link'] = "admin_log.php?auditlog"; + + $var['rolllog']['text'] = RL_LAN_002; + $var['rolllog']['link'] = "admin_log.php?rolllog"; + + $var['downlog']['text'] = RL_LAN_067; + $var['downlog']['link'] = "admin_log.php?downlog"; + + $var['detailed']['text'] = RL_LAN_091; + $var['detailed']['link'] = "admin_log.php?detailed"; + +// Deprecated by Comments Manager. +/* + $var['comments']['text'] = 'Comments'; + $var['comments']['link'] = "admin_log.php?comments"; +*/ + $var['config']['text'] = LAN_OPTIONS; + $var['config']['link'] = "admin_log.php?config"; + + /* XXX - why?! + if($action == 'comments') + { + $var['users']['text'] = RL_LAN_115; + $var['users']['link'] = "users.php"; + } + */ + e_admin_menu(RL_LAN_005, $action, $var); +} + +require_once (e_ADMIN."footer.php"); + +function gen_log_delete($selectname) +{ + $values = array(90, 60, 30, 21, 20, 14, 10, 7, 6, 5, 4, 3, 2, 1); + $ret = ""; + return $ret; +} + +/** + * Handle page DOM within the page header + * + * @return string JS source + */ +function headerjs() +{ + require_once(e_HANDLER.'js_helper.php'); + $ret = " + + + "; + + return $ret; +} + ?> \ No newline at end of file diff --git a/e107_languages/English/admin/lan_admin_log.php b/e107_languages/English/admin/lan_admin_log.php index c7698fae1..59c5dd2d9 100644 --- a/e107_languages/English/admin/lan_admin_log.php +++ b/e107_languages/English/admin/lan_admin_log.php @@ -1,121 +1,121 @@ -%d entries matching search condition'); -// define('RL_LAN_JS_CONFIRM', 'Are you sure?'); +%d entries matching search condition'); +// define('RL_LAN_JS_CONFIRM', 'Are you sure?'); ?> \ No newline at end of file