diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2021-05-07 17:21:16 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2021-05-07 17:21:16 +0200 |
| commit | a65097f1b334ddd4da69343745324a93b6a754c6 (patch) | |
| tree | 332d9bda9807ebf728d9e5bc67ee1992eebda242 | |
| parent | 5160bc62d8e6012e8296a8ca3c00acc33c6c05a2 (diff) | |
Make SSL options available to non-admins (#3612)
#fix https://github.com/FreshRSS/FreshRSS/issues/3611
| -rwxr-xr-x | app/Controllers/feedController.php | 8 | ||||
| -rw-r--r-- | app/Controllers/subscriptionController.php | 11 | ||||
| -rw-r--r-- | app/views/helpers/feed/update.phtml | 2 | ||||
| -rw-r--r-- | app/views/subscription/add.phtml | 2 |
4 files changed, 6 insertions, 17 deletions
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php index a9dc241a9..dd845bccd 100755 --- a/app/Controllers/feedController.php +++ b/app/Controllers/feedController.php @@ -181,11 +181,9 @@ class FreshRSS_feed_Controller extends Minz_ActionController { 'timeout' => null, 'curl_params' => empty($opts) ? null : $opts, ); - if (FreshRSS_Auth::hasAccess('admin')) { - $attributes['ssl_verify'] = Minz_Request::paramTernary('ssl_verify'); - $timeout = intval(Minz_Request::param('timeout', 0)); - $attributes['timeout'] = $timeout > 0 ? $timeout : null; - } + $attributes['ssl_verify'] = Minz_Request::paramTernary('ssl_verify'); + $timeout = intval(Minz_Request::param('timeout', 0)); + $attributes['timeout'] = $timeout > 0 ? $timeout : null; try { $feed = self::addFeed($url, '', $cat, null, $http_auth, $attributes); diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php index 879c7f905..f47988926 100644 --- a/app/Controllers/subscriptionController.php +++ b/app/Controllers/subscriptionController.php @@ -131,14 +131,9 @@ class FreshRSS_subscription_Controller extends Minz_ActionController { $feed->_attributes('content_action', Minz_Request::param('content_action', 'replace')); - if (FreshRSS_Auth::hasAccess('admin')) { - $feed->_attributes('ssl_verify', Minz_Request::paramTernary('ssl_verify')); - $timeout = intval(Minz_Request::param('timeout', 0)); - $feed->_attributes('timeout', $timeout > 0 ? $timeout : null); - } else { - $feed->_attributes('ssl_verify', null); - $feed->_attributes('timeout', null); - } + $feed->_attributes('ssl_verify', Minz_Request::paramTernary('ssl_verify')); + $timeout = intval(Minz_Request::param('timeout', 0)); + $feed->_attributes('timeout', $timeout > 0 ? $timeout : null); if (Minz_Request::paramBoolean('use_default_purge_options')) { $feed->_attributes('archiving', null); diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml index c0d095edb..8127875ed 100644 --- a/app/views/helpers/feed/update.phtml +++ b/app/views/helpers/feed/update.phtml @@ -399,7 +399,6 @@ </div> </div> - <?php if (FreshRSS_Auth::hasAccess('admin')) { ?> <div class="form-group"> <label class="group-name" for="timeout"><?= _t('sub.feed.timeout') ?></label> <div class="group-controls"> @@ -419,7 +418,6 @@ </label> </div> </div> - <?php } ?> <legend><?= _t('sub.feed.filteractions') ?></legend> <div class="form-group"> diff --git a/app/views/subscription/add.phtml b/app/views/subscription/add.phtml index 9e652f702..adcb01699 100644 --- a/app/views/subscription/add.phtml +++ b/app/views/subscription/add.phtml @@ -89,7 +89,6 @@ </div> </div> - <?php if (FreshRSS_Auth::hasAccess('admin')) { ?> <div class="form-group"> <label class="group-name" for="timeout"><?= _t('sub.feed.timeout') ?></label> <div class="group-controls"> @@ -109,7 +108,6 @@ </label> </div> </div> - <?php } ?> </details> <div class="form-group form-actions"> |