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

Merge pull request #11131 from owncloud/use-phpini-wrapper 

Replacing ini_get instances with inigetwrapper usages
This commit is contained in:
Thomas Müller 2015-12-07 10:20:59 +01:00
parent 0c3d97921f 728648ad77
commit f3d49a89fe
10 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/files/admin.php
View File

@ -30,9 +30,8 @@
OCP\User::checkAdminUser(); OCP\User::checkAdminUser();
$htaccessWorking=(getenv('htaccessWorking')=='true'); $htaccessWorking=(getenv('htaccessWorking')=='true');
$upload_max_filesize = OC::$server->getIniWrapper()->getBytes('upload_max_filesize');
$upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize')); $post_max_size = OC::$server->getIniWrapper()->getBytes('post_max_size');
$post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
$maxUploadFilesize = OCP\Util::humanFileSize(min($upload_max_filesize, $post_max_size)); $maxUploadFilesize = OCP\Util::humanFileSize(min($upload_max_filesize, $post_max_size));
if($_POST && OC_Util::isCallRegistered()) { if($_POST && OC_Util::isCallRegistered()) {
if(isset($_POST['maxUploadSize'])) { if(isset($_POST['maxUploadSize'])) {

2
apps/files/ajax/upload.php
View File

@ -114,7 +114,7 @@ foreach ($_FILES['files']['error'] as $error) {
$errors = array( $errors = array(
UPLOAD_ERR_OK => $l->t('There is no error, the file uploaded with success'), UPLOAD_ERR_OK => $l->t('There is no error, the file uploaded with success'),
UPLOAD_ERR_INI_SIZE => $l->t('The uploaded file exceeds the upload_max_filesize directive in php.ini: ') UPLOAD_ERR_INI_SIZE => $l->t('The uploaded file exceeds the upload_max_filesize directive in php.ini: ')
. ini_get('upload_max_filesize'), . OC::$server->getIniWrapper()->getNumeric('upload_max_filesize'),
UPLOAD_ERR_FORM_SIZE => $l->t('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'), UPLOAD_ERR_FORM_SIZE => $l->t('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'),
UPLOAD_ERR_PARTIAL => $l->t('The uploaded file was only partially uploaded'), UPLOAD_ERR_PARTIAL => $l->t('The uploaded file was only partially uploaded'),
UPLOAD_ERR_NO_FILE => $l->t('No file was uploaded'), UPLOAD_ERR_NO_FILE => $l->t('No file was uploaded'),

2
core/js/config.php
View File

@ -136,7 +136,7 @@ $array = array(
"firstDay" => json_encode($l->getFirstWeekDay()) , "firstDay" => json_encode($l->getFirstWeekDay()) ,
"oc_config" => json_encode( "oc_config" => json_encode(
array( array(
'session_lifetime' => min(\OCP\Config::getSystemValue('session_lifetime', ini_get('session.gc_maxlifetime')), ini_get('session.gc_maxlifetime')), 'session_lifetime' => min(\OCP\Config::getSystemValue('session_lifetime', OC::$server->getIniWrapper()->getNumeric('session.gc_maxlifetime')), OC::$server->getIniWrapper()->getNumeric('session.gc_maxlifetime')),
'session_keepalive' => \OCP\Config::getSystemValue('session_keepalive', true), 'session_keepalive' => \OCP\Config::getSystemValue('session_keepalive', true),
'version' => implode('.', OC_Util::getVersion()), 'version' => implode('.', OC_Util::getVersion()),
'versionstring' => OC_Util::getVersionString(), 'versionstring' => OC_Util::getVersionString(),

2
lib/private/files.php
View File

@ -115,7 +115,7 @@ class OC_Files {
self::lockFiles($view, $dir, $files); self::lockFiles($view, $dir, $files);
$streamer->sendHeaders($name); $streamer->sendHeaders($name);
$executionTime = intval(ini_get('max_execution_time')); $executionTime = intval(OC::$server->getIniWrapper()->getNumeric('max_execution_time'));
set_time_limit(0); set_time_limit(0);
if ($getType === self::ZIP_FILES) { if ($getType === self::ZIP_FILES) {
foreach ($files as $file) { foreach ($files as $file) {

12
lib/private/helper.php
View File

@ -441,7 +441,7 @@ class OC_Helper {
// Default check will be done with $path directories : // Default check will be done with $path directories :
$dirs = explode(PATH_SEPARATOR, $path); $dirs = explode(PATH_SEPARATOR, $path);
// WARNING : We have to check if open_basedir is enabled : // 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") { if ($obd != "none") {
$obd_values = explode(PATH_SEPARATOR, $obd); $obd_values = explode(PATH_SEPARATOR, $obd);
if (count($obd_values) > 0 and $obd_values[0]) { if (count($obd_values) > 0 and $obd_values[0]) {
@ -701,8 +701,9 @@ class OC_Helper {
* @return int PHP upload file size limit * @return int PHP upload file size limit
*/ */
public static function uploadLimit() { public static function uploadLimit() {
$upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize')); $ini = \OC::$server->getIniWrapper();
$post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size')); $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) { if ((int)$upload_max_filesize === 0 and (int)$post_max_size === 0) {
return INF; return INF;
} elseif ((int)$upload_max_filesize === 0 or (int)$post_max_size === 0) { } elseif ((int)$upload_max_filesize === 0 or (int)$post_max_size === 0) {
@ -722,12 +723,13 @@ class OC_Helper {
if (!function_exists($function_name)) { if (!function_exists($function_name)) {
return false; return false;
} }
$disabled = explode(',', ini_get('disable_functions')); $ini = \OC::$server->getIniWrapper();
$disabled = explode(',', $ini->get('disable_functions'));
$disabled = array_map('trim', $disabled); $disabled = array_map('trim', $disabled);
if (in_array($function_name, $disabled)) { if (in_array($function_name, $disabled)) {
return false; return false;
} }
$disabled = explode(',', ini_get('suhosin.executor.func.blacklist')); $disabled = explode(',', $ini->get('suhosin.executor.func.blacklist'));
$disabled = array_map('trim', $disabled); $disabled = array_map('trim', $disabled);
if (in_array($function_name, $disabled)) { if (in_array($function_name, $disabled)) {
return false; return false;

4
lib/private/memcache/apc.php
View File

@ -115,9 +115,9 @@ class APC extends Cache implements IMemcache {
static public function isAvailable() { static public function isAvailable() {
if (!extension_loaded('apc')) { if (!extension_loaded('apc')) {
return false; return false;
} elseif (!ini_get('apc.enabled')) { } elseif (!\OC::$server->getIniWrapper()->getBool('apc.enabled')) {
return false; return false;
} elseif (!ini_get('apc.enable_cli') && \OC::$CLI) { } elseif (!\OC::$server->getIniWrapper()->getBool('apc.enable_cli') && \OC::$CLI) {
return false; return false;
} else { } else {
return true; return true;

4
lib/private/memcache/apcu.php
View File

@ -28,9 +28,9 @@ class APCu extends APC {
static public function isAvailable() { static public function isAvailable() {
if (!extension_loaded('apcu')) { if (!extension_loaded('apcu')) {
return false; return false;
} elseif (!ini_get('apc.enabled')) { } elseif (!\OC::$server->getIniWrapper()->getBool('apc.enabled')) {
return false; return false;
} elseif (!ini_get('apc.enable_cli') && \OC::$CLI) { } elseif (!\OC::$server->getIniWrapper()->getBool('apc.enable_cli') && \OC::$CLI) {
return false; return false;
} elseif (version_compare(phpversion('apc'), '4.0.6') === -1) { } elseif (version_compare(phpversion('apc'), '4.0.6') === -1) {
return false; return false;

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

@ -118,13 +118,13 @@ class XCache extends Cache implements IMemcache {
if (\OC::$CLI && !getenv('XCACHE_TEST')) { if (\OC::$CLI && !getenv('XCACHE_TEST')) {
return false; return false;
} }
if (!function_exists('xcache_unset_by_prefix') && ini_get('xcache.admin.enable_auth')) { if (!function_exists('xcache_unset_by_prefix') && \OC::$server->getIniWrapper()->getBool('xcache.admin.enable_auth')) {
// We do not want to use XCache if we can not clear it without // We do not want to use XCache if we can not clear it without
// using the administration function xcache_clear_cache() // using the administration function xcache_clear_cache()
// AND administration functions are password-protected. // AND administration functions are password-protected.
return false; return false;
} }
$var_size = (int)ini_get('xcache.var_size'); $var_size = \OC::$server->getIniWrapper()->getNumeric('xcache.var_size');
if (!$var_size) { if (!$var_size) {
return false; return false;
} }

2
lib/private/tempmanager.php
View File

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

2
lib/private/util.php
View File

@ -1418,7 +1418,7 @@ class OC_Util {
} }
// XCache // XCache
if (function_exists('xcache_clear_cache')) { 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); \OCP\Util::writeLog('core', 'XCache opcode cache will not be cleared because "xcache.admin.enable_auth" is enabled.', \OCP\Util::WARN);
} else { } else {
@xcache_clear_cache(XC_TYPE_PHP, 0); @xcache_clear_cache(XC_TYPE_PHP, 0);