From a7bf7ced369a046b487ab1cd8b3819acc5ebdafe Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 1 Oct 2014 12:18:32 +0200
Subject: Fix links for feed management

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/Controllers/categoryController.php |  8 ++++----
 app/Controllers/feedController.php     | 16 +++++++++-------
 2 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'app/Controllers')

diff --git a/app/Controllers/categoryController.php b/app/Controllers/categoryController.php
index 65fe631cc..2c99751a4 100644
--- a/app/Controllers/categoryController.php
+++ b/app/Controllers/categoryController.php
@@ -31,7 +31,7 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 	 */
 	public function createAction() {
 		$catDAO = new FreshRSS_CategoryDAO();
-		$url_redirect = array('c' => 'configure', 'a' => 'categorize');
+		$url_redirect = array('c' => 'subscription', 'a' => 'index');
 
 		if (Minz_Request::isPost()) {
 			invalidateHttpCache();
@@ -71,7 +71,7 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 	 */
 	public function updateAction() {
 		$catDAO = new FreshRSS_CategoryDAO();
-		$url_redirect = array('c' => 'configure', 'a' => 'categorize');
+		$url_redirect = array('c' => 'subscription', 'a' => 'index');
 
 		if (Minz_Request::isPost()) {
 			invalidateHttpCache();
@@ -113,7 +113,7 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 		$feedDAO = FreshRSS_Factory::createFeedDao();
 		$catDAO = new FreshRSS_CategoryDAO();
 		$default_category = $catDAO->getDefault();
-		$url_redirect = array('c' => 'configure', 'a' => 'categorize');
+		$url_redirect = array('c' => 'subscription', 'a' => 'index');
 
 		if (Minz_Request::isPost()) {
 			invalidateHttpCache();
@@ -150,7 +150,7 @@ class FreshRSS_category_Controller extends Minz_ActionController {
 	 */
 	public function emptyAction() {
 		$feedDAO = FreshRSS_Factory::createFeedDao();
-		$url_redirect = array('c' => 'configure', 'a' => 'categorize');
+		$url_redirect = array('c' => 'subscription', 'a' => 'index');
 
 		if (Minz_Request::isPost()) {
 			invalidateHttpCache();
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 7ef427ac2..e4859b110 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -26,8 +26,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 
 		if ($url === false) {
 			Minz_Request::forward(array(
-				'c' => 'configure',
-				'a' => 'feed'
+				'c' => 'subscription',
+				'a' => 'index'
 			), true);
 		}
 
@@ -166,7 +166,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				$feedDAO->rollBack ();
 			}
 
-			Minz_Request::forward (array ('c' => 'configure', 'a' => 'feed', 'params' => $params), true);
+			Minz_Request::forward (array ('c' => 'subscription', 'a' => 'index', 'params' => $params), true);
 		} else {
 
 			// GET request so we must ask confirmation to user
@@ -193,8 +193,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				Minz_Session::_param('notification', $notif);
 
 				Minz_Request::forward(array(
-					'c' => 'configure',
-					'a' => 'feed',
+					'c' => 'subscription',
+					'a' => 'index',
 					'params' => array(
 						'id' => $feed->id()
 					)
@@ -214,7 +214,9 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			);
 			Minz_Session::_param ('notification', $notif);
 			invalidateHttpCache();
-			Minz_Request::forward (array ('c' => 'configure', 'a' => 'feed', 'params' => array('id' => $id)), true);
+			Minz_Request::forward (array ('c' => 'subscription',
+			                              'a' => 'index',
+			                              'params' => array('id' => $id)), true);
 		}
 	}
 
@@ -405,7 +407,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			if ($redirect_url) {
 				Minz_Request::forward($redirect_url);
 			} else {
-				Minz_Request::forward(array('c' => 'configure', 'a' => 'feed'), true);
+				Minz_Request::forward(array('c' => 'subscription', 'a' => 'index'), true);
 			}
 		}
 	}
-- 
cgit v1.2.3