mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-29 19:00:26 +02:00
Code Issues Releases Wiki Activity

Fix for file_size_decode() in PHP7.

Browse Source
This commit is contained in:
Cameron
2018-08-20 13:41:21 -07:00
parent 34a4f0ade8
commit 1f69d7cd0a
2 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
e107_admin/prefs.php
View File

@@ -1692,19 +1692,19 @@ $text .= "
<table class='table table-striped table-bordered'>
<tr><th>".LAN_TYPE."</th><th>".UPLLAN_33."</th>
";
$fl = e107::getFile();
$data = $fl->getFiletypeLimits();
$data = $fl->getAllowedFileTypes();
foreach($data as $k=>$v)
{
$text .= "<tr><td>".$k."</td>
<td>".$fl->file_size_encode($v)."</td>
</tr>";
}
// $text .= print_a($data,true);
// $text .= print_a($data,true);

42
e107_handlers/file_class.php
View File

@@ -837,47 +837,53 @@ class e_file
* @param int $compare - a 'compare' value
* @param string $action - values (gt|lt)
*
* @return int file size value.
* @return int file size value in bytes.
* If the decoded value evaluates to zero, returns the value of $compare
* If $action == 'gt', return the larger of the decoded value and $compare
* If $action == 'lt', return the smaller of the decoded value and $compare
*/
function file_size_decode($source, $compare = 0, $action = '')
{
$source = trim($source);
if (strtolower(substr($source, -1, 1)) == 'b')
$source = substr($source, 0, -1); // Trim a trailing byte indicator
//$mult = 1;
if (strlen($source) && (strtoupper(substr($source, -1, 1)) == 'B'))
$source = substr($source, 0, -1);
if (!$source || is_numeric($source))
$source = strtoupper($source);
list($val, $unit) = preg_split('#(?<=\d)(?=[a-z])#i', $source);
$val = (int) $val;
if(!$source || is_numeric($source))
{
$val = $source;
$val = (int) $source;
}
else
{
$val = substr($source, 0, -1);
switch (substr($source, -1, 1))
switch($unit)
{
case 'T':
$val = $val * 1024;
case 'TB':
$val = $val * 1024 * 1024 * 1024 * 1024;
break;
case 'G':
$val = $val * 1024;
case 'GB':
$val = $val * 1024 * 1024 * 1024;
break;
case 'M':
$val = $val * 1024;
case 'MB':
$val = $val * 1024 * 1024;
break;
case 'K':
case 'k':
case 'KB':
$val = $val * 1024;
break;
break;
}
}
if ($val == 0)
if($val == 0)
{
return $compare;
}
switch ($action)
switch($action)
{
case 'lt':
return min($val, $compare);
@@ -886,7 +892,7 @@ class e_file
default:
return $val;
}
// return 0;
// return 0;
}
/**