X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tumblr%2Ftumblr.php;h=bbd0da83033df854569109f806d36c36d0ee8797;hb=2e96c60a478156a9dae89d9ab9d35c6eebf543e6;hp=eeb51348ba65e799113974b3a0f81c6926ead494;hpb=4f3e76e87e68014f31cd6810ffaa557644af13a2;p=friendica-addons.git

diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index eeb51348..bbd0da83 100755
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -7,6 +7,9 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 
+require_once('library/OAuth1.php');
+require_once('addon/tumblr/tumblroauth/tumblroauth.php');
+
 function tumblr_install() {
     register_hook('post_local',           'addon/tumblr/tumblr.php', 'tumblr_post_local');
     register_hook('notifier_normal',      'addon/tumblr/tumblr.php', 'tumblr_send');
@@ -23,6 +26,125 @@ function tumblr_uninstall() {
     unregister_hook('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post');
 }
 
+function tumblr_module() {}
+
+function tumblr_content(&$a) {
+
+	if(! local_user()) {
+		notice( t('Permission denied.') . EOL);
+		return '';
+	}
+
+	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
+		$o = tumblr_connect($a);
+
+	return $o;
+}
+
+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();
+
+	// Include the TumblrOAuth library
+	//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');
+
+	// 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";
+
+	// Let's begin.  First we need a Request Token.  The request token is required to send the user
+	// to Tumblr's login page.
+
+	// Create a new instance of the TumblrOAuth library.  For this step, all we need to give the library is our
+	// Consumer Key and Consumer Secret
+	$tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret);
+
+	// Ask Tumblr for a Request Token.  Specify the Callback URL here too (although this should be optional)
+	$request_token = $tum_oauth->getRequestToken($callback_url);
+
+	// Store the request token and Request Token Secret as out callback.php script will need this
+	$_SESSION['request_token'] = $token = $request_token['oauth_token'];
+	$_SESSION['request_token_secret'] = $request_token['oauth_token_secret'];
+
+	// 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.';
+	}
+	return($o);
+}
+
+function tumblr_callback($a) {
+
+	// Start a session, load the library
+	session_start();
+	//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');
+
+	// 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)
+	// and oauth_verifier (Key that we need to get Access Token).
+	// We'll also need out Request Token Secret, which we stored in a session.
+
+	// Create instance of TumblrOAuth.
+	// 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. 
+	$access_token = $tum_oauth->getAccessToken($_REQUEST['oauth_verifier']);
+
+	// We're done with the Request Token and Secret so let's remove those.
+	unset($_SESSION['request_token']);
+	unset($_SESSION['request_token_secret']);
+
+	// Make sure nothing went wrong.
+	if (200 == $tum_oauth->http_code) {
+	  // good to go
+	} else {
+	  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']);
+
+	$o = t("You are now authenticated to tumblr.");
+	$o .= '<br /><a href="'.$a->get_baseurl().'/settings/connectors">'.t("return to the connector page").'</a>';
+	return($o);
+}
 
 function tumblr_jot_nets(&$a,&$b) {
     if(! local_user())
@@ -50,34 +172,30 @@ function tumblr_settings(&$a,&$s) {
     /* Get the current state of our config variables */
 
     $enabled = get_pconfig(local_user(),'tumblr','post');
-
     $checked = (($enabled) ? ' checked="checked" ' : '');
+    $css = (($enabled) ? '' : '-disabled');
 
     $def_enabled = get_pconfig(local_user(),'tumblr','post_by_default');
 
     $def_checked = (($def_enabled) ? ' checked="checked" ' : '');
 
-	$tmbl_username = get_pconfig(local_user(), 'tumblr', 'tumblr_username');
-	$tmbl_password = get_pconfig(local_user(), 'tumblr', 'tumblr_password');
-
-
     /* Add some HTML to the existing form */
 
-    $s .= '<div class="settings-block">';
-    $s .= '<h3>' . t('Tumblr Post Settings') . '</h3>';
-    $s .= '<div id="tumblr-enable-wrapper">';
-    $s .= '<label id="tumblr-enable-label" for="tumblr-checkbox">' . t('Enable Tumblr Post Plugin') . '</label>';
-    $s .= '<input id="tumblr-checkbox" type="checkbox" name="tumblr" value="1" ' . $checked . '/>';
-    $s .= '</div><div class="clear"></div>';
+    $s .= '<span id="settings_tumblr_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_tumblr_expanded\'); openClose(\'settings_tumblr_inflated\');">';
+    $s .= '<img class="connector'.$css.'" src="images/tumblr.png" /><h3 class="connector">'. t('Tumblr Export').'</h3>';
+    $s .= '</span>';
+    $s .= '<div id="settings_tumblr_expanded" class="settings-block" style="display: none;">';
+    $s .= '<span class="fakelink" onclick="openClose(\'settings_tumblr_expanded\'); openClose(\'settings_tumblr_inflated\');">';
+    $s .= '<img class="connector'.$css.'" src="images/tumblr.png" /><h3 class="connector">'. t('Tumblr Export').'</h3>';
+    $s .= '</span>';
 
     $s .= '<div id="tumblr-username-wrapper">';
-    $s .= '<label id="tumblr-username-label" for="tumblr-username">' . t('Tumblr login') . '</label>';
-    $s .= '<input id="tumblr-username" type="text" name="tumblr_username" value="' . $tmbl_username . '" />';
+    $s .= '<a href="'.$a->get_baseurl().'/tumblr/connect">'.t("(Re-)Authenticate your tumblr page").'</a>';
     $s .= '</div><div class="clear"></div>';
 
-    $s .= '<div id="tumblr-password-wrapper">';
-    $s .= '<label id="tumblr-password-label" for="tumblr-password">' . t('Tumblr password') . '</label>';
-    $s .= '<input id="tumblr-password" type="password" name="tumblr_password" value="' . $tmbl_password . '" />';
+    $s .= '<div id="tumblr-enable-wrapper">';
+    $s .= '<label id="tumblr-enable-label" for="tumblr-checkbox">' . t('Enable Tumblr Post Plugin') . '</label>';
+    $s .= '<input id="tumblr-checkbox" type="checkbox" name="tumblr" value="1" ' . $checked . '/>';
     $s .= '</div><div class="clear"></div>';
 
     $s .= '<div id="tumblr-bydefault-wrapper">';
@@ -85,9 +203,40 @@ function tumblr_settings(&$a,&$s) {
     $s .= '<input id="tumblr-bydefault" type="checkbox" name="tumblr_bydefault" value="1" ' . $def_checked . '/>';
     $s .= '</div><div class="clear"></div>';
 
+    $oauth_token = get_pconfig(local_user(), "tumblr", "oauth_token");
+    $oauth_token_secret = get_pconfig(local_user(), "tumblr", "oauth_token_secret");
+
+    $s .= '<div id="tumblr-page-wrapper">';
+    if (($oauth_token != "") and ($oauth_token_secret != "")) {
+
+	$page = get_pconfig(local_user(),'tumblr','page');
+	$consumer_key = get_config('tumblr','consumer_key');
+	$consumer_secret = get_config('tumblr','consumer_secret');
+
+	$tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret);
+
+	$userinfo = $tum_oauth->get('user/info');
+
+	$blogs = array();
+
+	$s .= '<label id="tumblr-page-label" for="tumblr-page">' . t('Post to page:') . '</label>';
+	$s .= '<select name="tumblr_page" id="tumblr-page">';
+	foreach($userinfo->response->user->blogs as $blog) {
+		$blogurl = substr(str_replace(array("http://", "https://"), array("", ""), $blog->url), 0, -1);
+		if ($page == $blogurl)
+			$s .= "<option value='".$blogurl."' selected>".$blogurl."</option>";
+		else
+			$s .= "<option value='".$blogurl."'>".$blogurl."</option>";
+	}
+
+	$s .= "</select>";
+    } else
+	$s .= t("You are not authenticated to tumblr");
+    $s .= '</div><div class="clear"></div>';
+
     /* provide a submit button */
 
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="tumblr-submit" name="tumblr-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="tumblr-submit" name="tumblr-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
 
 }
 
@@ -97,9 +246,8 @@ function tumblr_settings_post(&$a,&$b) {
 	if(x($_POST,'tumblr-submit')) {
 
 		set_pconfig(local_user(),'tumblr','post',intval($_POST['tumblr']));
+		set_pconfig(local_user(),'tumblr','page',$_POST['tumblr_page']);
 		set_pconfig(local_user(),'tumblr','post_by_default',intval($_POST['tumblr_bydefault']));
-		set_pconfig(local_user(),'tumblr','tumblr_username',trim($_POST['tumblr_username']));
-		set_pconfig(local_user(),'tumblr','tumblr_password',trim($_POST['tumblr_password']));
 
 	}
 
@@ -147,12 +295,12 @@ function tumblr_send(&$a,&$b) {
     if($b['parent'] != $b['id'])
         return;
 
+	$oauth_token = get_pconfig($b['uid'], "tumblr", "oauth_token");
+	$oauth_token_secret = get_pconfig($b['uid'], "tumblr", "oauth_token_secret");
+	$page = get_pconfig($b['uid'], "tumblr", "page");
+	$tmbl_blog = 'blog/'.$page.'/post';
 
-	$tmbl_username = get_pconfig($b['uid'],'tumblr','tumblr_username');
-	$tmbl_password = get_pconfig($b['uid'],'tumblr','tumblr_password');
-	$tmbl_blog = 'http://www.tumblr.com/api/write';
-
-	if($tmbl_username && $tmbl_password && $tmbl_blog) {
+	if($oauth_token && $oauth_token_secret && $tmbl_blog) {
 
 		require_once('include/bbcode.php');
 
@@ -193,10 +341,8 @@ function tumblr_send(&$a,&$b) {
 		}
 
 		$params = array(
-			'email' => $tmbl_username,
-			'password' => $tmbl_password,
 			'format' => 'html',
-			'generator' => 'Friendica',
+			'tweet' => 'off',
 			'tags' => $tags);
 
 		if (($link != '') and $video) {
@@ -204,22 +350,30 @@ function tumblr_send(&$a,&$b) {
 			$params['embed'] = $link;
 			if ($title != '')
 				$params['caption'] = '<h1><a href="'.$link.'">'.$title.
-							"</a></h1><p>".bbcode($body, false, false)."</p>";
+							"</a></h1><p>".bbcode($body, false, false, 4)."</p>";
 			else
-				$params['caption'] = bbcode($body, false, false);
+				$params['caption'] = bbcode($body, false, false, 4);
 		} else if (($link != '') and !$video) {
 			$params['type'] = "link";
-			$params['name'] = $title;
+			$params['title'] = $title;
 			$params['url'] = $link;
-			$params['description'] = bbcode($b["body"], false, false);
+			$params['description'] = bbcode($b["body"], false, false, 4);
 		} else {
-			$params['type'] = "regular";
+			$params['type'] = "text";
 			$params['title'] = $title;
-			$params['body'] = bbcode($b['body'], false, false);
+			$params['body'] = bbcode($b['body'], false, false, 4);
 		}
 
-		$x = post_url($tmbl_blog,$params);
-		$ret_code = $a->get_curl_code();
+		$consumer_key = get_config('tumblr','consumer_key');
+		$consumer_secret = get_config('tumblr','consumer_secret');
+
+		$tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret);
+
+		// Make an API call with the TumblrOAuth instance.
+		$x = $tum_oauth->post($tmbl_blog,$params);
+
+		$ret_code = $tum_oauth->http_code;
+
 		if($ret_code == 201)
 			logger('tumblr_send: success');
 		elseif($ret_code == 403)