Browse Source

show maximagesize warning in a human readable format

pull/1703/head
rabuzarus 5 years ago
parent
commit
a982320ba9
5 changed files with 17 additions and 5 deletions
  1. +12
    -0
      include/Photo.php
  2. +1
    -1
      mod/photos.php
  3. +1
    -1
      mod/profile_photo.php
  4. +2
    -2
      mod/wall_attach.php
  5. +1
    -1
      mod/wall_upload.php

+ 12
- 0
include/Photo.php View File

@ -1013,3 +1013,15 @@ function store_photo($a, $uid, $imagedata = "", $url = "") {
return($image);
}
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];
}

+ 1
- 1
mod/photos.php View File

@ -785,7 +785,7 @@ function photos_post(&$a) {
$maximagesize = get_config('system','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);
$foo = 0;
call_hooks('photo_post_end',$foo);


+ 1
- 1
mod/profile_photo.php View File

@ -141,7 +141,7 @@ function profile_photo_post(&$a) {
$maximagesize = get_config('system','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);
return;
}


+ 2
- 2
mod/wall_attach.php View File

@ -78,9 +78,9 @@ function wall_attach_post(&$a) {
}
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);
return;
killme();
}
$r = q("select sum(octet_length(data)) as total from attach where uid = %d ",


+ 1
- 1
mod/wall_upload.php View File

@ -119,7 +119,7 @@ function wall_upload_post(&$a, $desktopmode = true) {
$maximagesize = get_config('system','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);
killme();
}


Loading…
Cancel
Save