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

Merge branch 'master' of dev.sourcefabric.org:campcaster

Browse source
This commit is contained in:
Naomi 2011-03-05 11:54:05 -05:00
commit 4b4174fe50
66 changed files with 977 additions and 18743 deletions
Download patch file Download diff file Expand all files Collapse all files

8
application/controllers/ApiController.php
View file

@ -31,7 +31,7 @@ class ApiController extends Zend_Controller_Action
print 'You are not allowed to access this resource.';
exit;
}
$jsonStr = json_encode(array("version"=>CAMPCASTER_VERSION));
$jsonStr = json_encode(array("version"=>AIRTIME_VERSION));
echo $jsonStr;
}
@ -126,7 +126,11 @@ class ApiController extends Zend_Controller_Action
$from = $this->_getParam("from");
$to = $this->_getParam("to");
if (Schedule::ValidPypoTimeFormat($from) && Schedule::ValidPypoTimeFormat($to)) {
echo Schedule::ExportRangeAsJson($from, $to);
$result = Schedule::ExportRangeAsJson($from, $to);
$result['stream_metadata'] = array();
$result['stream_metadata']['format'] = Application_Model_Preference::GetStreamLabelFormat();
$result['stream_metadata']['station_name'] = Application_Model_Preference::GetStationName();
echo json_encode($result);
}
}

3
application/controllers/LoginController.php
View file

@ -61,7 +61,8 @@ class LoginController extends Zend_Controller_Action
$this->view->message = $message;
$this->view->form = $form;
$this->view->airtimeVersion = AIRTIME_VERSION;
$this->view->airtimeCopyright = AIRTIME_COPYRIGHT_DATE;
}
public function logoutAction()

2
application/controllers/NowplayingController.php
View file

@ -36,8 +36,6 @@ class NowplayingController extends Zend_Controller_Action
$this->view->headScript()->appendFile('/js/playlist/nowplayingdatagrid.js','text/javascript');
$this->view->headScript()->appendFile('/js/playlist/dayview.js','text/javascript');
}
}

1
application/controllers/PreferenceController.php
View file

@ -29,6 +29,7 @@ class PreferenceController extends Zend_Controller_Action
$values = $form->getValues();
Application_Model_Preference::SetHeadTitle($values["stationName"], $this->view);
Application_Model_Preference::SetDefaultFade($values["stationDefaultFade"]);
Application_Model_Preference::SetStreamLabelFormat($values["streamFormat"]);
$this->view->statusMsg = "Preferences Updated.";
}