files: fix max filesize check

php check both, upload_max_filesize and post_max_size, when uploading a
file so we should do the same when figuring out the maximum size.

Signed-off-by: Florian Pritz <bluewind@xinu.at>

diff --git a/files/admin.php b/files/admin.php
index 09237dfc1d50c2fe0b30c5b71ab2edaf56aa8db9..861b6037f3c4f8d5e3614a0079264c361337c575 100644 (file)
--- a/files/admin.php
+++ b/files/admin.php
@@ -32,7 +32,9 @@ if(isset($_POST['maxUploadSize'])){
        $maxUploadFilesize=$_POST['maxUploadSize'];
        OC_Files::setUploadLimit(OC_Helper::computerFileSize($maxUploadFilesize));
 }else{
-       $maxUploadFilesize = ini_get('upload_max_filesize').'B';
+       $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);
 }
 
 OC_App::setActiveNavigationEntry( "files_administration" );

diff --git a/files/index.php b/files/index.php
index bba8dc4951e059227b9aa37e45d2804ffda8361d..aa081d4880432433a2f1723b3fe5117e0380c16e 100644 (file)
--- a/files/index.php
+++ b/files/index.php
@@ -78,7 +78,9 @@ $breadcrumbNav = new OC_Template( "files", "part.breadcrumb", "" );
 $breadcrumbNav->assign( "breadcrumb", $breadcrumb );
 $breadcrumbNav->assign( "baseURL", OC_Helper::linkTo("files", "index.php?dir="));
 
-$maxUploadFilesize = OC_Helper::computerFileSize(ini_get('upload_max_filesize'));
+$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);
 
 $tmpl = new OC_Template( "files", "index", "user" );
 $tmpl->assign( "fileList", $list->fetchPage() );