X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=statusnet%2Fstatusnet.php;h=f7158a40187c73b7e9f68b7db3c210bb530eb9b2;hb=c3e93f1ed9a487f823bcc75ddd43024334c25bfc;hp=1109a0f2cb1ff9ccb69fa38f0ad75f6d28f178f2;hpb=b34489d5c1e3242eb00ac1620a6cef262954264f;p=friendica-addons.git

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 1109a0f2..f7158a40 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Name: StatusNet Connector
- * Description: Relay public postings to a connected StatusNet account
+ * Name: GNU Social Connector
+ * Description: Bidirectional (posting, relaying and reading) connector for GNU Social.
  * Version: 1.0.5
  * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
@@ -35,7 +35,7 @@
 
 
 /***
- * We have to alter the TwitterOAuth class a little bit to work with any StatusNet
+ * We have to alter the TwitterOAuth class a little bit to work with any GNU Social
  * installation abroad. Basically it's only make the API path variable and be happy.
  *
  * Thank you guys for the Twitter compatible API!
@@ -44,6 +44,11 @@
 define('STATUSNET_DEFAULT_POLL_INTERVAL', 5); // given in minutes
 
 require_once('library/twitteroauth.php');
+require_once('include/enotify.php');
+require_once("include/socgraph.php");
+
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
 
 class StatusNetOAuth extends TwitterOAuth {
     function get_maxlength() {
@@ -69,11 +74,11 @@ class StatusNetOAuth extends TwitterOAuth {
     $this->http_info = array();
     $ci = curl_init();
     /* Curl settings */
-    $prx = get_config('system','proxy');
+    $prx = Config::get('system','proxy');
     if(strlen($prx)) {
 	curl_setopt($ci, CURLOPT_HTTPPROXYTUNNEL, 1);
 	curl_setopt($ci, CURLOPT_PROXY, $prx);
-	$prxusr = get_config('system','proxyuser');
+	$prxusr = Config::get('system','proxyuser');
 	if(strlen($prxusr))
 	    curl_setopt($ci, CURLOPT_PROXYUSERPWD, $prxusr);
     }
@@ -118,7 +123,9 @@ function statusnet_install() {
 	register_hook('post_local', 'addon/statusnet/statusnet.php', 'statusnet_post_local');
 	register_hook('jot_networks',    'addon/statusnet/statusnet.php', 'statusnet_jot_nets');
 	register_hook('cron', 'addon/statusnet/statusnet.php', 'statusnet_cron');
-	logger("installed statusnet");
+	register_hook('prepare_body', 'addon/statusnet/statusnet.php', 'statusnet_prepare_body');
+	register_hook('check_item_notification','addon/statusnet/statusnet.php', 'statusnet_check_item_notification');
+	logger("installed GNU Social");
 }
 
 
@@ -129,6 +136,8 @@ function statusnet_uninstall() {
 	unregister_hook('post_local', 'addon/statusnet/statusnet.php', 'statusnet_post_local');
 	unregister_hook('jot_networks',    'addon/statusnet/statusnet.php', 'statusnet_jot_nets');
 	unregister_hook('cron', 'addon/statusnet/statusnet.php', 'statusnet_cron');
+	unregister_hook('prepare_body', 'addon/statusnet/statusnet.php', 'statusnet_prepare_body');
+	unregister_hook('check_item_notification','addon/statusnet/statusnet.php', 'statusnet_check_item_notification');
 
 	// old setting - remove only
 	unregister_hook('post_local_end', 'addon/statusnet/statusnet.php', 'statusnet_post_hook');
@@ -137,29 +146,33 @@ function statusnet_uninstall() {
 
 }
 
+function statusnet_check_item_notification($a, &$notification_data) {
+	$notification_data["profiles"][] = PConfig::get($notification_data["uid"], 'statusnet', 'own_url');
+}
+
 function statusnet_jot_nets(&$a,&$b) {
 	if(! local_user())
 		return;
 
-	$statusnet_post = get_pconfig(local_user(),'statusnet','post');
+	$statusnet_post = PConfig::get(local_user(),'statusnet','post');
 	if(intval($statusnet_post) == 1) {
-		$statusnet_defpost = get_pconfig(local_user(),'statusnet','post_by_default');
+		$statusnet_defpost = PConfig::get(local_user(),'statusnet','post_by_default');
 		$selected = ((intval($statusnet_defpost) == 1) ? ' checked="checked" ' : '');
-		$b .= '<div class="profile-jot-net"><input type="checkbox" name="statusnet_enable"' . $selected . ' value="1" /> ' 
-			. t('Post to StatusNet') . '</div>';
+		$b .= '<div class="profile-jot-net"><input type="checkbox" name="statusnet_enable"' . $selected . ' value="1" /> '
+			. t('Post to GNU Social') . '</div>';
 	}
 }
 
 function statusnet_settings_post ($a,$post) {
 	if(! local_user())
 		return;
-	// don't check statusnet settings if statusnet submit button is not clicked
+	// don't check GNU Social settings if GNU Social submit button is not clicked
 	if (!x($_POST,'statusnet-submit'))
 		return;
 
 	if (isset($_POST['statusnet-disconnect'])) {
 		/***
-		 * if the statusnet-disconnect checkbox is set, clear the statusnet configuration
+		 * if the GNU Social-disconnect checkbox is set, clear the GNU Social configuration
 		 */
 		del_pconfig(local_user(), 'statusnet', 'consumerkey');
 		del_pconfig(local_user(), 'statusnet', 'consumersecret');
@@ -168,30 +181,28 @@ function statusnet_settings_post ($a,$post) {
 		del_pconfig(local_user(), 'statusnet', 'oauthtoken');
 		del_pconfig(local_user(), 'statusnet', 'oauthsecret');
 		del_pconfig(local_user(), 'statusnet', 'baseapi');
-		del_pconfig(local_user(), 'statusnet', 'post_taglinks');
 		del_pconfig(local_user(), 'statusnet', 'lastid');
 		del_pconfig(local_user(), 'statusnet', 'mirror_posts');
-		del_pconfig(local_user(), 'statusnet', 'intelligent_shortening');
 		del_pconfig(local_user(), 'statusnet', 'import');
-        	del_pconfig(local_user(), 'statusnet', 'create_user');
-        	del_pconfig(local_user(), 'statusnet', 'own_id');
+		del_pconfig(local_user(), 'statusnet', 'create_user');
+		del_pconfig(local_user(), 'statusnet', 'own_id');
 	} else {
 	if (isset($_POST['statusnet-preconf-apiurl'])) {
 		/***
-		 * If the user used one of the preconfigured StatusNet server credentials
+		 * If the user used one of the preconfigured GNU Social server credentials
 		 * use them. All the data are available in the global config.
 		 * Check the API Url never the less and blame the admin if it's not working ^^
 		 */
-		$globalsn = get_config('statusnet', 'sites');
+		$globalsn = Config::get('statusnet', 'sites');
 		foreach ( $globalsn as $asn) {
 			if ($asn['apiurl'] == $_POST['statusnet-preconf-apiurl'] ) {
 				$apibase = $asn['apiurl'];
 				$c = fetch_url( $apibase . 'statusnet/version.xml' );
 				if (strlen($c) > 0) {
-					set_pconfig(local_user(), 'statusnet', 'consumerkey', $asn['consumerkey'] );
-					set_pconfig(local_user(), 'statusnet', 'consumersecret', $asn['consumersecret'] );
-					set_pconfig(local_user(), 'statusnet', 'baseapi', $asn['apiurl'] );
-					set_pconfig(local_user(), 'statusnet', 'application_name', $asn['applicationname'] );
+					PConfig::set(local_user(), 'statusnet', 'consumerkey', $asn['consumerkey'] );
+					PConfig::set(local_user(), 'statusnet', 'consumersecret', $asn['consumersecret'] );
+					PConfig::set(local_user(), 'statusnet', 'baseapi', $asn['apiurl'] );
+					//PConfig::set(local_user(), 'statusnet', 'application_name', $asn['applicationname'] );
 				} else {
 					notice( t('Please contact your site administrator.<br />The provided API URL is not valid.').EOL.$asn['apiurl'].EOL );
 				}
@@ -200,61 +211,63 @@ function statusnet_settings_post ($a,$post) {
 		goaway($a->get_baseurl().'/settings/connectors');
 	} else {
 	if (isset($_POST['statusnet-consumersecret'])) {
-		//  check if we can reach the API of the StatusNet server
+		//  check if we can reach the API of the GNU Social server
 		//  we'll check the API Version for that, if we don't get one we'll try to fix the path but will
 		//  resign quickly after this one try to fix the path ;-)
 		$apibase = $_POST['statusnet-baseapi'];
 		$c = fetch_url( $apibase . 'statusnet/version.xml' );
 		if (strlen($c) > 0) {
 			//  ok the API path is correct, let's save the settings
-			set_pconfig(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
-			set_pconfig(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']);
-			set_pconfig(local_user(), 'statusnet', 'baseapi', $apibase );
-			set_pconfig(local_user(), 'statusnet', 'application_name', $_POST['statusnet-applicationname'] );
+			PConfig::set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
+			PConfig::set(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']);
+			PConfig::set(local_user(), 'statusnet', 'baseapi', $apibase );
+			//PConfig::set(local_user(), 'statusnet', 'application_name', $_POST['statusnet-applicationname'] );
 		} else {
 			//  the API path is not correct, maybe missing trailing / ?
 			$apibase = $apibase . '/';
 			$c = fetch_url( $apibase . 'statusnet/version.xml' );
 			if (strlen($c) > 0) {
 				//  ok the API path is now correct, let's save the settings
-				set_pconfig(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
-				set_pconfig(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']);
-				set_pconfig(local_user(), 'statusnet', 'baseapi', $apibase );
+				PConfig::set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
+				PConfig::set(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']);
+				PConfig::set(local_user(), 'statusnet', 'baseapi', $apibase );
 			} else {
 				//  still not the correct API base, let's do noting
-				notice( t('We could not contact the StatusNet API with the Path you entered.').EOL );
+				notice( t('We could not contact the GNU Social API with the Path you entered.').EOL );
 			}
 		}
 		goaway($a->get_baseurl().'/settings/connectors');
 	} else {
 	if (isset($_POST['statusnet-pin'])) {
-		//  if the user supplied us with a PIN from StatusNet, let the magic of OAuth happen
-		$api     = get_pconfig(local_user(), 'statusnet', 'baseapi');
-		$ckey    = get_pconfig(local_user(), 'statusnet', 'consumerkey'  );
-		$csecret = get_pconfig(local_user(), 'statusnet', 'consumersecret' );
+		//  if the user supplied us with a PIN from GNU Social, let the magic of OAuth happen
+		$api     = PConfig::get(local_user(), 'statusnet', 'baseapi');
+		$ckey    = PConfig::get(local_user(), 'statusnet', 'consumerkey'  );
+		$csecret = PConfig::get(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 StatusNet using these token
+		//  form as token and token2, we need a new connection to GNU Social 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);
-		set_pconfig(local_user(),'statusnet', 'post_taglinks', 1);
+		PConfig::set(local_user(),'statusnet', 'oauthtoken',  $token['oauth_token']);
+		PConfig::set(local_user(),'statusnet', 'oauthsecret', $token['oauth_token_secret']);
+		PConfig::set(local_user(),'statusnet', 'post', 1);
+		PConfig::set(local_user(),'statusnet', 'post_taglinks', 1);
 		//  reload the Addon Settings page, if we don't do it see Bug #42
 		goaway($a->get_baseurl().'/settings/connectors');
 	} else {
 		//  if no PIN is supplied in the POST variables, the user has changed the setting
 		//  to post a dent for every new __public__ posting to the wall
-		set_pconfig(local_user(),'statusnet','post',intval($_POST['statusnet-enable']));
-		set_pconfig(local_user(),'statusnet','post_by_default',intval($_POST['statusnet-default']));
-		set_pconfig(local_user(),'statusnet','post_taglinks',intval($_POST['statusnet-sendtaglinks']));
-		set_pconfig(local_user(), 'statusnet', 'mirror_posts', intval($_POST['statusnet-mirror']));
-		set_pconfig(local_user(), 'statusnet', 'intelligent_shortening', intval($_POST['statusnet-shortening']));
-		set_pconfig(local_user(), 'statusnet', 'import', intval($_POST['statusnet-import']));
-		set_pconfig(local_user(), 'statusnet', 'create_user', intval($_POST['statusnet-create_user']));
-		info( t('StatusNet settings updated.') . EOL);
+		PConfig::set(local_user(),'statusnet','post',intval($_POST['statusnet-enable']));
+		PConfig::set(local_user(),'statusnet','post_by_default',intval($_POST['statusnet-default']));
+		PConfig::set(local_user(), 'statusnet', 'mirror_posts', intval($_POST['statusnet-mirror']));
+		PConfig::set(local_user(), 'statusnet', 'import', intval($_POST['statusnet-import']));
+		PConfig::set(local_user(), 'statusnet', 'create_user', intval($_POST['statusnet-create_user']));
+
+		if (!intval($_POST['statusnet-mirror']))
+			del_pconfig(local_user(),'statusnet','lastid');
+
+		info( t('GNU Social settings updated.') . EOL);
 	}}}}
 }
 function statusnet_settings(&$a,&$s) {
@@ -267,53 +280,49 @@ function statusnet_settings(&$a,&$s) {
 	 *    allow the user to cancel the connection process at this step
 	 * 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');
+	$api     = PConfig::get(local_user(), 'statusnet', 'baseapi');
+	$ckey    = PConfig::get(local_user(), 'statusnet', 'consumerkey');
+	$csecret = PConfig::get(local_user(), 'statusnet', 'consumersecret');
+	$otoken  = PConfig::get(local_user(), 'statusnet', 'oauthtoken');
+	$osecret = PConfig::get(local_user(), 'statusnet', 'oauthsecret');
+	$enabled = PConfig::get(local_user(), 'statusnet', 'post');
 	$checked = (($enabled) ? ' checked="checked" ' : '');
-	$defenabled = get_pconfig(local_user(),'statusnet','post_by_default');
+	$defenabled = PConfig::get(local_user(),'statusnet','post_by_default');
 	$defchecked = (($defenabled) ? ' checked="checked" ' : '');
-	$linksenabled = get_pconfig(local_user(),'statusnet','post_taglinks');
-	$linkschecked = (($linksenabled) ? ' checked="checked" ' : '');
-	$mirrorenabled = get_pconfig(local_user(),'statusnet','mirror_posts');
+	$mirrorenabled = PConfig::get(local_user(),'statusnet','mirror_posts');
 	$mirrorchecked = (($mirrorenabled) ? ' checked="checked" ' : '');
-	$shorteningenabled = get_pconfig(local_user(),'statusnet','intelligent_shortening');
-	$shorteningchecked = (($shorteningenabled) ? ' checked="checked" ' : '');
-	$importenabled = get_pconfig(local_user(),'statusnet','import');
-        $importchecked = (($importenabled) ? ' checked="checked" ' : '');
-        $create_userenabled = get_pconfig(local_user(),'statusnet','create_user');
-        $create_userchecked = (($create_userenabled) ? ' checked="checked" ' : '');
+	$import = PConfig::get(local_user(),'statusnet','import');
+	$importselected = array("", "", "");
+	$importselected[$import] = ' selected="selected"';
+	//$importenabled = PConfig::get(local_user(),'statusnet','import');
+	//$importchecked = (($importenabled) ? ' checked="checked" ' : '');
+	$create_userenabled = PConfig::get(local_user(),'statusnet','create_user');
+	$create_userchecked = (($create_userenabled) ? ' checked="checked" ' : '');
 
 	$css = (($enabled) ? '' : '-disabled');
 
-	$globalshortening = get_config('statusnet','intelligent_shortening');
-
-
 	$s .= '<span id="settings_statusnet_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_statusnet_expanded\'); openClose(\'settings_statusnet_inflated\');">';
-	$s .= '<img class="connector'.$css.'" src="images/gnusocial.png" /><h3 class="connector">'. t('StatusNet Import/Export/Mirror').'</h3>';
+	$s .= '<img class="connector'.$css.'" src="images/gnusocial.png" /><h3 class="connector">'. t('GNU Social Import/Export/Mirror').'</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_statusnet_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_statusnet_expanded\'); openClose(\'settings_statusnet_inflated\');">';
-	$s .= '<img class="connector'.$css.'" src="images/gnusocial.png" /><h3 class="connector">'. t('StatusNet Import/Export/Mirror').'</h3>';
+	$s .= '<img class="connector'.$css.'" src="images/gnusocial.png" /><h3 class="connector">'. t('GNU Social Import/Export/Mirror').'</h3>';
 	$s .= '</span>';
 
 	if ( (!$ckey) && (!$csecret) ) {
 		/***
 		 * no consumer keys
 		 */
-		$globalsn = get_config('statusnet', 'sites');
+		$globalsn = Config::get('statusnet', 'sites');
 		/***
-		 * lets check if we have one or more globally configured StatusNet
+		 * lets check if we have one or more globally configured GNU Social
 		 * server OAuth credentials in the configuration. If so offer them
 		 * with a little explanation to the user as choice - otherwise
 		 * ignore this option entirely.
 		 */
 		if (! $globalsn == null) {
-			$s .= '<h4>' . t('Globally Available StatusNet OAuthKeys') . '</h4>';
-			$s .= '<p>'. t("There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance \x28see below\x29.") .'</p>';
+			$s .= '<h4>' . t('Globally Available GNU Social OAuthKeys') . '</h4>';
+			$s .= '<p>'. t("There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance \x28see below\x29.") .'</p>';
 			$s .= '<div id="statusnet-preconf-wrapper">';
 			foreach ($globalsn as $asn) {
 				$s .= '<input type="radio" name="statusnet-preconf-apiurl" value="'. $asn['apiurl'] .'">'. $asn['sitename'] .'<br />';
@@ -322,7 +331,7 @@ function statusnet_settings(&$a,&$s) {
 			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
 		}
 		$s .= '<h4>' . t('Provide your own OAuth Credentials') . '</h4>';
-		$s .= '<p>'. t('No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation.') .'</p>';
+		$s .= '<p>'. t('No consumer key pair for GNU Social found. Register your Friendica Account as an desktop client on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited GNU Social installation.') .'</p>';
 		$s .= '<div id="statusnet-consumer-wrapper">';
 		$s .= '<label id="statusnet-consumerkey-label" for="statusnet-consumerkey">'. t('OAuth Consumer Key') .'</label>';
 		$s .= '<input id="statusnet-consumerkey" type="text" name="statusnet-consumerkey" size="35" /><br />';
@@ -333,8 +342,8 @@ function statusnet_settings(&$a,&$s) {
 		$s .= '<label id="statusnet-baseapi-label" for="statusnet-baseapi">'. t("Base API Path \x28remember the trailing /\x29") .'</label>';
 		$s .= '<input id="statusnet-baseapi" type="text" name="statusnet-baseapi" size="35" /><br />';
 		$s .= '<div class="clear"></div>';
-		$s .= '<label id="statusnet-applicationname-label" for="statusnet-applicationname">'.t('StatusNet application name').'</label>';
-		$s .= '<input id="statusnet-applicationname" type="text" name="statusnet-applicationname" size="35" /><br />';
+		//$s .= '<label id="statusnet-applicationname-label" for="statusnet-applicationname">'.t('GNU Socialapplication name').'</label>';
+		//$s .= '<input id="statusnet-applicationname" type="text" name="statusnet-applicationname" size="35" /><br />';
 		$s .= '<p></p><div class="clear"></div>';
 		$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
 		$s .= '</div>';
@@ -344,10 +353,10 @@ function statusnet_settings(&$a,&$s) {
 		 */
 		if ( (!$otoken) && (!$osecret) ) {
 			/***
-			 * the user has not yet connected the account to statusnet
+			 * the user has not yet connected the account to GNU Social
 			 * get a temporary OAuth key/secret pair and display a button with
 			 * which the user can request a PIN to connect the account to a
-			 * account at statusnet
+			 * account at GNU Social
 			 */
 			$connection = new StatusNetOAuth($api, $ckey, $csecret);
 			$request_token = $connection->getRequestToken('oob');
@@ -355,10 +364,10 @@ function statusnet_settings(&$a,&$s) {
 			/***
 			 *  make some nice form
 			 */
-			$s .= '<p>'. 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 <strong>public</strong> posts will be posted to StatusNet.') .'</p>';
-			$s .= '<a href="'.$connection->getAuthorizeURL($token,False).'" target="_statusnet"><img src="addon/statusnet/signinwithstatusnet.png" alt="'. t('Log in with StatusNet') .'"></a>';
+			$s .= '<p>'. t('To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social.') .'</p>';
+			$s .= '<a href="'.$connection->getAuthorizeURL($token,False).'" target="_statusnet"><img src="addon/statusnet/signinwithstatusnet.png" alt="'. t('Log in with GNU Social') .'"></a>';
 			$s .= '<div id="statusnet-pin-wrapper">';
-			$s .= '<label id="statusnet-pin-label" for="statusnet-pin">'. t('Copy the security code from StatusNet here') .'</label>';
+			$s .= '<label id="statusnet-pin-label" for="statusnet-pin">'. t('Copy the security code from GNU Social here') .'</label>';
 			$s .= '<input id="statusnet-pin" type="text" name="statusnet-pin" />';
 			$s .= '<input id="statusnet-token" type="hidden" name="statusnet-token" value="'.$token.'" />';
 			$s .= '<input id="statusnet-token2" type="hidden" name="statusnet-token2" value="'.$request_token['oauth_token_secret'].'" />';
@@ -366,320 +375,137 @@ function statusnet_settings(&$a,&$s) {
 			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
 			$s .= '<h4>'.t('Cancel Connection Process').'</h4>';
 			$s .= '<div id="statusnet-cancel-wrapper">';
-			$s .= '<p>'.t('Current StatusNet API is').': '.$api.'</p>';
-			$s .= '<label id="statusnet-cancel-label" for="statusnet-cancel">'. t('Cancel StatusNet Connection') . '</label>';
+			$s .= '<p>'.t('Current GNU Social API is').': '.$api.'</p>';
+			$s .= '<label id="statusnet-cancel-label" for="statusnet-cancel">'. t('Cancel GNU Social Connection') . '</label>';
 			$s .= '<input id="statusnet-cancel" type="checkbox" name="statusnet-disconnect" value="1" />';
 			$s .= '</div><div class="clear"></div>';
 			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
 		} else {
 			/***
 			 *  we have an OAuth key / secret pair for the user
-			 *  so let's give a chance to disable the postings to statusnet
+			 *  so let's give a chance to disable the postings to GNU Social
 			 */
 			$connection = new StatusNetOAuth($api,$ckey,$csecret,$otoken,$osecret);
 			$details = $connection->get('account/verify_credentials');
 			$s .= '<div id="statusnet-info" ><img id="statusnet-avatar" src="'.$details->profile_image_url.'" /><p id="statusnet-info-block">'. t('Currently connected to: ') .'<a href="'.$details->statusnet_profile_url.'" target="_statusnet">'.$details->screen_name.'</a><br /><em>'.$details->description.'</em></p></div>';
-			$s .= '<p>'. t('If enabled all your <strong>public</strong> postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.') .'</p>';
+			$s .= '<p>'. t('If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.') .'</p>';
 			if ($a->user['hidewall']) {
-			    $s .= '<p>'. t('<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.') .'</p>';
+			    $s .= '<p>'. t('<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.') .'</p>';
 			}
 			$s .= '<div id="statusnet-enable-wrapper">';
-			$s .= '<label id="statusnet-enable-label" for="statusnet-checkbox">'. t('Allow posting to StatusNet') .'</label>';
+			$s .= '<label id="statusnet-enable-label" for="statusnet-checkbox">'. t('Allow posting to GNU Social') .'</label>';
 			$s .= '<input id="statusnet-checkbox" type="checkbox" name="statusnet-enable" value="1" ' . $checked . '/>';
 			$s .= '<div class="clear"></div>';
-			$s .= '<label id="statusnet-default-label" for="statusnet-default">'. t('Send public postings to StatusNet by default') .'</label>';
+			$s .= '<label id="statusnet-default-label" for="statusnet-default">'. t('Send public postings to GNU Social by default') .'</label>';
 			$s .= '<input id="statusnet-default" type="checkbox" name="statusnet-default" value="1" ' . $defchecked . '/>';
 			$s .= '<div class="clear"></div>';
 
-			$s .= '<label id="statusnet-mirror-label" for="statusnet-mirror">'.t('Mirror all posts from statusnet that are no replies or repeated messages').'</label>';
+			$s .= '<label id="statusnet-mirror-label" for="statusnet-mirror">'.t('Mirror all posts from GNU Social that are no replies or repeated messages').'</label>';
 			$s .= '<input id="statusnet-mirror" type="checkbox" name="statusnet-mirror" value="1" '. $mirrorchecked . '/>';
-			$s .= '<div class="clear"></div>';
-
-			if (!$globalshortening) {
-				$s .= '<label id="statusnet-shortening-label" for="statusnet-shortening">'.t('Shortening method that optimizes the post').'</label>';
-				$s .= '<input id="statusnet-shortening" type="checkbox" name="statusnet-shortening" value="1" '. $shorteningchecked . '/>';
-				$s .= '<div class="clear"></div>';
 
-				$s .= '<label id="statusnet-sendtaglinks-label" for="statusnet-sendtaglinks">'.t('Send linked #-tags and @-names to StatusNet').'</label>';
-				$s .= '<input id="statusnet-sendtaglinks" type="checkbox" name="statusnet-sendtaglinks" value="1" '. $linkschecked . '/>';
-				$s .= '<div class="clear"></div>';
-			}
+			$s .= '<div class="clear"></div>';
 			$s .= '</div>';
 
 			$s .= '<label id="statusnet-import-label" for="statusnet-import">'.t('Import the remote timeline').'</label>';
-                        $s .= '<input id="statusnet-import" type="checkbox" name="statusnet-import" value="1" '. $importchecked . '/>';
-                        $s .= '<div class="clear"></div>';
+			//$s .= '<input id="statusnet-import" type="checkbox" name="statusnet-import" value="1" '. $importchecked . '/>';
+
+			$s .= '<select name="statusnet-import" id="statusnet-import" />';
+			$s .= '<option value="0" '.$importselected[0].'>'.t("Disabled").'</option>';
+			$s .= '<option value="1" '.$importselected[1].'>'.t("Full Timeline").'</option>';
+			$s .= '<option value="2" '.$importselected[2].'>'.t("Only Mentions").'</option>';
+			$s .= '</select>';
+			$s .= '<div class="clear"></div>';
 /*
-                        $s .= '<label id="statusnet-create_user-label" for="statusnet-create_user">'.t('Automatically create contacts').'</label>';
-                        $s .= '<input id="statusnet-create_user" type="checkbox" name="statusnet-create_user" value="1" '. $create_userchecked . '/>';
-                        $s .= '<div class="clear"></div>';
+			$s .= '<label id="statusnet-create_user-label" for="statusnet-create_user">'.t('Automatically create contacts').'</label>';
+			$s .= '<input id="statusnet-create_user" type="checkbox" name="statusnet-create_user" value="1" '. $create_userchecked . '/>';
+			$s .= '<div class="clear"></div>';
 */
 			$s .= '<div id="statusnet-disconnect-wrapper">';
 			$s .= '<label id="statusnet-disconnect-label" for="statusnet-disconnect">'. t('Clear OAuth configuration') .'</label>';
 			$s .= '<input id="statusnet-disconnect" type="checkbox" name="statusnet-disconnect" value="1" />';
 			$s .= '</div><div class="clear"></div>';
-			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>'; 
+			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
 		}
 	}
 	$s .= '</div><div class="clear"></div>';
 }
 
 
-function statusnet_post_local(&$a,&$b) {
-	if($b['edit'])
+function statusnet_post_local(&$a, &$b) {
+	if ($b['edit']) {
 		return;
-
-	if((local_user()) && (local_user() == $b['uid']) && (! $b['private'])) {
-
-		$statusnet_post = get_pconfig(local_user(),'statusnet','post');
-		$statusnet_enable = (($statusnet_post && x($_REQUEST,'statusnet_enable')) ? intval($_REQUEST['statusnet_enable']) : 0);
-
-		// if API is used, default to the chosen settings
-		if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'statusnet','post_by_default')))
-			$statusnet_enable = 1;
-
-		if(! $statusnet_enable)
-			return;
-
-		if(strlen($b['postopts']))
-			$b['postopts'] .= ',';
-		$b['postopts'] .= 'statusnet';
 	}
-}
 
-if (! function_exists( 'short_link' )) {
-function short_link($url) {
-    require_once('library/slinky.php');
-    $slinky = new Slinky( $url );
-    $yourls_url = get_config('yourls','url1');
-    if ($yourls_url) {
-	    $yourls_username = get_config('yourls','username1');
-	    $yourls_password = get_config('yourls', 'password1');
-	    $yourls_ssl = get_config('yourls', 'ssl1');
-	    $yourls = new Slinky_YourLS();
-	    $yourls->set( 'username', $yourls_username );
-	    $yourls->set( 'password', $yourls_password );
-	    $yourls->set( 'ssl', $yourls_ssl );
-	    $yourls->set( 'yourls-url', $yourls_url );
-	    $slinky->set_cascade( array( $yourls, new Slinky_UR1ca(), new Slinky_Trim(), new Slinky_IsGd(), new Slinky_TinyURL() ) );
-    }
-    else {
-	    // 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() ) );
-    }
-    return $slinky->short();
-} };
-
-function statusnet_shortenmsg($b, $max_char) {
-	require_once("include/api.php");
-	require_once("include/bbcode.php");
-	require_once("include/html2plain.php");
-
-	$b['body'] = bb_CleanPictureLinks($b['body']);
-
-	// Looking for the first image
-	$cleaned_body = api_clean_plain_items($b['body']);
-	$image = '';
-	if(preg_match("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/is",$cleaned_body,$matches))
-		$image = $matches[3];
-
-	if ($image == '')
-		if(preg_match("/\[img\](.*?)\[\/img\]/is",$cleaned_body,$matches))
-			$image = $matches[1];
-
-	$multipleimages = (strpos($cleaned_body, "[img") != strrpos($cleaned_body, "[img"));
-
-	// When saved into the database the content is sent through htmlspecialchars
-	// That means that we have to decode all image-urls
-	$image = htmlspecialchars_decode($image);
-
-	$body = $b["body"];
-	if ($b["title"] != "")
-		$body = $b["title"]."\n\n".$body;
-
-	if (strpos($body, "[bookmark") !== false) {
-		// splitting the text in two parts:
-		// before and after the bookmark
-		$pos = strpos($body, "[bookmark");
-		$body1 = substr($body, 0, $pos);
-		$body2 = substr($body, $pos);
-
-		// Removing all quotes after the bookmark
-		// they are mostly only the content after the bookmark.
-		$body2 = preg_replace("/\[quote\=([^\]]*)\](.*?)\[\/quote\]/ism",'',$body2);
-		$body2 = preg_replace("/\[quote\](.*?)\[\/quote\]/ism",'',$body2);
-		$body = $body1.$body2;
+	if (!local_user() || (local_user() != $b['uid'])) {
+		return;
 	}
 
-	// Add some newlines so that the message could be cut better
-	$body = str_replace(array("[quote", "[bookmark", "[/bookmark]", "[/quote]"),
-				array("\n[quote", "\n[bookmark", "[/bookmark]\n", "[/quote]\n"), $body);
-
-	// remove the recycle signs and the names since they aren't helpful on statusnet
-	// recycle 1
-	$recycle = html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8');
-	$body = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', "\n", $body);
-	// recycle 2 (Test)
-	$recycle = html_entity_decode("&#x25CC; ", ENT_QUOTES, 'UTF-8');
-	$body = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', "\n", $body);
-
-	// remove the share element
-	//$body = preg_replace("/\[share(.*?)\](.*?)\[\/share\]/ism","\n\n$2\n\n",$body);
-
-	// At first convert the text to html
-	$html = bbcode(api_clean_plain_items($body), false, false, 2);
-
-	// Then convert it to plain text
-	//$msg = trim($b['title']." \n\n".html2plain($html, 0, true));
-	$msg = trim(html2plain($html, 0, true));
-	$msg = html_entity_decode($msg,ENT_QUOTES,'UTF-8');
-
-	// Removing multiple newlines
-	while (strpos($msg, "\n\n\n") !== false)
-		$msg = str_replace("\n\n\n", "\n\n", $msg);
-
-	// Removing multiple spaces
-	while (strpos($msg, "  ") !== false)
-		$msg = str_replace("  ", " ", $msg);
-
-	$origmsg = $msg;
-
-	// Removing URLs
-	$msg = preg_replace('/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/i', "", $msg);
+	$statusnet_post = PConfig::get(local_user(),'statusnet','post');
+	$statusnet_enable = (($statusnet_post && x($_REQUEST,'statusnet_enable')) ? intval($_REQUEST['statusnet_enable']) : 0);
 
-	$msg = trim($msg);
-
-	$link = '';
-	// look for bookmark-bbcode and handle it with priority
-	if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches))
-		$link = $matches[1];
-
-	$multiplelinks = (strpos($b['body'], "[bookmark") != strrpos($b['body'], "[bookmark"));
-
-	// If there is no bookmark element then take the first link
-	if ($link == '') {
-		$links = collecturls($html);
-		if (sizeof($links) > 0) {
-			reset($links);
-			$link = current($links);
-		}
-		$multiplelinks = (sizeof($links) > 1);
+	// if API is used, default to the chosen settings
+	if ($b['api_source'] && intval(PConfig::get(local_user(),'statusnet','post_by_default'))) {
+		$statusnet_enable = 1;
 	}
 
-	$msglink = "";
-	if ($multiplelinks)
-		$msglink = $b["plink"];
-	else if ($link != "")
-		$msglink = $link;
-	else if ($multipleimages)
-		$msglink = $b["plink"];
-	else if ($image != "")
-		$msglink = $image;
-
-	if (($msglink == "") and strlen($msg) > $max_char)
-		$msglink = $b["plink"];
-
-	// If the message is short enough then don't modify it. (if the link exists in the original message)
-	if ((strlen(trim($origmsg)) <= $max_char) AND (($msglink == "") OR strpos($origmsg, $msglink)))
-		return(array("msg"=>trim($origmsg), "image"=>""));
-
-	// If the message is short enough and contains a picture then post the picture as well
-	if ((strlen(trim($origmsg)) <= ($max_char - 20)) AND strpos($origmsg, $msglink))
-		return(array("msg"=>trim($origmsg), "image"=>$image));
-
-	// If the message is short enough and the link exists in the original message don't modify it as well
-	if ((strlen(trim($origmsg)) <= $max_char) AND strpos($origmsg, $msglink))
-		return(array("msg"=>trim($origmsg), "image"=>""));
-
-	// Preserve the unshortened link
-	$orig_link = $msglink;
-
-	if (strlen($msglink) > 20)
-		$msglink = short_link($msglink);
-
-	if (strlen(trim($msg." ".$msglink)) > $max_char) {
-		$msg = substr($msg, 0, $max_char - (strlen($msglink)));
-		$lastchar = substr($msg, -1);
-		$msg = substr($msg, 0, -1);
-		$pos = strrpos($msg, "\n");
-		if ($pos > 0)
-			$msg = substr($msg, 0, $pos);
-		else if ($lastchar != "\n")
-			$msg = substr($msg, 0, -3)."...";
+	if (!$statusnet_enable) {
+		return;
 	}
-	//$msg = str_replace("\n", " ", $msg);
-
-	// Removing multiple spaces - again
-	while (strpos($msg, "  ") !== false)
-		$msg = str_replace("  ", " ", $msg);
-
-	//return(array("msg"=>trim($msg."\n".$msglink), "image"=>$image));
 
-	// Looking if the link points to an image
-	$img_str = fetch_url($orig_link);
-
-	$tempfile = tempnam(get_config("system","temppath"), "cache");
-	file_put_contents($tempfile, $img_str);
-	$mime = image_type_to_mime_type(exif_imagetype($tempfile));
-	unlink($tempfile);
+	if (strlen($b['postopts'])) {
+		$b['postopts'] .= ',';
+	}
 
-	if (($image == $orig_link) OR (substr($mime, 0, 6) == "image/"))
-		return(array("msg"=>trim($msg), "image"=>$orig_link));
-	else if (($image != $orig_link) AND ($image != "") AND (strlen($msg." ".$msglink) <= ($max_char - 20)))
-		return(array("msg"=>trim($msg." ".$msglink)."\n", "image"=>$image));
-	else
-		return(array("msg"=>trim($msg." ".$msglink), "image"=>""));
+	$b['postopts'] .= 'statusnet';
 }
 
 function statusnet_action($a, $uid, $pid, $action) {
-	$api     = get_pconfig($uid, 'statusnet', 'baseapi');
-	$ckey    = get_pconfig($uid, 'statusnet', 'consumerkey');
-	$csecret = get_pconfig($uid, 'statusnet', 'consumersecret');
-	$otoken  = get_pconfig($uid, 'statusnet', 'oauthtoken');
-	$osecret = get_pconfig($uid, 'statusnet', 'oauthsecret');
+	$api     = PConfig::get($uid, 'statusnet', 'baseapi');
+	$ckey    = PConfig::get($uid, 'statusnet', 'consumerkey');
+	$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
+	$otoken  = PConfig::get($uid, 'statusnet', 'oauthtoken');
+	$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
 
 	$connection = new StatusNetOAuth($api,$ckey,$csecret,$otoken,$osecret);
 
-        logger("statusnet_action '".$action."' ID: ".$pid, LOGGER_DATA);
-
-        switch ($action) {
-                case "delete":
-                        $result = $connection->post("statuses/destroy/".$pid);
-                        break;
-                case "like":
-                        $result = $connection->post("favorites/create/".$pid);
-                        break;
-                case "unlike":
-                        $result = $connection->post("favorites/destroy/".$pid);
-                        break;
-        }
-        logger("statusnet_action '".$action."' send, result: " . print_r($result, true), LOGGER_DEBUG);
+	logger("statusnet_action '".$action."' ID: ".$pid, LOGGER_DATA);
+
+	switch ($action) {
+		case "delete":
+			$result = $connection->post("statuses/destroy/".$pid);
+			break;
+		case "like":
+			$result = $connection->post("favorites/create/".$pid);
+			break;
+		case "unlike":
+			$result = $connection->post("favorites/destroy/".$pid);
+			break;
+	}
+	logger("statusnet_action '".$action."' send, result: " . print_r($result, true), LOGGER_DEBUG);
 }
 
 function statusnet_post_hook(&$a,&$b) {
 
 	/**
-	 * Post to statusnet
+	 * Post to GNU Social
 	 */
 
-	if (!get_pconfig($b["uid"],'statusnet','import')) {
+	if (!PConfig::get($b["uid"],'statusnet','import')) {
 		if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
 			return;
 	}
 
-	$api = get_pconfig($b["uid"], 'statusnet', 'baseapi');
+	$api = PConfig::get($b["uid"], 'statusnet', 'baseapi');
 	$hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $api);
 
 	if($b['parent'] != $b['id']) {
 		logger("statusnet_post_hook: parameter ".print_r($b, true), LOGGER_DATA);
 
-		// Looking if its a reply to a statusnet post
+		// Looking if its a reply to a GNU Social post
 		$hostlength = strlen($hostname) + 2;
-		if ((substr($b["parent-uri"], 0, $hostlength) != $hostname."::") AND (substr($b["extid"], 0, $hostlength) != $hostname."::")
-			AND (substr($b["thr-parent"], 0, $hostlength) != $hostname."::")) {
-			logger("statusnet_post_hook: no statusnet post ".$b["parent"]);
+		if ((substr($b["parent-uri"], 0, $hostlength) != $hostname."::") && (substr($b["extid"], 0, $hostlength) != $hostname."::")
+			&& (substr($b["thr-parent"], 0, $hostlength) != $hostname."::")) {
+			logger("statusnet_post_hook: no GNU Social post ".$b["parent"]);
 			return;
 		}
 
@@ -697,157 +523,97 @@ function statusnet_post_hook(&$a,&$b) {
 			$orig_post = $r[0];
 		}
 
-		$nickname = "@[url=".$orig_post["author-link"]."]".$orig_post["contact_nick"]."[/url]";
-		$nicknameplain = "@".$orig_post["contact_nick"];
+		//$nickname = "@[url=".$orig_post["author-link"]."]".$orig_post["contact_nick"]."[/url]";
+		//$nicknameplain = "@".$orig_post["contact_nick"];
+
+		$nick = preg_replace("=https?://(.*)/(.*)=ism", "$2", $orig_post["author-link"]);
+
+		$nickname = "@[url=".$orig_post["author-link"]."]".$nick."[/url]";
+		$nicknameplain = "@".$nick;
 
 		logger("statusnet_post_hook: comparing ".$nickname." and ".$nicknameplain." with ".$b["body"], LOGGER_DEBUG);
-		if ((strpos($b["body"], $nickname) === false) AND (strpos($b["body"], $nicknameplain) === false))
+		if ((strpos($b["body"], $nickname) === false) && (strpos($b["body"], $nicknameplain) === false))
 			$b["body"] = $nickname." ".$b["body"];
 
 		logger("statusnet_post_hook: parent found ".print_r($orig_post, true), LOGGER_DEBUG);
 	} else {
 		$iscomment = false;
 
-		if($b['private'] OR !strstr($b['postopts'],'statusnet'))
+		if($b['private'] || !strstr($b['postopts'],'statusnet'))
 			return;
 	}
 
-	if (($b['verb'] == ACTIVITY_POST) AND $b['deleted'])
-                statusnet_action($a, $b["uid"], substr($orig_post["uri"], $hostlength), "delete");
+	if (($b['verb'] == ACTIVITY_POST) && $b['deleted'])
+		statusnet_action($a, $b["uid"], substr($orig_post["uri"], $hostlength), "delete");
 
-        if($b['verb'] == ACTIVITY_LIKE) {
-                logger("statusnet_post_hook: parameter 2 ".substr($b["thr-parent"], $hostlength), LOGGER_DEBUG);
-                if ($b['deleted'])
-                        statusnet_action($a, $b["uid"], substr($b["thr-parent"], $hostlength), "unlike");
-                else
-                        statusnet_action($a, $b["uid"], substr($b["thr-parent"], $hostlength), "like");
-                return;
+	if($b['verb'] == ACTIVITY_LIKE) {
+		logger("statusnet_post_hook: parameter 2 ".substr($b["thr-parent"], $hostlength), LOGGER_DEBUG);
+		if ($b['deleted'])
+			statusnet_action($a, $b["uid"], substr($b["thr-parent"], $hostlength), "unlike");
+		else
+			statusnet_action($a, $b["uid"], substr($b["thr-parent"], $hostlength), "like");
+		return;
 	}
 
-        if($b['deleted'] || ($b['created'] !== $b['edited']))
-                return;
+	if($b['deleted'] || ($b['created'] !== $b['edited']))
+		return;
 
-	// if posts comes from statusnet don't send it back
-	if($b['app'] == "StatusNet")
+	// if posts comes from GNU Social don't send it back
+	if($b['extid'] == NETWORK_STATUSNET)
 		return;
 
-	logger('statusnet post invoked');
+	if($b['app'] == "StatusNet")
+		return;
 
-	load_pconfig($b['uid'], 'statusnet');
+	logger('GNU Socialpost invoked');
 
-	$api     = get_pconfig($b['uid'], 'statusnet', 'baseapi');
-	$ckey    = get_pconfig($b['uid'], 'statusnet', 'consumerkey');
-	$csecret = get_pconfig($b['uid'], 'statusnet', 'consumersecret');
-	$otoken  = get_pconfig($b['uid'], 'statusnet', 'oauthtoken');
-	$osecret = get_pconfig($b['uid'], 'statusnet', 'oauthsecret');
-	$intelligent_shortening = get_pconfig($b['uid'], 'statusnet', 'intelligent_shortening');
+	PConfig::load($b['uid'], 'statusnet');
 
-	// Global setting overrides this
-	if (get_config('statusnet','intelligent_shortening'))
-		$intelligent_shortening = get_config('statusnet','intelligent_shortening');
+	$api     = PConfig::get($b['uid'], 'statusnet', 'baseapi');
+	$ckey    = PConfig::get($b['uid'], 'statusnet', 'consumerkey');
+	$csecret = PConfig::get($b['uid'], 'statusnet', 'consumersecret');
+	$otoken  = PConfig::get($b['uid'], 'statusnet', 'oauthtoken');
+	$osecret = PConfig::get($b['uid'], 'statusnet', 'oauthsecret');
 
 	if($ckey && $csecret && $otoken && $osecret) {
 
-		// If it's a repeated message from statusnet then do a native retweet and exit
+		// If it's a repeated message from GNU Social then do a native retweet and exit
 		if (statusnet_is_retweet($a, $b['uid'], $b['body']))
 			return;
 
 		require_once('include/bbcode.php');
 		$dent = new StatusNetOAuth($api,$ckey,$csecret,$otoken,$osecret);
 		$max_char = $dent->get_maxlength(); // max. length for a dent
-		// we will only work with up to two times the length of the dent
-		// 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.
 
-		$tempfile = "";
-		$intelligent_shortening = get_config('statusnet','intelligent_shortening');
-		if (!$intelligent_shortening) {
-			if (! $b['title']=='') {
-				$tmp = $b['title'].": \n".$b['body'];
-	//                    $tmp = substr($tmp, 0, 4*$max_char);
-			} else {
-			    $tmp = $b['body']; // substr($b['body'], 0, 3*$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
-			$tmp = preg_replace( '/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism', '$3', $tmp);
-			$tmp = preg_replace( '/\[\\/?img(\\s+.*?\]|\])/i', '', $tmp);
-			$tmp = preg_replace( '/\[\\/?video(\\s+.*?\]|\])/i', '', $tmp);
-			$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
-			// that is, don't send if the option is not set in the
-			// connector settings
-			if ($linksenabled=='0') {
-				// #-tags
-				$tmp = preg_replace( '/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $tmp);
-				// @-mentions
-				$tmp = preg_replace( '/@\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '@$2', $tmp);
-				// recycle 1
-				$recycle = html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8');
-				$tmp = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', $recycle.'$2', $tmp);
-				// recycle 2 (test)
-				$recycle = html_entity_decode("&#x25CC; ", ENT_QUOTES, 'UTF-8');
-				$tmp = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', $recycle.'$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);
-			// find all http or https links in the body of the entry and 
-			// apply the shortener if the link is longer then 20 characters 
-			if (( strlen($tmp)>$max_char ) && ( $max_char > 0 )) {
-			    preg_match_all ( '/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/i', $tmp, $allurls  );
-			    foreach ($allurls as $url) {
-				foreach ($url as $u) {
-				    if (strlen($u)>20) {
-					$sl = short_link($u);
-					$tmp = str_replace( $u, $sl, $tmp );
-				    }
-				}
-			    }
-			}
-			// ok, all the links we want to send out are save, now strip 
-			// away the remaining bbcode
-			//$msg = strip_tags(bbcode($tmp, false, false));
-			$msg = bbcode($tmp, false, false, true);
-			$msg = str_replace(array('<br>','<br />'),"\n",$msg);
-			$msg = strip_tags($msg);
-
-			// quotes not working - let's try this
-			$msg = html_entity_decode($msg);
-
-			if (( strlen($msg) > $max_char) && $max_char > 0) {
-				$shortlink = short_link( $b['plink'] );
-				// the new message will be shortened such that "... $shortlink"
-				// will fit into the character limit
-				$msg = nl2br(substr($msg, 0, $max_char-strlen($shortlink)-4));
-				$msg = str_replace(array('<br>','<br />'),' ',$msg);
-				$e = explode(' ', $msg);
-				//  remove the last word from the cut down message to
-				//  avoid sending cut words to the MicroBlog
-				array_pop($e);
-				$msg = implode(' ', $e);
-				$msg .= '... ' . $shortlink;
-			}
+		PConfig::set($b['uid'], 'statusnet', 'max_char', $max_char);
 
-			$msg = trim($msg);
-			$postdata = array('status' => $msg);
-		} else {
-			$msgarr = statusnet_shortenmsg($b, $max_char);
-			$msg = $msgarr["msg"];
+		$tempfile = "";
+		require_once("include/plaintext.php");
+		require_once("include/network.php");
+		$msgarr = plaintext($a, $b, $max_char, true, 7);
+		$msg = $msgarr["text"];
+
+		if (($msg == "") && isset($msgarr["title"]))
+			$msg = shortenmsg($msgarr["title"], $max_char - 50);
+
+		$image = "";
+
+		if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {
+			if ((strlen($msgarr["url"]) > 20) &&
+				((strlen($msg." \n".$msgarr["url"]) > $max_char)))
+				$msg .= " \n".short_link($msgarr["url"]);
+			else
+				$msg .= " \n".$msgarr["url"];
+		} elseif (isset($msgarr["image"]) && ($msgarr["type"] != "video"))
 			$image = $msgarr["image"];
-			if ($image != "") {
-				$img_str = fetch_url($image);
-				$tempfile = tempnam(get_config("system","temppath"), "cache");
-				file_put_contents($tempfile, $img_str);
-				$postdata = array("status" => $msg, "media[]" => $tempfile);
-			} else
-				$postdata = array("status"=>$msg);
-		}
+
+		if ($image != "") {
+			$img_str = fetch_url($image);
+			$tempfile = tempnam(get_temppath(), "cache");
+			file_put_contents($tempfile, $img_str);
+			$postdata = array("status" => $msg, "media[]" => $tempfile);
+		} else
+			$postdata = array("status"=>$msg);
 
 		// and now dent it :-)
 		if(strlen($msg)) {
@@ -867,8 +633,12 @@ function statusnet_post_hook(&$a,&$b) {
 			//$result = $dent->post('statuses/update', $postdata);
 			logger('statusnet_post send, result: ' . print_r($result, true).
 				"\nmessage: ".$msg, LOGGER_DEBUG."\nOriginal post: ".print_r($b, true)."\nPost Data: ".print_r($postdata, true));
+
+			if ($result->source)
+				PConfig::set($b["uid"], "statusnet", "application_name", strip_tags($result->source));
+
 			if ($result->error) {
-				logger('Send to StatusNet failed: "'.$result->error.'"');
+				logger('Send to GNU Social failed: "'.$result->error.'"');
 			} elseif ($iscomment) {
 				logger('statusnet_post: Update extid '.$result->id." for post id ".$b['id']);
 				q("UPDATE `item` SET `extid` = '%s', `body` = '%s' WHERE `id` = %d",
@@ -894,7 +664,7 @@ function statusnet_plugin_admin_post(&$a){
 		    $apiurl=$apiurl.'/';
 		$secret=trim($_POST['secret'][$id]);
 		$key=trim($_POST['key'][$id]);
-		$applicationname = ((x($_POST, 'applicationname')) ? notags(trim($_POST['applicationname'][$id])):'');
+		//$applicationname = ((x($_POST, 'applicationname')) ? notags(trim($_POST['applicationname'][$id])):'');
 		if ($sitename!="" &&
 			$apiurl!="" &&
 			$secret!="" &&
@@ -906,18 +676,18 @@ function statusnet_plugin_admin_post(&$a){
 					'apiurl' => $apiurl,
 					'consumersecret' => $secret,
 					'consumerkey' => $key,
-					'applicationname' => $applicationname
+					//'applicationname' => $applicationname
 				);
 		}
 	}
 
-	$sites = set_config('statusnet','sites', $sites);
+	$sites = Config::set('statusnet','sites', $sites);
 
 }
 
 function statusnet_plugin_admin(&$a, &$o){
 
-	$sites = get_config('statusnet','sites');
+	$sites = Config::get('statusnet','sites');
 	$sitesform=array();
 	if (is_array($sites)){
 		foreach($sites as $id=>$s){
@@ -926,7 +696,7 @@ function statusnet_plugin_admin(&$a, &$o){
 				'apiurl' => Array("apiurl[$id]", "Api url", $s['apiurl'], t("Base API Path \x28remember the trailing /\x29") ),
 				'secret' => Array("secret[$id]", "Secret", $s['consumersecret'], ""),
 				'key' => Array("key[$id]", "Key", $s['consumerkey'], ""),
-				'applicationname' => Array("applicationname[$id]", "Application name", $s['applicationname'], ""),
+				//'applicationname' => Array("applicationname[$id]", "Application name", $s['applicationname'], ""),
 				'delete' => Array("delete[$id]", "Delete", False , "Check to delete this preset"),
 			);
 		}
@@ -938,7 +708,7 @@ function statusnet_plugin_admin(&$a, &$o){
 		'apiurl' => Array("apiurl[$id]", "Api url", "", t("Base API Path \x28remember the trailing /\x29") ),
 		'secret' => Array("secret[$id]", t("Consumer Secret"), "", ""),
 		'key' => Array("key[$id]", t("Consumer Key"), "", ""),
-		'applicationname' => Array("applicationname[$id]", t("Application name"), "", ""),
+		//'applicationname' => Array("applicationname[$id]", t("Application name"), "", ""),
 	);
 
 	$t = get_markup_template( "admin.tpl", "addon/statusnet/" );
@@ -948,10 +718,57 @@ function statusnet_plugin_admin(&$a, &$o){
 	));
 }
 
+function statusnet_prepare_body(&$a,&$b) {
+        if ($b["item"]["network"] != NETWORK_STATUSNET)
+                return;
+
+        if ($b["preview"]) {
+		$max_char = PConfig::get(local_user(),'statusnet','max_char');
+		if (intval($max_char) == 0)
+			$max_char = 140;
+
+                require_once("include/plaintext.php");
+                $item = $b["item"];
+                $item["plink"] = $a->get_baseurl()."/display/".$a->user["nickname"]."/".$item["parent"];
+
+		$r = q("SELECT `item`.`author-link`, `item`.`uri`, `contact`.`nick` AS contact_nick
+                        FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+                        WHERE `item`.`uri` = '%s' AND `item`.`uid` = %d LIMIT 1",
+                        dbesc($item["thr-parent"]),
+                        intval(local_user()));
+
+                if(count($r)) {
+                        $orig_post = $r[0];
+			//$nickname = "@[url=".$orig_post["author-link"]."]".$orig_post["contact_nick"]."[/url]";
+			//$nicknameplain = "@".$orig_post["contact_nick"];
+
+			$nick = preg_replace("=https?://(.*)/(.*)=ism", "$2", $orig_post["author-link"]);
+
+			$nickname = "@[url=".$orig_post["author-link"]."]".$nick."[/url]";
+			$nicknameplain = "@".$nick;
+
+	                if ((strpos($item["body"], $nickname) === false) && (strpos($item["body"], $nicknameplain) === false))
+	                        $item["body"] = $nickname." ".$item["body"];
+                }
+
+
+                $msgarr = plaintext($a, $item, $max_char, true, 7);
+                $msg = $msgarr["text"];
+
+                if (isset($msgarr["url"]) && ($msgarr["type"] != "photo"))
+                        $msg .= " ".$msgarr["url"];
+
+                if (isset($msgarr["image"]))
+                        $msg .= " ".$msgarr["image"];
+
+                $b['html'] = nl2br(htmlspecialchars($msg));
+        }
+}
+
 function statusnet_cron($a,$b) {
-	$last = get_config('statusnet','last_poll');
+	$last = Config::get('statusnet','last_poll');
 
-	$poll_interval = intval(get_config('statusnet','poll_interval'));
+	$poll_interval = intval(Config::get('statusnet','poll_interval'));
 	if(! $poll_interval)
 		$poll_interval = STATUSNET_DEFAULT_POLL_INTERVAL;
 
@@ -972,26 +789,40 @@ function statusnet_cron($a,$b) {
 		}
 	}
 
-	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'statusnet' AND `k` = 'import' AND `v` = '1' ORDER BY RAND()");
-        if(count($r)) {
-                foreach($r as $rr) {
-                        logger('statusnet: importing timeline from user '.$rr['uid']);
-                        statusnet_fetchhometimeline($a, $rr["uid"]);
-                }
-        }
+	$abandon_days = intval(Config::get('system','account_abandon_days'));
+	if ($abandon_days < 1)
+		$abandon_days = 0;
+
+	$abandon_limit = date("Y-m-d H:i:s", time() - $abandon_days * 86400);
+
+	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'statusnet' AND `k` = 'import' AND `v` ORDER BY RAND()");
+	if(count($r)) {
+		foreach($r as $rr) {
+			if ($abandon_days != 0) {
+				$user = q("SELECT `login_date` FROM `user` WHERE uid=%d AND `login_date` >= '%s'", $rr['uid'], $abandon_limit);
+				if (!count($user)) {
+					logger('abandoned account: timeline from user '.$rr['uid'].' will not be imported');
+					continue;
+				}
+			}
+
+			logger('statusnet: importing timeline from user '.$rr['uid']);
+			statusnet_fetchhometimeline($a, $rr["uid"], $rr["v"]);
+		}
+	}
 
 	logger('statusnet: cron_end');
 
-	set_config('statusnet','last_poll', time());
+	Config::set('statusnet','last_poll', time());
 }
 
 function statusnet_fetchtimeline($a, $uid) {
-	$ckey    = get_pconfig($uid, 'statusnet', 'consumerkey');
-	$csecret = get_pconfig($uid, 'statusnet', 'consumersecret');
-	$api     = get_pconfig($uid, 'statusnet', 'baseapi');
-	$otoken  = get_pconfig($uid, 'statusnet', 'oauthtoken');
-	$osecret = get_pconfig($uid, 'statusnet', 'oauthsecret');
-	$lastid  = get_pconfig($uid, 'statusnet', 'lastid');
+	$ckey    = PConfig::get($uid, 'statusnet', 'consumerkey');
+	$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
+	$api     = PConfig::get($uid, 'statusnet', 'baseapi');
+	$otoken  = PConfig::get($uid, 'statusnet', 'oauthtoken');
+	$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
+	$lastid  = PConfig::get($uid, 'statusnet', 'lastid');
 
 	require_once('mod/item.php');
 	require_once('include/items.php');
@@ -999,9 +830,9 @@ function statusnet_fetchtimeline($a, $uid) {
 	//  get the application name for the SN app
 	//  1st try personal config, then system config and fallback to the
 	//  hostname of the node if neither one is set.
-	$application_name  = get_pconfig( $uid, 'statusnet', 'application_name');
+	$application_name  = PConfig::get( $uid, 'statusnet', 'application_name');
 	if ($application_name == "")
-		$application_name  = get_config('statusnet', 'application_name');
+		$application_name  = Config::get('statusnet', 'application_name');
 	if ($application_name == "")
 		$application_name = $a->get_hostname();
 
@@ -1038,7 +869,7 @@ function statusnet_fetchtimeline($a, $uid) {
 		if ($post->in_reply_to_status_id != "")
 			continue;
 
-		if (!strpos($post->source, $application_name)) {
+		if (!stristr($post->source, $application_name)) {
 			$_SESSION["authenticated"] = true;
 			$_SESSION["uid"] = $uid;
 
@@ -1046,7 +877,13 @@ function statusnet_fetchtimeline($a, $uid) {
 			$_REQUEST["type"] = "wall";
 			$_REQUEST["api_source"] = true;
 			$_REQUEST["profile_uid"] = $uid;
-			$_REQUEST["source"] = "StatusNet";
+			//$_REQUEST["source"] = "StatusNet";
+			$_REQUEST["source"] = $post->source;
+			$_REQUEST["extid"] = NETWORK_STATUSNET;
+
+			if (isset($post->id)) {
+				$_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_STATUSNET.":".$post->id);
+			}
 
 			//$_REQUEST["date"] = $post->created_at;
 
@@ -1074,7 +911,7 @@ function statusnet_fetchtimeline($a, $uid) {
 		}
 	    }
 	}
-	set_pconfig($uid, 'statusnet', 'lastid', $lastid);
+	PConfig::set($uid, 'statusnet', 'lastid', $lastid);
 }
 
 function statusnet_address($contact) {
@@ -1089,31 +926,22 @@ function statusnet_address($contact) {
 }
 
 function statusnet_fetch_contact($uid, $contact, $create_user) {
-	// Check if the unique contact is existing
-	// To-Do: only update once a while
-	 $r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
-			dbesc(normalise_link($contact->statusnet_profile_url)));
+	if ($contact->statusnet_profile_url == "")
+		return(-1);
 
-	if (count($r) == 0)
-		q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')",
-			dbesc(normalise_link($contact->statusnet_profile_url)),
-			dbesc($contact->name),
-			dbesc($contact->screen_name),
-			dbesc($contact->profile_image_url));
-	else
-		q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'",
-			dbesc($contact->name),
-			dbesc($contact->screen_name),
-			dbesc($contact->profile_image_url),
-			dbesc(normalise_link($contact->statusnet_profile_url)));
+	update_gcontact(array("url" => $contact->statusnet_profile_url,
+			"network" => NETWORK_STATUSNET, "photo" => $contact->profile_image_url,
+			"name" => $contact->name, "nick" => $contact->screen_name,
+			"location" => $contact->location, "about" => $contact->description,
+			"addr" => statusnet_address($contact), "generation" => 3));
 
-	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
-		intval($uid), dbesc(normalise_link($contact->statusnet_profile_url)));
+	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' AND `network` = '%s'LIMIT 1",
+		intval($uid), dbesc(normalise_link($contact->statusnet_profile_url)), dbesc(NETWORK_STATUSNET));
 
-	if(!count($r) AND !$create_user)
+	if(!count($r) && !$create_user)
 		return(0);
 
-	if (count($r) AND ($r[0]["readonly"] OR $r[0]["blocked"])) {
+	if (count($r) && ($r[0]["readonly"] || $r[0]["blocked"])) {
 		logger("statusnet_fetch_contact: Contact '".$r[0]["nick"]."' is blocked or readonly.", LOGGER_DEBUG);
 		return(-1);
 	}
@@ -1122,8 +950,8 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
 		// create contact record
 		q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
 					`name`, `nick`, `photo`, `network`, `rel`, `priority`,
-					`writable`, `blocked`, `readonly`, `pending` )
-					VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ",
+					`location`, `about`, `writable`, `blocked`, `readonly`, `pending` )
+					VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0 ) ",
 			intval($uid),
 			dbesc(datetime_convert()),
 			dbesc($contact->statusnet_profile_url),
@@ -1138,13 +966,15 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
 			dbesc(NETWORK_STATUSNET),
 			intval(CONTACT_IS_FRIEND),
 			intval(1),
+			dbesc($contact->location),
+			dbesc($contact->description),
 			intval(1)
 		);
 
-		$r = q("SELECT * FROM `contact` WHERE `alias` = '%s' AND `uid` = %d LIMIT 1",
+		$r = q("SELECT * FROM `contact` WHERE `alias` = '%s' AND `uid` = %d AND `network` = '%s' LIMIT 1",
 			dbesc($contact->statusnet_profile_url),
-			intval($uid)
-			);
+			intval($uid),
+			dbesc(NETWORK_STATUSNET));
 
 		if(! count($r))
 			return(false);
@@ -1167,19 +997,14 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
 		q("UPDATE `contact` SET `photo` = '%s',
 					`thumb` = '%s',
 					`micro` = '%s',
-					`name-date` = '%s',
-					`uri-date` = '%s',
 					`avatar-date` = '%s'
 				WHERE `id` = %d",
 			dbesc($photos[0]),
 			dbesc($photos[1]),
 			dbesc($photos[2]),
 			dbesc(datetime_convert()),
-			dbesc(datetime_convert()),
-			dbesc(datetime_convert()),
 			intval($contact_id)
 		);
-
 	} else {
 		// update profile photos once every two weeks as we have no notification of when they change.
 
@@ -1188,7 +1013,7 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
 
 		// check that we have all the photos, this has been known to fail on occasion
 
-		if((! $r[0]['photo']) || (! $r[0]['thumb']) || (! $r[0]['micro']) || ($update_photo)) {
+		if((!$r[0]['photo']) || (!$r[0]['thumb']) || (!$r[0]['micro']) || ($update_photo)) {
 
 			logger("statusnet_fetch_contact: Updating contact ".$contact->screen_name, LOGGER_DEBUG);
 
@@ -1206,7 +1031,9 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
 						`nurl` = '%s',
 						`addr` = '%s',
 						`name` = '%s',
-						`nick` = '%s'
+						`nick` = '%s',
+						`location` = '%s',
+						`about` = '%s'
 					WHERE `id` = %d",
 				dbesc($photos[0]),
 				dbesc($photos[1]),
@@ -1219,6 +1046,8 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
 				dbesc(statusnet_address($contact)),
 				dbesc($contact->name),
 				dbesc($contact->screen_name),
+				dbesc($contact->location),
+				dbesc($contact->description),
 				intval($r[0]['id'])
 			);
 		}
@@ -1228,11 +1057,11 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
 }
 
 function statusnet_fetchuser($a, $uid, $screen_name = "", $user_id = "") {
-	$ckey    = get_pconfig($uid, 'statusnet', 'consumerkey');
-	$csecret = get_pconfig($uid, 'statusnet', 'consumersecret');
-	$api     = get_pconfig($uid, 'statusnet', 'baseapi');
-	$otoken  = get_pconfig($uid, 'statusnet', 'oauthtoken');
-	$osecret = get_pconfig($uid, 'statusnet', 'oauthsecret');
+	$ckey    = PConfig::get($uid, 'statusnet', 'consumerkey');
+	$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
+	$api     = PConfig::get($uid, 'statusnet', 'baseapi');
+	$otoken  = PConfig::get($uid, 'statusnet', 'oauthtoken');
+	$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
 
 	require_once("addon/statusnet/codebird.php");
 
@@ -1271,7 +1100,9 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
 
 	require_once("include/html2bbcode.php");
 
-	$api = get_pconfig($uid, 'statusnet', 'baseapi');
+	logger("statusnet_createpost: start", LOGGER_DEBUG);
+
+	$api = PConfig::get($uid, 'statusnet', 'baseapi');
 	$hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $api);
 
 	$postarray = array();
@@ -1279,7 +1110,14 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
 	$postarray['gravity'] = 0;
 	$postarray['uid'] = $uid;
 	$postarray['wall'] = 0;
-	$postarray['uri'] = $hostname."::".$post->id;
+
+	if (is_object($post->retweeted_status)) {
+		$content = $post->retweeted_status;
+		statusnet_fetch_contact($uid, $content->user, false);
+	} else
+		$content = $post;
+
+	$postarray['uri'] = $hostname."::".$content->id;
 
 	$r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
 			dbesc($postarray['uri']),
@@ -1291,9 +1129,9 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
 
 	$contactid = 0;
 
-	if ($post->in_reply_to_status_id != "") {
+	if ($content->in_reply_to_status_id != "") {
 
-		$parent = $hostname."::".$post->in_reply_to_status_id;
+		$parent = $hostname."::".$content->in_reply_to_status_id;
 
 		$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 				dbesc($parent),
@@ -1302,6 +1140,8 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
 		if (count($r)) {
 			$postarray['thr-parent'] = $r[0]["uri"];
 			$postarray['parent-uri'] = $r[0]["parent-uri"];
+			$postarray['parent'] = $r[0]["parent"];
+			$postarray['object-type'] = ACTIVITY_OBJ_COMMENT;
 		} else {
 			$r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
 					dbesc($parent),
@@ -1310,16 +1150,19 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
 			if (count($r)) {
 				$postarray['thr-parent'] = $r[0]['uri'];
 				$postarray['parent-uri'] = $r[0]['parent-uri'];
+				$postarray['parent'] = $r[0]['parent'];
+				$postarray['object-type'] = ACTIVITY_OBJ_COMMENT;
 			} else {
 				$postarray['thr-parent'] = $postarray['uri'];
 				$postarray['parent-uri'] = $postarray['uri'];
+				$postarray['object-type'] = ACTIVITY_OBJ_NOTE;
 			}
 		}
 
 		// Is it me?
-		$own_url = get_pconfig($uid, 'statusnet', 'own_url');
+		$own_url = PConfig::get($uid, 'statusnet', 'own_url');
 
-		if ($post->user->id == $own_url) {
+		if ($content->user->id == $own_url) {
 			$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
 				intval($uid));
 
@@ -1332,8 +1175,12 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
 			} else
 				return(array());
 		}
-	} else
+		// Don't create accounts of people who just comment something
+		$create_user = false;
+	} else {
 		$postarray['parent-uri'] = $postarray['uri'];
+		$postarray['object-type'] = ACTIVITY_OBJ_NOTE;
+	}
 
 	if ($contactid == 0) {
 		$contactid = statusnet_fetch_contact($uid, $post->user, $create_user);
@@ -1341,7 +1188,7 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
 		$postarray['owner-link'] = $post->user->statusnet_profile_url;
 		$postarray['owner-avatar'] = $post->user->profile_image_url;
 	}
-	if(($contactid == 0) AND !$only_existing_contact)
+	if(($contactid == 0) && !$only_existing_contact)
 		$contactid = $self['id'];
 	elseif ($contactid <= 0)
 		return(array());
@@ -1349,43 +1196,44 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
 	$postarray['contact-id'] = $contactid;
 
 	$postarray['verb'] = ACTIVITY_POST;
-	$postarray['author-name'] = $postarray['owner-name'];
-	$postarray['author-link'] = $postarray['owner-link'];
-	$postarray['author-avatar'] = $postarray['owner-avatar'];
+
+	$postarray['author-name'] = $content->user->name;
+	$postarray['author-link'] = $content->user->statusnet_profile_url;
+	$postarray['author-avatar'] = $content->user->profile_image_url;
 
 	// To-Do: Maybe unreliable? Can the api be entered without trailing "/"?
-	$hostname = str_replace("/api/", "/notice/", get_pconfig($uid, 'statusnet', 'baseapi'));
+	$hostname = str_replace("/api/", "/notice/", PConfig::get($uid, 'statusnet', 'baseapi'));
 
-	$postarray['plink'] = $hostname.$post->id;
-	$postarray['app'] = strip_tags($post->source);
+	$postarray['plink'] = $hostname.$content->id;
+	$postarray['app'] = strip_tags($content->source);
 
-	if ($post->user->protected) {
+	if ($content->user->protected) {
 		$postarray['private'] = 1;
 		$postarray['allow_cid'] = '<' . $self['id'] . '>';
 	}
 
-	$postarray['body'] = html2bbcode($post->statusnet_html);
+	$postarray['body'] = html2bbcode($content->statusnet_html);
 
 	$converted = statusnet_convertmsg($a, $postarray['body'], false);
 	$postarray['body'] = $converted["body"];
 	$postarray['tag'] = $converted["tags"];
 
-	$postarray['created'] = datetime_convert('UTC','UTC',$post->created_at);
-	$postarray['edited'] = datetime_convert('UTC','UTC',$post->created_at);
+	$postarray['created'] = datetime_convert('UTC','UTC',$content->created_at);
+	$postarray['edited'] = datetime_convert('UTC','UTC',$content->created_at);
 
-	if (is_string($post->place->name))
-		$postarray["location"] = $post->place->name;
+	if (is_string($content->place->name))
+		$postarray["location"] = $content->place->name;
 
-	if (is_string($post->place->full_name))
-		$postarray["location"] = $post->place->full_name;
+	if (is_string($content->place->full_name))
+		$postarray["location"] = $content->place->full_name;
 
-	if (is_array($post->geo->coordinates))
-		$postarray["coord"] = $post->geo->coordinates[0]." ".$post->geo->coordinates[1];
+	if (is_array($content->geo->coordinates))
+		$postarray["coord"] = $content->geo->coordinates[0]." ".$content->geo->coordinates[1];
 
-	if (is_array($post->coordinates->coordinates))
-		$postarray["coord"] = $post->coordinates->coordinates[1]." ".$post->coordinates->coordinates[0];
+	if (is_array($content->coordinates->coordinates))
+		$postarray["coord"] = $content->coordinates->coordinates[1]." ".$content->coordinates->coordinates[0];
 
-	if (is_object($post->retweeted_status)) {
+	/*if (is_object($post->retweeted_status)) {
 		$postarray['body'] = html2bbcode($post->retweeted_status->statusnet_html);
 
 		$converted = statusnet_convertmsg($a, $postarray['body'], false);
@@ -1398,12 +1246,15 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
 		$postarray['author-name'] = $post->retweeted_status->user->name;
 		$postarray['author-link'] = $post->retweeted_status->user->statusnet_profile_url;
 		$postarray['author-avatar'] = $post->retweeted_status->user->profile_image_url;
-	}
+	}*/
+	logger("statusnet_createpost: end", LOGGER_DEBUG);
 	return($postarray);
 }
 
 function statusnet_checknotification($a, $uid, $own_url, $top_item, $postarray) {
 
+	// This function necer worked and need cleanup
+
 	$user = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
 			intval($uid)
 		);
@@ -1423,7 +1274,7 @@ function statusnet_checknotification($a, $uid, $own_url, $top_item, $postarray)
 	if(!count($own_user))
 		return;
 
-	// Is it me from statusnet?
+	// Is it me from GNU Social?
 	if (link_compare($own_user[0]["url"], $postarray['author-link']))
 		return;
 
@@ -1437,7 +1288,7 @@ function statusnet_checknotification($a, $uid, $own_url, $top_item, $postarray)
 		foreach($myconv as $conv) {
 			// now if we find a match, it means we're in this conversation
 
-			if(!link_compare($conv['author-link'],$user[0]["url"]) AND !link_compare($conv['author-link'],$own_user[0]["url"]))
+			if(!link_compare($conv['author-link'],$user[0]["url"]) && !link_compare($conv['author-link'],$own_user[0]["url"]))
 				continue;
 
 			require_once('include/enotify.php');
@@ -1452,7 +1303,7 @@ function statusnet_checknotification($a, $uid, $own_url, $top_item, $postarray)
 				'to_email'     => $user[0]['email'],
 				'uid'          => $user[0]['uid'],
 				'item'         => $postarray,
-				'link'             => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $top_item,
+				'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($top_item)),
 				'source_name'  => $postarray['author-name'],
 				'source_link'  => $postarray['author-link'],
 				'source_photo' => $postarray['author-avatar'],
@@ -1467,15 +1318,15 @@ function statusnet_checknotification($a, $uid, $own_url, $top_item, $postarray)
 	}
 }
 
-function statusnet_fetchhometimeline($a, $uid) {
+function statusnet_fetchhometimeline($a, $uid, $mode = 1) {
 	$conversations = array();
 
-	$ckey    = get_pconfig($uid, 'statusnet', 'consumerkey');
-	$csecret = get_pconfig($uid, 'statusnet', 'consumersecret');
-	$api     = get_pconfig($uid, 'statusnet', 'baseapi');
-	$otoken  = get_pconfig($uid, 'statusnet', 'oauthtoken');
-	$osecret = get_pconfig($uid, 'statusnet', 'oauthsecret');
-	$create_user = get_pconfig($uid, 'statusnet', 'create_user');
+	$ckey    = PConfig::get($uid, 'statusnet', 'consumerkey');
+	$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
+	$api     = PConfig::get($uid, 'statusnet', 'baseapi');
+	$otoken  = PConfig::get($uid, 'statusnet', 'oauthtoken');
+	$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
+	$create_user = PConfig::get($uid, 'statusnet', 'create_user');
 
 	// "create_user" is deactivated, since currently you cannot add users manually by now
 	$create_user = true;
@@ -1496,7 +1347,7 @@ function statusnet_fetchhometimeline($a, $uid) {
 	if(count($r)) {
 		$nick = $r[0]["nick"];
 	} else {
-		logger("statusnet_fetchhometimeline: Own statusnet contact not found for user ".$uid, LOGGER_DEBUG);
+		logger("statusnet_fetchhometimeline: Own GNU Social contact not found for user ".$uid, LOGGER_DEBUG);
 		return;
 	}
 
@@ -1520,61 +1371,72 @@ function statusnet_fetchhometimeline($a, $uid) {
 	$parameters = array("exclude_replies" => false, "trim_user" => false, "contributor_details" => true, "include_rts" => true);
 	//$parameters["count"] = 200;
 
+	if ($mode == 1) {
+		// Fetching timeline
+		$lastid  = PConfig::get($uid, 'statusnet', 'lasthometimelineid');
+		//$lastid = 1;
 
-	// Fetching timeline
-	$lastid  = get_pconfig($uid, 'statusnet', 'lasthometimelineid');
-	//$lastid = 1;
+		$first_time = ($lastid == "");
 
-	$first_time = ($lastid == "");
+		if ($lastid <> "")
+			$parameters["since_id"] = $lastid;
 
-	if ($lastid <> "")
-		$parameters["since_id"] = $lastid;
+		$items = $connection->get('statuses/home_timeline', $parameters);
 
-	$items = $connection->get('statuses/home_timeline', $parameters);
+		if (!is_array($items)) {
+			if (is_object($items) && isset($items->error))
+				$errormsg = $items->error;
+			elseif (is_object($items))
+				$errormsg = print_r($items, true);
+			elseif (is_string($items) || is_float($items) || is_int($items))
+				$errormsg = $items;
+			else
+				$errormsg = "Unknown error";
 
-	if (!is_array($items)) {
-		logger("statusnet_fetchhometimeline: Error fetching home timeline: ".print_r($items, true), LOGGER_DEBUG);
-		return;
-	}
+			logger("statusnet_fetchhometimeline: Error fetching home timeline: ".$errormsg, LOGGER_DEBUG);
+			return;
+		}
 
-	$posts = array_reverse($items);
+		$posts = array_reverse($items);
 
-	logger("statusnet_fetchhometimeline: Fetching timeline for user ".$uid." ".sizeof($posts)." items", LOGGER_DEBUG);
+		logger("statusnet_fetchhometimeline: Fetching timeline for user ".$uid." ".sizeof($posts)." items", LOGGER_DEBUG);
 
-	if (count($posts)) {
-		foreach ($posts as $post) {
+		if (count($posts)) {
+			foreach ($posts as $post) {
 
-			if ($post->id > $lastid)
-				$lastid = $post->id;
+				if ($post->id > $lastid)
+					$lastid = $post->id;
 
-			if ($first_time)
-				continue;
+				if ($first_time)
+					continue;
 
-			if (isset($post->statusnet_conversation_id)) {
-				if (!isset($conversations[$post->statusnet_conversation_id])) {
-					statusnet_complete_conversation($a, $uid, $self, $create_user, $nick, $post->statusnet_conversation_id);
-					$conversations[$post->statusnet_conversation_id] = $post->statusnet_conversation_id;
-				}
-			} else {
-				$postarray = statusnet_createpost($a, $uid, $post, $self, $create_user, true);
+				if (isset($post->statusnet_conversation_id)) {
+					if (!isset($conversations[$post->statusnet_conversation_id])) {
+						statusnet_complete_conversation($a, $uid, $self, $create_user, $nick, $post->statusnet_conversation_id);
+						$conversations[$post->statusnet_conversation_id] = $post->statusnet_conversation_id;
+					}
+				} else {
+					$postarray = statusnet_createpost($a, $uid, $post, $self, $create_user, true);
 
-				if (trim($postarray['body']) == "")
-					continue;
+					if (trim($postarray['body']) == "")
+						continue;
 
-				$item = item_store($postarray);
+					$item = item_store($postarray);
+					$postarray["id"] = $item;
 
-				logger('statusnet_fetchhometimeline: User '.$self["nick"].' posted home timeline item '.$item);
+					logger('statusnet_fetchhometimeline: User '.$self["nick"].' posted home timeline item '.$item);
 
-				if ($item != 0)
-					statusnet_checknotification($a, $uid, $nick, $item, $postarray);
-			}
+					if ($item && !function_exists("check_item_notification"))
+						statusnet_checknotification($a, $uid, $nick, $item, $postarray);
+				}
 
+			}
 		}
+		PConfig::set($uid, 'statusnet', 'lasthometimelineid', $lastid);
 	}
-	set_pconfig($uid, 'statusnet', 'lasthometimelineid', $lastid);
 
 	// Fetching mentions
-	$lastid  = get_pconfig($uid, 'statusnet', 'lastmentionid');
+	$lastid  = PConfig::get($uid, 'statusnet', 'lastmentionid');
 	$first_time = ($lastid == "");
 
 	if ($lastid <> "")
@@ -1611,8 +1473,12 @@ function statusnet_fetchhometimeline($a, $uid) {
 					continue;
 
 					$item = item_store($postarray);
+					$postarray["id"] = $item;
 
 					logger('statusnet_fetchhometimeline: User '.$self["nick"].' posted mention timeline item '.$item);
+
+					if ($item && function_exists("check_item_notification"))
+						check_item_notification($item, $uid, NOTIFY_TAGSELF);
 				}
 			}
 
@@ -1620,10 +1486,12 @@ function statusnet_fetchhometimeline($a, $uid) {
 				dbesc($postarray['uri']),
 				intval($uid)
 			);
-			if (count($r))
+			if (count($r)) {
 				$item = $r[0]['id'];
+				$parent_id = $r[0]['parent'];
+			}
 
-			if ($item != 0) {
+			if (($item != 0) && !function_exists("check_item_notification")) {
 				require_once('include/enotify.php');
 				notification(array(
 					'type'         => NOTIFY_TAGSELF,
@@ -1633,26 +1501,28 @@ function statusnet_fetchhometimeline($a, $uid) {
 					'to_email'     => $u[0]['email'],
 					'uid'          => $u[0]['uid'],
 					'item'         => $postarray,
-					'link'         => $a->get_baseurl() . '/display/' . $u[0]['nickname'] . '/' . $item,
+					'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)),
 					'source_name'  => $postarray['author-name'],
 					'source_link'  => $postarray['author-link'],
 					'source_photo' => $postarray['author-avatar'],
 					'verb'         => ACTIVITY_TAG,
-					'otype'        => 'item'
+					'otype'        => 'item',
+					'parent'       => $parent_id,
 				));
 			}
 		}
 	}
 
-	set_pconfig($uid, 'statusnet', 'lastmentionid', $lastid);
+	PConfig::set($uid, 'statusnet', 'lastmentionid', $lastid);
 }
 
 function statusnet_complete_conversation($a, $uid, $self, $create_user, $nick, $conversation) {
-	$ckey    = get_pconfig($uid, 'statusnet', 'consumerkey');
-	$csecret = get_pconfig($uid, 'statusnet', 'consumersecret');
-	$api     = get_pconfig($uid, 'statusnet', 'baseapi');
-	$otoken  = get_pconfig($uid, 'statusnet', 'oauthtoken');
-	$osecret = get_pconfig($uid, 'statusnet', 'oauthsecret');
+	$ckey    = PConfig::get($uid, 'statusnet', 'consumerkey');
+	$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
+	$api     = PConfig::get($uid, 'statusnet', 'baseapi');
+	$otoken  = PConfig::get($uid, 'statusnet', 'oauthtoken');
+	$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
+	$own_url = PConfig::get($uid, 'statusnet', 'own_url');
 
 	require_once('library/twitteroauth.php');
 
@@ -1661,21 +1531,24 @@ function statusnet_complete_conversation($a, $uid, $self, $create_user, $nick, $
 	$parameters["count"] = 200;
 
 	$items = $connection->get('statusnet/conversation/'.$conversation, $parameters);
-	$posts = array_reverse($items);
+	if (is_array($items)) {
+		$posts = array_reverse($items);
 
-	foreach($posts AS $post) {
-		$postarray = statusnet_createpost($a, $uid, $post, $self, $create_user, true);
+		foreach($posts AS $post) {
+			$postarray = statusnet_createpost($a, $uid, $post, $self, false, false);
 
-		if (trim($postarray['body']) == "")
-			continue;
+			if (trim($postarray['body']) == "")
+				continue;
 
-		//print_r($postarray);
-		$item = item_store($postarray);
+			//print_r($postarray);
+			$item = item_store($postarray);
+			$postarray["id"] = $item;
 
-		logger('statusnet_complete_conversation: User '.$self["nick"].' posted home timeline item '.$item);
+			logger('statusnet_complete_conversation: User '.$self["nick"].' posted home timeline item '.$item);
 
-		if ($item != 0)
-			statusnet_checknotification($a, $uid, $nick, $item, $postarray);
+			if ($item && !function_exists("check_item_notification"))
+				statusnet_checknotification($a, $uid, $nick, $item, $postarray);
+		}
 	}
 }
 
@@ -1685,34 +1558,47 @@ function statusnet_convertmsg($a, $body, $no_tags = false) {
 	require_once("include/items.php");
 	require_once("include/network.php");
 
+	$body = preg_replace("=\[url\=https?://([0-9]*).([0-9]*).([0-9]*).([0-9]*)/([0-9]*)\](.*?)\[\/url\]=ism","$1.$2.$3.$4/$5",$body);
+
 	$URLSearchString = "^\[\]";
 	$links = preg_match_all("/[^!#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $body,$matches,PREG_SET_ORDER);
 
 	$footer = "";
 	$footerurl = "";
+	$footerlink = "";
 	$type = "";
 
 	if ($links) {
 		foreach ($matches AS $match) {
 			$search = "[url=".$match[1]."]".$match[2]."[/url]";
 
+			logger("statusnet_convertmsg: expanding url ".$match[1], LOGGER_DEBUG);
+
 			$expanded_url = original_url($match[1]);
 
-			$oembed_data = oembed_fetch_url($expanded_url);
+			logger("statusnet_convertmsg: fetching data for ".$expanded_url, LOGGER_DEBUG);
+
+			$oembed_data = oembed_fetch_url($expanded_url, true);
+
+			logger("statusnet_convertmsg: fetching data: done", LOGGER_DEBUG);
 
 			if ($type == "")
 				$type = $oembed_data->type;
+			if ($oembed_data->type == "video") {
+				//$body = str_replace($search, "[video]".$expanded_url."[/video]", $body);
+				$type = $oembed_data->type;
+				$footerurl = $expanded_url;
+				$footerlink = "[url=".$expanded_url."]".$expanded_url."[/url]";
 
-			if ($oembed_data->type == "video")
-				$body = str_replace($search, "[video]".$expanded_url."[/video]", $body);
-			elseif (($oembed_data->type == "photo") AND isset($oembed_data->url) AND !$dontincludemedia)
+				$body = str_replace($search, $footerlink, $body);
+			} elseif (($oembed_data->type == "photo") && isset($oembed_data->url) && !$dontincludemedia)
 				$body = str_replace($search, "[url=".$expanded_url."][img]".$oembed_data->url."[/img][/url]", $body);
 			elseif ($oembed_data->type != "link")
 				$body = str_replace($search,  "[url=".$expanded_url."]".$expanded_url."[/url]", $body);
 			else {
 				$img_str = fetch_url($expanded_url, true, $redirects, 4);
 
-				$tempfile = tempnam(get_config("system","temppath"), "cache");
+				$tempfile = tempnam(get_temppath(), "cache");
 				file_put_contents($tempfile, $img_str);
 				$mime = image_type_to_mime_type(exif_imagetype($tempfile));
 				unlink($tempfile);
@@ -1725,7 +1611,7 @@ function statusnet_convertmsg($a, $body, $no_tags = false) {
 					$footerurl = $expanded_url;
 					$footerlink = "[url=".$expanded_url."]".$expanded_url."[/url]";
 
-					$body = str_replace($search, $expanded_url, $body);
+					$body = str_replace($search, $footerlink, $body);
 				}
 			}
 		}
@@ -1733,10 +1619,10 @@ function statusnet_convertmsg($a, $body, $no_tags = false) {
 		if ($footerurl != "")
 			$footer = add_page_info($footerurl);
 
-		if (($footerlink != "") AND (trim($footer) != "")) {
+		if (($footerlink != "") && (trim($footer) != "")) {
 			$removedlink = trim(str_replace($footerlink, "", $body));
 
-			if (strstr($body, $removedlink))
+			if (($removedlink == "") || strstr($body, $removedlink))
 				$body = $removedlink;
 
 			$body .= $footer;
@@ -1755,7 +1641,7 @@ function statusnet_convertmsg($a, $body, $no_tags = false) {
 				$str_tags .= ',';
 
 			if ($mtch[1] == "#") {
-				// Replacing the hash tags that are directed to the statusnet server with internal links
+				// Replacing the hash tags that are directed to the GNU Social server with internal links
 				$snhash = "#[url=".$mtch[2]."]".$mtch[3]."[/url]";
 				$frdchash = '#[url='.$a->get_baseurl().'/search?tag='.rawurlencode($mtch[3]).']'.$mtch[3].'[/url]';
 				$body = str_replace($snhash, $frdchash, $body);
@@ -1764,7 +1650,7 @@ function statusnet_convertmsg($a, $body, $no_tags = false) {
 			} else
 				$str_tags .= "@[url=".$mtch[2]."]".$mtch[3]."[/url]";
 				// To-Do:
-				// There is a problem with links with to statusnet groups, so these links are stored with "@" like friendica groups
+				// There is a problem with links with to GNU Social groups, so these links are stored with "@" like friendica groups
 				//$str_tags .= $mtch[1]."[url=".$mtch[2]."]".$mtch[3]."[/url]";
 		}
 	}
@@ -1774,12 +1660,12 @@ function statusnet_convertmsg($a, $body, $no_tags = false) {
 }
 
 function statusnet_fetch_own_contact($a, $uid) {
-	$ckey    = get_pconfig($uid, 'statusnet', 'consumerkey');
-	$csecret = get_pconfig($uid, 'statusnet', 'consumersecret');
-	$api     = get_pconfig($uid, 'statusnet', 'baseapi');
-	$otoken  = get_pconfig($uid, 'statusnet', 'oauthtoken');
-	$osecret = get_pconfig($uid, 'statusnet', 'oauthsecret');
-	$own_url = get_pconfig($uid, 'statusnet', 'own_url');
+	$ckey    = PConfig::get($uid, 'statusnet', 'consumerkey');
+	$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
+	$api     = PConfig::get($uid, 'statusnet', 'baseapi');
+	$otoken  = PConfig::get($uid, 'statusnet', 'oauthtoken');
+	$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
+	$own_url = PConfig::get($uid, 'statusnet', 'own_url');
 
 	$contact_id = 0;
 
@@ -1791,7 +1677,7 @@ function statusnet_fetch_own_contact($a, $uid) {
 		// Fetching user data
 		$user = $connection->get('account/verify_credentials');
 
-		set_pconfig($uid, 'statusnet', 'own_url', normalise_link($user->statusnet_profile_url));
+		PConfig::set($uid, 'statusnet', 'own_url', normalise_link($user->statusnet_profile_url));
 
 		$contact_id = statusnet_fetch_contact($uid, $user, true);
 
@@ -1833,11 +1719,11 @@ function statusnet_is_retweet($a, $uid, $body) {
 	if ($matches[1] != "")
 		$link = $matches[1];
 
-	$ckey    = get_pconfig($uid, 'statusnet', 'consumerkey');
-	$csecret = get_pconfig($uid, 'statusnet', 'consumersecret');
-	$api     = get_pconfig($uid, 'statusnet', 'baseapi');
-	$otoken  = get_pconfig($uid, 'statusnet', 'oauthtoken');
-	$osecret = get_pconfig($uid, 'statusnet', 'oauthsecret');
+	$ckey    = PConfig::get($uid, 'statusnet', 'consumerkey');
+	$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
+	$api     = PConfig::get($uid, 'statusnet', 'baseapi');
+	$otoken  = PConfig::get($uid, 'statusnet', 'oauthtoken');
+	$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
 	$hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $api);
 
 	$id = preg_replace("=https?://".$hostname."/notice/(.*)=ism", "$1", $link);