Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev

Browse source
This commit is contained in:
drigato 2015-10-21 11:01:20 -04:00
commit b98f573531
14 changed files with 111 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/forms/BillingClient.php
View file

@ -188,7 +188,7 @@ class Application_Form_BillingClient extends Zend_Form
$passwordVerify->addValidator($notEmptyValidator);
$this->addElement($passwordVerify);
$this->addElement('hash', 'csrf', array(
$this->addElement('hash', 'csrf_client', array(
'salt' => 'unique'
));

7
airtime_mvc/application/forms/BillingUpgradeDowngrade.php
View file

@ -3,12 +3,7 @@ class Application_Form_BillingUpgradeDowngrade extends Zend_Form
{
public function init()
{
$csrf_namespace = new Zend_Session_Namespace('csrf_namespace');
$csrf_element = new Zend_Form_Element_Hidden('csrf');
$csrf_element->setValue($csrf_namespace->authtoken)->setRequired('true')->removeDecorator('HtmlTag')->removeDecorator('Label');
$this->addElement($csrf_element);
$this->addElement('hash', 'csrf', array(
$this->addElement('hash', 'csrf_upgrade', array( //Needs a unique ID (csrf_upgrade) so it doesn't conflict with other tokens in subforms
'salt' => 'unique'
));