GX-Bug #50669 » customer-login-fix.patch
| src/GXMainComponents/Controllers/HttpView/Admin/CustomerLoginController.inc.php (date 1516211983000) | ||
|---|---|---|
| 1 | 1 |
<?php |
| 2 | 2 |
/* -------------------------------------------------------------- |
| 3 |
CustomerLoginController.inc.php 2017-05-15
|
|
| 3 |
CustomerLoginController.inc.php 2018-01-17
|
|
| 4 | 4 |
Gambio GmbH |
| 5 | 5 |
http://www.gambio.de |
| 6 |
Copyright (c) 2017 Gambio GmbH
|
|
| 6 |
Copyright (c) 2018 Gambio GmbH
|
|
| 7 | 7 |
Released under the GNU General Public License (Version 2) |
| 8 | 8 |
[http://www.gnu.org/licenses/gpl-2.0.html] |
| 9 | 9 |
-------------------------------------------------------------- |
| ... | ... | |
| 48 | 48 |
$loginControl = MainFactory::create('LoginContentControl');
|
| 49 | 49 |
|
| 50 | 50 |
$logoffControl->reset_user_session(); |
| 51 |
$loginControl->loginAfterSuccessfulAuthorization($customerId); |
|
| 51 |
$loginControl->loginAfterSuccessfulAuthorization($customerId, true);
|
|
| 52 | 52 |
|
| 53 | 53 |
return MainFactory::create('RedirectHttpControllerResponse', HTTP_SERVER . DIR_WS_CATALOG . 'account.php');
|
| 54 | 54 |
} |
| src/system/classes/accounts/LoginContentControl.inc.php (date 1516212009000) | ||
|---|---|---|
| 1 | 1 |
<?php |
| 2 | 2 |
/* -------------------------------------------------------------- |
| 3 |
LoginContentControl 2017-01-19
|
|
| 3 |
LoginContentControl 2018-01-17
|
|
| 4 | 4 |
Gambio GmbH |
| 5 | 5 |
http://www.gambio.de |
| 6 |
Copyright (c) 2017 Gambio GmbH
|
|
| 6 |
Copyright (c) 2018 Gambio GmbH
|
|
| 7 | 7 |
Released under the GNU General Public License (Version 2) |
| 8 | 8 |
[http://www.gnu.org/licenses/gpl-2.0.html] |
| 9 | 9 |
-------------------------------------------------------------- |
| ... | ... | |
| 162 | 162 |
|
| 163 | 163 |
|
| 164 | 164 |
/** |
| 165 |
* @param int $customerId |
|
| 165 |
* @param int $customerId |
|
| 166 |
* @param bool $suppressSessionRecreate |
|
| 166 | 167 |
*/ |
| 167 |
public function loginAfterSuccessfulAuthorization($customerId) |
|
| 168 |
public function loginAfterSuccessfulAuthorization($customerId, $suppressSessionRecreate = false)
|
|
| 168 | 169 |
{
|
| 169 | 170 |
$result = xtc_db_query("SELECT
|
| 170 | 171 |
customers_id, |
| ... | ... | |
| 181 | 182 |
|
| 182 | 183 |
$customerData = xtc_db_fetch_array($result); |
| 183 | 184 |
|
| 184 |
if(SESSION_RECREATE === 'True') |
|
| 185 |
if(SESSION_RECREATE === 'True' && !$suppressSessionRecreate)
|
|
| 185 | 186 |
{
|
| 186 | 187 |
xtc_session_recreate(); |
| 187 | 188 |
} |