remove usersettingscontroller in favor of pagecontroller, simplify settings requests

2 files changed, 33 insertions, 113 deletions

diff --git a/controller/pagecontroller.php b/controller/pagecontroller.php
index 0526d79e8..4acc5f9e6 100644
--- a/controller/pagecontroller.php
+++ b/controller/pagecontroller.php
@@ -26,15 +26,18 @@
 namespace OCA\News\Controller;
 
 use \OCP\IRequest;
+use \OCP\AppFramework\Http\JSONResponse;
 use \OCP\AppFramework\Controller;
 
 use \OCA\News\Core\API;
 
 class PageController extends Controller {
 
+	private $api;
 
 	public function __construct(API $api, IRequest $request){
 		parent::__construct($api->getAppName(), $request);
+		$this->api = $api;
 	}
 
 
@@ -47,4 +50,34 @@ class PageController extends Controller {
 	}
 
 
+	/**
+	 * @NoAdminRequired
+	 */
+	public function settings() {
+		$showAll = $this->api->getUserValue('showAll');
+		$compact = $this->api->getUserValue('compact');
+		$language = $this->api->getTrans()->findLanguage();
+
+		$settings = array(
+			'showAll' => $showAll === '1',
+			'compact' => $compact === '1',
+			'language' => $language
+		);
+
+		return new JSONResponse($settings);
+	}
+
+
+	/**
+	 * @NoAdminRequired
+	 */
+	public function updateSettings() {
+		$isShowAll = $this->params('showAll');
+		$isCompact = $this->params('compact');
+		$this->api->setUserValue('showAll', $isShowAll);
+		$this->api->setUserValue('compact', $isCompact);
+
+		return new JSONResponse();
+	}
+
 }
\ No newline at end of file
diff --git a/controller/usersettingscontroller.php b/controller/usersettingscontroller.php
deleted file mode 100644
index 46e003d2c..000000000
--- a/controller/usersettingscontroller.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-/**
-* ownCloud - News
-*
-* @author Alessandro Cosentino
-* @author Bernhard Posselt
-* @copyright 2012 Alessandro Cosentino cosenal@gmail.com
-* @copyright 2012 Bernhard Posselt dev@bernhard-posselt.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-namespace OCA\News\Controller;
-
-use \OCP\IRequest;
-use \OCP\AppFramework\Controller;
-use \OCP\AppFramework\Http\JSONResponse;
-
-use \OCA\News\Core\API;
-
-class UserSettingsController extends Controller {
-
-	private $api;
-
-	public function __construct(API $api, IRequest $request){
-		parent::__construct($api->getAppName(), $request);
-		$this->api = $api;
-	}
-
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function read(){
-		$showAll = $this->api->getUserValue('showAll');
-		$params = array(
-			'showAll' => $showAll === '1'
-		);
-
-		return new JSONResponse($params);
-	}
-
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function show(){
-		$this->api->setUserValue('showAll', true);
-
-		return new JSONResponse();
-	}
-
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function hide(){
-		$this->api->setUserValue('showAll', false);
-
-		return new JSONResponse();
-	}
-
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function getLanguage(){
-		$language = $this->api->getTrans()->findLanguage();
-
-		$params = array(
-			'language' => $language
-		);
-		return new JSONResponse($params);
-	}
-
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function isCompactView(){
-		$compact = $this->api->getUserValue('compact');
-		$params = array(
-			'compact' => $compact === '1'
-		);
-		return new JSONResponse($params);
-	}
-
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function setCompactView(){
-		$isCompact = $this->params('compact');
-		$this->api->setUserValue('compact', $isCompact);
-
-		return new JSONResponse();
-	}
-
-
-}
\ No newline at end of file