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

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

Browse source
This commit is contained in:
Albert Santoni 2015-01-27 12:14:24 -05:00
commit f93bc85f67
4 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/cloud_storage/Amazon_S3StorageBackend.php
View file

@ -10,7 +10,7 @@ class Amazon_S3StorageBackend extends StorageBackend
private $s3Client;
public function Amazon_S3($securityCredentials)
public function Amazon_S3StorageBackend($securityCredentials)
{
$this->setBucket($securityCredentials['bucket']);
$this->setAccessKey($securityCredentials['api_key']);

2
airtime_mvc/application/cloud_storage/ProxyStorageBackend.php
View file

@ -25,7 +25,7 @@ class ProxyStorageBackend extends StorageBackend
//the name of the class that implements it (eg. Amazon_S3), so we
//can easily create the right backend object dynamically:
if ($storageBackend == "amazon_S3") {
$this->storageBackend = new Amazon_S3StorageBackend($CC_CONFIG["Amazon_S3"]);
$this->storageBackend = new Amazon_S3StorageBackend($CC_CONFIG["amazon_S3"]);
} else if ($storageBackend == "file") {
$this->storageBackend = new FileStorageBackend();
} else {

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

@ -29,8 +29,8 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
$transition_fade = new Zend_Form_Element_Text("transition_fade");
$transition_fade->setLabel(_("Switch Transition Fade (s)"))
->setFilters(array('StringTrim'))
->addValidator('regex', false, array('/^[0-9]{1,2}(\.\d{1,3})?$/',
'messages' => _('enter a time in seconds 0{.000}')))
->addValidator('regex', false, array('/^\d*(\.\d+)?$/',
'messages' => _('Please enter a time in seconds (eg. 0.5)')))
->setValue($defaultFade)
->setDecorators(array('ViewHelper'));
$this->addElement($transition_fade);