From b89fe7c6b8d88319db99ef740cb5d3e3754e2eb2 Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 19 Feb 2025 01:02:04 -0800 Subject: [PATCH] Set install_path, revise parameters used w/ installPlugin() --- ajax/plugins/do_plugin_install.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ajax/plugins/do_plugin_install.php b/ajax/plugins/do_plugin_install.php index f05ccb75..1ec5f93a 100755 --- a/ajax/plugins/do_plugin_install.php +++ b/ajax/plugins/do_plugin_install.php @@ -10,20 +10,19 @@ require_once '../../src/RaspAP/Plugins/PluginInstaller.php'; $pluginInstaller = \RaspAP\Plugins\PluginInstaller::getInstance(); $plugin_uri = $_POST['plugin_uri'] ?? null; $plugin_version = $_POST['plugin_version'] ?? null; +$install_path = $_POST['install_path'] ?? null; -if (isset($plugin_uri) && isset($plugin_version)) { - $archiveUrl = rtrim($plugin_uri, '/') . '/archive/refs/tags/' . $plugin_version .'.zip'; - +if (isset($plugin_uri, $plugin_version, $install_path)) { try { - $return = $pluginInstaller->installPlugin($archiveUrl); + $return = $pluginInstaller->installPlugin($plugin_uri, $plugin_version, $install_path); echo json_encode($return); } catch (Exception $e) { - http_response_code(422); // Unprocessable Content + http_response_code(422); // unprocessable content echo json_encode(['error' => $e->getMessage()]); } } else { http_response_code(400); // Bad Request - echo json_encode(['error' => 'Plugin URI and version are required']); + echo json_encode(['error' => 'Plugin URI, version, and install path are required']); exit; }