Explorar el Código

Make SSL options available to non-admins (#3612)

#fix https://github.com/FreshRSS/FreshRSS/issues/3611
Alexandre Alapetite hace 4 años
padre
commit
a65097f1b3

+ 3 - 5
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);

+ 3 - 8
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);

+ 0 - 2
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">

+ 0 - 2
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">