Changeset 2349543

Timestamp:

07/31/2020 04:22:05 AM (6 years ago)

Author:

DevynCJohnson

Message:

v2020.07.30

Location:

bbcode-deluxe

Files:

• tags/2020.07.30 (copied) (copied from bbcode-deluxe/trunk)
• tags/2020.07.30/bbcode-admin.php (copied) (copied from bbcode-deluxe/trunk/bbcode-admin.php) (2 diffs)
• tags/2020.07.30/bbcode-deluxe.php (copied) (copied from bbcode-deluxe/trunk/bbcode-deluxe.php) (3 diffs)
• tags/2020.07.30/class-bbcode.php (copied) (copied from bbcode-deluxe/trunk/class-bbcode.php) (5 diffs)
• tags/2020.07.30/license.txt (copied) (copied from bbcode-deluxe/trunk/license.txt)
• tags/2020.07.30/options-form-template.php (copied) (copied from bbcode-deluxe/trunk/options-form-template.php) (2 diffs)
• tags/2020.07.30/readme.txt (copied) (copied from bbcode-deluxe/trunk/readme.txt) (3 diffs)
• trunk/bbcode-admin.php (modified) (2 diffs)
• trunk/bbcode-deluxe.php (modified) (3 diffs)
• trunk/class-bbcode.php (modified) (5 diffs)
• trunk/options-form-template.php (modified) (2 diffs)
• trunk/readme.txt (modified) (3 diffs)

bbcode-deluxe/tags/2020.07.30/bbcode-admin.php

@@ -1 +1 @@
 <?php
 
-function bbcode_deluxe_plugin_menu() { add_options_page('BBCode Deluxe', 'BBCode Deluxe', 'manage_options', 'bbcode-deluxe', 'bbcode_deluxe_plugin_options'); }
+function bbcode_deluxe_plugin_menu()
+{
+    add_options_page('BBCode Deluxe', 'BBCode Deluxe', 'manage_options', 'bbcode-deluxe', 'bbcode_deluxe_plugin_options');
+}
 
 add_action('admin_menu', 'bbcode_deluxe_plugin_menu');
 
-function bbcode_deluxe_plugin_options() {
+function bbcode_deluxe_plugin_options()
+{
     global $bbp_sc_whitelist;
     if (is_admin() && current_user_can('manage_options')) {
@@ -12 +16 @@
         if ($whitelist_enabled) {
             $enabled_plugins = get_option('bbpscwl_enabled_plugins');
-            if ($enabled_plugins === '') { $enabled_plugins = array(); }
-            else { $enabled_plugins = unserialize($enabled_plugins); }
+            if ($enabled_plugins) {
+                $enabled_plugins = unserialize($enabled_plugins);
+            } else {
+                $enabled_plugins = [];
+            }
             $bbcodes_active = false;
             foreach ($enabled_plugins as $plugin_tag) {
-                if ($plugin_tag === 'bbpress-bbcode') { $bbcodes_active = true; }
+                if ($plugin_tag === 'bbpress-bbcode') {
+                    $bbcodes_active = true;
+                    break;
+                }
             }
         }
-        require(dirname(__FILE__).'/options-form-template.php');
-    } else { echo '<div><p>No options currently available.</p></div>'; }
+        require dirname(__FILE__) . '/options-form-template.php';
+    } else {
+        echo '<div><p>No options currently available.</p></div>';
+    }
 }
-
-?>

bbcode-deluxe/tags/2020.07.30/bbcode-deluxe.php

@@ -3 +3 @@
 Plugin URI: http://dcjtech.info/
 Description: Adds support for BBCode to Wordpress and BBPress
-Version: 2019.02.24
+Version: 2020.07.30
 Author: Devyn Collier Johnson (DevynCJohnson)
 Author URI: http://dcjtech.info/
