summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2018-09-24 15:38:39 +0200
committerFlorian Pritz <bluewind@xinu.at>2018-09-24 15:38:39 +0200
commit55cbb7897e09ba8d94f730e265ddc7ac5fff1c18 (patch)
treea86573e31e01f659b8a024bae7e183770aa19f87
parent10288d9d5f5faf4d87cdce8924d89734eee1169f (diff)
Remove unused mb_str_pad function
Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rw-r--r--application/helpers/filebin_helper.php49
-rw-r--r--application/test/tests/test_filebin_helper.php6
2 files changed, 0 insertions, 55 deletions
diff --git a/application/helpers/filebin_helper.php b/application/helpers/filebin_helper.php
index a62577065..b3e0e3ed9 100644
--- a/application/helpers/filebin_helper.php
+++ b/application/helpers/filebin_helper.php
@@ -46,55 +46,6 @@ function format_bytes($size)
}
}
-// Source: http://hu.php.net/manual/en/function.str-pad.php#71558
-// This is a multibyte enabled str_pad
-function mb_str_pad($ps_input, $pn_pad_length, $ps_pad_string = " ", $pn_pad_type = STR_PAD_RIGHT, $ps_encoding = NULL)
-{
- $ret = "";
-
- if (is_null($ps_encoding))
- $ps_encoding = mb_internal_encoding();
-
- $hn_length_of_padding = $pn_pad_length - mb_strlen($ps_input, $ps_encoding);
- $hn_psLength = mb_strlen($ps_pad_string, $ps_encoding); // pad string length
-
- if ($hn_psLength <= 0 || $hn_length_of_padding <= 0) {
- // Padding string equal to 0:
- //
- $ret = $ps_input;
- }
- else {
- $hn_repeatCount = floor($hn_length_of_padding / $hn_psLength); // how many times repeat
-
- if ($pn_pad_type == STR_PAD_BOTH) {
- $hs_lastStrLeft = "";
- $hs_lastStrRight = "";
- $hn_repeatCountLeft = $hn_repeatCountRight = ($hn_repeatCount - $hn_repeatCount % 2) / 2;
-
- $hs_lastStrLength = $hn_length_of_padding - 2 * $hn_repeatCountLeft * $hn_psLength; // the rest length to pad
- $hs_lastStrLeftLength = $hs_lastStrRightLength = floor($hs_lastStrLength / 2); // the rest length divide to 2 parts
- $hs_lastStrRightLength += $hs_lastStrLength % 2; // the last char add to right side
-
- $hs_lastStrLeft = mb_substr($ps_pad_string, 0, $hs_lastStrLeftLength, $ps_encoding);
- $hs_lastStrRight = mb_substr($ps_pad_string, 0, $hs_lastStrRightLength, $ps_encoding);
-
- $ret = str_repeat($ps_pad_string, $hn_repeatCountLeft) . $hs_lastStrLeft;
- $ret .= $ps_input;
- $ret .= str_repeat($ps_pad_string, $hn_repeatCountRight) . $hs_lastStrRight;
- }
- else {
- $hs_lastStr = mb_substr($ps_pad_string, 0, $hn_length_of_padding % $hn_psLength, $ps_encoding); // last part of pad string
-
- if ($pn_pad_type == STR_PAD_LEFT)
- $ret = str_repeat($ps_pad_string, $hn_repeatCount) . $hs_lastStr . $ps_input;
- else
- $ret = $ps_input . str_repeat($ps_pad_string, $hn_repeatCount) . $hs_lastStr;
- }
- }
-
- return $ret;
-}
-
function is_api_client($override = null)
{
static $is_api = null;
diff --git a/application/test/tests/test_filebin_helper.php b/application/test/tests/test_filebin_helper.php
index 2f2895ddb..a46d4bc3c 100644
--- a/application/test/tests/test_filebin_helper.php
+++ b/application/test/tests/test_filebin_helper.php
@@ -80,12 +80,6 @@ class test_filebin_helper extends \test\Test {
$this->t->is(format_bytes(1500*1024*1024*1024*1024*1024), "1500.00PiB", "1500.00PiB");
}
- public function test_mb_str_pad()
- {
- $this->t->is(mb_str_pad('test', 6), 'test ', 'Simple test with length=6');
- $this->t->is(mb_str_pad('絫ö', 6), '絫ö ', 'UTF8 test with length=6');
- }
-
public function test_files_are_equal()
{
$a1 = FCPATH.'/data/tests/message1.bin';