Do not restore a full configuration if there is no pfsense or m0n0wall tag

1 files changed, 14 insertions, 9 deletions

diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php
index d3dc3f7..51f87f5 100755
--- a/usr/local/www/diag_backup.php
+++ b/usr/local/www/diag_backup.php
@@ -140,16 +140,21 @@ if ($_POST) {
 						$savemsg = "The configuration area has been restored.";
 					}
 				} else {
-					/* restore the entire configuration */
-					if (config_install($_FILES['conffile']['tmp_name']) == 0) {
-						/* this will be picked up by /index.php */
-						conf_mount_rw();
-						touch("/needs_package_sync");
-						conf_mount_ro();
-						$reloadall = true;
-						$savemsg = "The configuration has been restored. The firewall is now reloading the settings.";
+					$rules = file_get_contents($_FILES['conffile']['tmp_name']);
+					if(stristr($rules, "pfsense") == false) {
+						$input_errors[] = "You have selected to restore the full configuration but we could not locate a pfsense tag.";
 					} else {
-						$input_errors[] = "The configuration could not be restored.";
+					/* restore the entire configuration */
+						if (config_install($_FILES['conffile']['tmp_name']) == 0) {
+							/* this will be picked up by /index.php */
+							conf_mount_rw();
+							touch("/needs_package_sync");
+							conf_mount_ro();
+							$reloadall = true;
+							$savemsg = "The configuration has been restored. The firewall is now reloading the settings.";
+						} else {
+							$input_errors[] = "The configuration could not be restored.";
+						}
 					}
 				}				
 			} else {