From d2718b38ff88681c325c59858766e9ee4eb65a66 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Mon, 22 Aug 2016 10:10:28 +0200 Subject: [PATCH] Backport of Do not error on maxUploadChange #1005 to stable10 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 put file handling into a section again --- apps/files/appinfo/routes.php | 5 ++ apps/files/js/admin.js | 42 +++++++++++++++ .../lib/Controller/SettingsController.php | 51 +++++++++++++++++++ apps/files/lib/Settings/Admin.php | 7 --- apps/files/templates/admin.php | 8 +-- 5 files changed, 103 insertions(+), 10 deletions(-) create mode 100644 apps/files/lib/Controller/SettingsController.php diff --git a/apps/files/appinfo/routes.php b/apps/files/appinfo/routes.php index 34bb101177..c5eb86ca91 100644 --- a/apps/files/appinfo/routes.php +++ b/apps/files/appinfo/routes.php @@ -65,6 +65,11 @@ $application->registerRoutes( 'url' => '/', 'verb' => 'GET', ], + [ + 'name' => 'settings#setMaxUploadSize', + 'url' => '/settings/maxUpload', + 'verb' => 'POST', + ] ) ) ); diff --git a/apps/files/js/admin.js b/apps/files/js/admin.js index dcfec824cf..6afd77eb03 100644 --- a/apps/files/js/admin.js +++ b/apps/files/js/admin.js @@ -8,6 +8,46 @@ * */ +(function() { + if (!OCA.Files) { + /** + * Namespace for the files app + * @namespace OCA.Files + */ + OCA.Files = {}; + } + + /** + * @namespace OCA.Files.Admin + */ + OCA.Files.Admin = { + initialize: function() { + $('#submitMaxUpload').on('click', _.bind(this._onClickSubmitMaxUpload, this)); + }, + + _onClickSubmitMaxUpload: function () { + OC.msg.startSaving('#maxUploadSizeSettingsMsg'); + + var request = $.ajax({ + url: OC.generateUrl('/apps/files/settings/maxUpload'), + type: 'POST', + data: { + maxUploadSize: $('#maxUploadSize').val() + } + }); + + request.done(function (data) { + $('#maxUploadSize').val(data.maxUploadSize); + OC.msg.finishedSuccess('#maxUploadSizeSettingsMsg', 'Saved'); + }); + + request.fail(function () { + OC.msg.finishedError('#maxUploadSizeSettingsMsg', 'Error'); + }); + } + } +})(); + function switchPublicFolder() { var publicEnable = $('#publicEnable').is(':checked'); // find all radiobuttons of that group @@ -19,6 +59,8 @@ function switchPublicFolder() { } $(document).ready(function() { + OCA.Files.Admin.initialize(); + // Execute the function after loading DOM tree switchPublicFolder(); $('#publicEnable').click(function() { diff --git a/apps/files/lib/Controller/SettingsController.php b/apps/files/lib/Controller/SettingsController.php new file mode 100644 index 0000000000..0b2dc9c2dd --- /dev/null +++ b/apps/files/lib/Controller/SettingsController.php @@ -0,0 +1,51 @@ + + * + * @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 . + * + */ +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 9ec23d4751..da1d5deaf3 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 ), diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php index e5a6ecfc96..ef357245df 100644 --- a/apps/files/templates/admin.php +++ b/apps/files/templates/admin.php @@ -1,18 +1,20 @@ -
+

t('File handling')); ?>

+ +
' /> (t('max. possible: ')); p($_['maxPossibleUploadSize']) ?>) -

t('With PHP-FPM it might take 5 minutes for changes to be applied.')); ?>

t('Missing permissions to edit from here.')); ?>

- +