refactor(php74): use null coalescing (??) and ??= operators

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

Author: somethingwithproof

audit.php

@@ -51,13 +51,13 @@
 		if ($data['action'] == 'cli') {
 			$width = 'wide';
 			$output .= '<table style="width:100%" class="' . $width . '"><tr><td>';
-			$output .= '<span><b>' . __('Page:', 'audit') . '</b>  <i>' . $data['page'] . '</i></span>';
-			$output .= '<br><span><b>' . __('User:', 'audit') . '</b>  <i>' . $data['user_agent'] . '</i></span>';
-			$output .= '<br><span><b>' . __('IP Address:', 'audit') . '</b>  <i>' . $data['ip_address'] . '</i></span>';
-			$output .= '<br><span><b>' . __('Date:', 'audit') . '</b>  <i>' . $data['event_time'] . '</i></span>';
-			$output .= '<br><span><b>' . __('Action:', 'audit') . '</b>  <i>' . $data['action'] . '</i></span>';
+			$output .= '<span><b>' . __('Page:', 'audit') . '</b>  <i>' . html_escape($data['page']) . '</i></span>';
+			$output .= '<br><span><b>' . __('User:', 'audit') . '</b>  <i>' . html_escape($data['user_agent']) . '</i></span>';
+			$output .= '<br><span><b>' . __('IP Address:', 'audit') . '</b>  <i>' . html_escape($data['ip_address']) . '</i></span>';
+			$output .= '<br><span><b>' . __('Date:', 'audit') . '</b>  <i>' . html_escape($data['event_time']) . '</i></span>';
+			$output .= '<br><span><b>' . __('Action:', 'audit') . '</b>  <i>' . html_escape($data['action']) . '</i></span>';
 			$output .= '<hr>';
-			$output .= '<span><b>' . __('Script:', 'audit') . '</b>  <i>' . $data['post'] . '</i></span>';
+			$output .= '<span><b>' . __('Script:', 'audit') . '</b>  <i>' . html_escape($data['post']) . '</i></span>';
 		} elseif (cacti_sizeof($data)) {
 			$attribs = json_decode($data['post']);
 
@@ -74,11 +74,11 @@
 			}
 
 			$output .= '<table style="width:100%" class="' . $width . '"><tr><td>';
-			$output .= '<span><b>' . __('Page:', 'audit') . '</b>  <i>' . $data['page'] . '</i></span>';
-			$output .= '<br><span><b>' . __('User:', 'audit') . '</b>  <i>' . get_username($data['user_id']) . '</i></span>';
-			$output .= '<br><span><b>' . __('IP Address:', 'audit') . '</b>  <i>' . $data['ip_address'] . '</i></span>';
-			$output .= '<br><span><b>' . __('Date:', 'audit') . '</b>  <i>' . $data['event_time'] . '</i></span>';
-			$output .= '<br><span><b>' . __('Action:', 'audit') . '</b>  <i>' . $data['action'] . '</i></span>';
+			$output .= '<span><b>' . __('Page:', 'audit') . '</b>  <i>' . html_escape($data['page']) . '</i></span>';
+			$output .= '<br><span><b>' . __('User:', 'audit') . '</b>  <i>' . html_escape(get_username($data['user_id'])) . '</i></span>';
+			$output .= '<br><span><b>' . __('IP Address:', 'audit') . '</b>  <i>' . html_escape($data['ip_address']) . '</i></span>';
+			$output .= '<br><span><b>' . __('Date:', 'audit') . '</b>  <i>' . html_escape($data['event_time']) . '</i></span>';
+			$output .= '<br><span><b>' . __('Action:', 'audit') . '</b>  <i>' . html_escape($data['action']) . '</i></span>';
 			$output .= '<hr>';
 			$output .= '<table style="width:100%">';
 

audit_functions.php

@@ -157,7 +157,7 @@ function audit_config_insert() {
 
 		$post        = json_encode($post);
 		$page        = basename($_SERVER['SCRIPT_NAME']);
-		$user_id     = (isset($_SESSION['sess_user_id']) ? $_SESSION['sess_user_id'] : 0);
+		$user_id     = ($_SESSION['sess_user_id'] ?? 0);
 		$event_time  = date('Y-m-d H:i:s');
 
 		/* Retrieve IP address */