[dwpost] Remove references to obsolete virtual field item.tag

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

diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index 975d703..3d4b42a 100644 (file)
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -11,10 +11,10 @@
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Tag;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\XML;
@@ -48,7 +48,7 @@ function dwpost_jot_nets(App $a, array &$jotnets_fields)
                        'type' => 'checkbox',
                        'field' => [
                                'dwpost_enable',
-                               L10n::t('Post to Dreamwidth'),
+                               DI::l10n()->t('Post to Dreamwidth'),
                                DI::pConfig()->get(local_user(), 'dwpost', 'post_by_default')
                        ]
                ];
@@ -79,35 +79,35 @@ function dwpost_settings(App $a, &$s)
 
        /* Add some HTML to the existing form */
        $s .= '<span id="settings_dwpost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_dwpost_expanded\'); openClose(\'settings_dwpost_inflated\');">';
-       $s .= '<img class="connector" src="images/dreamwidth.png" /><h3 class="connector">'. L10n::t("Dreamwidth Export").'</h3>';
+       $s .= '<img class="connector" src="images/dreamwidth.png" /><h3 class="connector">'. DI::l10n()->t("Dreamwidth Export").'</h3>';
        $s .= '</span>';
        $s .= '<div id="settings_dwpost_expanded" class="settings-block" style="display: none;">';
        $s .= '<span class="fakelink" onclick="openClose(\'settings_dwpost_expanded\'); openClose(\'settings_dwpost_inflated\');">';
-       $s .= '<img class="connector" src="images/dreamwidth.png" /><h3 class="connector">'. L10n::t("Dreamwidth Export").'</h3>';
+       $s .= '<img class="connector" src="images/dreamwidth.png" /><h3 class="connector">'. DI::l10n()->t("Dreamwidth Export").'</h3>';
        $s .= '</span>';
 
        $s .= '<div id="dwpost-enable-wrapper">';
-       $s .= '<label id="dwpost-enable-label" for="dwpost-checkbox">' . L10n::t('Enable dreamwidth Post Addon') . '</label>';
+       $s .= '<label id="dwpost-enable-label" for="dwpost-checkbox">' . DI::l10n()->t('Enable dreamwidth Post Addon') . '</label>';
        $s .= '<input id="dwpost-checkbox" type="checkbox" name="dwpost" value="1" ' . $checked . '/>';
        $s .= '</div><div class="clear"></div>';
 
        $s .= '<div id="dwpost-username-wrapper">';
-       $s .= '<label id="dwpost-username-label" for="dwpost-username">' . L10n::t('dreamwidth username') . '</label>';
+       $s .= '<label id="dwpost-username-label" for="dwpost-username">' . DI::l10n()->t('dreamwidth username') . '</label>';
        $s .= '<input id="dwpost-username" type="text" name="dw_username" value="' . $dw_username . '" />';
        $s .= '</div><div class="clear"></div>';
 
        $s .= '<div id="dwpost-password-wrapper">';
-       $s .= '<label id="dwpost-password-label" for="dwpost-password">' . L10n::t('dreamwidth password') . '</label>';
+       $s .= '<label id="dwpost-password-label" for="dwpost-password">' . DI::l10n()->t('dreamwidth password') . '</label>';
        $s .= '<input id="dwpost-password" type="password" name="dw_password" value="' . $dw_password . '" />';
        $s .= '</div><div class="clear"></div>';
 
        $s .= '<div id="dwpost-bydefault-wrapper">';
-       $s .= '<label id="dwpost-bydefault-label" for="dwpost-bydefault">' . L10n::t('Post to dreamwidth by default') . '</label>';
+       $s .= '<label id="dwpost-bydefault-label" for="dwpost-bydefault">' . DI::l10n()->t('Post to dreamwidth by default') . '</label>';
        $s .= '<input id="dwpost-bydefault" type="checkbox" name="dw_bydefault" value="1" ' . $def_checked . '/>';
        $s .= '</div><div class="clear"></div>';
 
        /* provide a submit button */
-       $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="dwpost-submit" name="dwpost-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
+       $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="dwpost-submit" name="dwpost-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>';
 }
 
 
@@ -192,7 +192,7 @@ function dwpost_send(App $a, array &$b)
                $title = $b['title'];
                $post = BBCode::convert($b['body']);
                $post = XML::escape($post);
-               $tags = dwpost_get_tags($b['tag']);
+               $tags = Tag::getCSVByURIId($b['uri-id'], [Tag::HASHTAG]);
 
                $date = DateTimeFormat::convert($b['created'], $tz);
                $year = intval(substr($date,0,4));
@@ -237,12 +237,3 @@ EOT;
                Logger::log('posted to dreamwidth: ' . ($x) ? $x : '', Logger::DEBUG);
        }
 }
-
-function dwpost_get_tags($post)
-{
-       preg_match_all("/\]([^\[#]+)\[/", $post, $matches);
-
-       $tags = implode(', ', $matches[1]);
-
-       return $tags;
-}