Merge pull request #1000 from annando/bots-again

[friendica-addons.git] / markdown / markdown.php

diff --git a/markdown/markdown.php b/markdown/markdown.php
index 0f667373ab3afb9b0b6105b9f89a8165d1e07208..f02bc2a017f208b878e08bd72be7b8ae1c7def76 100644 (file)
--- a/markdown/markdown.php
+++ b/markdown/markdown.php
@@ -7,11 +7,9 @@
  */
 use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Renderer;
-use Friendica\Core\PConfig;
-use Friendica\Core\L10n;
+use Friendica\DI;
 
 function markdown_install() {
        Hook::register('post_local_start',      __FILE__, 'markdown_post_local_start');
@@ -25,13 +23,13 @@ function markdown_addon_settings(App $a, &$s)
                return;
        }
 
-       $enabled = intval(PConfig::get(local_user(), 'markdown', 'enabled'));
+       $enabled = intval(DI::pConfig()->get(local_user(), 'markdown', 'enabled'));
 
        $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/markdown/');
        $s .= Renderer::replaceMacros($t, [
-               '$title'   => L10n::t('Markdown'),
-               '$enabled' => ['enabled', L10n::t('Enable Markdown parsing'), $enabled, L10n::t('If enabled, self created items will additionally be parsed via Markdown.')],
-               '$submit'  => L10n::t('Save Settings'),
+               '$title'   => DI::l10n()->t('Markdown'),
+               '$enabled' => ['enabled', DI::l10n()->t('Enable Markdown parsing'), $enabled, DI::l10n()->t('If enabled, self created items will additionally be parsed via Markdown.')],
+               '$submit'  => DI::l10n()->t('Save Settings'),
        ]);
 }
 
@@ -41,16 +39,17 @@ function markdown_addon_settings_post(App $a, &$b)
                return;
        }
 
-       PConfig::set(local_user(), 'markdown', 'enabled', intval($_POST['enabled']));
+       DI::pConfig()->set(local_user(), 'markdown', 'enabled', intval($_POST['enabled']));
 }
 
 function markdown_post_local_start(App $a, &$request) {
-       if (empty($request['body']) || !PConfig::get(local_user(), 'markdown', 'enabled')) {
+       if (empty($request['body']) || !DI::pConfig()->get(local_user(), 'markdown', 'enabled')) {
                return;
        }
 
        // Elements that shouldn't be parsed
-       $elements = ['code', 'noparse', 'nobb', 'pre', 'share', 'url', 'img'];
+       $elements = ['code', 'noparse', 'nobb', 'pre', 'share', 'url', 'img', 'bookmark',
+               'audio', 'video', 'youtube', 'vimeo', 'attachment', 'iframe', 'map', 'mail'];
        foreach ($elements as $element) {
                $request['body'] = preg_replace_callback("/\[" . $element . "(.*?)\](.*?)\[\/" . $element . "\]/ism",
                        function ($match) use ($element) {