diff options
author | Thomas Mueller <thomas.mueller@tmit.eu> | 2012-12-28 21:57:05 +0100 |
---|---|---|
committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2012-12-28 22:17:38 +0100 |
commit | a3206b4e975082216d143c79edf379703317da20 (patch) | |
tree | 6c769d1d3442752e66b4e68962fc85cc6628b0bf /apps | |
parent | 7b72424a39688adbfd382f63899b200a3170884f (diff) | |
download | nextcloud-server-a3206b4e975082216d143c79edf379703317da20.tar.gz nextcloud-server-a3206b4e975082216d143c79edf379703317da20.zip |
only show the max possible upload of 2GB on a 32 bit system.
for a 64 bit system we have no such limitation
refs #856
Conflicts:
apps/files/templates/admin.php
Diffstat (limited to 'apps')
-rw-r--r-- | apps/files/admin.php | 2 | ||||
-rw-r--r-- | apps/files/templates/admin.php | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/apps/files/admin.php b/apps/files/admin.php index 25645a4bcc9..f747f8645f6 100644 --- a/apps/files/admin.php +++ b/apps/files/admin.php @@ -57,6 +57,8 @@ $htaccessWritable=is_writable(OC::$SERVERROOT.'/.htaccess'); $tmpl = new OCP\Template( 'files', 'admin' ); $tmpl->assign( 'uploadChangable', $htaccessWorking and $htaccessWritable ); $tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize); +// max possible makes only sense on a 32 bit system +$tmpl->assign( 'displayMaxPossibleUploadSize', PHP_INT_SIZE===4); $tmpl->assign( 'maxPossibleUploadSize', OCP\Util::humanFileSize(PHP_INT_MAX)); $tmpl->assign( 'allowZipDownload', $allowZipDownload); $tmpl->assign( 'maxZipInputSize', $maxZipInputSize); diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php index 0de12edcba5..ad69b5519d9 100644 --- a/apps/files/templates/admin.php +++ b/apps/files/templates/admin.php @@ -6,7 +6,10 @@ <?php if($_['uploadChangable']):?> <label for="maxUploadSize"><?php echo $l->t( 'Maximum upload size' ); ?> </label> <input name='maxUploadSize' id="maxUploadSize" value='<?php echo $_['uploadMaxFilesize'] ?>'/> - (<?php echo $l->t('max. possible: '); echo $_['maxPossibleUploadSize'] ?>)<br/> + <?php if($_['displayMaxPossibleUploadSize']):?> + (<?php echo $l->t('max. possible: '); echo $_['maxPossibleUploadSize'] ?>) + <?php endif;?> + <br/> <?php endif;?> <input type="checkbox" name="allowZipDownload" id="allowZipDownload" value="1" title="<?php echo $l->t( 'Needed for multi-file and folder downloads.' ); ?>" |