';
@@ -425,7 +433,12 @@ function statusnet_post_hook(&$a,&$b) {
// we can later send to StatusNet. This way we can "gain" some
// information during shortening of potential links but do not
// shorten all the links in a 200000 character long essay.
- $tmp = substr($b['body'], 0, 2*$max_char);
+ if (! $b['title']=='') {
+ $tmp = $b['title'] . ' : '. $b['body'];
+ $tmp = substr($tmp, 0, 2*$max_char);
+ } else {
+ $tmp = substr($b['body'], 0, 2*$max_char);
+ }
// if [url=bla][img]blub.png[/img][/url] get blub.png
$tmp = preg_replace( '/\[url\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\]\[img\](\\w+.*?)\\[\\/img\]\\[\\/url\]/i', '$2', $tmp);
// preserve links to images, videos and audios
@@ -435,11 +448,13 @@ function statusnet_post_hook(&$a,&$b) {
$tmp = preg_replace( '/\[\\/?youtube(\\s+.*?\]|\])/i', '', $tmp);
$tmp = preg_replace( '/\[\\/?vimeo(\\s+.*?\]|\])/i', '', $tmp);
$tmp = preg_replace( '/\[\\/?audio(\\s+.*?\]|\])/i', '', $tmp);
+ $linksenabled = get_pconfig($b['uid'],'statusnet','post_taglinks');
// if a #tag is linked, don't send the [url] over to SN
- // this is commented out by default as it means backlinks
- // to friendica, if you don't like this feel free to
- // uncomment the following line
-// $tmp = preg_replace( '/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $tmp);
+ // that is, don't send if the option is not set in the
+ // connector settings
+ if ($linksenabled=='0') {
+ $tmp = preg_replace( '/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $tmp);
+ }
// preserve links to webpages
$tmp = preg_replace( '/\[url\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\](\w+.*?)\[\/url\]/i', '$2 $1', $tmp);
$tmp = preg_replace( '/\[bookmark\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\](\w+.*?)\[\/bookmark\]/i', '$2 $1', $tmp);
diff --git a/twitter.tgz b/twitter.tgz
index 18416d1f6..68a412aa2 100755
Binary files a/twitter.tgz and b/twitter.tgz differ
diff --git a/twitter/README b/twitter/README
index 99edf0d30..a5511fec1 100755
--- a/twitter/README
+++ b/twitter/README
@@ -47,6 +47,9 @@ ___ Configuration ___
__ Global Configuration __
+If you enabled an administrator account, please use the admin panel to cofigure
+the Twitter relay.
+
To activate this addon add @twitter@ to the list of active addons in your
.htconfig.php file
$a->config['system']['addon'] = "twitter, ..."
diff --git a/twitter/twitter.css b/twitter/twitter.css
index 899cfd173..75747979e 100755
--- a/twitter/twitter.css
+++ b/twitter/twitter.css
@@ -12,7 +12,7 @@
}
#twitter-disconnect-label {
float: left;
- width: 200px;
+ width: 250px;
margin-bottom: 25px;
}
@@ -21,16 +21,25 @@
}
#twitter-enable-label {
float: left;
- width: 200px;
+ width: 250px;
margin-bottom: 5px;
}
+#twitter-default-label {
+ float: left;
+ width: 250px;
+}
+#twitter-sendtaglinks-label {
+ float: left;
+ width: 250px;
+ margin-bottom: 25px;
+}
#twitter-checkbox {
float: left;
}
#twitter-pin-label {
float: left;
- width: 200px;
+ width: 250px;
margin-bottom: 25px;
}
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 4f4d72808..006c16152 100755
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -2,7 +2,7 @@
/**
* Name: Twitter Connector
* Description: Relay public postings to a connected Twitter account
- * Version: 1.0.2
+ * Version: 1.0.3
* Author: Tobias Diekershoff
*/
@@ -93,6 +93,7 @@ function twitter_settings_post ($a,$post) {
del_pconfig( local_user(), 'twitter', 'oauthsecret' );
del_pconfig( local_user(), 'twitter', 'post' );
del_pconfig( local_user(), 'twitter', 'post_by_default' );
+ del_pconfig( local_user(), 'twitter', 'post_taglinks');
} else {
if (isset($_POST['twitter-pin'])) {
// if the user supplied us with a PIN from Twitter, let the magic of OAuth happen
@@ -109,6 +110,7 @@ function twitter_settings_post ($a,$post) {
set_pconfig(local_user(),'twitter', 'oauthtoken', $token['oauth_token']);
set_pconfig(local_user(),'twitter', 'oauthsecret', $token['oauth_token_secret']);
set_pconfig(local_user(),'twitter', 'post', 1);
+ set_pconfig(local_user(),'twitter', 'post_taglinks', 1);
// reload the Addon Settings page, if we don't do it see Bug #42
goaway($a->get_baseurl().'/settings/connectors');
} else {
@@ -116,6 +118,7 @@ function twitter_settings_post ($a,$post) {
// to post a tweet for every new __public__ posting to the wall
set_pconfig(local_user(),'twitter','post',intval($_POST['twitter-enable']));
set_pconfig(local_user(),'twitter','post_by_default',intval($_POST['twitter-default']));
+ set_pconfig(local_user(),'twitter','post_taglinks',intval($_POST['twitter-sendtaglinks']));
info( t('Twitter settings updated.') . EOL);
}}
}
@@ -136,6 +139,8 @@ function twitter_settings(&$a,&$s) {
$checked = (($enabled) ? ' checked="checked" ' : '');
$defenabled = get_pconfig(local_user(),'twitter','post_by_default');
$defchecked = (($defenabled) ? ' checked="checked" ' : '');
+ $linksenabled = get_pconfig(local_user(),'twitter','post_taglinks');
+ $linkschecked = (($linksenabled) ? ' checked="checked" ' : '');
$s .= '';
$s .= '
'. t('Twitter Posting Settings') .'
';
@@ -192,6 +197,9 @@ function twitter_settings(&$a,&$s) {
$s .= '
';
$s .= '';
$s .= '';
+ $s .= '
';
+ $s .= '';
+ $s .= '';
$s .= '