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

Merge pull request #12646 from owncloud/remove-safe-magic-quotes 

Remove checks for safe mode and magic quotes
This commit is contained in:
Robin Appelman 2014-12-05 21:17:40 +01:00
parent 1be5a3ca89 ddcf2b84ec
commit e47f4758f2
3 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/base.php
View File

@ -481,10 +481,6 @@ class OC {
date_default_timezone_set('UTC'); date_default_timezone_set('UTC');
ini_set('arg_separator.output', '&'); ini_set('arg_separator.output', '&');
// try to switch magic quotes off.
if (get_magic_quotes_gpc() == 1) {
ini_set('magic_quotes_runtime', 0);
}
//try to configure php to enable big file uploads. //try to configure php to enable big file uploads.
//this doesn´t work always depending on the webserver and php configuration. //this doesn´t work always depending on the webserver and php configuration.
//Let´s try to overwrite some defaults anyways //Let´s try to overwrite some defaults anyways

2
lib/private/httphelper.php
View File

@ -72,7 +72,7 @@ class HTTPHelper {
curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyUserPwd); curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyUserPwd);
} }
if (ini_get('open_basedir') === '' && (ini_get('safe_mode') === false) || strtolower(ini_get('safe_mode')) === 'off') { if (ini_get('open_basedir') === '') {
curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
curl_setopt($curl, CURLOPT_MAXREDIRS, $max_redirects); curl_setopt($curl, CURLOPT_MAXREDIRS, $max_redirects);
$data = curl_exec($curl); $data = curl_exec($curl);

20
lib/private/util.php
View File

@ -613,26 +613,6 @@ class OC_Util {
); );
$webServerRestart = true; $webServerRestart = true;
} }
if (((strtolower(@ini_get('safe_mode')) == 'on')
|| (strtolower(@ini_get('safe_mode')) == 'yes')
|| (strtolower(@ini_get('safe_mode')) == 'true')
|| (ini_get("safe_mode") == 1))
) {
$errors[] = array(
'error' => $l->t('PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly.'),
'hint' => $l->t('PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. '
. 'Please ask your server administrator to disable it in php.ini or in your webserver config.')
);
$webServerRestart = true;
}
if (get_magic_quotes_gpc() == 1) {
$errors[] = array(
'error' => $l->t('Magic Quotes is enabled. ownCloud requires that it is disabled to work properly.'),
'hint' => $l->t('Magic Quotes is a deprecated and mostly useless setting that should be disabled. '
. 'Please ask your server administrator to disable it in php.ini or in your webserver config.')
);
$webServerRestart = true;
}
if (!self::isAnnotationsWorking()) { if (!self::isAnnotationsWorking()) {
$errors[] = array( $errors[] = array(
'error' => 'PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.', 'error' => 'PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.',