@@ -19 +19 @@
 
 
-function quote_exempt_from_wptexturize($shortcodes) {
-    $shortcodes = ['quote', 'q', 'QUOTE', 'Q'];
-    return $shortcodes;
+defined('ABSPATH') or die('Invalid entrance into the plugin BBCode Deluxe!');
+
+
+function quote_exempt_from_wptexturize($shortcodes)
+{
+    return ['quote', 'q', 'QUOTE', 'Q'];
 }
 
 
-function code_exempt_from_wptexturize($shortcodes) {
-    $shortcodes = ['no-highlight', 'pre', 'raw'];
-    return $shortcodes;
+function code_exempt_from_wptexturize($shortcodes)
+{
+    return ['no-highlight', 'pre', 'raw'];
 }
 
 
-function caption_exempt_from_wptexturize($shortcodes) {
-    $shortcodes[] = 'caption';
-    return $shortcodes;
+function caption_exempt_from_wptexturize($shortcodes)
+{
+    return ['caption'];
 }
 
 
-function nested_quotes($content, $not_used = false) {
+function nested_quotes($content, $not_used = false)
+{
     $counter = 0;
     $tag_counter_string = '';
-    $content = preg_replace('/[\n\r]/', '', $content);
-    $content = str_replace('', '', $content);
-    $content = str_replace('[quote', '[', $content);
-    $content = str_replace('[/quote]', '[/]', $content);
-    $pos = strpos($content, '[/]');
-    while ($pos !== false) {
-        $content = preg_replace('/(?<=\[)([^]*?)(?=\[\/\])/u', '[]$0[/]', $content, 1);
+    $content = preg_replace('/[\n\r]/gu', '', $content);
+    $content = str_replace('', '', $content);
+    $content = str_replace('[quote', '[', $content);
+    $content = str_replace('[/quote]', '[/]', $content);
+    while (strpos($content, '[/]')) {
+        $content = preg_replace('/(?<=\[)([^]*?)(?=\[\/\])/gu', '[]$0[/]', $content, 1);
         $tag_counter_string = 'quote-'.strval($counter);
-        $content = str_replace('[]', $tag_counter_string, $content);
-        $content = str_replace('][/', $tag_counter_string, $content);
+        $content = str_replace('[]', $tag_counter_string, $content);
+        $content = str_replace('][/', $tag_counter_string, $content);
         ++$counter;
-        $pos = strpos($content, '[/]');
     }
-    $content = str_replace('', "\n", $content);
-    return $content;
+    return str_replace('', "\n", $content);
 }
 
 
-function fix_captions($content, $not_used = false) {
-    $content = preg_replace('/[\n\r]/', '', $content);
-    $content = str_replace('', '', $content);
-    $content = str_replace('[/caption]', '', $content);
-    $content = str_replace('[caption', '', $content);
-    $content = preg_replace('/<\/a>([^>]*?)/u', '</a><figcaption class="wp-caption-text aligncenter">$0</figcaption></figure>', $content);
-    while (strpos($content, '') !== false) {
-        $content = preg_replace('/[^\]]*? align="alignleft"[^\]]*?\]/u', '<figure class="wp-caption alignleft">', $content);
-        $content = preg_replace('/[^\]]*? align="alignright"[^\]]*?\]/u', '<figure class="wp-caption alignright">', $content);
-        $content = preg_replace('/[^\]]*? align="aligncenter"[^\]]*?\]/u', '<figure class="wp-caption aligncenter">', $content);
-        $content = preg_replace('/[^\]]*? align="alignnone"[^\]]*?\]/u', '<figure class="wp-caption alignnone">', $content);
-        $content = preg_replace('/[^\]]*?\]/u', '<figure class="wp-caption">', $content);
-        $content = preg_replace('/size\-([a-z]*?) wp\-image\-/', 'size-$0 aligncenter wp-image-', $content);
-        $content = preg_replace('/wp\-image\-([0-9]*?) size\-/', 'size-$0 aligncenter wp-image-', $content);
+function fix_captions($content, $not_used = false)
+{
+    $content = preg_replace('/[\n\r]/gu', '', $content);
+    $content = str_replace('', '', $content);
+    $content = str_replace('[/caption]', '', $content);
+    $content = str_replace('[caption', '', $content);
+    $content = preg_replace('/<\/a>([^>]*?)/gu', '</a><figcaption class="wp-caption-text aligncenter">$0</figcaption></figure>', $content);
+    while (strpos($content, '')) {
+        $content = preg_replace('/[^\]]*? align="alignleft"[^\]]*?\]/gu', '<figure class="wp-caption alignleft">', $content);
+        $content = preg_replace('/[^\]]*? align="alignright"[^\]]*?\]/gu', '<figure class="wp-caption alignright">', $content);
+        $content = preg_replace('/[^\]]*? align="aligncenter"[^\]]*?\]/gu', '<figure class="wp-caption aligncenter">', $content);
+        $content = preg_replace('/[^\]]*? align="alignnone"[^\]]*?\]/gu', '<figure class="wp-caption alignnone">', $content);
+        $content = preg_replace('/[^\]]*?\]/gu', '<figure class="wp-caption">', $content);
+        $content = preg_replace('/size\-([A-Za-z0-9]*?) wp\-image\-/gu', 'size-$0 aligncenter wp-image-', $content);
+        $content = preg_replace('/wp\-image\-([A-Za-z0-9]*?) size\-/gu', 'size-$0 aligncenter wp-image-', $content);
     }
-    $content = str_replace('', "\n", $content);
-    $content = str_replace('', '', $content);
-    $content = str_replace('', '', $content);
-    return $content;
+    $content = str_replace('', "\n", $content);
+    return str_replace('', '', str_replace('', '', $content));
 }
 
 
-defined('ABSPATH') or die('Invalid entrance into the plugin BBCode Deluxe!');
 add_filter('no_texturize_shortcodes', 'caption_exempt_from_wptexturize', 8);
 add_filter('no_texturize_shortcodes', 'code_exempt_from_wptexturize');
@@ -92 +91 @@
 add_filter('the_content', 'do_shortcode', 11);
 add_filter('widget_text', 'do_shortcode', 11);
-if (function_exists('get_comment_text')) { add_filter('get_comment_text', 'do_shortcode', 11); }
-if (function_exists('bbp_get_topic_content')) { add_filter('bbp_get_topic_content', 'do_shortcode', 11); }
-if (function_exists('bbp_get_reply_content')) { add_filter('bbp_get_reply_content', 'do_shortcode', 11); }
-if (function_exists('bp_get_activity_content_body')) { add_filter('bp_get_activity_content_body', 'do_shortcode', 11); }
-if (function_exists('bp_get_the_topic_post_content')) { add_filter('bp_get_the_topic_post_content', 'do_shortcode', 11); }
-if (function_exists('bp_get_the_thread_message_content')) { add_filter('bp_get_the_thread_message_content', 'do_shortcode', 11); }
-require_once(dirname(__FILE__).'/bbcode-admin.php');
-require_once(dirname(__FILE__).'/class-bbcode.php');
-add_action('plugins_loaded', function() { global $BBCode; $BBCode = new BBCode(); }, 14);
 
-?>
+if (function_exists('get_comment_text')) {
+    add_filter('get_comment_text', 'do_shortcode', 11);
+}
+if (function_exists('bbp_get_topic_content')) {
+    add_filter('bbp_get_topic_content', 'do_shortcode', 11);
+}
+if (function_exists('bbp_get_reply_content')) {
+    add_filter('bbp_get_reply_content', 'do_shortcode', 11);
+}
+if (function_exists('bp_get_activity_content_body')) {
+    add_filter('bp_get_activity_content_body', 'do_shortcode', 11);
+}
+if (function_exists('bp_get_the_topic_post_content')) {
+    add_filter('bp_get_the_topic_post_content', 'do_shortcode', 11);
+}
+if (function_exists('bp_get_the_thread_message_content')) {
+    add_filter('bp_get_the_thread_message_content', 'do_shortcode', 11);
+}
+
+require_once dirname(__FILE__) . '/bbcode-admin.php';
+require_once dirname(__FILE__) . '/class-bbcode.php';
+
+add_action(
+    'plugins_loaded',
+    function() {
+        global $BBCode;
+        $BBCode = new BBCode();
+    },
+    14
+);

bbcode-deluxe/tags/2020.07.30/class-bbcode.php

@@ -1 @@
-<?php class BBCode {
-
-    public $use_whitelist = false;
-    function __construct() {
-        if (!function_exists('add_shortcode')) { return; }
+<?php
+
+class BBCode
+{
+
+    private function __construct()
+    {
+        if (!function_exists('add_shortcode')) {
+            return;
+        }
         // Shortcode Protection
         add_shortcode('c', 'skip_enclosed_shortcodes');
@@ -21 +26 @@
         add_shortcode('sql', 'skip_enclosed_shortcodes');
         add_shortcode('xml', 'skip_enclosed_shortcodes');
-        if (function_exists('tiny_mce_before_init')) { add_action('tiny_mce_before_init', 'tinymce_skip_enclosed_shortcodes'); }
+        if (function_exists('tiny_mce_before_init')) {
+            add_action('tiny_mce_before_init', 'tinymce_skip_enclosed_shortcodes');
+        }
         // Formatting + Style
-        add_shortcode('b', array(&$this, 'shortcode_bold'));
-        add_shortcode('B', array(&$this, 'shortcode_bold'));
-        add_shortcode('bold', array(&$this, 'shortcode_bold'));
-        add_shortcode('BOLD', array(&$this, 'shortcode_bold'));
-        add_shortcode('strong', array(&$this, 'shortcode_bold'));
-        add_shortcode('STRONG', array(&$this, 'shortcode_bold'));
-        add_shortcode('center', array(&$this, 'shortcode_center'));
-        add_shortcode('CENTER', array(&$this, 'shortcode_center'));
-        add_shortcode('color', array(&$this, 'shortcode_color'));
-        add_shortcode('COLOR', array(&$this, 'shortcode_color'));
-        add_shortcode('del', array(&$this, 'shortcode_del'));
-        add_shortcode('DEL', array(&$this, 'shortcode_del'));
-        add_shortcode('i', array(&$this, 'shortcode_italics'));
-        add_shortcode('I', array(&$this, 'shortcode_italics'));
-        add_shortcode('italic', array(&$this, 'shortcode_italics'));
-        add_shortcode('ITALIC', array(&$this, 'shortcode_italics'));
-        add_shortcode('em', array(&$this, 'shortcode_italics'));
-        add_shortcode('EM', array(&$this, 'shortcode_italics'));
-        add_shortcode('justify', array(&$this, 'shortcode_justify'));
-        add_shortcode('JUSTIFY', array(&$this, 'shortcode_justify'));
-        add_shortcode('left', array(&$this, 'shortcode_left'));
-        add_shortcode('LEFT', array(&$this, 'shortcode_left'));
-        add_shortcode('bdo', array(&$this, 'shortcode_reverse'));
-        add_shortcode('BDO', array(&$this, 'shortcode_reverse'));
-        add_shortcode('reverse', array(&$this, 'shortcode_reverse'));
-        add_shortcode('REVERSE', array(&$this, 'shortcode_reverse'));
-        add_shortcode('right', array(&$this, 'shortcode_right'));
-        add_shortcode('RIGHT', array(&$this, 'shortcode_right'));
-        add_shortcode('size', array(&$this, 'shortcode_size'));
-        add_shortcode('SIZE', array(&$this, 'shortcode_size'));
-        add_shortcode('s', array(&$this, 'shortcode_strikethrough'));
-        add_shortcode('S', array(&$this, 'shortcode_strikethrough'));
-        add_shortcode('strike', array(&$this, 'shortcode_strikethrough'));
-        add_shortcode('STRIKE', array(&$this, 'shortcode_strikethrough'));
-        add_shortcode('sub', array(&$this, 'shortcode_subscript'));
-        add_shortcode('SUB', array(&$this, 'shortcode_subscript'));
-        add_shortcode('sup', array(&$this, 'shortcode_superscript'));
-        add_shortcode('SUP', array(&$this, 'shortcode_superscript'));
-        add_shortcode('u', array(&$this, 'shortcode_underline'));
-        add_shortcode('U', array(&$this, 'shortcode_underline'));
-        add_shortcode('underline', array(&$this, 'shortcode_underline'));
-        add_shortcode('UNDERLINE', array(&$this, 'shortcode_underline'));
+        add_shortcode('b', [&$this, 'shortcode_bold']);
+        add_shortcode('B', [&$this, 'shortcode_bold']);
+        add_shortcode('bold', [&$this, 'shortcode_bold']);
+        add_shortcode('BOLD', [&$this, 'shortcode_bold']);
+        add_shortcode('strong', [&$this, 'shortcode_bold']);
+        add_shortcode('STRONG', [&$this, 'shortcode_bold']);
+        add_shortcode('center', [&$this, 'shortcode_center']);
+        add_shortcode('CENTER', [&$this, 'shortcode_center']);
+        add_shortcode('color', [&$this, 'shortcode_color']);
+        add_shortcode('COLOR', [&$this, 'shortcode_color']);
+        add_shortcode('del', [&$this, 'shortcode_del']);
+        add_shortcode('DEL', [&$this, 'shortcode_del']);
+        add_shortcode('i', [&$this, 'shortcode_italics']);
+        add_shortcode('I', [&$this, 'shortcode_italics']);
+        add_shortcode('italic', [&$this, 'shortcode_italics']);
+        add_shortcode('ITALIC', [&$this, 'shortcode_italics']);
+        add_shortcode('em', [&$this, 'shortcode_italics']);
+        add_shortcode('EM', [&$this, 'shortcode_italics']);
+        add_shortcode('justify', [&$this, 'shortcode_justify']);
+        add_shortcode('JUSTIFY', [&$this, 'shortcode_justify']);
+        add_shortcode('left', [&$this, 'shortcode_left']);
+        add_shortcode('LEFT', [&$this, 'shortcode_left']);
+        add_shortcode('bdo', [&$this, 'shortcode_reverse']);
+        add_shortcode('BDO', [&$this, 'shortcode_reverse']);
+        add_shortcode('reverse', [&$this, 'shortcode_reverse']);
+        add_shortcode('REVERSE', [&$this, 'shortcode_reverse']);
+        add_shortcode('right', [&$this, 'shortcode_right']);
+        add_shortcode('RIGHT', [&$this, 'shortcode_right']);
+        add_shortcode('size', [&$this, 'shortcode_size']);
+        add_shortcode('SIZE', [&$this, 'shortcode_size']);
+        add_shortcode('s', [&$this, 'shortcode_strikethrough']);
+        add_shortcode('S', [&$this, 'shortcode_strikethrough']);
+        add_shortcode('strike', [&$this, 'shortcode_strikethrough']);
+        add_shortcode('STRIKE', [&$this, 'shortcode_strikethrough']);
+        add_shortcode('sub', [&$this, 'shortcode_subscript']);
+        add_shortcode('SUB', [&$this, 'shortcode_subscript']);
+        add_shortcode('sup', [&$this, 'shortcode_superscript']);
+        add_shortcode('SUP', [&$this, 'shortcode_superscript']);
+        add_shortcode('u', [&$this, 'shortcode_underline']);
+        add_shortcode('U', [&$this, 'shortcode_underline']);
+        add_shortcode('underline', [&$this, 'shortcode_underline']);
+        add_shortcode('UNDERLINE', [&$this, 'shortcode_underline']);
         // Quotes
-        add_shortcode('q', array(&$this, 'shortcode_quote'));
-        add_shortcode('q-0', array(&$this, 'shortcode_quote'));
-        add_shortcode('q-1', array(&$this, 'shortcode_quote'));
-        add_shortcode('q-2', array(&$this, 'shortcode_quote'));
-        add_shortcode('q-3', array(&$this, 'shortcode_quote'));
-        add_shortcode('q-4', array(&$this, 'shortcode_quote'));
-        add_shortcode('q-5', array(&$this, 'shortcode_quote'));
-        add_shortcode('q-6', array(&$this, 'shortcode_quote'));
-        add_shortcode('q-7', array(&$this, 'shortcode_quote'));
-        add_shortcode('q-8', array(&$this, 'shortcode_quote'));
-        add_shortcode('q-9', array(&$this, 'shortcode_quote'));
-        add_shortcode('q-10', array(&$this, 'shortcode_quote'));
-        add_shortcode('Q', array(&$this, 'shortcode_quote'));
-        add_shortcode('Q-0', array(&$this, 'shortcode_quote'));
-        add_shortcode('Q-1', array(&$this, 'shortcode_quote'));
-        add_shortcode('Q-2', array(&$this, 'shortcode_quote'));
-        add_shortcode('Q-3', array(&$this, 'shortcode_quote'));
-        add_shortcode('Q-4', array(&$this, 'shortcode_quote'));
-        add_shortcode('Q-5', array(&$this, 'shortcode_quote'));
-        add_shortcode('Q-6', array(&$this, 'shortcode_quote'));
-        add_shortcode('Q-7', array(&$this, 'shortcode_quote'));
-        add_shortcode('Q-8', array(&$this, 'shortcode_quote'));
-        add_shortcode('Q-9', array(&$this, 'shortcode_quote'));
-        add_shortcode('Q-10', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-0', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-1', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-2', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-3', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-4', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-5', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-6', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-7', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-8', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-9', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-10', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-11', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-12', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-13', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-14', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-15', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-16', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-17', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-18', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-19', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-20', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-21', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-22', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-23', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-24', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-25', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-26', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-27', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-28', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-29', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-30', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-31', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-32', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-33', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-34', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-35', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-36', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-37', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-38', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-39', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-40', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-41', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-42', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-43', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-44', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-45', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-46', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-47', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-48', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-49', array(&$this, 'shortcode_quote'));
-        add_shortcode('QUOTE', array(&$this, 'shortcode_quote'));
-        add_shortcode('QUOTE-0', array(&$this, 'shortcode_quote'));
-        add_shortcode('QUOTE-1', array(&$this, 'shortcode_quote'));
-        add_shortcode('QUOTE-2', array(&$this, 'shortcode_quote'));
-        add_shortcode('QUOTE-3', array(&$this, 'shortcode_quote'));
-        add_shortcode('QUOTE-4', array(&$this, 'shortcode_quote'));
-        add_shortcode('QUOTE-5', array(&$this, 'shortcode_quote'));
-        add_shortcode('QUOTE-6', array(&$this, 'shortcode_quote'));
-        add_shortcode('QUOTE-7', array(&$this, 'shortcode_quote'));
-        add_shortcode('QUOTE-8', array(&$this, 'shortcode_quote'));
-        add_shortcode('QUOTE-9', array(&$this, 'shortcode_quote'));
-        add_shortcode('QUOTE-10', array(&$this, 'shortcode_quote'));
-        add_shortcode('cite', array(&$this, 'shortcode_cite'));
-        add_shortcode('CITE', array(&$this, 'shortcode_cite'));
+        add_shortcode('q', [&$this, 'shortcode_quote']);
+        add_shortcode('q-0', [&$this, 'shortcode_quote']);
+        add_shortcode('q-1', [&$this, 'shortcode_quote']);
+        add_shortcode('q-2', [&$this, 'shortcode_quote']);
+        add_shortcode('q-3', [&$this, 'shortcode_quote']);
+        add_shortcode('q-4', [&$this, 'shortcode_quote']);
+        add_shortcode('q-5', [&$this, 'shortcode_quote']);
+        add_shortcode('q-6', [&$this, 'shortcode_quote']);
+        add_shortcode('q-7', [&$this, 'shortcode_quote']);
+        add_shortcode('q-8', [&$this, 'shortcode_quote']);
+        add_shortcode('q-9', [&$this, 'shortcode_quote']);
+        add_shortcode('q-10', [&$this, 'shortcode_quote']);
+        add_shortcode('Q', [&$this, 'shortcode_quote']);
+        add_shortcode('Q-0', [&$this, 'shortcode_quote']);
+        add_shortcode('Q-1', [&$this, 'shortcode_quote']);
+        add_shortcode('Q-2', [&$this, 'shortcode_quote']);
+        add_shortcode('Q-3', [&$this, 'shortcode_quote']);
+        add_shortcode('Q-4', [&$this, 'shortcode_quote']);
+        add_shortcode('Q-5', [&$this, 'shortcode_quote']);
+        add_shortcode('Q-6', [&$this, 'shortcode_quote']);
+        add_shortcode('Q-7', [&$this, 'shortcode_quote']);
+        add_shortcode('Q-8', [&$this, 'shortcode_quote']);
+        add_shortcode('Q-9', [&$this, 'shortcode_quote']);
+        add_shortcode('Q-10', [&$this, 'shortcode_quote']);
+        add_shortcode('quote', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-0', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-1', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-2', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-3', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-4', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-5', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-6', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-7', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-8', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-9', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-10', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-11', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-12', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-13', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-14', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-15', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-16', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-17', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-18', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-19', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-20', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-21', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-22', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-23', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-24', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-25', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-26', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-27', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-28', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-29', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-30', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-31', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-32', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-33', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-34', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-35', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-36', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-37', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-38', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-39', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-40', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-41', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-42', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-43', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-44', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-45', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-46', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-47', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-48', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-49', [&$this, 'shortcode_quote']);
+        add_shortcode('QUOTE', [&$this, 'shortcode_quote']);
+        add_shortcode('QUOTE-0', [&$this, 'shortcode_quote']);
+        add_shortcode('QUOTE-1', [&$this, 'shortcode_quote']);
+        add_shortcode('QUOTE-2', [&$this, 'shortcode_quote']);
+        add_shortcode('QUOTE-3', [&$this, 'shortcode_quote']);
+        add_shortcode('QUOTE-4', [&$this, 'shortcode_quote']);
+        add_shortcode('QUOTE-5', [&$this, 'shortcode_quote']);
+        add_shortcode('QUOTE-6', [&$this, 'shortcode_quote']);
+        add_shortcode('QUOTE-7', [&$this, 'shortcode_quote']);
+        add_shortcode('QUOTE-8', [&$this, 'shortcode_quote']);
+        add_shortcode('QUOTE-9', [&$this, 'shortcode_quote']);
+        add_shortcode('QUOTE-10', [&$this, 'shortcode_quote']);
+        add_shortcode('cite', [&$this, 'shortcode_cite']);
+        add_shortcode('CITE', [&$this, 'shortcode_cite']);
         // Code
-        add_shortcode('code', array(&$this, 'shortcode_code'));
-        add_shortcode('CODE', array(&$this, 'shortcode_code'));
-        add_shortcode('kbd', array(&$this, 'shortcode_kbd'));
-        add_shortcode('KBD', array(&$this, 'shortcode_kbd'));
-        add_shortcode('key', array(&$this, 'shortcode_kbd'));
-        add_shortcode('KEY', array(&$this, 'shortcode_kbd'));
-        add_shortcode('keyboard', array(&$this, 'shortcode_kbd'));
-        add_shortcode('KEYBOARD', array(&$this, 'shortcode_kbd'));
+        add_shortcode('code', [&$this, 'shortcode_code']);
+        add_shortcode('CODE', [&$this, 'shortcode_code']);
+        add_shortcode('kbd', [&$this, 'shortcode_kbd']);
+        add_shortcode('KBD', [&$this, 'shortcode_kbd']);
+        add_shortcode('key', [&$this, 'shortcode_kbd']);
+        add_shortcode('KEY', [&$this, 'shortcode_kbd']);
+        add_shortcode('keyboard', [&$this, 'shortcode_kbd']);
+        add_shortcode('KEYBOARD', [&$this, 'shortcode_kbd']);
         // Lists
-        add_shortcode('ol', array(&$this, 'shortcode_orderedlist'));
-        add_shortcode('OL', array(&$this, 'shortcode_orderedlist'));
-        add_shortcode('ul', array(&$this, 'shortcode_unorderedlist'));
-        add_shortcode('UL', array(&$this, 'shortcode_unorderedlist'));
-        add_shortcode('list', array(&$this, 'shortcode_unorderedlist'));
-        add_shortcode('LIST', array(&$this, 'shortcode_unorderedlist'));
-        add_shortcode('li', array(&$this, 'shortcode_listitem'));
-        add_shortcode('LI', array(&$this, 'shortcode_listitem'));
+        add_shortcode('ol', [&$this, 'shortcode_orderedlist']);
+        add_shortcode('OL', [&$this, 'shortcode_orderedlist']);
+        add_shortcode('ul', [&$this, 'shortcode_unorderedlist']);
+        add_shortcode('UL', [&$this, 'shortcode_unorderedlist']);
+        add_shortcode('list', [&$this, 'shortcode_unorderedlist']);
+        add_shortcode('LIST', [&$this, 'shortcode_unorderedlist']);
+        add_shortcode('li', [&$this, 'shortcode_listitem']);
+        add_shortcode('LI', [&$this, 'shortcode_listitem']);
         // Tables
-        add_shortcode('table', array(&$this, 'shortcode_table'));
-        add_shortcode('TABLE', array(&$this, 'shortcode_table'));
-        add_shortcode('thead', array(&$this, 'shortcode_thead'));
-        add_shortcode('THEAD', array(&$this, 'shortcode_thead'));
-        add_shortcode('tbody', array(&$this, 'shortcode_tbody'));
-        add_shortcode('TBODY', array(&$this, 'shortcode_tbody'));
-        add_shortcode('tfoot', array(&$this, 'shortcode_tfoot'));
-        add_shortcode('TFOOT', array(&$this, 'shortcode_tfoot'));
-        add_shortcode('th', array(&$this, 'shortcode_th'));
-        add_shortcode('TH', array(&$this, 'shortcode_th'));
-        add_shortcode('tr', array(&$this, 'shortcode_tr'));
-        add_shortcode('TR', array(&$this, 'shortcode_tr'));
-        add_shortcode('td', array(&$this, 'shortcode_td'));
-        add_shortcode('TD', array(&$this, 'shortcode_td'));
+        add_shortcode('table', [&$this, 'shortcode_table']);
+        add_shortcode('TABLE', [&$this, 'shortcode_table']);
+        add_shortcode('thead', [&$this, 'shortcode_thead']);
+        add_shortcode('THEAD', [&$this, 'shortcode_thead']);
+        add_shortcode('tbody', [&$this, 'shortcode_tbody']);
+        add_shortcode('TBODY', [&$this, 'shortcode_tbody']);
+        add_shortcode('tfoot', [&$this, 'shortcode_tfoot']);
+        add_shortcode('TFOOT', [&$this, 'shortcode_tfoot']);
+        add_shortcode('th', [&$this, 'shortcode_th']);
+        add_shortcode('TH', [&$this, 'shortcode_th']);
+        add_shortcode('tr', [&$this, 'shortcode_tr']);
+        add_shortcode('TR', [&$this, 'shortcode_tr']);
+        add_shortcode('td', [&$this, 'shortcode_td']);
+        add_shortcode('TD', [&$this, 'shortcode_td']);
         // Links and Images
-        add_shortcode('email', array(&$this, 'shortcode_email'));
-        add_shortcode('EMAIL', array(&$this, 'shortcode_email'));
-        add_shortcode('tel', array(&$this, 'shortcode_telephone'));
-        add_shortcode('TEL', array(&$this, 'shortcode_telephone'));
-        add_shortcode('img', array(&$this, 'shortcode_image'));
-        add_shortcode('IMG', array(&$this, 'shortcode_image'));
-        add_shortcode('url', array(&$this, 'shortcode_url'));
-        add_shortcode('URL', array(&$this, 'shortcode_url'));
-        add_shortcode('link', array(&$this, 'shortcode_url'));
-        add_shortcode('LINK', array(&$this, 'shortcode_url'));
+        add_shortcode('email', [&$this, 'shortcode_email']);
+        add_shortcode('EMAIL', [&$this, 'shortcode_email']);
+        add_shortcode('tel', [&$this, 'shortcode_telephone']);
+        add_shortcode('TEL', [&$this, 'shortcode_telephone']);
+        add_shortcode('img', [&$this, 'shortcode_image']);
+        add_shortcode('IMG', [&$this, 'shortcode_image']);
+        add_shortcode('url', [&$this, 'shortcode_url']);
+        add_shortcode('URL', [&$this, 'shortcode_url']);
+        add_shortcode('link', [&$this, 'shortcode_url']);
+        add_shortcode('LINK', [&$this, 'shortcode_url']);
         // Videos and Audio
-        add_shortcode('freesound', array(&$this, 'shortcode_freesound'));
-        add_shortcode('FREESOUND', array(&$this, 'shortcode_freesound'));
-        add_shortcode('gvideo', array(&$this, 'shortcode_gvideo'));
-        add_shortcode('GVIDEO', array(&$this, 'shortcode_gvideo'));
-        add_shortcode('vimeo', array(&$this, 'shortcode_vimeo'));
-        add_shortcode('VIMEO', array(&$this, 'shortcode_vimeo'));
-        add_shortcode('youtube', array(&$this, 'shortcode_youtube'));
-        add_shortcode('YOUTUBE', array(&$this, 'shortcode_youtube'));
+        add_shortcode('bitchute', [&$this, 'shortcode_bitchute']);
+        add_shortcode('BITCHUTE', [&$this, 'shortcode_bitchute']);
+        add_shortcode('dailymotion', [&$this, 'shortcode_dailymotion']);
+        add_shortcode('DAILYMOTION', [&$this, 'shortcode_dailymotion']);
+        add_shortcode('freesound', [&$this, 'shortcode_freesound']);
+        add_shortcode('FREESOUND', [&$this, 'shortcode_freesound']);
+        add_shortcode('gvideo', [&$this, 'shortcode_gvideo']);
+        add_shortcode('GVIDEO', [&$this, 'shortcode_gvideo']);
+        add_shortcode('vimeo', [&$this, 'shortcode_vimeo']);
+        add_shortcode('VIMEO', [&$this, 'shortcode_vimeo']);
+        add_shortcode('youtube', [&$this, 'shortcode_youtube']);
+        add_shortcode('YOUTUBE', [&$this, 'shortcode_youtube']);
         // Special/Miscellaneous Content
-        add_shortcode('abbr', array(&$this, 'shortcode_abbr'));
-        add_shortcode('ABBR', array(&$this, 'shortcode_abbr'));
-        add_shortcode('acronym', array(&$this, 'shortcode_abbr'));
-        add_shortcode('ACRONYM', array(&$this, 'shortcode_abbr'));
-        add_shortcode('ip', array(&$this, 'shortcode_clientip'));
-        add_shortcode('IP', array(&$this, 'shortcode_clientip'));
-        add_shortcode('hr', array(&$this, 'shortcode_hr'));
-        add_shortcode('HR', array(&$this, 'shortcode_hr'));
-        add_shortcode('note', array(&$this, 'shortcode_note'));
-        add_shortcode('NOTE', array(&$this, 'shortcode_note'));
-        add_shortcode('useragent', array(&$this, 'shortcode_useragent'));
-        add_shortcode('USERAGENT', array(&$this, 'shortcode_useragent'));
+        add_shortcode('abbr', [&$this, 'shortcode_abbr']);
+        add_shortcode('ABBR', [&$this, 'shortcode_abbr']);
+        add_shortcode('acronym', [&$this, 'shortcode_abbr']);
+        add_shortcode('ACRONYM', [&$this, 'shortcode_abbr']);
+        add_shortcode('ip', [&$this, 'shortcode_clientip']);
+        add_shortcode('IP', [&$this, 'shortcode_clientip']);
+        add_shortcode('hr', [&$this, 'shortcode_hr']);
+        add_shortcode('HR', [&$this, 'shortcode_hr']);
+        add_shortcode('note', [&$this, 'shortcode_note']);
+        add_shortcode('NOTE', [&$this, 'shortcode_note']);
+        add_shortcode('useragent', [&$this, 'shortcode_useragent']);
+        add_shortcode('USERAGENT', [&$this, 'shortcode_useragent']);
         // Hide and Display Content
-        add_shortcode('spoiler', array(&$this, 'shortcode_spoiler'));
-        add_shortcode('SPOILER', array(&$this, 'shortcode_spoiler'));
-        add_shortcode('user', array(&$this, 'shortcode_user'));
-        add_shortcode('USER', array(&$this, 'shortcode_user'));
-        add_shortcode('guest', array(&$this, 'shortcode_guest'));
-        add_shortcode('GUEST', array(&$this, 'shortcode_guest'));
+        add_shortcode('spoiler', [&$this, 'shortcode_spoiler']);
+        add_shortcode('SPOILER', [&$this, 'shortcode_spoiler']);
+        add_shortcode('user', [&$this, 'shortcode_user']);
+        add_shortcode('USER', [&$this, 'shortcode_user']);
+        add_shortcode('guest', [&$this, 'shortcode_guest']);
+        add_shortcode('GUEST', [&$this, 'shortcode_guest']);
         $this->use_whitelist = false;
-        if (function_exists('bbp_whitelist_do_shortcode')) { $this->use_whitelist = true; }
-    }
-
-    function do_shortcode($content) {
-        if (function_exists('bbp_whitelist_do_shortcode')) { return bbp_whitelist_do_shortcode($content); }
-        else { return do_shortcode($content); }
-    }
-
-    function attributefix($atts = array()) {
-        if (empty($atts[0])) { return $atts; }
-        if (0 !== preg_match('#=("|\')(.*?)("|\')#', $atts[0], $match)) { $atts[0] = $match[2]; }
+        if (function_exists('bbp_whitelist_do_shortcode')) {
+            $this->use_whitelist = true;
+        }
+    }
+
+    public function do_shortcode($content)
+    {
+        if (function_exists('bbp_whitelist_do_shortcode')) {
+            return bbp_whitelist_do_shortcode($content);
+        }
+        return do_shortcode($content);
+    }
+
+    public function attributefix($atts = [])
+    {
+        if (empty($atts[0])) {
+            return $atts;
+        }
+        $match = [];
+        if (preg_match('#=("|\')(.*?)("|\')#u', $atts[0], $match) !== 0) {
+            $atts[0] = $match[2];
+        }
         return $atts;
     }
 
 
-    // SHORTCODES //
+    /* SHORTCODES */
 
 
     // Shortcode Protection
 
-    function skip_enclosed_shortcodes($atts, $content = null) {
+    public function skip_enclosed_shortcodes($atts, $content = null)
+    {
         return $content;
     }
 
-    function tinymce_skip_enclosed_shortcodes($datainput) {
+    public function tinymce_skip_enclosed_shortcodes($datainput)
+    {
         $datainput['protect'] = "[/\<\?php[\s\S]*?\?\>/g, /\[insert_php\][\s\S]*?\[\/insert_php\]/g, /\[ignore_code\][\s\S]*?\[\/ignore_code\]/g]";
         return $datainput;
@@ -260 +284 @@
     // Formatting + Style
 
-    function shortcode_bold($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<strong>'.$this->do_shortcode($content).'</strong>';
-    }
-
-    function shortcode_center($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<span style="text-align:center">'.$this->do_shortcode($content).'</span>';
-    }
-
-    function shortcode_color($atts = array(), $content = null) {
-        if (null === $content || '' === $atts) { return ''; }
-        $color = substr(implode('', $atts), 1);
-        if (ctype_xdigit($color)) { $color = '#'.$color; }
-        return '<span style="color:'.$color.'">'.$this->do_shortcode($content).'</span>';
-    }
-
-    function shortcode_del($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<del>'.$this->do_shortcode($content).'</del>';
-    }
-
-    function shortcode_italics($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<em>'.$this->do_shortcode($content).'</em>';
-    }
-
-    function shortcode_justify($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<span style="text-align:justify">'.$this->do_shortcode($content).'</span>';
-    }
-
-    function shortcode_left($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<span style="text-align:left">'.$this->do_shortcode($content).'</span>';
-    }
-
-    function shortcode_reverse($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<bdo dir="rtl">'.$this->do_shortcode($content).'</bdo>';
-    }
-
-    function shortcode_right($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<span style="text-align:right">'.$this->do_shortcode($content).'</span>';
-    }
-
-    function shortcode_size($atts = array(), $content = null) {
-        if (null === $content || '' === $atts) { return ''; }
-        $subattribs = substr(implode('', $atts), 1);
-        return '<span style="font-size:'.$subattribs.'px">'.$this->do_shortcode($content).'</span>';
-    }
-
-    function shortcode_strikethrough($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<s>'.$this->do_shortcode($content).'</s>';
-    }
-
-    function shortcode_subscript($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<sub>'.$this->do_shortcode($content).'</sub>';
-    }
-
-    function shortcode_superscript($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<sup>'.$this->do_shortcode($content).'</sup>';
-    }
-
-    function shortcode_underline($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<span style="text-decoration:underline">'.$this->do_shortcode($content).'</span>';
+    public function shortcode_bold($atts = [], $content = null)
+    {
+        return $content ? '<strong>' . $this->do_shortcode($content) . '</strong>' : '';
+    }
+
+    public function shortcode_center($atts = [], $content = null)
+    {
+        return $content ? '<span style="text-align:center">' . $this->do_shortcode($content) . '</span>' : '';
+    }
+
+    public function shortcode_color($atts = [], $content = null)
+    {
+        if (!$content || !$atts) {
+            return '';
+        }
+        $color = mb_substr(implode('', $atts), 1);
+        if (ctype_xdigit($color)) {
+            $color = '#' . $color;
+        }
+        return '<span style="color:' . $color . '">' . $this->do_shortcode($content) . '</span>';
+    }
+
+    public function shortcode_del($atts = [], $content = null)
+    {
+        return $content ? '<del>' . $this->do_shortcode($content) . '</del>' : '';
+    }
+
+    public function shortcode_italics($atts = [], $content = null)
+    {
+        return $content ? '<em>' . $this->do_shortcode($content) . '</em>' : '';
+    }
+
+    public function shortcode_justify($atts = [], $content = null)
+    {
+        return $content ? '<span style="text-align:justify">' . $this->do_shortcode($content) . '</span>' : '';
+    }
+
+    public function shortcode_left($atts = [], $content = null)
+    {
+        return $content ? '<span style="text-align:left">' . $this->do_shortcode($content) . '</span>' : '';
+    }
+
+    public function shortcode_reverse($atts = [], $content = null)
+    {
+        return $content ? '<bdo dir="rtl">' . $this->do_shortcode($content) . '</bdo>' : '';
+    }
+
+    public function shortcode_right($atts = [], $content = null)
+    {
+        return $content ? '<span style="text-align:right">' . $this->do_shortcode($content) . '</span>' : '';
+    }
+
+    public function shortcode_size($atts = [], $content = null)
+    {
+        if (!$content || !$atts) {
+            return '';
+        }
+        $subattribs = mb_substr(implode('', $atts), 1);
+        return '<span style="font-size:' . $subattribs . 'px">' . $this->do_shortcode($content) . '</span>';
+    }
+
+    public function shortcode_strikethrough($atts = [], $content = null)
+    {
+        return $content ? '<s>' . $this->do_shortcode($content) . '</s>' : '';
+    }
+
+    public function shortcode_subscript($atts = [], $content = null)
+    {
+        return $content ? '<sub>' . $this->do_shortcode($content) . '</sub>' : '';
+    }
+
+    public function shortcode_superscript($atts = [], $content = null)
+    {
+        return $content ? '<sup>' . $this->do_shortcode($content) . '</sup>' : '';
+    }
+
+    public function shortcode_underline($atts = [], $content = null)
+    {
+        return $content ? '<span style="text-decoration:underline">' . $this->do_shortcode($content) . '</span>' : '';
     }
 
@@ -336 +368 @@
     // Quotes
 
-    function shortcode_quote($atts = array(), $content = null) {
+    public function shortcode_quote($atts = [], $content = null)
+    {
         global $bp;
         global $bbp;
-        $css_classes = array('bbcode-quote');
-        if ($content === null) { return ''; }
-        elseif (empty($atts)){
-            return '<div class="'.implode(' ',$css_classes).'"><blockquote>'.$this->do_shortcode($content).'</blockquote></div>';
-        } else {
-            $name = trim(array_shift($atts), '="');
-            $css_classes[] = 'bbcode-quote-'.$name;
-            $user = get_user_by('login', $name);
-            if (false !== $user){
-                $css_classes[] = 'bbcode-quote-user';
-                if (function_exists('bp_is_active')) { $name = '<a href="'.site_url().'/members/'.$user->user_login.'">'.$user->display_name.'</a>'; }
-                elseif ('bbPress' === get_class($bbp)) { $name = '<a href="'.site_url().'?bbp_user='.$user->ID.'">'.$user->display_name.'</a>'; }
-                else { $name = $user->display_name; }
+        if (!$content) {
+            return '';
+        }
+        $css_classes = ['bbcode-quote'];
+        if (empty($atts)){
+            return '<div class="' . implode(' ', $css_classes) . '"><blockquote>' . $this->do_shortcode($content) . '</blockquote></div>';
+        }
+        $name = trim(array_shift($atts), '="');
+        $css_classes[] = 'bbcode-quote-' . $name;
+        $user = get_user_by('login', $name);
+        if ($user) {
+            $css_classes[] = 'bbcode-quote-user';
+            if (function_exists('bp_is_active')) {
+                $name = '<a href="' . site_url() . '/members/' . $user->user_login . '">' . $user->display_name . '</a>';
+            } elseif (get_class($bbp) === 'bbPress') {
+                $name = '<a href="' . site_url() . '?bbp_user=' . $user->ID . '">' . $user->display_name . '</a>';
+            } elseif ($user->display_name) {
+                $name = $user->display_name;
             }
-            return '<div class="'.implode(' ', $css_classes).'"><strong>'.$name.' wrote: </strong><blockquote>'.$this->do_shortcode($content).'</blockquote></div>';
-        }
-    }
-
-    function shortcode_cite($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<cite>'.$this->do_shortcode($content).'</cite>';
+        }
+        return '<div class="' . implode(' ', $css_classes) . '"><strong>' . $name . ' wrote: </strong><blockquote>' . $this->do_shortcode($content) . '</blockquote></div>';
+    }
+
+    public function shortcode_cite($atts = [], $content = null)
+    {
+        return $content ? '<cite>' . $this->do_shortcode($content) . '</cite>' : '';
     }
 
     // Code
 
-    function shortcode_code($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<code>'.$this->do_shortcode($content).'</code>';
-    }
-
-    function shortcode_kbd($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<kbd>'.$this->do_shortcode($content).'</kbd>';
+    public function shortcode_code($atts = [], $content = null)
+    {
+        return $content ? '<code>' . $this->do_shortcode($content) . '</code>' : '';
+    }
+
+    public function shortcode_kbd($atts = [], $content = null)
+    {
+        return $content ? '<kbd>' . $this->do_shortcode($content) . '</kbd>' : '';
     }
 
     // Lists
 
-    function shortcode_orderedlist($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<ol>'.$this->do_shortcode($content).'</ol>';
-    }
-
-    function shortcode_unorderedlist($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<ul>'.$this->do_shortcode($content).'</ul>';
-    }
-
-    function shortcode_listitem($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<li>'.$this->do_shortcode($content).'</li>';
+    public function shortcode_orderedlist($atts = [], $content = null)
+    {
+        return $content ? '<ol>' . $this->do_shortcode($content) . '</ol>' : '';
+    }
+
+    public function shortcode_unorderedlist($atts = [], $content = null)
+    {
+        return $content ? '<ul>' . $this->do_shortcode($content) . '</ul>' : '';
+    }
+
+    public function shortcode_listitem($atts = [], $content = null)
+    {
+        return $content ? '<li>' . $this->do_shortcode($content) . '</li>' : '';
     }
 
     // Tables
 
-    function shortcode_table($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<table>'.$this->do_shortcode($content).'</table>';
-    }
-
-    function shortcode_thead($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<thead>'.$this->do_shortcode($content).'</thead>';
-    }
-
-    function shortcode_tbody($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<tbody>'.$this->do_shortcode($content).'</tbody>';
-    }
-
-    function shortcode_tfoot($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<tfoot>'.$this->do_shortcode($content).'</tfoot>';
-    }
-
-    function shortcode_th($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<th>'.$this->do_shortcode($content).'</th>';
-    }
-
-    function shortcode_tr($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<tr>'.$this->do_shortcode($content).'</tr>';
-    }
-
-    function shortcode_td($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<td>'.$this->do_shortcode($content).'</td>';
+    public function shortcode_table($atts = [], $content = null)
+    {
+        return $content ? '<table>' . $this->do_shortcode($content) . '</table>' : '';
+    }
+
+    public function shortcode_thead($atts = [], $content = null)
+    {
+        return $content ? '<thead>' . $this->do_shortcode($content) . '</thead>' : '';
+    }
+
+    public function shortcode_tbody($atts = [], $content = null)
+    {
+        return $content ? '<tbody>' . $this->do_shortcode($content) . '</tbody>' : '';
+    }
+
+    public function shortcode_tfoot($atts = [], $content = null)
+    {
+        return $content ? '<tfoot>' . $this->do_shortcode($content) . '</tfoot>' : '';
+    }
+
+    public function shortcode_th($atts = [], $content = null)
+    {
+        return $content ? '<th>' . $this->do_shortcode($content) . '</th>' : '';
+    }
+
+    public function shortcode_tr($atts = [], $content = null)
+    {
+        return $content ? '<tr>' . $this->do_shortcode($content) . '</tr>' : '';
+    }
+
+    public function shortcode_td($atts = [], $content = null)
+    {
+        return $content ? '<td>' . $this->do_shortcode($content) . '</td>' : '';
     }
 
     // Links and Images
 
-    function shortcode_email($atts = array(), $content = null) {
-        if (empty($atts)) {  // [email][email protected][/email]
-            $url = $content;
-        } else {  // [[email protected]]text[/email] or [email="[email protected]"]text[/email]
-            $atts = $this->attributefix($atts);
-            $url = trim(array_shift($atts), '="');
-        }
-        if (empty($url)) { return ''; }
+    public function shortcode_email($atts = [], $content = null)
+    {
+        $url = $content;  // [email][email protected][/email]
+        if ($atts) {  // [[email protected]]text[/email] or [email="[email protected]"]text[/email]
+            $url = trim(array_shift($this->attributefix($atts)), '="');
+        }
+        if (!$url) {
+            return '';
+        }
         $url = str_replace(' at ', '@', str_replace('  ', ' ', $url));
-        return '<a href="mailto:'.$url.'">'.$this->do_shortcode($content).'</a>';
-    }
-
-    function shortcode_telephone($atts = array(), $content = null) {
-        if (empty($atts)) {  // [tel]123-456-7890[/tel]
+        return '<a href="mailto:' . $url . '">' . $this->do_shortcode($content) . '</a>';
+    }
+
+    public function shortcode_telephone($atts = [], $content = null)
+    {
+        if (!$atts) {  // [tel]123-456-7890[/tel]
             $phone = $content;
         } else {  // [tel=123-456-7890]text[/tel] or [tel="123-456-7890"]text[/tel]
+            $phone = trim(array_shift($this->attributefix($atts)), '="');
+        }
+        if (!$phone) {
+            return '';
+        }
+        $phone = $phone.replace('-', '').replace('.', '').replace('+', '');
+        return '<a href="tel:' . $phone . '">' . $this->do_shortcode($content) . '</a>';
+    }
+
+    public function shortcode_image($atts = [], $content = null)
+    {
+        if (!$content) {
+            return '';
+        }
+        $alt = '';
+        if (!$atts) {  // [img=alttext]imageurl[/img]
+            $alt = trim(implode(' ', $atts), '="');
+        }
+        return '<img src="' . $content . '" alt="' . $alt . '" title="' . $alt . ' />';
+    }
+
+    public function shortcode_url($atts = [], $content = null)
+    {
+        if (!$atts) {  // [url]http://www.example.com/[/url]
+            $url = $content;
+        } else {  // [url=http://www.example.com/]text[/url] or [url="http://www.example.com/"]text[/url]
+            $url = trim(array_shift($this->attributefix($atts)), '="');
+        }
+        if (!$url) {
+            return '';
+        }
+        return '<a href="' . $url . '">' . $this->do_shortcode($content) . '</a>';
+    }
+
+    // Videos and Audio
+
+    public function shortcode_bitchute($atts = [], $content = null)
+    {
+        if (!$content) {
+            return 'No BitChute Video ID Set';
+        }
+        $vidID = $content;
+        $height = '330';
+        $width = '400';
+        if (!$atts) {
+            $match = [];
             $atts = $this->attributefix($atts);
-            $phone = trim(array_shift($atts), '="');
-        }
-        if (empty($phone)) { return ''; }
-        $phone = $phone.replace('-', '').replace('.', '').replace('+', '');
-        return '<a href="tel:'.$phone.'">'.$this->do_shortcode($content).'</a>';
-    }
-
-    function shortcode_image($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        $alt = '';
-        if (!empty($atts)) { $alt = trim(implode(' ', $atts ), '="'); }  //  [img=alttext]imageurl[/img]
-        return '<img src="'.$content.'" alt="'.$alt.'" title="'.$alt.' />';
-    }
-
-    function shortcode_url($atts = array(), $content = null) {
-        if (empty($atts)) {  //  [url]http://www.example.com/[/url]
-            $url = $text = $content;
-        } else {  // [url=http://www.example.com/]text[/url] or [url="http://www.example.com/"]text[/url]
+            $autoplay = $atts['autoplay'] === 'yes' ? '&autoplay=1' : '';
+            $vidID = (preg_match('%(?:bitchute(?:-nocookie)?\.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)/|.*[?&]v=))([^"&?/ ]{11})%iu', $atts['url'], $match)) ? $match[1] : false;
+            $height = (isset($atts['height']) && is_numeric($atts['height'])) ? $atts['height'] : '330';
+            $width = (isset($atts['width']) && is_numeric($atts['width'])) ? $atts['width'] : '400';
+        }
+        return '<iframe width="' . $width . '" height="' . $height . '" src="https://www.bitchute.com/embed/' . $vidID . '?html5=1' . $autoplay . '" frameborder="0" allowfullscreen="true"></iframe>';
+    }
+
+    public function shortcode_dailymotion($atts = [], $content = null)
+    {
+        if (!$content) {
+            return 'No DailyMotion Video ID Set';
+        }
+        $vidID = $content;
+        $height = '330';
+        $width = '400';
+        if (!$atts) {
+            $match = [];
             $atts = $this->attributefix($atts);
-            $url = trim(array_shift($atts), '="');
-        }
-        if (empty($url)) { return ''; }
-        if (empty($text)) { $text=$url; }
-        return '<a href="'.$url.'">'.$this->do_shortcode($content).'</a>';
-    }
-
-    // Videos and Audio
-
-    function shortcode_freesound($atts = array(), $content = null) {
-        if ('' === $content) { return 'No Freesound Audio ID Set'; }
-        if (empty($atts)) {  // [freesound]164929[/freesound]
+            $autoplay = $atts['autoplay'] === 'yes' ? '&autoplay=1' : '';
+            $vidID = (preg_match('%(?:dailymotion(?:-nocookie)?\.com/(?:[^/]+/.+/|(?:v|e(?:mbed/)?|(?:video/)?)/|.*[?&]v=))([^"&?/ ]{11})%iu', $atts['url'], $match)) ? $match[1] : false;
+            $height = (isset($atts['height']) && is_numeric($atts['height'])) ? $atts['height'] : '330';
+            $width = (isset($atts['width']) && is_numeric($atts['width'])) ? $atts['width'] : '400';
+        }
+        return '<iframe width="' . $width . '" height="' . $height . '" src="https://www.dailymotion.com/embed/video/' . $vidID . '?html5=1' . $autoplay . '" frameborder="0" allowfullscreen="true"></iframe>';
+    }
+
+    public function shortcode_freesound($atts = [], $content = null)
+    {
+        if (!$content) {
+            return 'No Freesound Audio ID Set';
+        }
+        if (!$atts) {  // [freesound]164929[/freesound]
             $size = 'medium';
         } else {  // [freesound=large]164929[/freesound] or [freesound=small]164929[/freesound]
-            $size = $this->attributefix($atts);
-            $size = trim(array_shift($size), '="');
-        }
-        $vidID = $content;
+            $size = strtolower(trim(array_shift($this->attributefix($atts)), '="'));
+        }
         switch ($size) {
             case 'big':
             case 'large':
             case 'l':
-                return '<iframe frameborder="0" scrolling="no" src="http://www.freesound.org/embed/sound/iframe/'.$vidID.'/simple/large/" width="920" height="245"></iframe>';
+                return '<iframe frameborder="0" scrolling="no" src="http://www.freesound.org/embed/sound/iframe/' . $content . '/simple/large/" width="920" height="245"></iframe>';
             case 'little':
             case 'short':
             case 'small':
             case 's':
-                return '<iframe frameborder="0" scrolling="no" src="http://www.freesound.org/embed/sound/iframe/'.$vidID.'/simple/small/" width="375" height="30"></iframe>';
+                return '<iframe frameborder="0" scrolling="no" src="http://www.freesound.org/embed/sound/iframe/' . $content . '/simple/small/" width="375" height="30"></iframe>';
             case 'mid':
             case 'medium':
             case 'm':
             default:
-                return '<iframe frameborder="0" scrolling="no" src="http://www.freesound.org/embed/sound/iframe/'.$vidID.'/simple/medium/" width="481" height="86"></iframe>';
-        }
-    }
-
-    function shortcode_gvideo($atts = array(), $content = null) {
-        if ('' === $content) { return 'No Google Video ID Set'; }
+                return '<iframe frameborder="0" scrolling="no" src="http://www.freesound.org/embed/sound/iframe/' . $content . '/simple/medium/" width="480" height="86"></iframe>';
+        }
+    }
+
+    public function shortcode_gvideo($atts = [], $content = null)
+    {
+        if (!$content) {
+            return 'No Google Video ID Set';
+        }
+        return '<embed style="width:400px;height:330px" id="VideoPlayback" type="application/x-shockwave-flash" src="http://video.google.com/googleplayer.swf?docId=' . $content . '&hl=en"></embed>';
+    }
+
+    public function shortcode_vimeo($atts = [], $content = null)
+    {
+        if (!$content) {
+            return 'No Vimeo Video ID Set';
+        }
         $vidID = $content;
-        return '<embed style="width:400px;height:325px" id="VideoPlayback" type="application/x-shockwave-flash" src="http://video.google.com/googleplayer.swf?docId='.$vidID.'&hl=en"></embed>';
-    }
-
-    function shortcode_vimeo($atts = array(), $content = null) {
-        if ('' === $content) { return 'No Vimeo Video ID Set'; }
-        $vidID = $content;
-        $height = '325';
+        $height = '330';
         $width = '400';
-        if (!empty($atts)){
+        if (!$atts) {
+            $match = [];
             $atts = $this->attributefix($atts);
             $autoplay = $atts['autoplay'] === 'yes' ? '&amp;autoplay=1' : '';
-            $vidID = (preg_match('~(?:<iframe [^>]*src=")?(?:https?:\/\/(?:[\w]+\.)*vimeo\.com(?:[\/\w]*\/videos?)?\/([0-9]+)[^\s]*)"?(?:[^>]*></iframe>)?(?:<p>.*</p>)?~ix', $atts['url'], $match)) ? $match[1] : false;
-            $height = (isset($atts['height']) && is_numeric($atts['height'])) ? $atts['height'] : '325';
+            $vidID = (preg_match('~(?:<iframe [^>]*src=")?(?:https?:\/\/(?:[\w]+\.)*vimeo\.com(?:[\/\w]*\/videos?)?\/([0-9]+)[^\s]*)"?(?:[^>]*></iframe>)?(?:<p>.*</p>)?~iux', $atts['url'], $match)) ? $match[1] : false;
+            $height = (isset($atts['height']) && is_numeric($atts['height'])) ? $atts['height'] : '330';
             $width = (isset($atts['width']) && is_numeric($atts['width'])) ? $atts['width'] : '400';
         }
-        return '<iframe width="'.$width.'" height="'.$height.'" src="//player.vimeo.com/video/'.$vidID.'?title=0&amp;byline=0&amp;portrait=0&amp;color=ffffff'.$autoplay.'" frameborder="0" allowfullscreen="true"></iframe>';
-    }
-
-    function shortcode_youtube($atts = array(), $content = null) {
-        if ('' === $content) { return 'No YouTube Video ID Set'; }
+        return '<iframe width="' . $width . '" height="' . $height . '" src="//player.vimeo.com/video/' . $vidID . '?title=0&amp;byline=0&amp;portrait=0&amp;color=ffffff' . $autoplay . '" frameborder="0" allowfullscreen="true"></iframe>';
+    }
+
+    public function shortcode_youtube($atts = [], $content = null)
+    {
+        if (!$content) {
+            return 'No YouTube Video ID Set';
+        }
         $vidID = $content;
-        $height = '325';
+        $height = '330';
         $width = '400';
-        if (!empty($atts)){
+        if (!$atts) {
+            $match = [];
             $atts = $this->attributefix($atts);
-            $autoplay = $atts['autoplay'] === 'yes' ? '?autoplay=1' : '';
-            $vidID = (preg_match('%(?:youtube(?:-nocookie)?\.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)/|.*[?&]v=)|youtu\.be/)([^"&?/ ]{11})%i', $atts['url'], $match)) ? $match[1] : false;
-            $height = (isset($atts['height']) && is_numeric($atts['height'])) ? $atts['height'] : '325';
+            $autoplay = $atts['autoplay'] === 'yes' ? '&autoplay=1' : '';
+            $vidID = (preg_match('%(?:youtube(?:-nocookie)?\.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)/|.*[?&]v=)|youtu\.be/)([^"&?/ ]{11})%iu', $atts['url'], $match)) ? $match[1] : false;
+            $height = (isset($atts['height']) && is_numeric($atts['height'])) ? $atts['height'] : '330';
             $width = (isset($atts['width']) && is_numeric($atts['width'])) ? $atts['width'] : '400';
         }
-        return '<iframe width="'.$width.'" height="'.$height.'" src="http://www.youtube.com/embed/'.$vidID.$autoplay.'" frameborder="0" allowfullscreen="true"></iframe>';
+        return '<iframe width="' . $width . '" height="' . $height . '" src="https://www.youtube.com/embed/' . $vidID . '?html5=1' . $autoplay . '" frameborder="0" allowfullscreen="true"></iframe>';
     }
 
     // Special/Miscellaneous Content
 
-    function shortcode_abbr($atts = array(), $content = null) {
-        if (null === $content || !isset($atts['title'])) { return ''; }
+    public function shortcode_abbr($atts = [], $content = null)
+    {
+        if (!$content || !isset($atts['title'])) {
+            return '';
+        }
         $atts = $this->attributefix($atts);
-        return '<abbr title="'.$atts['title'].'">'.$this->do_shortcode($content).'</abbr>';
-    }
-
-    function shortcode_clientip($atts = array(), $content = null) {
+        return '<abbr title="' . $atts['title'] . '">' . $this->do_shortcode($content) . '</abbr>';
+    }
+
+    public function shortcode_clientip($atts = [], $content = null)
+    {
         return $_SERVER['REMOTE_ADDR'];
     }
 
-    function shortcode_hr($atts = array(), $content = null) {
+    public function shortcode_hr($atts = [], $content = null)
+    {
         return '<hr/>';
     }
 
-    function shortcode_note($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<!--'.$content.'-->';
-    }
-
-    function shortcode_useragent($atts = array(), $content = null) {
+    public function shortcode_note($atts = [], $content = null)
+    {
+        return $content ? '<!--' . $content . '-->' : '';
+    }
+
+    public function shortcode_useragent($atts = [], $content = null)
+    {
         return $_SERVER['HTTP_USER_AGENT'];
     }
@@ -565 +667 @@
     // Hide and Display Content
 
-    function shortcode_spoiler($atts = array(), $content = null) {
-        if ($content === null) { return ''; }
-        if ($atts === '') { return '<div style="margin:20px;margin-top:5px"><div class="smallfont" style="margin-bottom:2px"><strong>Spoiler: </strong><input type="button" value="Show" style="width:45px;font-size:10px;margin:0px;padding:0px" onClick="if (this.parentNode.parentNode.getElementsByTagName(\'div\')[1].getElementsByTagName(\'div\')[0].style.display != \'\') { this.parentNode.parentNode.getElementsByTagName(\'div\')[1].getElementsByTagName(\'div\')[0].style.display = \'\'; this.innerText = \'\'; this.value = \'Hide\'; } else { this.parentNode.parentNode.getElementsByTagName(\'div\')[1].getElementsByTagName(\'div\')[0].style.display = \'none\'; this.innerText = \'\'; this.value = \'Show\'; }"></div><div class="alt2" style="margin: 0px; padding: 6px; border: 1px inset;"><div style="display:none">'. $this->do_shortcode($content) .'</div></div></div>'; }
+    public function shortcode_spoiler($atts = [], $content = null)
+    {
+        if (!$content) {
+            return '';
+        }
+        if (!$atts) {
+            return '<div style="margin:20px;margin-top:5px"><div class="smallfont" style="margin-bottom:2px"><strong>Spoiler: </strong><input type="button" value="Show" style="width:45px;font-size:10px;margin:0px;padding:0px" onClick="if (this.parentNode.parentNode.getElementsByTagName(\'div\')[1].getElementsByTagName(\'div\')[0].style.display != \'\') { this.parentNode.parentNode.getElementsByTagName(\'div\')[1].getElementsByTagName(\'div\')[0].style.display = \'\'; this.innerText = \'\'; this.value = \'Hide\'; } else { this.parentNode.parentNode.getElementsByTagName(\'div\')[1].getElementsByTagName(\'div\')[0].style.display = \'none\'; this.innerText = \'\'; this.value = \'Show\'; }"></div><div class="alt2" style="margin: 0px; padding: 4px; border: 1px inset;"><div style="display:none">' . $this->do_shortcode($content) . '</div></div></div>';
+        }
         $subattribs = substr(implode(' ', $atts), 1);
-        return '<div style="margin:20px;margin-top:5px"><div class="smallfont" style="margin-bottom:2px"><strong>Spoiler</strong> for <em>'. $subattribs .'</em> <input type="button" value="Show" style="width:45px;font-size:10px;margin:0px;padding:0px" onClick="if (this.parentNode.parentNode.getElementsByTagName(\'div\')[1].getElementsByTagName(\'div\')[0].style.display != \'\') { this.parentNode.parentNode.getElementsByTagName(\'div\')[1].getElementsByTagName(\'div\')[0].style.display = \'\'; this.innerText = \'\'; this.value = \'Hide\'; } else { this.parentNode.parentNode.getElementsByTagName(\'div\')[1].getElementsByTagName(\'div\')[0].style.display = \'none\'; this.innerText = \'\'; this.value = \'Show\'; }"></div><div class="alt2" style="margin: 0px; padding: 6px; border: 1px inset;"><div style="display:none">'. $this->do_shortcode($content) .'</div></div></div>';
-    }
-
-    function shortcode_guest($atts = array(), $content = null) {
-        if ($content === null || is_user_logged_in()) { return ''; }
-        return '<div>'.$this->do_shortcode($content).'</div>';
-    }
-
-    function shortcode_user($atts = array(), $content = null) {
-        if ($content === null || !is_user_logged_in()) { return ''; }
-        return '<div>'.$this->do_shortcode($content).'</div>';
-    }
-
-}?>
+        return '<div style="margin:20px;margin-top:5px"><div class="smallfont" style="margin-bottom:2px"><strong>Spoiler</strong> for <em>' . $subattribs . '</em> <input type="button" value="Show" style="width:45px;font-size:10px;margin:0px;padding:0px" onClick="if (this.parentNode.parentNode.getElementsByTagName(\'div\')[1].getElementsByTagName(\'div\')[0].style.display != \'\') { this.parentNode.parentNode.getElementsByTagName(\'div\')[1].getElementsByTagName(\'div\')[0].style.display = \'\'; this.innerText = \'\'; this.value = \'Hide\'; } else { this.parentNode.parentNode.getElementsByTagName(\'div\')[1].getElementsByTagName(\'div\')[0].style.display = \'none\'; this.innerText = \'\'; this.value = \'Show\'; }"></div><div class="alt2" style="margin: 0px; padding: 4px; border: 1px inset;"><div style="display:none">' . $this->do_shortcode($content) . '</div></div></div>';
+    }
+
+    public function shortcode_guest($atts = [], $content = null)
+    {
+        if (!$content || is_user_logged_in()) {
+            return '';
+        }
+        return '<div>' . $this->do_shortcode($content) . '</div>';
+    }
+
+    public function shortcode_user($atts = [], $content = null)
+    {
+        if (!$content || !is_user_logged_in()) {
+            return '';
+        }
+        return '<div>' . $this->do_shortcode($content) . '</div>';
+    }
+}

bbcode-deluxe/tags/2020.07.30/options-form-template.php

@@ -2 +2 @@
     <h1>BBCode Deluxe</h1>
     <p>BBCode (Bulletin Board Code) is a lightweight markup language used as an alternative to HTML for formatting. <a href="http://www.bbcode.org/reference.php">http://www.bbcode.org/reference.php</a></p>
-    <?php if ($whitelist_enabled) {
-        if ($bbcodes_active) { ?>
+    <?php if (isset($whitelist_enabled) && $whitelist_enabled) {
+        if (isset($bbcodes_active) && $bbcodes_active) { ?>
             <p>BBCodes are enabled and <a href="http://wordpress.org/extend/plugins/bbpress2-shortcode-whitelist/">bbPress shortcode whitelist</a> has been detected as activated. Users should be able to use BBCodes in blogs, comments, and forums.</p>
         <?php } else { ?>
@@ -62 +62 @@
         <h3>Loaded Extensions</h3>
         <ul><?php
-            $conf_array = get_loaded_extensions();
-            foreach ($conf_array as $val_pair) {
-                echo '<li>'.strval($val_pair).'</li>';
-            }
+        $conf_array = get_loaded_extensions();
+        foreach ($conf_array as $val_pair) {
+            echo '<li>' . strval($val_pair) . '</li>';
+        }
         ?></ul>
     </div>

bbcode-deluxe/tags/2020.07.30/readme.txt

@@ -4 +4 @@
 Tags: bbcode, bbpress, buddypress, bbpress-plugin, bbpress2, forum, html5, information, markup, nested-quotes, php-version, server-info, shortcode
 Requires at least: 3.9
-Tested up to: 5.4
+Tested up to: 5.5
 Stable tag: trunk
 License: GPLv3
@@ -22 +22 @@
 * Plugin URI: https://wordpress.org/plugins/bbcode-deluxe/
 * Description: Adds support for BBCode to Wordpress and BBPress
-* Version: 2019.10.20
+* Version: 2020.07.30
 * Author: Devyn Collier Johnson (DevynCJohnson)
 * Author URI: http://dcjtech.info/
@@ -150 +150 @@
 
 == Changelog ==
+= 2020.07.30 =
+* Bug fixes & minor improvements
+* Added support for BitChute & DailyMotion
+* Made Youtube shortcodes use HTTPS and full embedding
 = 2019.10.20 =
 * Bug fixes

bbcode-deluxe/trunk/bbcode-admin.php

@@ -1 +1 @@
 <?php
 
-function bbcode_deluxe_plugin_menu() { add_options_page('BBCode Deluxe', 'BBCode Deluxe', 'manage_options', 'bbcode-deluxe', 'bbcode_deluxe_plugin_options'); }
+function bbcode_deluxe_plugin_menu()
+{
+    add_options_page('BBCode Deluxe', 'BBCode Deluxe', 'manage_options', 'bbcode-deluxe', 'bbcode_deluxe_plugin_options');
+}
 
 add_action('admin_menu', 'bbcode_deluxe_plugin_menu');
 
-function bbcode_deluxe_plugin_options() {
+function bbcode_deluxe_plugin_options()
+{
     global $bbp_sc_whitelist;
     if (is_admin() && current_user_can('manage_options')) {
@@ -12 +16 @@
         if ($whitelist_enabled) {
             $enabled_plugins = get_option('bbpscwl_enabled_plugins');
-            if ($enabled_plugins === '') { $enabled_plugins = array(); }
-            else { $enabled_plugins = unserialize($enabled_plugins); }
+            if ($enabled_plugins) {
+                $enabled_plugins = unserialize($enabled_plugins);
+            } else {
+                $enabled_plugins = [];
+            }
             $bbcodes_active = false;
             foreach ($enabled_plugins as $plugin_tag) {
-                if ($plugin_tag === 'bbpress-bbcode') { $bbcodes_active = true; }
+                if ($plugin_tag === 'bbpress-bbcode') {
+                    $bbcodes_active = true;
+                    break;
+                }
             }
         }
-        require(dirname(__FILE__).'/options-form-template.php');
-    } else { echo '<div><p>No options currently available.</p></div>'; }
+        require dirname(__FILE__) . '/options-form-template.php';
+    } else {
+        echo '<div><p>No options currently available.</p></div>';
+    }
 }
-
-?>

bbcode-deluxe/trunk/bbcode-deluxe.php

@@ -3 +3 @@
 Plugin URI: http://dcjtech.info/
 Description: Adds support for BBCode to Wordpress and BBPress
-Version: 2019.02.24
+Version: 2020.07.30
 Author: Devyn Collier Johnson (DevynCJohnson)
 Author URI: http://dcjtech.info/
@@ -19 +19 @@
 
 
-function quote_exempt_from_wptexturize($shortcodes) {
-    $shortcodes = ['quote', 'q', 'QUOTE', 'Q'];
-    return $shortcodes;
+defined('ABSPATH') or die('Invalid entrance into the plugin BBCode Deluxe!');
+
+
+function quote_exempt_from_wptexturize($shortcodes)
+{
+    return ['quote', 'q', 'QUOTE', 'Q'];
 }
 
 
-function code_exempt_from_wptexturize($shortcodes) {
-    $shortcodes = ['no-highlight', 'pre', 'raw'];
-    return $shortcodes;
+function code_exempt_from_wptexturize($shortcodes)
+{
+    return ['no-highlight', 'pre', 'raw'];
 }
 
 
-function caption_exempt_from_wptexturize($shortcodes) {
-    $shortcodes[] = 'caption';
-    return $shortcodes;
+function caption_exempt_from_wptexturize($shortcodes)
+{
+    return ['caption'];
 }
 
 
-function nested_quotes($content, $not_used = false) {
+function nested_quotes($content, $not_used = false)
+{
     $counter = 0;
     $tag_counter_string = '';
-    $content = preg_replace('/[\n\r]/', '', $content);
-    $content = str_replace('', '', $content);
-    $content = str_replace('[quote', '[', $content);
-    $content = str_replace('[/quote]', '[/]', $content);
-    $pos = strpos($content, '[/]');
-    while ($pos !== false) {
-        $content = preg_replace('/(?<=\[)([^]*?)(?=\[\/\])/u', '[]$0[/]', $content, 1);
+    $content = preg_replace('/[\n\r]/gu', '', $content);
+    $content = str_replace('', '', $content);
+    $content = str_replace('[quote', '[', $content);
+    $content = str_replace('[/quote]', '[/]', $content);
+    while (strpos($content, '[/]')) {
+        $content = preg_replace('/(?<=\[)([^]*?)(?=\[\/\])/gu', '[]$0[/]', $content, 1);
         $tag_counter_string = 'quote-'.strval($counter);
-        $content = str_replace('[]', $tag_counter_string, $content);
-        $content = str_replace('][/', $tag_counter_string, $content);
+        $content = str_replace('[]', $tag_counter_string, $content);
+        $content = str_replace('][/', $tag_counter_string, $content);
         ++$counter;
-        $pos = strpos($content, '[/]');
     }
-    $content = str_replace('', "\n", $content);
-    return $content;
+    return str_replace('', "\n", $content);
 }
 
 
-function fix_captions($content, $not_used = false) {
-    $content = preg_replace('/[\n\r]/', '', $content);
-    $content = str_replace('', '', $content);
-    $content = str_replace('[/caption]', '', $content);
-    $content = str_replace('[caption', '', $content);
-    $content = preg_replace('/<\/a>([^>]*?)/u', '</a><figcaption class="wp-caption-text aligncenter">$0</figcaption></figure>', $content);
-    while (strpos($content, '') !== false) {
-        $content = preg_replace('/[^\]]*? align="alignleft"[^\]]*?\]/u', '<figure class="wp-caption alignleft">', $content);
-        $content = preg_replace('/[^\]]*? align="alignright"[^\]]*?\]/u', '<figure class="wp-caption alignright">', $content);
-        $content = preg_replace('/[^\]]*? align="aligncenter"[^\]]*?\]/u', '<figure class="wp-caption aligncenter">', $content);
-        $content = preg_replace('/[^\]]*? align="alignnone"[^\]]*?\]/u', '<figure class="wp-caption alignnone">', $content);
-        $content = preg_replace('/[^\]]*?\]/u', '<figure class="wp-caption">', $content);
-        $content = preg_replace('/size\-([a-z]*?) wp\-image\-/', 'size-$0 aligncenter wp-image-', $content);
-        $content = preg_replace('/wp\-image\-([0-9]*?) size\-/', 'size-$0 aligncenter wp-image-', $content);
+function fix_captions($content, $not_used = false)
+{
+    $content = preg_replace('/[\n\r]/gu', '', $content);
+    $content = str_replace('', '', $content);
+    $content = str_replace('[/caption]', '', $content);
+    $content = str_replace('[caption', '', $content);
+    $content = preg_replace('/<\/a>([^>]*?)/gu', '</a><figcaption class="wp-caption-text aligncenter">$0</figcaption></figure>', $content);
+    while (strpos($content, '')) {
+        $content = preg_replace('/[^\]]*? align="alignleft"[^\]]*?\]/gu', '<figure class="wp-caption alignleft">', $content);
+        $content = preg_replace('/[^\]]*? align="alignright"[^\]]*?\]/gu', '<figure class="wp-caption alignright">', $content);
+        $content = preg_replace('/[^\]]*? align="aligncenter"[^\]]*?\]/gu', '<figure class="wp-caption aligncenter">', $content);
+        $content = preg_replace('/[^\]]*? align="alignnone"[^\]]*?\]/gu', '<figure class="wp-caption alignnone">', $content);
+        $content = preg_replace('/[^\]]*?\]/gu', '<figure class="wp-caption">', $content);
+        $content = preg_replace('/size\-([A-Za-z0-9]*?) wp\-image\-/gu', 'size-$0 aligncenter wp-image-', $content);
+        $content = preg_replace('/wp\-image\-([A-Za-z0-9]*?) size\-/gu', 'size-$0 aligncenter wp-image-', $content);
     }
-    $content = str_replace('', "\n", $content);
-    $content = str_replace('', '', $content);
-    $content = str_replace('', '', $content);
-    return $content;
+    $content = str_replace('', "\n", $content);
+    return str_replace('', '', str_replace('', '', $content));
 }
 
 
-defined('ABSPATH') or die('Invalid entrance into the plugin BBCode Deluxe!');
 add_filter('no_texturize_shortcodes', 'caption_exempt_from_wptexturize', 8);
 add_filter('no_texturize_shortcodes', 'code_exempt_from_wptexturize');
@@ -92 +91 @@
 add_filter('the_content', 'do_shortcode', 11);
 add_filter('widget_text', 'do_shortcode', 11);
-if (function_exists('get_comment_text')) { add_filter('get_comment_text', 'do_shortcode', 11); }
-if (function_exists('bbp_get_topic_content')) { add_filter('bbp_get_topic_content', 'do_shortcode', 11); }
-if (function_exists('bbp_get_reply_content')) { add_filter('bbp_get_reply_content', 'do_shortcode', 11); }
-if (function_exists('bp_get_activity_content_body')) { add_filter('bp_get_activity_content_body', 'do_shortcode', 11); }
-if (function_exists('bp_get_the_topic_post_content')) { add_filter('bp_get_the_topic_post_content', 'do_shortcode', 11); }
-if (function_exists('bp_get_the_thread_message_content')) { add_filter('bp_get_the_thread_message_content', 'do_shortcode', 11); }
-require_once(dirname(__FILE__).'/bbcode-admin.php');
-require_once(dirname(__FILE__).'/class-bbcode.php');
-add_action('plugins_loaded', function() { global $BBCode; $BBCode = new BBCode(); }, 14);
 
-?>
+if (function_exists('get_comment_text')) {
+    add_filter('get_comment_text', 'do_shortcode', 11);
+}
+if (function_exists('bbp_get_topic_content')) {
+    add_filter('bbp_get_topic_content', 'do_shortcode', 11);
+}
+if (function_exists('bbp_get_reply_content')) {
+    add_filter('bbp_get_reply_content', 'do_shortcode', 11);
+}
+if (function_exists('bp_get_activity_content_body')) {
+    add_filter('bp_get_activity_content_body', 'do_shortcode', 11);
+}
+if (function_exists('bp_get_the_topic_post_content')) {
+    add_filter('bp_get_the_topic_post_content', 'do_shortcode', 11);
+}
+if (function_exists('bp_get_the_thread_message_content')) {
+    add_filter('bp_get_the_thread_message_content', 'do_shortcode', 11);
+}
+
+require_once dirname(__FILE__) . '/bbcode-admin.php';
+require_once dirname(__FILE__) . '/class-bbcode.php';
+
+add_action(
+    'plugins_loaded',
+    function() {
+        global $BBCode;
+        $BBCode = new BBCode();
+    },
+    14
+);

bbcode-deluxe/trunk/class-bbcode.php

@@ -1 @@
-<?php class BBCode {
-
-    public $use_whitelist = false;
-    function __construct() {
-        if (!function_exists('add_shortcode')) { return; }
+<?php
+
+class BBCode
+{
+
+    private function __construct()
+    {
+        if (!function_exists('add_shortcode')) {
+            return;
+        }
         // Shortcode Protection
         add_shortcode('c', 'skip_enclosed_shortcodes');
@@ -21 +26 @@
         add_shortcode('sql', 'skip_enclosed_shortcodes');
         add_shortcode('xml', 'skip_enclosed_shortcodes');
-        if (function_exists('tiny_mce_before_init')) { add_action('tiny_mce_before_init', 'tinymce_skip_enclosed_shortcodes'); }
+        if (function_exists('tiny_mce_before_init')) {
+            add_action('tiny_mce_before_init', 'tinymce_skip_enclosed_shortcodes');
+        }
         // Formatting + Style
-        add_shortcode('b', array(&$this, 'shortcode_bold'));
-        add_shortcode('B', array(&$this, 'shortcode_bold'));
-        add_shortcode('bold', array(&$this, 'shortcode_bold'));
-        add_shortcode('BOLD', array(&$this, 'shortcode_bold'));
-        add_shortcode('strong', array(&$this, 'shortcode_bold'));
-        add_shortcode('STRONG', array(&$this, 'shortcode_bold'));
-        add_shortcode('center', array(&$this, 'shortcode_center'));
-        add_shortcode('CENTER', array(&$this, 'shortcode_center'));
-        add_shortcode('color', array(&$this, 'shortcode_color'));
-        add_shortcode('COLOR', array(&$this, 'shortcode_color'));
-        add_shortcode('del', array(&$this, 'shortcode_del'));
-        add_shortcode('DEL', array(&$this, 'shortcode_del'));
-        add_shortcode('i', array(&$this, 'shortcode_italics'));
-        add_shortcode('I', array(&$this, 'shortcode_italics'));
-        add_shortcode('italic', array(&$this, 'shortcode_italics'));
-        add_shortcode('ITALIC', array(&$this, 'shortcode_italics'));
-        add_shortcode('em', array(&$this, 'shortcode_italics'));
-        add_shortcode('EM', array(&$this, 'shortcode_italics'));
-        add_shortcode('justify', array(&$this, 'shortcode_justify'));
-        add_shortcode('JUSTIFY', array(&$this, 'shortcode_justify'));
-        add_shortcode('left', array(&$this, 'shortcode_left'));
-        add_shortcode('LEFT', array(&$this, 'shortcode_left'));
-        add_shortcode('bdo', array(&$this, 'shortcode_reverse'));
-        add_shortcode('BDO', array(&$this, 'shortcode_reverse'));
-        add_shortcode('reverse', array(&$this, 'shortcode_reverse'));
-        add_shortcode('REVERSE', array(&$this, 'shortcode_reverse'));
-        add_shortcode('right', array(&$this, 'shortcode_right'));
-        add_shortcode('RIGHT', array(&$this, 'shortcode_right'));
-        add_shortcode('size', array(&$this, 'shortcode_size'));
-        add_shortcode('SIZE', array(&$this, 'shortcode_size'));
-        add_shortcode('s', array(&$this, 'shortcode_strikethrough'));
-        add_shortcode('S', array(&$this, 'shortcode_strikethrough'));
-        add_shortcode('strike', array(&$this, 'shortcode_strikethrough'));
-        add_shortcode('STRIKE', array(&$this, 'shortcode_strikethrough'));
-        add_shortcode('sub', array(&$this, 'shortcode_subscript'));
-        add_shortcode('SUB', array(&$this, 'shortcode_subscript'));
-        add_shortcode('sup', array(&$this, 'shortcode_superscript'));
-        add_shortcode('SUP', array(&$this, 'shortcode_superscript'));
-        add_shortcode('u', array(&$this, 'shortcode_underline'));
-        add_shortcode('U', array(&$this, 'shortcode_underline'));
-        add_shortcode('underline', array(&$this, 'shortcode_underline'));
-        add_shortcode('UNDERLINE', array(&$this, 'shortcode_underline'));
+        add_shortcode('b', [&$this, 'shortcode_bold']);
+        add_shortcode('B', [&$this, 'shortcode_bold']);
+        add_shortcode('bold', [&$this, 'shortcode_bold']);
+        add_shortcode('BOLD', [&$this, 'shortcode_bold']);
+        add_shortcode('strong', [&$this, 'shortcode_bold']);
+        add_shortcode('STRONG', [&$this, 'shortcode_bold']);
+        add_shortcode('center', [&$this, 'shortcode_center']);
+        add_shortcode('CENTER', [&$this, 'shortcode_center']);
+        add_shortcode('color', [&$this, 'shortcode_color']);
+        add_shortcode('COLOR', [&$this, 'shortcode_color']);
+        add_shortcode('del', [&$this, 'shortcode_del']);
+        add_shortcode('DEL', [&$this, 'shortcode_del']);
+        add_shortcode('i', [&$this, 'shortcode_italics']);
+        add_shortcode('I', [&$this, 'shortcode_italics']);
+        add_shortcode('italic', [&$this, 'shortcode_italics']);
+        add_shortcode('ITALIC', [&$this, 'shortcode_italics']);
+        add_shortcode('em', [&$this, 'shortcode_italics']);
+        add_shortcode('EM', [&$this, 'shortcode_italics']);
+        add_shortcode('justify', [&$this, 'shortcode_justify']);
+        add_shortcode('JUSTIFY', [&$this, 'shortcode_justify']);
+        add_shortcode('left', [&$this, 'shortcode_left']);
+        add_shortcode('LEFT', [&$this, 'shortcode_left']);
+        add_shortcode('bdo', [&$this, 'shortcode_reverse']);
+        add_shortcode('BDO', [&$this, 'shortcode_reverse']);
+        add_shortcode('reverse', [&$this, 'shortcode_reverse']);
+        add_shortcode('REVERSE', [&$this, 'shortcode_reverse']);
+        add_shortcode('right', [&$this, 'shortcode_right']);
+        add_shortcode('RIGHT', [&$this, 'shortcode_right']);
+        add_shortcode('size', [&$this, 'shortcode_size']);
+        add_shortcode('SIZE', [&$this, 'shortcode_size']);
+        add_shortcode('s', [&$this, 'shortcode_strikethrough']);
+        add_shortcode('S', [&$this, 'shortcode_strikethrough']);
+        add_shortcode('strike', [&$this, 'shortcode_strikethrough']);
+        add_shortcode('STRIKE', [&$this, 'shortcode_strikethrough']);
+        add_shortcode('sub', [&$this, 'shortcode_subscript']);
+        add_shortcode('SUB', [&$this, 'shortcode_subscript']);
+        add_shortcode('sup', [&$this, 'shortcode_superscript']);
+        add_shortcode('SUP', [&$this, 'shortcode_superscript']);
+        add_shortcode('u', [&$this, 'shortcode_underline']);
+        add_shortcode('U', [&$this, 'shortcode_underline']);
+        add_shortcode('underline', [&$this, 'shortcode_underline']);
+        add_shortcode('UNDERLINE', [&$this, 'shortcode_underline']);
         // Quotes
-        add_shortcode('q', array(&$this, 'shortcode_quote'));
-        add_shortcode('q-0', array(&$this, 'shortcode_quote'));
-        add_shortcode('q-1', array(&$this, 'shortcode_quote'));
-        add_shortcode('q-2', array(&$this, 'shortcode_quote'));
-        add_shortcode('q-3', array(&$this, 'shortcode_quote'));
-        add_shortcode('q-4', array(&$this, 'shortcode_quote'));
-        add_shortcode('q-5', array(&$this, 'shortcode_quote'));
-        add_shortcode('q-6', array(&$this, 'shortcode_quote'));
-        add_shortcode('q-7', array(&$this, 'shortcode_quote'));
-        add_shortcode('q-8', array(&$this, 'shortcode_quote'));
-        add_shortcode('q-9', array(&$this, 'shortcode_quote'));
-        add_shortcode('q-10', array(&$this, 'shortcode_quote'));
-        add_shortcode('Q', array(&$this, 'shortcode_quote'));
-        add_shortcode('Q-0', array(&$this, 'shortcode_quote'));
-        add_shortcode('Q-1', array(&$this, 'shortcode_quote'));
-        add_shortcode('Q-2', array(&$this, 'shortcode_quote'));
-        add_shortcode('Q-3', array(&$this, 'shortcode_quote'));
-        add_shortcode('Q-4', array(&$this, 'shortcode_quote'));
-        add_shortcode('Q-5', array(&$this, 'shortcode_quote'));
-        add_shortcode('Q-6', array(&$this, 'shortcode_quote'));
-        add_shortcode('Q-7', array(&$this, 'shortcode_quote'));
-        add_shortcode('Q-8', array(&$this, 'shortcode_quote'));
-        add_shortcode('Q-9', array(&$this, 'shortcode_quote'));
-        add_shortcode('Q-10', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-0', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-1', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-2', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-3', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-4', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-5', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-6', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-7', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-8', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-9', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-10', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-11', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-12', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-13', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-14', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-15', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-16', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-17', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-18', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-19', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-20', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-21', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-22', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-23', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-24', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-25', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-26', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-27', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-28', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-29', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-30', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-31', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-32', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-33', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-34', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-35', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-36', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-37', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-38', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-39', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-40', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-41', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-42', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-43', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-44', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-45', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-46', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-47', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-48', array(&$this, 'shortcode_quote'));
-        add_shortcode('quote-49', array(&$this, 'shortcode_quote'));
-        add_shortcode('QUOTE', array(&$this, 'shortcode_quote'));
-        add_shortcode('QUOTE-0', array(&$this, 'shortcode_quote'));
-        add_shortcode('QUOTE-1', array(&$this, 'shortcode_quote'));
-        add_shortcode('QUOTE-2', array(&$this, 'shortcode_quote'));
-        add_shortcode('QUOTE-3', array(&$this, 'shortcode_quote'));
-        add_shortcode('QUOTE-4', array(&$this, 'shortcode_quote'));
-        add_shortcode('QUOTE-5', array(&$this, 'shortcode_quote'));
-        add_shortcode('QUOTE-6', array(&$this, 'shortcode_quote'));
-        add_shortcode('QUOTE-7', array(&$this, 'shortcode_quote'));
-        add_shortcode('QUOTE-8', array(&$this, 'shortcode_quote'));
-        add_shortcode('QUOTE-9', array(&$this, 'shortcode_quote'));
-        add_shortcode('QUOTE-10', array(&$this, 'shortcode_quote'));
-        add_shortcode('cite', array(&$this, 'shortcode_cite'));
-        add_shortcode('CITE', array(&$this, 'shortcode_cite'));
+        add_shortcode('q', [&$this, 'shortcode_quote']);
+        add_shortcode('q-0', [&$this, 'shortcode_quote']);
+        add_shortcode('q-1', [&$this, 'shortcode_quote']);
+        add_shortcode('q-2', [&$this, 'shortcode_quote']);
+        add_shortcode('q-3', [&$this, 'shortcode_quote']);
+        add_shortcode('q-4', [&$this, 'shortcode_quote']);
+        add_shortcode('q-5', [&$this, 'shortcode_quote']);
+        add_shortcode('q-6', [&$this, 'shortcode_quote']);
+        add_shortcode('q-7', [&$this, 'shortcode_quote']);
+        add_shortcode('q-8', [&$this, 'shortcode_quote']);
+        add_shortcode('q-9', [&$this, 'shortcode_quote']);
+        add_shortcode('q-10', [&$this, 'shortcode_quote']);
+        add_shortcode('Q', [&$this, 'shortcode_quote']);
+        add_shortcode('Q-0', [&$this, 'shortcode_quote']);
+        add_shortcode('Q-1', [&$this, 'shortcode_quote']);
+        add_shortcode('Q-2', [&$this, 'shortcode_quote']);
+        add_shortcode('Q-3', [&$this, 'shortcode_quote']);
+        add_shortcode('Q-4', [&$this, 'shortcode_quote']);
+        add_shortcode('Q-5', [&$this, 'shortcode_quote']);
+        add_shortcode('Q-6', [&$this, 'shortcode_quote']);
+        add_shortcode('Q-7', [&$this, 'shortcode_quote']);
+        add_shortcode('Q-8', [&$this, 'shortcode_quote']);
+        add_shortcode('Q-9', [&$this, 'shortcode_quote']);
+        add_shortcode('Q-10', [&$this, 'shortcode_quote']);
+        add_shortcode('quote', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-0', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-1', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-2', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-3', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-4', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-5', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-6', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-7', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-8', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-9', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-10', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-11', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-12', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-13', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-14', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-15', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-16', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-17', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-18', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-19', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-20', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-21', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-22', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-23', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-24', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-25', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-26', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-27', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-28', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-29', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-30', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-31', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-32', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-33', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-34', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-35', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-36', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-37', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-38', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-39', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-40', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-41', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-42', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-43', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-44', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-45', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-46', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-47', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-48', [&$this, 'shortcode_quote']);
+        add_shortcode('quote-49', [&$this, 'shortcode_quote']);
+        add_shortcode('QUOTE', [&$this, 'shortcode_quote']);
+        add_shortcode('QUOTE-0', [&$this, 'shortcode_quote']);
+        add_shortcode('QUOTE-1', [&$this, 'shortcode_quote']);
+        add_shortcode('QUOTE-2', [&$this, 'shortcode_quote']);
+        add_shortcode('QUOTE-3', [&$this, 'shortcode_quote']);
+        add_shortcode('QUOTE-4', [&$this, 'shortcode_quote']);
+        add_shortcode('QUOTE-5', [&$this, 'shortcode_quote']);
+        add_shortcode('QUOTE-6', [&$this, 'shortcode_quote']);
+        add_shortcode('QUOTE-7', [&$this, 'shortcode_quote']);
+        add_shortcode('QUOTE-8', [&$this, 'shortcode_quote']);
+        add_shortcode('QUOTE-9', [&$this, 'shortcode_quote']);
+        add_shortcode('QUOTE-10', [&$this, 'shortcode_quote']);
+        add_shortcode('cite', [&$this, 'shortcode_cite']);
+        add_shortcode('CITE', [&$this, 'shortcode_cite']);
         // Code
-        add_shortcode('code', array(&$this, 'shortcode_code'));
-        add_shortcode('CODE', array(&$this, 'shortcode_code'));
-        add_shortcode('kbd', array(&$this, 'shortcode_kbd'));
-        add_shortcode('KBD', array(&$this, 'shortcode_kbd'));
-        add_shortcode('key', array(&$this, 'shortcode_kbd'));
-        add_shortcode('KEY', array(&$this, 'shortcode_kbd'));
-        add_shortcode('keyboard', array(&$this, 'shortcode_kbd'));
-        add_shortcode('KEYBOARD', array(&$this, 'shortcode_kbd'));
+        add_shortcode('code', [&$this, 'shortcode_code']);
+        add_shortcode('CODE', [&$this, 'shortcode_code']);
+        add_shortcode('kbd', [&$this, 'shortcode_kbd']);
+        add_shortcode('KBD', [&$this, 'shortcode_kbd']);
+        add_shortcode('key', [&$this, 'shortcode_kbd']);
+        add_shortcode('KEY', [&$this, 'shortcode_kbd']);
+        add_shortcode('keyboard', [&$this, 'shortcode_kbd']);
+        add_shortcode('KEYBOARD', [&$this, 'shortcode_kbd']);
         // Lists
-        add_shortcode('ol', array(&$this, 'shortcode_orderedlist'));
-        add_shortcode('OL', array(&$this, 'shortcode_orderedlist'));
-        add_shortcode('ul', array(&$this, 'shortcode_unorderedlist'));
-        add_shortcode('UL', array(&$this, 'shortcode_unorderedlist'));
-        add_shortcode('list', array(&$this, 'shortcode_unorderedlist'));
-        add_shortcode('LIST', array(&$this, 'shortcode_unorderedlist'));
-        add_shortcode('li', array(&$this, 'shortcode_listitem'));
-        add_shortcode('LI', array(&$this, 'shortcode_listitem'));
+        add_shortcode('ol', [&$this, 'shortcode_orderedlist']);
+        add_shortcode('OL', [&$this, 'shortcode_orderedlist']);
+        add_shortcode('ul', [&$this, 'shortcode_unorderedlist']);
+        add_shortcode('UL', [&$this, 'shortcode_unorderedlist']);
+        add_shortcode('list', [&$this, 'shortcode_unorderedlist']);
+        add_shortcode('LIST', [&$this, 'shortcode_unorderedlist']);
+        add_shortcode('li', [&$this, 'shortcode_listitem']);
+        add_shortcode('LI', [&$this, 'shortcode_listitem']);
         // Tables
-        add_shortcode('table', array(&$this, 'shortcode_table'));
-        add_shortcode('TABLE', array(&$this, 'shortcode_table'));
-        add_shortcode('thead', array(&$this, 'shortcode_thead'));
-        add_shortcode('THEAD', array(&$this, 'shortcode_thead'));
-        add_shortcode('tbody', array(&$this, 'shortcode_tbody'));
-        add_shortcode('TBODY', array(&$this, 'shortcode_tbody'));
-        add_shortcode('tfoot', array(&$this, 'shortcode_tfoot'));
-        add_shortcode('TFOOT', array(&$this, 'shortcode_tfoot'));
-        add_shortcode('th', array(&$this, 'shortcode_th'));
-        add_shortcode('TH', array(&$this, 'shortcode_th'));
-        add_shortcode('tr', array(&$this, 'shortcode_tr'));
-        add_shortcode('TR', array(&$this, 'shortcode_tr'));
-        add_shortcode('td', array(&$this, 'shortcode_td'));
-        add_shortcode('TD', array(&$this, 'shortcode_td'));
+        add_shortcode('table', [&$this, 'shortcode_table']);
+        add_shortcode('TABLE', [&$this, 'shortcode_table']);
+        add_shortcode('thead', [&$this, 'shortcode_thead']);
+        add_shortcode('THEAD', [&$this, 'shortcode_thead']);
+        add_shortcode('tbody', [&$this, 'shortcode_tbody']);
+        add_shortcode('TBODY', [&$this, 'shortcode_tbody']);
+        add_shortcode('tfoot', [&$this, 'shortcode_tfoot']);
+        add_shortcode('TFOOT', [&$this, 'shortcode_tfoot']);
+        add_shortcode('th', [&$this, 'shortcode_th']);
+        add_shortcode('TH', [&$this, 'shortcode_th']);
+        add_shortcode('tr', [&$this, 'shortcode_tr']);
+        add_shortcode('TR', [&$this, 'shortcode_tr']);
+        add_shortcode('td', [&$this, 'shortcode_td']);
+        add_shortcode('TD', [&$this, 'shortcode_td']);
         // Links and Images
-        add_shortcode('email', array(&$this, 'shortcode_email'));
-        add_shortcode('EMAIL', array(&$this, 'shortcode_email'));
-        add_shortcode('tel', array(&$this, 'shortcode_telephone'));
-        add_shortcode('TEL', array(&$this, 'shortcode_telephone'));
-        add_shortcode('img', array(&$this, 'shortcode_image'));
-        add_shortcode('IMG', array(&$this, 'shortcode_image'));
-        add_shortcode('url', array(&$this, 'shortcode_url'));
-        add_shortcode('URL', array(&$this, 'shortcode_url'));
-        add_shortcode('link', array(&$this, 'shortcode_url'));
-        add_shortcode('LINK', array(&$this, 'shortcode_url'));
+        add_shortcode('email', [&$this, 'shortcode_email']);
+        add_shortcode('EMAIL', [&$this, 'shortcode_email']);
+        add_shortcode('tel', [&$this, 'shortcode_telephone']);
+        add_shortcode('TEL', [&$this, 'shortcode_telephone']);
+        add_shortcode('img', [&$this, 'shortcode_image']);
+        add_shortcode('IMG', [&$this, 'shortcode_image']);
+        add_shortcode('url', [&$this, 'shortcode_url']);
+        add_shortcode('URL', [&$this, 'shortcode_url']);
+        add_shortcode('link', [&$this, 'shortcode_url']);
+        add_shortcode('LINK', [&$this, 'shortcode_url']);
         // Videos and Audio
-        add_shortcode('freesound', array(&$this, 'shortcode_freesound'));
-        add_shortcode('FREESOUND', array(&$this, 'shortcode_freesound'));
-        add_shortcode('gvideo', array(&$this, 'shortcode_gvideo'));
-        add_shortcode('GVIDEO', array(&$this, 'shortcode_gvideo'));
-        add_shortcode('vimeo', array(&$this, 'shortcode_vimeo'));
-        add_shortcode('VIMEO', array(&$this, 'shortcode_vimeo'));
-        add_shortcode('youtube', array(&$this, 'shortcode_youtube'));
-        add_shortcode('YOUTUBE', array(&$this, 'shortcode_youtube'));
+        add_shortcode('bitchute', [&$this, 'shortcode_bitchute']);
+        add_shortcode('BITCHUTE', [&$this, 'shortcode_bitchute']);
+        add_shortcode('dailymotion', [&$this, 'shortcode_dailymotion']);
+        add_shortcode('DAILYMOTION', [&$this, 'shortcode_dailymotion']);
+        add_shortcode('freesound', [&$this, 'shortcode_freesound']);
+        add_shortcode('FREESOUND', [&$this, 'shortcode_freesound']);
+        add_shortcode('gvideo', [&$this, 'shortcode_gvideo']);
+        add_shortcode('GVIDEO', [&$this, 'shortcode_gvideo']);
+        add_shortcode('vimeo', [&$this, 'shortcode_vimeo']);
+        add_shortcode('VIMEO', [&$this, 'shortcode_vimeo']);
+        add_shortcode('youtube', [&$this, 'shortcode_youtube']);
+        add_shortcode('YOUTUBE', [&$this, 'shortcode_youtube']);
         // Special/Miscellaneous Content
-        add_shortcode('abbr', array(&$this, 'shortcode_abbr'));
-        add_shortcode('ABBR', array(&$this, 'shortcode_abbr'));
-        add_shortcode('acronym', array(&$this, 'shortcode_abbr'));
-        add_shortcode('ACRONYM', array(&$this, 'shortcode_abbr'));
-        add_shortcode('ip', array(&$this, 'shortcode_clientip'));
-        add_shortcode('IP', array(&$this, 'shortcode_clientip'));
-        add_shortcode('hr', array(&$this, 'shortcode_hr'));
-        add_shortcode('HR', array(&$this, 'shortcode_hr'));
-        add_shortcode('note', array(&$this, 'shortcode_note'));
-        add_shortcode('NOTE', array(&$this, 'shortcode_note'));
-        add_shortcode('useragent', array(&$this, 'shortcode_useragent'));
-        add_shortcode('USERAGENT', array(&$this, 'shortcode_useragent'));
+        add_shortcode('abbr', [&$this, 'shortcode_abbr']);
+        add_shortcode('ABBR', [&$this, 'shortcode_abbr']);
+        add_shortcode('acronym', [&$this, 'shortcode_abbr']);
+        add_shortcode('ACRONYM', [&$this, 'shortcode_abbr']);
+        add_shortcode('ip', [&$this, 'shortcode_clientip']);
+        add_shortcode('IP', [&$this, 'shortcode_clientip']);
+        add_shortcode('hr', [&$this, 'shortcode_hr']);
+        add_shortcode('HR', [&$this, 'shortcode_hr']);
+        add_shortcode('note', [&$this, 'shortcode_note']);
+        add_shortcode('NOTE', [&$this, 'shortcode_note']);
+        add_shortcode('useragent', [&$this, 'shortcode_useragent']);
+        add_shortcode('USERAGENT', [&$this, 'shortcode_useragent']);
         // Hide and Display Content
-        add_shortcode('spoiler', array(&$this, 'shortcode_spoiler'));
-        add_shortcode('SPOILER', array(&$this, 'shortcode_spoiler'));
-        add_shortcode('user', array(&$this, 'shortcode_user'));
-        add_shortcode('USER', array(&$this, 'shortcode_user'));
-        add_shortcode('guest', array(&$this, 'shortcode_guest'));
-        add_shortcode('GUEST', array(&$this, 'shortcode_guest'));
+        add_shortcode('spoiler', [&$this, 'shortcode_spoiler']);
+        add_shortcode('SPOILER', [&$this, 'shortcode_spoiler']);
+        add_shortcode('user', [&$this, 'shortcode_user']);
+        add_shortcode('USER', [&$this, 'shortcode_user']);
+        add_shortcode('guest', [&$this, 'shortcode_guest']);
+        add_shortcode('GUEST', [&$this, 'shortcode_guest']);
         $this->use_whitelist = false;
-        if (function_exists('bbp_whitelist_do_shortcode')) { $this->use_whitelist = true; }
-    }
-
-    function do_shortcode($content) {
-        if (function_exists('bbp_whitelist_do_shortcode')) { return bbp_whitelist_do_shortcode($content); }
-        else { return do_shortcode($content); }
-    }
-
-    function attributefix($atts = array()) {
-        if (empty($atts[0])) { return $atts; }
-        if (0 !== preg_match('#=("|\')(.*?)("|\')#', $atts[0], $match)) { $atts[0] = $match[2]; }
+        if (function_exists('bbp_whitelist_do_shortcode')) {
+            $this->use_whitelist = true;
+        }
+    }
+
+    public function do_shortcode($content)
+    {
+        if (function_exists('bbp_whitelist_do_shortcode')) {
+            return bbp_whitelist_do_shortcode($content);
+        }
+        return do_shortcode($content);
+    }
+
+    public function attributefix($atts = [])
+    {
+        if (empty($atts[0])) {
+            return $atts;
+        }
+        $match = [];
+        if (preg_match('#=("|\')(.*?)("|\')#u', $atts[0], $match) !== 0) {
+            $atts[0] = $match[2];
+        }
         return $atts;
     }
 
 
-    // SHORTCODES //
+    /* SHORTCODES */
 
 
     // Shortcode Protection
 
-    function skip_enclosed_shortcodes($atts, $content = null) {
+    public function skip_enclosed_shortcodes($atts, $content = null)
+    {
         return $content;
     }
 
-    function tinymce_skip_enclosed_shortcodes($datainput) {
+    public function tinymce_skip_enclosed_shortcodes($datainput)
+    {
         $datainput['protect'] = "[/\<\?php[\s\S]*?\?\>/g, /\[insert_php\][\s\S]*?\[\/insert_php\]/g, /\[ignore_code\][\s\S]*?\[\/ignore_code\]/g]";
         return $datainput;
@@ -260 +284 @@
     // Formatting + Style
 
-    function shortcode_bold($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<strong>'.$this->do_shortcode($content).'</strong>';
-    }
-
-    function shortcode_center($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<span style="text-align:center">'.$this->do_shortcode($content).'</span>';
-    }
-
-    function shortcode_color($atts = array(), $content = null) {
-        if (null === $content || '' === $atts) { return ''; }
-        $color = substr(implode('', $atts), 1);
-        if (ctype_xdigit($color)) { $color = '#'.$color; }
-        return '<span style="color:'.$color.'">'.$this->do_shortcode($content).'</span>';
-    }
-
-    function shortcode_del($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<del>'.$this->do_shortcode($content).'</del>';
-    }
-
-    function shortcode_italics($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<em>'.$this->do_shortcode($content).'</em>';
-    }
-
-    function shortcode_justify($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<span style="text-align:justify">'.$this->do_shortcode($content).'</span>';
-    }
-
-    function shortcode_left($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<span style="text-align:left">'.$this->do_shortcode($content).'</span>';
-    }
-
-    function shortcode_reverse($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<bdo dir="rtl">'.$this->do_shortcode($content).'</bdo>';
-    }
-
-    function shortcode_right($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<span style="text-align:right">'.$this->do_shortcode($content).'</span>';
-    }
-
-    function shortcode_size($atts = array(), $content = null) {
-        if (null === $content || '' === $atts) { return ''; }
-        $subattribs = substr(implode('', $atts), 1);
-        return '<span style="font-size:'.$subattribs.'px">'.$this->do_shortcode($content).'</span>';
-    }
-
-    function shortcode_strikethrough($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<s>'.$this->do_shortcode($content).'</s>';
-    }
-
-    function shortcode_subscript($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<sub>'.$this->do_shortcode($content).'</sub>';
-    }
-
-    function shortcode_superscript($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<sup>'.$this->do_shortcode($content).'</sup>';
-    }
-
-    function shortcode_underline($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<span style="text-decoration:underline">'.$this->do_shortcode($content).'</span>';
+    public function shortcode_bold($atts = [], $content = null)
+    {
+        return $content ? '<strong>' . $this->do_shortcode($content) . '</strong>' : '';
+    }
+
+    public function shortcode_center($atts = [], $content = null)
+    {
+        return $content ? '<span style="text-align:center">' . $this->do_shortcode($content) . '</span>' : '';
+    }
+
+    public function shortcode_color($atts = [], $content = null)
+    {
+        if (!$content || !$atts) {
+            return '';
+        }
+        $color = mb_substr(implode('', $atts), 1);
+        if (ctype_xdigit($color)) {
+            $color = '#' . $color;
+        }
+        return '<span style="color:' . $color . '">' . $this->do_shortcode($content) . '</span>';
+    }
+
+    public function shortcode_del($atts = [], $content = null)
+    {
+        return $content ? '<del>' . $this->do_shortcode($content) . '</del>' : '';
+    }
+
+    public function shortcode_italics($atts = [], $content = null)
+    {
+        return $content ? '<em>' . $this->do_shortcode($content) . '</em>' : '';
+    }
+
+    public function shortcode_justify($atts = [], $content = null)
+    {
+        return $content ? '<span style="text-align:justify">' . $this->do_shortcode($content) . '</span>' : '';
+    }
+
+    public function shortcode_left($atts = [], $content = null)
+    {
+        return $content ? '<span style="text-align:left">' . $this->do_shortcode($content) . '</span>' : '';
+    }
+
+    public function shortcode_reverse($atts = [], $content = null)
+    {
+        return $content ? '<bdo dir="rtl">' . $this->do_shortcode($content) . '</bdo>' : '';
+    }
+
+    public function shortcode_right($atts = [], $content = null)
+    {
+        return $content ? '<span style="text-align:right">' . $this->do_shortcode($content) . '</span>' : '';
+    }
+
+    public function shortcode_size($atts = [], $content = null)
+    {
+        if (!$content || !$atts) {
+            return '';
+        }
+        $subattribs = mb_substr(implode('', $atts), 1);
+        return '<span style="font-size:' . $subattribs . 'px">' . $this->do_shortcode($content) . '</span>';
+    }
+
+    public function shortcode_strikethrough($atts = [], $content = null)
+    {
+        return $content ? '<s>' . $this->do_shortcode($content) . '</s>' : '';
+    }
+
+    public function shortcode_subscript($atts = [], $content = null)
+    {
+        return $content ? '<sub>' . $this->do_shortcode($content) . '</sub>' : '';
+    }
+
+    public function shortcode_superscript($atts = [], $content = null)
+    {
+        return $content ? '<sup>' . $this->do_shortcode($content) . '</sup>' : '';
+    }
+
+    public function shortcode_underline($atts = [], $content = null)
+    {
+        return $content ? '<span style="text-decoration:underline">' . $this->do_shortcode($content) . '</span>' : '';
     }
 
@@ -336 +368 @@
     // Quotes
 
-    function shortcode_quote($atts = array(), $content = null) {
+    public function shortcode_quote($atts = [], $content = null)
+    {
         global $bp;
         global $bbp;
-        $css_classes = array('bbcode-quote');
-        if ($content === null) { return ''; }
-        elseif (empty($atts)){
-            return '<div class="'.implode(' ',$css_classes).'"><blockquote>'.$this->do_shortcode($content).'</blockquote></div>';
-        } else {
-            $name = trim(array_shift($atts), '="');
-            $css_classes[] = 'bbcode-quote-'.$name;
-            $user = get_user_by('login', $name);
-            if (false !== $user){
-                $css_classes[] = 'bbcode-quote-user';
-                if (function_exists('bp_is_active')) { $name = '<a href="'.site_url().'/members/'.$user->user_login.'">'.$user->display_name.'</a>'; }
-                elseif ('bbPress' === get_class($bbp)) { $name = '<a href="'.site_url().'?bbp_user='.$user->ID.'">'.$user->display_name.'</a>'; }
-                else { $name = $user->display_name; }
+        if (!$content) {
+            return '';
+        }
+        $css_classes = ['bbcode-quote'];
+        if (empty($atts)){
+            return '<div class="' . implode(' ', $css_classes) . '"><blockquote>' . $this->do_shortcode($content) . '</blockquote></div>';
+        }
+        $name = trim(array_shift($atts), '="');
+        $css_classes[] = 'bbcode-quote-' . $name;
+        $user = get_user_by('login', $name);
+        if ($user) {
+            $css_classes[] = 'bbcode-quote-user';
+            if (function_exists('bp_is_active')) {
+                $name = '<a href="' . site_url() . '/members/' . $user->user_login . '">' . $user->display_name . '</a>';
+            } elseif (get_class($bbp) === 'bbPress') {
+                $name = '<a href="' . site_url() . '?bbp_user=' . $user->ID . '">' . $user->display_name . '</a>';
+            } elseif ($user->display_name) {
+                $name = $user->display_name;
             }
-            return '<div class="'.implode(' ', $css_classes).'"><strong>'.$name.' wrote: </strong><blockquote>'.$this->do_shortcode($content).'</blockquote></div>';
-        }
-    }
-
-    function shortcode_cite($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<cite>'.$this->do_shortcode($content).'</cite>';
+        }
+        return '<div class="' . implode(' ', $css_classes) . '"><strong>' . $name . ' wrote: </strong><blockquote>' . $this->do_shortcode($content) . '</blockquote></div>';
+    }
+
+    public function shortcode_cite($atts = [], $content = null)
+    {
+        return $content ? '<cite>' . $this->do_shortcode($content) . '</cite>' : '';
     }
 
     // Code
 
-    function shortcode_code($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<code>'.$this->do_shortcode($content).'</code>';
-    }
-
-    function shortcode_kbd($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<kbd>'.$this->do_shortcode($content).'</kbd>';
+    public function shortcode_code($atts = [], $content = null)
+    {
+        return $content ? '<code>' . $this->do_shortcode($content) . '</code>' : '';
+    }
+
+    public function shortcode_kbd($atts = [], $content = null)
+    {
+        return $content ? '<kbd>' . $this->do_shortcode($content) . '</kbd>' : '';
     }
 
     // Lists
 
-    function shortcode_orderedlist($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<ol>'.$this->do_shortcode($content).'</ol>';
-    }
-
-    function shortcode_unorderedlist($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<ul>'.$this->do_shortcode($content).'</ul>';
-    }
-
-    function shortcode_listitem($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<li>'.$this->do_shortcode($content).'</li>';
+    public function shortcode_orderedlist($atts = [], $content = null)
+    {
+        return $content ? '<ol>' . $this->do_shortcode($content) . '</ol>' : '';
+    }
+
+    public function shortcode_unorderedlist($atts = [], $content = null)
+    {
+        return $content ? '<ul>' . $this->do_shortcode($content) . '</ul>' : '';
+    }
+
+    public function shortcode_listitem($atts = [], $content = null)
+    {
+        return $content ? '<li>' . $this->do_shortcode($content) . '</li>' : '';
     }
 
     // Tables
 
-    function shortcode_table($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<table>'.$this->do_shortcode($content).'</table>';
-    }
-
-    function shortcode_thead($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<thead>'.$this->do_shortcode($content).'</thead>';
-    }
-
-    function shortcode_tbody($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<tbody>'.$this->do_shortcode($content).'</tbody>';
-    }
-
-    function shortcode_tfoot($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<tfoot>'.$this->do_shortcode($content).'</tfoot>';
-    }
-
-    function shortcode_th($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<th>'.$this->do_shortcode($content).'</th>';
-    }
-
-    function shortcode_tr($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<tr>'.$this->do_shortcode($content).'</tr>';
-    }
-
-    function shortcode_td($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<td>'.$this->do_shortcode($content).'</td>';
+    public function shortcode_table($atts = [], $content = null)
+    {
+        return $content ? '<table>' . $this->do_shortcode($content) . '</table>' : '';
+    }
+
+    public function shortcode_thead($atts = [], $content = null)
+    {
+        return $content ? '<thead>' . $this->do_shortcode($content) . '</thead>' : '';
+    }
+
+    public function shortcode_tbody($atts = [], $content = null)
+    {
+        return $content ? '<tbody>' . $this->do_shortcode($content) . '</tbody>' : '';
+    }
+
+    public function shortcode_tfoot($atts = [], $content = null)
+    {
+        return $content ? '<tfoot>' . $this->do_shortcode($content) . '</tfoot>' : '';
+    }
+
+    public function shortcode_th($atts = [], $content = null)
+    {
+        return $content ? '<th>' . $this->do_shortcode($content) . '</th>' : '';
+    }
+
+    public function shortcode_tr($atts = [], $content = null)
+    {
+        return $content ? '<tr>' . $this->do_shortcode($content) . '</tr>' : '';
+    }
+
+    public function shortcode_td($atts = [], $content = null)
+    {
+        return $content ? '<td>' . $this->do_shortcode($content) . '</td>' : '';
     }
 
     // Links and Images
 
-    function shortcode_email($atts = array(), $content = null) {
-        if (empty($atts)) {  // [email][email protected][/email]
-            $url = $content;
-        } else {  // [[email protected]]text[/email] or [email="[email protected]"]text[/email]
-            $atts = $this->attributefix($atts);
-            $url = trim(array_shift($atts), '="');
-        }
-        if (empty($url)) { return ''; }
+    public function shortcode_email($atts = [], $content = null)
+    {
+        $url = $content;  // [email][email protected][/email]
+        if ($atts) {  // [[email protected]]text[/email] or [email="[email protected]"]text[/email]
+            $url = trim(array_shift($this->attributefix($atts)), '="');
+        }
+        if (!$url) {
+            return '';
+        }
         $url = str_replace(' at ', '@', str_replace('  ', ' ', $url));
-        return '<a href="mailto:'.$url.'">'.$this->do_shortcode($content).'</a>';
-    }
-
-    function shortcode_telephone($atts = array(), $content = null) {
-        if (empty($atts)) {  // [tel]123-456-7890[/tel]
+        return '<a href="mailto:' . $url . '">' . $this->do_shortcode($content) . '</a>';
+    }
+
+    public function shortcode_telephone($atts = [], $content = null)
+    {
+        if (!$atts) {  // [tel]123-456-7890[/tel]
             $phone = $content;
         } else {  // [tel=123-456-7890]text[/tel] or [tel="123-456-7890"]text[/tel]
+            $phone = trim(array_shift($this->attributefix($atts)), '="');
+        }
+        if (!$phone) {
+            return '';
+        }
+        $phone = $phone.replace('-', '').replace('.', '').replace('+', '');
+        return '<a href="tel:' . $phone . '">' . $this->do_shortcode($content) . '</a>';
+    }
+
+    public function shortcode_image($atts = [], $content = null)
+    {
+        if (!$content) {
+            return '';
+        }
+        $alt = '';
+        if (!$atts) {  // [img=alttext]imageurl[/img]
+            $alt = trim(implode(' ', $atts), '="');
+        }
+        return '<img src="' . $content . '" alt="' . $alt . '" title="' . $alt . ' />';
+    }
+
+    public function shortcode_url($atts = [], $content = null)
+    {
+        if (!$atts) {  // [url]http://www.example.com/[/url]
+            $url = $content;
+        } else {  // [url=http://www.example.com/]text[/url] or [url="http://www.example.com/"]text[/url]
+            $url = trim(array_shift($this->attributefix($atts)), '="');
+        }
+        if (!$url) {
+            return '';
+        }
+        return '<a href="' . $url . '">' . $this->do_shortcode($content) . '</a>';
+    }
+
+    // Videos and Audio
+
+    public function shortcode_bitchute($atts = [], $content = null)
+    {
+        if (!$content) {
+            return 'No BitChute Video ID Set';
+        }
+        $vidID = $content;
+        $height = '330';
+        $width = '400';
+        if (!$atts) {
+            $match = [];
             $atts = $this->attributefix($atts);
-            $phone = trim(array_shift($atts), '="');
-        }
-        if (empty($phone)) { return ''; }
-        $phone = $phone.replace('-', '').replace('.', '').replace('+', '');
-        return '<a href="tel:'.$phone.'">'.$this->do_shortcode($content).'</a>';
-    }
-
-    function shortcode_image($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        $alt = '';
-        if (!empty($atts)) { $alt = trim(implode(' ', $atts ), '="'); }  //  [img=alttext]imageurl[/img]
-        return '<img src="'.$content.'" alt="'.$alt.'" title="'.$alt.' />';
-    }
-
-    function shortcode_url($atts = array(), $content = null) {
-        if (empty($atts)) {  //  [url]http://www.example.com/[/url]
-            $url = $text = $content;
-        } else {  // [url=http://www.example.com/]text[/url] or [url="http://www.example.com/"]text[/url]
+            $autoplay = $atts['autoplay'] === 'yes' ? '&autoplay=1' : '';
+            $vidID = (preg_match('%(?:bitchute(?:-nocookie)?\.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)/|.*[?&]v=))([^"&?/ ]{11})%iu', $atts['url'], $match)) ? $match[1] : false;
+            $height = (isset($atts['height']) && is_numeric($atts['height'])) ? $atts['height'] : '330';
+            $width = (isset($atts['width']) && is_numeric($atts['width'])) ? $atts['width'] : '400';
+        }
+        return '<iframe width="' . $width . '" height="' . $height . '" src="https://www.bitchute.com/embed/' . $vidID . '?html5=1' . $autoplay . '" frameborder="0" allowfullscreen="true"></iframe>';
+    }
+
+    public function shortcode_dailymotion($atts = [], $content = null)
+    {
+        if (!$content) {
+            return 'No DailyMotion Video ID Set';
+        }
+        $vidID = $content;
+        $height = '330';
+        $width = '400';
+        if (!$atts) {
+            $match = [];
             $atts = $this->attributefix($atts);
-            $url = trim(array_shift($atts), '="');
-        }
-        if (empty($url)) { return ''; }
-        if (empty($text)) { $text=$url; }
-        return '<a href="'.$url.'">'.$this->do_shortcode($content).'</a>';
-    }
-
-    // Videos and Audio
-
-    function shortcode_freesound($atts = array(), $content = null) {
-        if ('' === $content) { return 'No Freesound Audio ID Set'; }
-        if (empty($atts)) {  // [freesound]164929[/freesound]
+            $autoplay = $atts['autoplay'] === 'yes' ? '&autoplay=1' : '';
+            $vidID = (preg_match('%(?:dailymotion(?:-nocookie)?\.com/(?:[^/]+/.+/|(?:v|e(?:mbed/)?|(?:video/)?)/|.*[?&]v=))([^"&?/ ]{11})%iu', $atts['url'], $match)) ? $match[1] : false;
+            $height = (isset($atts['height']) && is_numeric($atts['height'])) ? $atts['height'] : '330';
+            $width = (isset($atts['width']) && is_numeric($atts['width'])) ? $atts['width'] : '400';
+        }
+        return '<iframe width="' . $width . '" height="' . $height . '" src="https://www.dailymotion.com/embed/video/' . $vidID . '?html5=1' . $autoplay . '" frameborder="0" allowfullscreen="true"></iframe>';
+    }
+
+    public function shortcode_freesound($atts = [], $content = null)
+    {
+        if (!$content) {
+            return 'No Freesound Audio ID Set';
+        }
+        if (!$atts) {  // [freesound]164929[/freesound]
             $size = 'medium';
         } else {  // [freesound=large]164929[/freesound] or [freesound=small]164929[/freesound]
-            $size = $this->attributefix($atts);
-            $size = trim(array_shift($size), '="');
-        }
-        $vidID = $content;
+            $size = strtolower(trim(array_shift($this->attributefix($atts)), '="'));
+        }
         switch ($size) {
             case 'big':
             case 'large':
             case 'l':
-                return '<iframe frameborder="0" scrolling="no" src="http://www.freesound.org/embed/sound/iframe/'.$vidID.'/simple/large/" width="920" height="245"></iframe>';
+                return '<iframe frameborder="0" scrolling="no" src="http://www.freesound.org/embed/sound/iframe/' . $content . '/simple/large/" width="920" height="245"></iframe>';
             case 'little':
             case 'short':
             case 'small':
             case 's':
-                return '<iframe frameborder="0" scrolling="no" src="http://www.freesound.org/embed/sound/iframe/'.$vidID.'/simple/small/" width="375" height="30"></iframe>';
+                return '<iframe frameborder="0" scrolling="no" src="http://www.freesound.org/embed/sound/iframe/' . $content . '/simple/small/" width="375" height="30"></iframe>';
             case 'mid':
             case 'medium':
             case 'm':
             default:
-                return '<iframe frameborder="0" scrolling="no" src="http://www.freesound.org/embed/sound/iframe/'.$vidID.'/simple/medium/" width="481" height="86"></iframe>';
-        }
-    }
-
-    function shortcode_gvideo($atts = array(), $content = null) {
-        if ('' === $content) { return 'No Google Video ID Set'; }
+                return '<iframe frameborder="0" scrolling="no" src="http://www.freesound.org/embed/sound/iframe/' . $content . '/simple/medium/" width="480" height="86"></iframe>';
+        }
+    }
+
+    public function shortcode_gvideo($atts = [], $content = null)
+    {
+        if (!$content) {
+            return 'No Google Video ID Set';
+        }
+        return '<embed style="width:400px;height:330px" id="VideoPlayback" type="application/x-shockwave-flash" src="http://video.google.com/googleplayer.swf?docId=' . $content . '&hl=en"></embed>';
+    }
+
+    public function shortcode_vimeo($atts = [], $content = null)
+    {
+        if (!$content) {
+            return 'No Vimeo Video ID Set';
+        }
         $vidID = $content;
-        return '<embed style="width:400px;height:325px" id="VideoPlayback" type="application/x-shockwave-flash" src="http://video.google.com/googleplayer.swf?docId='.$vidID.'&hl=en"></embed>';
-    }
-
-    function shortcode_vimeo($atts = array(), $content = null) {
-        if ('' === $content) { return 'No Vimeo Video ID Set'; }
-        $vidID = $content;
-        $height = '325';
+        $height = '330';
         $width = '400';
-        if (!empty($atts)){
+        if (!$atts) {
+            $match = [];
             $atts = $this->attributefix($atts);
             $autoplay = $atts['autoplay'] === 'yes' ? '&amp;autoplay=1' : '';
-            $vidID = (preg_match('~(?:<iframe [^>]*src=")?(?:https?:\/\/(?:[\w]+\.)*vimeo\.com(?:[\/\w]*\/videos?)?\/([0-9]+)[^\s]*)"?(?:[^>]*></iframe>)?(?:<p>.*</p>)?~ix', $atts['url'], $match)) ? $match[1] : false;
-            $height = (isset($atts['height']) && is_numeric($atts['height'])) ? $atts['height'] : '325';
+            $vidID = (preg_match('~(?:<iframe [^>]*src=")?(?:https?:\/\/(?:[\w]+\.)*vimeo\.com(?:[\/\w]*\/videos?)?\/([0-9]+)[^\s]*)"?(?:[^>]*></iframe>)?(?:<p>.*</p>)?~iux', $atts['url'], $match)) ? $match[1] : false;
+            $height = (isset($atts['height']) && is_numeric($atts['height'])) ? $atts['height'] : '330';
             $width = (isset($atts['width']) && is_numeric($atts['width'])) ? $atts['width'] : '400';
         }
-        return '<iframe width="'.$width.'" height="'.$height.'" src="//player.vimeo.com/video/'.$vidID.'?title=0&amp;byline=0&amp;portrait=0&amp;color=ffffff'.$autoplay.'" frameborder="0" allowfullscreen="true"></iframe>';
-    }
-
-    function shortcode_youtube($atts = array(), $content = null) {
-        if ('' === $content) { return 'No YouTube Video ID Set'; }
+        return '<iframe width="' . $width . '" height="' . $height . '" src="//player.vimeo.com/video/' . $vidID . '?title=0&amp;byline=0&amp;portrait=0&amp;color=ffffff' . $autoplay . '" frameborder="0" allowfullscreen="true"></iframe>';
+    }
+
+    public function shortcode_youtube($atts = [], $content = null)
+    {
+        if (!$content) {
+            return 'No YouTube Video ID Set';
+        }
         $vidID = $content;
-        $height = '325';
+        $height = '330';
         $width = '400';
-        if (!empty($atts)){
+        if (!$atts) {
+            $match = [];
             $atts = $this->attributefix($atts);
-            $autoplay = $atts['autoplay'] === 'yes' ? '?autoplay=1' : '';
-            $vidID = (preg_match('%(?:youtube(?:-nocookie)?\.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)/|.*[?&]v=)|youtu\.be/)([^"&?/ ]{11})%i', $atts['url'], $match)) ? $match[1] : false;
-            $height = (isset($atts['height']) && is_numeric($atts['height'])) ? $atts['height'] : '325';
+            $autoplay = $atts['autoplay'] === 'yes' ? '&autoplay=1' : '';
+            $vidID = (preg_match('%(?:youtube(?:-nocookie)?\.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)/|.*[?&]v=)|youtu\.be/)([^"&?/ ]{11})%iu', $atts['url'], $match)) ? $match[1] : false;
+            $height = (isset($atts['height']) && is_numeric($atts['height'])) ? $atts['height'] : '330';
             $width = (isset($atts['width']) && is_numeric($atts['width'])) ? $atts['width'] : '400';
         }
-        return '<iframe width="'.$width.'" height="'.$height.'" src="http://www.youtube.com/embed/'.$vidID.$autoplay.'" frameborder="0" allowfullscreen="true"></iframe>';
+        return '<iframe width="' . $width . '" height="' . $height . '" src="https://www.youtube.com/embed/' . $vidID . '?html5=1' . $autoplay . '" frameborder="0" allowfullscreen="true"></iframe>';
     }
 
     // Special/Miscellaneous Content
 
-    function shortcode_abbr($atts = array(), $content = null) {
-        if (null === $content || !isset($atts['title'])) { return ''; }
+    public function shortcode_abbr($atts = [], $content = null)
+    {
+        if (!$content || !isset($atts['title'])) {
+            return '';
+        }
         $atts = $this->attributefix($atts);
-        return '<abbr title="'.$atts['title'].'">'.$this->do_shortcode($content).'</abbr>';
-    }
-
-    function shortcode_clientip($atts = array(), $content = null) {
+        return '<abbr title="' . $atts['title'] . '">' . $this->do_shortcode($content) . '</abbr>';
+    }
+
+    public function shortcode_clientip($atts = [], $content = null)
+    {
         return $_SERVER['REMOTE_ADDR'];
     }
 
-    function shortcode_hr($atts = array(), $content = null) {
+    public function shortcode_hr($atts = [], $content = null)
+    {
         return '<hr/>';
     }
 
-    function shortcode_note($atts = array(), $content = null) {
-        if (null === $content) { return ''; }
-        return '<!--'.$content.'-->';
-    }
-
-    function shortcode_useragent($atts = array(), $content = null) {
+    public function shortcode_note($atts = [], $content = null)
+    {
+        return $content ? '<!--' . $content . '-->' : '';
+    }
+
+    public function shortcode_useragent($atts = [], $content = null)
+    {
         return $_SERVER['HTTP_USER_AGENT'];
     }
@@ -565 +667 @@
     // Hide and Display Content
 
-    function shortcode_spoiler($atts = array(), $content = null) {
-        if ($content === null) { return ''; }
-        if ($atts === '') { return '<div style="margin:20px;margin-top:5px"><div class="smallfont" style="margin-bottom:2px"><strong>Spoiler: </strong><input type="button" value="Show" style="width:45px;font-size:10px;margin:0px;padding:0px" onClick="if (this.parentNode.parentNode.getElementsByTagName(\'div\')[1].getElementsByTagName(\'div\')[0].style.display != \'\') { this.parentNode.parentNode.getElementsByTagName(\'div\')[1].getElementsByTagName(\'div\')[0].style.display = \'\'; this.innerText = \'\'; this.value = \'Hide\'; } else { this.parentNode.parentNode.getElementsByTagName(\'div\')[1].getElementsByTagName(\'div\')[0].style.display = \'none\'; this.innerText = \'\'; this.value = \'Show\'; }"></div><div class="alt2" style="margin: 0px; padding: 6px; border: 1px inset;"><div style="display:none">'. $this->do_shortcode($content) .'</div></div></div>'; }
+    public function shortcode_spoiler($atts = [], $content = null)
+    {
+        if (!$content) {
+            return '';
+        }
+        if (!$atts) {
+            return '<div style="margin:20px;margin-top:5px"><div class="smallfont" style="margin-bottom:2px"><strong>Spoiler: </strong><input type="button" value="Show" style="width:45px;font-size:10px;margin:0px;padding:0px" onClick="if (this.parentNode.parentNode.getElementsByTagName(\'div\')[1].getElementsByTagName(\'div\')[0].style.display != \'\') { this.parentNode.parentNode.getElementsByTagName(\'div\')[1].getElementsByTagName(\'div\')[0].style.display = \'\'; this.innerText = \'\'; this.value = \'Hide\'; } else { this.parentNode.parentNode.getElementsByTagName(\'div\')[1].getElementsByTagName(\'div\')[0].style.display = \'none\'; this.innerText = \'\'; this.value = \'Show\'; }"></div><div class="alt2" style="margin: 0px; padding: 4px; border: 1px inset;"><div style="display:none">' . $this->do_shortcode($content) . '</div></div></div>';
+        }
         $subattribs = substr(implode(' ', $atts), 1);
-        return '<div style="margin:20px;margin-top:5px"><div class="smallfont" style="margin-bottom:2px"><strong>Spoiler</strong> for <em>'. $subattribs .'</em> <input type="button" value="Show" style="width:45px;font-size:10px;margin:0px;padding:0px" onClick="if (this.parentNode.parentNode.getElementsByTagName(\'div\')[1].getElementsByTagName(\'div\')[0].style.display != \'\') { this.parentNode.parentNode.getElementsByTagName(\'div\')[1].getElementsByTagName(\'div\')[0].style.display = \'\'; this.innerText = \'\'; this.value = \'Hide\'; } else { this.parentNode.parentNode.getElementsByTagName(\'div\')[1].getElementsByTagName(\'div\')[0].style.display = \'none\'; this.innerText = \'\'; this.value = \'Show\'; }"></div><div class="alt2" style="margin: 0px; padding: 6px; border: 1px inset;"><div style="display:none">'. $this->do_shortcode($content) .'</div></div></div>';
-    }
-
-    function shortcode_guest($atts = array(), $content = null) {
-        if ($content === null || is_user_logged_in()) { return ''; }
-        return '<div>'.$this->do_shortcode($content).'</div>';
-    }
-
-    function shortcode_user($atts = array(), $content = null) {
-        if ($content === null || !is_user_logged_in()) { return ''; }
-        return '<div>'.$this->do_shortcode($content).'</div>';
-    }
-
-}?>
+        return '<div style="margin:20px;margin-top:5px"><div class="smallfont" style="margin-bottom:2px"><strong>Spoiler</strong> for <em>' . $subattribs . '</em> <input type="button" value="Show" style="width:45px;font-size:10px;margin:0px;padding:0px" onClick="if (this.parentNode.parentNode.getElementsByTagName(\'div\')[1].getElementsByTagName(\'div\')[0].style.display != \'\') { this.parentNode.parentNode.getElementsByTagName(\'div\')[1].getElementsByTagName(\'div\')[0].style.display = \'\'; this.innerText = \'\'; this.value = \'Hide\'; } else { this.parentNode.parentNode.getElementsByTagName(\'div\')[1].getElementsByTagName(\'div\')[0].style.display = \'none\'; this.innerText = \'\'; this.value = \'Show\'; }"></div><div class="alt2" style="margin: 0px; padding: 4px; border: 1px inset;"><div style="display:none">' . $this->do_shortcode($content) . '</div></div></div>';
+    }
+
+    public function shortcode_guest($atts = [], $content = null)
+    {
+        if (!$content || is_user_logged_in()) {
+            return '';
+        }
+        return '<div>' . $this->do_shortcode($content) . '</div>';
+    }
+
+    public function shortcode_user($atts = [], $content = null)
+    {
+        if (!$content || !is_user_logged_in()) {
+            return '';
+        }
+        return '<div>' . $this->do_shortcode($content) . '</div>';
+    }
+}

bbcode-deluxe/trunk/options-form-template.php

@@ -2 +2 @@
     <h1>BBCode Deluxe</h1>
     <p>BBCode (Bulletin Board Code) is a lightweight markup language used as an alternative to HTML for formatting. <a href="http://www.bbcode.org/reference.php">http://www.bbcode.org/reference.php</a></p>
-    <?php if ($whitelist_enabled) {
-        if ($bbcodes_active) { ?>
+    <?php if (isset($whitelist_enabled) && $whitelist_enabled) {
+        if (isset($bbcodes_active) && $bbcodes_active) { ?>
             <p>BBCodes are enabled and <a href="http://wordpress.org/extend/plugins/bbpress2-shortcode-whitelist/">bbPress shortcode whitelist</a> has been detected as activated. Users should be able to use BBCodes in blogs, comments, and forums.</p>
         <?php } else { ?>
@@ -62 +62 @@
         <h3>Loaded Extensions</h3>
         <ul><?php
-            $conf_array = get_loaded_extensions();
-            foreach ($conf_array as $val_pair) {
-                echo '<li>'.strval($val_pair).'</li>';
-            }
+        $conf_array = get_loaded_extensions();
+        foreach ($conf_array as $val_pair) {
+            echo '<li>' . strval($val_pair) . '</li>';
+        }
         ?></ul>
     </div>

bbcode-deluxe/trunk/readme.txt

@@ -4 +4 @@
 Tags: bbcode, bbpress, buddypress, bbpress-plugin, bbpress2, forum, html5, information, markup, nested-quotes, php-version, server-info, shortcode
 Requires at least: 3.9
-Tested up to: 5.4
+Tested up to: 5.5
 Stable tag: trunk
 License: GPLv3
@@ -22 +22 @@
 * Plugin URI: https://wordpress.org/plugins/bbcode-deluxe/
 * Description: Adds support for BBCode to Wordpress and BBPress
-* Version: 2019.10.20
+* Version: 2020.07.30
 * Author: Devyn Collier Johnson (DevynCJohnson)
 * Author URI: http://dcjtech.info/
@@ -150 +150 @@
 
 == Changelog ==
+= 2020.07.30 =
+* Bug fixes & minor improvements
+* Added support for BitChute & DailyMotion
+* Made Youtube shortcodes use HTTPS and full embedding
 = 2019.10.20 =
 * Bug fixes