Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • Libriciel/archivage/asalae-core
1 result
Show changes
Commits on Source (5)
Hide whitespace changes
Inline Side-by-side
README.md
View file @ 76c10c43
......@@ -2,15 +2,15 @@
[![License](https://img.shields.io/badge/license-AGPL-blue)](https://www.gnu.org/licenses/agpl-3.0.txt)
[![build status](https://gitlab.libriciel.fr/libriciel/pole-archivage/asalae/asalae-core/badges/php83/pipeline.svg)](https://gitlab.libriciel.fr/libriciel/pole-archivage/asalae/asalae-core/pipelines/latest)
[![coverage report](https://gitlab.libriciel.fr/libriciel/pole-archivage/asalae/asalae-core/badges/php83/coverage.svg)](https://asalae-master.dev.libriciel.net/coverage/asalae-core/index.html)
[![coverage report](https://gitlab.libriciel.fr/libriciel/pole-archivage/asalae/asalae-core/badges/php83/coverage.svg?min_medium=50&min_acceptable=70&min_good=80)](https://asalae-master.dev.libriciel.net/coverage/asalae-core/index.html)
## Dépendence de
| Projet | Build | Coverage |
|-------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| [asalae2](https://gitlab.libriciel.fr/libriciel/pole-archivage/asalae/asalae) | [![build status](https://gitlab.libriciel.fr/libriciel/pole-archivage/asalae/asalae/badges/master/pipeline.svg)](https://gitlab.libriciel.fr/libriciel/pole-archivage/asalae/asalae/pipelines/latest) | [![coverage report](https://gitlab.libriciel.fr/libriciel/pole-archivage/asalae/asalae/badges/master/coverage.svg)](https://asalae-master.dev.libriciel.net/coverage/asalae2/index.html) |
| [versae](https://gitlab.libriciel.fr/libriciel/pole-archivage/versae/versae) | [![build status](https://gitlab.libriciel.fr/libriciel/pole-archivage/versae/versae/badges/master/pipeline.svg)](https://gitlab.libriciel.fr/libriciel/pole-archivage/versae/versae/pipelines/latest) | [![coverage report](https://gitlab.libriciel.fr/libriciel/pole-archivage/versae/versae/badges/master/coverage.svg)](https://versae-master.dev.libriciel.net/coverage/versae/index.html) |
| [refae](https://gitlab.libriciel.fr/libriciel/pole-archivage/refae/refae) | [![build status](https://gitlab.libriciel.fr/libriciel/pole-archivage/refae/refae/badges/master/pipeline.svg)](https://gitlab.libriciel.fr/libriciel/pole-archivage/refae/refae/pipelines/latest) | [![coverage report](https://gitlab.libriciel.fr/libriciel/pole-archivage/refae/refae/badges/master/coverage.svg)](https://refae-master.dev.libriciel.net/coverage/refae/index.html) |
| Projet | Build | Coverage |
|-------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| [asalae2](https://gitlab.libriciel.fr/libriciel/pole-archivage/asalae/asalae) | [![build status](https://gitlab.libriciel.fr/libriciel/pole-archivage/asalae/asalae/badges/master/pipeline.svg)](https://gitlab.libriciel.fr/libriciel/pole-archivage/asalae/asalae/pipelines/latest) | [![coverage report](https://gitlab.libriciel.fr/libriciel/pole-archivage/asalae/asalae/badges/master/coverage.svg?min_medium=50&min_acceptable=70&min_good=80)](https://asalae-master.dev.libriciel.net/coverage/asalae2/index.html) |
| [versae](https://gitlab.libriciel.fr/libriciel/pole-archivage/versae/versae) | [![build status](https://gitlab.libriciel.fr/libriciel/pole-archivage/versae/versae/badges/master/pipeline.svg)](https://gitlab.libriciel.fr/libriciel/pole-archivage/versae/versae/pipelines/latest) | [![coverage report](https://gitlab.libriciel.fr/libriciel/pole-archivage/versae/versae/badges/master/coverage.svg?min_medium=50&min_acceptable=70&min_good=80)](https://versae-master.dev.libriciel.net/coverage/versae/index.html) |
| [refae](https://gitlab.libriciel.fr/libriciel/pole-archivage/refae/refae) | [![build status](https://gitlab.libriciel.fr/libriciel/pole-archivage/refae/refae/badges/master/pipeline.svg)](https://gitlab.libriciel.fr/libriciel/pole-archivage/refae/refae/pipelines/latest) | [![coverage report](https://gitlab.libriciel.fr/libriciel/pole-archivage/refae/refae/badges/master/coverage.svg?min_medium=50&min_acceptable=70&min_good=80)](https://refae-master.dev.libriciel.net/coverage/refae/index.html) |
## Description
......
src/Http/Session/DatabaseSession.php
View file @ 76c10c43
......@@ -37,7 +37,10 @@ class DatabaseSession extends CakeDatabaseSession
if (preg_match($regex, $data, $m)) {
/** @var string $pkField */
$pkField = $this->_table->getPrimaryKey();
$this->_table->deleteAll([$pkField . ' !=' => $id, 'token' => $m[1]]);
$oldEntity = $this->_table->find()->where([$pkField . ' !=' => $id, 'token' => $m[1]])->first();
if ($oldEntity) {
return parent::write($oldEntity->id, $data);
}
}
return parent::write($id, $data);
}
......
src/Utility/Session.php
View file @ 76c10c43
......@@ -6,6 +6,7 @@
namespace AsalaeCore\Utility;
use AsalaeCore\Factory\Utility;
use Cake\Datasource\EntityInterface;
use Cake\Log\Log;
use Cake\ORM\TableRegistry;
use Cake\Utility\Security;
......@@ -88,7 +89,6 @@ class Session
&& !in_array($data['key'], $resets)
&& $data['expire'] > strtotime(date('Y-m-d H:i:s'))
) {
$session->renew();
if (!$getUserFn) {
$getUserFn = [self::class, 'getGenericSessionUser'];
}
......@@ -104,9 +104,9 @@ class Session
/**
* Donne l'utilisateur à placer dans la clé Auth (de la session)
* @param int $user_id
* @return array
* @return EntityInterface
*/
private static function getGenericSessionUser(int $user_id): array
private static function getGenericSessionUser(int $user_id): EntityInterface
{
return TableRegistry::getTableLocator()->get('Users')
->find()
......@@ -121,7 +121,7 @@ class Session
'Roles',
]
)
->toArray();
->first();
}
/**
......