Overview
Comment: | Fix upgrade for 1.2.0-alpha |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | dev |
Files: | files | file ages | folders |
SHA3-256: |
f778c81044131543f92e8557571d72c2 |
User & Date: | bohwaz on 2022-08-14 23:37:08 |
Other Links: | branch diff | manifest | tags |
Context
2022-08-15
| ||
00:08 | Fix missing tables from templates branch, fix multiple issues with membres table being removed check-in: ac78239b94 user: bohwaz tags: dev | |
2022-08-14
| ||
23:37 | Fix upgrade for 1.2.0-alpha check-in: f778c81044 user: bohwaz tags: dev | |
23:22 | Move static methods from File to Files, make create methods easier to use check-in: ac80448801 user: bohwaz tags: dev | |
Changes
Modified src/include/lib/Garradin/Entity.php from [bcf866d06b] to [4081a66519].
︙ | ︙ | |||
47 48 49 50 51 52 53 | } protected function filterUserValue(string $type, $value, string $key) { if ($type == 'date') { return self::filterUserDateValue($value); } | | | 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | } protected function filterUserValue(string $type, $value, string $key) { if ($type == 'date') { return self::filterUserDateValue($value); } elseif ($type == 'DateTime' && is_string($value)) { if (preg_match('!^\d{2}/\d{2}/\d{4}\s\d{1,2}:\d{2}$!', $value)) { return \DateTime::createFromFormat('d/m/Y H:i', $value); } } return parent::filterUserValue($type, $value, $key); } |
︙ | ︙ |
Modified src/include/lib/Garradin/Files/Files.php from [51c0d15bc1] to [1b61527553].
1 2 3 4 5 6 7 8 9 10 11 12 13 | <?php namespace Garradin\Files; use Garradin\Static_Cache; use Garradin\DB; use Garradin\Utils; use Garradin\UserException; use Garradin\ValidationException; use Garradin\Users\Session; use Garradin\Entities\Files\File; use Garradin\Entities\Web\Page; | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | <?php namespace Garradin\Files; use Garradin\Static_Cache; use Garradin\DB; use Garradin\Plugin; use Garradin\Utils; use Garradin\UserException; use Garradin\ValidationException; use Garradin\Users\Session; use Garradin\Entities\Files\File; use Garradin\Entities\Web\Page; |
︙ | ︙ | |||
567 568 569 570 571 572 573 | /** * Create a new directory * @param string $parent Target parent path * @param string $name Target name * @param bool $create_parent Create parent directories if they don't exist * @return self */ | | > > | > | < > > | | 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 | /** * Create a new directory * @param string $parent Target parent path * @param string $name Target name * @param bool $create_parent Create parent directories if they don't exist * @return self */ static public function mkdir(string $path, bool $create_parent = true): File { $path = trim($path, '/'); $parent = Utils::dirname($path); $name = Utils::basename($path); $name = File::filterName($name); $path = $parent . '/' . $name; File::validatePath($path); Files::checkQuota(); if (self::exists($path)) { throw new ValidationException('Le nom de répertoire choisi existe déjà: ' . $path); } if ($parent !== '' && $create_parent) { self::ensureDirectoryExists($parent); } $file = new File; $type = $file::TYPE_DIRECTORY; $file->import(compact('path', 'name', 'parent') + [ 'type' => file::TYPE_DIRECTORY, 'image' => false, ]); $file->modified = new \DateTime; Files::callStorage('mkdir', $file); Plugin::fireSignal('files.mkdir', compact('file')); return $file; } static public function ensureDirectoryExists(string $path): void { $db = DB::getInstance(); $parts = explode('/', $path); $tree = ''; foreach ($parts as $part) { $tree = trim($tree . '/' . $part, '/'); $exists = $db->test(File::TABLE, 'type = ? AND path = ?', File::TYPE_DIRECTORY, $tree); if (!$exists) { try { self::mkdir($tree, false); } catch (ValidationException $e) { // Ignore when directory already exists } } } } } |
Modified src/include/lib/Garradin/Upgrade.php from [906572b7f6] to [22a5fe2755].
︙ | ︙ | |||
162 163 164 165 166 167 168 | $files = $db->firstColumn('SELECT value FROM config WHERE key = \'files\';'); $files = json_decode($files); $files->signature = null; $db->exec(sprintf('REPLACE INTO config (key, value) VALUES (\'files\', %s);', $db->quote(json_encode($files)))); // Move skeletons from skel/ to skel/web/ // Don't use Files::get to get around validatePath security | | > | > > > | > > > > | 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 | $files = $db->firstColumn('SELECT value FROM config WHERE key = \'files\';'); $files = json_decode($files); $files->signature = null; $db->exec(sprintf('REPLACE INTO config (key, value) VALUES (\'files\', %s);', $db->quote(json_encode($files)))); // Move skeletons from skel/ to skel/web/ // Don't use Files::get to get around validatePath security $list = Files::list(File::CONTEXT_SKELETON); foreach ($list as $file) { if ($file->name == 'web') { continue; } $file->move(File::CONTEXT_SKELETON . '/web'); if ($file->type == $file::TYPE_DIRECTORY) { continue; } // Prepend "./" to includes functions file parameter foreach (Files::list(File::CONTEXT_SKELETON . '/web') as $file) { if ($file->type != File::TYPE_FILE || !preg_match('/\.(?:txt|css|js|html|htm)$/', $file->name)) { continue; } |
︙ | ︙ |
Modified src/include/lib/Garradin/UserTemplate/CommonModifiers.php from [41de487e17] to [b348dfd20e].
︙ | ︙ | |||
344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 | if ($type == 'date' && is_object($current_value) && $current_value instanceof \DateTimeInterface) { $current_value = $current_value->format('d/m/Y'); } elseif ($type == 'time' && is_object($current_value) && $current_value instanceof \DateTimeInterface) { $current_value = $current_value->format('H:i'); } elseif ($type == 'date' && is_string($current_value)) { if ($v = \DateTime::createFromFormat('!Y-m-d', $current_value)) { $current_value = $v->format('d/m/Y'); } elseif ($v = \DateTime::createFromFormat('!Y-m-d H:i:s', $current_value)) { $current_value = $v->format('d/m/Y'); } elseif ($v = \DateTime::createFromFormat('!Y-m-d H:i', $current_value)) { $current_value = $v->format('d/m/Y'); } } elseif ($type == 'time' && is_string($current_value)) { if ($v = \DateTime::createFromFormat('!Y-m-d H:i:s', $current_value)) { $current_value = $v->format('H:i'); } elseif ($v = \DateTime::createFromFormat('!Y-m-d H:i', $current_value)) { $current_value = $v->format('H:i'); } } | > > > > < < < | 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 | if ($type == 'date' && is_object($current_value) && $current_value instanceof \DateTimeInterface) { $current_value = $current_value->format('d/m/Y'); } elseif ($type == 'time' && is_object($current_value) && $current_value instanceof \DateTimeInterface) { $current_value = $current_value->format('H:i'); } elseif ($type == 'password') { $current_value = null; } // FIXME: is this still needed? elseif ($type == 'date' && is_string($current_value)) { if ($v = \DateTime::createFromFormat('!Y-m-d', $current_value)) { $current_value = $v->format('d/m/Y'); } elseif ($v = \DateTime::createFromFormat('!Y-m-d H:i:s', $current_value)) { $current_value = $v->format('d/m/Y'); } elseif ($v = \DateTime::createFromFormat('!Y-m-d H:i', $current_value)) { $current_value = $v->format('d/m/Y'); } } elseif ($type == 'time' && is_string($current_value)) { if ($v = \DateTime::createFromFormat('!Y-m-d H:i:s', $current_value)) { $current_value = $v->format('H:i'); } elseif ($v = \DateTime::createFromFormat('!Y-m-d H:i', $current_value)) { $current_value = $v->format('H:i'); } } $attributes['id'] = 'f_' . str_replace(['[', ']'], '', $name); $attributes['name'] = $name; if (!isset($attributes['autocomplete']) && ($type == 'money' || $type == 'password')) { $attributes['autocomplete'] = 'off'; } |
︙ | ︙ |
Modified src/www/admin/docs/new_dir.php from [09f7338d53] to [b38b615fa6].
︙ | ︙ | |||
13 14 15 16 17 18 19 | 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')); | | | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | 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')); $f = File::mkdir($parent . '/' . $name); $url = '!docs/?path=' . $f->path; if (null !== qg('_dialog')) { Utils::reloadParentFrame($url); } Utils::redirect($url); }, $csrf_key); $tpl->assign(compact('csrf_key')); $tpl->display('docs/new_dir.tpl'); |