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

Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas.

Browse source
This commit is contained in:
Robert Elder 2014-10-10 19:57:22 +00:00
commit 9fb35c448e
24 changed files with 165 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -61,6 +61,7 @@ class LoginController extends Zend_Controller_Action
$result = $auth->authenticate($authAdapter);
if ($result->isValid()) {
Zend_Session::regenerateId();
//all info about this user from the login table omit only the password
$userInfo = $authAdapter->getResultRowObject(null, 'password');
@ -81,6 +82,7 @@ class LoginController extends Zend_Controller_Action
$auth = Zend_Auth::getInstance();
$result = $auth->authenticate($authAdapter);
if ($result->isValid()) {
Zend_Session::regenerateId();
//set the user locale in case user changed it in when logging in
Application_Model_Preference::SetUserLocale($locale);