diff --git a/install/lib/class.FroxlorInstall.php b/install/lib/class.FroxlorInstall.php index d25eb691..1b4d1317 100644 --- a/install/lib/class.FroxlorInstall.php +++ b/install/lib/class.FroxlorInstall.php @@ -850,14 +850,16 @@ class FroxlorInstall { $content .= $this->_status_message('green', PHP_VERSION); } - // Check if magic_quotes_runtime is active - $content .= $this->_status_message('begin', $this->_lng['requirements']['phpmagic_quotes_runtime']); - if (get_magic_quotes_runtime()) { - // deactivate it - set_magic_quotes_runtime(false); - $content .= $this->_status_message('orange', $this->_lng['requirements']['not_true'] . "
". $this->_lng['requirements']['phpmagic_quotes_runtime_description']); - } else { - $content .= $this->_status_message('green', 'off'); + // Check if magic_quotes_runtime is active | get_magic_quotes_runtime() is always FALSE since 5.4 + if (version_compare("5.4.0", PHP_VERSION, "<")) { + $content .= $this->_status_message('begin', $this->_lng['requirements']['phpmagic_quotes_runtime']); + if (get_magic_quotes_runtime()) { + // deactivate it + set_magic_quotes_runtime(false); + $content .= $this->_status_message('orange', $this->_lng['requirements']['not_true'] . "
". $this->_lng['requirements']['phpmagic_quotes_runtime_description']); + } else { + $content .= $this->_status_message('green', 'off'); + } } // check for php_pdo and pdo_mysql diff --git a/lib/init.php b/lib/init.php index 2e2b9282..5b49db9a 100644 --- a/lib/init.php +++ b/lib/init.php @@ -121,27 +121,30 @@ $idna_convert = new idna_convert_wrapper(); /** * disable magic_quotes_runtime if enabled */ -if (get_magic_quotes_runtime()) { - // deactivate - set_magic_quotes_runtime(false); -} - -/** - * Reverse magic_quotes_gpc=on to have clean GPC data again - */ -if (get_magic_quotes_gpc()) { - $in = array(&$_GET, &$_POST, &$_COOKIE); - - while (list($k, $v) = each($in)) { - foreach ($v as $key => $val) { - if (!is_array($val)) { - $in[$k][$key] = stripslashes($val); - continue; - } - $in[] = & $in[$k][$key]; - } +// since 5.4 get_magic_quotes_runtime() and get_magic_quotes_gpc() return always FALSE +if (version_compare("5.4.0", PHP_VERSION, "<")) { + if (get_magic_quotes_runtime()) { + // deactivate + set_magic_quotes_runtime(false); + } + + /** + * Reverse magic_quotes_gpc=on to have clean GPC data again + */ + if (get_magic_quotes_gpc()) { + $in = array(&$_GET, &$_POST, &$_COOKIE); + + while (list($k, $v) = each($in)) { + foreach ($v as $key => $val) { + if (!is_array($val)) { + $in[$k][$key] = stripslashes($val); + continue; + } + $in[] = & $in[$k][$key]; + } + } + unset($in); } - unset($in); } /** diff --git a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php index 532cf4e4..212d3251 100644 --- a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php +++ b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php @@ -700,7 +700,7 @@ class lighttpd { Database::pexecute($alias_domains_stmt, array('domainid' => $domain['id'])); while (($alias_domain = $alias_domains_stmt->fetch(PDO::FETCH_ASSOC)) !== false) { - $alias_domain_name = ereg_replace('\.', '\.', $alias_domain['domain']); + $alias_domain_name = str_replace('.', '\.', $alias_domain['domain']); if ($alias_domain['iswildcarddomain'] == '1') { $server_string[] = '(?:^|\.)' . $alias_domain_name . '$';