Comment: | Fix PHP 8.1 depreciations |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk | stable |
Files: | files | file ages | folders |
SHA3-256: |
ef43b2a231a86af9e9781cbcd5c8075a |
User & Date: | bohwaz on 2022-02-01 23:31:19 |
Other Links: | manifest | tags |
2022-02-01
| ||
23:50 | Fix phpstan suggestions check-in: dc6013583c user: bohwaz tags: trunk, stable | |
23:31 | Fix PHP 8.1 depreciations check-in: ef43b2a231 user: bohwaz tags: trunk, stable | |
2022-01-29
| ||
22:27 | Fix import of analytical projects in custom CSV import check-in: fff0f2d011 user: bohwaz tags: trunk, stable | |
Modified src/include/lib/Garradin/Install.php from [71063dd4ee] to [d64a069fc2].
︙ | ︙ | |||
70 71 72 73 74 75 76 | if ($ok) { // Force l'installation de plugin système Plugin::checkAndInstallSystemPlugins(); } | | | 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 | if ($ok) { // Force l'installation de plugin système Plugin::checkAndInstallSystemPlugins(); } if (defined('\Garradin\LOCAL_LOGIN') && \Garradin\LOCAL_LOGIN) { Session::getInstance()->refresh(); } @unlink(CACHE_ROOT . '/reset'); Utils::redirect('!config/advanced/?msg=RESET'); } |
︙ | ︙ |
Modified src/include/lib/Garradin/UserTemplate/CommonModifiers.php from [86761f9ede] to [8e1df65a53].
︙ | ︙ | |||
88 89 90 91 92 93 94 | } return strftime($format, $ts->getTimestamp()); } static public function date($ts, string $format = null, string $locale = 'fr'): ?string { | | | | < | | 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 | } return strftime($format, $ts->getTimestamp()); } static public function date($ts, string $format = null, string $locale = 'fr'): ?string { if (null === $format) { $format = 'd/m/Y à H:i'; } elseif (preg_match('/^DATE_[\w\d]+$/', $format)) { $format = constant('DateTime::' . $format); } if ($locale == 'fr') { return Utils::date_fr($ts, $format); } $ts = Utils::get_datetime($ts); |
︙ | ︙ |
Modified src/include/lib/Garradin/Utils.php from [c57af14dea] to [c38332713c].
︙ | ︙ | |||
962 963 964 965 966 967 968 | $a = strtoupper(self::transliterateToAscii($a)); $b = strtoupper(self::transliterateToAscii($b)); return strcmp($a, $b); } | | | 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 | $a = strtoupper(self::transliterateToAscii($a)); $b = strtoupper(self::transliterateToAscii($b)); return strcmp($a, $b); } static public function utf8_encode(string $str) { // Check if string is already UTF-8 encoded or not return !preg_match('//u', $str) ? utf8_encode($str) : $str; } /** * Transforms a unicode string to lowercase AND removes all diacritics |
︙ | ︙ |
Modified src/www/admin/common/search.php from [3d91096201] to [4f62b55a04].
︙ | ︙ | |||
18 19 20 21 22 23 24 | 'order' => f('order') ?: $recherche->getDefaultOrder($target), 'limit' => f('limit') ?: 100, 'desc' => $recherche->getDefaultDesc($target), ]; $query->desc = (bool) f('desc'); | | | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | 'order' => f('order') ?: $recherche->getDefaultOrder($target), 'limit' => f('limit') ?: 100, 'desc' => $recherche->getDefaultDesc($target), ]; $query->desc = (bool) f('desc'); $text_query = trim((string) qg('qt')); $result = null; $sql_query = null; $search = null; $id = f('id') ?: qg('id'); $is_unprotected = false; |
︙ | ︙ |
Modified src/www/admin/config/edit_file.php from [15de1c6be2] to [7ce9030a67].
︙ | ︙ | |||
26 27 28 29 30 31 32 | $form->runIf('reset', function () use ($key, $config) { $config->setFile($key, null); $config->save(); }, $csrf_key, Utils::getSelfURI()); $form->runIf('save', function () use ($key, $config) { | | | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | $form->runIf('reset', function () use ($key, $config) { $config->setFile($key, null); $config->save(); }, $csrf_key, Utils::getSelfURI()); $form->runIf('save', function () use ($key, $config) { $content = trim((string) f('content')); $config->setFile($key, $content === '' ? null : $content); $config->save(); if (qg('js') !== null) { die('{"success":true}'); } |
︙ | ︙ |
Modified src/www/admin/docs/index.php from [7fe6a0182d] to [1b21a8a97c].
1 2 3 4 5 6 7 8 9 10 11 | <?php namespace Garradin; use Garradin\Files\Files; use Garradin\Files\Transactions; use Garradin\Files\Users; use Garradin\Entities\Files\File; require_once __DIR__ . '/_inc.php'; | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | <?php namespace Garradin; use Garradin\Files\Files; use Garradin\Files\Transactions; use Garradin\Files\Users; use Garradin\Entities\Files\File; require_once __DIR__ . '/_inc.php'; $path = qg('path') ?: File::CONTEXT_DOCUMENTS; $context = Files::getContext($path); $context_ref = Files::getContextRef($path); $list = null; // Specific lists for some contexts if ($context == File::CONTEXT_TRANSACTION) { |
︙ | ︙ |
Modified src/www/admin/docs/new_dir.php from [d8847a425e] to [5427985226].
1 2 3 4 5 6 7 8 9 | <?php namespace Garradin; use Garradin\Files\Files; use Garradin\Entities\Files\File; require_once __DIR__ . '/_inc.php'; | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | <?php namespace Garradin; use Garradin\Files\Files; use Garradin\Entities\Files\File; require_once __DIR__ . '/_inc.php'; $parent = qg('path'); if (!File::checkCreateAccess($parent, $session)) { throw new UserException('Vous n\'avez pas le droit de créer de répertoire ici.'); } $csrf_key = 'create_dir'; $form->runIf('create', function () use ($parent) { $name = trim((string) f('name')); File::validatePath($parent . '/' . $name); $f = File::createDirectory($parent, $name); $url = '!docs/?path=' . $f->path; if (null !== qg('_dialog')) { Utils::reloadParentFrame($url); |
︙ | ︙ |
Modified src/www/admin/docs/new_file.php from [4505ff7d98] to [8c1dc0d614].
1 2 3 4 5 6 7 8 9 | <?php namespace Garradin; use Garradin\Files\Files; use Garradin\Entities\Files\File; require_once __DIR__ . '/_inc.php'; | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | <?php namespace Garradin; use Garradin\Files\Files; use Garradin\Entities\Files\File; require_once __DIR__ . '/_inc.php'; $parent = qg('path'); if (!File::checkCreateAccess($parent, $session)) { throw new UserException('Vous n\'avez pas le droit de créer de répertoire ici.'); } $csrf_key = 'create_file'; $form->runIf('create', function () use ($parent) { $name = trim((string) f('name')); if (!strpos($name, '.')) { $name .= '.skriv'; } File::validatePath($parent . '/' . $name); $name = File::filterName($name); |
︙ | ︙ |
Modified src/www/admin/docs/search.php from [553721a33e] to [8ca80671b0].
1 2 3 4 5 6 7 8 | <?php namespace Garradin; use Garradin\Files\Files; use Garradin\Entities\Files\File; require_once __DIR__ . '/_inc.php'; | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 | <?php namespace Garradin; use Garradin\Files\Files; use Garradin\Entities\Files\File; require_once __DIR__ . '/_inc.php'; $q = trim((string) f('q')); $tpl->assign('query', $q); if ($q) { $r = Files::search($q, File::CONTEXT_DOCUMENTS . '%'); $tpl->assign('results', $r); $tpl->assign('results_count', count($r)); |
︙ | ︙ |
Modified src/www/admin/docs/zip.php from [21577262c1] to [9c06488dfb].
1 2 3 4 5 6 7 8 9 10 11 | <?php namespace Garradin; use Garradin\Files\Files; use Garradin\Files\Transactions; use Garradin\Files\Users; use Garradin\Entities\Files\File; require_once __DIR__ . '/_inc.php'; | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | <?php namespace Garradin; use Garradin\Files\Files; use Garradin\Files\Transactions; use Garradin\Files\Users; use Garradin\Entities\Files\File; require_once __DIR__ . '/_inc.php'; $path = qg('path') ?: File::CONTEXT_DOCUMENTS; $name = preg_replace('/[^\p{L}_-]+/i', '_', $path); $name = sprintf('%s - Fichiers - %s.zip', Config::getInstance()->get('nom_asso'), $name); header('Content-type: application/zip'); header(sprintf('Content-Disposition: attachment; filename="%s"', $name)); Files::zip($path, $session); |
Modified src/www/admin/login.php from [052d532ffd] to [0c05de3b09].
︙ | ︙ | |||
26 27 28 29 30 31 32 | } $champs = $config->get('champs_membres'); $id_field = (object) $champs->get($config->get('champ_identifiant')); $id_field_name = $id_field->title; $form->runIf('login', function () use ($id_field_name, $session) { | | | | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | } $champs = $config->get('champs_membres'); $id_field = (object) $champs->get($config->get('champ_identifiant')); $id_field_name = $id_field->title; $form->runIf('login', function () use ($id_field_name, $session) { if (!trim((string) f('_id'))) { throw new UserException(sprintf('L\'identifiant (%s) n\'a pas été renseigné.', $id_field_name)); } if (!trim((string) f('password'))) { throw new UserException('Le mot de passe n\'a pas été renseigné.'); } if (!$session->login(f('_id'), f('password'), (bool) f('permanent'))) { throw new UserException(sprintf("Connexion impossible.\nVérifiez votre identifiant (%s) et votre mot de passe.", $id_field_name)); } }, 'login', ADMIN_URL); |
︙ | ︙ |
Modified src/www/admin/password.php from [8dbf35c476] to [85043868d0].
1 2 3 4 5 6 7 8 | <?php namespace Garradin; const LOGIN_PROCESS = true; require_once __DIR__ . '/_inc.php'; | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 | <?php namespace Garradin; const LOGIN_PROCESS = true; require_once __DIR__ . '/_inc.php'; if (qg('c')) { if (!$session->recoverPasswordCheck(qg('c'))) { $form->addError('Le lien que vous avez suivi est invalide ou a expiré.'); } else { |
︙ | ︙ | |||
34 35 36 37 38 39 40 | { $form->check('recoverPassword', [ 'id' => 'required' ]); if (!$form->hasErrors()) { | | | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | { $form->check('recoverPassword', [ 'id' => 'required' ]); if (!$form->hasErrors()) { if (f('id') && $session->recoverPasswordSend(f('id'))) { Utils::redirect(ADMIN_URL . 'password.php?sent'); } $form->addError('Ce membre n\'a pas d\'adresse email enregistrée ou n\'a pas le droit de se connecter.'); } } |
︙ | ︙ |
Modified src/www/admin/web/config.php from [3dd1c46ed9] to [2f908bf8b1].
︙ | ︙ | |||
27 28 29 30 31 32 33 | return; } Skeleton::resetSelected(f('select')); }, 'squelettes', Utils::getSelfURI('reset_ok')); if (qg('edit')) { | | | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | return; } Skeleton::resetSelected(f('select')); }, 'squelettes', Utils::getSelfURI('reset_ok')); if (qg('edit')) { $source = qg('edit'); $csrf_key = 'edit_skel_' . md5($source); $form->runIf('save', function () use ($source) { $tpl = new Skeleton($source); $tpl->edit(f('content')); $fullscreen = null !== qg('fullscreen') ? '#fullscreen' : ''; Utils::redirect(Utils::getSelfURI(sprintf('edit=%s&ok%s', rawurlencode($source), $fullscreen))); |
︙ | ︙ |
Modified src/www/admin/web/search.php from [7ffb84ef47] to [1a70f9e5ce].
1 2 3 4 5 6 7 8 | <?php namespace Garradin; use Garradin\Web\Web; use Garradin\Entities\Web\Page; require_once __DIR__ . '/_inc.php'; | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 | <?php namespace Garradin; use Garradin\Web\Web; use Garradin\Entities\Web\Page; require_once __DIR__ . '/_inc.php'; $q = trim((string) f('q')); $tpl->assign('query', $q); if ($q) { $r = Web::search($q); $tpl->assign('results', $r); $tpl->assign('results_count', count($r)); |
︙ | ︙ |