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

QuickForm: improve REST API support 

refs #486
This commit is contained in:
Thomas Gelf 2017-07-06 15:08:34 +02:00
parent 53db1674d8
commit e562d00a50
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
library/Director/Web/Form/QuickForm.php
View File

@ -158,6 +158,9 @@ abstract class QuickForm extends QuickBaseForm
protected function createIdElement()
{
if ($this->isApiRequest()) {
return $this;
}
$this->detectName();
$this->addHidden(self::ID, $this->getName());
$this->getElement(self::ID)->setIgnore(true);
@ -197,11 +200,24 @@ abstract class QuickForm extends QuickBaseForm
public function isApiRequest()
{
return $this->isApiRequest || $this->getRequest()->isApiRequest();
if ($this->isApiRequest === null) {
if ($this->request === null) {
throw new ProgrammingError(
'Early acess to isApiRequest(). This is not possible, sorry'
);
}
return $this->getRequest()->isApiRequest();
} else {
return $this->isApiRequest;
}
}
public function regenerateCsrfToken()
{
if ($this->isApiRequest()) {
return $this;
}
if (! $element = $this->getElement(self::CSRF)) {
$this->addHidden(self::CSRF, CsrfToken::generate());
$element = $this->getElement(self::CSRF);
@ -264,6 +280,9 @@ abstract class QuickForm extends QuickBaseForm
{
if ($this->hasBeenSubmitted === null) {
$req = $this->getRequest();
if ($req->isApiRequest()) {
return $this->hasBeenSubmitted = true;
}
if ($req->isPost()) {
if (! $this->hasSubmitButton()) {
return $this->hasBeenSubmitted = $this->hasBeenSent();
@ -479,7 +498,9 @@ abstract class QuickForm extends QuickBaseForm
$req = $this->request;
}
if ($req->isPost()) {
if ($req->isApiRequest()) {
$this->hasBeenSent = true;
} elseif ($req->isPost()) {
$post = $req->getPost();
$this->hasBeenSent = array_key_exists(self::ID, $post) &&
$post[self::ID] === $this->getName();