From 4637dcc4587ed0c3b1695568a3c8a3853d695c5d Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Wed, 9 Apr 2014 01:59:42 +0200
Subject: migrate security annotations, please review

---
 controller/feedcontroller.php | 40 ++++++++++------------------------------
 1 file changed, 10 insertions(+), 30 deletions(-)

(limited to 'controller/feedcontroller.php')

diff --git a/controller/feedcontroller.php b/controller/feedcontroller.php
index 29f60b8ea..76a582139 100644
--- a/controller/feedcontroller.php
+++ b/controller/feedcontroller.php
@@ -59,9 +59,7 @@ class FeedController extends Controller {
 
 
 	/**
-	 * @IsAdminExemption
-	 * @IsSubAdminExemption
-	 * @Ajax
+	 * @NoAdminRequired
 	 */
 	public function feeds(){
 		$userId = $this->api->getUserId();
@@ -84,9 +82,7 @@ class FeedController extends Controller {
 
 
 	/**
-	 * @IsAdminExemption
-	 * @IsSubAdminExemption
-	 * @Ajax
+	 * @NoAdminRequired
 	 */
 	public function active(){
 		$userId = $this->api->getUserId();
@@ -128,9 +124,7 @@ class FeedController extends Controller {
 
 
 	/**
-	 * @IsAdminExemption
-	 * @IsSubAdminExemption
-	 * @Ajax
+	 * @NoAdminRequired
 	 */
 	public function create(){
 		$url = $this->params('url');
@@ -168,9 +162,7 @@ class FeedController extends Controller {
 
 
 	/**
-	 * @IsAdminExemption
-	 * @IsSubAdminExemption
-	 * @Ajax
+	 * @NoAdminRequired
 	 */
 	public function delete(){
 		$feedId = (int) $this->params('feedId');
@@ -188,9 +180,7 @@ class FeedController extends Controller {
 
 
 	/**
-	 * @IsAdminExemption
-	 * @IsSubAdminExemption
-	 * @Ajax
+	 * @NoAdminRequired
 	 */
 	public function update(){
 		try {
@@ -221,9 +211,7 @@ class FeedController extends Controller {
 
 
 	/**
-	 * @IsAdminExemption
-	 * @IsSubAdminExemption
-	 * @Ajax
+	 * @NoAdminRequired
 	 */
 	public function move(){
 		$feedId = (int) $this->params('feedId');
@@ -241,9 +229,7 @@ class FeedController extends Controller {
 	}
 
 	/**
-	 * @IsAdminExemption
-	 * @IsSubAdminExemption
-	 * @Ajax
+	 * @NoAdminRequired
 	 */
 	public function rename() {
 		$feedId = (int) $this->params('feedId');
@@ -261,9 +247,7 @@ class FeedController extends Controller {
 	}
 
 	/**
-	 * @IsAdminExemption
-	 * @IsSubAdminExemption
-	 * @Ajax
+	 * @NoAdminRequired
 	 */
 	public function importArticles() {
 		$json = $this->params('json');
@@ -281,9 +265,7 @@ class FeedController extends Controller {
 
 
 	/**
-	 * @IsAdminExemption
-	 * @IsSubAdminExemption
-	 * @Ajax
+	 * @NoAdminRequired
 	 */
 	public function read(){
 		$userId = $this->api->getUserId();
@@ -305,9 +287,7 @@ class FeedController extends Controller {
 
 
 	/**
-	 * @IsAdminExemption
-	 * @IsSubAdminExemption
-	 * @Ajax
+	 * @NoAdminRequired
 	 */
 	public function restore(){
 		$feedId = (int) $this->params('feedId');
-- 
cgit v1.2.3