diff --git a/application/Api/v1/MaintenanceinfoApicontroller.php b/application/Api/v1/MaintenanceinfoApicontroller.php index c583a1029..7d009a949 100644 --- a/application/Api/v1/MaintenanceinfoApicontroller.php +++ b/application/Api/v1/MaintenanceinfoApicontroller.php @@ -15,7 +15,7 @@ class MaintenanceinfoApicontroller extends mfBaseApicontroller { protected function getCurrentMaintenance() { $results = []; - foreach(\MaintenanceNotification::searchActive([]) as $notification) { + foreach(\MaintenanceNotification::searchOpen([]) as $notification) { $item = []; $from = new DateTime("@".$notification->from); diff --git a/application/MaintenanceNotification/MaintenanceNotification.php b/application/MaintenanceNotification/MaintenanceNotification.php index 09b797d4a..b101c8219 100644 --- a/application/MaintenanceNotification/MaintenanceNotification.php +++ b/application/MaintenanceNotification/MaintenanceNotification.php @@ -355,7 +355,12 @@ class MaintenanceNotification extends mfBaseModel { return 0; } - public static function searchActive($filter, $limit = false, $order = false) { + public static function searchOpen($filter = [], $limit = false, $order = false) { + $filter["to>"] = date("U"); + + return self::search($filter, $limit, $order); + } + public static function searchActiveOpen($filter = [], $limit = false, $order = false) { $filter["to>"] = date("U"); $filter["sent"] = false; diff --git a/scripts/send-maintenance-notifications.php b/scripts/send-maintenance-notifications.php index ea937b6cd..2419a8eed 100755 --- a/scripts/send-maintenance-notifications.php +++ b/scripts/send-maintenance-notifications.php @@ -16,6 +16,6 @@ define("INTERNAL_USER_ID", $me->id); define("INTERNAL_USER_USERNAME", $me->username); define("MFBASE_BYPASS_LOGIN", true); -foreach(MaintenanceNotification::searchActive(["send_ts<" => date("U")]) as $notification) { +foreach(MaintenanceNotification::searchActiveOpen() as $notification) { $notification->sendToRecipients(); }