adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changing the direct access of super globals in Cake/Network/CakeRequest.php to use env() and fixed a typo.

Browse source
This commit is contained in:
Florian Krämer 2014-11-29 03:04:07 +01:00
parent 43f7fcc735
commit e7f554cba7
1 changed files with 7 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lib/Cake/Network/CakeRequest.php
View file

@ -519,20 +519,7 @@ class CakeRequest implements ArrayAccess {
} }
/** /**
* Gets the accept header from the current request. * Detects if a URL extension is present.
*
* @return bool Returns an array of accept header values.
*/
public function getAcceptHeaders() {
$headers = array();
if (isset($_SERVER['HTTP_ACCEPT'])) {
$headers = explode(',', $_SERVER['HTTP_ACCEPT']);
}
return $headers;
}
/**
* Detects if an URL extension is present.
* *
* @param array $detect Detector options array. * @param array $detect Detector options array.
* @return bool Whether or not the request is the type you are checking. * @return bool Whether or not the request is the type you are checking.
@ -554,7 +541,7 @@ class CakeRequest implements ArrayAccess {
* @return bool Whether or not the request is the type you are checking. * @return bool Whether or not the request is the type you are checking.
*/ */
protected function _acceptHeaderDetector($detect) { protected function _acceptHeaderDetector($detect) {
$acceptHeaders = $this->getAcceptHeaders(); $acceptHeaders = explode(',', (string)env('HTTP_ACCEPT'));
foreach ($detect['accept'] as $header) { foreach ($detect['accept'] as $header) {
if (in_array($header, $acceptHeaders)) { if (in_array($header, $acceptHeaders)) {
return true; return true;
@ -571,12 +558,12 @@ class CakeRequest implements ArrayAccess {
*/ */
protected function _headerDetector($detect) { protected function _headerDetector($detect) {
foreach ($detect['header'] as $header => $value) { foreach ($detect['header'] as $header => $value) {
$header = 'HTTP_' . strtoupper($header); $header = env('HTTP_' . strtoupper($header));
if (isset($_SERVER[$header])) { if (!is_null($header)) {
if (is_callable($value)) { if (!is_string($value) && !is_bool($value) && is_callable($value)) {
return call_user_func($value, $_SERVER[$header]); return call_user_func($value, $header);
} }
return ($_SERVER[$header] === $value); return ($header === $value);
} }
} }
return false; return false;