From 2333679ee0f8c8afb349fb6321e9590fcb33fd85 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sat, 21 Apr 2012 19:29:46 +0200
Subject: [PATCH 01/23] Re-Added "fromgplus" - Not working by now

---
 fromgplus/README        |   1 +
 fromgplus/fromgplus.php | 183 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 184 insertions(+)
 create mode 100644 fromgplus/README
 create mode 100644 fromgplus/fromgplus.php

diff --git a/fromgplus/README b/fromgplus/README
new file mode 100644
index 00000000..cecbb2b9
--- /dev/null
+++ b/fromgplus/README
@@ -0,0 +1 @@
+This extension is a preparation of the upcoming import of items via Google+
diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
new file mode 100644
index 00000000..88d2622f
--- /dev/null
+++ b/fromgplus/fromgplus.php
@@ -0,0 +1,183 @@
+<?php
+/**
+ * Name: From GPlus
+ * Description: Imports posts from a Google+ account and repeats them - not working by now
+ * Version: 0.1
+ * Author: Michael Vogel <ike@piratenpartei.de>
+ *
+ */
+
+function fromgplus_install() {
+	register_hook('plugin_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings');
+	register_hook('plugin_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post');
+}
+
+function fromgplus_uninstall() {
+	unregister_hook('plugin_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings');
+	unregister_hook('plugin_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post');
+}
+
+function fromgplus_addon_settings(&$a,&$s) {
+
+	if(! local_user())
+		return;
+
+	$enable_checked = (intval(get_pconfig(local_user(),'fromgplus','enable')) ? ' checked="checked"' : '');
+	$account = get_pconfig(local_user(),'fromgplus','account');
+
+	$s .= '<div class="settings-block">';
+	$s .= '<h3>' . t('Google+ Import Settings').'</h3>';
+	$s .= '<div id="fromgplus-wrapper">';
+
+	$s .= '<label id="fromgplus-enable-label" for="fromgplus-enable">'.t('Enable Google+ Import').'</label>';
+	$s .= '<input id="fromgplus-enable" type="checkbox" name="fromgplus-enable" value="1"'.$enable_checked.' />';
+	$s .= '<div class="clear"></div>';
+	$s .= '<label id="fromgplus-label" for="fromgplus-account">'.t('Google Account ID').' </label>';
+	$s .= '<input id="fromgplus-account" type="text" name="fromgplus-account" value="'.$account.'" />';
+	$s .= '</div><div class="clear"></div>';
+
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="fromgplus-submit" name="fromgplus-submit" 
+class="settings-submit" value="' . t('Submit') . '" /></div>';
+	$s .= '</div>';
+
+	return;
+}
+
+function fromgplus_addon_settings_post(&$a,&$b) {
+
+	if(! local_user())
+		return;
+
+	if($_POST['fromgplus-submit']) {
+		set_pconfig(local_user(),'fromgplus','account',trim($_POST['fromgplus-account']));
+		$enable = ((x($_POST,'fromgplus-enable')) ? intval($_POST['fromgplus-enable']) : 0);
+		set_pconfig(local_user(),'fromgplus','enable', $enable);
+		info( t('Google+ Import Settings saved.') . EOL);
+	}
+}
+/*
+function html2bbcode($html) {
+
+	$bbcode = html_entity_decode($html, ENT_QUOTES, 'UTF-8');
+
+	$bbcode = str_replace(array("\n"), array(""), $bbcode);
+	$bbcode = str_replace(array("<b>", "</b>"), array("[b]", "[/b]"), $bbcode);
+	$bbcode = str_replace(array("<i>", "</i>"), array("[i]", "[/i]"), $bbcode);
+	$bbcode = str_replace(array("<s>", "</s>"), array("[s]", "[/s]"), $bbcode);
+	$bbcode = str_replace(array("<br />"), array("\n"), $bbcode);
+
+	$bbcode = trim(strip_tags($bbcode));
+	return($bbcode);
+}
+
+function friendicapost($post) {
+	global $friendica;
+
+	$api = new Statusnet($friendica["user"], $friendica["pw"], "GooglePlus", $friendica["server"]);
+	$ret = $api->updateStatus($post);
+	$api->endSession();
+}
+
+function handleattachments($item) {
+	$post = "";
+
+	foreach ($item->object->attachments as $attachment) {
+		switch($attachment->objectType) {
+			case "video":
+				//$post .= "\n\n[url=".$attachment->url."]".
+				//		"[size=large][b]".html2bbcode($attachment->displayName)."[/b][/size][/url]\n";
+				$post .= "\n\n[bookmark=".$attachment->url."]".html2bbcode($attachment->displayName)."[/bookmark]\n";
+
+				//if (strpos($attachment->embed->url, "youtube.com"))
+				//	$post .= "[youtube]".$attachment->url."[/youtube]\n";
+				//else
+				///	$post .= "[url=".$attachment->url."][img]".$attachment->image->url."[/img][/url]\n";
+
+				///$post .= "[quote]".trim(html2bbcode($attachment->content))."[/quote]";
+				break;
+
+			case "article":
+				//$post .= "\n\n[url=".$attachment->url."]".
+				//		"[size=large][b]".html2bbcode($attachment->displayName)."[/b][/size][/url]\n";
+				$post .= "\n\n[bookmark=".$attachment->url."]".html2bbcode($attachment->displayName)."[/bookmark]\n";
+				$post .= "[quote]".trim(html2bbcode($attachment->content))."[/quote]";
+				break;
+
+			case "photo":
+				//$post .= "\n\n[url=".$attachment->fullImage->url."]".
+				//		"[img]".$attachment->fullImage->url."[/img][/url]\n";
+				$post .= "\n\n[img]".$attachment->fullImage->url."[/img]\n";
+				if ($attachment->displayName != "")
+					$post .= html2bbcode($attachment->displayName)."\n";
+				break;
+
+			case "photo-album":
+				$post .= "\n\n[url=".$attachment->url."]".
+						"[size=large][b]".html2bbcode($attachment->displayName)."[/b][/size][/url]\n";
+				break;
+
+			default:
+				print_r($attachment);
+				die();
+				break;
+		}
+	}
+	return($post);
+}
+
+$result = 
+file_get_contents("https://www.googleapis.com/plus/v1/people/".$google["id"]."/activities/public?alt=json&pp=1&key=".$google["key"]."&maxResults=".$google["maxfetch"]);
+$activities = json_decode($result);
+
+$state = array("lastid"=>'');
+if (file_exists($statefile))
+	$state = unserialize(file_get_contents($statefile));
+
+$lastid = "";
+
+foreach($activities->items as $item) {
+	if ($item->id == $state["lastid"])
+		break;
+
+	if ($lastid == "")
+		$lastid = $item->id;
+
+	switch($item->object->objectType) {
+		case "note":
+			$post = html2bbcode($item->object->content);
+
+			if (is_array($item->object->attachments))
+				$post .= handleattachments($item);
+			friendicapost($post);
+			break;
+
+		case "activity":
+			$post = html2bbcode($item->annotation)."\n";
+			//$post .= html2bbcode("&#x2672; ");
+			$post .= html2bbcode("&#x267B; ");
+			$post .= "[url=".$item->object->actor->url."]".$item->object->actor->displayName."[/url]";
+			$post .= " \n";
+			//$post .= "[quote]";
+
+			$post .= html2bbcode($item->object->content);
+
+			if (is_array($item->object->attachments))
+				$post .= "\n".trim(handleattachments($item));
+
+			//$post .= "[/quote]";
+
+			friendicapost($post);
+			break;
+
+		default:
+			print_r($item);
+			die();
+			break;
+	}
+}
+
+if ($lastid != "") {
+	$state['lastid'] = $lastid;
+	file_put_contents($statefile, serialize($state));
+}
+*/
-- 
2.45.2


From 7e9b3450c53fcf8d6057d789fbe0ad95b34a90f1 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Mon, 23 Apr 2012 22:58:52 +0200
Subject: [PATCH 02/23] Take the name of the bookmark link as title - when not
 set.

---
 tumblr/tumblr.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 31021842..3dd4daed 100755
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -166,8 +166,13 @@ function tumblr_send(&$a,&$b) {
 			}
 		}
 		if(count($tag_arr))
-			$tags = implode(',',$tag_arr);		
+			$tags = implode(',',$tag_arr);
 
+		if ($b['title'] == '') {
+			// Take the description from the bookmark
+			if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches))
+				$b['title'] = $matches[2];
+		}
 
 		$params = array(
 			'email' => $tmbl_username,
-- 
2.45.2


From eeed84f200c44210af3ddd9236d0ef32fecfb56c Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Tue, 24 Apr 2012 00:23:33 +0200
Subject: [PATCH 03/23] Tumblr: Export improved - autodetection of links.

---
 tumblr/tumblr.php | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 3dd4daed..85191f74 100755
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -168,22 +168,31 @@ function tumblr_send(&$a,&$b) {
 		if(count($tag_arr))
 			$tags = implode(',',$tag_arr);
 
+		$link = "";
 		if ($b['title'] == '') {
 			// Take the description from the bookmark
 			if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches))
-				$b['title'] = $matches[2];
+				$link = $matches[1];
+				$b['title'] = html_entity_decode($matches[2],ENT_QUOTES,'UTF-8');
 		}
 
 		$params = array(
 			'email' => $tmbl_username,
 			'password' => $tmbl_password,
-			'title' => $b['title'],
-			'type' => 'regular',
 			'format' => 'html',
 			'generator' => 'Friendica',
-			'tags' => $tags,
-			'body' => bbcode($b['body'])
-		);
+			'tags' => $tags);
+
+		if ($link != '') {
+			$params['type'] = "link";
+			$params['name'] = $b['title'],
+			$params['url'] = $link;
+			$params['description'] = bbcode($b['body']);
+		} else {
+			$params['type'] = "regular";
+			$params['title'] = $b['title'],
+			$params['body'] = bbcode($b['body']);
+		}
 
 		$x = post_url($tmbl_blog,$params);
 		$ret_code = $a->get_curl_code();
@@ -192,7 +201,7 @@ function tumblr_send(&$a,&$b) {
 		elseif($ret_code == 403)
 			logger('tumblr_send: authentication failure');
 		else
-			logger('tumblr_send: general error: ' . print_r($x,true)); 
+			logger('tumblr_send: general error: ' . print_r($x,true));
 
 	}
 }
-- 
2.45.2


From 8e6f6a14559cc77ebc16005af75ed491d3b3cbe6 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Tue, 24 Apr 2012 00:50:54 +0200
Subject: [PATCH 04/23] Tumblr: Bugfix

---
 tumblr/tumblr.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 85191f74..95755e39 100755
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -185,12 +185,12 @@ function tumblr_send(&$a,&$b) {
 
 		if ($link != '') {
 			$params['type'] = "link";
-			$params['name'] = $b['title'],
+			$params['name'] = $b['title'];
 			$params['url'] = $link;
 			$params['description'] = bbcode($b['body']);
 		} else {
 			$params['type'] = "regular";
-			$params['title'] = $b['title'],
+			$params['title'] = $b['title'];
 			$params['body'] = bbcode($b['body']);
 		}
 
-- 
2.45.2


From 64c68ac97815a516d36fa0f6c0b4734adf0f621c Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Tue, 24 Apr 2012 01:42:20 +0200
Subject: [PATCH 05/23] tumblr: Now videos are detected as well.

---
 tumblr/tumblr.php | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 95755e39..42518c05 100755
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -169,11 +169,26 @@ function tumblr_send(&$a,&$b) {
 			$tags = implode(',',$tag_arr);
 
 		$link = "";
-		if ($b['title'] == '') {
-			// Take the description from the bookmark
-			if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches))
-				$link = $matches[1];
+		$video = false;
+
+		// Checking for a bookmark
+		if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches)) {
+			$link = $matches[1];
+			if ($b['title'] == '')
 				$b['title'] = html_entity_decode($matches[2],ENT_QUOTES,'UTF-8');
+
+			$body = $b['body'];
+			// 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 the bookmark
+			$body2 = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'',$body2);
+			$body = $body1.$body2;
+
+			$video = ((stristr($link,'youtube')) || (stristr($link,'youtu.be')) || (stristr($mtch[1],'vimeo')));
 		}
 
 		$params = array(
@@ -183,11 +198,15 @@ function tumblr_send(&$a,&$b) {
 			'generator' => 'Friendica',
 			'tags' => $tags);
 
-		if ($link != '') {
+		if (($link != '') and $video) {
+			$params['type'] = "video";
+			$params['embed'] = $link;
+			$params['caption'] = bbcode($body);
+		} else if (($link != '') and !$video) {
 			$params['type'] = "link";
 			$params['name'] = $b['title'];
 			$params['url'] = $link;
-			$params['description'] = bbcode($b['body']);
+			$params['description'] = bbcode($body);
 		} else {
 			$params['type'] = "regular";
 			$params['title'] = $b['title'];
-- 
2.45.2


From 71ec9fdd9893ad429898dd5a6a0b5d1d1ed481c6 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Tue, 24 Apr 2012 02:04:51 +0200
Subject: [PATCH 06/23] Tumblr: The video export now shows the title

---
 tumblr/tumblr.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 42518c05..650e0b18 100755
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -201,7 +201,10 @@ function tumblr_send(&$a,&$b) {
 		if (($link != '') and $video) {
 			$params['type'] = "video";
 			$params['embed'] = $link;
-			$params['caption'] = bbcode($body);
+			if ($b['title'] != '')
+				$params['caption'] = '<p><strong><a href="'.$link.'">'.$b['title']."</a></strong></p>".bbcode($body);
+			else
+				$params['caption'] = bbcode($body);
 		} else if (($link != '') and !$video) {
 			$params['type'] = "link";
 			$params['name'] = $b['title'];
-- 
2.45.2


From a4c505489eea8f1a10145c695a727dda58a1aba3 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Wed, 9 May 2012 14:53:02 +0200
Subject: [PATCH 07/23] Tumblr: Some changes

---
 tumblr/tumblr.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 650e0b18..648911ff 100755
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -202,14 +202,16 @@ function tumblr_send(&$a,&$b) {
 			$params['type'] = "video";
 			$params['embed'] = $link;
 			if ($b['title'] != '')
-				$params['caption'] = '<p><strong><a href="'.$link.'">'.$b['title']."</a></strong></p>".bbcode($body);
+				$params['caption'] = '<h1><a href="'.$link.'">'.$b['title'].
+							"</a></h1><p>".bbcode($body)."</p>";
 			else
 				$params['caption'] = bbcode($body);
 		} else if (($link != '') and !$video) {
 			$params['type'] = "link";
 			$params['name'] = $b['title'];
 			$params['url'] = $link;
-			$params['description'] = bbcode($body);
+			//$params['description'] = bbcode($body);
+			$params['description'] = bbcode($b["body"]);
 		} else {
 			$params['type'] = "regular";
 			$params['title'] = $b['title'];
-- 
2.45.2


From ff27645c78bac0bbbbdd5d8c6ef0b0ddc509142b Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Tue, 29 May 2012 16:41:20 +0200
Subject: [PATCH 08/23] This commit is useless :)

---
 facebook/facebook.php | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/facebook/facebook.php b/facebook/facebook.php
index f70524a6..e7e2ab3e 100644
--- a/facebook/facebook.php
+++ b/facebook/facebook.php
@@ -79,38 +79,38 @@ function facebook_init(&$a) {
 
 	if (x($_REQUEST, "realtime_cb") && x($_REQUEST, "realtime_cb")) {
 		logger("facebook_init: Facebook Real-Time callback called", LOGGER_DEBUG);
-		
+
 		if (x($_REQUEST, "hub_verify_token")) {
 			// this is the verification callback while registering for real time updates
-			
+
 			$verify_token = get_config('facebook', 'cb_verify_token');
 			if ($verify_token != $_REQUEST["hub_verify_token"]) {
 				logger('facebook_init: Wrong Facebook Callback Verifier - expected ' . $verify_token . ', got ' . $_REQUEST["hub_verify_token"]);
 				return;
 			}
-			
+
 			if (x($_REQUEST, "hub_challenge")) {
 				logger('facebook_init: Answering Challenge: ' . $_REQUEST["hub_challenge"], LOGGER_DATA);
 				echo $_REQUEST["hub_challenge"];
 				die();
 			}
 		}
-		
+
 		require_once('include/items.php');
-		
+
 		// this is a status update
 		$content = file_get_contents("php://input");
 		if (is_numeric($content)) $content = file_get_contents("php://input");
 		$js = json_decode($content);
 		logger(print_r($js, true), LOGGER_DATA);
-		
+
 		if (!isset($js->object) || $js->object != "user" || !isset($js->entry)) {
 			logger('facebook_init: Could not parse Real-Time Update data', LOGGER_DEBUG);
 			return;
 		}
-		
+
 		$affected_users = array("feed" => array(), "friends" => array());
-		
+
 		foreach ($js->entry as $entry) {
 			$fbuser = $entry->uid;
 			foreach ($entry->changed_fields as $field) {
@@ -119,20 +119,20 @@ function facebook_init(&$a) {
 					continue;
 				}
 				if (in_array($fbuser, $affected_users[$field])) continue;
-				
+
 				$r = q("SELECT `uid` FROM `pconfig` WHERE `cat` = 'facebook' AND `k` = 'self_id' AND `v` = '%s' LIMIT 1", dbesc($fbuser));
 				if(! count($r))
 					continue;
 				$uid = $r[0]['uid'];
-				
+
 				$access_token = get_pconfig($uid,'facebook','access_token');
 				if(! $access_token)
 					return;
-				
+
 				switch ($field) {
 					case "feed":
 						logger('facebook_init: FB-User ' . $fbuser . ' / feed', LOGGER_DEBUG);
-						
+
 						if(! get_pconfig($uid,'facebook','no_wall')) {
 							$private_wall = intval(get_pconfig($uid,'facebook','private_wall'));
 							$s = fetch_url('https://graph.facebook.com/me/feed?access_token=' . $access_token);
@@ -146,11 +146,11 @@ function facebook_init(&$a) {
 								}
 							}
 						}
-						
+
 					break;
 					case "friends":
 						logger('facebook_init: FB-User ' . $fbuser . ' / friends', LOGGER_DEBUG);
-						
+
 						fb_get_friends($uid, false);
 						set_pconfig($uid,'facebook','friend_check',time());
 					break;
@@ -162,7 +162,7 @@ function facebook_init(&$a) {
 		}
 	}
 
-	
+
 	if($a->argc != 2)
 		return;
 	$nick = $a->argv[1];
@@ -188,7 +188,7 @@ function facebook_init(&$a) {
 
 		$x = fetch_url('https://graph.facebook.com/oauth/access_token?client_id='
 			. $appid . '&client_secret=' . $appsecret . '&redirect_uri='
-			. urlencode($a->get_baseurl() . '/facebook/' . $nick) 
+			. urlencode($a->get_baseurl() . '/facebook/' . $nick)
 			. '&code=' . $auth_code);
 
 		logger('facebook_init: returned access token: ' . $x, LOGGER_DATA);
@@ -404,6 +404,7 @@ function fb_get_friends($uid, $fullsync = true) {
 	$access_token = get_pconfig($uid,'facebook','access_token');
 
 	$no_linking = get_pconfig($uid,'facebook','no_linking');
+
 	if($no_linking)
 		return;
 
@@ -428,7 +429,7 @@ function fb_get_friends($uid, $fullsync = true) {
 }
 
 // This is the POST method to the facebook settings page
-// Content is posted to Facebook in the function facebook_post_hook() 
+// Content is posted to Facebook in the function facebook_post_hook()
 
 /**
  * @param App $a
@@ -439,7 +440,7 @@ function facebook_post(&$a) {
 	if($uid){
 
 
-		$fb_limited = get_config('facebook','restrict');
+		$fb_limited = get_config('facebook','crestrict');
 
 
 		$value = ((x($_POST,'post_by_default')) ? intval($_POST['post_by_default']) : 0);
@@ -452,7 +453,7 @@ function facebook_post(&$a) {
 
 		$private_wall = ((x($_POST,'facebook_private_wall')) ? intval($_POST['facebook_private_wall']) : 0);
 		set_pconfig($uid,'facebook','private_wall',$private_wall);
-	
+
 
 		set_pconfig($uid,'facebook','blocked_apps',escape_tags(trim($_POST['blocked_apps'])));
 
@@ -462,7 +463,7 @@ function facebook_post(&$a) {
 			if($linkvalue == 0)
 				set_pconfig($uid,'facebook','no_linking', 1);
 		}
-		else	
+		else
 			set_pconfig($uid,'facebook','no_linking', (($linkvalue) ? 0 : 1));
 
 		// FB linkage was allowed but has just been turned off - remove all FB contacts and posts
-- 
2.45.2


From c43a3773c8337c4efbfa5f963f4cf888029055f3 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 17 Jun 2012 20:35:20 +0200
Subject: [PATCH 09/23] Libertree: Now the title is included in the message as
 well

---
 libertree/libertree.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/libertree/libertree.php b/libertree/libertree.php
index 4f0c814d..f57c773b 100755
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -167,16 +167,21 @@ function libertree_send(&$a,&$b) {
 			}
 		}
 		if(count($tag_arr))
-			$tags = implode(',',$tag_arr);		
+			$tags = implode(',',$tag_arr);
 
+		$title = $b['title'];
+		$body = $b['body'];
+
+		if(strlen($title))
+			$body = "[b]".html_entity_decode($title)."[/b]\n\n".$body;
 
 		$params = array(
-			'text' => bb2diaspora($b['body'])
+			'text' => bb2diaspora($body)
 		//	'token' => $ltree_api_token
 		);
 
 		$result = post_url($ltree_blog,$params);
-		logger('libertree: ' . $result);	
+		logger('libertree: ' . $result);
 
 	}
 }
-- 
2.45.2


From 57441b4def0f4bb42044ea444b6c59bcaa166d61 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Mon, 18 Jun 2012 01:30:44 +0200
Subject: [PATCH 10/23] Fixed a bug where a title was set in a way that
 affected other addons. Additionally some changes to bb2markdown.

---
 facebook/facebook.php   |  8 ++++----
 statusnet/statusnet.php | 10 +++++-----
 tumblr/tumblr.php       | 13 +++++++------
 twitter/twitter.php     |  4 ++--
 wppost/wppost.php       | 12 +++++++-----
 5 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/facebook/facebook.php b/facebook/facebook.php
index fd9adad5..6ff2a2ef 100644
--- a/facebook/facebook.php
+++ b/facebook/facebook.php
@@ -941,7 +941,7 @@ function facebook_post_hook(&$a,&$b) {
 			if($fb_token && ($toplevel || $b['private'] || $reply)) {
 				logger('facebook: able to post');
 				require_once('library/facebook.php');
-				require_once('include/bbcode.php');	
+				require_once('include/bbcode.php');
 
 				$msg = $b['body'];
 
@@ -1016,7 +1016,7 @@ function facebook_post_hook(&$a,&$b) {
 				}
 
 				// At first convert the text to html
-				$html = bbcode($body);
+				$html = bbcode($body, false, false);
 
 				// Then convert it to plain text
 				$msg = trim($b['title']." \n\n".html2plain($html, 0, true));
@@ -1133,8 +1133,8 @@ function facebook_post_hook(&$a,&$b) {
 				} else {
 					// if its only a message and a subject and the message is larger than 500 characters then post it as note
 					$postvars = array(
-						'access_token' => $fb_token, 
-						'message' => bbcode($b['body']),
+						'access_token' => $fb_token,
+						'message' => bbcode($b['body'], false, false),
 						'subject' => $b['title'],
 					);
 					$url = 'https://graph.facebook.com/me/notes';
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index dd876168..d7ec4abb 100755
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -426,15 +426,15 @@ function statusnet_post_hook(&$a,&$b) {
 
 	if($ckey && $csecret && $otoken && $osecret) {
 
-		require_once('include/bbcode.php');	
+		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 
+                // 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.
                 if (! $b['title']=='') {
-                    $tmp = $b['title'] . ' : '. $b['body'];
+			$tmp = $b['title'].": \n".$b['body'];
 //                    $tmp = substr($tmp, 0, 4*$max_char);
                 } else {
                     $tmp = $b['body']; // substr($b['body'], 0, 3*$max_char);
@@ -476,7 +476,7 @@ function statusnet_post_hook(&$a,&$b) {
                 }
                 // ok, all the links we want to send out are save, now strip 
                 // away the remaining bbcode
-		$msg = strip_tags(bbcode($tmp));
+		$msg = strip_tags(bbcode($tmp, false, false));
 		// quotes not working - let's try this
 		$msg = html_entity_decode($msg);
 		if (( strlen($msg) > $max_char) && $max_char > 0) {
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index a39bc9d6..03a67949 100755
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -170,12 +170,13 @@ function tumblr_send(&$a,&$b) {
 
 		$link = "";
 		$video = false;
+		$title = trim($b['title']);
 
 		// Checking for a bookmark
 		if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches)) {
 			$link = $matches[1];
-			if ($b['title'] == '')
-				$b['title'] = html_entity_decode($matches[2],ENT_QUOTES,'UTF-8');
+			if ($title == '')
+				$title = html_entity_decode($matches[2],ENT_QUOTES,'UTF-8');
 
 			$body = $b['body'];
 			// splitting the text in two parts:
@@ -201,20 +202,20 @@ function tumblr_send(&$a,&$b) {
 		if (($link != '') and $video) {
 			$params['type'] = "video";
 			$params['embed'] = $link;
-			if ($b['title'] != '')
-				$params['caption'] = '<h1><a href="'.$link.'">'.$b['title'].
+			if ($title != '')
+				$params['caption'] = '<h1><a href="'.$link.'">'.$title.
 							"</a></h1><p>".bbcode($body)."</p>";
 			else
 				$params['caption'] = bbcode($body);
 		} else if (($link != '') and !$video) {
 			$params['type'] = "link";
-			$params['name'] = $b['title'];
+			$params['name'] = $title;
 			$params['url'] = $link;
 			//$params['description'] = bbcode($body);
 			$params['description'] = bbcode($b["body"]);
 		} else {
 			$params['type'] = "regular";
-			$params['title'] = $b['title'];
+			$params['title'] = $title;
 			$params['body'] = bbcode($b['body']);
 		}
 
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 0ac9396d..8de7d06d 100755
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -290,7 +290,7 @@ function twitter_post_hook(&$a,&$b) {
 		logger('twitter: we have customer key and oauth stuff, going to send.', LOGGER_DEBUG);
 
 		require_once('library/twitteroauth.php');
-		require_once('include/bbcode.php');	
+		require_once('include/bbcode.php');
 		$tweet = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
                 // in theory max char is 140 but T. uses t.co to make links 
                 // longer so we give them 10 characters extra
@@ -341,7 +341,7 @@ function twitter_post_hook(&$a,&$b) {
                 }
                 // ok, all the links we want to send out are save, now strip 
                 // away the remaining bbcode
-		$msg = strip_tags(bbcode($tmp));
+		$msg = strip_tags(bbcode($tmp, false, false));
 		// quotes not working - let's try this
 		$msg = html_entity_decode($msg);
 		if (( strlen($msg) > $max_char) && $max_char > 0) {
diff --git a/wppost/wppost.php b/wppost/wppost.php
index ee9acb0d..e8b6fc6d 100755
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -179,24 +179,26 @@ function wppost_send(&$a,&$b) {
 		require_once('include/bbcode.php');
 		require_once('include/html2plain.php');
 
+		$wptitle = trim($b['title']);
+
 		// If the title is empty then try to guess
-		if ($b['title'] == '') {
+		if ($wptitle == '') {
 			// Take the description from the bookmark
 			if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches))
-				$b['title'] = $matches[2];
+				$wptitle = $matches[2];
 
 			// If no bookmark is found then take the first line
-			if ($b['title'] == '') {
+			if ($wptitle == '') {
 				$title = html2plain(bbcode($b['body']), 0, true);
 				$pos = strpos($title, "\n");
 				if (($pos == 0) or ($pos > 60))
 					$pos = 60;
 
-				$b['title'] = substr($title, 0, $pos);
+				$wptitle = substr($title, 0, $pos);
 			}
 		}
 
-		$title = '<title>' . (($b['title']) ? $b['title'] : t('Post from Friendica')) . '</title>';
+		$title = '<title>' . (($wptitle) ? $wptitle : t('Post from Friendica')) . '</title>';
 		$post = $title . bbcode($b['body']);
 
 		$wp_backlink = intval(get_pconfig($b['uid'],'wppost','backlink'));
-- 
2.45.2


From fe7c741eed1afa26ddab7a07cbe5d1944d3d1584 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Mon, 18 Jun 2012 21:54:35 +0200
Subject: [PATCH 11/23] Libertree: Improve the format of postings

---
 libertree/libertree.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/libertree/libertree.php b/libertree/libertree.php
index f57c773b..fc9dcc44 100755
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -172,11 +172,25 @@ function libertree_send(&$a,&$b) {
 		$title = $b['title'];
 		$body = $b['body'];
 
+		// Insert a newline before and after a quote
+		$body = str_ireplace("[quote", "\n\n[quote", $body);
+		$body = str_ireplace("[/quote]", "[/quote]\n\n", $body);
+
+		// remove multiple newlines
+		do {
+			$oldbody = $body;
+                        $body = str_replace("\n\n\n", "\n\n", $body);
+                } while ($oldbody != $body);
+
+		// convert to markdown
+		$body = bb2diaspora($body);
+
+		// Adding the title
 		if(strlen($title))
-			$body = "[b]".html_entity_decode($title)."[/b]\n\n".$body;
+			$body = "## ".html_entity_decode($title)."\n\n".$body;
 
 		$params = array(
-			'text' => bb2diaspora($body)
+			'text' => $body
 		//	'token' => $ltree_api_token
 		);
 
-- 
2.45.2


From b863aa697ede1b8de522fe125f9bfd9e7fb1b782 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 19 Jun 2012 02:30:44 -0700
Subject: [PATCH 12/23] page updates

---
 page/page.php | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 79 insertions(+), 1 deletion(-)

diff --git a/page/page.php b/page/page.php
index 129af412..4ae471ba 100755
--- a/page/page.php
+++ b/page/page.php
@@ -10,10 +10,18 @@
  */
 
 function page_install() {
-	register_hook('page_end', 'addon/page/page.php', 'page_page_end');
+	register_hook('network_mod_init', 'addon/page/page.php', 'page_network_mod_init');
+	register_hook('plugin_settings', 'addon/page/page.php', 'page_plugin_settings');
+	register_hook('plugin_settings_post', 'addon/page/page.php', 'page_plugin_settings_post');
+
 }
 
 function page_uninstall() {
+	unregister_hook('network_mod_init', 'addon/page/page.php', 'page_network_mod_init');
+	unregister_hook('plugin_settings', 'addon/page/page.php', 'page_plugin_settings');
+	unregister_hook('plugin_settings_post', 'addon/page/page.php', 'page_plugin_settings_post');
+
+	// remove only - obsolete
 	unregister_hook('page_end', 'addon/page/page.php', 'page_page_end');
 }
 
@@ -71,5 +79,75 @@ function page_page_end($a,&$b) {
 		$a->page['aside'] = $page . $a->page['aside'];
 }
 
+function page_network_mod_init($a,$b) {
+
+	$page = '<div id="page-sidebar" class="widget">
+			<div class="title tool">
+			<h3>'.t("Forums").'</h3></div>
+			<div id="sidebar-page-list"><ul>';
+
+	$show_total = intval(get_pconfig(local_user(),'page','max_pages'));
+	if($show_total === false)
+		$show_total = 6;
+	$contacts = page_getpage($a->user['uid']);
+
+	$total_shown = 0;
+	$more = false;
+
+	foreach($contacts as $contact) {
+		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" title="' . $contact['url'] . '" class="label" target="external-link">'.
+				$contact["name"]."</a></li>";
+		$total_shown ++;
+		if(($show_total) && ($total_shown == $show_total)) {
+			$more = true;
+			$page .= '</ul><div id="hide-comments-page-widget" class="fakelink" onclick="showHideComments(\'page-widget\');" >' . t('show more') 
+				. '</div><div id="collapsed-comments-page-widget" style="display: none;" ><ul>';
+		} 
+	}
+	if($more)
+		$page .= '</div>';
+	$page .= "</ul></div></div>";
+	if (sizeof($contacts) > 0)
+		$a->page['aside'] = $page . $a->page['aside'];
+}
+
+function page_plugin_settings_post($a,$post) {
+	if(! local_user() || (! x($_POST,'page-settings-submit')))
+		return;
+
+	set_pconfig(local_user(),'page','max_pages',intval($_POST['page_max_pages']));
+	info( t('Page settings updated.') . EOL);
+}
+
+
+function page_plugin_settings(&$a,&$s) {
+
+	if(! local_user())
+		return;
+
+	/* Add our stylesheet to the page so we can make our settings look nice */
+
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/page/page.css' . '" media="all" />' . "\r\n";
+
+	/* Get the current state of our config variable */
+
+	$max_pages = get_pconfig(local_user(),'page','max_pages');
+	if($max_pages === false)
+		$max_pages = 6;
+	
+	/* Add some HTML to the existing form */
+
+	$s .= '<div class="settings-block">';
+	$s .= '<h3>' . t('Page Settings') . '</h3>';
+	$s .= '<div id="page-settings-wrapper">';
+	$s .= '<label id="page-settings-label" for="page-max-pages">' . t('How many forums to display on sidebar without paging') . '</label>';
+	$s .= '<input id="page-max-pages" type="text" name="page_max_pages" value="' . intval($max_pages) . '" ' . '/>';
+	$s .= '</div><div class="clear"></div>';
+
+	/* provide a submit button */
+
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="page-settings-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
+
+}
 
 
-- 
2.45.2


From eba055ab80326b7775b130eb568f64d3f43f303a Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 19 Jun 2012 02:34:32 -0700
Subject: [PATCH 13/23] page settings css

---
 page/page.css | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 page/page.css

diff --git a/page/page.css b/page/page.css
new file mode 100644
index 00000000..f145ee0f
--- /dev/null
+++ b/page/page.css
@@ -0,0 +1,14 @@
+
+
+
+#page-settings-label {
+	float: left;
+	width: 200px;
+	margin-bottom: 25px;
+}
+
+#page-max-pages {
+	float: left;
+}
+
+
-- 
2.45.2


From f48b75bb659c074089ec411b5bb4468b3d72c458 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 19 Jun 2012 02:35:57 -0700
Subject: [PATCH 14/23] package update

---
 page.tgz | Bin 1185 -> 1900 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/page.tgz b/page.tgz
index c94f01b214e1c3285c36513420649539f2517c4f..d3f9cac70e9654d6318ef7c3d11141f75c35c17b 100644
GIT binary patch
literal 1900
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

literal 1185
zcmV;S1YY|eiwFRc{Gm?(1MOB(Q{y%e&TITDwi;SH9K=Z=fq^*f%^f%Qa2y@3bA8|#
zB5WnrpxCY~L(>lby}Pm#2-j=-P_7TvH<{R4t#()YeNs~Jxd>a&iyq?OVAvWA_YVex
z{Z?-{8jSY)*507i?;i|%dk3T5VASg2pf_s4@R{qfs7k{%Kx@I{xzx8Z`+{FFACCHm
zhlgLIrmu*C_@}RKkrvOC<8S!i@An3e_#YzwdwY9>7WAH}o(=rZ`5%9eynEsHwg=nr
zo-f1^{D^9x(Q8r0S{6p;*%5q5^Sct1EKLdd4B~vTs4{7mK-wuGkc&d+w<3W;=vl58
zJc|XOL4$8S{0@cuD0FGV^}9V9zpPA}>mxXoHv&#q48VAS;~&<HbTQk6+^>0w8S<=2
zTBvG{-q*{`P;ttIf{*zezsD4)keVBj6<ix3yNRG!_z694R%J2m&j!4b8EQePpaZ{q
zZ7t@wS)s4eJiiI-Cay%5_&eb9B+0XI<K&Rpx~%;=$KL(Z1lY01DXQ$>N%ADiTo`%=
zTa`>GkLR_w$Ux*l1YB#r3~(iy<2*AwMoJ_2C14*;-krSq38pfc?!dItiXItif}RT*
z>wNm={OlB_&9bT2ZnuAadvbn)Zo=H<`eqt|pUiaT!^`)tVTwwq7E_Ggug6#sjlNB2
zWv&yH$Mq5@1@JNkwnKKAnOm;v^1XIlDAm7Ndl<qyY#PWJm{b6&Zzh!hSpt8ePOpt+
z2p*@w!+v=QtAVAW&Tw(L&cSf|ESjvGF6{Vn2N)H*F<}ifBa;m~4#{f!_ISd#7XK1=
z(Y`00nM!AY&HrbbS#cd~@tyCsu5Gor_p?kbVSxvXjsy09KE^L?FIYncLx-fortmDG
z3Ei|u<@0%cj;c~<uZ?R148J>R+`ow)LUiEl9PA|dUie6gk6ntO*Fkcc>K{|&j}v(d
zGKm-&c1xLvYpxl@ikD@??qq`cWD_FVdNy_=4Q4iZu9~@YZ{l}Nz}}FAO4jN6;}C7*
z5EnhHraVoGU7L?Y&L-nZP5fi;iNrTg$L5x5nVB3<=T(V!U55TWWN2%F+QIi3SEV4I
zf2t+uQZJN*(kzvT7!|f_-*?Tjz-u<kGjY7`OTF{4T+AUAa-N!q4SEc)T_&wxOC3kd
zhc0}kB<T7KxH3<tQL;1%I2%r2%puichE84DJNDs<?o)IMu(_cYiPRy^Z3vhmTWbCy
zcC!P;uZ2Qyt}%4P#IJa-Wn3X6*$qQ3iL>_8W7B2hkRz!|PS`QE?lA)|UXV%7f=yl`
z7}b4VlVfxxj;-OL^C3!LEs+!@vP-vu$V^!ar4iz)`We3wwo*J6v6Ar(>I&1n#f7h$
zb-^e9(aKMF`7)SLS4`lOFHkjp2kb_>R02tLT|=BJ#S8oa`$8d&P7+xbiZ9ptSZTT4
zz6X0@P(LVBXH#i58TqYktnNWwh5e=$(_t^=Zz7*PNVo$NJkJylg<&s3pVO(LlMYQh
z_-wBJ?eYHWe=rUX4h{|u4h{|u4h{|u4h{|u4h{|u4h{|u4lDct3#u&T04M+e%qc><

-- 
2.45.2


From 4cdf19966d4fa9fa20a5883fa6c94bd8e6cbe3ec Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 19 Jun 2012 03:02:42 -0700
Subject: [PATCH 15/23] final cleanup for this round

---
 page.tgz      | Bin 1900 -> 1897 bytes
 page/page.php |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/page.tgz b/page.tgz
index d3f9cac70e9654d6318ef7c3d11141f75c35c17b..7fcbf750c9e8f84ec003a6a59ce90222d415925d 100644
GIT binary patch
literal 1897
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

literal 1900
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

diff --git a/page/page.php b/page/page.php
index 4ae471ba..1d2aec63 100755
--- a/page/page.php
+++ b/page/page.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Name: Page
- * Description: Shows lists of community pages (improved performance over 'pages')
+ * Description: Shows list of subscribed community pages/forums on network sidebar
  * Version: 1.0
  * Author: Mike Macgirvin <mike@macgirvin.com>
  * based on pages plugin by
-- 
2.45.2


From 9c4f69cf7fb4637d0dd1b308b105124a78d5a211 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 19 Jun 2012 03:27:51 -0700
Subject: [PATCH 16/23] randomise page results of desired

---
 page.tgz      | Bin 1897 -> 2054 bytes
 page/page.css |   4 ++--
 page/page.php |  21 ++++++++++++++++++---
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/page.tgz b/page.tgz
index 7fcbf750c9e8f84ec003a6a59ce90222d415925d..43eb2b5616195fb85ed7713dc21f548ea544dae9 100644
GIT binary patch
literal 2054
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

literal 1897
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

diff --git a/page/page.css b/page/page.css
index f145ee0f..b8d84fef 100644
--- a/page/page.css
+++ b/page/page.css
@@ -1,13 +1,13 @@
 
 
 
-#page-settings-label {
+#page-settings-label, #page-random-label {
 	float: left;
 	width: 200px;
 	margin-bottom: 25px;
 }
 
-#page-max-pages {
+#page-max-pages, #page-random {
 	float: left;
 }
 
diff --git a/page/page.php b/page/page.php
index 1d2aec63..80d902de 100755
--- a/page/page.php
+++ b/page/page.php
@@ -26,11 +26,13 @@ function page_uninstall() {
 }
 
 
-function page_getpage($uid) {
+function page_getpage($uid,$randomise = false) {
 
 
 	$pagelist = array();
 
+	$random = (($randomise) ? ' order by rand ' : ' order by name asc ');
+
 	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
 			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
 			order by name asc ",
@@ -89,7 +91,9 @@ function page_network_mod_init($a,$b) {
 	$show_total = intval(get_pconfig(local_user(),'page','max_pages'));
 	if($show_total === false)
 		$show_total = 6;
-	$contacts = page_getpage($a->user['uid']);
+	$randomise = intval(get_pconfig(local_user(),'page','randomise'));
+
+	$contacts = page_getpage($a->user['uid'],$randomise);
 
 	$total_shown = 0;
 	$more = false;
@@ -116,6 +120,8 @@ function page_plugin_settings_post($a,$post) {
 		return;
 
 	set_pconfig(local_user(),'page','max_pages',intval($_POST['page_max_pages']));
+	set_pconfig(local_user(),'page','randomise',intval($_POST['page_random']));
+
 	info( t('Page settings updated.') . EOL);
 }
 
@@ -134,6 +140,10 @@ function page_plugin_settings(&$a,&$s) {
 	$max_pages = get_pconfig(local_user(),'page','max_pages');
 	if($max_pages === false)
 		$max_pages = 6;
+
+	$randomise = intval(get_pconfig(local_user(),'page','randomise'));
+	$randomise_checked = (($randomise) ? ' checked="checked" ' : '');
+
 	
 	/* Add some HTML to the existing form */
 
@@ -142,7 +152,12 @@ function page_plugin_settings(&$a,&$s) {
 	$s .= '<div id="page-settings-wrapper">';
 	$s .= '<label id="page-settings-label" for="page-max-pages">' . t('How many forums to display on sidebar without paging') . '</label>';
 	$s .= '<input id="page-max-pages" type="text" name="page_max_pages" value="' . intval($max_pages) . '" ' . '/>';
-	$s .= '</div><div class="clear"></div>';
+	$s .= '<div class="clear"></div>';
+	$s .= '<label id="page-random-label" for="page-random">' . t('Randomise Page/Forum list') . '</label>';
+	$s .= '<input id="page-random" type="checkbox" name="page_random" value="1" ' . $randomise_checked . '/>';
+	$s .= '<div class="clear"></div>';
+
+	$s .= '</div>';
 
 	/* provide a submit button */
 
-- 
2.45.2


From 4c2a40ece8731ab4f4a1232c356b83b67e0259d6 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 19 Jun 2012 03:33:40 -0700
Subject: [PATCH 17/23] ordering preference

---
 page.tgz      | Bin 2054 -> 2055 bytes
 page/page.php |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/page.tgz b/page.tgz
index 43eb2b5616195fb85ed7713dc21f548ea544dae9..0523c0fe20b51d89f1c6fdb78eecd0bf4dd7ae98 100644
GIT binary patch
literal 2055
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

literal 2054
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

diff --git a/page/page.php b/page/page.php
index 80d902de..c79b6bea 100755
--- a/page/page.php
+++ b/page/page.php
@@ -31,7 +31,7 @@ function page_getpage($uid,$randomise = false) {
 
 	$pagelist = array();
 
-	$random = (($randomise) ? ' order by rand ' : ' order by name asc ');
+	$random = (($randomise) ? ' order by rand() ' : ' order by name asc ');
 
 	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
 			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
-- 
2.45.2


From 3e6ccd4c920beed1b45c1a7a25dc84adce682d03 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 19 Jun 2012 03:39:30 -0700
Subject: [PATCH 18/23] push order to sql

---
 page.tgz      | Bin 2055 -> 2051 bytes
 page/page.php |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/page.tgz b/page.tgz
index 0523c0fe20b51d89f1c6fdb78eecd0bf4dd7ae98..b942bad6d8b571f0c6a628f0cae9ffd1a7ea04d5 100644
GIT binary patch
literal 2051
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

literal 2055
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

diff --git a/page/page.php b/page/page.php
index c79b6bea..f1718822 100755
--- a/page/page.php
+++ b/page/page.php
@@ -31,11 +31,11 @@ function page_getpage($uid,$randomise = false) {
 
 	$pagelist = array();
 
-	$random = (($randomise) ? ' order by rand() ' : ' order by name asc ');
+	$order = (($randomise) ? ' order by rand() ' : ' order by name asc ');
 
 	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
 			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
-			order by name asc ",
+			$order ",
 			intval($uid)
 	);
 
-- 
2.45.2


From 8341082c70bd61d86216d013c76d4fb672fb559d Mon Sep 17 00:00:00 2001
From: Thomas Willingham <founder@kakste.com>
Date: Tue, 19 Jun 2012 19:28:22 +0100
Subject: [PATCH 19/23] Infiniteimprobabilitydrive - kill iframe border.

---
 infiniteimprobabilitydrive.tgz                  | Bin 721 -> 724 bytes
 .../infiniteimprobabilitydrive.css              |   7 +++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/infiniteimprobabilitydrive.tgz b/infiniteimprobabilitydrive.tgz
index 6d10fb6916d54da79a6931cef3a263ed53d0fc68..8d9a2203fc1b0b29d951461b132ad266a6927e75 100644
GIT binary patch
literal 724
zcmV;_0xSI=iwFRy#NbZ=1MQYwYuhjshI_4FaWJ7yLz~!X;y~kg6uLogHW=M@QA$wa
zlUUT2jU;akrT=}$X_^K`opdc*$MisuZGFAxOOcQ>A%#Ja6)K<biAaT6#7ca}&faU`
zdETJk2WtI6-`i~0fbS0mp5N>G-2kW^c>O)-znX#?N^Q6zDKA}TWyiYxM-WfP|LLyw
zRO@H#LH-DOy_)z3y^Z+$;B}9^p0@`tj>#_k=keD#H6oXATktp*a(<NJ%$$H%+zjs+
z6Enp#gxg83VpJy}bBV*dzpdHwdi-Af7fJDqJ+{<;x7QCI>faB7U|Ijcv913<LHLeh
z$vUkTYr#jV^%FQ>g&oc};|^z4;Azkq>ZuY%b!a?}O&9CY^!P!@7*63cmvNrK7mbSM
zeMP00bNsePucxI+ayn5il04%YzKJxY(<k8>Yjqf#mGb^rdO8QkLQ>??w0QuxOyOK;
zgKC`Q`E}FfMKR7$mhK_AbgbpFCYQIQd9_51i1khfLw2{D?ow_lFXfxizN`3$In4$?
z+;2=O3mTKlN6}Z8S1<xMjKz1Drd;chLw!d^m=v8T<d7(wjhv@<a3UAlV47}S8oCEG
z#tl0>3Olq@<Sw1RlL1*Cmnp82#*|9#K6RQ)gVHqj8~omGuCY`p+1ubp(HzZq^`*I#
z*Vz_5Qr*ZaZ_xv*mMHifFWtmsX@Wd<ub^GIlIr3b6s99bn?;H`K{O7SMS&y7;En0f
zWz1Rm)ouSGrM+FqmYbf_sT|B|4X*kD$Q+U!h9SKFbir6SQBn0{VG&)Z1#p?01Qo=n
zjgWll?;pY>Kwn{<8xPymsB)sZ?5OgBg{!NJR#VtmQ_-136K3Qv6!XN49KY*%4#|j3
zLND}Z<V0i(BLjx33?Z|IWE=pqHy?||VzF2(7K_DVu~;k?i^XEGSS%LH8|NoR{eZy$
GC;$M^PHK?=

literal 721
zcmV;?0xta@iwFSb!^=+q1MQYuYuhjs$NO4+ih~Jt8rt|$Cx*uHC~SkiY%sd*p_HJ+
zN-S#2Mv}XR(eJ+FG))5|PP%qm$Ml0B+q(VFMJM87$_3Yq=cO#hbj&lZ=ZWMu%-MS>
zT-ObIJ;2rrd+vI>0z5D5`(c2M53U!4Ua$wf7gNwcr8Jc&<+<xD?O3({2z+z=H+OX>
zN<Co@^hZAk8sZ;#b^L=ca9!UE!Szqvz~6&s$7C1&^Y|+^(Yz4wo$Qx1Nw}CDXKboZ
z!7XnGWS`vqZGnd0%CDXOGA*C5$CmT&2fhBH{<}fg_fAe0=f7{x{~sZGgRvw|r$ajM
zf#&QK&X-|_^YysH+dA+#=q*zd$;-NEJdVxgtI_!Qo{I#|;1d-|k;7-jB+mQ7q*~1J
zx-Pz+RXQ!?DO{vQP8EFRS%$SIr8((1giI@OUzRrK;D`&1T$Z&Dv35x|<4Q9*N{iyU
zZPT(G<xEue5!hJN3ek|uThhE<qCv!Jr^5lc+f8>R)|FS{RcPN;{KK4fiyj@c#<c~l
z@#UlFtII1Gf*mFN1|}I*YG`5KvF18sRvb}CC7TYd%{y4J4PDS}yD1IrLmXpA4vixR
zcZ%(W^LH{JFOn)_%cRkj6uVEI6hbqh+XpRrZ#Pw}k{R0DqQ~)!>Cy5_dm+!+7Cltm
zDr#@x1F4rN>5N_4sm`;M(Zs%jZtY4u7uO(JHnfzUXH2DxX$$ncWJ61{TkYUw%v$=@
z?*1gDyIshZo1W#=4knET*Zlx!4oZ%q2;P0XAS4>gxc-r-j4$LIs3>&GBqU5}F6hGF
z-?&Zzzrrdv9=2&vWyMX|QRfAT_*7y!10^T0wx-0IgcGLdFve%89$KF7x)#bvbc!$d
zXJo}_3qb=0%M3xY2520BxeOT$27|$1Fc=I5gTY`h7z_r3!C){LUOPVk6P@|l04M+e
DgT!YG

diff --git a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.css b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.css
index f4be6051..7fb4019c 100644
--- a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.css
+++ b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.css
@@ -1,4 +1,3 @@
-section {
-	padding-left: 0px;
-	
-}
\ No newline at end of file
+section {padding-left: 0px;}
+
+iframe {border: none;}
\ No newline at end of file
-- 
2.45.2


From d8e403001ff12d007963b8c14a0b4fc3cca5adc1 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 22 Jun 2012 00:29:15 -0700
Subject: [PATCH 20/23] Forums have sparkle links, but missing the sparkle

---
 page.tgz      | Bin 2051 -> 2066 bytes
 page/page.php |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/page.tgz b/page.tgz
index b942bad6d8b571f0c6a628f0cae9ffd1a7ea04d5..0f3ed4cc04525942ca9c9e348cf54197303512c2 100644
GIT binary patch
literal 2066
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

literal 2051
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

diff --git a/page/page.php b/page/page.php
index f1718822..a91a255e 100755
--- a/page/page.php
+++ b/page/page.php
@@ -65,7 +65,7 @@ function page_page_end($a,&$b) {
 	$more = false;
 
 	foreach($contacts as $contact) {
-		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" title="' . $contact['url'] . '" class="label" target="external-link">'.
+		$page .= '<li style="list-style-type: none;" class="tool sparkle"><img height="20" width="20" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" title="' . $contact['url'] . '" class="label sparkle" target="external-link">'.
 				$contact["name"]."</a></li>";
 		$total_shown ++;
 		if($total_shown == 6) {
-- 
2.45.2


From 18c59bd2e771da2f8e6935293e1bc5df2b177866 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 22 Jun 2012 00:35:55 -0700
Subject: [PATCH 21/23] put the sparkle in the old interface, should probably
 put it in the current one.

---
 page.tgz      | Bin 2066 -> 2064 bytes
 page/page.php |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/page.tgz b/page.tgz
index 0f3ed4cc04525942ca9c9e348cf54197303512c2..6c30406afc7df06c7d0148250abf41845821878e 100644
GIT binary patch
literal 2064
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

literal 2066
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

diff --git a/page/page.php b/page/page.php
index a91a255e..014cc499 100755
--- a/page/page.php
+++ b/page/page.php
@@ -99,7 +99,7 @@ function page_network_mod_init($a,$b) {
 	$more = false;
 
 	foreach($contacts as $contact) {
-		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" title="' . $contact['url'] . '" class="label" target="external-link">'.
+		$page .= '<li style="list-style-type: none;" class="tool sparkle"><img height="20" width="20" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" title="' . $contact['url'] . '" class="label sparkle" target="external-link">'.
 				$contact["name"]."</a></li>";
 		$total_shown ++;
 		if(($show_total) && ($total_shown == $show_total)) {
-- 
2.45.2


From a60d66c70ae165282ec7851c1c89176e2c7dc99e Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 22 Jun 2012 00:39:47 -0700
Subject: [PATCH 22/23] only sparklify the links, not the photos as they aren't
 linked

---
 page.tgz      | Bin 2064 -> 2060 bytes
 page/page.php |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/page.tgz b/page.tgz
index 6c30406afc7df06c7d0148250abf41845821878e..f77dcf2364dc8f88319d1df71ee4ad38386f5a2e 100644
GIT binary patch
literal 2060
zcmV+n2=n(JiwFQdA>>a01MOLDbK5o&_E+gwY<aqnO7-s8&e)dPOzU1gBy}gw^gbjR
z86qJGV~XGbpkMBq|9-mwNs*FMr`L0?Hx<SsiNIp9FAtst=#(vZfA4YI0Nc^g!QSZL
z+0kh9Y;SOII68bbwEcP88xD_-hJ(@I+0p*q03Qa!Jvew|yKKv}VG3Yx#lnS9*CP3Z
zT)H?o96o>k{7cyM1zSq_r;lE!^&_qEQ2s}wL!1A>;9z*TkNv~_ef)yKBiU1HfAah{
zo6Wya`n#GNBa(&g#%#vp4!B;$l1Q#xAN;G?n8%WtV~F|OoHQFZA~MTk7!3yLEk3T8
zT8N}Olg7vub{|mh$6|pMyY12sUDv&(6(=<R*HQWNwDtZ^m+2#|@$374xIaS9uk%0d
z|D)ah{}S!=8_avN|MY1Sp2Cl8#gE}9L<2p2&vmFoYJ^OV;bJLoG{iz1kaN)4jK*d>
zf>5qjSt86G*v;LaOO>rO$OIB@Zlt;bEh0W+id6p0mA2}Jy#YPH$jnlzV|XpDIJ_=0
z0H-T_{<h3W57(HG_>5^>5mnozAdNHR8<^eIRfS82Wc9OL;O8kRN`+#ECn-~gi(bS@
z7yk8|&3TrD<eybI6$xS?j)OLFlHv<=maFMf%B#T7otds=gmS|89q?Hc$)sP~LDX$^
zZOOM!wsboCrv>vqq;gaIVU5#N>IW^ocMj?%BCf{=(_D>EmOMs`wzU2iqV$l?-xsGw
zzYmJ9<TXcV#&^&KIny%chTpd`sp3iW;A(|j+f~GRCKlY#chJg2)M>dwDl~^N%vr2C
zr3dY5k&NB4V_-_LyTF>;k}Bc~`+{ISwGH2Z4{l_32h@*Q_TjkNn;<^`(;+y&TcJ!0
z3ynry{|LN`vsY)|y@g8=U3TCyQ!#zf6#8C?P|3?5-kiUN%Y52pv(ae${pH!4GZb@B
zxEzBY%~j&Viyyy-OUosfsD0?3(OY`@YeX}1H@pr#h{Rm8*v6yXY&h%4`?}|ts8^T;
z5OXj~4ylrJ5pxh4*anZ`nM5ki!ey{_l4&R&EdJdJ?>>}kc<8e?o)kjw?DK~Xcoc-%
zfbF0W5!L$fk$P>gssq05@jnolKhmx@nMwk?zQacy9tC)U7VA7|&8)TP`#GUA$0@~t
z{*13}EWA7e9tuPm1_c2?11b+sEEfyMy_x2!*}%C7AJ(1Z;$Mx|D%x=V2J9fozVk6D
zK1OK_gEl57x4xPp|1=WUAfmD7j-sw$co4=+>#>K&Oa#0)p+sBByx$0eD;p`}d~CTt
z@p~rley}yjYxn%qKK7mVangD=t&=Zd52Rh%BHrXQizog`a|74)?N)cm!OTdc#Hq&m
zn4tUsGt^okc8a}7GM|ej=us?U0ovTfeC&~7UHiLh?ouqxiA?xO85igIsaP#w$;D!6
z#@=Y)fjyPGpIU`u&xamtAqjfE2P`(5!w6X#1RU*8;FQ5q@i_|h$ajpxlxi>v1sL4E
z;*n5&9IFACG~3ktitgM4cdyV`nXh7wv+x4J(IkG0gqg4yGm~6-m{ZDKV{`lTywg6z
z<i=v+olpp?nfUr^>Jsyyo}V!sx_FmKGAiRIwqu=vK0={{$`YZ{C3fJ6(GD;<APX<%
z?221UaeIWZ2(J)dxZF#e_+36Pc<)zczDNG_U_#L`flsnP*7$9(j`qj|f^2C+DC3x=
zc=-8*Avs<mq0^Y%l{hId-DrFSOB@srTB%(}oL!9M%0AD<z*%8GDa5qtwfHBO^EH&)
zFu{FI`Vb(N5Pe3wi*`KZ`e1A99@5%84G?)b?)rlgMWaQTn_7IKZFvczJ(6N@=3)`V
zGDPSRV+8Gv1%Ti2@g8gm8jmLJ6PJ>zo^esbDWtUp4k<y^TK~B#mUHZipU-cVlf{ne
z{tu|G3ZynXc>-JHR~6Xt;2)C*@4IJME~FneX=wddP~GY9%P)Xkw?S+A)A_|)xAE6+
z^zgR6qTAKR=}Uh;Q+0~-wblR5T~XG<A1sqSsBg_f_v&-QP8m9x%w<5Zpw|&l_ySoP
z;axuJAx3&|cK+(#>(NFCgD3VJtX(bHie5b`{ipCE!h>$69Gdi!bAz?R-59Jb5^gwz
zEP)jQ-bohb#dN($M9A&yg$fpyW)&|vql0kHe90Bw8e`ld<tiQkaUZfBvO+)9+AAn2
zhfa-@h+X=dS4f=XJK9+xVX?7?w{@a7>h#{L_lcML_&0J2Jqk0Wa37(s7*=|<L+-dF
z!ZlNZ&EmqBGT#X3-%{oBB3GGSt8rDehqlc8{u)=&F%6eIyuz!?efQmb42i}4@Z62p
zU2jV)Xo=U}mv3LcDqz5Gv07oi0ju3AkB)YEt(-c_{Wn94iQ7-sVsrp;tY_hUQNFDJ
zOL{bXQdhb@^b~4u6iZXC>WW>N*%r3_9vPgEl&|Bx!jhLnzbv_f{1qNLn-eKr`|^Vj
zmRz%xnW3$KiVK6S`kEmkNl~gaWW8Jk<DPw^;3U>`;vw+jEH9}AQIw-?2XBk={#KOo
z(1$U{W8tJi==X=G`tOZua9n>GnKvaMDO-JeYP9b{KimCWVeY#{+f3fp{4Ydu=ZDV6
zdw~2~9A68qdl1#BlGm6|yw|(h0JF>(O!9+JcH$-Uu(CQwonLOW>eXfu@;;%lmUE2w
qMP9Os<5{%=`|jQ3?w>@vwrjh#YrD2<yS8ipN&7dbyLJ2kC;$MU04ciw

literal 2064
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

diff --git a/page/page.php b/page/page.php
index 014cc499..fd48b4ee 100755
--- a/page/page.php
+++ b/page/page.php
@@ -65,7 +65,7 @@ function page_page_end($a,&$b) {
 	$more = false;
 
 	foreach($contacts as $contact) {
-		$page .= '<li style="list-style-type: none;" class="tool sparkle"><img height="20" width="20" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" title="' . $contact['url'] . '" class="label sparkle" target="external-link">'.
+		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" title="' . $contact['url'] . '" class="label sparkle" target="external-link">'.
 				$contact["name"]."</a></li>";
 		$total_shown ++;
 		if($total_shown == 6) {
@@ -99,7 +99,7 @@ function page_network_mod_init($a,$b) {
 	$more = false;
 
 	foreach($contacts as $contact) {
-		$page .= '<li style="list-style-type: none;" class="tool sparkle"><img height="20" width="20" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" title="' . $contact['url'] . '" class="label sparkle" target="external-link">'.
+		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" title="' . $contact['url'] . '" class="label sparkle" target="external-link">'.
 				$contact["name"]."</a></li>";
 		$total_shown ++;
 		if(($show_total) && ($total_shown == $show_total)) {
-- 
2.45.2


From 471b5db36feedc9c71ab862a7c35478633bebfa9 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sat, 23 Jun 2012 12:50:48 +0200
Subject: [PATCH 23/23] Twitter, Statusnet: Supress profile link of user whose
 message was repeated libertree: Design improvement of exported messages
 privacy_image_cache: quickfix for double encoded urls

---
 libertree/libertree.php                     |  8 +++++-
 privacy_image_cache/privacy_image_cache.php | 30 +++++++++++----------
 statusnet/statusnet.php                     | 14 +++++++---
 twitter/twitter.php                         | 20 +++++++++-----
 4 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/libertree/libertree.php b/libertree/libertree.php
index fc9dcc44..c117fa81 100755
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -118,7 +118,7 @@ function libertree_post_local(&$a,&$b) {
 	if($b['private'] || $b['parent'])
 		return;
 
-    $ltree_post   = intval(get_pconfig(local_user(),'libertree','post'));
+	$ltree_post   = intval(get_pconfig(local_user(),'libertree','post'));
 
 	$ltree_enable = (($ltree_post && x($_REQUEST,'libertree_enable')) ? intval($_REQUEST['libertree_enable']) : 0);
 
@@ -176,6 +176,12 @@ function libertree_send(&$a,&$b) {
 		$body = str_ireplace("[quote", "\n\n[quote", $body);
 		$body = str_ireplace("[/quote]", "[/quote]\n\n", $body);
 
+		// Removal of tags and mentions
+		// #-tags
+		$body = preg_replace('/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $body);
+ 		// @-mentions
+		$body = preg_replace('/@\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '@$2', $body);
+
 		// remove multiple newlines
 		do {
 			$oldbody = $body;
diff --git a/privacy_image_cache/privacy_image_cache.php b/privacy_image_cache/privacy_image_cache.php
index d3202c4d..b7236d09 100644
--- a/privacy_image_cache/privacy_image_cache.php
+++ b/privacy_image_cache/privacy_image_cache.php
@@ -36,16 +36,18 @@ function privacy_image_cache_init() {
 	}
 
 	$urlhash = 'pic:' . sha1($_REQUEST['url']);
-    $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", $urlhash );
-    if (count($r)) {
-        $img_str = $r[0]['data'];
+	// Double encoded url - happens with Diaspora
+	$urlhash2 = 'pic:' . sha1(urldecode($_REQUEST['url']));
+
+	$r = q("SELECT * FROM `photo` WHERE `resource-id` in ('%s', '%s') LIMIT 1", $urlhash, $urlhash2);
+	if (count($r)) {
+        	$img_str = $r[0]['data'];
 		$mime = $r[0]["desc"];
 		if ($mime == "") $mime = "image/jpeg";
-    }
-    else {
-        require_once("Photo.php");
+	} else {
+		require_once("Photo.php");
 
-        $img_str = fetch_url($_REQUEST['url'],true);
+		$img_str = fetch_url($_REQUEST['url'],true);
 		if (substr($img_str, 0, 6) == "GIF89a") {
 			$mime = "image/gif";
 			$image = @imagecreatefromstring($img_str);
@@ -77,16 +79,16 @@ function privacy_image_cache_init() {
 			}
 			$mime = "image/jpeg";
 		}
-    }
+	}
 
 
-    header("Content-type: $mime");
-    header("Expires: " . gmdate("D, d M Y H:i:s", time() + (3600*24)) . " GMT");
-    header("Cache-Control: max-age=" . (3600*24));
+	header("Content-type: $mime");
+	header("Expires: " . gmdate("D, d M Y H:i:s", time() + (3600*24)) . " GMT");
+	header("Cache-Control: max-age=" . (3600*24));
 
-    echo $img_str;
+	echo $img_str;
 
-    killme();
+	killme();
 }
 
 /**
@@ -210,4 +212,4 @@ function privacy_image_cache_plugin_admin_post(&$a = null, &$o = null){
     if (isset($_REQUEST['delete_all'])) {
         q('DELETE FROM `photo` WHERE `uid` = 0 AND `resource-id` LIKE "pic:%%"');
     }
-}
\ No newline at end of file
+}
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index d7ec4abb..99e84475 100755
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -453,10 +453,16 @@ function statusnet_post_hook(&$a,&$b) {
                 // 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);
+			// #-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
+			//$recycle = html_entity_decode("&#x267B; ", ENT_QUOTES, 'UTF-8');
+			//$tmp = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', 'RT @$2:', $tmp);
                 }
                 // preserve links to webpages
                 $tmp = preg_replace( '/\[url\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\](\w+.*?)\[\/url\]/i', '$2 $1', $tmp);
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 8de7d06d..9984f369 100755
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -316,18 +316,24 @@ function twitter_post_hook(&$a,&$b) {
                 $tmp = preg_replace( '/\[\\/?audio(\\s+.*?\]|\])/i', '', $tmp);
                 $linksenabled = get_pconfig($b['uid'],'twitter','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 
+                // 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);
+			// #-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
+			//$recycle = html_entity_decode("&#x267B; ", ENT_QUOTES, 'UTF-8');
+			//$tmp = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', 'RT @$2:', $tmp);
                 }
                 $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 
+                // 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) {
-- 
2.45.2