1
0
mirror of https://github.com/e107inc/e107.git synced 2025-07-25 00:41:52 +02:00

Merge branch 'e107inc:master' into master

This commit is contained in:
rica-carv
2025-01-19 18:23:20 +00:00
committed by GitHub
5 changed files with 13 additions and 3 deletions

View File

@@ -1118,6 +1118,13 @@ else
define('e_REFERER_SELF', false);
}
if(deftrue('USER') && !e107::isCli())
{
if (check_class(varset($pref['user_audit_class']))) // Need to note in user audit trail
{
e107::getLog()->user_audit(USER_AUDIT_NAVIGATION, e_REQUEST_URI, USERID, USERNAME);
}
}
/**
* @deprecated Use e107::getRedirect()->go($url) instead.

View File

@@ -486,10 +486,10 @@ class admin_log_form_ui extends e_admin_form_ui
// 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
$RL_LAN_136 = defset('RL_LAN_136', "User navigation trail");
$audit_checkboxes = array(USER_AUDIT_SIGNUP => RL_LAN_071, USER_AUDIT_EMAILACK => RL_LAN_072,
USER_AUDIT_LOGIN => LAN_AUDIT_LOG_013, USER_AUDIT_LOGOUT => LAN_AUDIT_LOG_014, // Logout is lumped in with login
USER_AUDIT_LOGIN => LAN_AUDIT_LOG_013, USER_AUDIT_LOGOUT => LAN_AUDIT_LOG_014, USER_AUDIT_NAVIGATION => $RL_LAN_136, // 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);

View File

@@ -112,6 +112,7 @@ class e_admin_log
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
define('USER_AUDIT_NAVIGATION', 25); // User signed up
}
// Init E_MESSAGE_* constants if not already done

View File

@@ -129,5 +129,7 @@ define("RL_LAN_132", "Informative");
define("RL_LAN_133", "Notice");
define("RL_LAN_134", "Warning");
define("RL_LAN_135", "Fatal");
define("RL_LAN_136", "User navigation trail");
// define("RL_LAN_JS_CONFIRM", "Are you sure?");

View File

@@ -40,7 +40,7 @@ define("LAN_AUDIT_LOG_021", "User email bounce");
define("LAN_AUDIT_LOG_022", "User banned");
define("LAN_AUDIT_LOG_023", "User bounce reset");
define("LAN_AUDIT_LOG_024", "User temporary status");
define("LAN_AUDIT_LOG_025", "User navigation trail");
// Admin log events
//-----------------