Merge pull request #14430 from nextcloud/bugfix/13990/remove-upload-s…

…etting Remove the upload and memory setting
nextcloud · Mar 4, 2019 · bbb168a · bbb168a
2 parents daee222 + c6a69ba
commit bbb168a
Show file tree

Hide file tree

Showing 19 changed files with 7 additions and 649 deletions.
diff --git a/.htaccess b/.htaccess
@@ -31,9 +31,6 @@
   </FilesMatch>
 </IfModule>
 <IfModule mod_php7.c>
-  php_value upload_max_filesize 511M
-  php_value post_max_size 511M
-  php_value memory_limit 512M
   php_value mbstring.func_overload 0
   php_value default_charset 'UTF-8'
   php_value output_buffering 0

diff --git a/.user.ini b/.user.ini
@@ -1,6 +1,3 @@
-upload_max_filesize=511M
-post_max_size=511M
-memory_limit=512M
 mbstring.func_overload=0
 always_populate_raw_post_data=-1
 default_charset='UTF-8'

diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml
@@ -35,10 +35,6 @@
 		<command>OCA\Files\Command\ScanAppData</command>
 	</commands>
 
-	<settings>
-		<admin>OCA\Files\Settings\Admin</admin>
-	</settings>
-
 	<activity>
 		<settings>
 			<setting>OCA\Files\Activity\Settings\FavoriteAction</setting>

diff --git a/apps/files/appinfo/routes.php b/apps/files/appinfo/routes.php
@@ -76,11 +76,6 @@
 				'url' => '/',
 				'verb' => 'GET',
 			],
-			[
-				'name' => 'settings#setMaxUploadSize',
-				'url' => '/settings/maxUpload',
-				'verb' => 'POST',
-			],
 			[
 				'name' => 'ajax#getStorageStats',
 				'url' => '/ajax/getstoragestats.php',

diff --git a/apps/files/composer/composer/autoload_classmap.php b/apps/files/composer/composer/autoload_classmap.php
@@ -31,9 +31,7 @@
     'OCA\\Files\\Command\\TransferOwnership' => $baseDir . '/../lib/Command/TransferOwnership.php',
     'OCA\\Files\\Controller\\AjaxController' => $baseDir . '/../lib/Controller/AjaxController.php',
     'OCA\\Files\\Controller\\ApiController' => $baseDir . '/../lib/Controller/ApiController.php',
-    'OCA\\Files\\Controller\\SettingsController' => $baseDir . '/../lib/Controller/SettingsController.php',
     'OCA\\Files\\Controller\\ViewController' => $baseDir . '/../lib/Controller/ViewController.php',
     'OCA\\Files\\Helper' => $baseDir . '/../lib/Helper.php',
     'OCA\\Files\\Service\\TagService' => $baseDir . '/../lib/Service/TagService.php',
-    'OCA\\Files\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
 );
diff --git a/apps/files/composer/composer/autoload_static.php b/apps/files/composer/composer/autoload_static.php
@@ -46,11 +46,9 @@ class ComposerStaticInitFiles
         'OCA\\Files\\Command\\TransferOwnership' => __DIR__ . '/..' . '/../lib/Command/TransferOwnership.php',
         'OCA\\Files\\Controller\\AjaxController' => __DIR__ . '/..' . '/../lib/Controller/AjaxController.php',
         'OCA\\Files\\Controller\\ApiController' => __DIR__ . '/..' . '/../lib/Controller/ApiController.php',
-        'OCA\\Files\\Controller\\SettingsController' => __DIR__ . '/..' . '/../lib/Controller/SettingsController.php',
         'OCA\\Files\\Controller\\ViewController' => __DIR__ . '/..' . '/../lib/Controller/ViewController.php',
         'OCA\\Files\\Helper' => __DIR__ . '/..' . '/../lib/Helper.php',
         'OCA\\Files\\Service\\TagService' => __DIR__ . '/..' . '/../lib/Service/TagService.php',
-        'OCA\\Files\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
     );
 
     public static function getInitializer(ClassLoader $loader)

diff --git a/apps/files/js/admin.js b/apps/files/js/admin.js
diff --git a/apps/files/lib/Controller/SettingsController.php b/apps/files/lib/Controller/SettingsController.php
diff --git a/apps/files/lib/Settings/Admin.php b/apps/files/lib/Settings/Admin.php
diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php
diff --git a/apps/files/tests/Settings/AdminTest.php b/apps/files/tests/Settings/AdminTest.php