MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1703 from rabuzarus/readable_bytes

Browse source 
show maximagesize warning in a human readable format
This commit is contained in:
fabrixxm 2015-06-29 13:50:55 +02:00
parent 6c5b4b96a5 68e565889d
commit 17514e0d68
6 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/Photo.php
View file

@ -1013,3 +1013,4 @@ function store_photo($a, $uid, $imagedata = "", $url = "") {
return($image); return($image);
} }

12
include/text.php
View file

@ -2282,3 +2282,15 @@ function deindent($text, $chr="[\t ]", $count=NULL) {
return implode("\n", $lines); return implode("\n", $lines);
} }
function formatBytes($bytes, $precision = 2) {
$units = array('B', 'KB', 'MB', 'GB', 'TB');
$bytes = max($bytes, 0);
$pow = floor(($bytes ? log($bytes) : 0) / log(1024));
$pow = min($pow, count($units) - 1);
$bytes /= pow(1024, $pow);
return round($bytes, $precision) . ' ' . $units[$pow];
}

2
mod/photos.php
View file

@ -785,7 +785,7 @@ function photos_post(&$a) {
$maximagesize = get_config('system','maximagesize'); $maximagesize = get_config('system','maximagesize');
if(($maximagesize) && ($filesize > $maximagesize)) { if(($maximagesize) && ($filesize > $maximagesize)) {
notice( t('Image exceeds size limit of ') . $maximagesize . EOL); notice( sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL);
@unlink($src); @unlink($src);
$foo = 0; $foo = 0;
call_hooks('photo_post_end',$foo); call_hooks('photo_post_end',$foo);

2
mod/profile_photo.php
View file

@ -141,7 +141,7 @@ function profile_photo_post(&$a) {
$maximagesize = get_config('system','maximagesize'); $maximagesize = get_config('system','maximagesize');
if(($maximagesize) && ($filesize > $maximagesize)) { if(($maximagesize) && ($filesize > $maximagesize)) {
notice( sprintf(t('Image exceeds size limit of %d'), $maximagesize) . EOL); notice( sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL);
@unlink($src); @unlink($src);
return; return;
} }

4
mod/wall_attach.php
View file

@ -78,9 +78,9 @@ function wall_attach_post(&$a) {
} }
if(($maxfilesize) && ($filesize > $maxfilesize)) { if(($maxfilesize) && ($filesize > $maxfilesize)) {
notice( sprintf(t('File exceeds size limit of %d'), $maxfilesize) . EOL); echo sprintf(t('File exceeds size limit of %s'), formatBytes($maxfilesize)) . EOL;
@unlink($src); @unlink($src);
return; killme();
} }
$r = q("select sum(octet_length(data)) as total from attach where uid = %d ", $r = q("select sum(octet_length(data)) as total from attach where uid = %d ",

2
mod/wall_upload.php
View file

@ -119,7 +119,7 @@ function wall_upload_post(&$a, $desktopmode = true) {
$maximagesize = get_config('system','maximagesize'); $maximagesize = get_config('system','maximagesize');
if(($maximagesize) && ($filesize > $maximagesize)) { if(($maximagesize) && ($filesize > $maximagesize)) {
echo sprintf( t('Image exceeds size limit of %d'), $maximagesize) . EOL; echo sprintf( t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL;
@unlink($src); @unlink($src);
killme(); killme();
} }