Move export public calendar additional feature to core

diff --git a/mod/cal.php b/mod/cal.php
index dcfb5db9c840dbf21711996561eb8ef4a10ba443..8db2237844017286c5a2f4f1eef0ff416d1d6ea9 100644 (file)
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -292,13 +292,6 @@ function cal_content(App $a)
                        return;
                }
 
-               // Test permissions
-               // Respect the export feature setting for all other /cal pages if it's not the own profile
-               if ((local_user() !== $owner_uid) && !Feature::isEnabled($owner_uid, "export_calendar")) {
-                       notice(DI::l10n()->t('Permission denied.') . EOL);
-                       DI::baseUrl()->redirect('cal/' . $nick);
-               }
-
                // Get the export data by uid
                $evexport = Event::exportListByUserId($owner_uid, $format);
 

diff --git a/src/Content/Feature.php b/src/Content/Feature.php
index b35aa3f363425ac50b9ef02cc50ad0f35cea5447..0f3493ab292055c26ee4924f55c9221d25f94c9d 100644 (file)
--- a/src/Content/Feature.php
+++ b/src/Content/Feature.php
@@ -96,7 +96,6 @@ class Feature
                                DI::l10n()->t('General Features'),
                                //array('expire',         DI::l10n()->t('Content Expiration'),          DI::l10n()->t('Remove old posts/comments after a period of time')),
                                ['photo_location',  DI::l10n()->t('Photo Location'),         DI::l10n()->t("Photo metadata is normally stripped. This extracts the location \x28if present\x29 prior to stripping metadata and links it to a map."), false, DI::config()->get('feature_lock', 'photo_location', false)],
-                               ['export_calendar', DI::l10n()->t('Export Public Calendar'), DI::l10n()->t('Ability for visitors to download the public calendar'), false, DI::config()->get('feature_lock', 'export_calendar', false)],
                                ['trending_tags',   DI::l10n()->t('Trending Tags'),          DI::l10n()->t('Show a community page widget with a list of the most popular tags in recent public posts.'), false, DI::config()->get('feature_lock', 'trending_tags', false)],
                        ],
 

diff --git a/src/Content/Widget/CalendarExport.php b/src/Content/Widget/CalendarExport.php
index dda3513fec0a917c3c84053a983043f4b82a87d2..9f282d264214e854564422a6f9330532e9c7ec0d 100644 (file)
--- a/src/Content/Widget/CalendarExport.php
+++ b/src/Content/Widget/CalendarExport.php
@@ -54,22 +54,6 @@ class CalendarExport
                        return;
                }
 
-               /*
-                * If it's a kind of profile page (intval($owner_uid)) return if the user not logged in and
-                * export feature isn't enabled.
-                */
-               /*
-                * Cal logged in user (test permission at foreign profile page).
-                * If the $owner uid is available we know it is part of one of the profile pages (like /cal).
-                * So we have to test if if it's the own profile page of the logged in user
-                * or a foreign one. For foreign profile pages we need to check if the feature
-                * for exporting the cal is enabled (otherwise the widget would appear for logged in users
-                * on foreigen profile pages even if the widget is disabled).
-                */
-               if (local_user() != $owner_uid && !Feature::isEnabled($owner_uid, "export_calendar")) {
-                       return;
-               }
-
                // $a->data is only available if the profile page is visited. If the visited page is not part
                // of the profile page it should be the personal /events page. So we can use $a->user.
                $user = ($a->data['user']['nickname'] ?? '') ?: $a->user['nickname'];