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

Better solution for upgrade problems (SAAS-1133)

This commit is contained in:
Albert Santoni 2015-10-20 14:52:17 -04:00
parent 9d4cc6c205
commit 885f47c20e
3 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
airtime_mvc/application/forms/BillingClient.php
View File

@ -188,17 +188,9 @@ class Application_Form_BillingClient extends Zend_Form
$passwordVerify->addValidator($notEmptyValidator); $passwordVerify->addValidator($notEmptyValidator);
$this->addElement($passwordVerify); $this->addElement($passwordVerify);
/* $this->addElement('hash', 'csrf_client', array(
$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(
'salt' => 'unique' 'salt' => 'unique'
)); ));
*/
$submit = new Zend_Form_Element_Submit("submit"); $submit = new Zend_Form_Element_Submit("submit");
$submit->setIgnore(true) $submit->setIgnore(true)

9
airtime_mvc/application/forms/BillingUpgradeDowngrade.php
View File

@ -3,16 +3,9 @@ class Application_Form_BillingUpgradeDowngrade extends Zend_Form
{ {
public function init() public function init()
{ {
/* $this->addElement('hash', 'csrf_upgrade', array( //Needs a unique ID (csrf_upgrade) so it doesn't conflict with other tokens in subforms
$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(
'salt' => 'unique' 'salt' => 'unique'
)); ));
*/
$productPrices = array(); $productPrices = array();
$productTypes = array(); $productTypes = array();

5
airtime_mvc/application/views/scripts/billing/upgrade.phtml
View File

@ -274,7 +274,7 @@ echo($currentProduct["name"]);
<form id="<?php echo $form->getId(); ?>" method="<?php echo $form->getMethod() ?>" action="<?php echo <form id="<?php echo $form->getId(); ?>" method="<?php echo $form->getMethod() ?>" action="<?php echo
$form->getAction()?>" enctype="<?php echo $form->getEncType();?>"> $form->getAction()?>" enctype="<?php echo $form->getEncType();?>">
<?php echo $form->csrf ?> <?php echo $form->csrf_upgrade ?>
<div id="plantype"> <div id="plantype">
<?php echo $form->newproductid ?> <?php echo $form->newproductid ?>
@ -353,6 +353,7 @@ echo($currentProduct["name"]);
<div id="vaterror"></div> <div id="vaterror"></div>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
<?php echo $billingForm->csrf_client ?>
<div> <div>
<div class="billing_checkbox"> <div class="billing_checkbox">
@ -379,7 +380,7 @@ echo($currentProduct["name"]);
<b>Total:</b> <span id="total"></span> <b>Total:</b> <span id="total"></span>
</div> </div>
<input type="submit" class="btn right-floated" value="Submit Order" id="atpro_submitorder"></input> <input type="submit" class="btn right-floated" value="Submit Order" id="atpro_submitorder">
<div class="clearfix"></div> <div class="clearfix"></div>
</form> </form>
</div> </div>