eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-19 22:16:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #3734 from nextcloud/enh/noid/add-json-decode-and-encode

Browse source
This commit is contained in:
Simon L 2023-11-15 22:57:32 +01:00 • committed by GitHub
commit ea5965c149
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
php/src/Data/ConfigurationManager.php
View file

@ -12,7 +12,7 @@ class ConfigurationManager
if(file_exists(DataConst::GetConfigFile())) if(file_exists(DataConst::GetConfigFile()))
{ {
$configContent = file_get_contents(DataConst::GetConfigFile()); $configContent = file_get_contents(DataConst::GetConfigFile());
return json_decode($configContent, true); return json_decode($configContent, true, 512, JSON_THROW_ON_ERROR);
} }
return []; return [];
@ -514,7 +514,7 @@ class ConfigurationManager
throw new InvalidSettingConfigurationException(DataConst::GetDataDirectory() . " does not exist! Something was set up falsely!"); throw new InvalidSettingConfigurationException(DataConst::GetDataDirectory() . " does not exist! Something was set up falsely!");
} }
$df = disk_free_space(DataConst::GetDataDirectory()); $df = disk_free_space(DataConst::GetDataDirectory());
$content = json_encode($config, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT); $content = json_encode($config, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT|JSON_THROW_ON_ERROR);
$size = strlen($content) + 10240; $size = strlen($content) + 10240;
if ($df !== false && (int)$df < $size) { if ($df !== false && (int)$df < $size) {
throw new InvalidSettingConfigurationException(DataConst::GetDataDirectory() . " does not have enough space for writing the config file! Not writing it back!"); throw new InvalidSettingConfigurationException(DataConst::GetDataDirectory() . " does not have enough space for writing the config file! Not writing it back!");