add jquery script, use it to autoload on xnet when xorg cookie is present

[platal.git] / classes / miniwiki.php

diff --git a/classes/miniwiki.php b/classes/miniwiki.php
index 7f0b76e..d17f097 100644 (file)
--- a/classes/miniwiki.php
+++ b/classes/miniwiki.php
@@ -20,7 +20,7 @@ class MiniWiki
         MiniWiki::Markup(0, "/(\r\n|\r([^\n]))/", "\n$2", "\n$2");
                 
         // retours à la ligne avec \\
-        MiniWiki::Markup(1, "/\\\\(?".">(\\\\*))\n/e", "str_repeat('<br />\n',strlen('$1'))", "str_repeat('\\\\n',strlen('$1'))");
+        MiniWiki::Markup(1, "/\\\\(?".">(\\\\*))\n/e", "str_repeat('<br />\n',strlen('$1'))", "str_repeat('\n',strlen('$1'))");
         
         // bold, italic and others
         // ''' bold '''
@@ -38,12 +38,12 @@ class MiniWiki
         // {+ underline +}
         MiniWiki::Markup(8, "/{+(.*?)+}/",'<ins>$1</ins>','_$1_');
         // {- strikeout -}
-        MiniWiki::Markup(9, "/{-(.*?)-}/",'<del>$1</del>','_$1_');
+        MiniWiki::Markup(9, "/{-(.*?)-}/",'<del>$1</del>','-$1-');
         // [+ big +] [++ bigger ++] [+++ even bigger +++] ...
         MiniWiki::Markup(10, '/\\[(([-+])+)(.*?)\\1\\]/e',"'<span style=\'font-size:'.(round(pow(6/5,$2strlen('$1'))*100,0)).'%\'>$3</span>'", "'$3'");
         
         // ----- <hr/>
-        MiniWiki::Markup(11, '/(\n|^)----+/s', '$1<hr/>', '$1----');
+        MiniWiki::Markup(11, '/(\n|^)----+/s', '$1<hr/>', '$1----'."\n");
         // titles
         MiniWiki::Markup(12, '/(\n|^)(!+)([^\n]*)/se', "'$1<h'.strlen('$2').'>$3</h'.strlen('$2').'>'", "'$1$3'");
         
@@ -53,10 +53,10 @@ class MiniWiki
         MiniWiki::Markup(14, "/(^|\n)#(([^\n]*(\n|$))(#[^\n]*(\n|$))*)/se", "'<ol><li>'.str_replace(\"\\n#\",'</li><li>','$2').'</li></ol>'", "$0");
         
         // links
-        MiniWiki::Markup(15, '/((?:https?|ftp):\/\/(?:\.*,*[\w@~%$£µ&i#\-+=_\/\?;])*)/ui', '<a href="\\0">\\0</a>', '\\0');
-        MiniWiki::Markup(16, '/(\s|^|\\[\\[)www\.((?:\.*,*[\w@~%$£µ&i#\-+=_\/\?;])*)/iu', '\\1<a href="http://www.\\2">www.\\2</a>', 'http://www.\\2');
-        MiniWiki::Markup(17, '/(?:mailto:)?([a-z0-9.\-+_]+@([\-.+_]?[a-z0-9])+)/i', '<a href="mailto:\\0">\\0</a>', '\\0');
-        MiniWiki::Markup(18, '/\\[\\[\\s*<a href="([^>]*)">.*<\/a>\\s*\|([^\\]]+)\\]\\]/i', '<a href="\\1">\\2</a>', '\\2 (\\1)');
+        MiniWiki::Markup(15, '/((?:https?|ftp):\/\/(?:\.*,*[\w@~%$£µ&i#\-+=_\/\?;])*)/ui', '<a href="\\0">\\0</a>', '[\\0]');
+        MiniWiki::Markup(16, '/(\s|^|\\[\\[)www\.((?:\.*,*[\w@~%$£µ&i#\-+=_\/\?;])*)/iu', '\\1<a href="http://www.\\2">www.\\2</a>', '[http://www.\\2]');
+        MiniWiki::Markup(17, '/(?:mailto:)?([a-z0-9.\-+_]+@([\-.+_]?[a-z0-9])+)/i', '<a href="mailto:\\0">\\0</a>', '[mailto:\\0]');
+        MiniWiki::Markup(18, '/\\[\\[\\s*<a href="([^>]*)">.*<\/a>\\s*\|([^\\]]+)\\]\\]/i', '<a href="\\1">\\2</a>', '\\2 [\\1]');
         
         // paragraphs and empty lines
         MiniWiki::Markup(19, "/\n\n/", '</p><p>', "\n\n");
