Replace Function nullable_htmlentities() with just escapeHtml() and update all instances throughout

This commit is contained in:
johnnyq
2026-07-14 17:10:45 -04:00
parent d62b6e2ae7
commit 7bc47a58fe
338 changed files with 3057 additions and 3057 deletions

View File

@@ -1,5 +1,5 @@
<!-- Main Sidebar Container -->
<aside class="main-sidebar sidebar-dark-<?php echo nullable_htmlentities($config_theme); ?> d-print-none">
<aside class="main-sidebar sidebar-dark-<?php echo escapeHtml($config_theme); ?> d-print-none">
<a class="brand-link pb-1 mt-1" href="/agent/<?php echo $config_start_page ?>">
<p class="h5">

View File

@@ -7,7 +7,7 @@ require_once '../../libs/totp/totp.php'; //TOTP MFA Lib
// Get Company Logo
$sql = mysqli_query($mysqli, "SELECT company_logo FROM companies");
$row = mysqli_fetch_assoc($sql);
$company_logo = nullable_htmlentities($row['company_logo']);
$company_logo = escapeHtml($row['company_logo']);
// Only generate the token once and store it in session:
@@ -57,7 +57,7 @@ $data = "otpauth://totp/ITFlow:$session_email?secret=$token";
<div class="login-box">
<div class="login-logo">
<?php if (!empty($company_logo)) { ?>
<img alt="<?= nullable_htmlentities($company_name)?> logo" height="110" width="380" class="img-fluid" src="<?php echo "../../uploads/settings/$company_logo"; ?>">
<img alt="<?= escapeHtml($company_name)?> logo" height="110" width="380" class="img-fluid" src="<?php echo "../../uploads/settings/$company_logo"; ?>">
<?php } else { ?>
<span class="text-primary text-bold"><i class="fas fa-paper-plane mr-2"></i>IT</span>Flow
<?php } ?>

View File

@@ -24,11 +24,11 @@ $sql_recent_logs = mysqli_query($mysqli, "SELECT * FROM logs
while ($row = mysqli_fetch_assoc($sql_recent_logins)) {
$log_id = intval($row['log_id']);
$log_ip = nullable_htmlentities($row['log_ip']);
$log_user_agent = nullable_htmlentities($row['log_user_agent']);
$log_ip = escapeHtml($row['log_ip']);
$log_user_agent = escapeHtml($row['log_user_agent']);
$log_user_os = getOS($log_user_agent);
$log_user_browser = getWebBrowser($log_user_agent);
$log_created_at = nullable_htmlentities($row['log_created_at']);
$log_created_at = escapeHtml($row['log_created_at']);
?>
@@ -60,10 +60,10 @@ $sql_recent_logs = mysqli_query($mysqli, "SELECT * FROM logs
while ($row = mysqli_fetch_assoc($sql_recent_logs)) {
$log_id = intval($row['log_id']);
$log_type = nullable_htmlentities($row['log_type']);
$log_action = nullable_htmlentities($row['log_action']);
$log_description = nullable_htmlentities($row['log_description']);
$log_created_at = nullable_htmlentities($row['log_created_at']);
$log_type = escapeHtml($row['log_type']);
$log_action = escapeHtml($row['log_action']);
$log_description = escapeHtml($row['log_description']);
$log_created_at = escapeHtml($row['log_created_at']);
if ($log_action == 'Create') {
$log_icon = "plus text-success";
@@ -90,7 +90,7 @@ $sql_recent_logs = mysqli_query($mysqli, "SELECT * FROM logs
</table>
<?php if (isset($session_is_admin) && $session_is_admin === true) { ?>
<div class="card-footer">
<a href="../../admin/audit_log.php?q=<?php echo nullable_htmlentities($session_name); ?>">See More...</a>
<a href="../../admin/audit_log.php?q=<?php echo escapeHtml($session_name); ?>">See More...</a>
</div>
<?php } ?>
</div>

View File

@@ -15,7 +15,7 @@ require_once "includes/inc_all_user.php";
<div class="row">
<div class="col-md-3 text-center">
<?php if($session_avatar) { ?>
<img class="img-thumbnail" src="<?php echo "../../uploads/users/$session_user_id/" . nullable_htmlentities($session_avatar); ?>">
<img class="img-thumbnail" src="<?php echo "../../uploads/users/$session_user_id/" . escapeHtml($session_avatar); ?>">
<a href="post.php?clear_your_user_avatar&csrf_token=<?= $_SESSION['csrf_token'] ?>" class="btn btn-outline-danger btn-block">Remove Avatar</a>
<hr>
<?php } ?>
@@ -32,7 +32,7 @@ require_once "includes/inc_all_user.php";
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
</div>
<input type="text" class="form-control" name="name" placeholder="Full Name" value="<?php echo stripslashes(nullable_htmlentities($session_name)); ?>" required>
<input type="text" class="form-control" name="name" placeholder="Full Name" value="<?php echo stripslashes(escapeHtml($session_name)); ?>" required>
</div>
</div>
@@ -42,7 +42,7 @@ require_once "includes/inc_all_user.php";
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-user-shield"></i></span>
</div>
<input type="text" class="form-control" value="<?php echo nullable_htmlentities($session_user_role_display); ?>" disabled>
<input type="text" class="form-control" value="<?php echo escapeHtml($session_user_role_display); ?>" disabled>
</div>
</div>
@@ -52,7 +52,7 @@ require_once "includes/inc_all_user.php";
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
</div>
<input type="email" class="form-control" name="email" placeholder="Email Address" value="<?php echo nullable_htmlentities($session_email); ?>" required>
<input type="email" class="form-control" name="email" placeholder="Email Address" value="<?php echo escapeHtml($session_email); ?>" required>
</div>
</div>

View File

@@ -58,7 +58,7 @@ $remember_token_count = mysqli_num_rows($sql_remember_tokens);
<ul>
<?php while ($row = mysqli_fetch_assoc($sql_remember_tokens)) {
$token_id = intval($row['remember_token_id']);
$token_created = nullable_htmlentities($row['remember_token_created_at']);
$token_created = escapeHtml($row['remember_token_created_at']);
echo "<li>ID: $token_id | Created: $token_created</li>";
} ?>