From f744131b18c97f84dd8868a1cee1879c5ea5cbb9 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Mon, 22 Aug 2016 10:10:28 +0200
Subject: Do not error on maxUploadChange

The new admin page broke the updating of the max upload size. This is
due to very old code there.

* Now update is done in the background using js
* Added proper route+controller to update

Fixes #994
---
 apps/files/lib/Controller/SettingsController.php | 51 ++++++++++++++++++++++++
 apps/files/lib/Settings/Admin.php                |  7 ----
 2 files changed, 51 insertions(+), 7 deletions(-)
 create mode 100644 apps/files/lib/Controller/SettingsController.php

(limited to 'apps/files/lib')

diff --git a/apps/files/lib/Controller/SettingsController.php b/apps/files/lib/Controller/SettingsController.php
new file mode 100644
index 00000000000..0b2dc9c2dd1
--- /dev/null
+++ b/apps/files/lib/Controller/SettingsController.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ *
+ *
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OCA\Files\Controller;
+
+use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\JSONResponse;
+use OCP\IRequest;
+use OCP\Util;
+
+class SettingsController extends Controller {
+	public function __construct($appName, IRequest $request) {
+		parent::__construct($appName, $request);
+	}
+
+	/**
+	 * @param string $maxUploadSize
+	 * @return JSONResponse
+	 */
+	public function setMaxUploadSize($maxUploadSize) {
+		$setMaxSize = \OC_Files::setUploadLimit(Util::computerFileSize($maxUploadSize));
+
+		if ($setMaxSize === false) {
+			return new JSONResponse([], Http::STATUS_BAD_REQUEST);
+		} else {
+			return new JSONResponse([
+				'maxUploadSize' => Util::humanFileSize($setMaxSize)
+			]);
+		}
+	}
+}
diff --git a/apps/files/lib/Settings/Admin.php b/apps/files/lib/Settings/Admin.php
index 9ec23d47517..da1d5deaf35 100644
--- a/apps/files/lib/Settings/Admin.php
+++ b/apps/files/lib/Settings/Admin.php
@@ -53,13 +53,6 @@ class Admin implements ISettings {
 		$upload_max_filesize = $this->iniWrapper->getBytes('upload_max_filesize');
 		$post_max_size = $this->iniWrapper->getBytes('post_max_size');
 		$maxUploadFilesize = Util::humanFileSize(min($upload_max_filesize, $post_max_size));
-		if($_POST && $this->request->passesCSRFCheck()) {
-			if(isset($_POST['maxUploadSize'])) {
-				if(($setMaxSize = \OC_Files::setUploadLimit(Util::computerFileSize($_POST['maxUploadSize']))) !== false) {
-					$maxUploadFilesize = Util::humanFileSize($setMaxSize);
-				}
-			}
-		}
 
 		$parameters = [
 			'uploadChangable'              => (($htaccessWorking and $htaccessWritable) or $userIniWritable ),
-- 
cgit v1.2.3