X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=addon%2Ftwitter%2Ftwitter.php;h=1dce9d2f66a38b5b0b6b28f1ec55742504b33442;hb=8cc6e69705c40b942ff74f757d8db743c479646a;hp=8faa5e5cf6313d3276d7427297c59e08fc361cf5;hpb=fd6116296efd4dc9168b3fefa6ba586d83a1a454;p=friendica.git
diff --git a/addon/twitter/twitter.php b/addon/twitter/twitter.php
index 8faa5e5cf6..1dce9d2f66 100644
--- a/addon/twitter/twitter.php
+++ b/addon/twitter/twitter.php
@@ -1,4 +1,10 @@
+ */
+
/* Twitter Plugin for Friendika
*
@@ -24,16 +30,15 @@
* setting. After this, your user can configure their Twitter account settings
* from "Settings -> Plugin Settings".
*
+ * Requirements: PHP5, curl [Slinky library]
+ *
* Documentation: http://diekershoff.homeunix.net/redmine/wiki/friendikaplugin/Twitter_Plugin
*/
/* __TODO__
*
- * - deletion of the OAuth credentials does not work
- * - include short links to the original posting if possible
* - what about multimedia content?
* so far we just strip HTML tags from the message
- * - after entering the PIN reload page propperly
*/
function twitter_install() {
@@ -41,6 +46,7 @@ function twitter_install() {
register_hook('plugin_settings', 'addon/twitter/twitter.php', 'twitter_settings');
register_hook('plugin_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post');
register_hook('post_local_end', 'addon/twitter/twitter.php', 'twitter_post_hook');
+ register_hook('jot_networks', 'addon/twitter/twitter.php', 'twitter_jot_nets');
logger("installed twitter");
}
@@ -49,16 +55,34 @@ function twitter_uninstall() {
unregister_hook('plugin_settings', 'addon/twitter/twitter.php', 'twitter_settings');
unregister_hook('plugin_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post');
unregister_hook('post_local_end', 'addon/twitter/twitter.php', 'twitter_post_hook');
+ unregister_hook('jot_networks', 'addon/twitter/twitter.php', 'twitter_jot_nets');
+}
+
+function twitter_jot_nets(&$a,&$b) {
+ if(! local_user())
+ return;
+
+ $tw_post = get_pconfig(local_user(),'twitter','post');
+ if(intval($tw_post) == 1) {
+ $tw_defpost = get_pconfig(local_user(),'twitter','post_by_default');
+ $selected = ((intval($tw_defpost) == 1) ? ' checked="checked" ' : '');
+ $b .= '
'
+ . t('Post to Twitter') . '
';
+ }
+
+
}
function twitter_settings_post ($a,$post) {
if(! local_user())
return;
+ // don't check twitter settings if twitter submit button is not clicked
+ if (!x($_POST,'twitter-submit')) return;
+
if (isset($_POST['twitter-disconnect'])) {
/***
* if the twitter-disconnect checkbox is set, clear the OAuth key/secret pair
* from the user configuration
- * TODO this does not work that way!?
* TODO can we revoke the access tokens at Twitter and do we need to do so?
*/
del_pconfig( local_user(), 'twitter', 'consumerkey' );
@@ -68,7 +92,7 @@ function twitter_settings_post ($a,$post) {
if (isset($_POST['twitter-pin'])) {
// if the user supplied us with a PIN from Twitter, let the magic of OAuth happen
logger('got a Twitter PIN');
- require_once('addon/twitter/twitteroauth.php');
+ require_once('library/twitteroauth.php');
$ckey = get_config('twitter', 'consumerkey' );
$csecret = get_config('twitter', 'consumersecret' );
// the token and secret for which the PIN was generated were hidden in the settings
@@ -85,7 +109,7 @@ function twitter_settings_post ($a,$post) {
} else {
// if no PIN is supplied in the POST variables, the user has changed the setting
// to post a tweet for every new __public__ posting to the wall
- set_pconfig(local_user(),'twitter','post',intval($_POST['twitter']));
+ set_pconfig(local_user(),'twitter','post',intval($_POST['twitter-enable']));
}}
}
function twitter_settings(&$a,&$s) {
@@ -103,14 +127,15 @@ function twitter_settings(&$a,&$s) {
$osecret = get_pconfig(local_user(), 'twitter', 'oauthsecret' );
$enabled = get_pconfig(local_user(), 'twitter', 'post');
$checked = (($enabled) ? ' checked="checked" ' : '');
- $s .= '
'.t('Twitter Posting Settings').'
';
+ $s .= '
';
+ $s .= '
'. t('Twitter Posting Settings') .'
';
if ( (!$ckey) && (!$csecret) ) {
/***
* no global consumer keys
* display warning and skip personal config
*/
- $s .= '
'.t('No consumer key pair for Twitter found. Please contact your site administrator.').'
';
+ $s .= '
'. t('No consumer key pair for Twitter found. Please contact your site administrator.') .'
';
} else {
/***
* ok we have a consumer key pair now look into the OAuth stuff
@@ -122,44 +147,44 @@ function twitter_settings(&$a,&$s) {
* which the user can request a PIN to connect the account to a
* account at Twitter.
*/
- require_once('addon/twitter/twitteroauth.php');
+ require_once('library/twitteroauth.php');
$connection = new TwitterOAuth($ckey, $csecret);
$request_token = $connection->getRequestToken();
$token = $request_token['oauth_token'];
/***
* make some nice form
*/
- $s .= '
'.t('At this Friendika instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter.').'
';
+ $s .= '';
} else {
/***
* we have an OAuth key / secret pair for the user
* so let's give a chance to disable the postings to Twitter
*/
- require_once('addon/twitter/twitteroauth.php');
+ require_once('library/twitteroauth.php');
$connection = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
$details = $connection->get('account/verify_credentials');
- $s .= '
';
- $s .= '';
+ $s .= '';
}
}
- $s .= '';
+ $s .= '';
}
@@ -171,7 +196,12 @@ function twitter_post_hook(&$a,&$b) {
logger('twitter post invoked');
- if((local_user()) && (local_user() == $b['uid']) && (! $b['private'])) {
+ if((local_user()) && (local_user() == $b['uid']) && (! $b['private']) && (! $b['parent']) ) {
+
+ // Twitter is not considered a private network
+ if($b['prvnets'])
+ return;
+
load_pconfig(local_user(), 'twitter');
@@ -182,38 +212,57 @@ function twitter_post_hook(&$a,&$b) {
if($ckey && $csecret && $otoken && $osecret) {
- $twitter_post = get_pconfig(local_user(),'twitter','post');
+ $twitter_post = intval(get_pconfig(local_user(),'twitter','post'));
+ $twitter_enable = (($twitter_post && x($_POST,'twitter_enable')) ? intval($_POST['twitter_enable']) : 0);
- if($twitter_post) {
- require_once('addon/twitter/twitteroauth.php');
+ if($twitter_post && $twitter_enable) {
+ logger('Posting to Twitter', LOGGER_DEBUG);
+ require_once('library/twitteroauth.php');
require_once('include/bbcode.php');
$tweet = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
$max_char = 140; // max. length for a tweet
$msg = strip_tags(bbcode($b['body']));
- if ( strlen($msg) > $max_char) {
- $shortlink = "";
- require_once('addon/twitter/slinky.php');
- // post url = base url + /display/ + owner + post id
- // we construct this from the Owner link and replace
- // profile by display - this will cause an error when
- // /profile/ is in the owner url twice but I don't
- // think this will be very common...
+ if ( strlen($msg) > $max_char) {
+ $shortlink = "";
+ require_once('library/slinky.php');
+ // post url = base url + /display/ + owner + post id
+ // we construct this from the Owner link and replace
+ // profile by display - this will cause an error when
+ // /profile/ is in the owner url twice but I don't
+ // think this will be very common...
$posturl = str_replace('/profile/','/display/',$b['owner-link']).'/'.$b['id'];
$slinky = new Slinky( $posturl );
// setup a cascade of shortening services
// try to get a short link from these services
// in the order ur1.ca, trim, id.gd, tinyurl
$slinky->set_cascade( array( new Slinky_UR1ca(), new Slinky_Trim(), new Slinky_IsGd(), new Slinky_TinyURL() ) );
- $shortlink = $slinky->short();
- // the new message will be shortened such that "... $shortlink"
- // will fit into the character limit
- $msg = substr($msg, 0, $max_char-strlen($shortlink)-4);
- $msg .= '... ' . $shortlink;
- }
- // and now tweet it :-)
- $tweet->post('statuses/update', array('status' => $msg));
+ $shortlink = $slinky->short();
+ // the new message will be shortened such that "... $shortlink"
+ // will fit into the character limit
+ $msg = substr($msg, 0, $max_char-strlen($shortlink)-4);
+ $msg .= '... ' . $shortlink;
+ }
+ // and now tweet it :-)
+ if(strlen($msg))
+ $tweet->post('statuses/update', array('status' => $msg));
}
}
- }
+ }
}
+function twitter_plugin_admin_post(&$a){
+ $consumerkey = ((x($_POST,'consumerkey')) ? notags(trim($_POST['consumerkey'])) : '');
+ $consumersecret = ((x($_POST,'consumersecret')) ? notags(trim($_POST['consumersecret'])): '');
+ set_config('twitter','consumerkey',$consumerkey);
+ set_config('twitter','consumersecret',$consumersecret);
+ info( t('Settings updated.'). EOL );
+}
+function twitter_plugin_admin(&$a, &$o){
+ $t = file_get_contents( dirname(__file__). "/admin.tpl" );
+ $o = replace_macros($t, array(
+ '$submit' => t('Submit'),
+ // name, label, value, help, [extra values]
+ '$consumerkey' => array('consumerkey', t('Consumer key'), get_config('twitter', 'consumerkey' ), ''),
+ '$consumersecret' => array('consumersecret', t('Consumer secret'), get_config('twitter', 'consumersecret' ), '')
+ ));
+}