Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PSDI Army
yii2
Commits
ce04134d
Commit
ce04134d
authored
Jan 27, 2014
by
Carsten Brandt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed getPostParam() from Request, body is $_POST by default
fixes #2093
parent
190417f9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
47 deletions
+4
-47
Request.php
framework/web/Request.php
+4
-47
No files found.
framework/web/Request.php
View file @
ce04134d
...
@@ -344,6 +344,9 @@ class Request extends \yii\base\Request
...
@@ -344,6 +344,9 @@ class Request extends \yii\base\Request
throw
new
InvalidConfigException
(
"The fallback request parser is invalid. It must implement the yii
\\
web
\\
RequestParserInterface."
);
throw
new
InvalidConfigException
(
"The fallback request parser is invalid. It must implement the yii
\\
web
\\
RequestParserInterface."
);
}
}
$this
->
_bodyParams
=
$parser
->
parse
(
$this
->
getRawBody
(),
$contentType
);
$this
->
_bodyParams
=
$parser
->
parse
(
$this
->
getRawBody
(),
$contentType
);
}
elseif
(
$this
->
getMethod
()
===
'POST'
)
{
// PHP has already parsed the body so we have all params in $_POST
$this
->
_bodyParams
=
$_POST
;
}
else
{
}
else
{
$this
->
_bodyParams
=
[];
$this
->
_bodyParams
=
[];
mb_parse_str
(
$this
->
getRawBody
(),
$this
->
_bodyParams
);
mb_parse_str
(
$this
->
getRawBody
(),
$this
->
_bodyParams
);
...
@@ -411,7 +414,6 @@ class Request extends \yii\base\Request
...
@@ -411,7 +414,6 @@ class Request extends \yii\base\Request
* @param string $name the GET parameter name. If not specified, whole $_GET is returned.
* @param string $name the GET parameter name. If not specified, whole $_GET is returned.
* @param mixed $defaultValue the default parameter value if the GET parameter does not exist.
* @param mixed $defaultValue the default parameter value if the GET parameter does not exist.
* @return mixed the GET parameter value
* @return mixed the GET parameter value
* @see getPostParam()
* @see getBodyParam()
* @see getBodyParam()
*/
*/
public
function
getQueryParam
(
$name
,
$defaultValue
=
null
)
public
function
getQueryParam
(
$name
,
$defaultValue
=
null
)
...
@@ -420,51 +422,6 @@ class Request extends \yii\base\Request
...
@@ -420,51 +422,6 @@ class Request extends \yii\base\Request
return
isset
(
$params
[
$name
])
?
$params
[
$name
]
:
$defaultValue
;
return
isset
(
$params
[
$name
])
?
$params
[
$name
]
:
$defaultValue
;
}
}
private
$_postParams
;
/**
* Returns the POST request parameters.
*
* This method will return the contents of `$_POST` if params where not explicitly set.
* @return array the request POST parameter values.
* @see setPostParams()
* @see getPostParam()
*/
public
function
getPostParams
()
{
if
(
$this
->
_postParams
===
null
)
{
return
$_POST
;
}
return
$this
->
_postParams
;
}
/**
* Sets the request POST parameters.
* @param array $values the request POST parameters (name-value pairs)
* @see getPostParam()
* @see getPostParams()
*/
public
function
setPostParams
(
$values
)
{
$this
->
_postParams
=
$values
;
}
/**
* Returns the named POST parameter value.
* If the POST parameter does not exist, the second parameter to this method will be returned.
* @param string $name the POST parameter name. If not specified, whole $_POST is returned.
* @param mixed $defaultValue the default parameter value if the POST parameter does not exist.
* @property array the POST request parameter values
* @return mixed the POST parameter value
* @see getQueryParam()
* @see getBodyParam() for request method independent body parameters.
*/
public
function
getPostParam
(
$name
,
$defaultValue
=
null
)
{
$params
=
$this
->
getPostParams
();
return
isset
(
$params
[
$name
])
?
$params
[
$name
]
:
$defaultValue
;
}
private
$_hostInfo
;
private
$_hostInfo
;
/**
/**
...
@@ -1204,7 +1161,7 @@ class Request extends \yii\base\Request
...
@@ -1204,7 +1161,7 @@ class Request extends \yii\base\Request
return
true
;
return
true
;
}
}
$trueToken
=
$this
->
getCookies
()
->
getValue
(
$this
->
csrfVar
);
$trueToken
=
$this
->
getCookies
()
->
getValue
(
$this
->
csrfVar
);
$token
=
$
method
===
'POST'
?
$this
->
getPostParam
(
$this
->
csrfVar
)
:
$
this
->
getBodyParam
(
$this
->
csrfVar
);
$token
=
$this
->
getBodyParam
(
$this
->
csrfVar
);
return
$this
->
validateCsrfTokenInternal
(
$token
,
$trueToken
)
return
$this
->
validateCsrfTokenInternal
(
$token
,
$trueToken
)
||
$this
->
validateCsrfTokenInternal
(
$this
->
getCsrfTokenFromHeader
(),
$trueToken
);
||
$this
->
validateCsrfTokenInternal
(
$this
->
getCsrfTokenFromHeader
(),
$trueToken
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment