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

---
 .omc/sessions/42a5a3ed-3430-434f-addf-dc7423bda6d8.json | 8 ++++++++
 .omc/sessions/859688d5-ece7-4d1e-ab13-c82d820e7440.json | 8 ++++++++
 cycle.php                                               | 2 ++
 functions.php                                           | 2 ++
 images/index.php                                        | 2 ++
 index.php                                               | 2 ++
 locales/LC_MESSAGES/index.php                           | 2 ++
 locales/index.php                                       | 2 ++
 setup.php                                               | 2 ++
 9 files changed, 30 insertions(+)
 create mode 100644 .omc/sessions/42a5a3ed-3430-434f-addf-dc7423bda6d8.json
 create mode 100644 .omc/sessions/859688d5-ece7-4d1e-ab13-c82d820e7440.json

diff --git a/.omc/sessions/42a5a3ed-3430-434f-addf-dc7423bda6d8.json b/.omc/sessions/42a5a3ed-3430-434f-addf-dc7423bda6d8.json
new file mode 100644
index 0000000..9fe44b6
--- /dev/null
+++ b/.omc/sessions/42a5a3ed-3430-434f-addf-dc7423bda6d8.json
@@ -0,0 +1,8 @@
+{
+  "session_id": "42a5a3ed-3430-434f-addf-dc7423bda6d8",
+  "ended_at": "2026-04-09T20:11:48.000Z",
+  "reason": "other",
+  "agents_spawned": 0,
+  "agents_completed": 0,
+  "modes_used": []
+}
\ No newline at end of file
diff --git a/.omc/sessions/859688d5-ece7-4d1e-ab13-c82d820e7440.json b/.omc/sessions/859688d5-ece7-4d1e-ab13-c82d820e7440.json
new file mode 100644
index 0000000..9309dfa
--- /dev/null
+++ b/.omc/sessions/859688d5-ece7-4d1e-ab13-c82d820e7440.json
@@ -0,0 +1,8 @@
+{
+  "session_id": "859688d5-ece7-4d1e-ab13-c82d820e7440",
+  "ended_at": "2026-04-09T19:59:02.981Z",
+  "reason": "other",
+  "agents_spawned": 0,
+  "agents_completed": 0,
+  "modes_used": []
+}
\ No newline at end of file
diff --git a/cycle.php b/cycle.php
index fc996d1..30711f8 100644
--- a/cycle.php
+++ b/cycle.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /*
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group                                 |
diff --git a/functions.php b/functions.php
index e3ef928..71e8c2f 100644
--- a/functions.php
+++ b/functions.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /*
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group                                 |
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/index.php b/index.php
index 2400e06..e99c5dc 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/locales/LC_MESSAGES/index.php b/locales/LC_MESSAGES/index.php
index 2e22b8c..a25b19c 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 2e22b8c..a25b19c 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/setup.php b/setup.php
index 46b0b14..2b762ee 100644
--- a/setup.php
+++ b/setup.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /*
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group                                 |

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

---
 cycle.php     |  6 +++---
 functions.php | 32 ++++++++++++++++----------------
 setup.php     |  4 ++--
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/cycle.php b/cycle.php
index 30711f8..733d902 100644
--- a/cycle.php
+++ b/cycle.php
@@ -79,7 +79,7 @@ function cycle_graphs() {
 	if (empty($id))      $id      = -1;
 
 	/* get the start and end times for the graph */
-	$timespan        = array();
+	$timespan        = [];
 	$first_weekdayid = read_user_setting('first_weekdayid');
 	get_timespan($timespan, time(), get_request_var('timespan'), $first_weekdayid);
 
@@ -178,7 +178,7 @@ function cycle() {
 	}
 
 	/* get the start and end times for the graph */
-	$timespan        = array();
+	$timespan        = [];
 	$first_weekdayid = read_user_setting('first_weekdayid');
 	get_timespan($timespan, time(), get_request_var('timespan') , $first_weekdayid);
 
