Merge pull request #948 from nupplaphil/task/di_config

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

diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index 781c1d045b59d21e283f424000eed5773316145c..96314d883c5ce5d7c3ec5cd3bb055d9b02070c60 100644 (file)
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -12,10 +12,7 @@ require_once 'addon/diaspora/Diaspora_Connection.php';
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
-use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\Core\Worker;
 use Friendica\DI;
@@ -51,7 +48,7 @@ function diaspora_jot_nets(App $a, array &$jotnets_fields)
                        'type' => 'checkbox',
                        'field' => [
                                'diaspora_enable',
-                               L10n::t('Post to Diaspora'),
+                               DI::l10n()->t('Post to Diaspora'),
                                DI::pConfig()->get(local_user(), 'diaspora', 'post_by_default')
                        ]
                ];
@@ -87,9 +84,9 @@ function diaspora_settings(App $a, &$s)
        $r = q("SELECT `addr` FROM `contact` WHERE `self` AND `uid` = %d", intval(local_user()));
 
        if (DBA::isResult($r)) {
-               $status = L10n::t("Please remember: You can always be reached from Diaspora with your Friendica handle %s. ", $r[0]['addr']);
-               $status .= L10n::t('This connector is only meant if you still want to use your old Diaspora account for some time. ');
-               $status .= L10n::t('However, it is preferred that you tell your Diaspora contacts the new handle %s instead.', $r[0]['addr']);
+               $status = DI::l10n()->t("Please remember: You can always be reached from Diaspora with your Friendica handle %s. ", $r[0]['addr']);
+               $status .= DI::l10n()->t('This connector is only meant if you still want to use your old Diaspora account for some time. ');
+               $status .= DI::l10n()->t('However, it is preferred that you tell your Diaspora contacts the new handle %s instead.', $r[0]['addr']);
        }
 
        $aspects = false;
@@ -100,18 +97,18 @@ function diaspora_settings(App $a, &$s)
                $aspects = $conn->getAspects();
 
                if (!$aspects) {
-                       $status = L10n::t("Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password.");
+                       $status = DI::l10n()->t("Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password.");
                }
        }
 
        /* Add some HTML to the existing form */
 
        $s .= '<span id="settings_diaspora_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_diaspora_expanded\'); openClose(\'settings_diaspora_inflated\');">';
-       $s .= '<img class="connector'.$css.'" src="images/diaspora-logo.png" /><h3 class="connector">'. L10n::t('Diaspora Export').'</h3>';
+       $s .= '<img class="connector'.$css.'" src="images/diaspora-logo.png" /><h3 class="connector">'. DI::l10n()->t('Diaspora Export').'</h3>';
        $s .= '</span>';
        $s .= '<div id="settings_diaspora_expanded" class="settings-block" style="display: none;">';
        $s .= '<span class="fakelink" onclick="openClose(\'settings_diaspora_expanded\'); openClose(\'settings_diaspora_inflated\');">';
-       $s .= '<img class="connector'.$css.'" src="images/diaspora-logo.png" /><h3 class="connector">'. L10n::t('Diaspora Export').'</h3>';
+       $s .= '<img class="connector'.$css.'" src="images/diaspora-logo.png" /><h3 class="connector">'. DI::l10n()->t('Diaspora Export').'</h3>';
        $s .= '</span>';
 
        if ($status) {
@@ -121,32 +118,32 @@ function diaspora_settings(App $a, &$s)
        }
 
        $s .= '<div id="diaspora-enable-wrapper">';
-       $s .= '<label id="diaspora-enable-label" for="diaspora-checkbox">' . L10n::t('Enable Diaspora Post Addon') . '</label>';
+       $s .= '<label id="diaspora-enable-label" for="diaspora-checkbox">' . DI::l10n()->t('Enable Diaspora Post Addon') . '</label>';
        $s .= '<input id="diaspora-checkbox" type="checkbox" name="diaspora" value="1" ' . $checked . '/>';
        $s .= '</div><div class="clear"></div>';
 
        $s .= '<div id="diaspora-username-wrapper">';
