check if selected files for zip archive are not too large

offer config option

1 files changed, 12 insertions, 6 deletions

diff --git a/files/admin.php b/files/admin.php
index ea846202ab3..7e410652cfb 100644
--- a/files/admin.php
+++ b/files/admin.php
@@ -28,13 +28,20 @@ require_once('../lib/base.php');
 OC_Util::checkAdminUser();
 
 $htaccessWorking=(getenv('htaccessWorking')=='true');
-if(isset($_POST['maxUploadSize'])){
-	$maxUploadFilesize=$_POST['maxUploadSize'];
-	OC_Files::setUploadLimit(OC_Helper::computerFileSize($maxUploadFilesize));
+if($_POST) {
+	if(isset($_POST['maxUploadSize'])){
+		$maxUploadFilesize=$_POST['maxUploadSize'];
+		OC_Files::setUploadLimit(OC_Helper::computerFileSize($maxUploadFilesize));
+	}
+	if(isset($_POST['maxZipInputSize'])) {
+		$maxZipInputSize=$_POST['maxZipInputSize'];
+		OC_Preferences::setValue('', 'files', 'maxZipInputSize', OC_Helper::computerFileSize($maxZipInputSize));
+	}
 }else{
 	$upload_max_filesize = OC_Helper::computerFileSize(ini_get('upload_max_filesize'));
 	$post_max_size = OC_Helper::computerFileSize(ini_get('post_max_size'));
 	$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
+	$maxZipInputSize = OC_Helper::humanfilesize(OC_Preferences::getValue('', 'files', 'maxZipInputSize', OC_Helper::computerFileSize('800 MB')));
 }
 
 OC_App::setActiveNavigationEntry( "files_administration" );
@@ -42,6 +49,5 @@ OC_App::setActiveNavigationEntry( "files_administration" );
 $tmpl = new OC_Template( 'files', 'admin' );
 $tmpl->assign( 'htaccessWorking', $htaccessWorking );
 $tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
-return $tmpl->fetchPage();
-
-?>
+$tmpl->assign( 'maxZipInputSize', $maxZipInputSize);
+return $tmpl->fetchPage();
\ No newline at end of file