deblan-mirror/tinyfilemanager
deblan-mirror/tinyfilemanager
1
0
Fork 0
mirror of https://github.com/prasathmani/tinyfilemanager synced 2024-05-17 21:16:38 +02:00
Code Issues Projects Releases Wiki Activity

Merge 1dff8f3b5f into 4d8d4a3aba

Browse source
This commit is contained in:
naftali100 2022-11-13 22:03:04 +03:00 committed by GitHub
parent 4d8d4a3aba 1dff8f3b5f
commit 9e2809dbf4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config-sample.php
View file

@ -16,6 +16,9 @@ or
// Is independent from IP white- and blacklisting
$use_auth = true;
// Allow guest user when using auth
$auth_allow_guest = true;
// Login user name and password
// Users: array('Username' => 'Password', 'Username2' => 'Password2', ...)
// Generate secure password hash - https://tinyfilemanager.github.io/docs/pwd.html
@ -27,7 +30,7 @@ $auth_users = array(
// Readonly users
// e.g. array('users', 'guest', ...)
$readonly_users = array(
'user'
'user', 'guest'
);
// Enable highlight.js (https://highlightjs.org/) on view's page

23
tinyfilemanager.php
View file

@ -22,6 +22,9 @@ define('APP_TITLE', 'Tiny File Manager');
// Is independent from IP white- and blacklisting
$use_auth = true;
// Allow guest user when using auth
$auth_allow_guest = true;
// Login user name and password
// Users: array('Username' => 'Password', 'Username2' => 'Password2', ...)
// Generate secure password hash - https://tinyfilemanager.github.io/docs/pwd.html
@ -33,7 +36,7 @@ $auth_users = array(
// Readonly users
// e.g. array('users', 'guest', ...)
$readonly_users = array(
'user'
'user', 'guest'
);
// Global readonly, including when auth is not being used
@ -300,12 +303,12 @@ if ($use_auth) {
} else {
unset($_SESSION[FM_SESSION_ID]['logged']);
fm_set_msg(lng('Login failed. Invalid username or password'), 'error');
fm_redirect(FM_SELF_URL);
fm_redirect(FM_SELF_URL . '?login=1');
}
} else {
fm_set_msg(lng('password_hash not supported, Upgrade PHP version'), 'error');;
}
} else {
} elseif(!$auth_allow_guest || ($_GET['login'] ?? false)) {
// Form
unset($_SESSION[FM_SESSION_ID]['logged']);
fm_show_header_login();
@ -350,6 +353,13 @@ if ($use_auth) {
<?php echo lng('Login'); ?>
</button>
</div>
<?php if ($auth_allow_guest) { ?>
<div class="form-group">
<a href="<?php echo FM_SELF_URL?>" class="btn btn-secondary btn-block mt-4" role="button">
<?php echo "Guest" ?>
</a>
</div>
<?php } ?>
</form>
</div>
</div>
@ -368,6 +378,10 @@ if ($use_auth) {
}
}
if($use_auth && $auth_allow_guest && !isset($_SESSION[FM_SESSION_ID]['logged'])){
$_SESSION[FM_SESSION_ID]['logged'] = 'guest';
}
// update root path
if ($use_auth && isset($_SESSION[FM_SESSION_ID]['logged'])) {
$root_path = isset($directories_users[$_SESSION[FM_SESSION_ID]['logged']]) ? $directories_users[$_SESSION[FM_SESSION_ID]['logged']] : $root_path;
@ -3472,7 +3486,8 @@ function fm_show_nav_path($path)
<a title="<?php echo lng('Settings') ?>" class="dropdown-item nav-link" href="?p=<?php echo urlencode(FM_PATH) ?>&amp;settings=1"><i class="fa fa-cog" aria-hidden="true"></i> <?php echo lng('Settings') ?></a>
<?php endif ?>
<a title="<?php echo lng('Help') ?>" class="dropdown-item nav-link" href="?p=<?php echo urlencode(FM_PATH) ?>&amp;help=2"><i class="fa fa-exclamation-circle" aria-hidden="true"></i> <?php echo lng('Help') ?></a>
<a title="<?php echo lng('Logout') ?>" class="dropdown-item nav-link" href="?logout=1"><i class="fa fa-sign-out" aria-hidden="true"></i> <?php echo lng('Logout') ?></a>
<?php $is_guest = $_SESSION[FM_SESSION_ID]['logged'] == 'guest' ?>
<a title="<?php echo $is_guest ? lng('Login') : lng('Logout') ?>" class="dropdown-item nav-link" href=<?php echo $is_guest ? "?login=1": "?logout=1" ?>><i class="fa fa-sign-out" aria-hidden="true"></i> <?php echo $is_guest ? lng('Login') : lng('Logout') ?></a>
</div>
</li>
<?php else: ?>