diff --git a/CHANGELOG b/CHANGELOG index 1581869..c0f95b0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ ====================== Version Description +1.2.19......Fix typo in tarballs page and cleanup, thanks to Lux. 1.2.18......Fix typo in tarballs download page, thanks to Lux. 1.2.17......Check if bastille_zfs_enable is actually set to NO before zfs disable. 1.2.16......Disable zfs activation warnings if bastille_zfs_enable is set to NO. diff --git a/gui/bastille_manager_editor.php b/gui/bastille_manager_editor.php index 4f096f9..8b5d2fe 100644 --- a/gui/bastille_manager_editor.php +++ b/gui/bastille_manager_editor.php @@ -60,7 +60,7 @@ if(isset($_POST['submit'])) { } else { $savemsg = sprintf('%s %s', gtext('File not found'), $savetopath); $content = ''; - $savetopath = ''; + $savetopath = ''; } } break; @@ -128,7 +128,7 @@ $(window).on("load", function() { -
+
+
    • + +
    -
      -
      • +
        +
        • -
        • -
      -
      • diff --git a/gui/bastille_manager_tarballs.php b/gui/bastille_manager_tarballs.php index e6a893c..1105c93 100644 --- a/gui/bastille_manager_tarballs.php +++ b/gui/bastille_manager_tarballs.php @@ -53,7 +53,7 @@ function get_rel_list() { if (is_dir("{$rootfolder}/releases")): $entries = preg_grep('/^[0-9]+\.[0-9]+\-RELEASE|(Debian[0-9]{1,2}$)|(Ubuntu_[0-9]{4}$)/', scandir("{$rootfolder}/releases")); foreach($entries as $entry): - $a = preg_split('/\t/',$entry); + $a = preg_split('/\t/',$entry); $r = []; $name = $a[0]; if(preg_match('/^[0-9]+\.[0-9]+\-RELEASE|(Debian[0-9]{1,2}$)|(Ubuntu_[0-9]{4}$)/', $name, $m)): @@ -101,7 +101,7 @@ else: '14.2-RELEASE' => gettext('14.2-RELEASE'), '14.1-RELEASE' => gettext('14.1-RELEASE'), '14.0-RELEASE' => gettext('14.0-RELEASE'), - '13.5-RELEASE' => gettext('13.4-RELEASE'), + '13.5-RELEASE' => gettext('13.5-RELEASE'), '13.4-RELEASE' => gettext('13.4-RELEASE'), ]; endif; @@ -213,7 +213,7 @@ if($_POST): else: $errormsg .= sprintf(gtext('%s failed to delete.'),$get_release); endif; - endif; + endif; endif; endif; endif; @@ -275,7 +275,7 @@ $document->render(); render(); html_inputbox2('newipaddr',gettext('Enter a IP address for the new container'),!empty($pconfig['newipaddr']),'',true,30); html_checkbox2('clonestop',gettext('Stop container'),!empty($pconfig['clonestop']) ? true : false,gettext('Stop the container if running before cloning, mandatory on UFS filesystem.'),'',false); html_filechooser("source_path",gtext("Source Data Directory"),!empty($pconfig['source_path']), gtext("Source data directory to be shared, full path here, if the path contain spaces they will be automatically escaped with the ASCII \"\\040\" octal code."), !empty($source_path), false, 60); - html_filechooser("target_path",gtext("Target Data Directory"),!empty($pconfig['target_path']), gtext("Target data directory to be mapped, full path to jail here, if the path contain spaces they will be automatically escaped with the ASCII \"\\040\" octal code."), !empty($target_path), false, 60); - html_checkbox2("path_check", gettext("Source/Target path check"),!empty($pconfig['path_check']) ? true : false, gettext("If this option is selected no examination of the source/target directory paths will be performed."), "".gettext("Please use this option only if you know what you are doing here!")."", false); + html_filechooser("target_path",gtext("Target Data Directory"),!empty($pconfig['target_path']), gtext("Target data directory to be mapped, full path to jail here, if the path contain spaces they will be automatically escaped with the ASCII \"\\040\" octal code."), !empty($target_path), false, 60); + html_checkbox2("path_check", gettext("Source/Target path check"),!empty($pconfig['path_check']) ? true : false, gettext("If this option is selected no examination of the source/target directory paths will be performed."), "".gettext("Please use this option only if you know what you are doing here!")."", false); html_checkbox2('advanced',gettext('Advanced jail configuration Files'),!empty($pconfig['advanced']) ? true : false,gettext('I want to edit the jail files manually, Warning: It is recommended to stop the jail before config edit to prevent issues.'),'',true); html_checkbox2('readonly',gettext('Read-Only Mode'),!empty($pconfig['readonly']) ? true : false,gettext('Set target directory in Read-Only mode.'),'',true); html_checkbox2('automount',gettext('Auto-mount Nullfs'),!empty($pconfig['automount']) ? true : false,gettext('Auto-mount the nullfs mountpoint if the container is already running.'),'',true); diff --git a/version b/version index 591bdbc..9ddbe16 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.2.18 +1.2.19