From 39d874cd902a4e3d4f7ae313ec5e15bafe35df13 Mon Sep 17 00:00:00 2001
From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Thu, 20 Dec 2012 17:16:01 +0100
Subject: the maximum upload size is now part of the response of the upload and
 delete operation. the maximum upload size is updated within the browser once
 an upload or delete operation has been finished

---
 apps/files/index.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'apps/files/index.php')

diff --git a/apps/files/index.php b/apps/files/index.php
index b64bde44cc0..8b92bcc3728 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -79,13 +79,7 @@ $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
 $breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
 $breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=', false);
 
-$upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize'));
-$post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
-$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
-
-$freeSpace = OC_Filesystem::free_space($dir);
-$freeSpace = max($freeSpace, 0);
-$maxUploadFilesize = min($maxUploadFilesize, $freeSpace);
+$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir);
 
 $permissions = OCP\PERMISSION_READ;
 if (OC_Filesystem::isUpdatable($dir . '/')) {
-- 
cgit v1.2.3


From 938254a1c015c447b24fe1f3e64d8026f4dda8c3 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Fri, 11 Jan 2013 16:45:32 +0100
Subject: load jquery-visibility

---
 apps/files/index.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'apps/files/index.php')

diff --git a/apps/files/index.php b/apps/files/index.php
index 8b92bcc3728..959c7e4f7ea 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -28,6 +28,7 @@ OCP\User::checkLoggedIn();
 OCP\Util::addStyle('files', 'files');
 OCP\Util::addscript('files', 'jquery.iframe-transport');
 OCP\Util::addscript('files', 'jquery.fileupload');
+OCP\Util::addscript('files', 'jquery-visibility');
 OCP\Util::addscript('files', 'files');
 OCP\Util::addscript('files', 'filelist');
 OCP\Util::addscript('files', 'fileactions');
-- 
cgit v1.2.3