Merge pull request smrealms#387 from hemberger/nbbc-composer

Install NBBC with Composer
hemberger · Apr 2, 2018 · 47fddf3 · 47fddf3
2 parents 55ebc63 + 4605e69
commit 47fddf3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2,055 deletions.
diff --git a/composer.json b/composer.json
@@ -10,6 +10,7 @@
         "facebook/graph-sdk": "^5.5.0",
         "google/recaptcha": "~1.1",
         "php": "5.4.0 - 7.2",
-        "phpmailer/phpmailer": "~6.0"
+        "phpmailer/phpmailer": "~6.0",
+        "vanilla/nbbc": "~2.0"
     }
 }
diff --git a/lib/Default/smr.inc b/lib/Default/smr.inc
@@ -149,20 +149,20 @@ function xmlify($str) {
 function bbifyMessage($message, $noLinks=false) {
 	static $bbParser;
 	if(!isset($bbParser)) {
-		require_once(LIB.'External/BBCode/nbbc.php');
-		$bbParser = new BBCode();
+		$bbParser = new \Nbbc\BBCode();
 		$bbParser->SetEnableSmileys(false);
 		$bbParser->RemoveRule('wiki');
 		$bbParser->RemoveRule('img');
 		$bbParser->SetURLTarget('_blank');
 		$bbParser->SetURLTargetable('override');
+		$bbParser->setEscapeContent(false); // don't escape HTML, needed for News etc.
 		$smrRule = array(
-				'mode' => BBCODE_MODE_CALLBACK,
+				'mode' => \Nbbc\BBCode::BBCODE_MODE_CALLBACK,
 				'method' => 'smrBBCode',
 				'class' => 'link',
 				'allow_in' => Array('listitem', 'block', 'columns', 'inline'),
-				'end_tag' => BBCODE_PROHIBIT,
-				'content' => BBCODE_PROHIBIT,
+				'end_tag' => \Nbbc\BBCode::BBCODE_PROHIBIT,
+				'content' => \Nbbc\BBCode::BBCODE_PROHIBIT,
 			);
 		$bbParser->AddRule('combatlog',$smrRule);
 		$bbParser->AddRule('player',$smrRule);