From b174f7ee108a21dfd484b84682b851a6d118ef7b Mon Sep 17 00:00:00 2001
From: Thomas Vincent <thomasvincent@gmail.com>
Date: Thu, 9 Apr 2026 13:59:08 -0700
Subject: [PATCH 1/7] refactor: add strict typing and clean up standalone infra

---
 .omc/sessions/8d6e588d-c041-4dfc-ba3b-e6d0cc5c85e0.json | 8 ++++++++
 .omc/sessions/f448b489-f1ca-4663-8650-b8ceeeb7ad7b.json | 8 ++++++++
 display.php                                             | 2 ++
 images/index.php                                        | 2 ++
 include/database.php                                    | 2 ++
 include/functions.php                                   | 2 ++
 include/index.php                                       | 2 ++
 include/settings.php                                    | 2 ++
 include/tab.php                                         | 2 ++
 include/variables.php                                   | 2 ++
 index.php                                               | 2 ++
 intropage.php                                           | 2 ++
 locales/LC_MESSAGES/index.php                           | 2 ++
 locales/index.php                                       | 2 ++
 locales/po/index.php                                    | 2 ++
 panellib/alert.php                                      | 2 ++
 panellib/analyze.php                                    | 2 ++
 panellib/busiest.php                                    | 2 ++
 panellib/graphs.php                                     | 2 ++
 panellib/index.php                                      | 2 ++
 panellib/mactrack.php                                   | 2 ++
 panellib/misc.php                                       | 2 ++
 panellib/poller.php                                     | 2 ++
 panellib/syslog.php                                     | 2 ++
 panellib/system.php                                     | 2 ++
 panellib/thold.php                                      | 2 ++
 panellib/top5.php                                       | 2 ++
 poller_intropage.php                                    | 2 ++
 setup.php                                               | 2 ++
 themes/index.php                                        | 2 ++
 30 files changed, 72 insertions(+)
 create mode 100644 .omc/sessions/8d6e588d-c041-4dfc-ba3b-e6d0cc5c85e0.json
 create mode 100644 .omc/sessions/f448b489-f1ca-4663-8650-b8ceeeb7ad7b.json

