From a3829b1d3ffdf0e8eb0145c499c72ff7ba8e6c4d Mon Sep 17 00:00:00 2001
From: JRGTH <joserprg@gmail.com>
Date: Sun, 28 Aug 2022 06:22:37 -0400
Subject: [PATCH] Cosmetic changes, some PHP8.x warning fixes

---
 CHANGELOG                            | 1 +
 gui/bastille_manager_config.php      | 1 +
 gui/bastille_manager_gui.php         | 1 +
 gui/bastille_manager_maintenance.php | 2 +-
 version                              | 2 +-
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 59218b5..36284ac 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 ======================
 Version    Description
 
+1.1.17......Cosmetic changes, some PHP8.x warning fixes.
 1.1.16......Add help support section for useful commands.
 1.1.15......Add required files from FreeBSD 13.1 base release, update config.
 1.1.14......Automatically deal with spaces on the fstab utility.
diff --git a/gui/bastille_manager_config.php b/gui/bastille_manager_config.php
index 89c3821..1f85530 100644
--- a/gui/bastille_manager_config.php
+++ b/gui/bastille_manager_config.php
@@ -80,6 +80,7 @@ function htmlButton($name, $text, $value="", $title="", $confirm="", $buttonImag
 }
 
 function parseConfigFile($configFile) {
+	global $section;
 	$fileArray = file($configFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);	// load config file content to array
 	$configArray = array();
 	foreach($fileArray as $line) {							// create array from config
diff --git a/gui/bastille_manager_gui.php b/gui/bastille_manager_gui.php
index ecc1383..e3ee342 100644
--- a/gui/bastille_manager_gui.php
+++ b/gui/bastille_manager_gui.php
@@ -224,6 +224,7 @@ $document->render();
 ?>
 <form action="bastille_manager_gui.php" method="post" name="iform" id="iform"><table id="area_data"><tbody><tr><td id="area_data_frame">
 <?php
+	global $sphere_notifier;
 	if(!empty($errormsg)):
 		print_error_box($errormsg);
 	endif;
diff --git a/gui/bastille_manager_maintenance.php b/gui/bastille_manager_maintenance.php
index b32cf70..571ae08 100644
--- a/gui/bastille_manager_maintenance.php
+++ b/gui/bastille_manager_maintenance.php
@@ -345,7 +345,7 @@ $(document).ready(function(){
 				</tr>
 					<?php
 						if(!initial_install_banner()):
-							html_checkbox2('zfs_activate',gtext('ZFS support activation'),'' ? true : false,gtext('Check this to activate ZFS support or leave unchecked to dismiss (requires ZFS support to be available), this is a one time option and this row will disappear after clicking Save button.'),'',false);
+							html_checkbox2('zfs_activate',gtext('ZFS support activation'),'' ? true : false,gtext('Check this to activate ZFS support or leave unchecked to dismiss (requires ZFS support to be available/enabled), this is a one time option and this row will disappear after clicking Save button or page refresh.'),'',false);
 						endif;
 					?>
 					<?php html_filechooser("backup_path", gtext("Backup directory"), $backup_path, gtext("Directory to store containers backup archives, use as file chooser for restoring from file, importable formats: .GZ/TGZ/TXZ/XZ or RAW(no extension on the file name)."), $backup_path, true, 60);?>
diff --git a/version b/version
index 63b283b..cbb8cba 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.1.16
+1.1.17