restructured

Author: codemasher

src/Modules/DB/DBBaseModule.php

@@ -13,15 +13,13 @@
 namespace chillerlan\bbcode\Modules\DB;
 
 use chillerlan\bbcode\BBTemp;
-use chillerlan\bbcode\Modules\Html5\{Html5BaseModule, Code, Containers, Expanders, Images, Links, Lists,
-	Noparse, Simpletext, Singletags, StyledText, Tables, Video};
-use chillerlan\Database\DBOptions;
+use chillerlan\bbcode\Modules\Markup\MarkupBaseModule;
 use chillerlan\Database\Traits\DatabaseTrait;
 
 /**
  *
  */
-class DBBaseModule extends Html5BaseModule{
+class DBBaseModule extends MarkupBaseModule{
 	use DatabaseTrait;
 
 	/**
@@ -32,20 +30,32 @@ class DBBaseModule extends Html5BaseModule{
 	 */
 	protected $modules = [
 		DBTags::class,
-		Code::class,
-		Containers::class,
-		Expanders::class,
-#		Images::class,
-#		Links::class,
-		Lists::class,
-		Noparse::class,
-#		Simpletext::class,
-#		Singletags::class,
-#		StyledText::class,
-		Tables::class,
-		Video::class,
 	];
 
+	/**
+	 * An array of tags the module is able to process
+	 *
+	 * @var array
+	 * @see \chillerlan\bbcode\Modules\Tagmap::$tags
+	 */
+	protected $tags = [];
+
+	/**
+	 * An optional array of tags contained in self::$tags which are marked as "noparse"
+	 *
+	 * @var array
+	 * @see \chillerlan\bbcode\Modules\Tagmap::$noparse_tags
+	 */
+	protected $noparse_tags = [];
+
+	/**
+	 * An optional array of tags contained in self::$tags which are marked as "single tag"
+	 *
+	 * @var array
+	 * @see \chillerlan\bbcode\Modules\Tagmap::$singletags
+	 */
+	protected $singletags = [];
+
 	/**
 	 * @var \chillerlan\Database\Drivers\DBDriverInterface
 	 */
@@ -59,10 +69,33 @@ class DBBaseModule extends Html5BaseModule{
 	public function __construct(BBTemp $bbtemp = null){
 		parent::__construct($bbtemp);
 
+		$this->tags         = [];
+		$this->noparse_tags = [];
+		$this->singletags   = [];
+
 		if($this->parserOptions && $this->parserOptions->DBDriver){
 			$this->DBDriverInterface = $this->dbconnect($this->parserOptions->DBDriver, $this->parserOptions->DBOptions);
 		}
 
 	}
 
+	/**
+	 * Holds the current base module's EOL token which will replace any newlines
+	 *
+	 * @var string
+	 * @see \chillerlan\bbcode\Modules\ModuleInfo::$eol_token
+	 */
+	protected $eol_token = '<br />';
+
+	/**
+	 * Sanitizes the content to prevent vulnerabilities or compatibility problems
+	 *
+	 * @param $content string to sanitize
+	 *
+	 * @return string
+	 */
+	public function sanitize(string $content):string{
+		return htmlspecialchars($content, ENT_NOQUOTES | ENT_SUBSTITUTE | ENT_DISALLOWED | ENT_HTML5, 'UTF-8', false);
+	}
+
 }

src/Modules/DB/DBTags.php

@@ -19,43 +19,6 @@
  */
 class DBTags extends DBBaseModule implements ModuleInterface{
 
-	/**
-	 * An array of tags the module is able to process
-	 *
-	 * @var array
-	 * @see \chillerlan\bbcode\Modules\Tagmap::$tags
-	 */
-	protected $tags = [];
-
-	/**
-	 * An optional array of tags contained in self::$tags which are marked as "noparse"
-	 *
-	 * @var array
-	 * @see \chillerlan\bbcode\Modules\Tagmap::$noparse_tags
-	 */
-	protected $noparse_tags = [];
-
-	/**
-	 * An optional array of tags contained in self::$tags which are marked as "single tag"
-	 *
-	 * @var array
-	 * @see \chillerlan\bbcode\Modules\Tagmap::$singletags
-	 */
-	protected $singletags = [];
-
-	/**
-	 * DBTags constructor.
-	 *
-	 * @param \chillerlan\bbcode\BBTemp $bbtemp
-	 */
-	public function __construct(BBTemp $bbtemp = null){
-		parent::__construct($bbtemp);
-
-		$this->tags         = [];
-		$this->noparse_tags = [];
-		$this->singletags   = [];
-	}
-
 	/**
 	 * Transforms the bbcode, called from BaseModuleInterface
 	 *
@@ -65,4 +28,5 @@ public function __construct(BBTemp $bbtemp = null){
 	public function __transform():string{
 		// TODO: Implement __transform() method.
 	}
+
 }