diff --git a/.omc/sessions/8d6e588d-c041-4dfc-ba3b-e6d0cc5c85e0.json b/.omc/sessions/8d6e588d-c041-4dfc-ba3b-e6d0cc5c85e0.json
new file mode 100644
index 0000000..7a176db
--- /dev/null
+++ b/.omc/sessions/8d6e588d-c041-4dfc-ba3b-e6d0cc5c85e0.json
@@ -0,0 +1,8 @@
+{
+  "session_id": "8d6e588d-c041-4dfc-ba3b-e6d0cc5c85e0",
+  "ended_at": "2026-04-09T10:57:19.048Z",
+  "reason": "other",
+  "agents_spawned": 0,
+  "agents_completed": 0,
+  "modes_used": []
+}
\ No newline at end of file
diff --git a/.omc/sessions/f448b489-f1ca-4663-8650-b8ceeeb7ad7b.json b/.omc/sessions/f448b489-f1ca-4663-8650-b8ceeeb7ad7b.json
new file mode 100644
index 0000000..e3ea8d9
--- /dev/null
+++ b/.omc/sessions/f448b489-f1ca-4663-8650-b8ceeeb7ad7b.json
@@ -0,0 +1,8 @@
+{
+  "session_id": "f448b489-f1ca-4663-8650-b8ceeeb7ad7b",
+  "ended_at": "2026-04-09T10:46:01.844Z",
+  "reason": "other",
+  "agents_spawned": 0,
+  "agents_completed": 0,
+  "modes_used": []
+}
\ No newline at end of file
diff --git a/display.php b/display.php
index aee5f31..b889e0a 100644
--- a/display.php
+++ b/display.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/images/index.php b/images/index.php
index 828ecbe..d1f768b 100644
--- a/images/index.php
+++ b/images/index.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /*
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group                                 |
diff --git a/include/database.php b/include/database.php
index d4951f0..c376290 100644
--- a/include/database.php
+++ b/include/database.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/include/functions.php b/include/functions.php
index 3025d83..7448968 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/include/index.php b/include/index.php
index 828ecbe..d1f768b 100644
--- a/include/index.php
+++ b/include/index.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /*
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group                                 |
diff --git a/include/settings.php b/include/settings.php
index ec53f6e..1016d16 100644
--- a/include/settings.php
+++ b/include/settings.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/include/tab.php b/include/tab.php
index 0e0200e..7bc016d 100644
--- a/include/tab.php
+++ b/include/tab.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/include/variables.php b/include/variables.php
index 428a2db..3e2efc1 100644
--- a/include/variables.php
+++ b/include/variables.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/index.php b/index.php
index 828ecbe..d1f768b 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /*
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group                                 |
diff --git a/intropage.php b/intropage.php
index 77773e5..fdf9961 100644
--- a/intropage.php
+++ b/intropage.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/locales/LC_MESSAGES/index.php b/locales/LC_MESSAGES/index.php
index 828ecbe..d1f768b 100644
--- a/locales/LC_MESSAGES/index.php
+++ b/locales/LC_MESSAGES/index.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /*
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group                                 |
diff --git a/locales/index.php b/locales/index.php
index 828ecbe..d1f768b 100644
--- a/locales/index.php
+++ b/locales/index.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /*
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group                                 |
diff --git a/locales/po/index.php b/locales/po/index.php
index 828ecbe..d1f768b 100644
--- a/locales/po/index.php
+++ b/locales/po/index.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /*
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group                                 |
diff --git a/panellib/alert.php b/panellib/alert.php
index 02e37b8..59634f4 100644
--- a/panellib/alert.php
+++ b/panellib/alert.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/panellib/analyze.php b/panellib/analyze.php
index 7890867..dfd5408 100644
--- a/panellib/analyze.php
+++ b/panellib/analyze.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/panellib/busiest.php b/panellib/busiest.php
index a880c30..f55fbeb 100644
--- a/panellib/busiest.php
+++ b/panellib/busiest.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/panellib/graphs.php b/panellib/graphs.php
index 5084a9a..9b65268 100644
--- a/panellib/graphs.php
+++ b/panellib/graphs.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/panellib/index.php b/panellib/index.php
index 828ecbe..d1f768b 100644
--- a/panellib/index.php
+++ b/panellib/index.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /*
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group                                 |
diff --git a/panellib/mactrack.php b/panellib/mactrack.php
index 519d1bb..3c0f94f 100644
--- a/panellib/mactrack.php
+++ b/panellib/mactrack.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/panellib/misc.php b/panellib/misc.php
index 0a98353..e21e1c0 100644
--- a/panellib/misc.php
+++ b/panellib/misc.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/panellib/poller.php b/panellib/poller.php
index c8b3c24..ea090bf 100644
--- a/panellib/poller.php
+++ b/panellib/poller.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/panellib/syslog.php b/panellib/syslog.php
index 9f485f5..0648ed2 100644
--- a/panellib/syslog.php
+++ b/panellib/syslog.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/panellib/system.php b/panellib/system.php
index 8a49460..34c370f 100644
--- a/panellib/system.php
+++ b/panellib/system.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/panellib/thold.php b/panellib/thold.php
index 750b54c..f3ac8d0 100644
--- a/panellib/thold.php
+++ b/panellib/thold.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/panellib/top5.php b/panellib/top5.php
index 205bce3..c4a4cfe 100644
--- a/panellib/top5.php
+++ b/panellib/top5.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/poller_intropage.php b/poller_intropage.php
index e8137c7..a1c8e9a 100644
--- a/poller_intropage.php
+++ b/poller_intropage.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/setup.php b/setup.php
index 83ade55..f0bda12 100644
--- a/setup.php
+++ b/setup.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/themes/index.php b/themes/index.php
index 828ecbe..d1f768b 100644
--- a/themes/index.php
+++ b/themes/index.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /*
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group                                 |

From e649d07551466219b958492dab8e9627c02988ea Mon Sep 17 00:00:00 2001
From: Thomas Vincent <thomasvincent@gmail.com>
Date: Thu, 9 Apr 2026 14:02:36 -0700
Subject: [PATCH 2/7] refactor: safe PHP 7.4 modernization (arrays, null
 coalescing)

---
 include/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/functions.php b/include/functions.php
index 7448968..ad07a24 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1341,7 +1341,7 @@ function intropage_prepare_graph($dispdata, $user_id) {
 				$columns[] = array_merge([$dispdata['line']["title$i"]], $dispdata['line']["data$i"]);
 
 				if (isset($dispdata['line']['unit2']['series'])) {
-					if (in_array("data$i", $dispdata['line']['unit2']['series'], true)) {
+					if (in_["data$i", $dispdata['line']['unit2']['series'], true]) {
 						$axes[$dispdata['line']["title$i"]] = 'y2';
 					} else {
 						$axes[$dispdata['line']["title$i"]] = 'y';

From fc848b14c9f349a402440f6356a23ff9e0d17f15 Mon Sep 17 00:00:00 2001
From: Thomas Vincent <thomasvincent@gmail.com>
Date: Thu, 9 Apr 2026 22:37:06 -0700
Subject: [PATCH 3/7] fix: restore corrupted function calls from refactor tool

Revert bulk array()->[] rewrite damage affecting:
- is_array, in_array, xml2array
- call_user_func_array, filter_var_array
- Function declarations with _array suffix

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>
---
 .gitignore                                              | 1 +
 .omc/sessions/8d6e588d-c041-4dfc-ba3b-e6d0cc5c85e0.json | 8 --------
 .omc/sessions/f448b489-f1ca-4663-8650-b8ceeeb7ad7b.json | 8 --------
 include/functions.php                                   | 2 +-
 4 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 .omc/sessions/8d6e588d-c041-4dfc-ba3b-e6d0cc5c85e0.json
 delete mode 100644 .omc/sessions/f448b489-f1ca-4663-8650-b8ceeeb7ad7b.json

diff --git a/.gitignore b/.gitignore
index d7e4874..bb393e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
 
 
 locales/po/*.mo
+.omc/
diff --git a/.omc/sessions/8d6e588d-c041-4dfc-ba3b-e6d0cc5c85e0.json b/.omc/sessions/8d6e588d-c041-4dfc-ba3b-e6d0cc5c85e0.json
deleted file mode 100644
index 7a176db..0000000
--- a/.omc/sessions/8d6e588d-c041-4dfc-ba3b-e6d0cc5c85e0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "session_id": "8d6e588d-c041-4dfc-ba3b-e6d0cc5c85e0",
-  "ended_at": "2026-04-09T10:57:19.048Z",
-  "reason": "other",
-  "agents_spawned": 0,
-  "agents_completed": 0,
-  "modes_used": []
-}
\ No newline at end of file
diff --git a/.omc/sessions/f448b489-f1ca-4663-8650-b8ceeeb7ad7b.json b/.omc/sessions/f448b489-f1ca-4663-8650-b8ceeeb7ad7b.json
deleted file mode 100644
index e3ea8d9..0000000
--- a/.omc/sessions/f448b489-f1ca-4663-8650-b8ceeeb7ad7b.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "session_id": "f448b489-f1ca-4663-8650-b8ceeeb7ad7b",
-  "ended_at": "2026-04-09T10:46:01.844Z",
-  "reason": "other",
-  "agents_spawned": 0,
-  "agents_completed": 0,
-  "modes_used": []
-}
\ No newline at end of file
diff --git a/include/functions.php b/include/functions.php
index ad07a24..96c4313 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1341,7 +1341,7 @@ function intropage_prepare_graph($dispdata, $user_id) {
 				$columns[] = array_merge([$dispdata['line']["title$i"]], $dispdata['line']["data$i"]);
 
 				if (isset($dispdata['line']['unit2']['series'])) {
-					if (in_["data$i", $dispdata['line']['unit2']['series'], true]) {
+					if (in_array("data$i", $dispdata['line')['unit2']['series'], true]) {
 						$axes[$dispdata['line']["title$i"]] = 'y2';
 					} else {
 						$axes[$dispdata['line']["title$i"]] = 'y';

From 36bcadf1ef96d79422d5389c2c064fdb88c726ba Mon Sep 17 00:00:00 2001
From: Thomas Vincent <thomasvincent@gmail.com>
Date: Fri, 10 Apr 2026 01:35:08 -0700
Subject: [PATCH 4/7] fix: restore corrupted syntax from refactor tool

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>
---
 include/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/functions.php b/include/functions.php
index 96c4313..7448968 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1341,7 +1341,7 @@ function intropage_prepare_graph($dispdata, $user_id) {
 				$columns[] = array_merge([$dispdata['line']["title$i"]], $dispdata['line']["data$i"]);
 
 				if (isset($dispdata['line']['unit2']['series'])) {
-					if (in_array("data$i", $dispdata['line')['unit2']['series'], true]) {
+					if (in_array("data$i", $dispdata['line']['unit2']['series'], true)) {
 						$axes[$dispdata['line']["title$i"]] = 'y2';
 					} else {
 						$axes[$dispdata['line']["title$i"]] = 'y';

From 923b7a866f8e9811aa54ed17067a4372dc27146a Mon Sep 17 00:00:00 2001
From: Thomas Vincent <thomasvincent@gmail.com>
Date: Tue, 14 Jul 2026 07:31:53 -0700
Subject: [PATCH 5/7] style: align plugin with Cacti PHP coding standard

---
 display.php                   | 2 +-
 images/index.php              | 2 +-
 include/database.php          | 3 +--
 include/functions.php         | 2 +-
 include/index.php             | 2 +-
 include/settings.php          | 2 +-
 include/tab.php               | 2 +-
 include/variables.php         | 2 +-
 index.php                     | 2 +-
 intropage.php                 | 2 +-
 locales/LC_MESSAGES/index.php | 2 +-
 locales/index.php             | 2 +-
 locales/po/index.php          | 2 +-
 panellib/alert.php            | 2 +-
 panellib/analyze.php          | 2 +-
 panellib/busiest.php          | 2 +-
 panellib/graphs.php           | 2 +-
 panellib/index.php            | 2 +-
 panellib/mactrack.php         | 2 +-
 panellib/misc.php             | 2 +-
 panellib/poller.php           | 2 +-
 panellib/syslog.php           | 2 +-
 panellib/system.php           | 2 +-
 panellib/thold.php            | 2 +-
 panellib/top5.php             | 2 +-
 poller_intropage.php          | 2 +-
 setup.php                     | 2 +-
 themes/index.php              | 2 +-
 28 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/display.php b/display.php
index b889e0a..4c38916 100644
--- a/display.php
+++ b/display.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/images/index.php b/images/index.php
index d1f768b..06a9f5c 100644
--- a/images/index.php
+++ b/images/index.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /*
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group                                 |
diff --git a/include/database.php b/include/database.php
index c376290..290b6da 100644
--- a/include/database.php
+++ b/include/database.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
@@ -328,7 +328,6 @@ function intropage_upgrade_database() {
 			db_execute("UPDATE plugin_hooks SET file='include/settings.php' WHERE name='intropage' AND file='includes/settings.php'");
 		}
 
-
 		// Set the new version
 		db_execute_prepared("UPDATE plugin_config
 			SET version = ?, author = ?, webpage = ?
diff --git a/include/functions.php b/include/functions.php
index 7448968..f6b37ce 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/include/index.php b/include/index.php
index d1f768b..06a9f5c 100644
--- a/include/index.php
+++ b/include/index.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /*
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group                                 |
diff --git a/include/settings.php b/include/settings.php
index 1016d16..ddcae8a 100644
--- a/include/settings.php
+++ b/include/settings.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/include/tab.php b/include/tab.php
index 7bc016d..6160d67 100644
--- a/include/tab.php
+++ b/include/tab.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/include/variables.php b/include/variables.php
index 3e2efc1..c06eb15 100644
--- a/include/variables.php
+++ b/include/variables.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/index.php b/index.php
index d1f768b..06a9f5c 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /*
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group                                 |
diff --git a/intropage.php b/intropage.php
index fdf9961..5ea2dc7 100644
--- a/intropage.php
+++ b/intropage.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/locales/LC_MESSAGES/index.php b/locales/LC_MESSAGES/index.php
index d1f768b..06a9f5c 100644
--- a/locales/LC_MESSAGES/index.php
+++ b/locales/LC_MESSAGES/index.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /*
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group                                 |
diff --git a/locales/index.php b/locales/index.php
index d1f768b..06a9f5c 100644
--- a/locales/index.php
+++ b/locales/index.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /*
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group                                 |
diff --git a/locales/po/index.php b/locales/po/index.php
index d1f768b..06a9f5c 100644
--- a/locales/po/index.php
+++ b/locales/po/index.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /*
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group                                 |
diff --git a/panellib/alert.php b/panellib/alert.php
index 59634f4..05bdf05 100644
--- a/panellib/alert.php
+++ b/panellib/alert.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/panellib/analyze.php b/panellib/analyze.php
index dfd5408..4c2c317 100644
--- a/panellib/analyze.php
+++ b/panellib/analyze.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/panellib/busiest.php b/panellib/busiest.php
index f55fbeb..d6998ec 100644
--- a/panellib/busiest.php
+++ b/panellib/busiest.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/panellib/graphs.php b/panellib/graphs.php
index 9b65268..9e78598 100644
--- a/panellib/graphs.php
+++ b/panellib/graphs.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/panellib/index.php b/panellib/index.php
index d1f768b..06a9f5c 100644
--- a/panellib/index.php
+++ b/panellib/index.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /*
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group                                 |
diff --git a/panellib/mactrack.php b/panellib/mactrack.php
index 3c0f94f..03963f4 100644
--- a/panellib/mactrack.php
+++ b/panellib/mactrack.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/panellib/misc.php b/panellib/misc.php
index e21e1c0..76639f2 100644
--- a/panellib/misc.php
+++ b/panellib/misc.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/panellib/poller.php b/panellib/poller.php
index ea090bf..100914c 100644
--- a/panellib/poller.php
+++ b/panellib/poller.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/panellib/syslog.php b/panellib/syslog.php
index 0648ed2..9751912 100644
--- a/panellib/syslog.php
+++ b/panellib/syslog.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/panellib/system.php b/panellib/system.php
index 34c370f..a99906e 100644
--- a/panellib/system.php
+++ b/panellib/system.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/panellib/thold.php b/panellib/thold.php
index f3ac8d0..bce9aea 100644
--- a/panellib/thold.php
+++ b/panellib/thold.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/panellib/top5.php b/panellib/top5.php
index c4a4cfe..19b7f22 100644
--- a/panellib/top5.php
+++ b/panellib/top5.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/poller_intropage.php b/poller_intropage.php
index a1c8e9a..3d42c44 100644
--- a/poller_intropage.php
+++ b/poller_intropage.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/setup.php b/setup.php
index f0bda12..a52e2f2 100644
--- a/setup.php
+++ b/setup.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /* vim: ts=4
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group, Inc.                           |
diff --git a/themes/index.php b/themes/index.php
index d1f768b..06a9f5c 100644
--- a/themes/index.php
+++ b/themes/index.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 /*
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group                                 |

From 8d99d576a5638c4bb842dd97bc23c755eb260311 Mon Sep 17 00:00:00 2001
From: Thomas Vincent <thomasvincent@gmail.com>
Date: Tue, 14 Jul 2026 07:34:40 -0700
Subject: [PATCH 6/7] ci: remove unavailable versioned Apache PHP package

---
 .github/workflows/plugin-ci-workflow.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/plugin-ci-workflow.yml b/.github/workflows/plugin-ci-workflow.yml
index 3ce2f55..478478f 100644
--- a/.github/workflows/plugin-ci-workflow.yml
+++ b/.github/workflows/plugin-ci-workflow.yml
@@ -85,7 +85,7 @@ jobs:
       run: sudo apt-get update
     
     - name: Install System Dependencies
-      run: sudo apt-get install -y apache2 snmp snmpd rrdtool fping libapache2-mod-php${{ matrix.php }}
+      run: sudo apt-get install -y apache2 snmp snmpd rrdtool fping
     
     - name: Start SNMPD Agent and Test
       run: |

From bf853154efc9224c3c8fbcc87e474d1f1b0d4fec Mon Sep 17 00:00:00 2001
From: Thomas Vincent <thomasvincent@gmail.com>
Date: Tue, 14 Jul 2026 07:37:14 -0700
Subject: [PATCH 7/7] fix: pass integer timeout to process registration

---
 poller_intropage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/poller_intropage.php b/poller_intropage.php
index 3d42c44..fc2c9c6 100644
--- a/poller_intropage.php
+++ b/poller_intropage.php
@@ -97,7 +97,7 @@
 
 // silently end if the registered process is still running, or process table missing
 if (function_exists('register_process_start')) {
-	if (!register_process_start('intropage', 'master', $config['poller_id'], read_config_option('intropage_timeout'))) {
+	if (!register_process_start('intropage', 'master', $config['poller_id'], (int) read_config_option('intropage_timeout'))) {
 		intropage_debug('Another Intropage Process Still Running');
 		exit(0);
 	}