Merge branch 'e107inc:master' into rica-carv-pm_breadcrumb

e107inc · Feb 6, 2025 · 66e024a · 66e024a
2 parents 76ac162 + 10ed5f8
commit 66e024a
Show file tree

Hide file tree

Showing 52 changed files with 1,524 additions and 374 deletions.
diff --git a/class2.php b/class2.php
@@ -1118,6 +1118,13 @@ function systemTimeZoneIsValid($zone = '')
 	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.

diff --git a/e107_admin/admin_log.php b/e107_admin/admin_log.php
@@ -486,10 +486,10 @@ function user_audit_opts($curVal,$mode)
 		//	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);
@@ -683,7 +683,7 @@ function dblog_remarks($curVal,$mode)
 				{
 					$id = $this->getController()->getListModel()->get('dblog_id');
 					$ret ="<a class='e-expandit' href='#rem-".$id."'>".RL_LAN_087."</a>";
-					$ret .= "<div style='display:none;width:33vw' id='rem-".$id."'>";
+					$ret .= "<div class='logcanvas' style='display:none;width:33vw' id='rem-".$id."'>";
 					$text = str_replace("<br />","\n",$text);
 					$text = str_replace("&#092;","/",$text);
 

diff --git a/e107_admin/auth.php b/e107_admin/auth.php
@@ -27,7 +27,7 @@
 // Required for a clean v1.x -> v2 upgrade. 
 $core = e107::getConfig();
 $adminTheme = $core->get('admintheme');
-if($adminTheme !== 'bootstrap3'/* && $adminTheme !== 'bootstrap5'*/)
+if($adminTheme !== 'bootstrap3' /*&& $adminTheme !== 'bootstrap5'*/)
 {
 	$core->update('admintheme','bootstrap3');
 	$core->update('adminstyle','infopanel');