Overview
Comment: | Liste des pages par date de création + amélioration import syntaxe skriv et html |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
f9b744bba2d798dff3d8a7888491e708 |
User & Date: | bohwaz on 2015-04-14 15:33:43 |
Other Links: | manifest | tags |
Context
2015-04-14
| ||
16:26 | Modif pour pouvoir utiliser la galerie en dehors de l'admin check-in: 85814d3876 user: bohwaz tags: trunk | |
15:33 | Liste des pages par date de création + amélioration import syntaxe skriv et html check-in: f9b744bba2 user: bohwaz tags: trunk | |
14:29 | Taille de la base de données et des fichiers dedans check-in: 365930a10a user: bohwaz tags: trunk | |
Changes
Modified src/include/lib/Garradin/Utils.php from [edeec2e7a3] to [54935bb596].
︙ | ︙ | |||
406 407 408 409 410 411 412 | */ static public function SpipToSkriv($str) { $str = preg_replace('/(?<!\\\\)\{{3}(\V*)\}{3}/', '=== $1 ===', $str); $str = preg_replace('/(?<!\\\\)\{{2}(\V*)\}{2}/', '**$1**', $str); $str = preg_replace('/(?<!\\\\)\{(\V*)\}/', '\'\'$1\'\'', $str); $str = preg_replace('/(?<!\\\\)\[(.+?)->(.+?)\]/', '[[$1 | $2]]', $str); | | > > | 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 | */ static public function SpipToSkriv($str) { $str = preg_replace('/(?<!\\\\)\{{3}(\V*)\}{3}/', '=== $1 ===', $str); $str = preg_replace('/(?<!\\\\)\{{2}(\V*)\}{2}/', '**$1**', $str); $str = preg_replace('/(?<!\\\\)\{(\V*)\}/', '\'\'$1\'\'', $str); $str = preg_replace('/(?<!\\\\)\[(.+?)->(.+?)\]/', '[[$1 | $2]]', $str); $str = preg_replace('/(?<!\[)\[([^\[\]]+?)\]/', '[[$1]]', $str); return $str; } /** * Transforme les tags HTML basiques en tags SkrivML * @param string $str Texte d'entrée * @return string Texte transformé */ static public function HTMLToSkriv($str) { $str = preg_replace('/<h3>(\V*?)<\/h3>/', '=== $1 ===', $str); $str = preg_replace('/<b>(\V*)<\/b>/', '**$1**', $str); $str = preg_replace('/<strong>(\V*?)<\/strong>/', '**$1**', $str); $str = preg_replace('/<i>(\V*?)<\/i>/', '\'\'$1\'\'', $str); $str = preg_replace('/<em>(\V*?)<\/em>/', '\'\'$1\'\'', $str); $str = preg_replace('/<li>(\V*?)<\/li>/', '* $1', $str); $str = preg_replace('/<ul>|<\/ul>/', '', $str); $str = preg_replace('/<a href="([^"]*?)">(\V*?)<\/a>/', '[[$2 | $1]]', $str); return $str; } static public function mail($to, $subject, $content, $additional_headers = []) { // Création du contenu du message |
︙ | ︙ |
Modified src/include/lib/Garradin/Wiki.php from [93dce48266] to [21f2ef0119].
︙ | ︙ | |||
345 346 347 348 349 350 351 | || $ecriture == self::ECRITURE_NORMAL || $ecriture == $this->restriction_categorie) return true; return false; } | | > | | 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 | || $ecriture == self::ECRITURE_NORMAL || $ecriture == $this->restriction_categorie) return true; return false; } public function getList($parent = 0, $order_by_date = false) { $db = DB::getInstance(); $order = ($order_by_date ? 'date_creation DESC' : 'transliterate_to_ascii(titre) COLLATE NOCASE'); return $db->simpleStatementFetch( 'SELECT id, revision, uri, titre, strftime(\'%s\', date_creation) AS date_creation, strftime(\'%s\', date_modification) AS date_modification FROM wiki_pages WHERE parent = ? AND '.$this->_getLectureClause().' ORDER BY '.$order.' LIMIT 500;', SQLITE3_ASSOC, (int) $parent ); } public function getById($id) { |
︙ | ︙ |
Modified src/www/admin/wiki/index.php from [c8d1109620] to [5ccd0d2627].
︙ | ︙ | |||
19 20 21 22 23 24 25 | $tpl->assign('can_edit', $wiki->canWritePage(Wiki::ECRITURE_NORMAL)); $tpl->assign('can_read', true); } else { $tpl->assign('can_read', $wiki->canReadPage($page['droit_lecture'])); $tpl->assign('can_edit', $wiki->canWritePage($page['droit_ecriture'])); | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | $tpl->assign('can_edit', $wiki->canWritePage(Wiki::ECRITURE_NORMAL)); $tpl->assign('can_read', true); } else { $tpl->assign('can_read', $wiki->canReadPage($page['droit_lecture'])); $tpl->assign('can_edit', $wiki->canWritePage($page['droit_ecriture'])); $tpl->assign('children', $wiki->getList($page['uri'] == $config->get('accueil_wiki') ? 0 : $page['id'], true)); $tpl->assign('breadcrumbs', $wiki->listBackBreadCrumbs($page['id'])); $tpl->assign('auteur', $membres->getNom($page['contenu']['id_auteur'])); $images = Fichiers::listLinkedFiles(Fichiers::LIEN_WIKI, $page['id'], true); if ($images && !$page['contenu']['chiffrement']) { |
︙ | ︙ |