X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tumblr%2Ftumblr.php;h=4504534cbdc737fff9c7a0215513426b07d45ccf;hb=05d2707d501b7b1cdd98b0802121e69a6df7d05d;hp=c0e65c7ef9b4415bfbeec6bc16a75f1d73d0d976;hpb=04d552bcb43de7dc1dc1e06e58b98b4845465975;p=friendica-addons.git
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index c0e65c7e..4504534c 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -11,13 +11,12 @@ require_once __DIR__ . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . '
use Friendica\App;
use Friendica\Content\Text\BBCode;
-use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
+use Friendica\DI;
+use Friendica\Model\Tag;
use Friendica\Util\Strings;
function tumblr_install()
@@ -30,16 +29,6 @@ function tumblr_install()
Hook::register('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post');
}
-function tumblr_uninstall()
-{
- Hook::unregister('hook_fork', 'addon/tumblr/tumblr.php', 'tumblr_hook_fork');
- Hook::unregister('post_local', 'addon/tumblr/tumblr.php', 'tumblr_post_local');
- Hook::unregister('notifier_normal', 'addon/tumblr/tumblr.php', 'tumblr_send');
- Hook::unregister('jot_networks', 'addon/tumblr/tumblr.php', 'tumblr_jot_nets');
- Hook::unregister('connector_settings', 'addon/tumblr/tumblr.php', 'tumblr_settings');
- Hook::unregister('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post');
-}
-
function tumblr_module()
{
}
@@ -47,7 +36,7 @@ function tumblr_module()
function tumblr_content(App $a)
{
if (! local_user()) {
- notice(L10n::t('Permission denied.') . EOL);
+ notice(DI::l10n()->t('Permission denied.') . EOL);
return '';
}
@@ -77,10 +66,10 @@ function tumblr_addon_admin(App $a, &$o)
$t = Renderer::getMarkupTemplate( "admin.tpl", "addon/tumblr/" );
$o = Renderer::replaceMacros($t, [
- '$submit' => L10n::t('Save Settings'),
+ '$submit' => DI::l10n()->t('Save Settings'),
// name, label, value, help, [extra values]
- '$consumer_key' => ['consumer_key', L10n::t('Consumer Key'), Config::get('tumblr', 'consumer_key' ), ''],
- '$consumer_secret' => ['consumer_secret', L10n::t('Consumer Secret'), Config::get('tumblr', 'consumer_secret' ), ''],
+ '$consumer_key' => ['consumer_key', DI::l10n()->t('Consumer Key'), DI::config()->get('tumblr', 'consumer_key' ), ''],
+ '$consumer_secret' => ['consumer_secret', DI::l10n()->t('Consumer Secret'), DI::config()->get('tumblr', 'consumer_secret' ), ''],
]);
}
@@ -89,10 +78,8 @@ function tumblr_addon_admin_post(App $a)
$consumer_key = (!empty($_POST['consumer_key']) ? Strings::escapeTags(trim($_POST['consumer_key'])) : '');
$consumer_secret = (!empty($_POST['consumer_secret']) ? Strings::escapeTags(trim($_POST['consumer_secret'])): '');
- Config::set('tumblr', 'consumer_key',$consumer_key);
- Config::set('tumblr', 'consumer_secret',$consumer_secret);
-
- info(L10n::t('Settings updated.'). EOL);
+ DI::config()->set('tumblr', 'consumer_key',$consumer_key);
+ DI::config()->set('tumblr', 'consumer_secret',$consumer_secret);
}
function tumblr_connect(App $a)
@@ -104,12 +91,12 @@ function tumblr_connect(App $a)
//require_once('addon/tumblr/tumblroauth/tumblroauth.php');
// Define the needed keys
- $consumer_key = Config::get('tumblr', 'consumer_key');
- $consumer_secret = Config::get('tumblr', 'consumer_secret');
+ $consumer_key = DI::config()->get('tumblr', 'consumer_key');
+ $consumer_secret = DI::config()->get('tumblr', 'consumer_secret');
// The callback URL is the script that gets called after the user authenticates with tumblr
// In this example, it would be the included callback.php
- $callback_url = $a->getBaseURL()."/tumblr/callback";
+ $callback_url = DI::baseUrl()->get()."/tumblr/callback";
// Let's begin. First we need a Request Token. The request token is required to send the user
// to Tumblr's login page.
@@ -157,8 +144,8 @@ function tumblr_callback(App $a)
//require_once('addon/tumblr/tumblroauth/tumblroauth.php');
// Define the needed keys
- $consumer_key = Config::get('tumblr', 'consumer_key');
- $consumer_secret = Config::get('tumblr', 'consumer_secret');
+ $consumer_key = DI::config()->get('tumblr', 'consumer_key');
+ $consumer_secret = DI::config()->get('tumblr', 'consumer_secret');
// Once the user approves your app at Tumblr, they are sent back to this script.
// This script is passed two parameters in the URL, oauth_token (our Request Token)
@@ -184,11 +171,11 @@ function tumblr_callback(App $a)
}
// What's next? Now that we have an Access Token and Secret, we can make an API call.
- PConfig::set(local_user(), "tumblr", "oauth_token", $access_token['oauth_token']);
- PConfig::set(local_user(), "tumblr", "oauth_token_secret", $access_token['oauth_token_secret']);
+ DI::pConfig()->set(local_user(), "tumblr", "oauth_token", $access_token['oauth_token']);
+ DI::pConfig()->set(local_user(), "tumblr", "oauth_token_secret", $access_token['oauth_token_secret']);
- $o = L10n::t("You are now authenticated to tumblr.");
- $o .= '
'.L10n::t("return to the connector page").'';
+ $o = DI::l10n()->t("You are now authenticated to tumblr.");
+ $o .= '
' . DI::l10n()->t("return to the connector page") . '';
return $o;
}
@@ -199,13 +186,13 @@ function tumblr_jot_nets(App $a, array &$jotnets_fields)
return;
}
- if (PConfig::get(local_user(),'tumblr','post')) {
+ if (DI::pConfig()->get(local_user(),'tumblr','post')) {
$jotnets_fields[] = [
'type' => 'checkbox',
'field' => [
'tumblr_enable',
- L10n::t('Post to Tumblr'),
- PConfig::get(local_user(),'tumblr','post_by_default')
+ DI::l10n()->t('Post to Tumblr'),
+ DI::pConfig()->get(local_user(),'tumblr','post_by_default')
]
];
}
@@ -219,53 +206,53 @@ function tumblr_settings(App $a, &$s)
/* Add our stylesheet to the page so we can make our settings look nice */
- $a->page['htmlhead'] .= '' . "\r\n";
+ DI::page()['htmlhead'] .= '' . "\r\n";
/* Get the current state of our config variables */
- $enabled = PConfig::get(local_user(), 'tumblr', 'post');
+ $enabled = DI::pConfig()->get(local_user(), 'tumblr', 'post');
$checked = (($enabled) ? ' checked="checked" ' : '');
$css = (($enabled) ? '' : '-disabled');
- $def_enabled = PConfig::get(local_user(), 'tumblr', 'post_by_default');
+ $def_enabled = DI::pConfig()->get(local_user(), 'tumblr', 'post_by_default');
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
/* Add some HTML to the existing form */
$s .= '';
- $s .= ''. L10n::t('Tumblr Export').'
';
+ $s .= ''. DI::l10n()->t('Tumblr Export').'
';
$s .= '';
$s .= '