mirror/php-tinyfilemanager
1
0
Fork 0
mirror of https://github.com/prasathmani/tinyfilemanager.git synced 2025-07-31 14:00:47 +02:00
Code Issues Releases Wiki Activity

Add support user customized config file (if exists) (#242)

Browse Source 
* feat(/): add support user customized config file (if exists)

* Show current process ID in Status bar + Make fm_get_filesize function much more concise (#245)

* Update Simplified Chinese (#241)

* Feature Font Size Choose Options / Bug Fix Settings not visible in auth=false (#240)

* Bug fix and PR #245, #241, #240

Co-authored-by: 刘明野 <898310895@qq.com>
Co-authored-by: B Bharath Kumar Reddy <39063133+bbharathkumarreddy@users.noreply.github.com>
Co-authored-by: Prasath Mani <prasath.mani@publicissapient.com>
Co-authored-by: Prasath Mani <prasathmani@users.noreply.github.com>
This commit is contained in:
Nguyen The Anh
2020-05-24 12:20:25 +09:00
committed by GitHub
parent a0c595a8e1
commit 0826838917
3 changed files with 118 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tinyfilemanager.php
View File

@@ -100,11 +100,22 @@ $online_viewer = 'google';
// false => disable sticky header
$sticky_navbar = true;
// max upload file size
$max_upload_size_bytes = 2048;
// if User has the customized config file, try to use it to override the default config above
$user_config_file_path = 'user_config.php';
if(file_exists($user_config_file_path)) {
include($user_config_file_path);
}
// Maximum file upload size
// Increase the following values in php.ini to work properly
// memory_limit, upload_max_filesize, post_max_size
define('MAX_UPLOAD_SIZE', '2048');
// Possible rules are 'OFF', 'AND' or 'OR'
// OFF => Don't check connection IP, defaults to OFF
// AND => Connection must be on the whitelist, and not on the blacklist
@@ -128,6 +139,9 @@ $ip_blacklist = array(
// --- EDIT BELOW CAREFULLY OR DO NOT EDIT AT ALL ---
// Set the max upload file size
define('MAX_UPLOAD_SIZE', $max_upload_size_bytes);
// private key and session name to store to the session
if ( !defined( 'FM_SESSION_ID')) {
define('FM_SESSION_ID', 'filemanager');
@@ -2413,17 +2427,9 @@ function fm_get_size($file)
*/
function fm_get_filesize($size)
{
if ($size < 1000) {
return sprintf('%s B', $size);
} elseif (($size / 1024) < 1000) {
return sprintf('%s KB', round(($size / 1024), 2));
} elseif (($size / 1024 / 1024) < 1000) {
return sprintf('%s MB', round(($size / 1024 / 1024), 2));
} elseif (($size / 1024 / 1024 / 1024) < 1000) {
return sprintf('%s GB', round(($size / 1024 / 1024 / 1024), 2));
} else {
return sprintf('%s TB', round(($size / 1024 / 1024 / 1024 / 1024), 2));
}
$units = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
$power = $size > 0 ? floor(log($size, 1024)) : 0;
return sprintf('%s %s', round($size / pow(1024, $power), 2), $units[$power]);
}
/**
@@ -3964,14 +3970,12 @@ function lng($txt) {
$tr['en']['ProcessID'] = 'Process ID';
$tr['en']['HideColumns'] = 'Hide Perms/Owner columns';
$tr['en']['Check Latest Version']= 'Check Latest Version'; $tr['en']['Generate new password hash'] = 'Generate new password hash';
$tr['en']['Folder is empty'] = 'Folder is empty';
$tr['en']['Created'] = 'Created';
$tr['en']['You are logged in'] = 'You are logged in';
$tr['en']['Login failed. Invalid username or password'] = 'Login failed. Invalid username or password';
$tr['en']['password_hash not supported, Upgrade PHP version'] = 'password_hash not supported, Upgrade PHP version';
$i18n = fm_get_translations($tr);
$tr = $i18n ? $i18n : $tr;