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

Removed unused status page stuff for Pro and cleanup for code review

Browse source
This commit is contained in:
Albert Santoni 2015-04-17 11:17:35 -04:00
parent 02dff34328
commit 6dc8837aff
7 changed files with 13 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

16
airtime_mvc/application/controllers/ScheduleController.php
View file

@ -50,12 +50,10 @@ class ScheduleController extends Zend_Controller_Action
$baseUrl = Application_Common_OsPath::getBaseDir();
$foo = new ScheduleController($this->getRequest(), $this->getResponse());
$foo->eventFeedPreloadAction();
//$foo->eventFeedAction();
$events = json_encode($foo->view->events);
//$timescale =
//$this->getRequest()->getParam("view", "week");
//Embed the schedule in our page response so we don't have to make an AJAX request to get this data after the page load.
$scheduleController = new ScheduleController($this->getRequest(), $this->getResponse());
$scheduleController->eventFeedPreloadAction();
$events = json_encode($scheduleController->view->events);
$this->view->headScript()->appendScript(
"var calendarPref = {};\n".
@ -307,9 +305,9 @@ class ScheduleController extends Zend_Controller_Action
public static function printCurrentPlaylistForEmbedding()
{
$front = Zend_Controller_Front::getInstance();
$foo = new ScheduleController($front->getRequest(), $front->getResponse());
$foo->getCurrentPlaylistAction();
echo(json_encode($foo->view));
$scheduleController = new ScheduleController($front->getRequest(), $front->getResponse());
$scheduleController->getCurrentPlaylistAction();
echo(json_encode($scheduleController->view));
}
public function getCurrentPlaylistAction()

4
airtime_mvc/application/controllers/ShowbuilderController.php
View file

@ -67,8 +67,8 @@ class ShowbuilderController extends Zend_Controller_Action
if (isset($values["Privacy"])) {
Application_Model_Preference::SetPrivacyPolicyCheck($values["Privacy"]);
}
// unset referrer
session_start(); //open session for writing again
// unset referrer
Zend_Session::namespaceUnset('referrer');
} elseif ($values["Publicise"] == '1' && $form->isValid($values)) {
Application_Model_Preference::SetHeadTitle($values["stnName"], $this->view);
@ -89,8 +89,8 @@ class ShowbuilderController extends Zend_Controller_Action
if (isset($values["Privacy"])) {
Application_Model_Preference::SetPrivacyPolicyCheck($values["Privacy"]);
}
// unset session
session_start(); //open session for writing again
// unset referrer
Zend_Session::namespaceUnset('referrer');
} else {
$logo = Application_Model_Preference::GetStationLogo();

4
airtime_mvc/application/controllers/SystemstatusController.php
View file

@ -13,16 +13,18 @@ class SystemstatusController extends Zend_Controller_Action
public function indexAction()
{
/*
$services = array(
"pypo"=>Application_Model_Systemstatus::GetPypoStatus(),
"liquidsoap"=>Application_Model_Systemstatus::GetLiquidsoapStatus(),
//"media-monitor"=>Application_Model_Systemstatus::GetMediaMonitorStatus(),
);
*/
$partitions = Application_Model_Systemstatus::GetDiskInfo();
$this->view->status = new StdClass;
$this->view->status->services = $services;
//$this->view->status->services = $services;
$this->view->status->partitions = $partitions;
}
}