From 6c5e92dd3cca3eb3104fb75c6c5fd2c165cb577b Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Wed, 25 Jan 2023 12:59:26 -0500
Subject: [PATCH] Only show notifications belonging to the logged in user and
 system notifications where notification_user_id = 0

---
 check_login.php             | 2 +-
 notifications.php           | 2 +-
 notifications_dismissed.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/check_login.php b/check_login.php
index 557ca399..4e1486a0 100644
--- a/check_login.php
+++ b/check_login.php
@@ -84,7 +84,7 @@ if ($iPod || $iPhone || $iPad) {
 }
 
 //Get Notification Count for the badge on the top nav
-$row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('notification_id') AS num FROM notifications WHERE notification_dismissed_at IS NULL AND company_id = $session_company_id"));
+$row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('notification_id') AS num FROM notifications WHERE (notification_user_id = $session_user_id OR notification_user_id = 0) AND notification_dismissed_at IS NULL AND company_id = $session_company_id"));
 $num_notifications = $row['num'];
 
 //Set Currency Format
diff --git a/notifications.php b/notifications.php
index 50ce7168..e2582827 100644
--- a/notifications.php
+++ b/notifications.php
@@ -2,7 +2,7 @@
 
 <?php 
 
-$sql = mysqli_query($mysqli,"SELECT * FROM notifications LEFT JOIN clients ON notification_client_id = client_id WHERE notification_dismissed_at IS NULL AND notifications.company_id = $session_company_id ORDER BY notification_id DESC");
+$sql = mysqli_query($mysqli,"SELECT * FROM notifications LEFT JOIN clients ON notification_client_id = client_id WHERE notification_dismissed_at IS NULL AND (notification_user_id = $session_user_id OR notification_user_id = 0) AND notifications.company_id = $session_company_id ORDER BY notification_id DESC");
 
 ?>
 
diff --git a/notifications_dismissed.php b/notifications_dismissed.php
index e1597d8b..c90a13e3 100644
--- a/notifications_dismissed.php
+++ b/notifications_dismissed.php
@@ -29,7 +29,7 @@ $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o
 $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM notifications 
   LEFT JOIN users ON notification_dismissed_by = user_id 
   LEFT JOIN clients ON notification_client_id = client_id
-  WHERE (notification_type LIKE '%$q%' OR notification LIKE '%$q%' OR user_name LIKE '%$q%' OR client_name LIKE '%$q%') AND DATE(notification_timestamp) BETWEEN '$dtf' AND '$dtt' AND notifications.company_id = $session_company_id AND notification_dismissed_at IS NOT NULL ORDER BY $sb $o LIMIT $record_from, $record_to"); 
+  WHERE (notification_type LIKE '%$q%' OR notification LIKE '%$q%' OR user_name LIKE '%$q%' OR client_name LIKE '%$q%') AND DATE(notification_timestamp) BETWEEN '$dtf' AND '$dtt' AND (notification_user_id = $session_user_id OR notification_user_id = 0) AND notifications.company_id = $session_company_id AND notification_dismissed_at IS NOT NULL ORDER BY $sb $o LIMIT $record_from, $record_to"); 
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));