test into master #42

Merged
juan merged 24 commits from test into master 2023-07-27 20:07:43 +00:00
3 changed files with 9 additions and 2 deletions
Showing only changes of commit a8f98d62ab - Show all commits

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
hedera-web (23.6.15) stable; urgency=low
hedera-web (23.6.16) stable; urgency=low
* Initial Release.

View File

@ -1,6 +1,6 @@
{
"name": "hedera-web",
"version": "23.6.15",
"version": "23.6.16",
"description": "Verdnatura web page",
"license": "GPL-3.0",
"repository": {

View File

@ -150,6 +150,9 @@ abstract class Service {
if (!empty($_GET['access_token']))
$token = $_GET['access_token'];
echo "Start login logs\n";
echo "_SERVER_HTTP_AUTHORIZATION: " . $_SERVER['HTTP_AUTHORIZATION'] . " _GET_Access_token: " . $_GET['access_token'] . "EndLine\n";
if (isset($token)) {
$userId = $db->getValue(
'SELECT userId FROM salix.AccessToken
@ -178,6 +181,8 @@ abstract class Service {
if (!$isActive)
throw new UserDisabledException();
}
echo "user: " . $user . "EndLine\n";
$db->query('CALL account.myUser_loginWithName(#)', [$user]);
$userChanged = !$anonymousUser
@ -186,6 +191,8 @@ abstract class Service {
$_SESSION['user'] = $user;
// Registering the user access
echo "SESSION_Access: " . $_SESSION['access'] . " _userChanged: " . $userChanged . " _SESSION_User: " . $_SESSION['user'] . "EndLine\n";
echo "End login logs\n";
if (isset($_SESSION['access']) && $userChanged)
$db->query(
'CALL visitUser_new(#, #)',