diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-01-20 03:11:04 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-01-20 03:11:04 +0100 |
| commit | 83d622132224fa61b1518e6bca430518cf138401 (patch) | |
| tree | 53f79474af81e07f1304a1cf10e866b2d8af652b /apps/files/ajax/delete.php | |
| parent | 8ca30d244c19b33e7e3b0da247b70160a3acc44f (diff) | |
| parent | ebc0c4b85bc382efcf64ad0b2613d70a193b18f2 (diff) | |
| download | nextcloud-server-83d622132224fa61b1518e6bca430518cf138401.tar.gz nextcloud-server-83d622132224fa61b1518e6bca430518cf138401.zip | |
merge master into filesytem
Diffstat (limited to 'apps/files/ajax/delete.php')
| -rw-r--r-- | apps/files/ajax/delete.php | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php index 8f05eaaa1b8..196d6982782 100644 --- a/apps/files/ajax/delete.php +++ b/apps/files/ajax/delete.php @@ -23,8 +23,20 @@ foreach ($files as $file) { } } -if ($success) { - OCP\JSON::success(array("data" => array("dir" => $dir, "files" => $files))); +// updated max file size after upload +$l=new OC_L10N('files'); +$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir); +$maxHumanFilesize=OCP\Util::humanFileSize($maxUploadFilesize); +$maxHumanFilesize=$l->t('Upload') . ' max. '.$maxHumanFilesize; + +if($success) { + OCP\JSON::success(array("data" => array( "dir" => $dir, "files" => $files, + 'uploadMaxFilesize'=>$maxUploadFilesize, + 'maxHumanFilesize'=>$maxHumanFilesize + ))); } else { - OCP\JSON::error(array("data" => array("message" => "Could not delete:\n" . $filesWithError))); + OCP\JSON::error(array("data" => array( "message" => "Could not delete:\n" . $filesWithError, + 'uploadMaxFilesize'=>$maxUploadFilesize, + 'maxHumanFilesize'=>$maxHumanFilesize + ))); } |