Skip to content

Commit 820f886

Browse files
adauradaur
committed
Add more functions to utils
1 parent 5e6d1df commit 820f886

File tree

7 files changed

+23
-23
lines changed

7 files changed

+23
-23
lines changed

‎featherbb/Core/Utils.php‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,4 +184,18 @@ public static function feather_hash($str)
184184
{
185185
return sha1($str);
186186
}
187+
188+
//
189+
// Converts the file size in bytes to a human readable file size
190+
//
191+
public function file_size($size)
192+
{
193+
$units = array('B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB');
194+
195+
for ($i = 0; $size > 1024; $i++) {
196+
$size /= 1024;
197+
}
198+
199+
return sprintf(__('Size unit '.$units[$i]), round($size, 2));
200+
}
187201
}

‎featherbb/Helpers/functions.php‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -499,20 +499,6 @@ function redirect($destination_url, $message = null)
499499
}
500500

501501

502-
//
503-
// Converts the file size in bytes to a human readable file size
504-
//
505-
function file_size($size)
506-
{
507-
$units = array('B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB');
508-
509-
for ($i = 0; $size > 1024; $i++) {
510-
$size /= 1024;
511-
}
512-
513-
return sprintf(__('Size unit '.$units[$i]), round($size, 2));
514-
}
515-
516502
//
517503
// Generate a cache ID based on the last modification time for all stopwords files
518504
//

‎featherbb/Model/Admin/Statistics.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function get_total_size()
7676
$total['size'] += $status['Data_length'] + $status['Index_length'];
7777
}
7878

79-
$total['size'] = file_size($total['size']);
79+
$total['size'] = $this->feather->utils->file_size($total['size']);
8080
}
8181

8282
$total = $this->hook->fire('model.statistics.get_total_size.total', $total);

‎featherbb/Model/Debug.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ public static function get_info()
3232

3333
$data = array('exec_time' => (self::$feather->utils->get_microtime() - self::$feather->start));
3434
$data['nb_queries'] = (isset(DB::get_query_log()[0])) ? count(DB::get_query_log()[0]) : 'N/A';
35-
$data['mem_usage'] = (function_exists('memory_get_usage')) ? file_size(memory_get_usage()) : 'N/A';
36-
$data['mem_peak_usage'] = (function_exists('memory_get_peak_usage')) ? file_size(memory_get_peak_usage()) : 'N/A';
35+
$data['mem_usage'] = (function_exists('memory_get_usage')) ? self::$feather->utils->file_size(memory_get_usage()) : 'N/A';
36+
$data['mem_peak_usage'] = (function_exists('memory_get_peak_usage')) ? self::$feather->utils->file_size(memory_get_peak_usage()) : 'N/A';
3737
return $data;
3838
}
3939
}

‎style/themes/FeatherBB/view/profile/upload_avatar.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
// Make sure no one attempts to run this script "directly"
1111
if (!defined('FEATHER')) {
12-
exit;
12+
exit;
1313
}
1414

1515
?>
@@ -25,7 +25,7 @@
2525
<input type="hidden" name="form_sent" value="1" />
2626
<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
2727
<label class="required"><strong><?php _e('File') ?> <span><?php _e('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
28-
<p><?php _e('Avatar desc').' '.$feather->forum_settings['o_avatars_width'].' x '.$feather->forum_settings['o_avatars_height'].' '.__('pixels').' '.__('and').' '.$feather->utils->forum_number_format($feather->forum_settings['o_avatars_size']).' '.__('bytes').' ('.file_size($feather->forum_settings['o_avatars_size']).').' ?></p>
28+
<p><?php _e('Avatar desc'); echo ' '.$feather->forum_settings['o_avatars_width'].' x '.$feather->forum_settings['o_avatars_height'].' '.__('pixels').' '.__('and').' '.$feather->utils->forum_number_format($feather->forum_settings['o_avatars_size']).' '.__('bytes').' ('.$feather->utils->file_size($feather->forum_settings['o_avatars_size']).').' ?></p>
2929
</div>
3030
</fieldset>
3131
</div>

‎style/themes/MyFeatherBB/view/profile/upload_avatar.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
// Make sure no one attempts to run this script "directly"
1111
if (!defined('FEATHER')) {
12-
exit;
12+
exit;
1313
}
1414

1515
?>
@@ -25,7 +25,7 @@
2525
<input type="hidden" name="form_sent" value="1" />
2626
<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
2727
<label class="required"><strong><?php _e('File') ?> <span><?php _e('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
28-
<p><?php _e('Avatar desc').' '.$feather->forum_settings['o_avatars_width'].' x '.$feather->forum_settings['o_avatars_height'].' '.__('pixels').' '.__('and').' '.$feather->utils->forum_number_format($feather->forum_settings['o_avatars_size']).' '.__('bytes').' ('.file_size($feather->forum_settings['o_avatars_size']).').' ?></p>
28+
<p><?php _e('Avatar desc'); echo ' '.$feather->forum_settings['o_avatars_width'].' x '.$feather->forum_settings['o_avatars_height'].' '.__('pixels').' '.__('and').' '.$feather->utils->forum_number_format($feather->forum_settings['o_avatars_size']).' '.__('bytes').' ('.$feather->utils->file_size($feather->forum_settings['o_avatars_size']).').' ?></p>
2929
</div>
3030
</fieldset>
3131
</div>

‎view/profile/upload_avatar.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
// Make sure no one attempts to run this script "directly"
1111
if (!defined('FEATHER')) {
12-
exit;
12+
exit;
1313
}
1414

1515
?>
@@ -25,7 +25,7 @@
2525
<input type="hidden" name="form_sent" value="1" />
2626
<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $feather->forum_settings['o_avatars_size'] ?>" />
2727
<label class="required"><strong><?php _e('File') ?> <span><?php _e('Required') ?></span></strong><br /><input name="req_file" type="file" size="40" /><br /></label>
28-
<p><?php _e('Avatar desc').' '.$feather->forum_settings['o_avatars_width'].' x '.$feather->forum_settings['o_avatars_height'].' '.__('pixels').' '.__('and').' '.$feather->utils->forum_number_format($feather->forum_settings['o_avatars_size']).' '.__('bytes').' ('.file_size($feather->forum_settings['o_avatars_size']).').' ?></p>
28+
<p><?php _e('Avatar desc'); echo ' '.$feather->forum_settings['o_avatars_width'].' x '.$feather->forum_settings['o_avatars_height'].' '.__('pixels').' '.__('and').' '.$feather->utils->forum_number_format($feather->forum_settings['o_avatars_size']).' '.__('bytes').' ('.$feather->utils->file_size($feather->forum_settings['o_avatars_size']).').' ?></p>
2929
</div>
3030
</fieldset>
3131
</div>

0 commit comments

Comments
 (0)