copy fix

btcpayserver · Mar 15, 2024 · 78c0b55 · 78c0b55
1 parent 9985bb1
commit 78c0b55
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 22 deletions.
diff --git a/BTCPayServer/Controllers/UIServerController.Plugins.cs b/BTCPayServer/Controllers/UIServerController.Plugins.cs
@@ -77,6 +77,7 @@ public class ListPluginsViewModel
         public IActionResult EnablePlugin(
             [FromServices] PluginService pluginService, string plugin)
         {
+            pluginService.CancelCommands(plugin);
             pluginService.Enable(plugin);
             TempData.SetStatusMessageModel(new StatusMessageModel()
             {

diff --git a/BTCPayServer/Views/UIServer/ListPlugins.cshtml b/BTCPayServer/Views/UIServer/ListPlugins.cshtml
@@ -484,28 +484,28 @@
 
                     </div>
                       @if (pendingAction == "install")
-                                            {
-                                                <div class="card-footer border-0 ">
-                                            <form asp-action="ToggleAutoUpdate" asp-route-plugin="@plugin.Identifier" class="form-group" data-bs-toggle="tooltip" title=" @(autoUpdate.Contains(plugin.Identifier) ? "Disable" : "Enable") automatic updates for this plugin. You will still need to restart BTCPay Server to apply the update.">
-                                                <label class="d-flex align-items-center">
-                                                    <button type="submit" class="btcpay-toggle me-3 @if (autoUpdate.Contains(plugin.Identifier)) { @("btcpay-toggle--active") }" value="scripting-@(autoUpdate.Contains(plugin.Identifier) ? "off" : "on")">@(autoUpdate.Contains(plugin.Identifier) ? "Disable" : "Enable") automatic updates</button>
-                                                    <div class="">
-                                                        <span>Automatic updates</span>
-                                                    </div>
-                                                </label>
-                                            </form>
-                    
-                                            <form asp-action="ToggleKillswitch" asp-route-plugin="@plugin.Identifier" class="form-group"
-                                                  data-bs-toggle="tooltip" title="@(killswitch.Contains(plugin.Identifier) ? "Disable" : "Enable") killswitch for this plugin. The plugin server would notify your BTCpay server to disable this plugin if it is found to be vulnerable. You will still need to restart BTCPay Server to apply.">
-                                                <label class="d-flex align-items-center">
-                                                    <button type="submit" class="btcpay-toggle me-3 @if (killswitch.Contains(plugin.Identifier)) { @("btcpay-toggle--active") }" value="scripting-@(killswitch.Contains(plugin.Identifier) ? "off" : "on")">@(killswitch.Contains(plugin.Identifier) ? "Disable" : "Enable") killswitch</button>
-                                                    <div class="">
-                                                        <span>Kill switch</span>
-                                                    </div>
-                                                </label>
-                                            </form>
-                                        </div>
-                                            }
+                    {
+                        <div class="card-footer border-0 ">
+                            <form asp-action="ToggleAutoUpdate" asp-route-plugin="@plugin.Identifier" class="form-group" data-bs-toggle="tooltip" title=" @(autoUpdate.Contains(plugin.Identifier) ? "Disable" : "Enable") automatic updates for this plugin. You will still need to restart BTCPay Server to apply the update.">
+                                <label class="d-flex align-items-center">
+                                    <button type="submit" class="btcpay-toggle me-3 @if (autoUpdate.Contains(plugin.Identifier)) { @("btcpay-toggle--active") }" value="scripting-@(autoUpdate.Contains(plugin.Identifier) ? "off" : "on")">@(autoUpdate.Contains(plugin.Identifier) ? "Disable" : "Enable") automatic updates</button>
+                                    <div class="">
+                                        <span>Automatic updates</span>
+                                    </div>
+                                </label>
+                            </form>
+
+                            <form asp-action="ToggleKillswitch" asp-route-plugin="@plugin.Identifier" class="form-group"
+                                  data-bs-toggle="tooltip" title="@(killswitch.Contains(plugin.Identifier) ? "Disable" : "Enable") killswitch for this plugin. The plugin server would notify your BTCpay server to disable this plugin if it is found to be vulnerable. You will still need to restart BTCPay Server to apply.">
+                                <label class="d-flex align-items-center">
+                                    <button type="submit" class="btcpay-toggle me-3 @if (killswitch.Contains(plugin.Identifier)) { @("btcpay-toggle--active") }" value="scripting-@(killswitch.Contains(plugin.Identifier) ? "off" : "on")">@(killswitch.Contains(plugin.Identifier) ? "Disable" : "Enable") killswitch</button>
+                                    <div class="">
+                                        <span>Vulnerability kill switch</span>
+                                    </div>
+                                </label>
+                            </form>
+                        </div>
+                    }
                 </div>
             </div>
         }