-       $s .= '<label id="diaspora-username-label" for="diaspora-username">' . L10n::t('Diaspora handle') . '</label>';
+       $s .= '<label id="diaspora-username-label" for="diaspora-username">' . DI::l10n()->t('Diaspora handle') . '</label>';
        $s .= '<input id="diaspora-username" type="text" name="handle" value="' . $handle . '" />';
        $s .= '</div><div class="clear"></div>';
 
        $s .= '<div id="diaspora-password-wrapper">';
-       $s .= '<label id="diaspora-password-label" for="diaspora-password">' . L10n::t('Diaspora password') . '</label>';
+       $s .= '<label id="diaspora-password-label" for="diaspora-password">' . DI::l10n()->t('Diaspora password') . '</label>';
        $s .= '<input id="diaspora-password" type="password" name="password" value="' . $password . '" />';
        $s .= '</div><div class="clear"></div>';
 
        if ($aspects) {
                $single_aspect =  new stdClass();
                $single_aspect->id = 'all_aspects';
-               $single_aspect->name = L10n::t('All aspects');
+               $single_aspect->name = DI::l10n()->t('All aspects');
                $aspects[] = $single_aspect;
 
                $single_aspect =  new stdClass();
                $single_aspect->id = 'public';
-               $single_aspect->name = L10n::t('Public');
+               $single_aspect->name = DI::l10n()->t('Public');
                $aspects[] = $single_aspect;
 
-               $s .= '<label id="diaspora-aspect-label" for="diaspora-aspect">' . L10n::t('Post to aspect:') . '</label>';
+               $s .= '<label id="diaspora-aspect-label" for="diaspora-aspect">' . DI::l10n()->t('Post to aspect:') . '</label>';
                $s .= '<select name="aspect" id="diaspora-aspect">';
                foreach($aspects as $single_aspect) {
                        if ($single_aspect->id == $aspect)
@@ -160,13 +157,13 @@ function diaspora_settings(App $a, &$s)
        }
 
        $s .= '<div id="diaspora-bydefault-wrapper">';
-       $s .= '<label id="diaspora-bydefault-label" for="diaspora-bydefault">' . L10n::t('Post to Diaspora by default') . '</label>';
+       $s .= '<label id="diaspora-bydefault-label" for="diaspora-bydefault">' . DI::l10n()->t('Post to Diaspora by default') . '</label>';
        $s .= '<input id="diaspora-bydefault" type="checkbox" name="diaspora_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="diaspora-submit" name="diaspora-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
+       $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="diaspora-submit" name="diaspora-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>';
 
 }
 
@@ -174,11 +171,11 @@ function diaspora_settings(App $a, &$s)
 function diaspora_settings_post(App $a, &$b)
 {
        if (!empty($_POST['diaspora-submit'])) {
-               PConfig::set(local_user(),'diaspora', 'post'           , intval($_POST['diaspora']));
-               PConfig::set(local_user(),'diaspora', 'post_by_default', intval($_POST['diaspora_bydefault']));
-               PConfig::set(local_user(),'diaspora', 'handle'         , trim($_POST['handle']));
-               PConfig::set(local_user(),'diaspora', 'password'       , trim($_POST['password']));
-               PConfig::set(local_user(),'diaspora', 'aspect'         , trim($_POST['aspect']));
+               DI::pConfig()->set(local_user(),'diaspora', 'post'           , intval($_POST['diaspora']));
+               DI::pConfig()->set(local_user(),'diaspora', 'post_by_default', intval($_POST['diaspora_bydefault']));
+               DI::pConfig()->set(local_user(),'diaspora', 'handle'         , trim($_POST['handle']));
+               DI::pConfig()->set(local_user(),'diaspora', 'password'       , trim($_POST['password']));
+               DI::pConfig()->set(local_user(),'diaspora', 'aspect'         , trim($_POST['aspect']));
        }
 }