Skip to content

Commit ec3a0d4

Browse files
author
Kristan Kenney
committed
Improvements to user context handling
1 parent 22f30d4 commit ec3a0d4

File tree

106 files changed

+212
-163
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+212
-163
lines changed

‎bin/v-list-user‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,8 @@ is_object_valid 'user' 'USER' "$user"
173173
USER=$user
174174
HOME=$HOMEDIR/$user
175175
source $HESTIA/data/users/$user/user.conf
176+
U_USERS=$(cat $HESTIA/data/users/admin/user.conf | grep "U_USERS" | cut -d'=' -f2 | sed "s/'//g")
177+
SUSPENDED_USERS=$(cat $HESTIA/data/users/admin/user.conf | grep "SUSPENDED_USERS" | cut -d'=' -f2 | sed "s/'//g")
176178

177179
# Listing data
178180
case $format in

‎install/deb/filemanager/filegator/backend/Services/Auth/Adapters/HestiaAuth.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function init(array $config = [])
3232
if (isset($_SESSION['user'])) {
3333
$v_user = $_SESSION['user'];
3434
}
35-
if (isset($_SESSION['look']) && $_SESSION['look'] != 'admin' && $v_user === 'admin') {
35+
if (isset($_SESSION['look']) && $_SESSION['look'] != 'admin' && $_SESSION['userContext'] == 'admin') {
3636
$v_user = $_SESSION['look'];
3737
}
3838
$this->hestia_user = $v_user;

‎install/deb/filemanager/filegator/configuration.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
if (isset($_SESSION['user'])) {
1616
$v_user = $_SESSION['user'];
1717
}
18-
if (isset($_SESSION['look']) && $_SESSION['look'] != 'admin' && $v_user === 'admin') {
18+
if (isset($_SESSION['look']) && $_SESSION['look'] != 'admin' && $_SESSION['userContext'] === 'admin') {
1919
$v_user = $_SESSION['look'];
2020
}
2121
# Create filemanager sftp key if missing and trash it after 30 min

‎web/add/firewall/banlist/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
88

99
// Check user
10-
if ($_SESSION['user'] != 'admin') {
10+
if ($_SESSION['userContext'] != 'admin') {
1111
header("Location: /list/user");
1212
exit;
1313
}

‎web/add/firewall/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
88

99
// Check user
10-
if ($_SESSION['user'] != 'admin') {
10+
if ($_SESSION['userContext'] != 'admin') {
1111
header("Location: /list/user");
1212
exit;
1313
}

‎web/add/firewall/ipset/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
88

99
// Check user
10-
if ($_SESSION['user'] != 'admin') {
10+
if ($_SESSION['userContext'] != 'admin') {
1111
header("Location: /list/user");
1212
exit;
1313
}

‎web/add/ip/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
88

99
// Check user
10-
if ($_SESSION['user'] != 'admin') {
10+
if ($_SESSION['userContext'] != 'admin') {
1111
header("Location: /list/user");
1212
exit;
1313
}

‎web/add/package/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
88

99
// Check user
10-
if ($_SESSION['user'] != 'admin') {
10+
if ($_SESSION['userContext'] != 'admin') {
1111
header("Location: /list/user");
1212
exit;
1313
}

‎web/add/user/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
88

99
// Check user
10-
if ($_SESSION['user'] != 'admin') {
10+
if ($_SESSION['userContext'] != 'admin') {
1111
header("Location: /list/user");
1212
exit;
1313
}

‎web/bulk/cron/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
$job = $_POST['job'];
1616
$action = $_POST['action'];
1717

18-
if ($_SESSION['user'] == 'admin') {
18+
if ($_SESSION['userContext'] == 'admin') {
1919
switch ($action) {
2020
case 'delete': $cmd='v-delete-cron-job';
2121
break;

0 commit comments

Comments
 (0)