From 47ea918c5f1eef306e4e411137430eec23b688b1 Mon Sep 17 00:00:00 2001 From: x2003bruneau Date: Wed, 28 Mar 2007 12:01:11 +0000 Subject: [PATCH] Add color capability to miniwiki (syntax {color|text|}) git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1626 839d8a87-29fc-0310-9880-83ba4fa771e5 --- classes/miniwiki.php | 72 +++++++++++++++++++++++++--------------------- templates/events/index.tpl | 4 +-- 2 files changed, 40 insertions(+), 36 deletions(-) diff --git a/classes/miniwiki.php b/classes/miniwiki.php index a267379..2fc500d 100644 --- a/classes/miniwiki.php +++ b/classes/miniwiki.php @@ -7,16 +7,19 @@ class MiniWiki private static $replacementHTML = array(); private static $replacementText = array(); + private static $title_index = -1; private static $info = array(); - public static function Markup($id, $pattern, $replacement, $replacementTxt, $info = null) + public static function Markup($pattern, $replacement, $replacementTxt, $info = null) { + $id = count(MiniWiki::$patternsWiki); MiniWiki::$patternsWiki[$id] = $pattern; MiniWiki::$replacementHTML[$id] = $replacement; MiniWiki::$replacementText[$id] = $replacementTxt; if ($info) { MiniWiki::$info[$id] = $info; } + return $id; } public static function init() @@ -24,65 +27,68 @@ class MiniWiki if (isset(MiniWiki::$patternsWiki[0])) { return; } - MiniWiki::Markup(0, "/(\r\n|\r([^\n]))/", "\n$2", "\n$2"); + MiniWiki::Markup("/(\r\n|\r([^\n]))/", "\n$2", "\n$2"); // retours à la ligne avec \\ - MiniWiki::Markup(1, "/\\\\(?".">(\\\\*))\n/e", "str_repeat('
\n',strlen('$1'))", "str_repeat('\n',strlen('$1'))", "ligne1\\\\\nligne2"); + MiniWiki::Markup("/\\\\(?".">(\\\\*))\n/e", "str_repeat('
\n',strlen('$1'))", "str_repeat('\n',strlen('$1'))", "ligne1\\\\\nligne2"); // bold, italic and others // ''' bold ''' - MiniWiki::Markup(2, "/'''(.*?)'''/",'$1','*$1*', "'''gras'''"); + MiniWiki::Markup("/'''(.*?)'''/",'$1','*$1*', "'''gras'''"); // '' italic '' - MiniWiki::Markup(3, "/''(.*?)''/",'$1','/$1/', "''italique''"); + MiniWiki::Markup("/''(.*?)''/",'$1','/$1/', "''italique''"); // '+ big +' - MiniWiki::Markup(4, "/'\\+(.*?)\\+'/",'$1','*$1*', "'+grand+'"); + MiniWiki::Markup("/'\\+(.*?)\\+'/",'$1','*$1*', "'+grand+'"); // '- small -' - MiniWiki::Markup(5, "/'\\-(.*?)\\-'/",'$1','$1', "'-petit-'"); + MiniWiki::Markup("/'\\-(.*?)\\-'/",'$1','$1', "'-petit-'"); // '^superscript^' - MiniWiki::Markup(6, "/'\\^(.*?)\\^'/",'$1','$1', "'^exposant^'"); + MiniWiki::Markup("/'\\^(.*?)\\^'/",'$1','$1', "'^exposant^'"); // '_subscript_' - MiniWiki::Markup(7, "/'_(.*?)_'/",'$1','$1', "'_indice_'"); + MiniWiki::Markup("/'_(.*?)_'/",'$1','$1', "'_indice_'"); // {+ underline +} - MiniWiki::Markup(8, "/\\{\\+(.*?)\\+\\}/",'$1','_$1_', "{+insertion+}"); + MiniWiki::Markup("/\\{\\+(.*?)\\+\\}/",'$1','_$1_', "{+insertion+}"); // {- strikeout -} - MiniWiki::Markup(9, "/\\{-(.*?)-\\}/",'$1','-$1-', "{-suppression-}"); + MiniWiki::Markup("/\\{-(.*?)-\\}/",'$1','-$1-', "{-suppression-}"); + // {color| colored text |} + MiniWiki::Markup("/\{([a-z]+|\#[0-9a-f]{3,6})\|(.*?)\|\}/i", "$2", "$2", + "{red|rouge|} {#ff0|jaune|} {#0000ff|bleu|}"); // [+ big +] [++ bigger ++] [+++ even bigger +++] ... - MiniWiki::Markup(10, "/\\[(([-+])+)(.*?)\\1\\]/e","'$3'", "'$3'", "[+ grand +]\n\n[++ plus grand ++]\n\n[+++ encore plus grand +++]"); + MiniWiki::Markup("/\\[(([-+])+)(.*?)\\1\\]/e","'$3'", "'$3'", "[+ grand +]\n\n[++ plus grand ++]\n\n[+++ encore plus grand +++]"); // -----
- MiniWiki::Markup(11, "/(\n|^)--(--+| \n)/s", '$1
', '$1-- '."\n", "----\n"); + MiniWiki::Markup("/(\n|^)--(--+| \n)/s", '$1
', '$1-- '."\n", "----\n"); // titles - MiniWiki::Markup(12, '/(\n|^)(!+)([^\n]*)/se', "'$1$3'", "'$1$3'", - "!titre1\n\n!!titre2\n\n!!!titre3"); + MiniWiki::$title_index = MiniWiki::Markup('/(\n|^)(!+)([^\n]*)/se', "'$1$3'", + "'$1$3'", "!titre1\n\n!!titre2\n\n!!!titre3"); // * unordered list - MiniWiki::Markup(13, "/(^|\n)\*(([^\n]*(\n|$))(\*[^\n]*(\n|$))*)/se", "''", "$0", "* element1\n* element2\n* element3"); + MiniWiki::Markup("/(^|\n)\*(([^\n]*(\n|$))(\*[^\n]*(\n|$))*)/se", "''", "$0", "* element1\n* element2\n* element3"); // # unordered list - MiniWiki::Markup(14, "/(^|\n)#(([^\n]*(\n|$))(#[^\n]*(\n|$))*)/se", "'
  1. '.str_replace(\"\\n#\",'
  2. ','$2').'
'", "$0", "# element1\n# element2\n# element3"); + MiniWiki::Markup("/(^|\n)#(([^\n]*(\n|$))(#[^\n]*(\n|$))*)/se", "'
  1. '.str_replace(\"\\n#\",'
  2. ','$2').'
'", "$0", "# element1\n# element2\n# element3"); // links - MiniWiki::Markup(15, '/((?:https?|ftp):\/\/(?:\.*,*[\w@~%$£µ&i#\-+=_\/\?;])*)/ui', '\\0', '[\\0]'); - MiniWiki::Markup(16, '/(\s|^|\\[\\[)www\.((?:\.*,*[\w@~%$£µ&i#\-+=_\/\?;])*)/iu', '\\1www.\\2', '[http://www.\\2]'); - MiniWiki::Markup(17, '/(?:mailto:)?([a-z0-9.\-+_]+@([\-.+_]?[a-z0-9])+)/i', '\\0', '[mailto:\\0]'); - MiniWiki::Markup(18, '/\\[\\[\\s*.*<\/a>\\s*\|([^\\]]+)\\]\\]/i', '\\2', '\\2 [\\1]', "[[http://www.example.com|Mon site web]]\n\nhttp://www.example.com\n\ntest@example.com"); + MiniWiki::Markup('/((?:https?|ftp):\/\/(?:\.*,*[\w@~%$£µ&i#\-+=_\/\?;])*)/ui', '\\0', '[\\0]'); + MiniWiki::Markup('/(\s|^|\\[\\[)www\.((?:\.*,*[\w@~%$£µ&i#\-+=_\/\?;])*)/iu', '\\1www.\\2', '[http://www.\\2]'); + MiniWiki::Markup('/(?:mailto:)?([a-z0-9.\-+_]+@([\-.+_]?[a-z0-9])+)/i', '\\0', '[mailto:\\0]'); + MiniWiki::Markup('/\\[\\[\\s*.*<\/a>\\s*\|([^\\]]+)\\]\\]/i', '\\2', '\\2 [\\1]', "[[http://www.example.com|Mon site web]]\n\nhttp://www.example.com\n\ntest@example.com"); // paragraphs and empty lines - MiniWiki::Markup(19, "/\n\n/", '

', "\n\n", "paragraphe1\n\nparagraphe2"); - MiniWiki::Markup(20, "/\n/", ' ', "\n"); - MiniWiki::Markup(21, "/^.*<\/p>

.*$/s", "

$0

", "$0"); + MiniWiki::Markup("/\n\n/", '

', "\n\n", "paragraphe1\n\nparagraphe2"); + MiniWiki::Markup("/\n/", ' ', "\n"); + MiniWiki::Markup("/^.*<\/p>

.*$/s", "

$0

", "$0"); } public static function WikiToHTML($wiki, $title = false) { if (!$title) { - $oldrule12 = MiniWiki::$replacementHTML[12]; - MiniWiki::$replacementHTML[12] = "'$0'"; + $oldrule12 = MiniWiki::$replacementHTML[MiniWiki::$title_index]; + MiniWiki::$replacementHTML[MiniWiki::$title_index] = "'$0'"; } $html = preg_replace(MiniWiki::$patternsWiki, MiniWiki::$replacementHTML, htmlentities(trim($wiki), ENT_COMPAT, 'UTF-8')); if (!$title) { - MiniWiki::$replacementHTML[12] = $oldrule12; + MiniWiki::$replacementHTML[MiniWiki::$title_index] = $oldrule12; } return $html; } @@ -135,12 +141,12 @@ class MiniWiki public static function WikiToText($wiki, $just=false, $indent=0, $width=68, $title=false) { if (!$title) { - $oldrule12 = MiniWiki::$replacementHTML[12]; - MiniWiki::$replacementHTML[12] = "'$0'"; + $oldrule12 = MiniWiki::$replacementHTML[MiniWiki::$title_index]; + MiniWiki::$replacementHTML[MiniWiki::$title_index] = "'$0'"; } $text = preg_replace(MiniWiki::$patternsWiki, MiniWiki::$replacementText, trim($wiki)); if (!$title) { - MiniWiki::$replacementHTML[12] = $oldrule12; + MiniWiki::$replacementHTML[MiniWiki::$title_index] = $oldrule12; } $text = $just ? MiniWiki::justify($text,$width-$indent) : wordwrap($text,$width-$indent); if($indent) { @@ -153,8 +159,8 @@ class MiniWiki static public function help($with_title = false) { if (!$with_title) { - $info12 = MiniWiki::$info[12]; - unset(MiniWiki::$info[12]); + $info12 = MiniWiki::$info[MiniWiki::$title_index]; + unset(MiniWiki::$info[MiniWiki::$title_index]); } $res = array(); @@ -163,7 +169,7 @@ class MiniWiki } if (!$with_title) { - MiniWiki::$info[12] = $info12; + MiniWiki::$info[MiniWiki::$title_index] = $info12; } return $res; } diff --git a/templates/events/index.tpl b/templates/events/index.tpl index c1fcb5a..34d081d 100644 --- a/templates/events/index.tpl +++ b/templates/events/index.tpl @@ -196,9 +196,7 @@ Bienvenue {$smarty.session.prenom} {/if}
- {tidy} - {$ev.texte|smarty:nodefaults|nl2br} - {/tidy} + {$ev.texte|smarty:nodefaults|nl2br}
-- 2.1.4