diff --git a/application/MaintenanceNotification/MaintenanceNotification.php b/application/MaintenanceNotification/MaintenanceNotification.php index bcaff1997..6bff72170 100644 --- a/application/MaintenanceNotification/MaintenanceNotification.php +++ b/application/MaintenanceNotification/MaintenanceNotification.php @@ -347,6 +347,7 @@ class MaintenanceNotification extends mfBaseModel { public static function searchActive($filter, $limit = false, $order = false) { $filter["to>"] = date("U"); + $filter["sent"] = false; return self::search($filter, $limit, $order); } @@ -409,7 +410,15 @@ class MaintenanceNotification extends mfBaseModel { $where .= " AND MaintenanceNotification.to >= $to"; } } - + + if(array_key_exists("sent", $filter)) { + $sent = $filter['sent']; + if($sent === true) { + $where .= " AND MaintenanceNotification.sent > 0"; + } elseif($sent === false || $sent === null) { + $where .= " AND (MaintenanceNotification.sent IS NULL OR MaintenanceNotification.sent = 0)"; + } + }