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

CC-4810: Add language setting to login page

Browse source 
-done
This commit is contained in:
denise 2013-01-09 18:03:23 -05:00
parent 7866b8a0cb
commit 1572955d07
9 changed files with 49 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,7 +5,6 @@ class LoginController extends Zend_Controller_Action
public function init()
{
/* Initialize action controller here */
}
public function indexAction()
@ -14,6 +13,7 @@ class LoginController extends Zend_Controller_Action
$request = $this->getRequest();
Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale'));
if (Zend_Auth::getInstance()->hasIdentity())
{
@ -43,6 +43,7 @@ class LoginController extends Zend_Controller_Action
//get the username and password from the form
$username = $form->getValue('username');
$password = $form->getValue('password');
$locale = $form->getValue('locale');
if (Application_Model_Subjects::getLoginAttempts($username) >= 3 && $form->getElement('captcha') == NULL) {
$form->addRecaptcha();
} else {
@ -67,6 +68,9 @@ class LoginController extends Zend_Controller_Action
$tempSess = new Zend_Session_Namespace("referrer");
$tempSess->referrer = 'login';
//set the user locale in case user changed it in when logging in
Application_Model_Preference::SetUserLocale($auth->getIdentity()->id, $locale);
$this->_redirect('Showbuilder');
} else {

2
airtime_mvc/application/controllers/UserController.php
View file

@ -162,7 +162,7 @@ class UserController extends Zend_Controller_Action
$this->view->successMessage = "<div class='success'>"._("User updated successfully!")."</div>";
}
$this->view->form = $form;
die(json_encode(array("html"=>$this->view->render('user/edit-user.phtml'))));
die(json_encode(array("locale"=>$formData['cu_locale'], "html"=>$this->view->render('user/edit-user.phtml'))));
}
$this->view->form = $form;
$this->view->html = $this->view->render('user/edit-user.phtml');