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

Merge branch 'airtime-2.0.x' into devel

Browse source
This commit is contained in:
James 2012-01-17 14:48:04 -05:00
commit 087d893a60
8 changed files with 38 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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()