Move library/markdown.php to src

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index daa8c5e0488cd5e6cff72136247c73a74de23b02..73210860d2668f63604264b849f2319949274c17 100644 (file)
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -1,14 +1,12 @@
 <?php
 
-use Friendica\App;
+use Friendica\Content\Text\Markdown;
 use Friendica\Core\System;
 use Friendica\Model\Contact;
 use Friendica\Network\Probe;
-
 use League\HTMLToMarkdown\HtmlConverter;
 
 require_once 'include/event.php';
-require_once 'library/markdown.php';
 require_once 'include/html2bbcode.php';
 require_once 'include/bbcode.php';
 
@@ -58,7 +56,7 @@ function diaspora2bb($s) {
        // Escaping the hash tags
        $s = preg_replace('/\#([^\s\#])/', '&#35;$1', $s);
 
-       $s = Markdown($s);
+       $s = Markdown::convert($s);
 
        $regexp = "/@\{(?:([^\}]+?); )?([^\} ]+)\}/";
        $s = preg_replace_callback($regexp, 'diaspora_mention2bb', $s);

diff --git a/library/markdown.php b/library/markdown.php
deleted file mode 100644 (file)
index 308d91b..0000000
--- a/library/markdown.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * @file library/markdown.php
- *
- * @brief Parser for Markdown files
- */
-
-use \Michelf\MarkdownExtra;
-
-/**
- * @brief This function parses a text using php-markdown library to render Markdown syntax to HTML
- *
- * This function is using the php-markdown library by Michel Fortin to parse a
- * string ($text).It returns the rendered HTML code from that text. The optional
- * $hardwrap parameter is used to switch between inserting hard breaks after
- * every linefeed, which is required for Diaspora compatibility, or not. The
- * later is used for parsing documentation and README.md files.
- *
- * @param string $text
- * @param boolean $hardwrap
- * @return string
- */
-
-function Markdown($text, $hardwrap = true) {
-       $a = get_app();
-
-       $stamp1 = microtime(true);
-
-       $MarkdownParser = new MarkdownExtra();
-       $MarkdownParser->hard_wrap = $hardwrap;
-       $html = $MarkdownParser->transform($text);
-
-       $a->save_timestamp($stamp1, "parser");
-
-       return $html;
-}

diff --git a/mod/admin.php b/mod/admin.php
index e7463a3609e5873d5101cbc3b7743732de794ba0..81ede51c03e6157417aaf4be39b125967d2e9af5 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -4,10 +4,12 @@
  *
  * @brief Friendica admin
  */
+
 use Friendica\App;
 use Friendica\Content\Feature;
-use Friendica\Core\System;
+use Friendica\Content\Text\Markdown;
 use Friendica\Core\Config;
+use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Database\DBStructure;
@@ -1777,9 +1779,7 @@ function admin_page_plugins(App $a)
 
                $readme = Null;
                if (is_file("addon/$plugin/README.md")) {
-                       require_once 'library/markdown.php';
-                       $readme = file_get_contents("addon/$plugin/README.md");
-                       $readme = Markdown($readme, false);
+                       $readme = Markdown::convert(file_get_contents("addon/$plugin/README.md"), false);
                } elseif (is_file("addon/$plugin/README")) {
                        $readme = "<pre>" . file_get_contents("addon/$plugin/README") . "</pre>";
                }
@@ -2028,9 +2028,7 @@ function admin_page_themes(App $a)
 
                $readme = null;
                if (is_file("view/theme/$theme/README.md")) {
-                       require_once 'library/markdown.php';
-                       $readme = file_get_contents("view/theme/$theme/README.md");
-                       $readme = Markdown($readme, false);
+                       $readme = Markdown::convert(file_get_contents("view/theme/$theme/README.md"), false);
                } elseif (is_file("view/theme/$theme/README")) {
                        $readme = "<pre>" . file_get_contents("view/theme/$theme/README") . "</pre>";
                }

diff --git a/mod/babel.php b/mod/babel.php
index 2b8c379016cf40c15d6fed900aa5e10790db3e4f..a4fbd172eed6282015c2c3d7a0720fe9738b73cf 100644 (file)
--- a/mod/babel.php
+++ b/mod/babel.php
@@ -1,11 +1,11 @@
 <?php
 
-use Friendica\App;
+use Friendica\Content\Text\Markdown;
 
 require_once 'include/bbcode.php';
-require_once 'library/markdown.php';
 require_once 'include/bb2diaspora.php';
 require_once 'include/html2bbcode.php';
+require_once 'include/pgettext.php';
 
 function visible_lf($s)
 {
@@ -51,7 +51,7 @@ function babel_content()
                $o .= '<h2>' . t('bb2diaspora: ') . '</h2>' . EOL . EOL;
                $o .= visible_lf($diaspora) . EOL . EOL;
 
-               $html = Markdown($diaspora);
+               $html = Markdown::convert($diaspora);
                $o .= '<h2>' . t('bb2diaspora => Markdown: ') . '</h2>' . EOL . EOL;
                $o .= $html . EOL . EOL;
 

diff --git a/mod/help.php b/mod/help.php
index 9a4b275f956185f1890701b9329c2cb167fa209a..65221165fdd5d23e6c14645fa3ad13f447e2e27a 100644 (file)
--- a/mod/help.php
+++ b/mod/help.php
@@ -1,10 +1,9 @@
 <?php
 
 use Friendica\App;
+use Friendica\Content\Text\Markdown;
 use Friendica\Core\System;
 
-require_once('library/markdown.php');
-
 if (!function_exists('load_doc_file')) {
 
        function load_doc_file($s) {
@@ -50,7 +49,7 @@ function help_content(App $a) {
                $filename = "Home";
                $a->page['title'] = t('Help');
        } else {
-               $a->page['aside'] = Markdown($home, false);
+               $a->page['aside'] = Markdown::convert($home, false);
        }
 
        if (!strlen($text)) {
@@ -61,7 +60,7 @@ function help_content(App $a) {
                                ));
        }
 
-       $html = Markdown($text, false);
+       $html = Markdown::convert($text, false);
 
        if ($filename !== "Home") {
                // create TOC but not for home

diff --git a/src/Content/Text/Markdown.php b/src/Content/Text/Markdown.php
new file mode 100644 (file)
index 0000000..2615aa4
--- /dev/null
+++ b/src/Content/Text/Markdown.php
@@ -0,0 +1,39 @@
+<?php\r
+\r
+/**\r
+ * @file src/Content/Text/Markdown.php\r
+ */\r
+\r
+namespace Friendica\Content\Text;\r
+\r
+use Friendica\BaseObject;\r
+use Michelf\MarkdownExtra;\r
+\r
+/**\r
+ * Friendica-specific usage of Markdown\r
+ *\r
+ * @author Hypolite Petovan <mrpetovan@gmail.com>\r
+ */\r
+class Markdown extends BaseObject\r
+{\r
+       /**\r
+        * Converts a Markdown string into HTML. The hardwrap parameter maximizes\r
+        * compatibility with Diaspora in spite of the Markdown standard.\r
+        *\r
+        * @brief Converts a Markdown string into HTML\r
+        * @param string $text\r
+        * @param bool   $hardwrap\r
+        * @return string\r
+        */\r
+       public static function convert($text, $hardwrap = true) {\r
+               $stamp1 = microtime(true);\r
+\r
+               $MarkdownParser = new MarkdownExtra();\r
+               $MarkdownParser->hard_wrap = $hardwrap;\r
+               $html = $MarkdownParser->transform($text);\r
+\r
+               self::getApp()->save_timestamp($stamp1, "parser");\r
+\r
+               return $html;\r
+       }\r
+}\r