' . t('Facebook Connect') . '
'; + + $o .= ''; + + $o .= '' . t('Install Facebook posting') . '
'; + + $o .= '' . t('Remove Facebook posting') . '
'; + + + return $o; +} function facebook_install() { - register_hook('post_local_end', 'addon/facebook/facebook.php', 'facebook_post_hook'); + register_hook('post_local_end', 'addon/facebook/facebook.php', 'facebook_post_hook'); + register_hook('jot_networks', 'addon/facebook/facebook.php', 'facebook_jot_nets'); + register_hook('post_local_start','addon/facebook/facebook.php', 'facebook_post_local'); + } function facebook_uninstall() { - unregister_hook('post_local_end', 'addon/facebook/facebook.php', 'facebook_post_hook'); + unregister_hook('post_local_end', 'addon/facebook/facebook.php', 'facebook_post_hook'); + unregister_hook('jot_networks', 'addon/facebook/facebook.php', 'facebook_jot_nets'); + unregister_hook('post_local_start','addon/facebook/facebook.php', 'facebook_post_local'); } +function facebook_jot_nets(&$a,&$b) { + if(! local_user()) + return; + + $fb_post = get_pconfig(local_user(),'facebook','post'); + if(intval($fb_post) == 1) { + $fb_defpost = get_pconfig(local_user(),'facebook','post_by_default'); + $selected = ((intval($fb_defpost == 1)) ? ' selected="selected" ' : ''); + $b .= '
Your ur1 is: /', $result, $matches ) )
+ return $matches[1];
+ else
+ return $url;
+ }
+}
+
+// PtitURL.com
+class Slinky_PtitURL extends Slinky_Service {
+ function url_is_short( $url ) {
+ return stristr( $url, 'ptiturl.com/' );
+ }
+
+ function url_is_long( $url ) {
+ return !stristr( $url, 'ptiturl.com/' );
+ }
+
+ function make_short( $url ) {
+ $result = $this->url_get( 'http://ptiturl.com/index.php?creer=oui&url=' . urlencode( $url ) );
+ if ( preg_match( '/ '. t('No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root. '. t('To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet.') .' '. t('Currently connected to: ') .''.$details->screen_name.' '. t('If enabled all your public postings will be posted to the associated StatusNet account as well.') .' Your ur1 is: /', $result, $matches ) )
+ return $matches[1];
+ else
+ return $url;
+ }
+}
+
+// PtitURL.com
+class Slinky_PtitURL extends Slinky_Service {
+ function url_is_short( $url ) {
+ return stristr( $url, 'ptiturl.com/' );
+ }
+
+ function url_is_long( $url ) {
+ return !stristr( $url, 'ptiturl.com/' );
+ }
+
+ function make_short( $url ) {
+ $result = $this->url_get( 'http://ptiturl.com/index.php?creer=oui&url=' . urlencode( $url ) );
+ if ( preg_match( '/ '. t('No consumer key pair for Twitter found. Please contact your site administrator.') .' '. 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.') .' '. t('Currently connected to: ') .''.$details->screen_name.' '. t('If enabled all your public postings will be posted to the associated Twitter account as well.') .']+)\'?>/', $result, $matches ) )
+ return $matches[1];
+ else
+ return $url;
+ }
+}
+
+// Tighturl.com
+class Slinky_TightURL extends Slinky_Service {
+ function url_is_short( $url ) {
+ return stristr( $url, 'tighturl.com/' )
+ || stristr( $url, '2tu.us/' );
+ }
+
+ function url_is_long( $url ) {
+ return !stristr( $url, 'tighturl.com/' )
+ && !stristr( $url, '2tu.us/' );
+ }
+
+ function make_short( $url ) {
+ $response = $this->url_get( 'http://tighturl.com/?save=y&url=' . urlencode( $url ) );
+ if ( preg_match( '/Your tight URL is:
/', $response, $matches ) ) {
+ return $matches[1];
+ } else {
+ return $url;
+ }
+ }
+}
+
+// Snipr for Slinky
+/*
+To use Snipr, you MUST set your user_id and API (key) for the service first, e.g.
+
+$snipr = new Slinky_Snipr();
+$snipr->set( 'user_id', 'Snipr User ID' );
+$snipr->set( 'API', 'Snipr API Key' );
+
+$slinky = new Slinky( $url, $snipr );
+echo $slinky->short();
+
+NOTE: Snipr requires the SimpleXML extension to be installed for lengthening URLs
+*/
+class Slinky_Snipr extends Slinky_Service {
+ // Snipurl, Snurl, Snipr, Sn.im
+ function url_is_short( $url ) {
+ return stristr( $url, 'snipr.com/' ) || stristr( $url, 'snipurl.com/' ) || stristr( $url, 'snurl.com/' ) || stristr( $url, 'sn.im/' );
+ }
+
+ function url_is_long( $url ) {
+ return !stristr( $url, 'snipr.com/' ) || !stristr( $url, 'snipurl.com/' ) || !stristr( $url, 'snurl.com/' ) || !stristr( $url, 'sn.im/' );
+ }
+
+ function make_short( $url ) {
+ if ( !$this->get( 'user_id' ) || !$this->get( 'API' ) )
+ return $url;
+
+ $response = $this->url_post( 'http://snipr.com/site/getsnip', array( 'sniplink' => urlencode( $url ), 'snipuser' => $this->get( 'user_id'), 'snipapi' => $this->get( 'API' ), 'snipformat' => 'simple' ) );
+ if ( 'ERROR' != substr( $response, 0, 5 ) )
+ return $response;
+ else
+ return $url;
+ }
+}
+
+// If you're testing things out, http://dentedreality.com.au/ should convert to:
+// - http://tinyurl.com/jw5sh
+// - http://bit.ly/hEkAD
+// - http://tr.im/sk1H
+// - http://is.gd/1yJ81
+// - http://fon.gs/tc1p8c
+// - http://micurl.com/qen3uub
+// - http://ur1.ca/7dcd
+// - http://ptiturl.com/?id=bac8fb
+// - http://tighturl.com/kgd
+// - http://snipr.com/nbbw3
+//
+// $slinky = new Slinky( 'http://dentedreality.com.au/' );
+// echo $slinky->short();
diff --git a/addon/statusnet/statusnet.css b/addon/statusnet/statusnet.css
new file mode 100644
index 000000000..4e27b0938
--- /dev/null
+++ b/addon/statusnet/statusnet.css
@@ -0,0 +1,67 @@
+
+
+#statusnet-avatar {
+ float: left;
+ width: 48px;
+ height: 48px;
+ padding: 2px;
+}
+#statusnet-info-block {
+ height: 52px;
+ vertical-align: middle;
+}
+#statusnet-disconnect-label {
+ float: left;
+ width: 200px;
+ margin-bottom: 25px;
+}
+
+#statusnet-disconnect {
+ float: left;
+}
+#statusnet-enable-label {
+ float: left;
+ width: 200px;
+ margin-bottom: 5px;
+}
+
+#statusnet-checkbox {
+ float: left;
+}
+#statusnet-pin-label {
+ float: left;
+ width: 200px;
+ margin-bottom: 25px;
+}
+#statusnet-pin {
+ float: left;
+}
+
+
+#statusnet-consumerkey-label {
+ float: left;
+ width: 200px;
+ margin-bottom: 8px;
+}
+#statusnet-consumerkey {
+ float: left;
+ margin-bottom: 8px;
+}
+#statusnet-consumersecret-label {
+ float: left;
+ width: 200px;
+ margin-bottom: 8px;
+}
+#statusnet-consumersecret {
+ float: left;
+ margin-bottom: 8px;
+}
+#statusnet-baseapi-label {
+ float: left;
+ width: 200px;
+ margin-bottom: 25px;
+}
+#statusnet-baseapi {
+ float: left;
+ margin-bottom: 8px;
+}
diff --git a/addon/statusnet/statusnet.php b/addon/statusnet/statusnet.php
new file mode 100644
index 000000000..bc47242fc
--- /dev/null
+++ b/addon/statusnet/statusnet.php
@@ -0,0 +1,244 @@
+config['system']['addon']
+ * 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/StatusNet_Plugin
+ */
+
+/* __TODO__
+ *
+ * - what about multimedia content?
+ * so far we just strip HTML tags from the message
+ */
+
+
+/***
+ * We have to alter the TwitterOAuth class a little bit to work with any StatusNet
+ * installation abroad. Basically it's only make the API path variable and be happy.
+ *
+ * Thank you guys for the Twitter compatible API!
+ */
+require_once('addon/twitter/twitteroauth.php');
+class StatusNetOAuth extends TwitterOAuth {
+ function get_maxlength() {
+ $config = $this->get($this->host . 'statusnet/config.json');
+ return $config->site->textlimit;
+ }
+ function accessTokenURL() { return $this->host.'oauth/access_token'; }
+ function authenticateURL() { return $this->host.'oauth/authenticate'; }
+ function authorizeURL() { return $this->host.'oauth/authorize'; }
+ function requestTokenURL() { return $this->host.'oauth/request_token'; }
+ function __construct($apipath, $consumer_key, $consumer_secret, $oauth_token = NULL, $oauth_token_secret = NULL) {
+ parent::__construct($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret);
+ $this->host = $apipath;
+ }
+}
+
+function statusnet_install() {
+ // we need some hooks, for the configuration and for sending tweets
+ register_hook('plugin_settings', 'addon/statusnet/statusnet.php', 'statusnet_settings');
+ register_hook('plugin_settings_post', 'addon/statusnet/statusnet.php', 'statusnet_settings_post');
+ register_hook('post_local_end', 'addon/statusnet/statusnet.php', 'statusnet_post_hook');
+ logger("installed statusnet");
+}
+
+
+function statusnet_uninstall() {
+ unregister_hook('plugin_settings', 'addon/statusnet/statusnet.php', 'statusnet_settings');
+ unregister_hook('plugin_settings_post', 'addon/statusnet/statusnet.php', 'statusnet_settings_post');
+ unregister_hook('post_local_end', 'addon/statusnet/statusnet.php', 'statusnet_post_hook');
+}
+
+function statusnet_settings_post ($a,$post) {
+ if(! local_user())
+ return;
+ if (isset($_POST['statusnet-disconnect'])) {
+ /***
+ * if the statusnet-disconnect checkbox is set, clear the statusnet configuration
+ * TODO can we revoke the access tokens at Twitter and do we need to do so?
+ */
+ del_pconfig( local_user(), 'statusnet', 'consumerkey' );
+ del_pconfig( local_user(), 'statusnet', 'consumersecret' );
+ del_pconfig( local_user(), 'statusnet', 'post' );
+ del_pconfig( local_user(), 'statusnet', 'oauthtoken' );
+ del_pconfig( local_user(), 'statusnet', 'oauthsecret' );
+ del_pconfig( local_user(), 'statusnet', 'baseapi' );
+ } else {
+ if (isset($_POST['statusnet-consumersecret'])) {
+ set_pconfig(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
+ set_pconfig(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']);
+ set_pconfig(local_user(), 'statusnet', 'baseapi', $_POST['statusnet-baseapi']);
+ header('Location: '.$a->get_baseurl().'/settings/addon');
+ } else {
+ if (isset($_POST['statusnet-pin'])) {
+ // if the user supplied us with a PIN from Twitter, let the magic of OAuth happen
+ logger('got a StatusNet security code');
+ $api = get_pconfig(local_user(), 'statusnet', 'baseapi');
+ $ckey = get_pconfig(local_user(), 'statusnet', 'consumerkey' );
+ $csecret = get_pconfig(local_user(), 'statusnet', 'consumersecret' );
+ // the token and secret for which the PIN was generated were hidden in the settings
+ // form as token and token2, we need a new connection to Twitter using these token
+ // and secret to request a Access Token with the PIN
+ $connection = new StatusNetOAuth($api, $ckey, $csecret, $_POST['statusnet-token'], $_POST['statusnet-token2']);
+ $token = $connection->getAccessToken( $_POST['statusnet-pin'] );
+ // ok, now that we have the Access Token, save them in the user config
+ set_pconfig(local_user(),'statusnet', 'oauthtoken', $token['oauth_token']);
+ set_pconfig(local_user(),'statusnet', 'oauthsecret', $token['oauth_token_secret']);
+ set_pconfig(local_user(),'statusnet', 'post', 1);
+ // reload the Addon Settings page, if we don't do it see Bug #42
+ header('Location: '.$a->get_baseurl().'/settings/addon');
+ } 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(),'statusnet','post',intval($_POST['statusnet-enable']));
+ }}}
+}
+function statusnet_settings(&$a,&$s) {
+ if(! local_user())
+ return;
+ $a->page['htmlhead'] .= '' . "\r\n";
+ /***
+ * 1) Check that we have a base api url and a consumer key & secret
+ * 2) If no OAuthtoken & stuff is present, generate button to get some
+ * 3) Checkbox for "Send public notices (respect size limitation)
+ */
+ $api = get_pconfig(local_user(), 'statusnet', 'baseapi');
+ $ckey = get_pconfig(local_user(), 'statusnet', 'consumerkey' );
+ $csecret = get_pconfig(local_user(), 'statusnet', 'consumersecret' );
+ $otoken = get_pconfig(local_user(), 'statusnet', 'oauthtoken' );
+ $osecret = get_pconfig(local_user(), 'statusnet', 'oauthsecret' );
+ $enabled = get_pconfig(local_user(), 'statusnet', 'post');
+ $checked = (($enabled) ? ' checked="checked" ' : '');
+ $s .= ''.t('StatusNet Posting Settings').'
';
+
+ if ( (!$ckey) && (!$csecret) ) {
+ /***
+ * no consumer keys
+ */
+ $s .= '
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation.') .'
';
+ $s .= '';
+ $s .= '
';
+ $s .= '';
+ $s .= '
';
+ $s .= '
';
+ $s .= '
'.$details->description.']+)\'?>/', $result, $matches ) )
+ return $matches[1];
+ else
+ return $url;
+ }
+}
+
+// Tighturl.com
+class Slinky_TightURL extends Slinky_Service {
+ function url_is_short( $url ) {
+ return stristr( $url, 'tighturl.com/' )
+ || stristr( $url, '2tu.us/' );
+ }
+
+ function url_is_long( $url ) {
+ return !stristr( $url, 'tighturl.com/' )
+ && !stristr( $url, '2tu.us/' );
+ }
+
+ function make_short( $url ) {
+ $response = $this->url_get( 'http://tighturl.com/?save=y&url=' . urlencode( $url ) );
+ if ( preg_match( '/Your tight URL is:
/', $response, $matches ) ) {
+ return $matches[1];
+ } else {
+ return $url;
+ }
+ }
+}
+
+// Snipr for Slinky
+/*
+To use Snipr, you MUST set your user_id and API (key) for the service first, e.g.
+
+$snipr = new Slinky_Snipr();
+$snipr->set( 'user_id', 'Snipr User ID' );
+$snipr->set( 'API', 'Snipr API Key' );
+
+$slinky = new Slinky( $url, $snipr );
+echo $slinky->short();
+
+NOTE: Snipr requires the SimpleXML extension to be installed for lengthening URLs
+*/
+class Slinky_Snipr extends Slinky_Service {
+ // Snipurl, Snurl, Snipr, Sn.im
+ function url_is_short( $url ) {
+ return stristr( $url, 'snipr.com/' ) || stristr( $url, 'snipurl.com/' ) || stristr( $url, 'snurl.com/' ) || stristr( $url, 'sn.im/' );
+ }
+
+ function url_is_long( $url ) {
+ return !stristr( $url, 'snipr.com/' ) || !stristr( $url, 'snipurl.com/' ) || !stristr( $url, 'snurl.com/' ) || !stristr( $url, 'sn.im/' );
+ }
+
+ function make_short( $url ) {
+ if ( !$this->get( 'user_id' ) || !$this->get( 'API' ) )
+ return $url;
+
+ $response = $this->url_post( 'http://snipr.com/site/getsnip', array( 'sniplink' => urlencode( $url ), 'snipuser' => $this->get( 'user_id'), 'snipapi' => $this->get( 'API' ), 'snipformat' => 'simple' ) );
+ if ( 'ERROR' != substr( $response, 0, 5 ) )
+ return $response;
+ else
+ return $url;
+ }
+}
+
+// If you're testing things out, http://dentedreality.com.au/ should convert to:
+// - http://tinyurl.com/jw5sh
+// - http://bit.ly/hEkAD
+// - http://tr.im/sk1H
+// - http://is.gd/1yJ81
+// - http://fon.gs/tc1p8c
+// - http://micurl.com/qen3uub
+// - http://ur1.ca/7dcd
+// - http://ptiturl.com/?id=bac8fb
+// - http://tighturl.com/kgd
+// - http://snipr.com/nbbw3
+//
+// $slinky = new Slinky( 'http://dentedreality.com.au/' );
+// echo $slinky->short();
diff --git a/addon/twitter/twitter.css b/addon/twitter/twitter.css
new file mode 100644
index 000000000..899cfd173
--- /dev/null
+++ b/addon/twitter/twitter.css
@@ -0,0 +1,41 @@
+
+
+#twitter-avatar {
+ float: left;
+ width: 48px;
+ height: 48px;
+ padding: 2px;
+}
+#twitter-info-block {
+ height: 52px;
+ vertical-align: middle;
+}
+#twitter-disconnect-label {
+ float: left;
+ width: 200px;
+ margin-bottom: 25px;
+}
+
+#twitter-disconnect {
+ float: left;
+}
+#twitter-enable-label {
+ float: left;
+ width: 200px;
+ margin-bottom: 5px;
+}
+
+#twitter-checkbox {
+ float: left;
+}
+#twitter-pin-label {
+ float: left;
+ width: 200px;
+ margin-bottom: 25px;
+}
+
+#twitter-pin {
+ float: left;
+}
+
+
diff --git a/addon/twitter/twitter.php b/addon/twitter/twitter.php
index 9fccefbee..0b706f9b1 100644
--- a/addon/twitter/twitter.php
+++ b/addon/twitter/twitter.php
@@ -1,16 +1,197 @@
config['twitter']['consumerkey'] = 'your consumer_key here';
+ * $a->config['twitter']['consumersecret'] = 'your consumer_secret here';
+ *
+ * To activate the plugin itself add it to the $a->config['system']['addon']
+ * 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__
+ *
+ * - what about multimedia content?
+ * so far we just strip HTML tags from the message
+ */
function twitter_install() {
+ // we need some hooks, for the configuration and for sending tweets
+ 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');
+ register_hook('post_local_start', 'addon/twitter/twitter.php', 'twitter_post_start');
+ logger("installed twitter");
}
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');
+ unregister_hook('post_local_start', 'addon/twitter/twitter.php', 'twitter_post_start');
+
+}
+
+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)) ? ' selected="selected" ' : '');
+ $b .= ''. t('Twitter Posting Settings') .'
';
+
+ if ( (!$ckey) && (!$csecret) ) {
+ /***
+ * no global consumer keys
+ * display warning and skip personal config
+ */
+ $s .= '
';
+ $s .= '
'.$details->description.'
\r\n" );
@@ -195,7 +195,7 @@ class App {
public $hooks;
public $timezone;
public $interactive = true;
-
+ public $plugins;
private $scheme;
private $hostname;
@@ -305,9 +305,9 @@ class App {
$this->scheme = $parsed['scheme'];
$this->hostname = $parsed['host'];
- if($parsed['port'])
+ if(x($parsed,'port'))
$this->hostname .= ':' . $parsed['port'];
- if($parsed['path'])
+ if(x($parsed,'path'))
$this->path = trim($parsed['path'],'\\/');
}
@@ -478,6 +478,8 @@ function check_config(&$a) {
if($plugins)
$plugins_arr = explode(',',str_replace(' ', '',$plugins));
+ $a->plugins = $plugins_arr;
+
$installed_arr = array();
if(count($installed)) {
@@ -514,6 +516,7 @@ function check_config(&$a) {
}
}
}
+ load_hooks();
return;
}}
@@ -1378,10 +1381,12 @@ function webfinger($s) {
logger('webfinger: lrdd template: ' . $tpl);
if(strlen($tpl)) {
$pxrd = str_replace('{uri}', urlencode('acct:'.$s), $tpl);
+ logger('webfinger: pxrd: ' . $pxrd);
$links = fetch_xrd_links($pxrd);
if(! count($links)) {
// try with double slashes
$pxrd = str_replace('{uri}', urlencode('acct://'.$s), $tpl);
+ logger('webfinger: pxrd: ' . $pxrd);
$links = fetch_xrd_links($pxrd);
}
return $links;
@@ -1453,6 +1458,7 @@ function fetch_lrdd_template($host) {
$tpl = '';
$url = 'http://' . $host . '/.well-known/host-meta' ;
$links = fetch_xrd_links($url);
+logger('template: ' . print_r($links,true));
if(count($links)) {
foreach($links as $link)
if($link['@attributes']['rel'] && $link['@attributes']['rel'] === 'lrdd')
@@ -1479,15 +1485,30 @@ function fetch_xrd_links($url) {
$h = simplexml_load_string($xml);
$arr = convert_xml_element_to_array($h);
+ $links = array();
+
if(isset($arr['xrd']['link'])) {
$link = $arr['xrd']['link'];
if(! isset($link[0]))
$links = array($link);
else
$links = $link;
- return $links;
}
- return array();
+ if(isset($arr['xrd']['alias'])) {
+ $alias = $arr['xrd']['alias'];
+ if(! isset($alias[0]))
+ $aliases = array($alias);
+ else
+ $aliases = $alias;
+ foreach($aliases as $alias) {
+ $links[]['@attributes'] = array('rel' => 'alias' , 'href' => $alias);
+ }
+ }
+
+ logger('fetch_xrd_links: ' . print_r($links,true), LOGGER_DATA);
+
+ return $links;
+
}}
// Convert an ACL array to a storable string
@@ -2079,7 +2100,7 @@ function profile_sidebar($profile) {
$tabs = '';
- $photo = '$1
' ,$Text);
diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index 6af8df824..734282d95 100644
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -7,10 +7,15 @@
function html2bbcode($s) {
+
+ // only keep newlines from source that are within pre tags
+
+ $s = stripnl_exceptinpre($s);
+
+
// Tags to Find
$htmltags = array(
- '/\n/is',
'/\ tag
+ if(strpos($string, '
') === false)
+ {
+ return str_replace("\n","", $string);
+ }
+
+ // If there is a , we have to split by line
+ // and manually replace the linebreaks
+
+ $strArr=explode("\n", $string);
+
+ $output="";
+ $preFound=false;
+
+ // Loop over each line
+ foreach($strArr as $line)
+ { // See if the line has a . If it does, set $preFound to true
+ if(strpos($line, "
") !== false)
+ {
+ $preFound=true;
+ }
+ elseif(strpos($line, "") !== false)
+ {
+ $preFound=false;
+ }
+
+ // If we are in a pre tag, add line and also add \n, else add the line without \n
+ if($preFound)
+ {
+ $output .= $line . "\n";
+ }
+ else
+ {
+ $output .= $line ;
+ }
+ }
+
+ return $output;
}
diff --git a/include/items.php b/include/items.php
index cffd13a01..b5bdd7833 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1128,15 +1128,16 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0) {
}
if(($is_reply) && is_array($contact)) {
-
+
// Have we seen it? If not, import it.
$item_id = $item->get_id();
-
+
$r = q("SELECT `uid`, `last-child`, `edited` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($item_id),
intval($importer['uid'])
);
+
// FIXME update content if 'updated' changes
if(count($r)) {
$allow = $item->get_item_tags( NAMESPACE_DFRN, 'comment-allow');
@@ -1155,6 +1156,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0) {
}
continue;
}
+
$datarray = get_atom_elements($feed,$item);
$force_parent = false;
if($contact['network'] === 'stat') {
diff --git a/include/notifier.php b/include/notifier.php
index b6c4ca571..648a07062 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -40,6 +40,7 @@ function notifier_run($argv, $argc){
break;
}
+ $top_level = false;
$recipients = array();
$url_recipients = array();
@@ -79,12 +80,16 @@ function notifier_run($argv, $argc){
return;
}
+
// avoid race condition with deleting entries
if($items[0]['deleted']) {
foreach($items as $item)
$item['deleted'] = 1;
}
+
+ if(count($items) == 1 && $items[0]['uri'] === $items[0]['parent-uri'])
+ $top_level = true;
}
$r = q("SELECT `contact`.*, `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, `user`.`page-flags`
@@ -167,9 +172,6 @@ function notifier_run($argv, $argc){
$r = q("SELECT * FROM `contact` WHERE `id` IN ( $conversant_str ) AND `blocked` = 0 AND `pending` = 0");
-// if( ! count($r)){
-// return;
-// }
if(count($r))
$contacts = $r;
@@ -242,12 +244,8 @@ function notifier_run($argv, $argc){
$atom .= atom_entry($item,'text',$contact,$owner,true);
- // There's a problem here - we *were* going to use salmon to provide semi-authenticated
- // communication to OStatus, but unless we're the item author they won't verify.
- // commented out for now, though we'll still send local replies (and any mentions
- // that they contain) upstream. Rethinking the problem space.
-
-// $slaps[] = atom_entry($item,'html',$contact,$owner,true);
+ if(($top_level) && ($notify_hub) && ($item['author-link'] === $item['owner-link']))
+ $slaps[] = atom_entry($item,'html',$contact,$owner,true);
}
}
}
@@ -255,7 +253,7 @@ function notifier_run($argv, $argc){
logger('notifier: ' . $atom, LOGGER_DATA);
-// logger('notifier: slaps: ' . print_r($slaps,true), LOGGER_DATA);
+ logger('notifier: slaps: ' . print_r($slaps,true), LOGGER_DATA);
if($followup)
$recip_str = $parent['contact-id'];
diff --git a/include/oembed.php b/include/oembed.php
index 37923a877..4d6b0af16 100644
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -79,7 +79,10 @@ function oe_get_inner_html( $node ) {
* and replace it with [embed]url[/embed]
*/
function oembed_html2bbcode($text) {
- $dom = DOMDocument::loadHTML($text);
+ // If it doesn't parse at all, just return the text.
+ $dom = @DOMDocument::loadHTML($text);
+ if(! $dom)
+ return $text;
$xpath = new DOMXPath($dom);
$attr = "oembed";
diff --git a/index.php b/index.php
index 5f128ebb1..661676bfd 100644
--- a/index.php
+++ b/index.php
@@ -134,11 +134,16 @@ else
if(strlen($a->module)) {
- if(file_exists("mod/{$a->module}.php")) {
+ if(is_array($a->plugins) && in_array($a->module,$a->plugins) && file_exists("addon/{$a->module}/{$a->module}.php")) {
+ include("addon/{$a->module}/{$a->module}.php");
+ if(function_exists($a->module . '_module'))
+ $a->module_loaded = true;
+ }
+ if((! $a->module_loaded) && (file_exists("mod/{$a->module}.php"))) {
include("mod/{$a->module}.php");
$a->module_loaded = true;
}
- else {
+ if(! $a->module_loaded) {
if((x($_SERVER,'QUERY_STRING')) && ($_SERVER['QUERY_STRING'] === 'q=internal_error.html') && isset($dreamhost_error_hack)) {
logger('index.php: dreamhost_error_hack invoked. Original URI =' . $_SERVER['REQUEST_URI']);
goaway($a->get_baseurl() . $_SERVER['REQUEST_URI']);
diff --git a/mod/cb.php b/mod/cb.php
new file mode 100644
index 000000000..6375d2398
--- /dev/null
+++ b/mod/cb.php
@@ -0,0 +1,24 @@
+get_baseurl() . "/" . $_POST['return'] );
}
$parent_item = $r[0];
+ if($parent_item['contact-id'] && $uid) {
+ $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ intval($parent_item['contact-id']),
+ intval($uid)
+ );
+ if(count($r))
+ $parent_contact = $r[0];
+ }
}
$profile_uid = ((x($_POST,'profile_uid')) ? intval($_POST['profile_uid']) : 0);
@@ -185,8 +196,13 @@ function item_post(&$a) {
$str_tags = '';
$inform = '';
+
$tags = get_tags($body);
+ if(($parent_contact) && ($parent_contact['network'] === 'stat') && ($parent_contact['nick']) && (! in_array('@' . $parent_contact['nick'],$tags))) {
+ $body = '@' . $parent_contact['nick'] . ' ' . $body;
+ $tags[] = '@' . $parent_contact['nick'];
+ }
if(count($tags)) {
foreach($tags as $tag) {
@@ -199,6 +215,7 @@ function item_post(&$a) {
continue;
}
if(strpos($tag,'@') === 0) {
+ $stat = false;
$name = substr($tag,1);
if((strpos($name,'@')) || (strpos($name,'http://'))) {
$newname = $name;
@@ -232,7 +249,12 @@ function item_post(&$a) {
}
if(count($r)) {
$profile = $r[0]['url'];
- $newname = $r[0]['name'];
+ if($r[0]['network'] === 'stat') {
+ $newname = $r[0]['nick'];
+ $stat = true;
+ }
+ else
+ $newname = $r[0]['name'];
if(strlen($inform))
$inform .= ',';
$inform .= 'cid:' . $r[0]['id'];
@@ -249,6 +271,8 @@ function item_post(&$a) {
}
}
+
+
$wall = 0;
if($post_type === 'wall' || $post_type === 'wall-comment')
$wall = 1;
diff --git a/mod/network.php b/mod/network.php
index b0196f92a..f11db45a8 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -79,8 +79,10 @@ function network_content(&$a, $update = 0) {
$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
- $jotplugins = "";
+ $jotplugins = '';
+ $jotnets = '';
call_hooks('jot_tool', $jotplugins);
+ call_hooks('jot_networks', $jotnets);
$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
@@ -90,6 +92,7 @@ function network_content(&$a, $update = 0) {
'$defloc' => $a->user['default-location'],
'$visitor' => 'block',
'$emailcc' => t('CC: email addresses'),
+ '$jotnets' => $jotnets,
'$emtitle' => t('Example: bob@example.com, mary@example.com'),
'$lockstate' => $lockstate,
'$acl' => populate_acl((($group) ? $group_acl : $a->user), $celeb),
diff --git a/mod/profile.php b/mod/profile.php
index 3b4616a34..8ec29d382 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -135,9 +135,12 @@ function profile_content(&$a, $update = 0) {
else
$lockstate = 'unlock';
- $jotplugins = "";
+ $jotplugins = '';
+ $jotnets = '';
call_hooks('jot_tool', $jotplugins);
+ call_hooks('jot_networks', $jotnets);
+
$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
$o .= replace_macros($tpl,array(
@@ -147,6 +150,7 @@ function profile_content(&$a, $update = 0) {
'$visitor' => (($is_owner || $commvisitor) ? 'block' : 'none'),
'$lockstate' => $lockstate,
'$emailcc' => t('CC: email addresses'),
+ '$jotnets' => $jotnets,
'$emtitle' => t('Example: bob@example.com, mary@example.com'),
'$bang' => '',
'$acl' => (($is_owner) ? populate_acl($a->user, $celeb) : ''),
diff --git a/mod/pubsub.php b/mod/pubsub.php
index 4f4ed2f16..df27c6bc2 100644
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -105,8 +105,10 @@ function pubsub_post(&$a) {
intval($contact_id),
intval($importer['uid'])
);
- if(! count($r))
+ if(! count($r)) {
+ logger('pubsub: no contact record - ignored');
hub_post_return();
+ }
$contact = $r[0];
diff --git a/mod/salmon.php b/mod/salmon.php
index 8c7d921c8..885ba470c 100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -177,7 +177,7 @@ function salmon_post(&$a) {
*
*/
- $r = q("SELECT * FROM `contact` WHERE `network` = 'stat' AND ( `url` = '%s' OR `lrdd` = '%s')
+ $r = q("SELECT * FROM `contact` WHERE `network` = 'stat' AND ( `url` = '%s' OR `alias` = '%s')
AND `uid` = %d LIMIT 1",
dbesc($author_link),
dbesc($author_link),
diff --git a/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js b/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
index ebccfb311..aad83280d 100644
--- a/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
+++ b/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
@@ -103,7 +103,7 @@
rep(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,"");
rep(/\[img\](.*?)\[\/img\]/gi,"
");
rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"$2");
-// rep(/\[\/code\]\s*\[code\]/gi,"
"); // fold multiline code
+ rep(/\[size=(.*?)\](.*?)\[\/size\]/gi,"$2");
rep(/\[code\](.*?)\[\/code\]/gi,"$1");
rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"$1
");
diff --git a/update.php b/update.php
index e51e8ac33..84eaebe18 100644
--- a/update.php
+++ b/update.php
@@ -363,3 +363,10 @@ function update_1036() {
}
}
}
+
+function update_1037() {
+
+ q("ALTER TABLE `contact` CHANGE `lrdd` `alias` CHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL ");
+
+}
+
diff --git a/util/strings.php b/util/strings.php
index 762c68d2b..b6360e971 100644
--- a/util/strings.php
+++ b/util/strings.php
@@ -57,6 +57,18 @@ $a->strings['December'] = 'December';
$a->strings['Birthdays this week:'] = 'Birthdays this week:';
$a->strings["\x28Adjusted for local time\x29"] = "\x28Adjusted for local time\x29";
$a->strings['[today]'] = '[today]';
+$a->strings['Unable to locate original post.'] = 'Unable to locate original post.';
+$a->strings['Empty post discarded.'] = 'Empty post discarded.';
+$a->strings['Wall Photos'] = 'Wall Photos';
+$a->strings[" commented on your item at "] = " commented on your item at ";
+$a->strings[" posted on your profile wall at "] = " posted on your profile wall at ";
+$a->strings['System error. Post not saved.'] = 'System error. Post not saved.';
+$a->strings['This message was sent to you by '] = 'This message was sent to you by ';
+$a->strings[', a member of the Friendika social network.'] = ', a member of the Friendika social network.';
+$a->strings['You may visit them online at'] = 'You may visit them online at';
+$a->strings['Please contact the sender by replying to this post if you do not wish to receive these messages.'] = 'Please contact the sender by replying to this post if you do not wish to receive these messages.';
+$a->strings['posted an update.'] = 'posted an update.';
+$a->strings['Item not found.'] = 'Item not found.';
$a->strings["Invite Friends"] = "Invite Friends";
$a->strings['Connect/Follow [profile address]'] = 'Connect/Follow [profile address]';
$a->strings['Example: bob@example.com, http://example.com/barbara'] = 'Example: bob@example.com, http://example.com/barbara';
@@ -76,6 +88,9 @@ $a->strings['Contact not found.'] = 'Contact not found.';
$a->strings['Mutual Friendship'] = 'Mutual Friendship';
$a->strings['is a fan of yours'] = 'is a fan of yours';
$a->strings['you are a fan of'] = 'you are a fan of';
+$a->strings['Never'] = 'Never';
+$a->strings["\x28Update was successful\x29"] = "\x28Update was successful\x29";
+$a->strings["\x28Update was not successful\x29"] = "\x28Update was not successful\x29";
$a->strings['Contact Editor'] = 'Contact Editor';
$a->strings['Visit $name\'s profile'] = 'Visit $name\'s profile';
$a->strings['Block/Unblock contact'] = 'Block/Unblock contact';
@@ -83,7 +98,6 @@ $a->strings['Ignore contact'] = 'Ignore contact';
$a->strings['Delete contact'] = 'Delete contact';
$a->strings['Last updated: '] = 'Last updated: ';
$a->strings['Update public posts: '] = 'Update public posts: ';
-$a->strings['Never'] = 'Never';
$a->strings['Update now'] = 'Update now';
$a->strings['Unblock this contact'] = 'Unblock this contact';
$a->strings['Block this contact'] = 'Block this contact';
@@ -159,7 +173,6 @@ $a->strings['Your profile address:'] = 'Your profile address:';
$a->strings['Submit Request'] = 'Submit Request';
$a->strings['Cancel'] = 'Cancel';
$a->strings['Global Directory'] = 'Global Directory';
-$a->strings['Item not found.'] = 'Item not found.';
$a->strings['Private Message'] = 'Private Message';
$a->strings['This is you'] = 'This is you';
$a->strings['View $name\'s profile'] = 'View $name\'s profile';
@@ -215,16 +228,6 @@ $a->strings['Your message:'] = 'Your message:';
$a->strings['Please join my social network on '] = 'Please join my social network on ';
$a->strings['To accept this invitation, please visit:'] = 'To accept this invitation, please visit:';
$a->strings['Once you have registered, please connect with me via my profile page at:'] = 'Once you have registered, please connect with me via my profile page at:';
-$a->strings['Unable to locate original post.'] = 'Unable to locate original post.';
-$a->strings['Empty post discarded.'] = 'Empty post discarded.';
-$a->strings['Wall Photos'] = 'Wall Photos';
-$a->strings[" commented on your item at "] = " commented on your item at ";
-$a->strings[" posted on your profile wall at "] = " posted on your profile wall at ";
-$a->strings['This message was sent to you by '] = 'This message was sent to you by ';
-$a->strings[', a member of the Friendika social network.'] = ', a member of the Friendika social network.';
-$a->strings['You may visit them online at'] = 'You may visit them online at';
-$a->strings['Please contact the sender by replying to this post if you do not wish to receive these messages.'] = 'Please contact the sender by replying to this post if you do not wish to receive these messages.';
-$a->strings['posted an update.'] = 'posted an update.';
$a->strings['photo'] = 'photo';
$a->strings['status'] = 'status';
$a->strings['likes'] = 'likes';
@@ -490,6 +493,23 @@ $a->strings['File has an invalid extension, it should be one of '] = 'File has a
$a->strings['Upload was cancelled, or server error encountered'] = 'Upload was cancelled, or server error encountered';
$a->strings['Randplace Settings'] = 'Randplace Settings';
$a->strings['Enable Randplace Plugin'] = 'Enable Randplace Plugin';
+$a->strings['No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation.'] = 'No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation.';
+$a->strings['OAuth Consumer Key'] = 'OAuth Consumer Key';
+$a->strings['OAuth Consumer Secret'] = 'OAuth Consumer Secret';
+$a->strings['Base API Path (remember the trailing /] = 'Base API Path (remember the trailing /;
+$a->strings['To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet.'] = 'To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet.';
+$a->strings['Log in with StatusNet'] = 'Log in with StatusNet';
+$a->strings['Copy the security code from StatusNet here'] = 'Copy the security code from StatusNet here';
+$a->strings['Currently connected to: '] = 'Currently connected to: ';
+$a->strings['If enabled all your public postings will be posted to the associated StatusNet account as well.'] = 'If enabled all your public postings will be posted to the associated StatusNet account as well.';
+$a->strings['Send public postings to StatusNet'] = 'Send public postings to StatusNet';
+$a->strings['Clear OAuth configuration'] = 'Clear OAuth configuration';
+$a->strings['Twitter Posting Settings'] = 'Twitter Posting Settings';
+$a->strings['No consumer key pair for Twitter found. Please contact your site administrator.'] = 'No consumer key pair for Twitter found. Please contact your site administrator.';
+$a->strings['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.'] = '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.';
+$a->strings['Copy the PIN from Twitter here'] = 'Copy the PIN from Twitter here';
+$a->strings['If enabled all your public postings will be posted to the associated Twitter account as well.'] = 'If enabled all your public postings will be posted to the associated Twitter account as well.';
+$a->strings['Send public postings to Twitter'] = 'Send public postings to Twitter';
$a->strings['Africa/Abidjan'] = 'Africa/Abidjan';
$a->strings['Africa/Accra'] = 'Africa/Accra';
$a->strings['Africa/Addis_Ababa'] = 'Africa/Addis_Ababa';
diff --git a/util/typo.php b/util/typo.php
index be5307ab3..d0ecf0c8f 100644
--- a/util/typo.php
+++ b/util/typo.php
@@ -21,6 +21,6 @@
foreach($files as $file)
include_once($file);
- $files = glob('addon/*.php');
+ $files = glob('addon/*/*.php');
foreach($files as $file)
include_once($file);
diff --git a/view/comment_item.tpl b/view/comment_item.tpl
index 1b1f3a49e..6f63e39b7 100644
--- a/view/comment_item.tpl
+++ b/view/comment_item.tpl
@@ -1,9 +1,9 @@
$bang$bang$bang$bang
