X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tumblr%2Ftumblr.php;h=62f711325ca99567d92f80cfca3a4f45c32111ea;hb=08206fdcc0750ec9dd12a68addb341cd05f8bcfb;hp=9617a3a0783c4f0506454aaebd94b26846779e8f;hpb=3940618a4a5bb9dc49e4a6b076add33ccfc79b94;p=friendica-addons.git
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 9617a3a0..62f71132 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -9,75 +9,94 @@
require_once __DIR__ . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . 'tumblroauth.php';
+use Friendica\App;
use Friendica\Content\Text\BBCode;
-use Friendica\Core\Addon;
use Friendica\Core\Config;
+use Friendica\Core\Hook;
use Friendica\Core\L10n;
+use Friendica\Core\Logger;
use Friendica\Core\PConfig;
-
-function tumblr_install() {
- Addon::registerHook('post_local', 'addon/tumblr/tumblr.php', 'tumblr_post_local');
- Addon::registerHook('notifier_normal', 'addon/tumblr/tumblr.php', 'tumblr_send');
- Addon::registerHook('jot_networks', 'addon/tumblr/tumblr.php', 'tumblr_jot_nets');
- Addon::registerHook('connector_settings', 'addon/tumblr/tumblr.php', 'tumblr_settings');
- Addon::registerHook('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post');
-
-}
-function tumblr_uninstall() {
- Addon::unregisterHook('post_local', 'addon/tumblr/tumblr.php', 'tumblr_post_local');
- Addon::unregisterHook('notifier_normal', 'addon/tumblr/tumblr.php', 'tumblr_send');
- Addon::unregisterHook('jot_networks', 'addon/tumblr/tumblr.php', 'tumblr_jot_nets');
- Addon::unregisterHook('connector_settings', 'addon/tumblr/tumblr.php', 'tumblr_settings');
- Addon::unregisterHook('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post');
+use Friendica\Core\Renderer;
+use Friendica\Database\DBA;
+use Friendica\Util\Strings;
+
+function tumblr_install()
+{
+ Hook::register('hook_fork', 'addon/tumblr/tumblr.php', 'tumblr_hook_fork');
+ Hook::register('post_local', 'addon/tumblr/tumblr.php', 'tumblr_post_local');
+ Hook::register('notifier_normal', 'addon/tumblr/tumblr.php', 'tumblr_send');
+ Hook::register('jot_networks', 'addon/tumblr/tumblr.php', 'tumblr_jot_nets');
+ Hook::register('connector_settings', 'addon/tumblr/tumblr.php', 'tumblr_settings');
+ Hook::register('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post');
}
-function tumblr_module() {}
+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_content(&$a) {
+function tumblr_module()
+{
+}
- if(! local_user()) {
+function tumblr_content(App $a)
+{
+ if (! local_user()) {
notice(L10n::t('Permission denied.') . EOL);
return '';
}
- if (isset($a->argv[1]))
+ if (isset($a->argv[1])) {
switch ($a->argv[1]) {
case "connect":
$o = tumblr_connect($a);
break;
+
case "callback":
$o = tumblr_callback($a);
break;
+
default:
$o = print_r($a->argv, true);
break;
}
- else
+ } else {
$o = tumblr_connect($a);
+ }
return $o;
}
-function tumblr_addon_admin(&$a, &$o){
- $t = get_markup_template( "admin.tpl", "addon/tumblr/" );
+function tumblr_addon_admin(App $a, &$o)
+{
+ $t = Renderer::getMarkupTemplate( "admin.tpl", "addon/tumblr/" );
- $o = replace_macros($t, [
- '$submit' => 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' ), ''],
- ]);
+ $o = Renderer::replaceMacros($t, [
+ '$submit' => 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' ), ''],
+ ]);
}
-function tumblr_addon_admin_post(&$a){
- $consumer_key = ((x($_POST,'consumer_key')) ? notags(trim($_POST['consumer_key'])) : '');
- $consumer_secret = ((x($_POST,'consumer_secret')) ? notags(trim($_POST['consumer_secret'])): '');
- Config::set('tumblr','consumer_key',$consumer_key);
- Config::set('tumblr','consumer_secret',$consumer_secret);
- info(L10n::t('Settings updated.'). EOL);
+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);
}
-function tumblr_connect($a) {
+function tumblr_connect(App $a)
+{
// Start a session. This is necessary to hold on to a few keys the callback script will also need
session_start();
@@ -85,12 +104,12 @@ function tumblr_connect($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 = Config::get('tumblr', 'consumer_key');
+ $consumer_secret = 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->get_baseurl()."/tumblr/callback";
+ $callback_url = $a->getBaseURL()."/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.
@@ -115,28 +134,31 @@ function tumblr_connect($a) {
// Redirect the user to the login URL given to us by Tumblr
header('Location: ' . $url);
- // That's it for our side. The user is sent to a Tumblr Login page and
- // asked to authroize our app. After that, Tumblr sends the user back to
- // our Callback URL (callback.php) along with some information we need to get
- // an access token.
-
+ /*
+ * That's it for our side. The user is sent to a Tumblr Login page and
+ * asked to authroize our app. After that, Tumblr sends the user back to
+ * our Callback URL (callback.php) along with some information we need to get
+ * an access token.
+ */
break;
+
default:
// Give an error message
$o = 'Could not connect to Tumblr. Refresh the page or try again later.';
}
- return($o);
-}
-function tumblr_callback($a) {
+ return $o;
+}
+function tumblr_callback(App $a)
+{
// Start a session, load the library
session_start();
//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 = Config::get('tumblr', 'consumer_key');
+ $consumer_secret = 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)
@@ -158,7 +180,7 @@ function tumblr_callback($a) {
if (200 == $tum_oauth->http_code) {
// good to go
} else {
- return('Unable to authenticate');
+ return 'Unable to authenticate';
}
// What's next? Now that we have an Access Token and Secret, we can make an API call.
@@ -166,40 +188,44 @@ function tumblr_callback($a) {
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").'';
- return($o);
+ $o .= '
'.L10n::t("return to the connector page").'';
+
+ return $o;
}
-function tumblr_jot_nets(&$a,&$b) {
- if(! local_user())
+function tumblr_jot_nets(App $a, &$b)
+{
+ if (! local_user()) {
return;
+ }
- $tmbl_post = PConfig::get(local_user(),'tumblr','post');
- if(intval($tmbl_post) == 1) {
- $tmbl_defpost = PConfig::get(local_user(),'tumblr','post_by_default');
+ $tmbl_post = PConfig::get(local_user(), 'tumblr', 'post');
+
+ if (intval($tmbl_post) == 1) {
+ $tmbl_defpost = PConfig::get(local_user(), 'tumblr', 'post_by_default');
$selected = ((intval($tmbl_defpost) == 1) ? ' checked="checked" ' : '');
$b .= '
".$params['caption']."
"; + } - if (empty($params['caption'])) + if (empty($params['caption']) && !empty($siteinfo["description"])) { $params['caption'] = BBCode::convert("[quote]" . $siteinfo["description"] . "[/quote]", false, 4); + } $consumer_key = Config::get('tumblr','consumer_key'); $consumer_secret = Config::get('tumblr','consumer_secret'); @@ -423,14 +475,15 @@ function tumblr_send(&$a,&$b) { // Make an API call with the TumblrOAuth instance. $x = $tum_oauth->post($tmbl_blog,$params); $ret_code = $tum_oauth->http_code; - //print_r($params); - if($ret_code == 201) - logger('tumblr_send: success'); - elseif($ret_code == 403) - logger('tumblr_send: authentication failure'); - else - logger('tumblr_send: general error: ' . print_r($x,true)); + //print_r($params); + if ($ret_code == 201) { + Logger::log('tumblr_send: success'); + } elseif ($ret_code == 403) { + Logger::log('tumblr_send: authentication failure'); + } else { + Logger::log('tumblr_send: general error: ' . print_r($x,true)); + } } }