Config file is more appropriate here
adjust default value
This commit is contained in:
parent
19bbb61b20
commit
7c815054c7
|
@ -35,16 +35,16 @@ if($_POST) {
|
||||||
}
|
}
|
||||||
if(isset($_POST['maxZipInputSize'])) {
|
if(isset($_POST['maxZipInputSize'])) {
|
||||||
$maxZipInputSize=$_POST['maxZipInputSize'];
|
$maxZipInputSize=$_POST['maxZipInputSize'];
|
||||||
OC_Preferences::setValue('', 'files', 'maxZipInputSize', OC_Helper::computerFileSize($maxZipInputSize));
|
OC_Config::setValue('maxZipInputSize', OC_Helper::computerFileSize($maxZipInputSize));
|
||||||
}
|
}
|
||||||
OC_Preferences::setValue('', 'files', 'allowZipDownload', isset($_POST['allowZipDownload']));
|
OC_Config::setValue('allowZipDownload', isset($_POST['allowZipDownload']));
|
||||||
}else{
|
}else{
|
||||||
$upload_max_filesize = OC_Helper::computerFileSize(ini_get('upload_max_filesize'));
|
$upload_max_filesize = OC_Helper::computerFileSize(ini_get('upload_max_filesize'));
|
||||||
$post_max_size = OC_Helper::computerFileSize(ini_get('post_max_size'));
|
$post_max_size = OC_Helper::computerFileSize(ini_get('post_max_size'));
|
||||||
$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
|
$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
|
||||||
$allowZipDownload = intval(OC_Preferences::getValue('', 'files', 'allowZipDownload', 1));
|
$maxZipInputSize = OC_Helper::humanfilesize(OC_Config::getValue('maxZipInputSize', OC_Helper::computerFileSize('800 MB')));
|
||||||
$maxZipInputSize = OC_Helper::humanfilesize(OC_Preferences::getValue('', 'files', 'maxZipInputSize', OC_Helper::computerFileSize('800 MB')));
|
|
||||||
}
|
}
|
||||||
|
$allowZipDownload = intval(OC_Config::getValue('allowZipDownload', true));
|
||||||
|
|
||||||
OC_App::setActiveNavigationEntry( "files_administration" );
|
OC_App::setActiveNavigationEntry( "files_administration" );
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
<?php if(!isset($_['readonly']) || !$_['readonly']) { ?><input type="checkbox" id="select_all" /><?php } ?>
|
<?php if(!isset($_['readonly']) || !$_['readonly']) { ?><input type="checkbox" id="select_all" /><?php } ?>
|
||||||
<span class='name'><?php echo $l->t( 'Name' ); ?></span>
|
<span class='name'><?php echo $l->t( 'Name' ); ?></span>
|
||||||
<span class='selectedActions'>
|
<span class='selectedActions'>
|
||||||
<?php if(OC_Preferences::getValue('', 'files', 'allowZipDownload', 1)) : ?>
|
<?php if(OC_Config::getValue('allowZipDownload', true)) : ?>
|
||||||
<a href="" title="<?php echo $l->t('Download')?>" class="download"><img class='svg' alt="Download" src="<?php echo image_path("core", "actions/download.svg"); ?>" /></a>
|
<a href="" title="<?php echo $l->t('Download')?>" class="download"><img class='svg' alt="Download" src="<?php echo image_path("core", "actions/download.svg"); ?>" /></a>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
<a href="" title="Share" class="share"><img class='svg' alt="Share" src="<?php echo image_path("core", "actions/share.svg"); ?>" /></a>
|
<a href="" title="Share" class="share"><img class='svg' alt="Share" src="<?php echo image_path("core", "actions/share.svg"); ?>" /></a>
|
||||||
|
@ -70,4 +70,4 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- config hints for javascript -->
|
<!-- config hints for javascript -->
|
||||||
<input type="hidden" name="allowZipDownload" id="allowZipDownload" value="<?php echo OC_Preferences::getValue('', 'files', 'allowZipDownload', 1); ?>" />
|
<input type="hidden" name="allowZipDownload" id="allowZipDownload" value="<?php echo intval(OC_Config::getValue('allowZipDownload', true)); ?>" />
|
|
@ -224,7 +224,7 @@ class OC_Files {
|
||||||
* @param files $files
|
* @param files $files
|
||||||
*/
|
*/
|
||||||
static function validateZipDownload($dir, $files) {
|
static function validateZipDownload($dir, $files) {
|
||||||
if(!OC_Preferences::getValue('', 'files', 'allowZipDownload', 1)) {
|
if(!OC_Config::getValue('allowZipDownload', true)) {
|
||||||
$l = new OC_L10N('files');
|
$l = new OC_L10N('files');
|
||||||
header("HTTP/1.0 409 Conflict");
|
header("HTTP/1.0 409 Conflict");
|
||||||
$tmpl = new OC_Template( '', 'error', 'user' );
|
$tmpl = new OC_Template( '', 'error', 'user' );
|
||||||
|
@ -239,7 +239,7 @@ class OC_Files {
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
$zipLimit = OC_Preferences::getValue('', 'files', 'maxZipInputSize', OC_Helper::computerFileSize('800 MB'));
|
$zipLimit = OC_Config::getValue('maxZipInputSize', OC_Helper::computerFileSize('800 MB'));
|
||||||
if($zipLimit > 0) {
|
if($zipLimit > 0) {
|
||||||
$totalsize = 0;
|
$totalsize = 0;
|
||||||
if(is_array($files)){
|
if(is_array($files)){
|
||||||
|
|
Loading…
Reference in New Issue