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

Merge branch 'airtime-2.0.x' into devel

This commit is contained in:
James 2012-01-17 14:48:04 -05:00
parent ff428d2c4f 3a8ba36e0d
commit 087d893a60
8 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LICENSE_3RD_PARTY
View File

@ -43,7 +43,7 @@ Linked code:
* Phing
- What is it: PHP project build system
- Web site: http://phing.info/trac/
- Note: Only used for database installation and development, not needed to run Airtime.
- Note: Only used for development, not needed to run Airtime.
- License: LGPLv3
* PHP-AMQPLIB
@ -175,7 +175,7 @@ Non-linked code:
- Web site: http://www.python.org/
- License: PSF License. See http://docs.python.org/license.html
* Liquidsoap (pre-release of 1.0)
* Liquidsoap 1.0.0
- Web site: http://savonet.sourceforge.net/
- License: GPLv2

4
airtime_mvc/application/configs/conf.php
View File

@ -81,5 +81,9 @@ class Config {
$CC_CONFIG['soundcloud-connection-retries'] = $values['soundcloud']['connection_retries'];
$CC_CONFIG['soundcloud-connection-wait'] = $values['soundcloud']['time_between_retries'];
if(isset($values['demo']['demo'])){
$CC_CONFIG['demo'] = $values['demo']['demo'];
}
}
}

15
airtime_mvc/application/controllers/LoginController.php
View File

@ -10,6 +10,8 @@ class LoginController extends Zend_Controller_Action
public function indexAction()
{
global $CC_CONFIG;
if(Zend_Auth::getInstance()->hasIdentity())
{
$this->_redirect('Nowplaying');
@ -80,11 +82,14 @@ class LoginController extends Zend_Controller_Action
}
}
$this->view->message = $message;
$this->view->error = $error;
$this->view->form = $form;
$this->view->airtimeVersion = Application_Model_Preference::GetAirtimeVersion();
$this->view->airtimeCopyright = AIRTIME_COPYRIGHT_DATE;
$this->view->message = $message;
$this->view->error = $error;
$this->view->form = $form;
$this->view->airtimeVersion = Application_Model_Preference::GetAirtimeVersion();
$this->view->airtimeCopyright = AIRTIME_COPYRIGHT_DATE;
if(isset($CC_CONFIG['demo'])){
$this->view->demo = $CC_CONFIG['demo'];
}
}
public function logoutAction()

6
airtime_mvc/application/forms/Login.php
View File

@ -5,6 +5,8 @@ class Application_Form_Login extends Zend_Form
public function init()
{
global $CC_CONFIG;
// Set the method for the display form to POST
$this->setMethod('post');
@ -13,17 +15,19 @@ class Application_Form_Login extends Zend_Form
'label' => 'Username:',
'class' => 'input_text',
'required' => true,
'value' => (isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1)?'admin':'',
'filters' => array('StringTrim'),
'validators' => array(
'NotEmpty',
)
));
// Add password element
$this->addElement('password', 'password', array(
'label' => 'Password:',
'class' => 'input_text',
'required' => true,
'value' => (isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1)?'admin':'',
'filters' => array('StringTrim'),
'validators' => array(
'NotEmpty',

16
airtime_mvc/application/models/Show.php
View File

@ -298,9 +298,11 @@ class Application_Model_Show {
$showId = $this->getId();
$sql = "SELECT starts FROM cc_show_instances "
."WHERE show_id = $showId AND rebroadcast = 1 "
."WHERE instance_id = (SELECT id FROM cc_show_instances WHERE show_id = $showId ORDER BY starts LIMIT 1) AND rebroadcast = 1 "
."ORDER BY starts";
Logging::log($sql);
$rebroadcasts = $CC_DBC->GetAll($sql);
$rebroadcastsLocal = array();
@ -415,8 +417,7 @@ class Application_Model_Show {
public function deleteAllInstances(){
global $CC_DBC;
$date = new Application_Model_DateHelper;
$timestamp = $date->getTimestamp();
$timestamp = gmdate("Y-m-d H:i:s");
$showId = $this->getId();
$sql = "DELETE FROM cc_show_instances"
@ -433,8 +434,7 @@ class Application_Model_Show {
public function deleteAllRebroadcasts(){
global $CC_DBC;
$date = new Application_Model_DateHelper;
$timestamp = $date->getTimestamp();
$timestamp = gmdate("Y-m-d H:i:s");
$showId = $this->getId();
$sql = "DELETE FROM cc_show_instances"
@ -457,8 +457,7 @@ class Application_Model_Show {
public function removeAllInstancesFromDate($p_date=null){
global $CC_DBC;
$date = new Application_Model_DateHelper;
$timestamp = $date->getTimestamp();
$timestamp = gmdate("Y-m-d H:i:s");
if(is_null($p_date)) {
$date = new Application_Model_DateHelper;
@ -490,8 +489,7 @@ class Application_Model_Show {
public function removeAllInstancesBeforeDate($p_date){
global $CC_DBC;
$date = new Application_Model_DateHelper;
$timestamp = $date->getTimestamp();
$timestamp = gmdate("Y-m-d H:i:s");
$showId = $this->getId();
$sql = "DELETE FROM cc_show_instances "

7
airtime_mvc/application/models/ShowInstance.php
View File

@ -494,7 +494,12 @@ class Application_Model_ShowInstance {
}
}
else {
$show->delete();
if ($this->isRebroadcast()) {
$this->_showInstance->delete();
}
else {
$show->delete();
}
}
}

3
airtime_mvc/application/views/scripts/login/index.phtml
View File

@ -2,6 +2,9 @@
<div class="logobox">&nbsp;</div>
<h2>Login</h2>
<div id="login" class="login-content clearfix">
<?php if(isset($this->demo) && $this->demo == 1){?>
<p style="font-weight:bold">Welcome to the online Airtime demo! You can log in using the username 'admin' and the password 'admin'.</p>
<?php }?>
<p class="light" style='<?php echo $this->error?"color:#902d2d;font-size:11px;padding:2px 4px;background:#c6b4b4;margin-bottom:2px;border:1px solid #c83f3f;":""?>'><?php echo $this->message; ?></p>
<?php echo $this->form; ?>
</div>

2
airtime_mvc/public/js/airtime/schedule/add-show.js
View File

@ -181,7 +181,7 @@ function setAddShowEvents() {
form.find("#add_show_start_time").timepicker({
amPmText: ['', ''],
defaultTime: '00:00',
defaultTime: '00:00'
});
form.find("#add_show_end_time").timepicker({
amPmText: ['', '']