Session fix
This commit is contained in:
+17
-31
@@ -30,6 +30,7 @@ class userAccess extends baseModel
|
|||||||
|
|
||||||
if (count($data['profile_data']) == 1) {
|
if (count($data['profile_data']) == 1) {
|
||||||
$data['profile_data'][0]['password'] = '**REMOVED**';
|
$data['profile_data'][0]['password'] = '**REMOVED**';
|
||||||
|
$data['profile_data'][0]['password2'] = '**REMOVED**';
|
||||||
$member_id = $data['profile_data'][0]['mid'];
|
$member_id = $data['profile_data'][0]['mid'];
|
||||||
$member_uid = $data['profile_data'][0]['mid']; //$data['profile_data'][0]['uuid'];
|
$member_uid = $data['profile_data'][0]['mid']; //$data['profile_data'][0]['uuid'];
|
||||||
$data['profile_data'][0]['member_id'] = $member_id; // fixing issue of member id used in profile
|
$data['profile_data'][0]['member_id'] = $member_id; // fixing issue of member id used in profile
|
||||||
@@ -45,12 +46,8 @@ class userAccess extends baseModel
|
|||||||
'settings' => [],
|
'settings' => [],
|
||||||
'layout'=> ['dash'=>$computedDash],
|
'layout'=> ['dash'=>$computedDash],
|
||||||
'preferences' => [],
|
'preferences' => [],
|
||||||
'measurement_units' => [
|
'cards' => [],
|
||||||
'weight' => [
|
'cars' => [],
|
||||||
['name' => 'Kilogram', 'code' => 'KG', 'text' => 'Kg.'],
|
|
||||||
['name' => 'Pound', 'code' => 'LB', 'text' => 'Lbs.'],
|
|
||||||
],
|
|
||||||
],
|
|
||||||
'status' => 0,
|
'status' => 0,
|
||||||
'status' => 1,
|
'status' => 1,
|
||||||
'raw_data' => $in,
|
'raw_data' => $in,
|
||||||
@@ -61,12 +58,8 @@ class userAccess extends baseModel
|
|||||||
'session_token' => '',
|
'session_token' => '',
|
||||||
'settings' => [],
|
'settings' => [],
|
||||||
'preferences' => [],
|
'preferences' => [],
|
||||||
'measurement_units' => [
|
'cards' => [],
|
||||||
'weight' => [
|
'cars' => [],
|
||||||
['name' => 'Kilogram', 'code' => 'KG', 'text' => 'Kg.'],
|
|
||||||
['name' => 'Pound', 'code' => 'LB', 'text' => 'Lbs.'],
|
|
||||||
],
|
|
||||||
],
|
|
||||||
'status' => 0,
|
'status' => 0,
|
||||||
'raw_data' => $in,
|
'raw_data' => $in,
|
||||||
'error_msg' => 'Invalid username or password',
|
'error_msg' => 'Invalid username or password',
|
||||||
@@ -91,12 +84,13 @@ class userAccess extends baseModel
|
|||||||
|
|
||||||
if (count($data['profile_data']) == 1) {
|
if (count($data['profile_data']) == 1) {
|
||||||
$data['profile_data'][0]['password'] = '**REMOVED**';
|
$data['profile_data'][0]['password'] = '**REMOVED**';
|
||||||
|
$data['profile_data'][0]['password2'] = '**REMOVED**';
|
||||||
$member_id = $data['profile_data'][0]['mid'];
|
$member_id = $data['profile_data'][0]['mid'];
|
||||||
$member_uid = $data['profile_data'][0]['uuid'];
|
$member_uid = $data['profile_data'][0]['mid'];
|
||||||
$data['profile_data'][0]['member_id'] = $member_id; // fixing issue of member id used in profile
|
$data['profile_data'][0]['member_id'] = $member_id; // fixing issue of member id used in profile
|
||||||
$possibeLayout =['33010','33015','33020','33025','33030','33035','33040'];
|
$possibeLayout =['33010','33015','33020','33025','33030','33035','33040'];
|
||||||
$computedDash = $possibeLayout[rand(0,6)];// 33010; // Recomendation engine points
|
$computedDash = $possibeLayout[rand(0,6)];// 33010; // Recomendation engine points
|
||||||
$sessionToken = $this->generateSession($member_id);
|
$sessionToken = $this->generateSession($member_id.'Fleet');
|
||||||
return $inx = [
|
return $inx = [
|
||||||
'session_token' => $sessionToken,
|
'session_token' => $sessionToken,
|
||||||
'member_id' => $member_id,
|
'member_id' => $member_id,
|
||||||
@@ -106,12 +100,8 @@ class userAccess extends baseModel
|
|||||||
'settings' => [],
|
'settings' => [],
|
||||||
'layout'=> ['dash'=>$computedDash],
|
'layout'=> ['dash'=>$computedDash],
|
||||||
'preferences' => [],
|
'preferences' => [],
|
||||||
'measurement_units' => [
|
'cards' => [],
|
||||||
'weight' => [
|
'cars' => [],
|
||||||
['name' => 'Kilogram', 'code' => 'KG', 'text' => 'Kg.'],
|
|
||||||
['name' => 'Pound', 'code' => 'LB', 'text' => 'Lbs.'],
|
|
||||||
],
|
|
||||||
],
|
|
||||||
'status' => 0,
|
'status' => 0,
|
||||||
'status' => 1,
|
'status' => 1,
|
||||||
'raw_data' => $in,
|
'raw_data' => $in,
|
||||||
@@ -122,19 +112,15 @@ class userAccess extends baseModel
|
|||||||
'session_token' => '',
|
'session_token' => '',
|
||||||
'settings' => [],
|
'settings' => [],
|
||||||
'preferences' => [],
|
'preferences' => [],
|
||||||
'measurement_units' => [
|
'cards' => [],
|
||||||
'weight' => [
|
'cars' => [],
|
||||||
['name' => 'Kilogram', 'code' => 'KG', 'text' => 'Kg.'],
|
|
||||||
['name' => 'Pound', 'code' => 'LB', 'text' => 'Lbs.'],
|
|
||||||
],
|
|
||||||
],
|
|
||||||
'status' => 0,
|
'status' => 0,
|
||||||
'raw_data' => $in,
|
'raw_data' => $in,
|
||||||
'error_msg' => 'Invalid username or password',
|
'error_msg' => 'Invalid username or password',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
private function generateSession($member_id)
|
private function generateSession($member_id,$login_type = 'Users')
|
||||||
{
|
{
|
||||||
$loc = $this->getIPAddress();
|
$loc = $this->getIPAddress();
|
||||||
|
|
||||||
@@ -158,13 +144,13 @@ class userAccess extends baseModel
|
|||||||
$query = $this->db->query($sqlQ);
|
$query = $this->db->query($sqlQ);
|
||||||
|
|
||||||
// Create HX
|
// Create HX
|
||||||
/*
|
|
||||||
$sqlQ =
|
$sqlQ =
|
||||||
"INSERT INTO members_login_hx (member_id,channel,loc) VALUES ($member_id,'Desktop','" .
|
"INSERT INTO members_login_hx (member_id,channel,loc) VALUES ($member_id,'$login_type','" .
|
||||||
$loc .
|
$loc .
|
||||||
"')";
|
"')";
|
||||||
$this->db->query($sqlQ);
|
$this->db->query($sqlQ);
|
||||||
*/
|
/* */
|
||||||
return $tk;
|
return $tk;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user