Feed attributes only for admin (FreshRSS#1905)

* Feed attributes only for admin FreshRSS#1838 * Changelog 1905 FreshRSS#1905
mdemoss · Mar 25, 2021 · 7ebd995 · 7ebd995
1 parent ab4df09
commit 7ebd995
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,8 +10,9 @@
  * Several per-feed options (implemented in JSON) [#1838](https://github.com/FreshRSS/FreshRSS/pull/1838)
   * Mark updated articles as read [#891](https://github.com/FreshRSS/FreshRSS/issues/891)
   * Mark as read upon reception [#1702](https://github.com/FreshRSS/FreshRSS/issues/1702)
-  * Feed cURL timeout
-  * Ignore SSL (unsafe) [#1811](https://github.com/FreshRSS/FreshRSS/issues/1811)
+  * Only for admin user [#1905](https://github.com/FreshRSS/FreshRSS/pull/1905)
+  * Feed cURL timeout
+  * Ignore SSL (unsafe) [#1811](https://github.com/FreshRSS/FreshRSS/issues/1811)
  * Light Boolean search implementation [#879](https://github.com/FreshRSS/FreshRSS/issues/879)
   * All parts are implicitly `AND` (which must not be written), except if `OR` is stated.
   * No use of parentheses. Support for quotes to disable the Boolean search, like `"This or that"`.

diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php
@@ -98,10 +98,15 @@ public function feedAction() {
 
  $feed->_attributes('mark_updated_article_unread', Minz_Request::paramTernary('mark_updated_article_unread'));
  $feed->_attributes('read_upon_reception', Minz_Request::paramTernary('read_upon_reception'));
- $feed->_attributes('ssl_verify', Minz_Request::paramTernary('ssl_verify'));
 
- $timeout = intval(Minz_Request::param('timeout', 0));
- $feed->_attributes('timeout', $timeout > 0 ? $timeout : null);
+ 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);
+ }
 
  $values = array(
  'name' => Minz_Request::param('name', ''),

diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml
@@ -205,6 +205,7 @@
  </div>
  </div>
 
+ <?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
  <div class="form-group">
  <label class="group-name" for="timeout"><?php echo _t('sub.feed.timeout'); ?></label>
  <div class="group-controls">
@@ -224,6 +225,7 @@
  </label>
  </div>
  </div>
+ <?php } ?>
 
  <div class="form-group form-actions">
  <div class="group-controls">