diff options
author | Roeland Jago Douma <roeland@famdouma.nl> | 2016-08-22 10:10:28 +0200 |
---|---|---|
committer | Roeland Jago Douma <roeland@famdouma.nl> | 2016-08-22 20:25:58 +0200 |
commit | f744131b18c97f84dd8868a1cee1879c5ea5cbb9 (patch) | |
tree | bdd698a6b84ba96c90249f4ba3f1d789f427e4ef /apps/files/lib/Controller | |
parent | 94992772b27b1f9c87d82a385932d3d93e45c750 (diff) | |
download | nextcloud-server-f744131b18c97f84dd8868a1cee1879c5ea5cbb9.tar.gz nextcloud-server-f744131b18c97f84dd8868a1cee1879c5ea5cbb9.zip |
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
Diffstat (limited to 'apps/files/lib/Controller')
-rw-r--r-- | apps/files/lib/Controller/SettingsController.php | 51 |
1 files changed, 51 insertions, 0 deletions
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) + ]); + } + } +} |