';
+ }
+
+
}
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
@@ -66,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
@@ -101,6 +127,7 @@ function twitter_settings(&$a,&$s) {
$osecret = get_pconfig(local_user(), 'twitter', 'oauthsecret' );
$enabled = get_pconfig(local_user(), 'twitter', 'post');
$checked = (($enabled) ? ' checked="checked" ' : '');
+ $s .= '
';
$s .= '
'. t('Twitter Posting Settings') .'
';
if ( (!$ckey) && (!$csecret) ) {
@@ -120,7 +147,7 @@ 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'];
@@ -134,14 +161,14 @@ function twitter_settings(&$a,&$s) {
$s .= '';
$s .= '';
$s .= '';
- $s .= '
';
- $s .= '';
+ $s .= '';
+ $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 .= '
';
@@ -154,10 +181,10 @@ function twitter_settings(&$a,&$s) {
$s .= '';
$s .= '';
$s .= '';
- $s .= '';
+ $s .= '';
}
}
- $s .= '';
+ $s .= '';
}
@@ -171,6 +198,11 @@ function twitter_post_hook(&$a,&$b) {
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');
$ckey = get_config('twitter', 'consumerkey' );
@@ -180,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' ), '')
+ ));
+}