[Pkg-owncloud-commits] [owncloud] 253/394: 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

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v4.5.10
in repository owncloud.

commit 2cb5123dad7867e09f1282f1dcf2cc921ca57d55
Author: Thomas Mueller <thomas.mueller at tmit.eu>
Date:   Fri Dec 28 21:57:05 2012 +0100

    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
---
 apps/files/admin.php           |    2 ++
 apps/files/templates/admin.php |    6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/files/admin.php b/apps/files/admin.php
index 0f5b3d1..3662288 100644
--- a/apps/files/admin.php
+++ b/apps/files/admin.php
@@ -56,6 +56,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 5869ed2..2f82a89 100644
--- a/apps/files/templates/admin.php
+++ b/apps/files/templates/admin.php
@@ -4,7 +4,11 @@
 	<fieldset class="personalblock">
 		<legend><strong><?php echo $l->t('File handling');?></strong></legend>
 		<?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/>
+			<label for="maxUploadSize"><?php echo $l->t( 'Maximum upload size' ); ?> </label><input name='maxUploadSize' id="maxUploadSize" value='<?php echo $_['uploadMaxFilesize'] ?>'/>
+			<?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.' ); ?>"<?php if ($_['allowZipDownload']) echo ' checked="checked"'; ?> /> <label for="allowZipDownload"><?php echo $l->t( 'Enable ZIP-download' ); ?></label> <br/>
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git