diff --git a/func_ruby/ext-modules/bunkerweb_module.mod b/func_ruby/ext-modules/bunkerweb_module.mod index fcf4782..69098f1 100644 --- a/func_ruby/ext-modules/bunkerweb_module.mod +++ b/func_ruby/ext-modules/bunkerweb_module.mod @@ -157,6 +157,22 @@ class BunkerwebWorker < Kernel::ModuleCoreWorker hestia_print_array_of_hashes(result, format, "API_USERNAME,API_PASSWORD,ADMIN_USERNAME,ADMIN_PASSWORD") ACTION_OK when "configure" + require 'shellwords' + param1 = args[1] + param2 = args[2] + if param1 && param2 && !param1.strip.empty? && !param2.strip.empty? + cmd = "/usr/local/hestia/bin/v-bunkerweb-module-install #{Shellwords.escape(param1)} #{Shellwords.escape(param2)}" + else + cmd = "/usr/local/hestia/bin/v-bunkerweb-module-install" + end + output = `#{cmd} 2>&1` + exit_status = $?.exitstatus + if exit_status != 0 + log_return("#{output}\nCommand failed with status #{exit_status}") + else + puts output + ACTION_OK + end when "help" puts "#{$0} bunkerweb_module COMMAND [OPTIONS] [json|csv|plain]" puts "COMMANDS:" diff --git a/web/extm/bunkerweb_module/edit/index.php b/web/extm/bunkerweb_module/edit/index.php index 59bc863..9f51704 100644 --- a/web/extm/bunkerweb_module/edit/index.php +++ b/web/extm/bunkerweb_module/edit/index.php @@ -40,7 +40,7 @@ $bunkerweb_list = []; if ($return_var == 0) { $bunkerweb_list = json_decode(implode("", $output), true); } else { - $error_message = $output; + $error_message = implode("
\n", $output); } unset($output); @@ -57,6 +57,21 @@ if ($return_var == 0) { unset($output); +//Get UI and API passw +// Data +exec( + HESTIA_CMD . "v-ext-modules-run bunkerweb_module passwd json", + $output, + $return_var, +); + +$pass = []; +if ($return_var == 0) { + $pass = json_decode(implode("", $output), true); +} else { + $error_message .= implode("
\n", $output); +} + // Render page render_page($user, $TAB, "extmodules/extmodules_bunkerweb_module"); diff --git a/web/templates/pages/extmodules/extmodules_bunkerweb_module.php b/web/templates/pages/extmodules/extmodules_bunkerweb_module.php index 73e5c69..f8dbc81 100644 --- a/web/templates/pages/extmodules/extmodules_bunkerweb_module.php +++ b/web/templates/pages/extmodules/extmodules_bunkerweb_module.php @@ -20,9 +20,9 @@ -

+

+ +

@@ -69,6 +69,39 @@
+

+ +

+
+
+
+
+
+
+
+
+ API +
+
+ +
+
+ +
+
+
+
+ UI +
+
+ +
+
+ +
+
+
+