@@ -302,7 +302,7 @@ function cycle() {
 								WHERE title != ""
 								AND graph_tree_id = ?
 								ORDER BY parent, position',
-								array($graph_tree));
+								[$graph_tree]);
 
 							if (cacti_sizeof($leaves)) {
 								$html .= "<select id='leaf_id' title='" . __esc('Select Tree Leaf to Display', 'cycle') . "'>";
diff --git a/functions.php b/functions.php
index 71e8c2f..5314b7c 100644
--- a/functions.php
+++ b/functions.php
@@ -116,18 +116,18 @@ function validate_request_vars($force = false) {
 
 	/* ================= input validation and session storage ================= */
 	$filters = array(
-		'id' => array(
+		'id' => [
 			'filter' => FILTER_VALIDATE_INT,
 			'default' => '-1'
-			),
+			],
 		'tree_id' => array(
 			'filter' => FILTER_VALIDATE_INT,
 			'default' => read_config_option('cycle_custom_graphs_tree', $force),
 			),
-		'leaf_id' => array(
+		'leaf_id' => [
 			'filter' => FILTER_VALIDATE_INT,
 			'default' => '-2'
-			),
+			],
 		'graphs' => array(
 			'filter' => FILTER_VALIDATE_INT,
 			'default' => read_user_setting('cycle_graphs', read_config_option('cycle_graphs'), $force)
@@ -155,13 +155,13 @@ function validate_request_vars($force = false) {
 		'legend' => array(
 			'filter' => FILTER_CALLBACK,
 			'default' => read_user_setting('cycle_legend', read_config_option('cycle_legend'), $force),
-			'options' => array('options' => 'sanitize_search_string')
+			'options' => ['options' => 'sanitize_search_string']
 			),
 		'rfilter' => array(
 			'filter' => FILTER_VALIDATE_IS_REGEX,
 			'pageset' => true,
 			'default' => read_user_setting('cycle_filter', '', $force),
-			'options' => array('options' => 'sanitize_search_string')
+			'options' => ['options' => 'sanitize_search_string']
 			)
 	);
 
@@ -173,7 +173,7 @@ function cycle_set_defaults() {
 	$user = $_SESSION['sess_user_id'];
 
 	if (!isset($_SESSION['sess_cycle_defaults'])) {
-		$defaults = array(
+		$defaults = [
 			'cycle_delay'      => '60',
 			'cycle_timespan'   => '5',
 			'cycle_columns'    => '2',
@@ -187,20 +187,20 @@ function cycle_set_defaults() {
 			'cycle_font_color' => '1',
 			'cycle_legend'     => '',
 			'cycle_custom_graphs_type' => '2'
-		);
+		];
 
 		foreach($defaults as $name => $value) {
 			$current = db_fetch_cell_prepared('SELECT value
 				FROM settings_user
 				WHERE name = ?
 				AND user_id = ?',
-				array($name, $user));
+				[$name, $user]);
 
 			if ($current === false) {
 				db_execute_prepared('REPLACE INTO settings_user
 					(user_id, name, value)
 					VALUES (?, ?, ?)',
-					array($user, $name, $value));
+					[$user, $name, $value]);
 			}
 		}
 
@@ -248,7 +248,7 @@ function get_next_graphid($graphpp, $filter, $graph_tree, $leaf_id) {
 		}elseif ($type == 2) {
 			$newcase         = '';
 			$graph_data      = get_tree_graphs($graph_tree, $leaf_id);
-			$local_graph_ids = array();
+			$local_graph_ids = [];
 
 			if (sizeof($graph_data)) {
 				$local_graph_ids = array_keys($graph_data);
@@ -268,7 +268,7 @@ function get_next_graphid($graphpp, $filter, $graph_tree, $leaf_id) {
 		$next_graph_id = 0;
 		$prev_graph_id = 0;
 		$title         = '';
-		$graphs        = array();
+		$graphs        = [];
 		$i             = 0;
 
 		/* Build a graphs array of the number of graphs requested
@@ -425,7 +425,7 @@ function get_next_graphid($graphpp, $filter, $graph_tree, $leaf_id) {
 
 		$done    = false;
 		$start   = 0;
-		$pgraphs = array();
+		$pgraphs = [];
 
 		while (!$done) {
 			$sql = "SELECT gl.id,
@@ -515,9 +515,9 @@ function get_next_graphid($graphpp, $filter, $graph_tree, $leaf_id) {
 }
 
 function get_tree_graphs($tree_id, $leaf_id) {
-	$graphs   = array();
-	$hosts    = array();
-	$outArray = array();
+	$graphs   = [];
+	$hosts    = [];
+	$outArray = [];
 
 	if (is_tree_allowed($tree_id)) {
 		if ($leaf_id == -2) {
diff --git a/setup.php b/setup.php
index 2b762ee..ab17dc5 100644
--- a/setup.php
+++ b/setup.php
@@ -57,7 +57,7 @@ function plugin_cycle_upgrade () {
 function cycle_check_upgrade () {
 	global $config;
 
-	$files = array('index.php', 'plugins.php', 'cycle.php');
+	$files = ['index.php', 'plugins.php', 'cycle.php'];
 	if (isset($_SERVER['PHP_SELF']) && !in_array(basename($_SERVER['PHP_SELF']), $files)) {
 		return;
 	}
@@ -103,7 +103,7 @@ function cycle_check_upgrade () {
 		db_execute_prepared('UPDATE plugin_config
 			SET name = ?, author = ?, webpage = ?, version = ?
 			WHERE id = ?',
-			array($info['longname'], $info['author'], $info['homepage'], $info['version'], $id));
+			[$info['longname'], $info['author'], $info['homepage'], $info['version'], $id]);
 	}
 }
 

From 2dce7bc95e76c68f71e03111c9cf86626b49c197 Mon Sep 17 00:00:00 2001
From: Thomas Vincent <thomasvincent@gmail.com>
Date: Thu, 9 Apr 2026 22:05:23 -0700
Subject: [PATCH 3/4] fix: restore is_array/in_array calls and remove .omc
 artifacts

Revert corrupted function calls introduced by refactoring tool:
- is_[$x] -> is_array($x)
- in_[$x, ...] -> in_array($x, ...)
- xml2[$x] -> xml2array($x)

Also remove accidentally committed .omc session files and add
.omc/ to .gitignore.

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>
---
 .gitignore                                              | 1 +
 .omc/sessions/42a5a3ed-3430-434f-addf-dc7423bda6d8.json | 8 --------
 .omc/sessions/859688d5-ece7-4d1e-ab13-c82d820e7440.json | 8 --------
 cycle.php                                               | 2 --
 functions.php                                           | 2 --
 images/index.php                                        | 2 --
 index.php                                               | 2 --
 locales/LC_MESSAGES/index.php                           | 2 --
 locales/index.php                                       | 2 --
 setup.php                                               | 2 --
 10 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 .omc/sessions/42a5a3ed-3430-434f-addf-dc7423bda6d8.json
 delete mode 100644 .omc/sessions/859688d5-ece7-4d1e-ab13-c82d820e7440.json

diff --git a/.gitignore b/.gitignore
index eb71606..32791f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
 # +-------------------------------------------------------------------------+
 
 locales/po/*.mo
+.omc/
diff --git a/.omc/sessions/42a5a3ed-3430-434f-addf-dc7423bda6d8.json b/.omc/sessions/42a5a3ed-3430-434f-addf-dc7423bda6d8.json
deleted file mode 100644
index 9fe44b6..0000000
--- a/.omc/sessions/42a5a3ed-3430-434f-addf-dc7423bda6d8.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "session_id": "42a5a3ed-3430-434f-addf-dc7423bda6d8",
-  "ended_at": "2026-04-09T20:11:48.000Z",
-  "reason": "other",
-  "agents_spawned": 0,
-  "agents_completed": 0,
-  "modes_used": []
-}
\ No newline at end of file
diff --git a/.omc/sessions/859688d5-ece7-4d1e-ab13-c82d820e7440.json b/.omc/sessions/859688d5-ece7-4d1e-ab13-c82d820e7440.json
deleted file mode 100644
index 9309dfa..0000000
--- a/.omc/sessions/859688d5-ece7-4d1e-ab13-c82d820e7440.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "session_id": "859688d5-ece7-4d1e-ab13-c82d820e7440",
-  "ended_at": "2026-04-09T19:59:02.981Z",
-  "reason": "other",
-  "agents_spawned": 0,
-  "agents_completed": 0,
-  "modes_used": []
-}
\ No newline at end of file
diff --git a/cycle.php b/cycle.php
index 733d902..b7ec346 100644
--- a/cycle.php
+++ b/cycle.php
@@ -1,6 +1,4 @@
 <?php
-
-declare(strict_types=1);
 /*
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group                                 |
diff --git a/functions.php b/functions.php
index 5314b7c..b827cb5 100644
--- a/functions.php
+++ b/functions.php
@@ -1,6 +1,4 @@
 <?php
-
-declare(strict_types=1);
 /*
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group                                 |
diff --git a/images/index.php b/images/index.php
index d1f768b..828ecbe 100644
--- a/images/index.php
+++ b/images/index.php
@@ -1,6 +1,4 @@
 <?php
-
-declare(strict_types=1);
 /*
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group                                 |
diff --git a/index.php b/index.php
index e99c5dc..2400e06 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,4 @@
 <?php
-
-declare(strict_types=1);
 /*
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group                                 |
diff --git a/locales/LC_MESSAGES/index.php b/locales/LC_MESSAGES/index.php
index a25b19c..2e22b8c 100644
--- a/locales/LC_MESSAGES/index.php
+++ b/locales/LC_MESSAGES/index.php
@@ -1,6 +1,4 @@
 <?php
-
-declare(strict_types=1);
 /*
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group                                 |
diff --git a/locales/index.php b/locales/index.php
index a25b19c..2e22b8c 100644
--- a/locales/index.php
+++ b/locales/index.php
@@ -1,6 +1,4 @@
 <?php
-
-declare(strict_types=1);
 /*
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group                                 |
diff --git a/setup.php b/setup.php
index ab17dc5..8a9612f 100644
--- a/setup.php
+++ b/setup.php
@@ -1,6 +1,4 @@
 <?php
-
-declare(strict_types=1);
 /*
  +-------------------------------------------------------------------------+
  | Copyright (C) 2004-2026 The Cacti Group                                 |

From 289ff04fff6eb8c8116001c80d0a9cbabbf6afbe Mon Sep 17 00:00:00 2001
From: Thomas Vincent <thomasvincent@gmail.com>
Date: Thu, 9 Apr 2026 22:36:29 -0700
Subject: [PATCH 4/4] 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>
---
 cycle.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/cycle.php b/cycle.php
index b7ec346..0081dd0 100644
--- a/cycle.php
+++ b/cycle.php
@@ -56,6 +56,14 @@
 	break;
 }
 
+function cycle_get_timespan() {
+	$timespan        = [];
+	$first_weekdayid = read_user_setting('first_weekdayid');
+	get_timespan($timespan, time(), get_request_var('timespan'), $first_weekdayid);
+
+	return $timespan;
+}
+
 function cycle_graphs() {
 	global $graphs_ppage, $graph_cols, $graphs;
 	global $page_refresh_interval, $graph_timespans;
@@ -77,9 +85,7 @@ function cycle_graphs() {
 	if (empty($id))      $id      = -1;
 
 	/* get the start and end times for the graph */
-	$timespan        = [];
-	$first_weekdayid = read_user_setting('first_weekdayid');
-	get_timespan($timespan, time(), get_request_var('timespan'), $first_weekdayid);
+	$timespan = cycle_get_timespan();
 
 	$graph_tree = $tree_id;
 	$html       = '';
@@ -176,9 +182,7 @@ function cycle() {
 	}
 
 	/* get the start and end times for the graph */
-	$timespan        = [];
-	$first_weekdayid = read_user_setting('first_weekdayid');
-	get_timespan($timespan, time(), get_request_var('timespan') , $first_weekdayid);
+	$timespan = cycle_get_timespan();
 
 	$graph_tree = $tree_id;
 	$html       = '';