fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 15799 Language stored in session SOLVED

Browse Source 
- In "home" controller doesn't sent the current language
- Sent the current language to method "getUserLocation"
This commit is contained in:
Julio Cesar Laura
2014-08-29 10:44:09 -04:00
parent ab41c74d4b
commit 007c9c5b32
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
workflow/engine/controllers/home.php
View File

@@ -43,13 +43,13 @@ class Home extends Controller
} }
public function login ($httpData) public function login ($httpData)
{ {
//start new session //start new session
@session_destroy(); @session_destroy();
session_start(); session_start();
session_regenerate_id(); session_regenerate_id();
$data = isset( $httpData->d ) ? unserialize( base64_decode( $httpData->d ) ) : ''; $data = isset( $httpData->d ) ? unserialize( base64_decode( $httpData->d ) ) : '';
$template = $this->clientBrowser['name'] == 'msie' ? 'login_ie' : 'login_standard'; $template = $this->clientBrowser['name'] == 'msie' ? 'login_ie' : 'login_standard';
$skin = $this->clientBrowser['name'] == 'msie' ? $this->lastSkin : 'simplified'; $skin = $this->clientBrowser['name'] == 'msie' ? $this->lastSkin : 'simplified';
@@ -94,9 +94,9 @@ class Home extends Controller
$start = 0; $start = 0;
$limit = ''; $limit = '';
$proData = $process->getAllProcesses( $start, $limit, null, null, false, true ); $proData = $process->getAllProcesses( $start, $limit, null, null, false, true );
$processList = $case->getStartCasesPerType( $_SESSION['USER_LOGGED'], 'category' ); $processList = $case->getStartCasesPerType( $_SESSION['USER_LOGGED'], 'category' );
unset( $processList[0] ); unset( $processList[0] );
$processesList = array (); $processesList = array ();
@@ -104,11 +104,11 @@ class Home extends Controller
foreach ($proData as $keyPro => $valuePro) { foreach ($proData as $keyPro => $valuePro) {
if ($valueProcess['pro_uid'] == $valuePro['PRO_UID']) { if ($valueProcess['pro_uid'] == $valuePro['PRO_UID']) {
$processesList[] = $valueProcess; $processesList[] = $valueProcess;
} }
} }
} }
$switchLink = $userProperty->getUserLocation( $_SESSION['USER_LOGGED'] ); $switchLink = $userProperty->getUserLocation( $_SESSION['USER_LOGGED'], SYS_LANG );
if (!isset($_COOKIE['workspaceSkin'])) { if (!isset($_COOKIE['workspaceSkin'])) {
if (substr( $sysConf['default_skin'], 0, 2 ) == 'ux') { if (substr( $sysConf['default_skin'], 0, 2 ) == 'ux') {
@@ -120,7 +120,7 @@ class Home extends Controller
$oServerConf = & serverConf::getSingleton(); $oServerConf = & serverConf::getSingleton();
if ($oServerConf->isRtl( SYS_LANG )) { if ($oServerConf->isRtl( SYS_LANG )) {
$swRtl = 1; $swRtl = 1;
} else { } else {
$swRtl = 0; $swRtl = 0;
} }
@@ -202,7 +202,7 @@ class Home extends Controller
} }
public function appList ($httpData) public function appList ($httpData)
{ {
// setting default list applications types [default: todo] // setting default list applications types [default: todo]
$httpData->t = isset( $httpData->t ) ? $httpData->t : 'todo'; $httpData->t = isset( $httpData->t ) ? $httpData->t : 'todo';
@@ -289,7 +289,7 @@ class Home extends Controller
} }
public function getApps ($httpData) public function getApps ($httpData)
{ {
$cases = $this->getAppsData( $httpData->t, $httpData->start, $httpData->limit ); $cases = $this->getAppsData( $httpData->t, $httpData->start, $httpData->limit );
$this->setView( $this->userUxBaseTemplate . PATH_SEP . 'applications' ); $this->setView( $this->userUxBaseTemplate . PATH_SEP . 'applications' );
@@ -312,7 +312,7 @@ class Home extends Controller
$dir = null, $dir = null,
$sort = "APP_CACHE_VIEW.APP_NUMBER", $sort = "APP_CACHE_VIEW.APP_NUMBER",
$category = null) $category = null)
{ {
require_once ("classes/model/AppNotes.php"); require_once ("classes/model/AppNotes.php");
G::LoadClass( 'applications' ); G::LoadClass( 'applications' );
@@ -564,7 +564,7 @@ class Home extends Controller
return $status; return $status;
} }
function getProcessArray($action, $userUid) function getProcessArray($action, $userUid)
{ {
global $oAppCache; global $oAppCache;
$processes = array(); $processes = array();
@@ -595,7 +595,7 @@ class Home extends Controller
$cProcess->addJoinMC($conds, Criteria::LEFT_JOIN); $cProcess->addJoinMC($conds, Criteria::LEFT_JOIN);
$cProcess->add(ProcessPeer::PRO_STATUS, "ACTIVE"); $cProcess->add(ProcessPeer::PRO_STATUS, "ACTIVE");
$oDataset = ProcessPeer::doSelectRS($cProcess); $oDataset = ProcessPeer::doSelectRS($cProcess);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next(); $oDataset->next();