From 0dc7dc5ac5eb32a5f93efc59f89016ad4cdd9b80 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Tue, 16 Apr 2024 21:53:24 +0900
Subject: [PATCH] Remove notice about FTP password when uninstalling a package

https://xetown.com/questions/1819447
---
 modules/admin/controllers/maintenance/Cleanup.php    |  2 ++
 modules/autoinstall/autoinstall.admin.view.php       |  7 +++----
 modules/autoinstall/ruleset/ftp.xml                  |  8 --------
 modules/autoinstall/tpl/filter/uninstall_package.xml | 10 ----------
 modules/autoinstall/tpl/uninstall.html               |  2 +-
 5 files changed, 6 insertions(+), 23 deletions(-)
 delete mode 100644 modules/autoinstall/ruleset/ftp.xml
 delete mode 100644 modules/autoinstall/tpl/filter/uninstall_package.xml

diff --git a/modules/admin/controllers/maintenance/Cleanup.php b/modules/admin/controllers/maintenance/Cleanup.php
index 97f575579..8a4303569 100644
--- a/modules/admin/controllers/maintenance/Cleanup.php
+++ b/modules/admin/controllers/maintenance/Cleanup.php
@@ -338,6 +338,8 @@ class Cleanup extends Base
 		'modules/admin/tpl/js/menu_setup.min.js' => 'deleted',
 		'modules/admin/tpl/img/faviconSample.png' => 'deleted',
 		'modules/admin/tpl/img/mobiconSample.png' => 'deleted',
+		'modules/autoinstall/ruleset/' => 'deleted:xe',
+		'modules/autoinstall/tpl/filter/uninstall_package.xml' => 'deleted:xe',
 		'modules/board/board.wap.php' => 'deleted:xe',
 		'modules/counter/queries/deleteSiteCounter.xml' => 'deleted:xe',
 		'modules/counter/queries/deleteSiteCounterLog.xml' => 'deleted:xe',
diff --git a/modules/autoinstall/autoinstall.admin.view.php b/modules/autoinstall/autoinstall.admin.view.php
index 4846e56c3..f49d99062 100644
--- a/modules/autoinstall/autoinstall.admin.view.php
+++ b/modules/autoinstall/autoinstall.admin.view.php
@@ -30,7 +30,7 @@ class autoinstallAdminView extends autoinstall
 		$oAdminModel = getAdminModel('autoinstall');
 		$config = $oAdminModel->getAutoInstallAdminModuleConfig();
 		Context::set('config', $config);
-		
+
 		$template_path = sprintf("%stpl/", $this->module_path);
 		Context::set('original_site', $config->location_site);
 		Context::set('uri', $config->download_server);
@@ -188,7 +188,7 @@ class autoinstallAdminView extends autoinstall
 		}
 
 		$oModel = getModel('autoinstall');
-		
+
 		if($package == null)
 		{
 			$packages = $oModel->getInstalledPackages(array_keys($targetpackages));
@@ -605,7 +605,6 @@ class autoinstallAdminView extends autoinstall
 			$installedPackage->deps = $item_list[$package_srl]->deps;
 			Context::set('package', $installedPackage);
 			$this->setTemplateFile('uninstall');
-			Context::addJsFilter($this->module_path . 'tpl/filter', 'uninstall_package.xml');
 
 			$security = new Security();
 			$security->encodeHTML('package.');
@@ -620,7 +619,7 @@ class autoinstallAdminView extends autoinstall
 
 	/**
 	 * Display config
-	 * 
+	 *
 	 */
 	function dispAutoinstallAdminConfig()
 	{
diff --git a/modules/autoinstall/ruleset/ftp.xml b/modules/autoinstall/ruleset/ftp.xml
deleted file mode 100644
index e8f584700..000000000
--- a/modules/autoinstall/ruleset/ftp.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ruleset version="1.5.0">
-	<customrules>
-	</customrules>
-	<fields>
-		<field name="ftp_password" required="true"/>
-	</fields>
-</ruleset>
diff --git a/modules/autoinstall/tpl/filter/uninstall_package.xml b/modules/autoinstall/tpl/filter/uninstall_package.xml
deleted file mode 100644
index 6df9b6f8e..000000000
--- a/modules/autoinstall/tpl/filter/uninstall_package.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<filter name="uninstall_package" module="autoinstall" act="procAutoinstallAdminUninstallPackage" confirm_msg_code="confirm_delete">
-	<form>
-		<node target="ftp_password" required="true" />
-	</form>
-	<response callback_func="completeUninstall">
-		<tag name="error" />
-		<tag name="message" />
-	</response>
-</filter>
-		
diff --git a/modules/autoinstall/tpl/uninstall.html b/modules/autoinstall/tpl/uninstall.html
index 094a07c74..290e541a1 100644
--- a/modules/autoinstall/tpl/uninstall.html
+++ b/modules/autoinstall/tpl/uninstall.html
@@ -21,7 +21,7 @@
 		<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/autoinstall/tpl/uninstall/1'" class="message error">
 			<p>{$XE_VALIDATOR_MESSAGE}</p>
 		</div>
-		<form action="./" class="x_form-horizontal" method="post" ruleset="ftp">
+		<form action="./" class="x_form-horizontal" method="post">
 			<input type="hidden" name="module" value="autoinstall" />
 			<input type="hidden" name="act" value="procAutoinstallAdminUninstallPackage" />
 			<input type="hidden" name="package_srl" value="{$package_srl}" />