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

Merge branch 'saas-dev' into saas-dev-publishing

Browse source 
Conflicts:
	airtime_mvc/application/controllers/plugins/PageLayoutInitPlugin.php
	airtime_mvc/public/css/dashboard.css
	airtime_mvc/public/js/airtime/library/spl.js
This commit is contained in:
Duncan Sommerville 2015-10-29 11:21:24 -04:00
commit 95aae317c6
26 changed files with 189 additions and 63 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'
));

20
airtime_mvc/application/forms/EditAudioMD.php
View file

@ -179,6 +179,26 @@ class Application_Form_EditAudioMD extends Zend_Form
));
$this->addElement($language);
$validCuePattern = '/^(?:[0-9]{1,2}:)?(?:[0-9]{1,2}:)?[0-9]{1,6}(\.\d{1,6})?$/';
$cueIn = new Zend_Form_Element_Text('cuein');
$cueIn->class = 'input_text';
$cueIn->setLabel("Cue In:");
$cueInValidator = Application_Form_Helper_ValidationTypes::overrideRegexValidator(
$validCuePattern, _(sprintf("Specify cue in time in the format %s", "(hh:mm:)ss(.dddddd)"))
);
$cueIn->setValidators(array($cueInValidator));
$this->addElement($cueIn);
$cueOut = new Zend_Form_Element_Text('cueout');
$cueOut->class = 'input_text';
$cueOut->setLabel('Cue Out:');
$cueOutValidator = Application_Form_Helper_ValidationTypes::overrideRegexValidator(
$validCuePattern, _(sprintf("Specify cue out time in the format %s", "(hh:mm:)ss(.dddddd)"))
);
$cueOut->setValidators(array($cueOutValidator));
$this->addElement($cueOut);
// Add the submit button
$this->addElement('button', 'editmdsave', array(
'ignore' => true,