tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Access formdata internally using a public helper method 

This way concrete form implementations can also simply fetch form
dependent request values without referring to the form's submission
method.

refs #5525
This commit is contained in:
Johannes Meyer 2014-08-27 10:19:33 +02:00
parent 65dd3f9a5b
commit d3c2fc858c
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
library/Icinga/Web/Form.php
View File

@ -361,7 +361,7 @@ class Form extends Zend_Form
*
* @param Request $request The request to be processed
*
* @return self
* @return Request The request supposed to be processed
*/
public function handleRequest(Request $request = null)
{
@ -369,26 +369,24 @@ class Form extends Zend_Form
$request = $this->getRequest();
}
if (strtolower($request->getMethod()) === $this->getMethod()) {
$formData = $request->{'get' . $request->isPost() ? 'Post' : 'Query'}();
if ($this->wasSent($formData)) {
$this->populate($formData); // Necessary to get isSubmitted() to work
if ($this->isSubmitted()) {
if ($this->isValid($formData)) {
if ($this->onSuccess($request)) {
$this->getResponse()->redirectAndExit($this->getRedirectUrl());
}
} else {
$this->onFailure($request);
$formData = $this->getRequestData($request);
if ($this->wasSent($formData)) {
$this->populate($formData); // Necessary to get isSubmitted() to work
if ($this->isSubmitted()) {
if ($this->isValid($formData)) {
if ($this->onSuccess($request)) {
$this->getResponse()->redirectAndExit($this->getRedirectUrl());
}
} else {
// The form can't be processed but we want to show validation errors though
$this->isValidPartial($formData);
$this->onFailure($request);
}
} else {
// The form can't be processed but we want to show validation errors though
$this->isValidPartial($formData);
}
}
return $this;
return $request;
}
/**
@ -509,6 +507,22 @@ class Form extends Zend_Form
return $name;
}
/**
* Return the request data based on this form's request method
*
* @param Request $request The request to fetch the data from
*
* @return array
*/
public function getRequestData(Request $request)
{
if (strtolower($request->getMethod()) === $this->getMethod()) {
return $request->{'get' . ($request->isPost() ? 'Post' : 'Query')}();
}
return array();
}
/**
* Return the current request
*