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/Bootstrap.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
This commit is contained in:
Duncan Sommerville 2015-10-19 16:18:19 -04:00
commit 12f6536e74
32 changed files with 4672 additions and 326 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -188,6 +188,10 @@ class Application_Form_BillingClient extends Zend_Form
$passwordVerify->addValidator($notEmptyValidator);
$this->addElement($passwordVerify);
$this->addElement('hash', 'csrf', array(
'salt' => 'unique'
));
$submit = new Zend_Form_Element_Submit("submit");
$submit->setIgnore(true)
->setLabel(_pro("Save"));

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

@ -8,6 +8,10 @@ class Application_Form_BillingUpgradeDowngrade extends Zend_Form
$csrf_element->setValue($csrf_namespace->authtoken)->setRequired('true')->removeDecorator('HtmlTag')->removeDecorator('Label');
$this->addElement($csrf_element);
$this->addElement('hash', 'csrf', array(
'salt' => 'unique'
));
$productPrices = array();
$productTypes = array();
list($productPrices, $productTypes) = Billing::getProductPricesAndTypes();

6
airtime_mvc/application/forms/EditUser.php
View file

@ -118,12 +118,12 @@ class Application_Form_EditUser extends Zend_Form
$locale = new Zend_Form_Element_Select("cu_locale");
$locale->setLabel(_("Language:"));
$locale->setMultiOptions(Application_Model_Locale::getLocales());
$locale->setValue(Application_Model_Preference::GetUserLocale($currentUserId));
$locale->setValue(Application_Model_Preference::GetUserLocale());
$locale->setDecorators(array('ViewHelper'));
$this->addElement($locale);
$stationTz = Application_Model_Preference::GetTimezone($currentUserId);
$userTz = Application_Model_Preference::GetUserTimezone($currentUserId);
$stationTz = Application_Model_Preference::GetDefaultTimezone();
$userTz = Application_Model_Preference::GetUserTimezone();
$timezone = new Zend_Form_Element_Select("cu_timezone");
$timezone->setLabel(_("Interface Timezone:"));