formatBytes calls

implement function in new class

diff --git a/include/api.php b/include/api.php
index 10ee292871f9cf0ca8b5db84b3cbd8ad0635ce76..8ae3c03d44e55fc66788a472a67d0a224209bde0 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -4500,7 +4500,7 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
        // check against max upload size within Friendica instance
        $maximagesize = Config::get('system', 'maximagesize');
        if ($maximagesize && ($filesize > $maximagesize)) {
-               $formattedBytes = formatBytes($maximagesize);
+               $formattedBytes = Strings::formatBytes($maximagesize);
                throw new InternalServerErrorException("image size exceeds Friendica config setting (uploaded size: $formattedBytes)");
        }
 

diff --git a/mod/photos.php b/mod/photos.php
index 238c7358589f99fd0f95c21f7d051522e8a5f58e..1b2e8d52b6ba66456b7ffdef6971c58cd8aeed5a 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -780,7 +780,7 @@ function photos_post(App $a)
                                notice(L10n::t('Image exceeds size limit of %s', ini_get('upload_max_filesize')) . EOL);
                                break;
                        case UPLOAD_ERR_FORM_SIZE:
-                               notice(L10n::t('Image exceeds size limit of %s', formatBytes(defaults($_REQUEST, 'MAX_FILE_SIZE', 0))) . EOL);
+                               notice(L10n::t('Image exceeds size limit of %s', Strings::formatBytes(defaults($_REQUEST, 'MAX_FILE_SIZE', 0))) . EOL);
                                break;
                        case UPLOAD_ERR_PARTIAL:
                                notice(L10n::t('Image upload didn\'t complete, please try again') . EOL);
@@ -809,7 +809,7 @@ function photos_post(App $a)
        $maximagesize = Config::get('system', 'maximagesize');
 
        if ($maximagesize && ($filesize > $maximagesize)) {
-               notice(L10n::t('Image exceeds size limit of %s', formatBytes($maximagesize)) . EOL);
+               notice(L10n::t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)) . EOL);
                @unlink($src);
                $foo = 0;
                Addon::callHooks('photo_post_end', $foo);

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 3304e3cab2c44762e2e8f72d737ee9a1bf8d5641..d8e236a73787fc476df68fb993adeec1fa8cadfc 100644 (file)
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -16,6 +16,7 @@ use Friendica\Model\Photo;
 use Friendica\Model\Profile;
 use Friendica\Object\Image;
 use Friendica\Util\Security;
+use Friendica\Util\Strings;
 
 function profile_photo_init(App $a)
 {
@@ -151,7 +152,7 @@ function profile_photo_post(App $a)
        $maximagesize = Config::get('system', 'maximagesize');
 
        if (($maximagesize) && ($filesize > $maximagesize)) {
-               notice(L10n::t('Image exceeds size limit of %s', formatBytes($maximagesize)) . EOL);
+               notice(L10n::t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)) . EOL);
                @unlink($src);
                return;
        }

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 2a3038e8f6a4ec8ebfb3c6ada2cb2fb66581df9d..b4254ba64adfc683d3392725f65d77a320530384 100644 (file)
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -11,6 +11,7 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Mimetype;
+use Friendica\Util\Strings;
 
 function wall_attach_post(App $a) {
 
@@ -115,7 +116,7 @@ function wall_attach_post(App $a) {
        }
 
        if ($maxfilesize && $filesize > $maxfilesize) {
-               $msg = L10n::t('File exceeds size limit of %s', formatBytes($maxfilesize));
+               $msg = L10n::t('File exceeds size limit of %s', Strings::formatBytes($maxfilesize));
                if ($r_json) {
                        echo json_encode(['error' => $msg]);
                } else {

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index c093d28e3a7f427c5e5f5d85a0cd0af4ba2937c1..0322c6606654c6cc1b7d510f2be85d683004a58a 100644 (file)
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -194,7 +194,7 @@ function wall_upload_post(App $a, $desktopmode = true)
        $maximagesize = Config::get('system', 'maximagesize');
 
        if (($maximagesize) && ($filesize > $maximagesize)) {
-               $msg = L10n::t('Image exceeds size limit of %s', formatBytes($maximagesize));
+               $msg = L10n::t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize));
                if ($r_json) {
                        echo json_encode(['error' => $msg]);
                } else {