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

Merge branch 'saas-dev' into soundcloud

Browse source
This commit is contained in:
Duncan Sommerville 2015-06-17 10:14:03 -04:00
commit 3a1d34dffe
10 changed files with 27 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

6
airtime_mvc/application/controllers/DashboardController.php
View file

@ -99,10 +99,10 @@ class DashboardController extends Zend_Controller_Action
$this->_helper->layout->setLayout('livestream');
$logo = Application_Model_Preference::GetStationLogo();
if ($logo) {
$this->view->logo = "data:image/png;base64,$logo";
if ($logo === DEFAULT_LOGO_PLACEHOLDER) {
$this->view->logo = "/".DEFAULT_LOGO_FILE;
} else {
$this->view->logo = $baseUrl."css/images/airtime_logo_jp.png";
$this->view->logo = "data:image/png;base64,".$logo;
}
}

7
airtime_mvc/application/controllers/EmbedController.php
View file

@ -78,17 +78,12 @@ class EmbedController extends Zend_Controller_Action
public function weeklyProgramAction()
{
$this->view->layout()->disableLayout();
$CC_CONFIG = Config::getConfig();
$request = $this->getRequest();
$useIframe = $request->getParam('useiframe');
if (!isset($useIframe)) {
$this->view->layout()->disableLayout();
} elseif ($useIframe == "1") {
$this->_helper->layout->setLayout('bare');
}
$widgetStyle = $request->getParam('style');
if ($widgetStyle == "premium") {

9
airtime_mvc/application/controllers/ErrorController.php
View file

@ -7,7 +7,6 @@ class ErrorController extends Zend_Controller_Action {
//We cannot show that.
$this->view->layout()->disableLayout();
$this->setupCSS();
}
public function errorAction() {
@ -31,9 +30,9 @@ class ErrorController extends Zend_Controller_Action {
break;
}
} else {
$exceptions = $this->_getAllParams();
Logging::error($exceptions);
$this->error500Action();
//$exceptions = $this->_getAllParams();
//Logging::error($exceptions);
$this->error404Action();
return;
}
@ -74,7 +73,7 @@ class ErrorController extends Zend_Controller_Action {
* 404 error - route or controller
*/
public function error404Action() {
$this->_helper->viewRenderer('error-404');
$this->_helper->viewRenderer('error');
$this->getResponse()->setHttpResponseCode(404);
$this->view->message = _('Page not found.');
}

2
airtime_mvc/application/controllers/plugins/Acl_plugin.php
View file

@ -134,7 +134,7 @@ class Zend_Controller_Plugin_Acl extends Zend_Controller_Plugin_Abstract
//$r->gotoSimpleAndExit('index', 'login', $request->getModuleName());
//die();
throw new Zend_Controller_Exception("hi", 401);
throw new Zend_Controller_Exception("Incorrect API key", 401);
}
}
else //Non-REST, regular Airtime web app requests