From bea03fb931059bb03f5242c9db6370a918407ef1 Mon Sep 17 00:00:00 2001
From: Jose <joserprg@gmail.com>
Date: Thu, 7 May 2020 21:04:03 -0400
Subject: [PATCH] Plugin/template icons code changes

---
 CHANGELOG                     | 1 +
 gui/bastille_manager-lib.inc  | 7 ++++---
 gui/bastille_manager_util.php | 4 ++++
 version                       | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3b9bb11..659d905 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 ======================
 Version    Description
 
+1.0.44......Plugin/template icons code changes.
 1.0.43......Add Swedish translation, thanks to Anders Malm.
 1.0.42......Update to new simplified bastille config, obsolete code cleanup.
 1.0.41......Set target jail path on advanced config editor by default.
diff --git a/gui/bastille_manager-lib.inc b/gui/bastille_manager-lib.inc
index 9332e8f..7d0b3bf 100755
--- a/gui/bastille_manager-lib.inc
+++ b/gui/bastille_manager-lib.inc
@@ -212,9 +212,11 @@ function get_jail_infos() {
 			$r['stat'] = $img_path['dis'];
 		endif;
 		// Display custom template icons if available.
-		$item = $item;
-		$template_icon = "{$image_dir}/{$item}_icon.png";
+		$template_icon = "{$jail_dir}/{$item}/plugin_icon.png";
 		if(file_exists($template_icon)):
+			if(!file_exists("{$image_dir}/{$item}_icon.png")):
+				copy("$template_icon", "{$image_dir}/{$item}_icon.png");
+			endif;
 			$r['logo'] = "{$image_dir}/{$item}_icon.png";
 		else:
 			// Display standard FreeBSD icon.
@@ -225,5 +227,4 @@ function get_jail_infos() {
 	endforeach;
 	return $result;
 }
-
 ?>
diff --git a/gui/bastille_manager_util.php b/gui/bastille_manager_util.php
index 089f64e..6ccb9c8 100644
--- a/gui/bastille_manager_util.php
+++ b/gui/bastille_manager_util.php
@@ -291,6 +291,7 @@ if($_POST):
 					$container['jailname'] = $_POST['jailname'];
 					$confirm_name = $pconfig['confirmname'];
 					$item = $container['jailname'];
+					$plugin_icon = "{$image_dir}/{$item}_icon.png";
 
 					if(strcmp($confirm_name, $item) !== 0):
 						$input_errors[] = gtext("Failed to destroy container, name confirmation is required.");
@@ -304,6 +305,9 @@ if($_POST):
 						unset($output,$retval);mwexec2($cmd,$output,$retval);
 						if($retval == 0):
 							exec("/usr/sbin/sysrc -f {$configfile} -qx {$item}_AUTO_START");
+							if(file_exists($plugin_icon)):
+								unlink($plugin_icon);
+							endif;
 							header('Location: bastille_manager_gui.php');
 							exit;
 						else:
diff --git a/version b/version
index f683e66..6ae122f 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.0.43
+1.0.44