X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tumblr%2Ftumblr.php;h=0a22d143a6ca25baade190ceb743ac03bfb1458d;hb=c3e93f1ed9a487f823bcc75ddd43024334c25bfc;hp=054b53f863a7839752c57710ce730a970f40ccbe;hpb=51b364aed46bebbf495cf552e7e030ad5e4f04cb;p=friendica-addons.git
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
old mode 100755
new mode 100644
index 054b53f8..0a22d143
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -11,20 +11,23 @@
require_once('library/OAuth1.php');
require_once('addon/tumblr/tumblroauth/tumblroauth.php');
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+
function tumblr_install() {
- register_hook('post_local', 'addon/tumblr/tumblr.php', 'tumblr_post_local');
- register_hook('notifier_normal', 'addon/tumblr/tumblr.php', 'tumblr_send');
- register_hook('jot_networks', 'addon/tumblr/tumblr.php', 'tumblr_jot_nets');
- register_hook('connector_settings', 'addon/tumblr/tumblr.php', 'tumblr_settings');
- register_hook('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post');
+ register_hook('post_local', 'addon/tumblr/tumblr.php', 'tumblr_post_local');
+ register_hook('notifier_normal', 'addon/tumblr/tumblr.php', 'tumblr_send');
+ register_hook('jot_networks', 'addon/tumblr/tumblr.php', 'tumblr_jot_nets');
+ register_hook('connector_settings', 'addon/tumblr/tumblr.php', 'tumblr_settings');
+ register_hook('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post');
}
function tumblr_uninstall() {
- unregister_hook('post_local', 'addon/tumblr/tumblr.php', 'tumblr_post_local');
- unregister_hook('notifier_normal', 'addon/tumblr/tumblr.php', 'tumblr_send');
- unregister_hook('jot_networks', 'addon/tumblr/tumblr.php', 'tumblr_jot_nets');
- unregister_hook('connector_settings', 'addon/tumblr/tumblr.php', 'tumblr_settings');
- unregister_hook('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post');
+ unregister_hook('post_local', 'addon/tumblr/tumblr.php', 'tumblr_post_local');
+ unregister_hook('notifier_normal', 'addon/tumblr/tumblr.php', 'tumblr_send');
+ unregister_hook('jot_networks', 'addon/tumblr/tumblr.php', 'tumblr_jot_nets');
+ unregister_hook('connector_settings', 'addon/tumblr/tumblr.php', 'tumblr_settings');
+ unregister_hook('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post');
}
function tumblr_module() {}
@@ -54,6 +57,25 @@ function tumblr_content(&$a) {
return $o;
}
+function tumblr_plugin_admin(&$a, &$o){
+ $t = get_markup_template( "admin.tpl", "addon/tumblr/" );
+
+ $o = replace_macros($t, array(
+ '$submit' => t('Save Settings'),
+ // name, label, value, help, [extra values]
+ '$consumer_key' => array('consumer_key', t('Consumer Key'), Config::get('tumblr', 'consumer_key' ), ''),
+ '$consumer_secret' => array('consumer_secret', t('Consumer Secret'), Config::get('tumblr', 'consumer_secret' ), ''),
+ ));
+}
+
+function tumblr_plugin_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( t('Settings updated.'). EOL );
+}
+
function tumblr_connect($a) {
// Start a session. This is necessary to hold on to a few keys the callback script will also need
session_start();
@@ -62,8 +84,8 @@ function tumblr_connect($a) {
//require_once('addon/tumblr/tumblroauth/tumblroauth.php');
// Define the needed keys
- $consumer_key = get_config('tumblr','consumer_key');
- $consumer_secret = get_config('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
@@ -85,22 +107,22 @@ function tumblr_connect($a) {
// Check the HTTP Code. It should be a 200 (OK), if it's anything else then something didn't work.
switch ($tum_oauth->http_code) {
- case 200:
- // Ask Tumblr to give us a special address to their login page
- $url = $tum_oauth->getAuthorizeURL($token);
-
- // 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.
-
- break;
- default:
- // Give an error message
- $o = 'Could not connect to Tumblr. Refresh the page or try again later.';
+ case 200:
+ // Ask Tumblr to give us a special address to their login page
+ $url = $tum_oauth->getAuthorizeURL($token);
+
+ // 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.
+
+ break;
+ default:
+ // Give an error message
+ $o = 'Could not connect to Tumblr. Refresh the page or try again later.';
}
return($o);
}
@@ -112,8 +134,8 @@ function tumblr_callback($a) {
//require_once('addon/tumblr/tumblroauth/tumblroauth.php');
// Define the needed keys
- $consumer_key = get_config('tumblr','consumer_key');
- $consumer_secret = get_config('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)
@@ -124,7 +146,7 @@ function tumblr_callback($a) {
// It'll need our Consumer Key and Secret as well as our Request Token and Secret
$tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret, $_SESSION['request_token'], $_SESSION['request_token_secret']);
- // Ok, let's get an Access Token. We'll need to pass along our oauth_verifier which was given to us in the URL.
+ // Ok, let's get an Access Token. We'll need to pass along our oauth_verifier which was given to us in the URL.
$access_token = $tum_oauth->getAccessToken($_REQUEST['oauth_verifier']);
// We're done with the Request Token and Secret so let's remove those.
@@ -133,14 +155,14 @@ function tumblr_callback($a) {
// Make sure nothing went wrong.
if (200 == $tum_oauth->http_code) {
- // good to go
+ // 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.
- set_pconfig(local_user(), "tumblr", "oauth_token", $access_token['oauth_token']);
- set_pconfig(local_user(), "tumblr", "oauth_token_secret", $access_token['oauth_token_secret']);
+ PConfig::set(local_user(), "tumblr", "oauth_token", $access_token['oauth_token']);
+ PConfig::set(local_user(), "tumblr", "oauth_token_secret", $access_token['oauth_token_secret']);
$o = t("You are now authenticated to tumblr.");
$o .= ' '.t("return to the connector page").'';
@@ -148,96 +170,96 @@ function tumblr_callback($a) {
}
function tumblr_jot_nets(&$a,&$b) {
- if(! local_user())
- return;
-
- $tmbl_post = get_pconfig(local_user(),'tumblr','post');
- if(intval($tmbl_post) == 1) {
- $tmbl_defpost = get_pconfig(local_user(),'tumblr','post_by_default');
- $selected = ((intval($tmbl_defpost) == 1) ? ' checked="checked" ' : '');
- $b .= '
