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

Merge branch 'saas-sessionoptimizations' into saas-3.x-sessionoptimizations

Browse source 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/controllers/LoginController.php
	airtime_mvc/application/controllers/UserController.php
	airtime_mvc/public/js/airtime/preferences/preferences.js
This commit is contained in:
Albert Santoni 2015-09-29 18:58:55 -04:00
commit 8b33acacd3
19 changed files with 395 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

10
airtime_mvc/application/controllers/BillingController.php
View file

@ -28,7 +28,10 @@ class BillingController extends Zend_Controller_Action {
$baseUrl = Application_Common_OsPath::getBaseDir();
$this->view->headLink()->appendStylesheet($baseUrl.'css/billing.css?'.$CC_CONFIG['airtime_version']);
Billing::ensureClientIdIsValid();
//Zend's CSRF token element requires the session to be open for writing
SessionHelper::reopenSessionForWriting();
$request = $this->getRequest();
$form = new Application_Form_BillingUpgradeDowngrade();
@ -224,7 +227,10 @@ class BillingController extends Zend_Controller_Action {
$CC_CONFIG = Config::getConfig();
$baseUrl = Application_Common_OsPath::getBaseDir();
$this->view->headLink()->appendStylesheet($baseUrl.'css/billing.css?'.$CC_CONFIG['airtime_version']);
//Zend's CSRF token element requires the session to be open for writing
SessionHelper::reopenSessionForWriting();
$request = $this->getRequest();
$form = new Application_Form_BillingClient();
Billing::ensureClientIdIsValid();