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/templates/admin.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'apps/files/templates')

diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php
index e5a6ecfc96e..fbadd21ef2a 100644
--- a/apps/files/templates/admin.php
+++ b/apps/files/templates/admin.php
@@ -1,18 +1,18 @@
 	<?php OCP\Util::addscript('files', 'admin'); ?>
 
-	<form name="filesForm" class="section" action="#" method="post">
-		<h2><?php p($l->t('File handling')); ?></h2>
-		<label for="maxUploadSize"><?php p($l->t( 'Maximum upload size' )); ?> </label>
-		<input type="text" name='maxUploadSize' id="maxUploadSize" value='<?php p($_['uploadMaxFilesize']) ?>' <?php if(!$_['uploadChangable']) { p('disabled'); } ?> />
-		<?php if($_['displayMaxPossibleUploadSize']):?>
-			(<?php p($l->t('max. possible: ')); p($_['maxPossibleUploadSize']) ?>)
-		<?php endif;?>
-		<input type="hidden" value="<?php p($_['requesttoken']); ?>" name="requesttoken" />
-		<?php if($_['uploadChangable']): ?>
-			<input type="submit" name="submitFilesAdminSettings" id="submitFilesAdminSettings"
-				   value="<?php p($l->t( 'Save' )); ?>"/>
-			<p><em><?php p($l->t('With PHP-FPM it might take 5 minutes for changes to be applied.')); ?></em></p>
-		<?php else: ?>
-			<p><em><?php p($l->t('Missing permissions to edit from here.')); ?></em></p>
-		<?php endif; ?>
-	</form>
+	<h2><?php p($l->t('File handling')); ?></h2>
+	<label for="maxUploadSize"><?php p($l->t( 'Maximum upload size' )); ?> </label>
+	<span id="maxUploadSizeSettingsMsg" class="msg"></span>
+	<br />
+	<input type="text" name='maxUploadSize' id="maxUploadSize" value='<?php p($_['uploadMaxFilesize']) ?>' <?php if(!$_['uploadChangable']) { p('disabled'); } ?> />
+	<?php if($_['displayMaxPossibleUploadSize']):?>
+		(<?php p($l->t('max. possible: ')); p($_['maxPossibleUploadSize']) ?>)
+	<?php endif;?>
+	<input type="hidden" value="<?php p($_['requesttoken']); ?>" name="requesttoken" />
+	<?php if($_['uploadChangable']): ?>
+		<input type="submit" id="submitMaxUpload"
+			   value="<?php p($l->t( 'Save' )); ?>"/>
+		<p><em><?php p($l->t('With PHP-FPM it might take 5 minutes for changes to be applied.')); ?></em></p>
+	<?php else: ?>
+		<p><em><?php p($l->t('Missing permissions to edit from here.')); ?></em></p>
+	<?php endif; ?>
-- 
cgit v1.2.3