From b567d32b0e51fda52308cc3b64e8c21c969d33eb Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Wed, 14 May 2014 19:22:55 +0200
Subject: first commit, nothing working yet

---
 controller/pagecontroller.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'controller')

diff --git a/controller/pagecontroller.php b/controller/pagecontroller.php
index db0fa48bf..2e9377a7e 100644
--- a/controller/pagecontroller.php
+++ b/controller/pagecontroller.php
@@ -51,7 +51,7 @@ class PageController extends Controller {
 	 * @NoAdminRequired
 	 */
 	public function settings() {
-		$settings = ['showAll', 'compact', 'readOnScroll', 'oldestFirst'];
+		$settings = ['showAll', 'compact', 'preventReadOnScroll', 'oldestFirst'];
 
 		$result = ['language' => $this->l10n->getLanguageCode()];
 
@@ -60,8 +60,7 @@ class PageController extends Controller {
 				$this->userId, $this->appName, $setting
 			) === '1';
 		}
-
-		return $result;
+		return ['settings' => $result];
 	}
 
 
@@ -70,11 +69,11 @@ class PageController extends Controller {
 	 *
 	 * @param bool $showAll
 	 * @param bool $compact
-	 * @param bool $readOnScroll
+	 * @param bool $preventReadOnScroll
 	 * @param bool $oldestFirst
 	 */
-	public function updateSettings($showAll, $compact, $readOnScroll, $oldestFirst) {
-		$settings = ['showAll', 'compact', 'readOnScroll', 'oldestFirst'];
+	public function updateSettings($showAll, $compact, $preventReadOnScroll, $oldestFirst) {
+		$settings = ['showAll', 'compact', 'preventReadOnScroll', 'oldestFirst'];
 		
 		foreach ($settings as $setting) {
 			if(${$setting} !== null) {
-- 
cgit v1.2.3