Xigmanas/xigmanas-bastille-extension
1
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

Minor cosmetic/wording changes

Browse Source
This commit is contained in:
JRGTH
2025-11-19 01:55:22 -04:00
parent cac84dc249
commit 2e7c30a48b
14 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+1
View File
@@ -3,6 +3,7 @@
====================== ======================
Version Description Version Description
1.2.26......Minor cosmetic/wording changes.
1.2.25......Add 'etcupdate' missing command, update bundled files. 1.2.25......Add 'etcupdate' missing command, update bundled files.
1.2.24......Minor code changes/improvements. 1.2.24......Minor code changes/improvements.
1.2.23......Check/update bastille config parameters on runtime. 1.2.23......Check/update bastille config parameters on runtime.
bastille-init
+1 -1
View File
@@ -9,7 +9,7 @@
# Debug script # Debug script
#set -x #set -x
# Copyright (c) 2019-2025, Jose Rivera (joserprg@gmail.com). # Copyright (c) 2019-2025, José Rivera (joserprg@gmail.com).
# All rights reserved. # All rights reserved.
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
gui/bastille_manager-lib.inc
+3 -3
View File
@@ -2,7 +2,7 @@
/* /*
bastille_manager-lib.inc bastille_manager-lib.inc
Copyright (c) 2019-2025 Jose Rivera (joserprg@gmail.com). Copyright (c) 2019-2025 José Rivera (joserprg@gmail.com).
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
@@ -85,7 +85,7 @@ if (is_file("{$rootfolder}/postinit")) unlink("{$rootfolder}/postinit");
// Check releases dir. // Check releases dir.
function is_dir_empty($reldir) { function is_dir_empty($reldir) {
if (!is_readable($reldir)) return NULL; if (!is_readable($reldir)) return NULL;
return (count(scandir($reldir)) == 2); return (count(scandir($reldir)) == 2);
} }
@@ -127,7 +127,7 @@ function initial_install_banner() {
return $is_bootstrapped = "YES"; return $is_bootstrapped = "YES";
break; break;
endif; endif;
endforeach; endforeach;
endif; endif;
} }
gui/bastille_manager_add.php
+2 -2
View File
@@ -2,7 +2,7 @@
/* /*
bastille_manager_add.php bastille_manager_add.php
Copyright (c) 2019-2025 Jose Rivera (joserprg@gmail.com). Copyright (c) 2019-2025 José Rivera (joserprg@gmail.com).
All rights reserved. All rights reserved.
Portions of XigmaNAS® (https://www.xigmanas.com). Portions of XigmaNAS® (https://www.xigmanas.com).
@@ -323,7 +323,7 @@ $document->render();
html_combobox2('interface',gettext('Network interface'),!empty($pconfig['interface']),$a_action,'',true,false); html_combobox2('interface',gettext('Network interface'),!empty($pconfig['interface']),$a_action,'',true,false);
html_combobox2('release',gettext('Base release'),!empty($pconfig['release']),$b_action,'',true,false); html_combobox2('release',gettext('Base release'),!empty($pconfig['release']),$b_action,'',true,false);
if($bastille_version_min > "0700000000"): if($bastille_version_min > "0700000000"):
html_checkbox2('thickjail',gettext('Create a thick container'),!empty($pconfig['thickjail']) ? true : false,gettext('These containers consume more space, but are self contained.'),'',false); html_checkbox2('thickjail',gettext('Create a thick container'),!empty($pconfig['thickjail']) ? true : false,gettext('These containers consume more space, but are self contained and fully independent.'),'',false);
if($host_version > "12100"): if($host_version > "12100"):
html_checkbox2('vnetjail',gettext('Enable VNET(VIMAGE)'),!empty($pconfig['vnetjail']) ? true : false,gettext('VNET-enabled containers are attached to a virtual bridge interface for connectivity(Only supported on 13.x and above).'),'',false,false,'vnetjail_change()'); html_checkbox2('vnetjail',gettext('Enable VNET(VIMAGE)'),!empty($pconfig['vnetjail']) ? true : false,gettext('VNET-enabled containers are attached to a virtual bridge interface for connectivity(Only supported on 13.x and above).'),'',false,false,'vnetjail_change()');
html_checkbox2('bridgejail',gettext('Enable Bridge VNET(VIMAGE)'),!empty($pconfig['bridgejail']) ? true : false,gettext('Bridge VNET-enabled containers are attached to a specified, already existing external bridge(Only supported on 13.x and above).'),'',false,false,'bridgejail_change()'); html_checkbox2('bridgejail',gettext('Enable Bridge VNET(VIMAGE)'),!empty($pconfig['bridgejail']) ? true : false,gettext('Bridge VNET-enabled containers are attached to a specified, already existing external bridge(Only supported on 13.x and above).'),'',false,false,'bridgejail_change()');
gui/bastille_manager_config.php
+4 -4
View File
@@ -2,7 +2,7 @@
/* /*
bastille_manager_config.php bastille_manager_config.php
Copyright (c) 2019-2025 Jose Rivera (joserprg@gmail.com). Copyright (c) 2019-2025 José Rivera (joserprg@gmail.com).
All rights reserved. All rights reserved.
Copyright (c) 2018 Andreas Schmidhuber Copyright (c) 2018 Andreas Schmidhuber
@@ -141,7 +141,7 @@ if ($_POST) {
if (isset($_POST['saveParam']) && $_POST['saveParam']) { // saveParam s/n/v if (isset($_POST['saveParam']) && $_POST['saveParam']) { // saveParam s/n/v
$buttonTag = explode("#", $_POST['saveParam']); // buttonTag[0] = section, buttonTag[1] = paramName $buttonTag = explode("#", $_POST['saveParam']); // buttonTag[0] = section, buttonTag[1] = paramName
$hashTag = str_replace(["[", "]", ".", "#"], "", $buttonTag[0]); // create destination to jump to after post $hashTag = str_replace(["[", "]", ".", "#"], "", $buttonTag[0]); // create destination to jump to after post
$nameTag = str_replace(["[", "]", ".", "#"], "", $_POST['saveParam']); // nameTag = <input title='$nameTag + addParam' ... /> $nameTag = str_replace(["[", "]", ".", "#"], "", $_POST['saveParam']); // nameTag = <input title='$nameTag + addParam' ... />
$configArray[$buttonTag[0]][$buttonTag[1]] = $_POST[$nameTag]; // save param to section $configArray[$buttonTag[0]][$buttonTag[1]] = $_POST[$nameTag]; // save param to section
#$savemsg .= "saveParam s/n/v: ".$_POST['saveParam']." ".$nameTag." ".$_POST[$nameTag]; #$savemsg .= "saveParam s/n/v: ".$_POST['saveParam']." ".$nameTag." ".$_POST[$nameTag];
@@ -171,10 +171,10 @@ bindtextdomain("xigmanas", $textdomain_bastille);
echo "<tr><td colspan='2' style='padding-left:0px; padding-right:0px;'>"; echo "<tr><td colspan='2' style='padding-left:0px; padding-right:0px;'>";
if (!empty($input_errors)) print_input_errors($input_errors); if (!empty($input_errors)) print_input_errors($input_errors);
if (!empty($savemsg)) print_info_box($savemsg); if (!empty($savemsg)) print_info_box($savemsg);
echo "</td></tr>"; echo "</td></tr>";
// loop through configuration // loop through configuration
$firstSection = true; // prevent first html_separator in loop $firstSection = true; // prevent first html_separator in loop
if (is_array($configArray) && !empty($configArray)) if (is_array($configArray) && !empty($configArray))
foreach($configArray as $key => $line) { // traverse array, key = section foreach($configArray as $key => $line) { // traverse array, key = section
$nameTag = str_replace(["[", "]", "."], "", $key); // create tag for post jump address and config changes $nameTag = str_replace(["[", "]", "."], "", $key); // create tag for post jump address and config changes
if (is_array($line)) { if (is_array($line)) {
gui/bastille_manager_editor.php
+1 -1
View File
@@ -2,7 +2,7 @@
/* /*
bastille_manager_editor.php bastille_manager_editor.php
Copyright (c) 2019-2025 Jose Rivera (joserprg@gmail.com). Copyright (c) 2019-2025 José Rivera (joserprg@gmail.com).
All rights reserved. All rights reserved.
Portions of XigmaNAS® (https://www.xigmanas.com). Portions of XigmaNAS® (https://www.xigmanas.com).
gui/bastille_manager_gui.php
+1 -1
View File
@@ -2,7 +2,7 @@
/* /*
bastille_manager_gui.php bastille_manager_gui.php
Copyright (c) 2019-2025 Jose Rivera (joserprg@gmail.com). Copyright (c) 2019-2025 José Rivera (joserprg@gmail.com).
All rights reserved. All rights reserved.
Portions of XigmaNAS® (https://www.xigmanas.com). Portions of XigmaNAS® (https://www.xigmanas.com).
gui/bastille_manager_info.php
+2 -2
View File
@@ -2,7 +2,7 @@
/* /*
bastille_manager_info.php bastille_manager_info.php
Copyright (c) 2019-2025 Jose Rivera (joserprg@gmail.com). Copyright (c) 2019-2025 José Rivera (joserprg@gmail.com).
All rights reserved. All rights reserved.
Portions of XigmaNAS® (https://www.xigmanas.com). Portions of XigmaNAS® (https://www.xigmanas.com).
@@ -147,7 +147,7 @@ $document->render();
</tr> </tr>
<tbody> <tbody>
</table> </table>
<tbody> <tbody>
</td></tr></tbody></table> </td></tr></tbody></table>
<?php <?php
include 'fend.inc'; include 'fend.inc';
gui/bastille_manager_jconf.php
+1 -1
View File
@@ -2,7 +2,7 @@
/* /*
bastille_manager_jconf.inc bastille_manager_jconf.inc
Copyright (c) 2019-2025 Jose Rivera (joserprg@gmail.com). Copyright (c) 2019-2025 José Rivera (joserprg@gmail.com).
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
gui/bastille_manager_maintenance.php
+1 -1
View File
@@ -2,7 +2,7 @@
/* /*
bastille_manager_maintenance.php bastille_manager_maintenance.php
Copyright (c) 2019-2025 Jose Rivera (joserprg@gmail.com). Copyright (c) 2019-2025 José Rivera (joserprg@gmail.com).
All rights reserved. All rights reserved.
Copyright (c) 2016 Andreas Schmidhuber Copyright (c) 2016 Andreas Schmidhuber
gui/bastille_manager_tarballs.php
+3 -3
View File
@@ -2,7 +2,7 @@
/* /*
bastille_manager_tarballs.php bastille_manager_tarballs.php
Copyright (c) 2019-2025 Jose Rivera (joserprg@gmail.com). Copyright (c) 2019-2025 José Rivera (joserprg@gmail.com).
All rights reserved. All rights reserved.
Portions of XigmaNAS® (https://www.xigmanas.com). Portions of XigmaNAS® (https://www.xigmanas.com).
@@ -87,7 +87,7 @@ if ($linux_compat_support == "YES"):
'13.4-RELEASE' => gettext('13.4-RELEASE'), '13.4-RELEASE' => gettext('13.4-RELEASE'),
// Linux base release bootstrap is allowed from command-line. // Linux base release bootstrap is allowed from command-line.
//'ubuntu-noble' => gettext('Ubuntu-noble'), //'ubuntu-noble' => gettext('Ubuntu-noble'),
//'ubuntu-jammy' => gettext('Ubuntu-Jammy'), //'ubuntu-jammy' => gettext('Ubuntu-Jammy'),
//'ubuntu-focal' => gettext('Ubuntu-Focal'), //'ubuntu-focal' => gettext('Ubuntu-Focal'),
//'ubuntu-bionic' => gettext('Ubuntu-Bionic'), //'ubuntu-bionic' => gettext('Ubuntu-Bionic'),
//'debian-bookworm' => gettext('Debian-Bookworm'), //'debian-bookworm' => gettext('Debian-Bookworm'),
@@ -203,7 +203,7 @@ if($_POST):
// Do not delete base releases with containers child. // Do not delete base releases with containers child.
if ($check_used): if ($check_used):
$errormsg .= sprintf(gtext('%s base appears to have containers child.'),$get_release); $errormsg .= sprintf(gtext('%s base appears to have containers child.'),$get_release);
else: else:
// Delete the FreeBSD base release/directory. // Delete the FreeBSD base release/directory.
if ($_POST['Destroy']): if ($_POST['Destroy']):
unset($output,$retval);mwexec2($cmd,$output,$retval); unset($output,$retval);mwexec2($cmd,$output,$retval);
gui/bastille_manager_util.php
+1 -1
View File
@@ -2,7 +2,7 @@
/* /*
bastille_manager_util.php bastille_manager_util.php
Copyright (c) 2019-2025 Jose Rivera (joserprg@gmail.com). Copyright (c) 2019-2025 José Rivera (joserprg@gmail.com).
All rights reserved. All rights reserved.
Portions of XigmaNAS® (https://www.xigmanas.com). Portions of XigmaNAS® (https://www.xigmanas.com).
unionfs.sh
+1 -1
View File
@@ -10,7 +10,7 @@
# Debug script # Debug script
#set -x #set -x
# Copyright (c) 2019-2025, Jose Rivera (joserprg@gmail.com). # Copyright (c) 2019-2025, José Rivera (joserprg@gmail.com).
# All rights reserved. # All rights reserved.
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
version
+1 -1
View File
@@ -1 +1 @@
1.2.25 1.2.26