Removed redundant maximagesize = INF statements

diff --git a/mod/photos.php b/mod/photos.php
index 4436da5d692d0bea8f423302a03bfd5c50236523..14eb88ac95b6ac6d7ac1952c24b7032e0392d525 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -656,10 +656,6 @@ function photos_post(App $a)
 
        $maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
 
-       if ($maximagesize == 0) {
-               $maximagesize = INF;
-       }
-
        if ($maximagesize && ($filesize > $maximagesize)) {
                DI::sysmsg()->addNotice(DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)));
                @unlink($src);

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 1250ad570b64bce65a10e573fbf9e4bb8d449a3a..126bc152b4ddf2d9ce5d275e73c6a94a4327f1bc 100644 (file)
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -577,11 +577,7 @@ class Photo
                        $filesize = strlen($image->asString());
                        $maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
 
-                       if ($maximagesize == 0) {
-                               $maximagesize = INF;
-                       }
-
-                       if (!empty($maximagesize) && ($filesize > $maximagesize)) {
+                       if ($maximagesize && ($filesize > $maximagesize)) {
                                Logger::info('Avatar exceeds image limit', ['uid' => $uid, 'cid' => $cid, 'maximagesize' => $maximagesize, 'size' => $filesize, 'type' => $image->getType()]);
                                if ($image->getType() == 'image/gif') {
                                        $image->toStatic();
@@ -973,11 +969,7 @@ class Photo
 
                $maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
 
-               if ($maximagesize == 0) {
-                       $maximagesize = INF;
-               }
-
-               if (!empty($maximagesize) && ($filesize > $maximagesize)) {
+               if ($maximagesize && ($filesize > $maximagesize)) {
                        // Scale down to multiples of 640 until the maximum size isn't exceeded anymore
                        foreach ([5120, 2560, 1280, 640] as $pixels) {
                                if (($filesize > $maximagesize) && (max($width, $height) > $pixels)) {

diff --git a/src/Module/Media/Photo/Upload.php b/src/Module/Media/Photo/Upload.php
index ec8dbcf70ddb7803c3e14ec91d0e30d6a9876c3f..885aa86147310cdf4a2ba05d270fe1d45e284cd8 100644 (file)
--- a/src/Module/Media/Photo/Upload.php
+++ b/src/Module/Media/Photo/Upload.php
@@ -171,11 +171,7 @@ class Upload extends \Friendica\BaseModule
 
                $maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
 
-               if ($maximagesize == 0) {
-                       $maximagesize = INF;
-               }
-
-               if (!empty($maximagesize) && $filesize > $maximagesize) {
+               if ($maximagesize && $filesize > $maximagesize) {
                        // Scale down to multiples of 640 until the maximum size isn't exceeded anymore
                        foreach ([5120, 2560, 1280, 640] as $pixels) {
                                if ($filesize > $maximagesize && max($width, $height) > $pixels) {

diff --git a/src/Module/Settings/Profile/Photo/Index.php b/src/Module/Settings/Profile/Photo/Index.php
index ee551f88bce17850c22b9c05685fb61eaa432345..26caae965062ac5181df1e8e259270676850a842 100644 (file)
--- a/src/Module/Settings/Profile/Photo/Index.php
+++ b/src/Module/Settings/Profile/Photo/Index.php
@@ -55,10 +55,6 @@ class Index extends BaseSettings
 
                $maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize', 0));
 
-               if ($maximagesize == 0) {
-                       $maximagesize = INF;
-               }
-
                if ($maximagesize && $filesize > $maximagesize) {
                        DI::sysmsg()->addNotice(DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)));
                        @unlink($src);