Next pass at bootstrap conversion

Author: carlbennett

composer.json

@@ -50,6 +50,7 @@
         "ext-memcached": "*",
         "ext-pdo": "*",
         "php-64bit": "^7.2",
-        "phpmailer/phpmailer": "^6.0"
+        "phpmailer/phpmailer": "^6.0",
+        "erusev/parsedown": "^1.7"
     }
 }

composer.lock

@@ -2,19 +2,19 @@
 
 namespace BNETDocs\Libraries;
 
-use \CarlBennett\MVC\Libraries\Database;
-use \CarlBennett\MVC\Libraries\DatabaseDriver;
 use \BNETDocs\Libraries\Exceptions\CommentNotFoundException;
 use \BNETDocs\Libraries\Exceptions\QueryException;
 use \BNETDocs\Libraries\User;
 use \CarlBennett\MVC\Libraries\Common;
-use \CarlBennett\MVC\Libraries\Markdown;
+use \CarlBennett\MVC\Libraries\Database;
+use \CarlBennett\MVC\Libraries\DatabaseDriver;
 use \DateTime;
 use \DateTimeZone;
 use \InvalidArgumentException;
 use \JsonSerializable;
 use \PDO;
 use \PDOException;
+use \Parsedown;
 use \StdClass;
 
 class Comment implements JsonSerializable {
@@ -152,7 +152,8 @@ public function getContent($prepare) {
     if (!$prepare) {
       return $this->content;
     }
-    $md = new Markdown();
+    $md = new Parsedown();
+    $md->setSafeMode(true); // unsafe user-input
     return $md->text(filter_var($this->content, FILTER_SANITIZE_FULL_SPECIAL_CHARS));
   }
 

src/libraries/Comment.php

@@ -2,18 +2,18 @@
 
 namespace BNETDocs\Libraries;
 
-use \CarlBennett\MVC\Libraries\Database;
-use \CarlBennett\MVC\Libraries\DatabaseDriver;
 use \BNETDocs\Libraries\Exceptions\DocumentNotFoundException;
 use \BNETDocs\Libraries\Exceptions\QueryException;
 use \BNETDocs\Libraries\User;
 use \CarlBennett\MVC\Libraries\Common;
-use \CarlBennett\MVC\Libraries\Markdown;
+use \CarlBennett\MVC\Libraries\Database;
+use \CarlBennett\MVC\Libraries\DatabaseDriver;
 use \DateTime;
 use \DateTimeZone;
 use \InvalidArgumentException;
 use \PDO;
 use \PDOException;
+use \Parsedown;
 use \StdClass;
 
 class Document {
@@ -146,7 +146,7 @@ public function getContent($prepare) {
       return $this->content;
     }
     if ($this->options_bitmask & self::OPTION_MARKDOWN) {
-      $md = new Markdown();
+      $md = new Parsedown();
       return $md->text($this->content);
     } else {
       return $this->content;

src/libraries/Document.php

@@ -10,12 +10,12 @@
 use \CarlBennett\MVC\Libraries\Common;
 use \CarlBennett\MVC\Libraries\Database;
 use \CarlBennett\MVC\Libraries\DatabaseDriver;
-use \CarlBennett\MVC\Libraries\Markdown;
 use \DateTime;
 use \DateTimeZone;
 use \InvalidArgumentException;
 use \PDO;
 use \PDOException;
+use \Parsedown;
 use \StdClass;
 
 class NewsPost {
@@ -202,7 +202,7 @@ public function getContent($prepare) {
       return $this->content;
     }
     if ($this->options_bitmask & self::OPTION_MARKDOWN) {
-      $md = new Markdown();
+      $md = new Parsedown();
       return $md->text($this->content);
     } else {
       return htmlspecialchars($this->content, ENT_HTML5, "UTF-8");

src/libraries/NewsPost.php

@@ -7,17 +7,15 @@
 use \BNETDocs\Libraries\Packet\Application as ApplicationLayer;
 use \BNETDocs\Libraries\Packet\Transport as TransportLayer;
 use \BNETDocs\Libraries\User;
-
 use \CarlBennett\MVC\Libraries\Common;
 use \CarlBennett\MVC\Libraries\DatabaseDriver;
-use \CarlBennett\MVC\Libraries\Markdown;
-
 use \DateTime;
 use \DateTimeZone;
 use \InvalidArgumentException;
 use \JsonSerializable;
 use \PDO;
 use \PDOException;
+use \Parsedown;
 use \StdClass;
 use \UnexpectedValueException;
 
@@ -321,7 +319,7 @@ public function getPacketRemarks( $prepare ) {
     }
 
     if ( $this->options_bitmask & self::OPTION_MARKDOWN ) {
-      $md = new Markdown();
+      $md = new Parsedown();
       return $md->text($this->packet_remarks);
     }