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

Revert "Form: Process request parameter _frameUpload" 

This reverts commit fc481e527b.
This commit is contained in:
Sukhwinder Dhillon 2022-04-29 12:55:29 +02:00 committed by Johannes Meyer
parent e4450e7368
commit a38d5ccac6
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/layouts/scripts/wrapped.phtml
View File

@ -1,10 +0,0 @@
<html>
<head>
<?php if (isset($this->layout()->redirectUrl)): ?>
<meta name="redirectUrl" content="<?= $this->layout()->redirectUrl; ?>">
<?php endif ?>
</head>
<body>
<?= $this->render('inline.phtml'); ?>
</body>
</html>

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

@ -1168,9 +1168,6 @@ class Form extends Zend_Form
|| $this->getUidDisabled()
|| $this->wasSent($formData)
) {
if (($frameUpload = (bool) $request->getUrl()->shift('_frameUpload', false))) {
$this->getView()->layout()->setLayout('wrapped');
}
$this->populate($formData); // Necessary to get isSubmitted() to work
if (! $this->getSubmitLabel() || $this->isSubmitted()) {
if ($this->isValid($formData)
@ -1192,10 +1189,8 @@ class Form extends Zend_Form
$this->getResponse()->json()
->setSuccessData($message !== null ? array('message' => $message) : null)
->sendResponse();
} elseif (! $frameUpload) {
$this->getResponse()->redirectAndExit($this->getRedirectUrl());
} else {
$this->getView()->layout()->redirectUrl = $this->getRedirectUrl()->getAbsoluteUrl();
$this->getResponse()->redirectAndExit($this->getRedirectUrl());
}
// TODO: Still bad. An api target must not behave as one if it's not an api request
} elseif ($this->getIsApiTarget() || $this->getRequest()->isApiRequest()) {