Changeset 6670 for trunk/src/includes/admin/converters/SimplePress5.php

Timestamp:

08/27/2017 11:24:00 PM (7 years ago)

Author:

johnjamesjacoby

Message:

Converter: more OOP, specifically for the BBCode parser.

This change introduces a bbcode_parser_properties array to the base converter, allowing custom BBCode parser properties to be passed into the parent method via the child, minimizing the amount of code in each individual forum converter.

Trunk, for 2.6.

File:

• trunk/src/includes/admin/converters/SimplePress5.php (modified) (5 diffs)

trunk/src/includes/admin/converters/SimplePress5.php

@@ -21 +21 @@
      *
      */
-    function __construct() {
+    public function __construct() {
         parent::__construct();
-        $this->setup_globals();
     }
 
@@ -30 +29 @@
      */
     public function setup_globals() {
+
+        // Setup smiley URL & path
+        $this->bbcode_parser_properties = array(
+            'smiley_url' => false,
+            'smiley_dir' => false
+        );
 
         /** Forum Section *****************************************************/
@@ -522 +527 @@
 
     /**
-     * Translate the post status from Simple:Press v5.x numeric's to WordPress's strings.
+     * Translate the post status from Simple:Press v5.x numerics to WordPress's strings.
      *
      * @param int $status Simple:Press numeric status
@@ -542 +547 @@
 
     /**
-     * Translate the topic sticky status type from Simple:Press v5.x numeric's to WordPress's strings.
+     * Translate the topic sticky status type from Simple:Press v5.x numerics to WordPress's strings.
      *
      * @param int $status Simple:Press v5.x numeric forum type
@@ -598 +603 @@
 
         // Replace '<strong>username said </strong>' with '@username said:'
-        $simplepress_markup = preg_replace ( '/\<strong\>(.*?)\ said\ \<\/strong\>/',     '@$1 said:',        $simplepress_markup );
+        $simplepress_markup = preg_replace( '/\<strong\>(.*?)\ said\ \<\/strong\>/',     '@$1 said:',        $simplepress_markup );
 
         // Replace '<p>&nbsp;</p>' with '<p>&nbsp;</p>'
-        $simplepress_markup = preg_replace ( '/\n(&nbsp;|[\s\p{Z}\xA0\x{00A0}]+)\r/', '<br>', $simplepress_markup );
+        $simplepress_markup = preg_replace( '/\n(&nbsp;|[\s\p{Z}\xA0\x{00A0}]+)\r/', '<br>', $simplepress_markup );
 
         // Now that SimplePress' custom HTML codes have been stripped put the cleaned HTML back in $field
         $field = $simplepress_markup;
 
-        // Parse out any bbCodes with the BBCode 'parser.php'
-        require_once bbpress()->admin->admin_dir . 'parser.php';
-        $bbcode = BBCode::getInstance();
-        $bbcode->enable_smileys = false;
-        $bbcode->smiley_regex   = false;
-        return html_entity_decode( $bbcode->Parse( $field ) );
+        // Parse out any bbCodes in $field with the BBCode 'parser.php'
+        return parent::callback_html( $field );
     }
 }