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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
Martin Konecny 2011-10-12 14:45:20 +02:00
commit 3fee646e35
12 changed files with 30 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/forms/AddShowRR.php
View file

@ -7,7 +7,7 @@ class Application_Form_AddShowRR extends Zend_Form_SubForm
{
// Add record element
$this->addElement('checkbox', 'add_show_record', array(
'label' => 'Record?',
'label' => 'Record from Line In?',
'required' => false,
));

2
airtime_mvc/application/forms/AddUser.php
View file

@ -34,7 +34,6 @@ class Application_Form_AddUser extends Zend_Form
$firstName = new Zend_Form_Element_Text('first_name');
$firstName->setLabel('Firstname:');
$firstName->setAttrib('class', 'input_text');
$firstName->setRequired(true);
$firstName->addFilter('StringTrim');
$firstName->addValidator('NotEmpty');
$this->addElement($firstName);
@ -42,7 +41,6 @@ class Application_Form_AddUser extends Zend_Form
$lastName = new Zend_Form_Element_Text('last_name');
$lastName->setLabel('Lastname:');
$lastName->setAttrib('class', 'input_text');
$lastName->setRequired(true);
$lastName->addFilter('StringTrim');
$lastName->addValidator('NotEmpty');
$this->addElement($lastName);

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

@ -11,7 +11,7 @@ class Application_Form_WatchedDirPreferences extends Zend_Form_SubForm
$this->addElement('text', 'storageFolder', array(
'class' => 'input_text',
'label' => 'Airtime\'s Storage Folder:',
'label' => 'Import Folder:',
'required' => false,
'filters' => array('StringTrim'),
'value' => '',
@ -22,7 +22,7 @@ class Application_Form_WatchedDirPreferences extends Zend_Form_SubForm
$this->addElement('text', 'watchedFolder', array(
'class' => 'input_text',
'label' => 'Choose a Watched Folder:',
'label' => 'Watched Folders:',
'required' => false,
'filters' => array('StringTrim'),
'value' => '',

2
airtime_mvc/application/models/RabbitMq.php
View file

@ -75,7 +75,7 @@ class Application_Model_RabbitMq
$channel->exchange_declare($EXCHANGE, 'direct', false, true);
$now = new DateTime("@".time());
$end_timestamp = new DateTime("@".time() + 3600*2);
$end_timestamp = new DateTime("@".(time() + 3600*2));
$temp['event_type'] = $event_type;
$temp['server_timezone'] = Application_Model_Preference::GetTimezone();

2
airtime_mvc/application/models/Show.php
View file

@ -804,7 +804,7 @@ class Application_Model_Show {
$utcStartDateTime->add(new DateInterval("P".$daysAdd."D"));
}
if (is_null($endDateTime) || $utcStartDateTime->getTimestamp() <= $endDateTime->getTimestamp()) {
if (is_null($endDate) || $utcStartDateTime->getTimestamp() <= $endDateTime->getTimestamp()) {
$showDay = new CcShowDays();
$showDay->setDbFirstShow($utcStartDateTime->format("Y-m-d"));
$showDay->setDbLastShow($endDate);

6
airtime_mvc/application/models/StreamSetting.php
View file

@ -83,15 +83,15 @@ class Application_Model_StreamSetting {
$sql = "SELECT COUNT(*) FROM cc_stream_setting"
." WHERE keyname = '$keyname'";
$result = $CC_DBC->GetOne($sql);
if ($result == 1){
$sql = "UPDATE cc_stream_setting"
." SET value = '$value'"
." SET value = '$msg'"
." WHERE keyname = '$keyname'";
}else{
$sql = "INSERT INTO cc_stream_setting (keyname, value, type)"
." VALUES ($keyname, '$msg', 'string')";
." VALUES ('$keyname', '$msg', 'string')";
}
$res = $CC_DBC->query($sql);
}
public static function getLiquidsoapError($stream_id){

2
airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml
View file

@ -16,7 +16,7 @@
</ul>
<?php endif; ?>
</dd>
<dd class="block-display selected-item"><strong>Current Storage Folder:</strong><?php $stor = Application_Model_MusicDir::getStorDir(); echo $stor->getDirectory(); ?></dd>
<dd class="block-display selected-item"><strong>Current Import Folder:</strong><?php $stor = Application_Model_MusicDir::getStorDir(); echo $stor->getDirectory(); ?></dd>
<dt id="watchedFolder-label" class="block-display">
<label class="required" for="watchedFolder"><?php echo $this->element->getElement('watchedFolder')->getLabel() ?></label>