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

CC-1724:phone-home-statistics

Browse source 
Rebase from devel into this branch
This commit is contained in:
james 2011-06-15 12:06:50 -04:00
parent 11b601308e
commit cf654f1a45
18 changed files with 656 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

5
airtime_mvc/application/controllers/LoginController.php
View file

@ -49,7 +49,10 @@ class LoginController extends Zend_Controller_Action
//the default storage is a session with namespace Zend_Auth
$authStorage = $auth->getStorage();
$authStorage->write($userInfo);
$this->refer_sess = new Zend_Session_Namespace("referrer");
$this->refer_sess->referrer = 'login';
$this->_redirect('Nowplaying');
}
else

8
airtime_mvc/application/controllers/NowplayingController.php
View file

@ -18,6 +18,14 @@ class NowplayingController extends Zend_Controller_Action
$this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.min.js','text/javascript');
$this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/nowplayingdatagrid.js','text/javascript');
$this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/nowview.js','text/javascript');
//popup if previous page was login
$refer_sses = new Zend_Session_Namespace('referrer');
if($refer_sses->referrer == 'login'){
//unset session
Zend_Session::namespaceUnset('referrer');
$this->view->headScript()->appendFile($baseUrl.'/js/airtime/nowplaying/register.js','text/javascript');
}
}
public function getDataGridDataAction()

52
airtime_mvc/application/controllers/PreferenceController.php
View file

@ -8,6 +8,7 @@ class PreferenceController extends Zend_Controller_Action
/* Initialize action controller here */
$ajaxContext = $this->_helper->getHelper('AjaxContext');
$ajaxContext->addActionContext('register', 'json')
->addActionContext('remindme', 'json')
->initContext();
}
@ -19,9 +20,6 @@ class PreferenceController extends Zend_Controller_Action
$this->view->headScript()->appendFile($baseUrl.'/js/airtime/preferences/preferences.js','text/javascript');
$this->view->statusMsg = "";
$this->view->registered = Application_Model_Preference::GetRegistered();
$this->view->supportFeedback = Application_Model_Preference::GetSupportFeedback();
$form = new Application_Form_Preferences();
if ($request->isPost()) {
@ -47,10 +45,46 @@ class PreferenceController extends Zend_Controller_Action
Application_Model_Preference::SetEmail($values["preferences_support"]["Email"]);
Application_Model_Preference::SetStationWebSite($values["preferences_support"]["StationWebSite"]);
Application_Model_Preference::SetSupportFeedback($values["preferences_support"]["SupportFeedback"]);
Application_Model_Preference::SetPublicise($values["preferences_support"]["Publicise"]);
$imagePath = $form->getSubForm('preferences_support')->Logo->getFileName();
Application_Model_Preference::SetStationCountry($values["preferences_support"]["Country"]);
Application_Model_Preference::SetStationCity($values["preferences_support"]["City"]);
Application_Model_Preference::SetStationDescription($values["preferences_support"]["Description"]);
Application_Model_Preference::SetStationLogo($imagePath);
$this->view->statusMsg = "<div class='success'>Preferences updated.</div>";
}else{
$errors = $form->getErrors();
$firstElementWithError = '';
foreach($errors as $section => $error){
foreach($error as $name => $er){
if(count($er) > 0){
$firstElementWithError = $name;
break;
}
}
if($section == "preferences_general"){
$this->view->errorGeneral = true;
}elseif($section == "preferences_soundcloud"){
$this->view->errorSoundCloud = true;
}elseif($section == "preferences_support"){
$this->view->errorSupport = true;
}
}
}
}
$this->view->supportFeedback = Application_Model_Preference::GetSupportFeedback();
$logo = Application_Model_Preference::GetStationLogo();
if($logo){
$this->view->logoImg = $logo;
}
$this->view->form = $form;
}
@ -61,8 +95,20 @@ class PreferenceController extends Zend_Controller_Action
$this->view->headScript()->appendFile($baseUrl.'/js/airtime/preferences/preferences.js','text/javascript');
$form = new Application_Form_RegisterAirtime();
$logo = Application_Model_Preference::GetStationLogo();
if($logo){
$this->view->logoImg = $logo;
}
$this->view->dialog = $form->render($this->view);
}
public function remindmeAction(){
$now = date("Y-m-d H:i:s");
Application_Model_Preference::SetRemindMeDate($now);
die();
}
}