X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fminiwiki.php;h=7e6898e114ea28def189bed86ef247ed4e81ed52;hb=d784d46540a498f5db214f30b0cefcd773cbb896;hp=5c0c176693863988421d25cb62ad293520877194;hpb=4e95f720b85c4446cddb0b173647d4a5e696b1f6;p=platal.git
diff --git a/classes/miniwiki.php b/classes/miniwiki.php
index 5c0c176..7e6898e 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,63 +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");
+
+ // * unordered list
+ MiniWiki::Markup("/(^|\n)\*(([^\n]*(\n|$))(\*[^\n]*(\n|$))*)/se", "'
', "\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, utf8_encode(htmlentities(utf8_decode(trim($wiki))))); + $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; } @@ -133,12 +141,17 @@ 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 = trim($wiki); + //foreach (MiniWiki::$patternsWiki as $key=>$pattern) { + // echo $key . " - " . $pattern . "\n"; + // $text = preg_replace($pattern, MiniWiki::$replacementText[$key], $text); + //} $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) { @@ -151,24 +164,17 @@ 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]); } - $i = 0; - $res = 'Syntaxe | Apparence |
---|---|
' . nl2br(htmlentities($value)) . ' | '; - $res .= '' . MiniWiki::wikiToHtml($value, true) . ' | '; - $res .= "