From 08d9474aaccd67c6e8a19abaf1d5ff6296063215 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <nukeawhale@gmail.com>
Date: Sat, 3 Aug 2013 10:07:34 +0200
Subject: require admin account for executing cron routes

---
 CHANGELOG                           | 1 +
 external/feedapi.php                | 2 --
 external/newsapi.php                | 2 --
 tests/unit/external/FeedAPITest.php | 4 +++-
 tests/unit/external/NewsAPITest.php | 3 ++-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 2f658385d..bb827ffda 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 owncloud-news (1.203)
 * Decode the title twice to fix special characters in HTML content in the title, author and email
 * Scroll to the bottom once you hit the show all button to prevent tedious scrolling
+* Add an API to make ownCloud cron updates optionally. This can be used to write an update script which can be threaded to dramatically speed up fetching of feeds and reduce the used memory to run the update
 
 ownCloud-news (1.202)
 * Fixed a bug in the API routes that would request an uneeded id when creating a feed
diff --git a/external/feedapi.php b/external/feedapi.php
index fdb83e682..319d93cee 100644
--- a/external/feedapi.php
+++ b/external/feedapi.php
@@ -183,8 +183,6 @@ class FeedAPI extends Controller {
 
 
 	/**
-	 * @IsAdminExemption
-	 * @IsSubAdminExemption
 	 * @CSRFExemption
 	 * @Ajax
 	 * @API
diff --git a/external/newsapi.php b/external/newsapi.php
index 331b65556..397e5c010 100644
--- a/external/newsapi.php
+++ b/external/newsapi.php
@@ -57,8 +57,6 @@ class NewsAPI extends Controller {
 
 
 	/**
-	 * @IsAdminExemption
-	 * @IsSubAdminExemption
 	 * @CSRFExemption
 	 * @Ajax
 	 * @API
diff --git a/tests/unit/external/FeedAPITest.php b/tests/unit/external/FeedAPITest.php
index 6b133610e..ee9e6b60a 100644
--- a/tests/unit/external/FeedAPITest.php
+++ b/tests/unit/external/FeedAPITest.php
@@ -116,7 +116,8 @@ class FeedAPITest extends ControllerTestUtility {
 
 
 	public function testGetAllFromUsersAnnotations(){
-		$this->assertDefaultAnnotations('getAllFromAllUsers');
+		$annotations = array('Ajax', 'CSRFExemption', 'API');
+		$this->assertAnnotations($this->feedAPI, 'getAllFromAllUsers', $annotations);
 	}
 
 
@@ -124,6 +125,7 @@ class FeedAPITest extends ControllerTestUtility {
 		$this->assertDefaultAnnotations('update');
 	}
 
+
 	public function testGetAll() {
 		$feeds = array(
 			new Feed()
diff --git a/tests/unit/external/NewsAPITest.php b/tests/unit/external/NewsAPITest.php
index b5cd808e3..9396e4f05 100644
--- a/tests/unit/external/NewsAPITest.php
+++ b/tests/unit/external/NewsAPITest.php
@@ -66,7 +66,8 @@ class NewsAPITest extends ControllerTestUtility {
 	}
 
 	public function testCleanUpAnnotations(){
-		$this->assertDefaultAnnotations('cleanUp');
+		$annotations = array('Ajax', 'CSRFExemption', 'API');
+		$this->assertAnnotations($this->newsAPI, 'cleanUp', $annotations);
 	}
 
 	public function testGetVersion(){
-- 
cgit v1.2.3