@@ -64,17 +64,79 @@ class MiniWiki
         MiniWiki::Markup(21, "/^.*<\/p><p>.*$/s", "<p>$0</p>", "$0");
     }
 
-    public static function WikiToHTML($wiki, $notitle = false) {
-        if ($notitle) {
+    public static function WikiToHTML($wiki, $title = false) {
+        if (!$title) {
             $oldrule12 = MiniWiki::$replacementHTML[12];
             MiniWiki::$replacementHTML[12] = "'$0'";
         }
-        $html = preg_replace(MiniWiki::$patternsWiki, MiniWiki::$replacementHTML, htmlentities($wiki));
-        if ($notitle) {
+        $html = preg_replace(MiniWiki::$patternsWiki, MiniWiki::$replacementHTML, utf8_encode(htmlentities(utf8_decode(trim($wiki)))));
+        if (!$title) {
             MiniWiki::$replacementHTML[12] = $oldrule12;
         }
         return $html;
     }
+    
+    private function justify($text,$n)
+    {
+        $arr = explode("\n",wordwrap($text,$n));
+        $arr = array_map('trim',$arr);
+        $res = '';
+        foreach ($arr as $key => $line) {
+            $nxl       = isset($arr[$key+1]) ? trim($arr[$key+1]) : '';
+            $nxl_split = preg_split('! +!',$nxl);
+            $nxw_len   = count($nxl_split) ? strlen($nxl_split[0]) : 0;
+            $line      = trim($line);
+        
+            if (strlen($line)+1+$nxw_len < $n) {
+                $res .= "$line\n";
+                continue;
+            }
+            
+            if (preg_match('![.:;]$!',$line)) {
+                $res .= "$line\n";
+                continue;
+            }
+        
+            $tmp   = preg_split('! +!',trim($line));
+            $words = count($tmp);
+            if ($words <= 1) {
+                $res .= "$line\n";
+                continue;
+            }
+        
+            $len   = array_sum(array_map('strlen',$tmp));
+            $empty = $n - $len;
+            $sw    = floatval($empty) / floatval($words-1);
+            
+            $cur = 0;
+            $l   = '';
+            foreach ($tmp as $word) {
+                $l   .= $word;
+                $cur += $sw + strlen($word);
+                $l    = str_pad($l,intval($cur+0.5));
+            }
+            $res .= trim($l)."\n";
+        }
+        return trim($res);
+    }
+    
+
+    public static function WikiToText($wiki, $just=false, $indent=0, $width=68, $title=false) {
+        if (!$title) {
+            $oldrule12 = MiniWiki::$replacementHTML[12];
+            MiniWiki::$replacementHTML[12] = "'$0'";
+        }
+        $text = preg_replace(MiniWiki::$patternsWiki, MiniWiki::$replacementText, trim($wiki));
+        if (!$title) {
+            MiniWiki::$replacementHTML[12] = $oldrule12;
+        }
+        $text = $just ? MiniWiki::justify($text,$width-$indent) : wordwrap($text,$width-$indent);
+        if($indent) {
+            $ind = str_pad('',$indent);
+            $text = $ind.str_replace("\n","\n$ind",$text);
+        }
+        return $text;
+    }
 };
 
 MiniWiki::init();