Move usersAction into usersController

5 files changed, 18 insertions, 20 deletions

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index b7b88b3ba..789e9dfb0 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -168,11 +168,11 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 */
 	public function shortcutAction() {
 		$list_keys = array('a', 'b', 'backspace', 'c', 'd', 'delete', 'down', 'e', 'end', 'enter',
-		                    'escape', 'f', 'g', 'h', 'home', 'i', 'insert', 'j', 'k', 'l', 'left',
-		                    'm', 'n', 'o', 'p', 'page_down', 'page_up', 'q', 'r', 'return', 'right',
-		                    's', 'space', 't', 'tab', 'u', 'up', 'v', 'w', 'x', 'y',
-		                    'z', 'f1', 'f2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8', 'f9',
-		                    'f10', 'f11', 'f12');
+		                   'escape', 'f', 'g', 'h', 'home', 'i', 'insert', 'j', 'k', 'l', 'left',
+		                   'm', 'n', 'o', 'p', 'page_down', 'page_up', 'q', 'r', 'return', 'right',
+		                   's', 'space', 't', 'tab', 'u', 'up', 'v', 'w', 'x', 'y',
+		                   'z', 'f1', 'f2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8', 'f9',
+		                   'f10', 'f11', 'f12');
 		$this->view->list_keys = $list_keys;
 
 		if (Minz_Request::isPost()) {
@@ -197,15 +197,6 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	}
 
 	/**
-	 * This action display the user configuration page
-	 *
-	 * @todo move that action in the user controller
-	 */
-	public function usersAction() {
-		Minz_View::prependTitle(_t('users') . ' · ');
-	}
-
-	/**
 	 * This action handles the archive configuration page.
 	 *
 	 * It displays the archive configuration page.
diff --git a/app/Controllers/usersController.php b/app/Controllers/usersController.php
index 8eb82f5d5..7d0171bc7 100644
--- a/app/Controllers/usersController.php
+++ b/app/Controllers/usersController.php
@@ -13,6 +13,13 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 		}
 	}
 
+	/**
+	 * This action display the user configuration page
+	 */
+	public function indexAction() {
+		Minz_View::prependTitle(_t('users') . ' · ');
+	}
+
 	public function authAction() {
 		if (Minz_Request::isPost()) {
 			$ok = true;
@@ -94,7 +101,7 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 			);
 			Minz_Session::_param('notification', $notif);
 		}
-		Minz_Request::forward(array('c' => 'configure', 'a' => 'users'), true);
+		Minz_Request::forward(array('c' => 'users', 'a' => 'index'), true);
 	}
 
 	public function createAction() {
@@ -166,7 +173,7 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 			);
 			Minz_Session::_param('notification', $notif);
 		}
-		Minz_Request::forward(array('c' => 'configure', 'a' => 'users'), true);
+		Minz_Request::forward(array('c' => 'users', 'a' => 'index'), true);
 	}
 
 	public function deleteAction() {
@@ -198,6 +205,6 @@ class FreshRSS_users_Controller extends Minz_ActionController {
 			);
 			Minz_Session::_param('notification', $notif);
 		}
-		Minz_Request::forward(array('c' => 'configure', 'a' => 'users'), true);
+		Minz_Request::forward(array('c' => 'users', 'a' => 'index'), true);
 	}
 }
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index d5c9bf4c9..e17bcb254 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -19,8 +19,8 @@
 		<a href="<?php echo _url('configure', 'queries'); ?>"><?php echo _t('queries'); ?></a>
 	</li>
 	<li class="separator"></li>
-	<li class="item<?php echo Minz_Request::actionName() === 'users' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('configure', 'users'); ?>"><?php echo _t('users'); ?></a>
+	<li class="item<?php echo Minz_Request::controllerName() === 'users' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('users', 'index'); ?>"><?php echo _t('users'); ?></a>
 	</li>
 	<?php
 		$current_user = Minz_Session::param('currentUser', '');
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index 028e63d8a..4b571ef06 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -74,7 +74,7 @@ if (Minz_Configuration::canLogIn()) {
 				<li class="item"><a href="<?php echo _url('configure', 'shortcut'); ?>"><?php echo _t('shortcuts'); ?></a></li>
 				<li class="item"><a href="<?php echo _url('configure', 'queries'); ?>"><?php echo _t('queries'); ?></a></li>
 				<li class="separator"></li>
-				<li class="item"><a href="<?php echo _url('configure', 'users'); ?>"><?php echo _t('users'); ?></a></li>
+				<li class="item"><a href="<?php echo _url('users', 'index'); ?>"><?php echo _t('users'); ?></a></li>
 				<?php
 					$current_user = Minz_Session::param('currentUser', '');
 					if (Minz_Configuration::isAdmin($current_user)) {
diff --git a/app/views/configure/users.phtml b/app/views/users/index.phtml
index 517e302e5..517e302e5 100644
--- a/app/views/configure/users.phtml
+++ b/app/views/users/index.phtml