Merge pull request hestiacp#1773 from jaapmarcus/fix/delete-ssh-key

Kristan Kenney · web-flow · commit 7e862274fa11 · 2021-04-29T16:26:51.000-03:00
Fix issue with deleting  ssh keys
diff --git a/web/delete/key/index.php b/web/delete/key/index.php
@@ -12,12 +12,12 @@
 }
 
 if (($_SESSION['userContext'] === 'admin') && (!empty($_GET['user']))) {
-    $v_user = $_GET['user'];
+    $user = $_GET['user'];
 }
 
 if (!empty($_GET['key'])) {
     $v_key = escapeshellarg(trim($_GET['key']));
-    $v_user = escapeshellarg(trim($v_user));
+    $v_user = escapeshellarg(trim($user));
     exec (HESTIA_CMD."v-delete-user-ssh-key ".$v_user." ".$v_key);
     check_return_code($return_var,$output);
 }

Original file line number	Diff line number	Diff line change
`@@ -12,12 +12,12 @@`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`if (($_SESSION['userContext'] === 'admin') && (!empty($_GET['user']))) {`
`15`		`- $v_user = $_GET['user'];`
	`15`	`+ $user = $_GET['user'];`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`if (!empty($_GET['key'])) {`
`19`	`19`	`$v_key = escapeshellarg(trim($_GET['key']));`
`20`		`- $v_user = escapeshellarg(trim($v_user));`
	`20`	`+ $v_user = escapeshellarg(trim($user));`
`21`	`21`	`exec (HESTIA_CMD."v-delete-user-ssh-key ".$v_user." ".$v_key);`
`22`	`22`	`check_return_code($return_var,$output);`
`23`	`23`	`}`