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

file_size_encode() test.

Browse Source
This commit is contained in:
Cameron
2020-12-26 11:11:35 -08:00
parent 3c6bdd35e0
commit c9ce6e1bd0
2 changed files with 51 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
e107_handlers/file_class.php
View File

@@ -811,7 +811,12 @@
while(false !== ($file = readdir($handle))) while(false !== ($file = readdir($handle)))
{ {
if(($file != '.') && ($file != '..') && !in_array($file, $this->dirFilter) && !in_array($file, $omit) && is_dir($path . '/' . $file) && ($fmask == '' || preg_match("#" . $fmask . "#", $file))) if($file === '.' || $file === '..' || in_array($file, $this->dirFilter) || in_array($file, $omit))
{
continue;
}
if(is_dir($path . '/' . $file) && ($fmask == '' || preg_match("#" . $fmask . "#", $file)))
{ {
$ret[] = $file; $ret[] = $file;
} }
@@ -829,7 +834,7 @@
function rmtree($dir) function rmtree($dir)
{ {
if(substr($dir, -1) != '/') if(substr($dir, -1) !== '/')
{ {
$dir .= '/'; $dir .= '/';
} }
@@ -837,8 +842,11 @@
{ {
while($obj = readdir($handle)) while($obj = readdir($handle))
{ {
if($obj != '.' && $obj != '..') if($obj === '.' || $obj === '..')
{ {
continue;
}
if(is_dir($dir . $obj)) if(is_dir($dir . $obj))
{ {
if(!$this->rmtree($dir . $obj)) if(!$this->rmtree($dir . $obj))
@@ -853,7 +861,7 @@
return false; return false;
} }
} }
}
} }
closedir($handle); closedir($handle);
@@ -950,34 +958,39 @@
{ {
$size = filesize($size); $size = filesize($size);
} }
$kb = 1024; $kb = 1024;
$mb = 1024 * $kb; $mb = 1024 * $kb;
$gb = 1024 * $mb; $gb = 1024 * $mb;
$tb = 1024 * $gb; $tb = 1024 * $gb;
if(!$size) if(!$size)
{ {
return '0 ' . CORE_LAN_B; return '0 ' . CORE_LAN_B;
} }
if($size < $kb) if($size < $kb)
{ {
return $size . "&nbsp;" . CORE_LAN_B; $ret = $size . "&nbsp;" . CORE_LAN_B;
} }
elseif($size < $mb) elseif($size < $mb)
{ {
return round($size / $kb, $decimal) . "&nbsp;" . CORE_LAN_KB; $ret = round($size / $kb, $decimal) . "&nbsp;" . CORE_LAN_KB;
} }
elseif($size < $gb) elseif($size < $gb)
{ {
return round($size / $mb, $decimal) . "&nbsp;" . CORE_LAN_MB; $ret = round($size / $mb, $decimal) . "&nbsp;" . CORE_LAN_MB;
} }
elseif($size < $tb) elseif($size < $tb)
{ {
return round($size / $gb, $decimal) . "&nbsp;" . CORE_LAN_GB; $ret = round($size / $gb, $decimal) . "&nbsp;" . CORE_LAN_GB;
} }
else else
{ {
return round($size / $tb, 2) . "&nbsp;" . CORE_LAN_TB; $ret = round($size / $tb, 2) . "&nbsp;" . CORE_LAN_TB;
} }
return $ret;
} }
@@ -1571,7 +1584,7 @@
// print_a($headers); // print_a($headers);
return (stripos($headers[0], "200 OK") || strpos($headers[0], "302")) ? true : false; return (stripos($headers[0], "200 OK") || strpos($headers[0], "302"));
} }
@@ -1854,7 +1867,7 @@
} }
return array('success' => $success, 'error' => $error, 'skipped' => $skipped); return compact('success', 'error', 'skipped');
} }

16
e107_tests/tests/unit/e_fileTest.php
View File

@@ -128,12 +128,26 @@ class e_fileTest extends \Codeception\Test\Unit
{ {
} }
*/
public function testFile_size_encode() public function testFile_size_encode()
{ {
$arr = array(
'1&nbsp;kB' => 1024,
'2&nbsp;kB' => 2048,
'1&nbsp;MB' => 1048576,
'1&nbsp;GB' => 1073741824,
'1&nbsp;TB' => 1099511627776,
);
foreach($arr as $expected => $bytes)
{
$result = $this->fl->file_size_encode($bytes);
$this->assertSame($expected, $result);
} }
}
/*
public function testMkDir() public function testMkDir()
{ {