mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace new occurences of ini_get with IniWrapper methods

This commit is contained in:
Morris Jobke 2015-10-29 09:52:13 +01:00
parent 9caf4ffbfc
commit 728648ad77
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/private/helper.php
View File

@ -753,8 +753,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) {
@ -774,12 +775,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;

2
lib/private/memcache/xcache.php
View File

@ -124,7 +124,7 @@ class XCache extends Cache implements IMemcache {
// AND administration functions are password-protected.
return false;
}
$var_size = (int)ini_get('xcache.var_size');
$var_size = \OC::$server->getIniWrapper()->getNumeric('xcache.var_size');
if (!$var_size) {
return false;
}

2
lib/private/tempmanager.php
View File

@ -213,7 +213,7 @@ class TempManager implements ITempManager {
if ($temp = $this->config->getSystemValue('tempdirectory', null)) {
$directories[] = $temp;
}
if ($temp = ini_get('upload_tmp_dir')) {
if ($temp = \OC::$server->getIniWrapper()->get('upload_tmp_dir')) {
$directories[] = $temp;
}
if ($temp = getenv('TMP')) {

2
lib/private/util.php
View File

@ -1415,7 +1415,7 @@ class OC_Util {
}
// XCache
if (function_exists('xcache_clear_cache')) {
if (ini_get('xcache.admin.enable_auth')) {
if (\OC::$server->getIniWrapper()->getBool('xcache.admin.enable_auth')) {
\OCP\Util::writeLog('core', 'XCache opcode cache will not be cleared because "xcache.admin.enable_auth" is enabled.', \OCP\Util::WARN);
} else {
@xcache_clear_cache(XC_TYPE_PHP, 0);