From 037c385947aa46e5f9cc125d0a2679ad6d7e7e7d Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 16 Jun 2019 18:59:50 +0200
Subject: Fix API remove category (#2412)

Fix https://github.com/FreshRSS/FreshRSS/issues/2411
---
 p/api/greader.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'p/api')

diff --git a/p/api/greader.php b/p/api/greader.php
index 66732b799..3d628c855 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -347,7 +347,7 @@ function subscriptionEdit($streamNames, $titles, $action, $add = '', $remove = '
 		$c_name = htmlspecialchars($c_name, ENT_COMPAT, 'UTF-8');
 		$cat = $categoryDAO->searchByName($c_name);
 		$addCatId = $cat == null ? 0 : $cat->id();
-	} else if ($remove != '' && strpos($remove, 'user/-/label/')) {
+	} elseif ($remove != '' && strpos($remove, 'user/-/label/') === 0) {
 		$addCatId = 1;	//Default category
 	}
 	$feedDAO = FreshRSS_Factory::createFeedDao();
@@ -998,7 +998,7 @@ if ($pathInfos[1] === 'accounts') {
 					 * (more efficient from a backend perspective than multiple requests). */
 					$streamId = $_GET['s'];
 					streamContentsItemsIds($streamId, $start_time, $stop_time, $count, $order, $filter_target, $exclude_target, $continuation);
-				} else if ($pathInfos[6] === 'contents' && isset($_POST['i'])) {	//FeedMe
+				} elseif ($pathInfos[6] === 'contents' && isset($_POST['i'])) {	//FeedMe
 					$e_ids = multiplePosts('i');	//item IDs
 					streamContentsItems($e_ids, $order);
 				}
-- 
cgit v1.2.3


From 1aa2af9752f7c1cb3a5753156900fc33bf9f2d2c Mon Sep 17 00:00:00 2001
From: Nick Cross <github@goots.org>
Date: Sat, 20 Jul 2019 22:23:24 +0100
Subject: Issue #2446 : Fix passing authentication headers (#2449)

* Issue #2446 : Fix passing authentication headers. Use CGIPassAuth is version is high enough

* Issue #2446 : Remove CGIPassAuth due to potential issues with AllowOverride rights.

* Tabs
---
 p/api/.htaccess | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'p/api')

diff --git a/p/api/.htaccess b/p/api/.htaccess
index 2bd6b1d14..dd3df0b4f 100644
--- a/p/api/.htaccess
+++ b/p/api/.htaccess
@@ -1,5 +1,5 @@
 <IfModule mod_setenvif.c>
-	SetEnvIfNoCase "^Authorization$" "(.*)" HTTP_AUTHORIZATION=$1
+	SetEnvIfNoCase "Authorization" "(.*)" HTTP_AUTHORIZATION=$1
 </IfModule>
 <IfModule !mod_setenvif.c>
 	<IfModule mod_rewrite.c>
-- 
cgit v1.2.3