Code and regex improvements

CHANGELOG

@@ -3,5 +3,6 @@
 ======================
 Version    Description
 
+1.0.2......Code and regex improvements.
 1.0.1......Update paths and minor changes.
 1.0.0......First Public Release.

gui/bastille_manager-lib.inc

@@ -54,12 +54,6 @@ $bastille_config = "{$rootfolder}/conf/bastille_config";
 $jail_dir = "{$rootfolder}/jails";
 $image_dir = "ext/bastille/images";
 
-$avail_releases = exec("/bin/echo $(/bin/ls {$rootfolder}/releases 2>/dev/null)");
-if ($avail_releases == ''):
-	$empty_releases = "YES";
-	$avail_releases = "No base releases detected!";
-endif;
-
 // Ensure the root directory is configured.
 if ($rootfolder == "")
 	$input_errors[] = gtext("Extension installed with fault");

gui/bastille_manager_add.php

@@ -62,7 +62,7 @@ foreach($a_release as $k_release => $release):
 	$l_release[$k_release] = $k_release;
 endforeach;
 
-if(!is_dir($jail_dir)):
+if(!get_all_release_list()):
 	$errormsg = gtext('No base releases extracted yet.')
 			. ' '
 			. '<a href="' . 'bastille_manager_tarballs.php' . '">'
@@ -72,7 +72,6 @@ if(!is_dir($jail_dir)):
 endif;
 
 if($_POST):
-	global $empty_releases;
 	global $configfile;
 	unset($input_errors);
 	$pconfig = $_POST;
@@ -90,27 +89,28 @@ if($_POST):
 			$interface = $pconfig['interface'];
 		endif;
 
-		if($empty_releases !== "YES"):
 		if ($_POST['nowstart']):
 			$cmd = ("/usr/local/bin/bastille create {$jname} {$release} {$ipaddr} {$interface} && /usr/local/bin/bastille start {$jname}");
 		else:
 			$cmd = ("/usr/local/bin/bastille create {$jname} {$release} {$ipaddr} {$interface}");
 		endif;
-			else:
+
-				$cmd = "";
-			endif;
 		if ($_POST['Create']):
+			if(get_all_release_list()):
+				unset($output,$retval);mwexec2($cmd,$output,$retval);
+				if($retval == 0):
 					if ($_POST['autostart']):
 						exec("/usr/sbin/sysrc -f {$configfile} {$jname}_AUTO_START=\"YES\"");
 					endif;
-			unset($output,$retval);mwexec2($cmd,$output,$retval);
-			if($retval == 0):
 					//$savemsg .= gtext("Boot Environment created and activated successfully.");
 					header('Location: bastille_manager_gui.php');
 					exit;
 				else:
 					$errormsg .= gtext("Failed to create container.");
 				endif;
+			else:
+				$errormsg .= gtext(" <<< Failed to create container.");
+			endif;
 		endif;
 	endif;
 endif;

gui/bastille_manager_tarballs.php

@@ -49,7 +49,7 @@ function get_rel_list() {
 	global $rootfolder;
 	$result = [];
 	if (is_dir("{$rootfolder}/releases")):
-		$entries = preg_grep('/^([^.])/', scandir("{$rootfolder}/releases"));
+		$entries = preg_grep('/^[0-9]+\.[0-9]+\-RELEASE/', scandir("{$rootfolder}/releases"));
 		foreach($entries as $entry):
    		$a = preg_split('/\t/',$entry);
 		$r = [];