diff --git a/CHANGELOG b/CHANGELOG index 47f90cf..f0d66b3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ ====================== Version Description +1.2.26......Minor cosmetic/wording changes. 1.2.25......Add 'etcupdate' missing command, update bundled files. 1.2.24......Minor code changes/improvements. 1.2.23......Check/update bastille config parameters on runtime. diff --git a/bastille-init b/bastille-init index 847fbeb..ba47f84 100755 --- a/bastille-init +++ b/bastille-init @@ -9,7 +9,7 @@ # Debug script #set -x -# Copyright (c) 2019-2025, Jose Rivera (joserprg@gmail.com). +# Copyright (c) 2019-2025, José Rivera (joserprg@gmail.com). # All rights reserved. # Redistribution and use in source and binary forms, with or without diff --git a/gui/bastille_manager-lib.inc b/gui/bastille_manager-lib.inc index 18b292e..906fe78 100644 --- a/gui/bastille_manager-lib.inc +++ b/gui/bastille_manager-lib.inc @@ -2,7 +2,7 @@ /* 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. 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. function is_dir_empty($reldir) { - if (!is_readable($reldir)) return NULL; + if (!is_readable($reldir)) return NULL; return (count(scandir($reldir)) == 2); } @@ -127,7 +127,7 @@ function initial_install_banner() { return $is_bootstrapped = "YES"; break; endif; - endforeach; + endforeach; endif; } diff --git a/gui/bastille_manager_add.php b/gui/bastille_manager_add.php index fcf71fc..06e9bf8 100644 --- a/gui/bastille_manager_add.php +++ b/gui/bastille_manager_add.php @@ -2,7 +2,7 @@ /* 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. 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('release',gettext('Base release'),!empty($pconfig['release']),$b_action,'',true,false); 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"): 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()'); diff --git a/gui/bastille_manager_config.php b/gui/bastille_manager_config.php index 2ea7ed6..09d49fc 100644 --- a/gui/bastille_manager_config.php +++ b/gui/bastille_manager_config.php @@ -2,7 +2,7 @@ /* 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. Copyright (c) 2018 Andreas Schmidhuber @@ -141,7 +141,7 @@ if ($_POST) { if (isset($_POST['saveParam']) && $_POST['saveParam']) { // saveParam s/n/v $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 = $configArray[$buttonTag[0]][$buttonTag[1]] = $_POST[$nameTag]; // save param to section #$savemsg .= "saveParam s/n/v: ".$_POST['saveParam']." ".$nameTag." ".$_POST[$nameTag]; @@ -171,10 +171,10 @@ bindtextdomain("xigmanas", $textdomain_bastille); echo ""; if (!empty($input_errors)) print_input_errors($input_errors); if (!empty($savemsg)) print_info_box($savemsg); - echo ""; + echo ""; // loop through configuration $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 $nameTag = str_replace(["[", "]", "."], "", $key); // create tag for post jump address and config changes if (is_array($line)) { diff --git a/gui/bastille_manager_editor.php b/gui/bastille_manager_editor.php index 8b5d2fe..9f1ba47 100644 --- a/gui/bastille_manager_editor.php +++ b/gui/bastille_manager_editor.php @@ -2,7 +2,7 @@ /* 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. Portions of XigmaNAS® (https://www.xigmanas.com). diff --git a/gui/bastille_manager_gui.php b/gui/bastille_manager_gui.php index dc5abae..c3f828e 100644 --- a/gui/bastille_manager_gui.php +++ b/gui/bastille_manager_gui.php @@ -2,7 +2,7 @@ /* 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. Portions of XigmaNAS® (https://www.xigmanas.com). diff --git a/gui/bastille_manager_info.php b/gui/bastille_manager_info.php index b78a67d..20607cf 100644 --- a/gui/bastille_manager_info.php +++ b/gui/bastille_manager_info.php @@ -2,7 +2,7 @@ /* 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. Portions of XigmaNAS® (https://www.xigmanas.com). @@ -147,7 +147,7 @@ $document->render(); - + gettext('13.4-RELEASE'), // Linux base release bootstrap is allowed from command-line. //'ubuntu-noble' => gettext('Ubuntu-noble'), - //'ubuntu-jammy' => gettext('Ubuntu-Jammy'), + //'ubuntu-jammy' => gettext('Ubuntu-Jammy'), //'ubuntu-focal' => gettext('Ubuntu-Focal'), //'ubuntu-bionic' => gettext('Ubuntu-Bionic'), //'debian-bookworm' => gettext('Debian-Bookworm'), @@ -203,7 +203,7 @@ if($_POST): // Do not delete base releases with containers child. if ($check_used): $errormsg .= sprintf(gtext('%s base appears to have containers child.'),$get_release); - else: + else: // Delete the FreeBSD base release/directory. if ($_POST['Destroy']): unset($output,$retval);mwexec2($cmd,$output,$retval); diff --git a/gui/bastille_manager_util.php b/gui/bastille_manager_util.php index 80505b4..ab71b33 100644 --- a/gui/bastille_manager_util.php +++ b/gui/bastille_manager_util.php @@ -2,7 +2,7 @@ /* 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. Portions of XigmaNAS® (https://www.xigmanas.com). diff --git a/unionfs.sh b/unionfs.sh index 8f2d89e..a60ddc2 100755 --- a/unionfs.sh +++ b/unionfs.sh @@ -10,7 +10,7 @@ # Debug script #set -x -# Copyright (c) 2019-2025, Jose Rivera (joserprg@gmail.com). +# Copyright (c) 2019-2025, José Rivera (joserprg@gmail.com). # All rights reserved. # Redistribution and use in source and binary forms, with or without diff --git a/version b/version index 8060c02..cba64f4 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.2.25 +1.2.26