summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorClark Tomlinson <fallen013@gmail.com>2014-09-17 10:07:32 -0400
committerMorris Jobke <hey@morrisjobke.de>2015-11-23 14:12:31 +0100
commit9caf4ffbfc2be077a1431149e77be485cd087081 (patch)
treee420a23bd67c20add4d1dda1e783d1c01024190a /lib
parentbf672d7e51bd3411130a3c3a41a931fb3d23ff68 (diff)
downloadnextcloud-server-9caf4ffbfc2be077a1431149e77be485cd087081.tar.gz
nextcloud-server-9caf4ffbfc2be077a1431149e77be485cd087081.zip
Replacing ini_get instances with inigetwrapper usages
Diffstat (limited to 'lib')
-rw-r--r--lib/private/files.php2
-rw-r--r--lib/private/helper.php2
-rw-r--r--lib/private/memcache/apc.php4
-rw-r--r--lib/private/memcache/apcu.php4
-rw-r--r--lib/private/memcache/xcache.php2
5 files changed, 7 insertions, 7 deletions
diff --git a/lib/private/files.php b/lib/private/files.php
index af10f3e1e32..1cda28496cb 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -115,7 +115,7 @@ class OC_Files {
self::lockFiles($view, $dir, $files);
$streamer->sendHeaders($name);
- $executionTime = intval(ini_get('max_execution_time'));
+ $executionTime = intval(OC::$server->getIniWrapper()->getNumeric('max_execution_time'));
set_time_limit(0);
if ($getType === self::ZIP_FILES) {
foreach ($files as $file) {
diff --git a/lib/private/helper.php b/lib/private/helper.php
index ee2f520fe2b..3bb81fba603 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -462,7 +462,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]) {
diff --git a/lib/private/memcache/apc.php b/lib/private/memcache/apc.php
index f768cdc1c6e..e38b4bd3a39 100644
--- a/lib/private/memcache/apc.php
+++ b/lib/private/memcache/apc.php
@@ -115,9 +115,9 @@ class APC extends Cache implements IMemcache {
static public function isAvailable() {
if (!extension_loaded('apc')) {
return false;
- } elseif (!ini_get('apc.enabled')) {
+ } elseif (!\OC::$server->getIniWrapper()->getBool('apc.enabled')) {
return false;
- } elseif (!ini_get('apc.enable_cli') && \OC::$CLI) {
+ } elseif (!\OC::$server->getIniWrapper()->getBool('apc.enable_cli') && \OC::$CLI) {
return false;
} else {
return true;
diff --git a/lib/private/memcache/apcu.php b/lib/private/memcache/apcu.php
index 9a8da2ae60c..84147233ef0 100644
--- a/lib/private/memcache/apcu.php
+++ b/lib/private/memcache/apcu.php
@@ -28,9 +28,9 @@ class APCu extends APC {
static public function isAvailable() {
if (!extension_loaded('apcu')) {
return false;
- } elseif (!ini_get('apc.enabled')) {
+ } elseif (!\OC::$server->getIniWrapper()->getBool('apc.enabled')) {
return false;
- } elseif (!ini_get('apc.enable_cli') && \OC::$CLI) {
+ } elseif (!\OC::$server->getIniWrapper()->getBool('apc.enable_cli') && \OC::$CLI) {
return false;
} elseif (version_compare(phpversion('apc'), '4.0.6') === -1) {
return false;
diff --git a/lib/private/memcache/xcache.php b/lib/private/memcache/xcache.php
index a6265ed5622..f1f932ba2c0 100644
--- a/lib/private/memcache/xcache.php
+++ b/lib/private/memcache/xcache.php
@@ -118,7 +118,7 @@ class XCache extends Cache implements IMemcache {
if (\OC::$CLI && !getenv('XCACHE_TEST')) {
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
// using the administration function xcache_clear_cache()
// AND administration functions are password-protected.