Fix hestiacp#2524 (hestiacp#2525)

jaapmarcus · web-flow · commit d2ef8f99838e · 2022-04-13T09:25:11.000+02:00
diff --git a/web/download/backup/index.php b/web/download/backup/index.php
@@ -30,7 +30,7 @@
     }
 
     if ((!empty($_SESSION['user'])) && ($_SESSION['userContext'] != 'admin')) {
-        if (strpos($backup, $user.'.') === 0) {
+        if (strpos($backup, $_SESSION['user'].'.') === 0) {
             header('Content-type: application/gzip');
             header("Content-Disposition: attachment; filename=\"".$backup."\";");
             header("X-Accel-Redirect: /backup/" . $backup);
diff --git a/web/inc/main.php b/web/inc/main.php
@@ -127,6 +127,10 @@ function destroy_sessions()
     $user_plain = htmlentities($_SESSION['look']);
 }
 
+if (empty($_SESSION['look'])) {
+    $_SESSION['look'] = '';
+}
+
 require_once(dirname(__FILE__) . '/i18n.php');
 
 function check_error($return_var)

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`if ((!empty($_SESSION['user'])) && ($_SESSION['userContext'] != 'admin')) {`
`33`		`- if (strpos($backup, $user.'.') === 0) {`
	`33`	`+ if (strpos($backup, $_SESSION['user'].'.') === 0) {`
`34`	`34`	`header('Content-type: application/gzip');`
`35`	`35`	`header("Content-Disposition: attachment; filename=\"".$backup."\";");`
`36`	`36`	`header("X-Accel-Redirect: /backup/" . $backup);`
Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,10 @@ function destroy_sessions()`
`127`	`127`	`$user_plain = htmlentities($_SESSION['look']);`
`128`	`128`	`}`
`129`	`129`
	`130`	`+if (empty($_SESSION['look'])) {`
	`131`	`+ $_SESSION['look'] = '';`
	`132`	`+}`
	`133`	`+`
`130`	`134`	`require_once(dirname(__FILE__) . '/i18n.php');`
`131`	`135`
`132`	`136`	`function check_error($return_var)`