Remove unused first parameter from BaseProfile::getTabsHTML

[friendica.git] / mod / photos.php

diff --git a/mod/photos.php b/mod/photos.php
index 173823527673109743c8428a6b3828660e002b6f..8bcd9f460cd83acf750ada2e897768002d2f26e6 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -654,7 +654,7 @@ function photos_post(App $a)
 
        Logger::info('photos: upload: received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes');
 
-       $maximagesize = DI::config()->get('system', 'maximagesize');
+       $maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
 
        if ($maximagesize && ($filesize > $maximagesize)) {
                DI::sysmsg()->addNotice(DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)));
@@ -865,9 +865,8 @@ function photos_content(App $a)
                $contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => $owner_uid, 'blocked' => false, 'pending' => false]);
        }
 
-       if ($user['hidewall'] && (DI::userSession()->getLocalUserId() != $owner_uid) && !$remote_contact) {
-               DI::sysmsg()->addNotice(DI::l10n()->t('Access to this item is restricted.'));
-               return;
+       if ($user['hidewall'] && !DI::userSession()->isAuthenticated()) {
+               DI::baseUrl()->redirect('profile/' . $user['nickname'] . '/restricted');
        }
 
        $sql_extra = Security::getPermissionsSQLByUserId($owner_uid);
@@ -876,7 +875,7 @@ function photos_content(App $a)
 
        // tabs
        $is_owner = (DI::userSession()->getLocalUserId() && (DI::userSession()->getLocalUserId() == $owner_uid));
-       $o .= BaseProfile::getTabsHTML($a, 'photos', $is_owner, $user['nickname'], $profile['hide-friends']);
+       $o .= BaseProfile::getTabsHTML('photos', $is_owner, $user['nickname'], $profile['hide-friends']);
 
        // Display upload form
        if ($datatype === 'upload') {
@@ -914,23 +913,20 @@ function photos_content(App $a)
                        '$submit' => DI::l10n()->t('Submit'),
                ]);
 
-               /* This block determines which setting actually limits  upload size of images:
-                * limit of Friendica ('maximagesize') or upload_max_filesize
-                * and outputs the lower one.
-               */
-               $maximagesize_Mbytes = 0;
-               {
-                       // Get the relevant size limits for uploads. Abbreviated var names: MaxImageSize -> mis; upload_max_filesize -> umf
-                       $mis_bytes = DI::config()->get('system', 'maximagesize');
-                       $umf_bytes = Strings::getBytesFromShorthand(get_cfg_var('upload_max_filesize'));
-
-                       if (is_numeric($mis_bytes)) {
-                               // When PHP is configured with upload_max_filesize less than maximagesize provide this lower limit.
-                               ($umf_bytes < $mis_bytes) ?
-                                       ($maximagesize_Mbytes = ($umf_bytes / (10 ** 6))) : ($maximagesize_Mbytes = ($mis_bytes / (10 ** 6)));
-                       }
+               // Get the relevant size limits for uploads. Abbreviated var names: MaxImageSize -> mis; upload_max_filesize -> umf
+               $mis_bytes = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
+               $umf_bytes = Strings::getBytesFromShorthand(ini_get('upload_max_filesize'));
+
+               // Per Friendica definition a value of '0' means unlimited:
+               If ($mis_bytes == 0) {
+                       $mis_bytes = INF;
                }
-               $usage_message = DI::l10n()->t('The maximum accepted image size is %.3g MB', Strings::getBytesFromShorthand(get_cfg_var('upload_max_filesize')));
+
+               // When PHP is configured with upload_max_filesize less than maximagesize provide this lower limit.
+               $maximagesize_bytes = (is_numeric($mis_bytes) && ($mis_bytes < $umf_bytes) ? $mis_bytes : $umf_bytes);
+
+               // @todo We may be want to use appropriate binary prefixed dynamicly
+               $usage_message = DI::l10n()->t('The maximum accepted image size is %s', Strings::formatBytes($maximagesize_bytes));
 
                $tpl = Renderer::getMarkupTemplate('photos_upload.tpl');