Don't block uploads if the max upload size is unknown

diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index a53df4e2d3e808af55e8d55136e56868cf627342..0d7185bcb7837ecf01b81fbddba7c75bd7417e9a 100644 (file)
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -23,8 +23,10 @@
                                          method="post"
                                          enctype="multipart/form-data"
                                          target="file_upload_target_1">
+                                       <?php if($_['uploadMaxFilesize'] >= 0):?>
                                        <input type="hidden" name="MAX_FILE_SIZE" id="max_upload"
                                                   value="<?php p($_['uploadMaxFilesize']) ?>">
+                                       <?php endif;?>
                                        <!-- Send the requesttoken, this is needed for older IE versions
                                                 because they don't send the CSRF token via HTTP header in this case -->
                                        <input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" id="requesttoken">

diff --git a/lib/helper.php b/lib/helper.php
index 6ee8a4891647926fea9df98c9f29c00d2de2cb53..687f61520a53edaef49ea5394defc5a0cf76c021 100644 (file)
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -764,7 +764,8 @@ class OC_Helper {
        public static function maxUploadFilesize($dir) {
                $upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize'));
                $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
-               if ($upload_max_filesize === 0 and $post_max_size === 0) {
+               $freeSpace = \OC\Files\Filesystem::free_space($dir);
+               if ($upload_max_filesize == 0 and $post_max_size == 0) {
                        $maxUploadFilesize = \OC\Files\FREE_SPACE_UNLIMITED;
                } elseif ($upload_max_filesize === 0 or $post_max_size === 0) {
                        $maxUploadFilesize = max($upload_max_filesize, $post_max_size); //only the non 0 value counts
@@ -772,7 +773,6 @@ class OC_Helper {
                        $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
                }
 
-               $freeSpace = \OC\Files\Filesystem::free_space($dir);
                if($freeSpace !== \OC\Files\FREE_SPACE_UNKNOWN){
                        $freeSpace = max($freeSpace, 0);