tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-29 16:54:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Implement dynamic form elements

Browse Source 
Rename "isPostAndValid" to "isSubmittedAndValid" and refactor it.
Add possibility for specific form elements to auto-submit their form.

refs #4439
This commit is contained in:
Johannes Meyer 2013-08-02 16:35:16 +02:00 committed by Jannis Moßhammer
parent 1b9885f274
commit f5162189dd
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/AuthenticationController.php
View File

@ -98,4 +98,4 @@ class AuthenticationController extends ActionController
} }
} }
// @codingStandardsIgnoreEnd // @codingStandardsIgnoreEnd

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

@ -295,8 +295,12 @@ abstract class Form extends Zend_Form
if ($submitted) { if ($submitted) {
$this->preValidation($checkData); $this->preValidation($checkData);
return $this->isValid($checkData);
} else {
$this->populate($checkData);
return false;
} }
return parent::isValid($checkData) && $submitted;
} }
/** /**
@ -373,8 +377,6 @@ abstract class Form extends Zend_Form
return false; return false;
} }
$seed -= intval(time() / $this->tokenTimeout) * $this->tokenTimeout;
return $token === hash('sha256', $this->getSessionId() . $seed); return $token === hash('sha256', $this->getSessionId() . $seed);
} }
@ -386,7 +388,6 @@ abstract class Form extends Zend_Form
{ {
$seed = mt_rand(); $seed = mt_rand();
$hash = hash('sha256', $this->getSessionId() . $seed); $hash = hash('sha256', $this->getSessionId() . $seed);
$seed += intval(time() / $this->tokenTimeout) * $this->tokenTimeout;
return array($seed, $hash); return array($seed, $hash);
} }