Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Nextcloud
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Nextcloud
Commits
e0e7c981
Commit
e0e7c981
authored
12 years ago
by
Thomas Müller
Browse files
Options
Downloads
Plain Diff
Merge pull request #1041 from owncloud/fixing-856-master
Fixing #856 master
parents
9dc5ea17
a3206b4e
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
apps/files/admin.php
+3
-4
3 additions, 4 deletions
apps/files/admin.php
apps/files/templates/admin.php
+4
-1
4 additions, 1 deletion
apps/files/templates/admin.php
with
7 additions
and
5 deletions
apps/files/admin.php
+
3
−
4
View file @
e0e7c981
...
...
@@ -30,11 +30,8 @@ OCP\User::checkAdminUser();
$htaccessWorking
=
(
getenv
(
'htaccessWorking'
)
==
'true'
);
$upload_max_filesize
=
OCP\Util
::
computerFileSize
(
ini_get
(
'upload_max_filesize'
));
$upload_max_filesize_possible
=
OCP\Util
::
computerFileSize
(
get_cfg_var
(
'upload_max_filesize'
));
$post_max_size
=
OCP\Util
::
computerFileSize
(
ini_get
(
'post_max_size'
));
$post_max_size_possible
=
OCP\Util
::
computerFileSize
(
get_cfg_var
(
'post_max_size'
));
$maxUploadFilesize
=
OCP\Util
::
humanFileSize
(
min
(
$upload_max_filesize
,
$post_max_size
));
$maxUploadFilesizePossible
=
OCP\Util
::
humanFileSize
(
min
(
$upload_max_filesize_possible
,
$post_max_size_possible
));
if
(
$_POST
&&
OC_Util
::
isCallRegistered
())
{
if
(
isset
(
$_POST
[
'maxUploadSize'
]))
{
if
((
$setMaxSize
=
OC_Files
::
setUploadLimit
(
OCP\Util
::
computerFileSize
(
$_POST
[
'maxUploadSize'
])))
!==
false
)
{
...
...
@@ -60,7 +57,9 @@ $htaccessWritable=is_writable(OC::$SERVERROOT.'/.htaccess');
$tmpl
=
new
OCP\Template
(
'files'
,
'admin'
);
$tmpl
->
assign
(
'uploadChangable'
,
$htaccessWorking
and
$htaccessWritable
);
$tmpl
->
assign
(
'uploadMaxFilesize'
,
$maxUploadFilesize
);
$tmpl
->
assign
(
'maxPossibleUploadSize'
,
$maxUploadFilesizePossible
);
// 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
);
return
$tmpl
->
fetchPage
();
This diff is collapsed.
Click to expand it.
apps/files/templates/admin.php
+
4
−
1
View file @
e0e7c981
...
...
@@ -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.'
);
?>
"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment