diff options
| author | mbi <knox@users.noreply.github.com> | 2015-12-08 21:02:52 +0100 |
|---|---|---|
| committer | mbi <knox@users.noreply.github.com> | 2015-12-08 21:02:52 +0100 |
| commit | 508c46a112d3d53b4b0668efcbe1403eb2e143b8 (patch) | |
| tree | 29ef86459abae1dcaadf75203851ab9b39ec43bd /lib/private/helper.php | |
| parent | 27f420e0a797f8a56b5e83e8dd8e19df289c766b (diff) | |
| parent | 13993c4a6db83c0a637fc7c20da0470acae47208 (diff) | |
| download | nextcloud-server-508c46a112d3d53b4b0668efcbe1403eb2e143b8.tar.gz nextcloud-server-508c46a112d3d53b4b0668efcbe1403eb2e143b8.zip | |
Merge branch 'master' into master
Diffstat (limited to 'lib/private/helper.php')
| -rw-r--r-- | lib/private/helper.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/private/helper.php b/lib/private/helper.php index 3cad77e6667..78a567638ef 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -441,7 +441,7 @@ class OC_Helper { // Default check will be done with $path directories : $dirs = explode(PATH_SEPARATOR, $path); // WARNING : We have to check if open_basedir is enabled : - $obd = ini_get('open_basedir'); + $obd = OC::$server->getIniWrapper()->getString('open_basedir'); if ($obd != "none") { $obd_values = explode(PATH_SEPARATOR, $obd); if (count($obd_values) > 0 and $obd_values[0]) { @@ -701,8 +701,9 @@ class OC_Helper { * @return int PHP upload file size limit */ public static function uploadLimit() { - $upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize')); - $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size')); + $ini = \OC::$server->getIniWrapper(); + $upload_max_filesize = OCP\Util::computerFileSize($ini->get('upload_max_filesize')); + $post_max_size = OCP\Util::computerFileSize($ini->get('post_max_size')); if ((int)$upload_max_filesize === 0 and (int)$post_max_size === 0) { return INF; } elseif ((int)$upload_max_filesize === 0 or (int)$post_max_size === 0) { @@ -722,12 +723,13 @@ class OC_Helper { if (!function_exists($function_name)) { return false; } - $disabled = explode(',', ini_get('disable_functions')); + $ini = \OC::$server->getIniWrapper(); + $disabled = explode(',', $ini->get('disable_functions')); $disabled = array_map('trim', $disabled); if (in_array($function_name, $disabled)) { return false; } - $disabled = explode(',', ini_get('suhosin.executor.func.blacklist')); + $disabled = explode(',', $ini->get('suhosin.executor.func.blacklist')); $disabled = array_map('trim', $disabled); if (in_array($function_name, $disabled)) { return false; |