From 52ea842e872cc004fd012496c828e9fb6186bec9 Mon Sep 17 00:00:00 2001
From: Michael <icarus@dabo.de>
Date: Fri, 2 Mar 2012 10:33:39 +0100
Subject: html2bbcode: don't convert sizes and fonts.

---
 include/html2bbcode.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index 65920380b..442e38691 100755
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -10,7 +10,7 @@ Originally made for the syncom project: http://wiki.piratenpartei.de/Syncom
 function node2bbcode(&$doc, $oldnode, $attributes, $startbb, $endbb)
 {
 	do {
-		$done = node2bbcodesub(&$doc, $oldnode, $attributes, $startbb, $endbb);
+		$done = node2bbcodesub($doc, $oldnode, $attributes, $startbb, $endbb);
 	} while ($done);
 }
 
@@ -150,10 +150,14 @@ function html2bbcode($message)
 	node2bbcode($doc, 'font', array('size'=>'/(\d+)/'), '[size=$1]', '[/size]');
 	node2bbcode($doc, 'font', array('color'=>'/(.+)/'), '[color=$1]', '[/color]');
 
-	node2bbcode($doc, 'span', array('style'=>'/.*color:\s*(.+?)[,;].*/'), '[color="$1"]', '[/color]');
-	node2bbcode($doc, 'span', array('style'=>'/.*font-size:\s*(\d+)/'), '[size=$1]', '[/size]');
+	// Untested
+	//node2bbcode($doc, 'span', array('style'=>'/.*font-size:\s*(.+?)[,;].*font-family:\s*(.+?)[,;].*color:\s*(.+?)[,;].*/'), '[size=$1][font=$2][color=$3]', '[/color][/font][/size]');
+	//node2bbcode($doc, 'span', array('style'=>'/.*font-size:\s*(\d+)[,;].*/'), '[size=$1]', '[/size]');
+	//node2bbcode($doc, 'span', array('style'=>'/.*font-size:\s*(.+?)[,;].*/'), '[size=$1]', '[/size]');
 
+	node2bbcode($doc, 'span', array('style'=>'/.*color:\s*(.+?)[,;].*/'), '[color="$1"]', '[/color]');
 	//node2bbcode($doc, 'span', array('style'=>'/.*font-family:\s*(.+?)[,;].*/'), '[font=$1]', '[/font]');
+
 	//node2bbcode($doc, 'div', array('style'=>'/.*font-family:\s*(.+?)[,;].*font-size:\s*(\d+?)pt.*/'), '[font=$1][size=$2]', '[/size][/font]');
 	//node2bbcode($doc, 'div', array('style'=>'/.*font-family:\s*(.+?)[,;].*font-size:\s*(\d+?)px.*/'), '[font=$1][size=$2]', '[/size][/font]');
 	//node2bbcode($doc, 'div', array('style'=>'/.*font-family:\s*(.+?)[,;].*/'), '[font=$1]', '[/font]');
-- 
cgit v1.2.3


From cb1ecf2c5ad649eb372db9eb3bd1da756f207fb6 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sat, 10 Mar 2012 00:15:27 +0100
Subject: diabook: Moving the location between the icons

---
 view/theme/diabook/style.css         | 3 +++
 view/theme/diabook/wall_item.tpl     | 3 +--
 view/theme/diabook/wallwall_item.tpl | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index bccfea149..2d4670dca 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -1113,6 +1113,7 @@ section {
 }
 .wall-item-container .wall-item-location {
   padding-right: 40px;
+  display: table-cell;
 }
 .wall-item-container .wall-item-ago {
   word-wrap: break-word;
@@ -1168,6 +1169,7 @@ section {
 .wall-item-container .wall-item-actions-social {
   float: left;
   margin-bottom: 1px;
+  display: table-cell;
 }
 .wall-item-container .wall-item-actions-social a {
   margin-right: 1em;
@@ -1178,6 +1180,7 @@ section {
 .wall-item-container .wall-item-actions-tools {
   float: right;
   width: 80px;
+  display: table-cell;
 }
 .wall-item-container .wall-item-actions-tools a {
   float: right;
diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl
index b1a014949..8c892fd2a 100644
--- a/view/theme/diabook/wall_item.tpl
+++ b/view/theme/diabook/wall_item.tpl
@@ -46,7 +46,6 @@
 
 		</div>
 		<div class="wall-item-actions">
-			<div class="wall-item-location">$item.location&nbsp;</div>
 			<div class="wall-item-actions-social">
 			
 			
@@ -82,7 +81,7 @@
 					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
 				{{ endif }}
 			</div>
-			
+			<div class="wall-item-location">$item.location&nbsp;</div>			
 		</div>
 	</div>
 	<div class="wall-item-bottom">
diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl
index 603a908c5..3b103745b 100644
--- a/view/theme/diabook/wallwall_item.tpl
+++ b/view/theme/diabook/wallwall_item.tpl
@@ -52,7 +52,6 @@
 
 		</div>
 		<div class="wall-item-actions">
-			<div class="wall-item-location">$item.location&nbsp;</div>
 			<div class="wall-item-actions-social">
 			
 			
@@ -88,7 +87,8 @@
 					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
 				{{ endif }}
 			</div>
-			
+			<div class="wall-item-location">$item.location&nbsp;</div>
+
 		</div>
 	</div>
 	<div class="wall-item-bottom">
@@ -100,4 +100,4 @@
 
 <div class="wall-item-comment-wrapper" >
 	$item.comment
-</div>
\ No newline at end of file
+</div>
-- 
cgit v1.2.3


From 15916a2cb717828367fc7e0bb74137942836a772 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sat, 10 Mar 2012 09:52:20 +0100
Subject: Mail: Removing signatures, gpg, unnecessary line breaks

---
 include/email.php    |  14 ++++
 include/msgclean.php | 225 +++++++++++++++++++++++++++++++++++++++++++++++++++
 include/poller.php   |   3 +-
 3 files changed, 240 insertions(+), 2 deletions(-)
 create mode 100644 include/msgclean.php

diff --git a/include/email.php b/include/email.php
index 659978b6e..a3449a424 100755
--- a/include/email.php
+++ b/include/email.php
@@ -1,5 +1,7 @@
 <?php
 require_once('include/html2plain.php');
+require_once('include/msgclean.php');
+require_once('include/quoteconvert.php');
 
 function email_connect($mailbox,$username,$password) {
 	if(! function_exists('imap_open'))
@@ -86,6 +88,7 @@ function email_get_msg($mbox,$uid) {
 
 	if(! $struc->parts) {
 		$ret['body'] = email_get_part($mbox,$uid,$struc,0, 'html');
+		$html = $ret['body'];
 
 		if (trim($ret['body']) == '')
 			$ret['body'] = email_get_part($mbox,$uid,$struc,0, 'plain');
@@ -107,6 +110,17 @@ function email_get_msg($mbox,$uid) {
 		else
 			$ret['body'] = $text;
 	}
+
+	$ret['body'] = removegpg($ret['body']);
+	$msg = removesig($ret['body']);
+	$ret['body'] = $msg['body'];
+	$ret['body'] = convertquote($ret['body'], false);
+
+	if (trim($html) != '')
+		$ret['body'] = removelinebreak($ret['body']);
+
+	$ret['body'] = unifyattributionline($ret['body']);
+
 	return $ret;
 }
 
diff --git a/include/msgclean.php b/include/msgclean.php
new file mode 100644
index 000000000..284ad1ce4
--- /dev/null
+++ b/include/msgclean.php
@@ -0,0 +1,225 @@
+<?php
+
+function savereplace($pattern, $replace, $text)
+{
+	$save = $text;
+
+	$text = preg_replace($pattern, $replace, $text);
+
+	if ($text == '')
+		$text = $save;
+	return($text);
+}
+
+function unifyattributionline($message)
+{
+	$quotestr = array('quote', 'collapsed');
+	foreach ($quotestr as $quote) {
+
+		$message = savereplace('/----- Original Message -----\s.*?From: "([^<"].*?)" <(.*?)>\s.*?To: (.*?)\s*?Cc: (.*?)\s*?Sent: (.*?)\s.*?Subject: ([^\n].*)\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+		$message = savereplace('/----- Original Message -----\s.*?From: "([^<"].*?)" <(.*?)>\s.*?To: (.*?)\s*?Sent: (.*?)\s.*?Subject: ([^\n].*)\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+
+		$message = savereplace('/-------- Original-Nachricht --------\s*\['.$quote.'\]\nDatum: (.*?)\nVon: (.*?) <(.*?)>\nAn: (.*?)\nBetreff: (.*?)\n/i', "[".$quote."='$2']\n", $message);
+		$message = savereplace('/-------- Original-Nachricht --------\s*\['.$quote.'\]\sDatum: (.*?)\s.*Von: "([^<"].*?)" <(.*?)>\s.*An: (.*?)\n.*/i', "[".$quote."='$2']\n", $message);
+		$message = savereplace('/-------- Original-Nachricht --------\s*\['.$quote.'\]\nDatum: (.*?)\nVon: (.*?)\nAn: (.*?)\nBetreff: (.*?)\n/i', "[".$quote."='$2']\n", $message);
+
+		$message = savereplace('/-----Urspr.*?ngliche Nachricht-----\sVon: "([^<"].*?)" <(.*?)>\s.*Gesendet: (.*?)\s.*An: (.*?)\s.*Betreff: ([^\n].*?).*:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+		$message = savereplace('/-----Urspr.*?ngliche Nachricht-----\sVon: "([^<"].*?)" <(.*?)>\s.*Gesendet: (.*?)\s.*An: (.*?)\s.*Betreff: ([^\n].*?)\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+
+		$message = savereplace('/Am (.*?), schrieb (.*?):\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
+
+		$message = savereplace('/Am .*?, \d+ .*? \d+ \d+:\d+:\d+ \+\d+\sschrieb\s(.*?)\s<(.*?)>:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+
+		$message = savereplace('/Am (.*?) schrieb (.*?) <(.*?)>:\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
+		$message = savereplace('/Am (.*?) schrieb <(.*?)>:\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
+		$message = savereplace('/Am (.*?) schrieb (.*?):\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
+		$message = savereplace('/Am (.*?) schrieb (.*?)\n(.*?):\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
+
+		$message = savereplace('/(\d+)\/(\d+)\/(\d+) ([^<"].*?) <(.*?)>\s*\['.$quote.'\]/i', "[".$quote."='$4']\n", $message);
+
+		$message = savereplace('/On .*?, \d+ .*? \d+ \d+:\d+:\d+ \+\d+\s(.*?)\s<(.*?)>\swrote:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+
+		$message = savereplace('/On (.*?) at (.*?), (.*?)\s<(.*?)>\swrote:\s*\['.$quote.'\]/i', "[".$quote."='$3']\n", $message);
+		$message = savereplace('/On (.*?)\n([^<].*?)\s<(.*?)>\swrote:\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
+		$message = savereplace('/On (.*?), (.*?), (.*?)\s<(.*?)>\swrote:\s*\['.$quote.'\]/i', "[".$quote."='$3']\n", $message);
+		$message = savereplace('/On ([^,].*?), (.*?)\swrote:\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
+		$message = savereplace('/On (.*?), (.*?)\swrote\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
+
+		// Der loescht manchmal den Body - was eigentlich unmoeglich ist
+		$message = savereplace('/On (.*?),(.*?),(.*?),(.*?), (.*?) wrote:\s*\['.$quote.'\]/i', "[".$quote."='$5']\n", $message);
+
+		$message = savereplace('/Zitat von ([^<].*?) <(.*?)>:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+
+		$message = savereplace('/Quoting ([^<].*?) <(.*?)>:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+
+		$message = savereplace('/From: "([^<"].*?)" <(.*?)>\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+		$message = savereplace('/From: <(.*?)>\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+
+		$message = savereplace('/Du \(([^)].*?)\) schreibst:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+
+		$message = savereplace('/--- (.*?) <.*?> schrieb am (.*?):\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+		$message = savereplace('/--- (.*?) schrieb am (.*?):\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+
+		$message = savereplace('/\* (.*?) <(.*?)> hat geschrieben:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+
+		$message = savereplace('/(.*?) <(.*?)> schrieb (.*?)\):\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+		$message = savereplace('/(.*?) <(.*?)> schrieb am (.*?) um (.*):\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+		$message = savereplace('/(.*?) schrieb am (.*?) um (.*):\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+		$message = savereplace('/(.*?) \((.*?)\) schrieb:\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
+		$message = savereplace('/(.*?) schrieb:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+
+		$message = savereplace('/(.*?) <(.*?)> writes:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+		$message = savereplace('/(.*?) \((.*?)\) writes:\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
+		$message = savereplace('/(.*?) writes:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+
+		$message = savereplace('/\* (.*?) wrote:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+		$message = savereplace('/(.*?) wrote \(.*?\):\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+		$message = savereplace('/(.*?) wrote:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+
+		$message = savereplace('/([^<].*?) <.*?> hat am (.*?)\sum\s(.*)\sgeschrieben:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+
+		$message = savereplace('/(\d+)\/(\d+)\/(\d+) ([^<"].*?) <(.*?)>:\s*\['.$quote.'\]/i', "[".$quote."='$4']\n", $message);
+		$message = savereplace('/(\d+)\/(\d+)\/(\d+) (.*?) <(.*?)>\s*\['.$quote.'\]/i', "[".$quote."='$4']\n", $message);
+		$message = savereplace('/(\d+)\/(\d+)\/(\d+) <(.*?)>:\s*\['.$quote.'\]/i', "[".$quote."='$4']\n", $message);
+		$message = savereplace('/(\d+)\/(\d+)\/(\d+) <(.*?)>\s*\['.$quote.'\]/i', "[".$quote."='$4']\n", $message);
+
+		$message = savereplace('/(.*?) <(.*?)> schrubselte:\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message);
+		$message = savereplace('/(.*?) \((.*?)\) schrubselte:\s*\['.$quote.'\]/i', "[".$quote."='$2']\n", $message);
+
+	}
+	return($message);
+}
+
+function removegpg($message)
+{
+
+	$pattern = '/(.*)\s*-----BEGIN PGP SIGNED MESSAGE-----\s*[\r\n].*Hash:.*?[\r\n](.*)'.
+		'[\r\n]\s*-----BEGIN PGP SIGNATURE-----\s*[\r\n].*'.
+		'[\r\n]\s*-----END PGP SIGNATURE-----(.*)/is';
+
+	preg_match($pattern, $message, $result);
+
+	$cleaned = trim($result[1].$result[2].$result[3]);
+
+	$cleaned = str_replace(array("\n- --\n", "\n- -"), array("\n-- \n", "\n-"), $cleaned);
+
+
+	if ($cleaned == '')
+		$cleaned = $message;
+
+	return($cleaned);
+}
+
+function removesig($message)
+{
+	$sigpos = strrpos($message, "\n-- \n");
+	$quotepos = strrpos($message, "[/quote]");
+
+	if ($sigpos == 0) {
+		// Speziell fuer web.de, die das als Trenner verwenden
+		$message = str_replace("\n___________________________________________________________\n", "\n-- \n", $message);
+		$sigpos = strrpos($message, "\n-- \n");
+		$quotepos = strrpos($message, "[/quote]");
+	}
+
+	// Sollte sich der Signaturtrenner innerhalb eines Quotes befinden
+	// wird keine Signaturtrennung ausgefuehrt
+	if (($sigpos < $quotepos) and ($sigpos != 0))
+		return(array('body' => $message, 'sig' => ''));
+
+	// To-Do: Regexp umstellen, so dass auf 1 oder kein Leerzeichen
+	// geprueft wird
+	//$message = str_replace("\n--\n", "\n-- \n", $message);
+
+	$pattern = '/(.*)[\r\n]-- [\r\n](.*)/is';
+
+	preg_match($pattern, $message, $result);
+
+	if (($result[1] != '') and ($result[2] != '')) {
+		$cleaned = trim($result[1])."\n";
+		$sig = trim($result[2]);
+		//	'[hr][size=x-small][color=darkblue]'.trim($result[2]).'[/color][/size]';
+	} else {
+		$cleaned = $message;
+		$sig = '';
+	}
+
+	return(array('body' => $cleaned, 'sig' => $sig));
+}
+
+function removelinebreak($message)
+{
+	$arrbody = explode("\n", trim($message));
+
+	$lines = array();
+	$lineno = 0;
+
+	foreach($arrbody as $i => $line) {
+		$currquotelevel = 0;
+		$currline = $line;
+		while ((strlen($currline)>0) and ((substr($currline, 0, 1) == '>')
+ 			or (substr($currline, 0, 1) == ' '))) {
+			if (substr($currline, 0, 1) == '>')
+				$currquotelevel++;
+
+			$currline = ltrim(substr($currline, 1));
+		}
+
+		$quotelevel = 0;
+		$nextline = trim($arrbody[$i+1]);
+		while ((strlen($nextline)>0) and ((substr($nextline, 0, 1) == '>')
+ 			or (substr($nextline, 0, 1) == ' '))) {
+			if (substr($nextline, 0, 1) == '>')
+				$quotelevel++;
+
+			$nextline = ltrim(substr($nextline, 1));
+		}
+
+		$len = strlen($line);
+		$firstword = strpos($nextline.' ', ' ');
+
+		$specialchars = ((substr(trim($nextline), 0, 1) == '-') or
+				(substr(trim($nextline), 0, 1) == '=') or
+				(substr(trim($nextline), 0, 1) == '*') or
+				(substr(trim($nextline), 0, 1) == '·') or
+				(substr(trim($nextline), 0, 4) == '[url') or
+				(substr(trim($nextline), 0, 5) == '[size') or
+				(substr(trim($nextline), 0, 7) == 'http://') or
+				(substr(trim($nextline), 0, 8) == 'https://'));
+
+		if (!$specialchars) 
+			$specialchars = ((substr(rtrim($line), -1) == '-') or
+					(substr(rtrim($line), -1) == '=') or
+					(substr(rtrim($line), -1) == '*') or
+					(substr(rtrim($line), -1) == '·') or
+					(substr(rtrim($line), -6) == '[/url]') or
+					(substr(rtrim($line), -7) == '[/size]'));
+
+		//if ($specialchars)
+		//	echo ("Special\n");
+
+		if ($lines[$lineno] != '') {
+			if (substr($lines[$lineno], -1) != ' ')
+			$lines[$lineno] .= ' ';
+
+			while ((strlen($line)>0) and ((substr($line, 0, 1) == '>')
+ 			or (substr($line, 0, 1) == ' '))) {
+
+				$line = ltrim(substr($line, 1));
+			}
+
+		}
+		//else
+		//	$lines[$lineno] = $quotelevel.'-'.$len.'-'.$firstword.'-';
+
+		$lines[$lineno] .= $line;
+		//if ((($len + $firstword < 68) and (substr($line, -1, 1) != ' '))
+		//	or ($quotelevel != $currquotelevel) or $specialchars)
+		if (((substr($line, -1, 1) != ' '))
+			or ($quotelevel != $currquotelevel))
+			$lineno++;
+	}
+	return(implode("\n", $lines));
+
+}
+?>
diff --git a/include/poller.php b/include/poller.php
index cfbc46b87..3be6caebd 100755
--- a/include/poller.php
+++ b/include/poller.php
@@ -1,7 +1,6 @@
 <?php
 
 require_once("boot.php");
-require_once("include/quoteconvert.php");
 
 
 function poller_run($argv, $argc){
@@ -494,7 +493,7 @@ function poller_run($argv, $argc){
 								logger("Mail: can't fetch msg ".$msg_uid);
 								continue;
 							}
-							$datarray['body'] = escape_tags(convertquote($r['body'], false));
+							$datarray['body'] = escape_tags($r['body']);
 
 							logger("Mail: Importing ".$msg_uid);
 
-- 
cgit v1.2.3


From e098147c24bd45bc15c14fc597bd101b66011458 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sat, 10 Mar 2012 11:29:40 +0100
Subject: New config options if ostatus polling should use the priority in the
 contacts

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

diff --git a/include/poller.php b/include/poller.php
index 3be6caebd..f165ad590 100755
--- a/include/poller.php
+++ b/include/poller.php
@@ -140,7 +140,10 @@ function poller_run($argv, $argc){
 			if($manual_id)
 				$contact['last-update'] = '0000-00-00 00:00:00';
 
-			if($contact['network'] === NETWORK_DFRN || $contact['network'] === NETWORK_OSTATUS)
+			if($contact['network'] === NETWORK_DFRN)
+				$contact['priority'] = 2;
+
+			if(!get_config('system','ostatus_use_priority') and ($contact['network'] === NETWORK_OSTATUS))
 				$contact['priority'] = 2;
 
 			if($contact['priority'] || $contact['subhub']) {
-- 
cgit v1.2.3


From 74b3e9f273b019729d213f3ccaeba1bb11d61d24 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sat, 10 Mar 2012 15:50:35 +0100
Subject: Enabled Caching for items. Changed color of tags in diabook.

---
 include/text.php             | 17 ++++++++++++++++-
 view/theme/diabook/style.css |  4 ++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/include/text.php b/include/text.php
index 5ad0154d7..38736d836 100644
--- a/include/text.php
+++ b/include/text.php
@@ -874,6 +874,14 @@ function link_compare($a,$b) {
 if(! function_exists('prepare_body')) {
 function prepare_body($item,$attach = false) {
 
+	$cache = get_config('system','itemcache');
+
+	if (($cache != '')) {
+		$cachefile = $cache."/".$item["guid"]."-".strtotime($item["edited"])."-".$attach;
+		if (file_exists($cachefile))
+			return(file_get_contents($cachefile));
+	}
+
 	call_hooks('prepare_body_init', $item); 
 
 	$s = prepare_text($item['body']);
@@ -882,8 +890,11 @@ function prepare_body($item,$attach = false) {
 	call_hooks('prepare_body', $prep_arr);
 	$s = $prep_arr['html'];
 
-	if(! $attach)
+	if(! $attach) {
+		if ($cache != '')
+			file_put_contents($cachefile, $s);
 		return $s;
+	}
 
 	$arr = explode(',',$item['attach']);
 	if(count($arr)) {
@@ -917,6 +928,10 @@ function prepare_body($item,$attach = false) {
 
 	$prep_arr = array('item' => $item, 'html' => $s);
 	call_hooks('prepare_body_final', $prep_arr);
+
+	if ($cache != '')
+		file_put_contents($cachefile, $prep_arr['html']);
+
 	return $prep_arr['html'];
 }}
 
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 2d4670dca..0504ce96a 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -1277,14 +1277,14 @@ section {
 }
 .tag {
   /*background: url("../../../images/tag_b.png") repeat-x center left;*/
-  color: #3465A4;
+  color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
   /*background: url("../../../images/tag.png") no-repeat center right;*/
-  color: #3465A4;
+  color: #999;
 }
 .wwto {
   position: absolute !important;
-- 
cgit v1.2.3


From 670b571c8ac0532cc80fff6351f91b1b0fa58e0c Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sat, 10 Mar 2012 18:19:00 +0100
Subject: Caching improved.

---
 include/text.php | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/include/text.php b/include/text.php
index 38736d836..5bf815105 100644
--- a/include/text.php
+++ b/include/text.php
@@ -874,25 +874,27 @@ function link_compare($a,$b) {
 if(! function_exists('prepare_body')) {
 function prepare_body($item,$attach = false) {
 
+	call_hooks('prepare_body_init', $item); 
+
 	$cache = get_config('system','itemcache');
 
 	if (($cache != '')) {
-		$cachefile = $cache."/".$item["guid"]."-".strtotime($item["edited"])."-".$attach;
-		if (file_exists($cachefile))
-			return(file_get_contents($cachefile));
-	}
-
-	call_hooks('prepare_body_init', $item); 
+		$cachefile = $cache."/".$item["guid"]."-".strtotime($item["edited"])."-".$attach."-".hash("crc32", $item['body']);
 
-	$s = prepare_text($item['body']);
+		if (file_exists($cachefile))
+			$s = file_get_contents($cachefile);
+		else {
+			$s = prepare_text($item['body']);
+			file_put_contents($cachefile, $s);
+		}
+	} else
+		$s = prepare_text($item['body']);
 
 	$prep_arr = array('item' => $item, 'html' => $s);
 	call_hooks('prepare_body', $prep_arr);
 	$s = $prep_arr['html'];
 
 	if(! $attach) {
-		if ($cache != '')
-			file_put_contents($cachefile, $s);
 		return $s;
 	}
 
@@ -925,13 +927,9 @@ function prepare_body($item,$attach = false) {
 		$s .= '<div class="clear"></div></div>';
 	}
 
-
 	$prep_arr = array('item' => $item, 'html' => $s);
 	call_hooks('prepare_body_final', $prep_arr);
 
-	if ($cache != '')
-		file_put_contents($cachefile, $prep_arr['html']);
-
 	return $prep_arr['html'];
 }}
 
-- 
cgit v1.2.3


From eb3b211461906c405c7d016401cb3cd6d7d03b83 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 11 Mar 2012 14:22:19 +0100
Subject: New plugin that shows community pages in the sidebar

---
 addon/pages/README    |  3 +++
 addon/pages/pages.php | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100755 addon/pages/README
 create mode 100755 addon/pages/pages.php

diff --git a/addon/pages/README b/addon/pages/README
new file mode 100755
index 000000000..6ec314b70
--- /dev/null
+++ b/addon/pages/README
@@ -0,0 +1,3 @@
+Pages
+
+Shows lists of community pages
diff --git a/addon/pages/pages.php b/addon/pages/pages.php
new file mode 100755
index 000000000..13e6c4b59
--- /dev/null
+++ b/addon/pages/pages.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Name: Pages
+ * Description: Shows lists of community pages
+ * Version: 1.0
+ * Author: Michael Vogel <ike@piratenpartei.de>
+ *
+ */
+
+function pages_install() {
+	register_hook('page_end', 'addon/pages/pages.php', 'pages_page_end');
+}
+
+function pages_uninstall() {
+	unregister_hook('page_end', 'addon/pages/pages.php', 'pages_page_end');
+}
+
+function pages_page_end($a,&$b) {
+	if (($a->module != "network") OR ($a->user['uid'] == 0))
+		return;
+
+	$pages = '<div id="pages-sidebar" class="widget"><h3>'.t("Community").'</h3><ul>';
+	$contacts = q("SELECT `contact`.`id`, `contact`.`url`, `contact`.`Name` FROM `contact`, `user` 
+			WHERE `network`= 'dfrn' AND `duplex` 
+			AND `contact`.`nick`=`user`.`nickname`
+			AND `user`.`page-flags`= %d
+			AND `contact`.`uid` = %d",
+			intval(PAGE_COMMUNITY),
+			intval($a->user['uid']));
+	foreach($contacts as $contact) {
+		$pages .= '<li class="tool"><a href="'.$contact["url"].'">'.$contact["Name"]."</a></li>";
+	}
+	$pages .= "</ul>";
+	if (sizeof($contacts) > 0)
+		$a->page['aside'] = $pages.$a->page['aside'];
+
+}
+
+?>
-- 
cgit v1.2.3


From b879a1ddf1575a3bd355edcee634be4a8d179c25 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 11 Mar 2012 17:45:12 +0100
Subject: Pages: Show every community page - even from foreign servers (with
 caching)

---
 addon/pages/pages.php        | 70 ++++++++++++++++++++++++++++++++++++--------
 view/theme/diabook/style.css |  3 ++
 2 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/addon/pages/pages.php b/addon/pages/pages.php
index 13e6c4b59..6b242be31 100755
--- a/addon/pages/pages.php
+++ b/addon/pages/pages.php
@@ -15,25 +15,71 @@ function pages_uninstall() {
 	unregister_hook('page_end', 'addon/pages/pages.php', 'pages_page_end');
 }
 
+function pages_iscommunity($url, &$pagelist) {
+	// check every week for the status - should be enough
+	if ($pagelist[$url]["checked"]<time()-86400*7) {
+		// When too old or not found fetch the status from the profile
+		$ch = curl_init();
+
+		curl_setopt($ch, CURLOPT_URL, $url);
+		curl_setopt($ch, CURLOPT_HEADER, 0);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+		curl_setopt($ch, CURLOPT_TIMEOUT, 2);
+ 
+		$page = curl_exec($ch);
+ 
+		curl_close($ch);
+
+		$iscommunity = (strpos($page, '<meta name="friendika.community" content="true" />') != 0);
+
+		$pagelist[$url] = array("community" => $iscommunity, "checked" => time());
+	} else // Fetch from cache
+		$iscommunity = $pagelist[$url]["community"];
+	return($iscommunity);
+}
+
+function pages_getpages($uid) {
+
+	// Fetch cached pagelist from configuration
+	$pagelist = get_pconfig($uid,'pages','pagelist');
+
+	if (sizeof($pagelist) == 0)
+		$pagelist = array();
+
+	$contacts = q("SELECT `id`, `url`, `Name` FROM `contact`
+			WHERE `network`= 'dfrn' AND `uid` = %d",
+			intval($uid));
+
+	$pages = array();
+
+	// Look if the profile is a community page
+	foreach($contacts as $contact) {
+		if (pages_iscommunity($contact["url"], $pagelist))
+			$pages[] = array("url"=>$contact["url"], "Name"=>$contact["Name"]);
+	}
+
+	// Write back cached pagelist
+	set_pconfig($uid,'pages','pagelist', $pagelist);
+	return($pages);
+}
+
 function pages_page_end($a,&$b) {
+	// Only move on if if it's the "network" module and there is a logged on user
 	if (($a->module != "network") OR ($a->user['uid'] == 0))
 		return;
 
-	$pages = '<div id="pages-sidebar" class="widget"><h3>'.t("Community").'</h3><ul>';
-	$contacts = q("SELECT `contact`.`id`, `contact`.`url`, `contact`.`Name` FROM `contact`, `user` 
-			WHERE `network`= 'dfrn' AND `duplex` 
-			AND `contact`.`nick`=`user`.`nickname`
-			AND `user`.`page-flags`= %d
-			AND `contact`.`uid` = %d",
-			intval(PAGE_COMMUNITY),
-			intval($a->user['uid']));
+	$pages = '<div id="pages-sidebar" class="widget">
+			<div class="title tool">
+			<h3>'.t("Community").'</h3></div>
+			<div id="sidebar-pages-list"><ul>';
+
+	$contacts = pages_getpages($a->user['uid']);
+
 	foreach($contacts as $contact) {
-		$pages .= '<li class="tool"><a href="'.$contact["url"].'">'.$contact["Name"]."</a></li>";
+		$pages .= '<li class="tool"><a href="'.$contact["url"].'" class="label" target="external-link">'.$contact["Name"]."</a></li>";
 	}
-	$pages .= "</ul>";
+	$pages .= "</ul></div></div>";
 	if (sizeof($contacts) > 0)
 		$a->page['aside'] = $pages.$a->page['aside'];
-
 }
-
 ?>
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 0504ce96a..ce3307645 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -484,6 +484,9 @@ code {
 #sidebar-group-list .tool:hover {
 	background: #EEE;
 }
+#sidebar-pages-list .tool:hover {
+	background: #EEE;
+}
 .tool .label {
   float: left;
 }
-- 
cgit v1.2.3


From 9f76d96d46356b18325ca49c383f94a1958fefd3 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 11 Mar 2012 19:11:25 +0100
Subject: Cache: item cache now has an autodelete of old files. The pages
 plugin now sets a link via redirection. So posting works.

---
 addon/pages/pages.php |  5 +++--
 include/poller.php    | 13 +++++++++++++
 include/text.php      |  2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/addon/pages/pages.php b/addon/pages/pages.php
index 6b242be31..9e90cc24d 100755
--- a/addon/pages/pages.php
+++ b/addon/pages/pages.php
@@ -55,7 +55,7 @@ function pages_getpages($uid) {
 	// Look if the profile is a community page
 	foreach($contacts as $contact) {
 		if (pages_iscommunity($contact["url"], $pagelist))
-			$pages[] = array("url"=>$contact["url"], "Name"=>$contact["Name"]);
+			$pages[] = array("url"=>$contact["url"], "Name"=>$contact["Name"], "id"=>$contact["id"]);
 	}
 
 	// Write back cached pagelist
@@ -76,7 +76,8 @@ function pages_page_end($a,&$b) {
 	$contacts = pages_getpages($a->user['uid']);
 
 	foreach($contacts as $contact) {
-		$pages .= '<li class="tool"><a href="'.$contact["url"].'" class="label" target="external-link">'.$contact["Name"]."</a></li>";
+		$pages .= '<li class="tool"><a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" class="label" target="external-link">'.
+				$contact["Name"]."</a></li>";
 	}
 	$pages .= "</ul></div></div>";
 	if (sizeof($contacts) > 0)
diff --git a/include/poller.php b/include/poller.php
index f165ad590..65fafda4c 100755
--- a/include/poller.php
+++ b/include/poller.php
@@ -69,6 +69,19 @@ function poller_run($argv, $argc){
 	// clear old cache
 	Cache::clear();
 
+	// clear item cache files if they are older than one day
+	$cache = get_config('system','itemcache');
+	if (($cache != '') and is_dir($cache)) {
+		if ($dh = opendir($cache)) {
+			while (($file = readdir($dh)) !== false) {
+				$fullpath = $cache."/".$file;
+				if ((filetype($fullpath) == "file") and filectime($fullpath) < (time() - 1800))
+					unlink($fullpath);
+			}
+			closedir($dh);
+		}
+	}
+
 	$manual_id  = 0;
 	$generation = 0;
 	$hub_update = false;
diff --git a/include/text.php b/include/text.php
index 5bf815105..08c5a5424 100644
--- a/include/text.php
+++ b/include/text.php
@@ -879,7 +879,7 @@ function prepare_body($item,$attach = false) {
 	$cache = get_config('system','itemcache');
 
 	if (($cache != '')) {
-		$cachefile = $cache."/".$item["guid"]."-".strtotime($item["edited"])."-".$attach."-".hash("crc32", $item['body']);
+		$cachefile = $cache."/".$item["guid"]."-".strtotime($item["edited"])."-".hash("crc32", $item['body']);
 
 		if (file_exists($cachefile))
 			$s = file_get_contents($cachefile);
-- 
cgit v1.2.3


From 739309abd0cb103fe5a4d5081a7252b5698ab787 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 11 Mar 2012 19:41:29 +0100
Subject: Corrected some git problems

---
 addon/pages/README    |  3 --
 addon/pages/pages.php | 86 ---------------------------------------------------
 2 files changed, 89 deletions(-)
 delete mode 100755 addon/pages/README
 delete mode 100755 addon/pages/pages.php

diff --git a/addon/pages/README b/addon/pages/README
deleted file mode 100755
index 6ec314b70..000000000
--- a/addon/pages/README
+++ /dev/null
@@ -1,3 +0,0 @@
-Pages
-
-Shows lists of community pages
diff --git a/addon/pages/pages.php b/addon/pages/pages.php
deleted file mode 100755
index 9e90cc24d..000000000
--- a/addon/pages/pages.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/**
- * Name: Pages
- * Description: Shows lists of community pages
- * Version: 1.0
- * Author: Michael Vogel <ike@piratenpartei.de>
- *
- */
-
-function pages_install() {
-	register_hook('page_end', 'addon/pages/pages.php', 'pages_page_end');
-}
-
-function pages_uninstall() {
-	unregister_hook('page_end', 'addon/pages/pages.php', 'pages_page_end');
-}
-
-function pages_iscommunity($url, &$pagelist) {
-	// check every week for the status - should be enough
-	if ($pagelist[$url]["checked"]<time()-86400*7) {
-		// When too old or not found fetch the status from the profile
-		$ch = curl_init();
-
-		curl_setopt($ch, CURLOPT_URL, $url);
-		curl_setopt($ch, CURLOPT_HEADER, 0);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-		curl_setopt($ch, CURLOPT_TIMEOUT, 2);
- 
-		$page = curl_exec($ch);
- 
-		curl_close($ch);
-
-		$iscommunity = (strpos($page, '<meta name="friendika.community" content="true" />') != 0);
-
-		$pagelist[$url] = array("community" => $iscommunity, "checked" => time());
-	} else // Fetch from cache
-		$iscommunity = $pagelist[$url]["community"];
-	return($iscommunity);
-}
-
-function pages_getpages($uid) {
-
-	// Fetch cached pagelist from configuration
-	$pagelist = get_pconfig($uid,'pages','pagelist');
-
-	if (sizeof($pagelist) == 0)
-		$pagelist = array();
-
-	$contacts = q("SELECT `id`, `url`, `Name` FROM `contact`
-			WHERE `network`= 'dfrn' AND `uid` = %d",
-			intval($uid));
-
-	$pages = array();
-
-	// Look if the profile is a community page
-	foreach($contacts as $contact) {
-		if (pages_iscommunity($contact["url"], $pagelist))
-			$pages[] = array("url"=>$contact["url"], "Name"=>$contact["Name"], "id"=>$contact["id"]);
-	}
-
-	// Write back cached pagelist
-	set_pconfig($uid,'pages','pagelist', $pagelist);
-	return($pages);
-}
-
-function pages_page_end($a,&$b) {
-	// Only move on if if it's the "network" module and there is a logged on user
-	if (($a->module != "network") OR ($a->user['uid'] == 0))
-		return;
-
-	$pages = '<div id="pages-sidebar" class="widget">
-			<div class="title tool">
-			<h3>'.t("Community").'</h3></div>
-			<div id="sidebar-pages-list"><ul>';
-
-	$contacts = pages_getpages($a->user['uid']);
-
-	foreach($contacts as $contact) {
-		$pages .= '<li class="tool"><a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" class="label" target="external-link">'.
-				$contact["Name"]."</a></li>";
-	}
-	$pages .= "</ul></div></div>";
-	if (sizeof($contacts) > 0)
-		$a->page['aside'] = $pages.$a->page['aside'];
-}
-?>
-- 
cgit v1.2.3


From 9ca5de8c281fa0a7b2323f33765bca25b64bc29d Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 11 Mar 2012 19:45:28 +0100
Subject: Item cache now is one day.

---
 include/poller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/poller.php b/include/poller.php
index 65fafda4c..3bc98e36f 100755
--- a/include/poller.php
+++ b/include/poller.php
@@ -75,7 +75,7 @@ function poller_run($argv, $argc){
 		if ($dh = opendir($cache)) {
 			while (($file = readdir($dh)) !== false) {
 				$fullpath = $cache."/".$file;
-				if ((filetype($fullpath) == "file") and filectime($fullpath) < (time() - 1800))
+				if ((filetype($fullpath) == "file") and filectime($fullpath) < (time() - 86400))
 					unlink($fullpath);
 			}
 			closedir($dh);
-- 
cgit v1.2.3


From ebdf4842184cc8d0576abe99b29650c6b6512167 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 11 Mar 2012 19:50:51 +0100
Subject: Added config options for the item cache and the ostatus priority

---
 htconfig.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htconfig.php b/htconfig.php
index f52aed2b1..9d9c8a2c7 100755
--- a/htconfig.php
+++ b/htconfig.php
@@ -79,3 +79,9 @@ $a->config['system']['theme'] = 'duepuntozero';
 // By default allow pseudonyms
 
 $a->config['system']['no_regfullname'] = true;
+
+// If set to true the priority settings of ostatus contacts are used
+$a->config['system']['ostatus_use_priority'] = false;
+
+// If enabled all items are cached in the given directory
+$a->config['system']['itemcache'] = "";
-- 
cgit v1.2.3


From 7235d5466a4f54cd80d1b661b142ec99230afbf2 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 11 Mar 2012 20:24:55 +0100
Subject: Removed changes

---
 view/theme/diabook/wall_item.tpl     | 14 +++++---------
 view/theme/diabook/wallwall_item.tpl | 16 ++++++----------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl
index 6cbab0a71..321bbbe9e 100644
--- a/view/theme/diabook/wall_item.tpl
+++ b/view/theme/diabook/wall_item.tpl
@@ -13,7 +13,8 @@
 				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
 					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
 				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" 
+id="wall-item-photo-menu-button-$item.id">menu</a>
 				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
 				$item.item_photo_menu
 				</ul>
@@ -21,7 +22,8 @@
 			</div>
 		</div>
 			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span 
+class="wall-item-name$item.sparkle">$item.name</span></a> 
 			<span class="wall-item-ago">-
 			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
 			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
@@ -46,10 +48,7 @@
 
 		</div>
 		<div class="wall-item-actions">
-<<<<<<< HEAD:view/theme/diabook/wall_item.tpl
-=======
 
->>>>>>> upstream/master:view/theme/diabook/wall_item.tpl
 			<div class="wall-item-actions-social">
 			
 			
@@ -85,11 +84,7 @@
 					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
 				{{ endif }}
 			</div>
-<<<<<<< HEAD:view/theme/diabook/wall_item.tpl
-			<div class="wall-item-location">$item.location&nbsp;</div>			
-=======
 			<div class="wall-item-location">$item.location&nbsp;</div>
->>>>>>> upstream/master:view/theme/diabook/wall_item.tpl
 		</div>
 	</div>
 	<div class="wall-item-bottom">
@@ -102,3 +97,4 @@
 <div class="wall-item-comment-wrapper" >
 	$item.comment
 </div>
+
diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl
index 4f0a2e25f..05ed4cc82 100644
--- a/view/theme/diabook/wallwall_item.tpl
+++ b/view/theme/diabook/wallwall_item.tpl
@@ -18,7 +18,8 @@
 				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
 					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
 				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" 
+id="wall-item-photo-menu-button-$item.id">menu</a>
 				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
 				$item.item_photo_menu
 				</ul>
@@ -26,8 +27,10 @@
 			</div>
 		</div>
 			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
-				$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a>
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span 
+class="wall-item-name$item.sparkle">$item.name</span></a>
+				$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" 
+id="wall-item-ownername-$item.id">$item.owner_name</span></a>
 				 $item.vwall <span class="wall-item-ago">- &nbsp;
 			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
 			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
@@ -52,10 +55,7 @@
 
 		</div>
 		<div class="wall-item-actions">
-<<<<<<< HEAD:view/theme/diabook/wallwall_item.tpl
-=======
 
->>>>>>> upstream/master:view/theme/diabook/wallwall_item.tpl
 			<div class="wall-item-actions-social">
 			
 			
@@ -92,10 +92,6 @@
 				{{ endif }}
 			</div>
 			<div class="wall-item-location">$item.location&nbsp;</div>
-<<<<<<< HEAD:view/theme/diabook/wallwall_item.tpl
-
-=======
->>>>>>> upstream/master:view/theme/diabook/wallwall_item.tpl
 		</div>
 	</div>
 	<div class="wall-item-bottom">
-- 
cgit v1.2.3


From 905ba5ba1d5d8e2d0caa5c0208357672ee527b7d Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 11 Mar 2012 22:39:40 +0100
Subject: Missing field in database.sql

---
 database.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/database.sql b/database.sql
index 35c257f02..2add8bd85 100755
--- a/database.sql
+++ b/database.sql
@@ -636,6 +636,7 @@ CREATE TABLE IF NOT EXISTS `mailacct` (
 `mailbox` CHAR( 255 ) NOT NULL,
 `user` CHAR( 255 ) NOT NULL ,
 `pass` TEXT NOT NULL ,
+`reply_to` CHAR( 255 ) NOT NULL ,
 `action` INT NOT NULL ,
 `movetofolder` CHAR(255) NOT NULL ,
 `pubmail` TINYINT(1) NOT NULL DEFAULT '0',
-- 
cgit v1.2.3


From 2ed6b3531eb1a9b778dfd87614fd824480a135e2 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 11 Mar 2012 23:29:59 +0100
Subject: Removing test exports

---
 include/delivery.php | 4 ++--
 include/notifier.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/delivery.php b/include/delivery.php
index c1ff07bd5..41869988d 100755
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -435,8 +435,8 @@ function delivery_run($argv, $argc){
 					$headers .= 'Reply-to: ' . $reply_to . "\n";
 
 				// for testing purposes: Collect exported mails
-				$file = tempnam("/tmp/friendica/", "mail-out-");
-				file_put_contents($file, json_encode($it));
+				// $file = tempnam("/tmp/friendica/", "mail-out-");
+				// file_put_contents($file, json_encode($it));
 
 				$headers .= 'Message-Id: <' . iri2msgid($it['uri']). '>' . "\n";
 
diff --git a/include/notifier.php b/include/notifier.php
index 5b23406fc..c0a98c8eb 100755
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -648,8 +648,8 @@ function notifier_run($argv, $argc){
 							$headers .= 'Reply-to: ' . $reply_to . "\n";
 
 						// for testing purposes: Collect exported mails
-						$file = tempnam("/tmp/friendica/", "mail-out2-");
-						file_put_contents($file, json_encode($it));
+						//$file = tempnam("/tmp/friendica/", "mail-out2-");
+						//file_put_contents($file, json_encode($it));
 
 						$headers .= 'Message-Id: <' . iri2msgid($it['uri']) . '>' . "\n";
 
-- 
cgit v1.2.3


From 6e7a190e9197bcf4d00accc5d85ccca4a080bec8 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Mon, 12 Mar 2012 00:22:12 +0100
Subject: Mail: Subject are now with working "Re:"

---
 include/delivery.php | 28 +++++++---------------------
 include/notifier.php | 29 +++++++----------------------
 2 files changed, 14 insertions(+), 43 deletions(-)

diff --git a/include/delivery.php b/include/delivery.php
index 41869988d..44a482ca2 100755
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -446,30 +446,16 @@ function delivery_run($argv, $argc){
 
 				if($it['uri'] !== $it['parent-uri']) {
 					$headers .= 'References: <' . iri2msgid($it['parent-uri']) . '>' . "\n";
-					if(! strlen($it['title'])) {
+					if(!strlen($it['title'])) {
 						$r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' LIMIT 1",
-							dbesc($it['parent-uri'])
-						);
-						if(count($r)) {
-							$subtitle = $r[0]['title'];
-							if($subtitle) {
-								if(strncasecmp($subtitle,'RE:',3))
-									$subject = $subtitle;
-								else
-									$subject = 'Re: ' . $subtitle;
-							}
-						}
+							dbesc($it['parent-uri']));
+
+						if(count($r) AND ($r[0]['title'] != ''))
+							$subject = $r[0]['title'];
 					}
+					if(strncasecmp($subject,'RE:',3))
+						$subject = 'Re: '.$subject;
 				}
-				/*$headers .= 'MIME-Version: 1.0' . "\n";
-				//$headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";
-				$headers .= 'Content-Type: text/plain; charset=UTF-8' . "\n";
-				$headers .= 'Content-Transfer-Encoding: 8bit' . "\n\n";
-				$html    = prepare_body($it);
-				//$message = '<html><body>' . $html . '</body></html>';
-				$message = html2plain($html);
-				logger('notifier: email delivery to ' . $addr);
-				mail($addr, $subject, $message, $headers);*/
 				email_send($addr, $subject, $headers, $it);
 			}
 			break;
diff --git a/include/notifier.php b/include/notifier.php
index c0a98c8eb..07edc7046 100755
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -655,31 +655,16 @@ function notifier_run($argv, $argc){
 
 						if($it['uri'] !== $it['parent-uri']) {
 							$headers .= 'References: <' . iri2msgid($it['parent-uri']) . '>' . "\n";
-							if(! strlen($it['title'])) {
+							if(!strlen($it['title'])) {
 								$r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' LIMIT 1",
-									dbesc($it['parent-uri'])
-								);
-								if(count($r)) {
-									$subtitle = $r[0]['title'];
-									if($subtitle) {
-										if(strncasecmp($subtitle,'RE:',3))
-											$subject = $subtitle;
-										else
-											$subject = 'Re: ' . $subtitle;
-									}
-								}
+									dbesc($it['parent-uri']));
+
+								if(count($r) AND ($r[0]['title'] != ''))  
+									$subject = $r[0]['title'];
 							}
+							if(strncasecmp($subject,'RE:',3))
+								$subject = 'Re: '.$subject;
 						}
-
-						/*$headers .= 'MIME-Version: 1.0' . "\n";
-						//$headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";
-						$headers .= 'Content-Type: text/plain; charset=UTF-8' . "\n";
-						$headers .= 'Content-Transfer-Encoding: 8bit' . "\n\n";
-						$html    = prepare_body($it);
-						//$message = '<html><body>' . $html . '</body></html>';
-						$message = html2plain($html);
-						logger('notifier: email delivery to ' . $addr);
-						mail($addr, $subject, $message, $headers);*/
 						email_send($addr, $subject, $headers, $it);
 					}
 					break;
-- 
cgit v1.2.3

-- 
cgit v1.2.3


From 9cd1c35c22e40cc7fea522f071a72452edd08017 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 15 Mar 2012 03:44:41 -0700
Subject: fix recycle symbol when using plaintext editor

---
 mod/share.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/share.php b/mod/share.php
index f6c025e3c..5a72e2377 100755
--- a/mod/share.php
+++ b/mod/share.php
@@ -17,7 +17,7 @@ function share_init(&$a) {
 	$o = '';
 
 	if(local_user() && intval(get_pconfig(local_user(),'system','plaintext'))) {
-		$o .= '&#x2672; [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]';
+		$o .= "\xE2\x99\xb2" . ' [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]';
 		if($r[0]['title'])
 			$o .= '[b]' . $r[0]['title'] . '[/b]' . "\n";
 		$o .= $r[0]['body'] . "\n";
-- 
cgit v1.2.3


From f96aff5518d2d5fb726d381892893a68d8c36450 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 15 Mar 2012 03:47:02 -0700
Subject: more recycle fixes for plaintext

---
 mod/share.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/share.php b/mod/share.php
index 5a72e2377..47bb851a4 100755
--- a/mod/share.php
+++ b/mod/share.php
@@ -17,7 +17,7 @@ function share_init(&$a) {
 	$o = '';
 
 	if(local_user() && intval(get_pconfig(local_user(),'system','plaintext'))) {
-		$o .= "\xE2\x99\xb2" . ' [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]';
+		$o .= "\xE2\x99\xb2" . ' [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]' . "\n";
 		if($r[0]['title'])
 			$o .= '[b]' . $r[0]['title'] . '[/b]' . "\n";
 		$o .= $r[0]['body'] . "\n";
-- 
cgit v1.2.3


From 5b757e4e0e2f33a17a5a17953e49aba44a6ae7b3 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Thu, 15 Mar 2012 15:07:17 -0400
Subject: commit latest to dispy-dark. fixes in html css and js

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/profile_vcard.tpl                         |  4 +-
 view/theme/dispy-dark/contact_template.tpl     |  2 +
 view/theme/dispy-dark/group_side.tpl           |  6 +--
 view/theme/dispy-dark/head.tpl                 | 19 ---------
 view/theme/dispy-dark/jot-header.tpl           | 14 ++++++
 view/theme/dispy-dark/nets.tpl                 |  2 +-
 view/theme/dispy-dark/profile_vcard.tpl        | 39 +++++++++++------
 view/theme/dispy-dark/saved_searches_aside.tpl |  2 +-
 view/theme/dispy-dark/style.css                | 59 +++++++++++++++++---------
 view/theme/dispy-dark/theme.php                | 25 ++++++-----
 view/theme/dispy-dark/wall_item.tpl            |  5 ++-
 view/theme/dispy-dark/wallwall_item.tpl        |  7 ++-
 view/theme/dispy/theme.php                     |  3 --
 view/theme/duepuntozero/style.css              |  4 +-
 view/theme/duepuntozero/wall_item.tpl          |  6 +--
 view/theme/duepuntozero/wallwall_item.tpl      |  3 --
 16 files changed, 115 insertions(+), 85 deletions(-)

diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl
index 5bcbfd0b0..7cd02f164 100755
--- a/view/profile_vcard.tpl
+++ b/view/profile_vcard.tpl
@@ -18,8 +18,8 @@
 			</div>
 		{{ endif }}
 	</div>
-				
-	
+
+
 	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
 	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
 
diff --git a/view/theme/dispy-dark/contact_template.tpl b/view/theme/dispy-dark/contact_template.tpl
index fbf354b47..04968bd07 100644
--- a/view/theme/dispy-dark/contact_template.tpl
+++ b/view/theme/dispy-dark/contact_template.tpl
@@ -20,9 +20,11 @@
 	</div>
 	<div class="contact-entry-photo-end" ></div>
 		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
+{{ if $contact.alt_text }}<div class="contact-entry-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }}
 	<div class="contact-entry-details" id="contact-entry-url-$contact.id" >
 		<a href="$contact.itemurl" title="$contact.itemurl">Profile URL</a></div>
 	<div class="contact-entry-details" id="contact-entry-network-$contact.id" >$contact.network</div>
 
 	<div class="contact-entry-end" ></div>
 </div>
+
diff --git a/view/theme/dispy-dark/group_side.tpl b/view/theme/dispy-dark/group_side.tpl
index 516d70d5b..10ecec2e8 100644
--- a/view/theme/dispy-dark/group_side.tpl
+++ b/view/theme/dispy-dark/group_side.tpl
@@ -1,5 +1,5 @@
-<div class="widget" id="group-sidebar">
-<h3>$title</h3>
+<div id="group-sidebar" class="widget">
+<h3 class="label">$title</h3>
 
 <div id="sidebar-group-list">
 	<ul id="sidebar-group-ul">
@@ -9,7 +9,7 @@
 				{{ if $group.edit }}
 					<a 
                         class="groupsideedit"
-                        href="$group.edit.href" title="$edittext"><span class="icon small-pencil"></span></a>
+                        href="$group.edit.href" title="$group.edit.title"><span class="icon small-pencil"></span></a>
 				{{ endif }}
 				{{ if $group.cid }}
 					<input type="checkbox" 
diff --git a/view/theme/dispy-dark/head.tpl b/view/theme/dispy-dark/head.tpl
index 793af6fd2..f606f2f7e 100644
--- a/view/theme/dispy-dark/head.tpl
+++ b/view/theme/dispy-dark/head.tpl
@@ -74,25 +74,6 @@
 		}
 	}
 
-    $(document).ready(function() {
-        function toggleToolbar() {
-            if ( $('#nav-floater').is(':visible') ) {
-                $('#nav-floater').slideUp('fast');
-                $('.floaterflip').css({
-                    backgroundPosition: '-210px -60px' 
-                });
-            } else {
-                $('#nav-floater').slideDown('fast');
-                $('.floaterflip').css({
-                    backgroundPosition: '-190px -60px'
-                });
-            }
-        };
-        $('.floaterflip').click(function() {
-            toggleToolbar();
-            return false;
-        });
-    });
 
 </script>
 
diff --git a/view/theme/dispy-dark/jot-header.tpl b/view/theme/dispy-dark/jot-header.tpl
index 43dcdbb84..4c8f59d79 100644
--- a/view/theme/dispy-dark/jot-header.tpl
+++ b/view/theme/dispy-dark/jot-header.tpl
@@ -114,6 +114,7 @@ function enableOnUser(){
 	$(this).val("");
 	initEditor();
 }
+
 </script>
 <script type="text/javascript" src="$baseurl/js/ajaxupload.js"></script>
 <script type="text/javascript">
@@ -121,6 +122,7 @@ function enableOnUser(){
 	var addtitle = '$addtitle';
 
 	$(document).ready(function() {
+		
 		/* enable tinymce on focus and click */
 		$("#profile-jot-text").focus(enableOnUser);
 		$("#profile-jot-text").click(enableOnUser);
@@ -261,6 +263,18 @@ function enableOnUser(){
 		}
 	}
 
+	function itemFiler(id) {
+		reply = prompt("$fileas");
+		if(reply && reply.length) {
+			commentBusy = true;
+			$('body').css('cursor', 'wait');
+			$.get('filer/' + id + '?term=' + reply);
+			if(timer) clearTimeout(timer);
+			timer = setTimeout(NavUpdate,3000);
+			liking = 1;
+		}
+	}
+
 	function jotClearLocation() {
 		$('#jot-coord').val('');
 		$('#profile-nolocation-wrapper').hide();
diff --git a/view/theme/dispy-dark/nets.tpl b/view/theme/dispy-dark/nets.tpl
index b0cb8890c..b322717ad 100644
--- a/view/theme/dispy-dark/nets.tpl
+++ b/view/theme/dispy-dark/nets.tpl
@@ -4,7 +4,7 @@
 	<a href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
 	<ul class="nets-ul">
 	{{ for $nets as $net }}
-	<li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+	<li><a href="$base?f=&nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
 	{{ endfor }}
 	</ul>
 </div>
diff --git a/view/theme/dispy-dark/profile_vcard.tpl b/view/theme/dispy-dark/profile_vcard.tpl
index 5cb567f5a..6228e4f28 100644
--- a/view/theme/dispy-dark/profile_vcard.tpl
+++ b/view/theme/dispy-dark/profile_vcard.tpl
@@ -1,30 +1,45 @@
 <div class="vcard">
 
 	<div class="fn label">$profile.name</div>
-	
+
+		{{ if $profile.edit }}
+			<div class="action">
+			<span class="icon-profile-edit"></span>
+			<a href="#" rel="#profiles-menu" class="ttright" id="profiles-menu-trigger" title="$profile.edit.3">$profile.edit.1</a>
+			<ul id="profiles-menu" class="menu-popup">
+				{{ for $profile.menu.entries as $e }}
+				<li>
+					<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
+				</li>
+				{{ endfor }}
+				<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
+				<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
+				
+			</ul>
+			</div>
+		{{ endif }}
+	</div>
+
 	{{ if $pdesc }}
     <div class="title">$profile.pdesc</div>
     {{ endif }}
 	<div id="profile-photo-wrapper">
-		<img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name" />
-		<div class="profile-edit-side-div">
-			<a class="profile-edit-side-link icon edit" title="$profile.$editprofile" href="profiles/$profile.id" ></a>
-		</div>
-		<div class="clear"></div>
+		<img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" />
     </div>
 
 	{{ if $location }}
 		<div class="location">
         <span class="location-label">$location</span>
-		<address class="adr">
+		<div class="adr">
 			{{ if $profile.address }}
             <div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">$profile.zip</span>
-            <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-            <span class="region">$profile.region</span>
-            <span class="postal-code">$profile.postal-code</span>
+			<span class="city-state-zip">
+				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
+				<span class="region">$profile.region</span>
+				<span class="postal-code">$profile.postal-code</span>
+			</span>
 			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-		</address>
+		</div>
 		</div>
 	{{ endif }}
 
diff --git a/view/theme/dispy-dark/saved_searches_aside.tpl b/view/theme/dispy-dark/saved_searches_aside.tpl
index e2aae1e77..63a85dda5 100644
--- a/view/theme/dispy-dark/saved_searches_aside.tpl
+++ b/view/theme/dispy-dark/saved_searches_aside.tpl
@@ -1,4 +1,4 @@
-<div class="widget" id="saved-search-list">
+<div id="saved-search-list" class="widget">
 	<h3 id="search">$title</h3>
 	$searchbox
 	
diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index c590042f1..2dc21817a 100644
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -195,14 +195,16 @@ input[type=submit] {
     color: #fff;
 }
 
+
 /**
  * global
  */
 /* .tool .action */
 .action {
-    float: right;
+	margin: 5px 0;
 }
 
+
 /**
  * 	login
  */
@@ -210,9 +212,10 @@ input[type=submit] {
     margin-right: 20px;
 }
 
-/*********
-* nav
-*********/
+
+/**
+ * nav
+ */
 nav {
 	height: 60px;
 	display: block;
@@ -690,7 +693,9 @@ aside #viewcontacts {
 #netsearch-box {
 	margin: 30px 0px;
 }
-
+.ttright {
+	margin: 0px 0px 0px 5px;
+}
 
 /**
 * contacts block
@@ -916,7 +921,7 @@ aside #viewcontacts {
 	clear: both;
 }
 #jot-title-desc {
-	color: #cccccc;
+	color: #ccc;
 }
 #profile-jot-desc {
 	color: #ff2000;
@@ -1097,7 +1102,7 @@ section {
 	clear: left;
 	font-size: 0.8em;
 	color: #878883;
-	margin: 20px 0 0 110px;
+	margin: 20px 20px 0 110px;
 }
 .wall-item-ago {
 	display: inline;
@@ -1744,26 +1749,40 @@ div[id$="wrapper"] br {
     margin: 30px 0px;
 }
 .profile-edit-side-div {
-	background: #2e2f2e;
-	border-radius: 5px 5px 0 0;
-	width: 175px;
-	height: 20px;
-	position: relative;
-    margin: -25px -30px 0px 0px;
-	display: none;
-}
-.profile-edit-side-div:hover {
+	/*background: #111;*/
+	/*border-radius: 5px 5px 0px 0px;*/
 	/*margin: 0px 0px 0px 0px;*/
-	display: inline;
+	/*width: 100px;*/
+	/*height: 25px;*/
+	/*position: absolute;*/
+	display: none;
+	/*left: 35%;*/
+	/*top: 41%;*/
+	/*cursor: pointer;*/
 }
-.profile-edit-side-link {
-	margin: 0 0px 0px 155px;
-	/*float: right;*/
+/*.profile-edit-side-div:hover {*/
+	/*display: block;*/
+/*}*/
+/*.profile-edit-side-link {*/
+	/*margin: 3px 0px 0px 70px;*/
+/*}*/
+#profiles-menu-trigger {
+	width: 100px;
 }
 .profile-listing {
     float: left;
     margin: 20px 20px 0px 0px;
 }
+.icon-profile-edit {
+    background: url("icons.png") no-repeat scroll -150px 0px transparent;
+    border: 0 none;
+    display: block;
+    float: right;
+    height: 20px;
+    margin: 0 0 -18px;
+    text-decoration: none;
+	cursor: pointer;
+}
 #profile-edit-links ul {
     margin: 20px 0;
     padding: 0;
diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php
index 6f8243058..c0611ce83 100644
--- a/view/theme/dispy-dark/theme.php
+++ b/view/theme/dispy-dark/theme.php
@@ -74,16 +74,6 @@ $(document).ready(function() {
 		event.stopPropagation();
 	});
 
-	// usermenu
-	//$('html').click(function() {
-//		$('#user-menu-popup').css('display: none');
-		//document.getElementById("usermenu-popup").style.display = "none";
-	//});
-
-	//$('#user-menu').click(function(event) {
-	//	event.stopPropagation();
-	//});
-
     function toggleToolbar() {
         if ( $('#nav-floater').is(':visible') ) {
             $('#nav-floater').slideUp('fast');
@@ -106,11 +96,20 @@ $(document).ready(function() {
 		$(this).css({color: '#eec'});
 	});
 
-	$('#profile-photo-wrapper').mouseover(function() {
-		$('#profile-edit-side-div').css({display: 'block'});
+/*	$('#profile-photo-wrapper').mouseover(function() {
+		$('.profile-edit-side-div').css({display: 'block'});
 	}).mouseout(function() {
-		$('#profile-edit-side-div').css({display: 'none'});
+		$('.profile-edit-side-div').css({display: 'none'});
+		return false;
 	});
+
+	$('img.photo').mouseover(function() {
+		$('.profile-edit-side-div').css({display: 'block'});
+	}).mouseout(function() {
+		$('.profile-edit-side-div').css({display: 'none'});
+		return false;
+	});*/
+
 });
 </script>
 EOT;
diff --git a/view/theme/dispy-dark/wall_item.tpl b/view/theme/dispy-dark/wall_item.tpl
index b013cfeef..c67a88635 100644
--- a/view/theme/dispy-dark/wall_item.tpl
+++ b/view/theme/dispy-dark/wall_item.tpl
@@ -26,11 +26,14 @@
 				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
 				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
 			{{ endif }}
+			
 			{{ if $item.vote }}
 			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
 				<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
 				<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-				{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+				{{ if $item.vote.share }}
+					<a href="#" id="share-$item.id"
+					class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
 				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 			</div>
 			{{ endif }}
diff --git a/view/theme/dispy-dark/wallwall_item.tpl b/view/theme/dispy-dark/wallwall_item.tpl
index 86453fad2..f251d7352 100644
--- a/view/theme/dispy-dark/wallwall_item.tpl
+++ b/view/theme/dispy-dark/wallwall_item.tpl
@@ -31,11 +31,15 @@
 				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
 				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
 			{{ endif }}
+			
 			{{ if $item.vote }}
 			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
 				<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
 				<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-				{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+
+			{{ if $item.vote.share }}
+				<a href="#"  id="share-$item.id"
+class="icon recycle wall-item-share-buttons"  title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
 				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 			</div>
 			{{ endif }}
@@ -63,6 +67,7 @@
 						{{ endfor }}
 					</div>			
 			</div>
+			
 		</div>
 		<div class="wall-item-author">
 			<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index 75297290c..cbfcb09e6 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -111,6 +111,3 @@ $(document).ready(function() {
 });
 </script>
 EOT;
-
-$a->page['footer'] .= <<<EOFooter
-EOFooter;
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index b79b00ef4..10ddb0090 100755
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2615,12 +2615,12 @@ aside input[type='text'] {
 	margin-top: 10px;
 }
 
-.body-tag, .filesavetags {
+.body-tag {
 	opacity: 0.5;
 	filter:alpha(opacity=50);
 }
 
-.body-tag:hover, .filesavetags:hover {
+.body-tag:hover {
 	opacity: 1.0 !important;
 	filter:alpha(opacity=100) !important;
 }
diff --git a/view/theme/duepuntozero/wall_item.tpl b/view/theme/duepuntozero/wall_item.tpl
index 6cb018b7b..2c88fc598 100755
--- a/view/theme/duepuntozero/wall_item.tpl
+++ b/view/theme/duepuntozero/wall_item.tpl
@@ -56,11 +56,9 @@
 			{{ if $item.star }}
 			<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
 			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.star.filer"></a>
 			{{ endif }}
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
-			{{ endif }}
-
+			
 			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
 				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
 			</div>
diff --git a/view/theme/duepuntozero/wallwall_item.tpl b/view/theme/duepuntozero/wallwall_item.tpl
index c37bcb4a2..211906c93 100755
--- a/view/theme/duepuntozero/wallwall_item.tpl
+++ b/view/theme/duepuntozero/wallwall_item.tpl
@@ -61,9 +61,6 @@
 			<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
 			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
 			{{ endif }}
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
-			{{ endif }}
 			
 			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
 				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-- 
cgit v1.2.3


From b5120888cf6e3aac29aa2a8d80bddcab73822e1e Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Thu, 15 Mar 2012 21:17:51 +0100
Subject: html2bbcode: Disabled size conversion

---
 include/html2bbcode.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index 0dafecc71..69ccf41b7 100755
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -142,14 +142,14 @@ function html2bbcode($message)
 	node2bbcode($doc, 'span', array('style'=>'font-style: italic;'), '[i]', '[/i]');
 	node2bbcode($doc, 'span', array('style'=>'font-weight: bold;'), '[b]', '[/b]');
 
-	node2bbcode($doc, 'font', array('face'=>'/([\w ]+)/', 'size'=>'/(\d+)/', 'color'=>'/(.+)/'), '[font=$1][size=$2][color=$3]', '[/color][/size][/font]');
+	/*node2bbcode($doc, 'font', array('face'=>'/([\w ]+)/', 'size'=>'/(\d+)/', 'color'=>'/(.+)/'), '[font=$1][size=$2][color=$3]', '[/color][/size][/font]');
 	node2bbcode($doc, 'font', array('size'=>'/(\d+)/', 'color'=>'/(.+)/'), '[size=$1][color=$2]', '[/color][/size]');
 	node2bbcode($doc, 'font', array('face'=>'/([\w ]+)/', 'size'=>'/(.+)/'), '[font=$1][size=$2]', '[/size][/font]');
 	node2bbcode($doc, 'font', array('face'=>'/([\w ]+)/', 'color'=>'/(.+)/'), '[font=$1][color=$3]', '[/color][/font]');
 	node2bbcode($doc, 'font', array('face'=>'/([\w ]+)/'), '[font=$1]', '[/font]');
 	node2bbcode($doc, 'font', array('size'=>'/(\d+)/'), '[size=$1]', '[/size]');
 	node2bbcode($doc, 'font', array('color'=>'/(.+)/'), '[color=$1]', '[/color]');
-
+*/
 	// Untested
 	//node2bbcode($doc, 'span', array('style'=>'/.*font-size:\s*(.+?)[,;].*font-family:\s*(.+?)[,;].*color:\s*(.+?)[,;].*/'), '[size=$1][font=$2][color=$3]', '[/color][/font][/size]');
 	//node2bbcode($doc, 'span', array('style'=>'/.*font-size:\s*(\d+)[,;].*/'), '[size=$1]', '[/size]');
@@ -191,13 +191,13 @@ function html2bbcode($message)
 
 	node2bbcode($doc, 'hr', array(), "[hr]", "");
 
-	//node2bbcode($doc, 'table', array(), "", "");
-	//node2bbcode($doc, 'tr', array(), "\n", "");
-	//node2bbcode($doc, 'td', array(), "\t", "");
-	node2bbcode($doc, 'table', array(), "[table]", "[/table]");
-	node2bbcode($doc, 'th', array(), "[th]", "[/th]");
-	node2bbcode($doc, 'tr', array(), "[tr]", "[/tr]");
-	node2bbcode($doc, 'td', array(), "[td]", "[/td]");
+	node2bbcode($doc, 'table', array(), "", "");
+	node2bbcode($doc, 'tr', array(), "\n", "");
+	node2bbcode($doc, 'td', array(), "\t", "");
+	//node2bbcode($doc, 'table', array(), "[table]", "[/table]");
+	//node2bbcode($doc, 'th', array(), "[th]", "[/th]");
+	//node2bbcode($doc, 'tr', array(), "[tr]", "[/tr]");
+	//node2bbcode($doc, 'td', array(), "[td]", "[/td]");
 
 	node2bbcode($doc, 'h1', array(), "\n\n[size=xx-large][b]", "[/b][/size]\n");
 	node2bbcode($doc, 'h2', array(), "\n\n[size=x-large][b]", "[/b][/size]\n");
-- 
cgit v1.2.3

-- 
cgit v1.2.3


From 5c75d40c0b6bee04d8c58a6f88ecbbe34684874a Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Thu, 15 Mar 2012 17:27:06 -0400
Subject: fixed the sidebar edit thingy. haven't synced dispy yet.

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy-dark/profile_vcard.tpl | 35 ++++++++++++++++-----------------
 view/theme/dispy-dark/style.css         | 16 +++++++++------
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/view/theme/dispy-dark/profile_vcard.tpl b/view/theme/dispy-dark/profile_vcard.tpl
index 6228e4f28..350a6ce4a 100644
--- a/view/theme/dispy-dark/profile_vcard.tpl
+++ b/view/theme/dispy-dark/profile_vcard.tpl
@@ -1,24 +1,23 @@
 <div class="vcard">
 
-	<div class="fn label">$profile.name</div>
-
-		{{ if $profile.edit }}
-			<div class="action">
-			<span class="icon-profile-edit"></span>
-			<a href="#" rel="#profiles-menu" class="ttright" id="profiles-menu-trigger" title="$profile.edit.3">$profile.edit.1</a>
-			<ul id="profiles-menu" class="menu-popup">
-				{{ for $profile.menu.entries as $e }}
-				<li>
-					<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
-				</li>
-				{{ endfor }}
-				<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
-				<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
-				
-			</ul>
-			</div>
-		{{ endif }}
+	{{ if $profile.edit }}
+	<div class="action">
+	<span class="icon-profile-edit"></span>
+	<a href="#" rel="#profiles-menu" class="ttright" id="profiles-menu-trigger" title="$profile.edit.3">$profile.edit.1</a>
+	<ul id="profiles-menu" class="menu-popup">
+		{{ for $profile.menu.entries as $e }}
+		<li>
+			<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
+		</li>
+		{{ endfor }}
+		<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
+		<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
+		
+	</ul>
 	</div>
+	{{ endif }}
+
+	<div class="fn label">$profile.name</div>
 
 	{{ if $pdesc }}
     <div class="title">$profile.pdesc</div>
diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index 2dc21817a..6ab0c7921 100644
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -694,7 +694,7 @@ aside #viewcontacts {
 	margin: 30px 0px;
 }
 .ttright {
-	margin: 0px 0px 0px 5px;
+	margin: 0px 0px 0px 0px;
 }
 
 /**
@@ -835,6 +835,7 @@ aside #viewcontacts {
     border: 0;
     text-decoration: none;
 	float: right;
+	cursor: pointer;
 }
 #profile-jot-perms { 
 	float: right;
@@ -1702,7 +1703,6 @@ div[id$="wrapper"] br {
 }
 
 
-
 /**
  * 	register, settings & profile forms
  */
@@ -1767,21 +1767,25 @@ div[id$="wrapper"] br {
 	/*margin: 3px 0px 0px 70px;*/
 /*}*/
 #profiles-menu-trigger {
-	width: 100px;
+	margin: 0px 0px 0px 25px;
 }
 .profile-listing {
     float: left;
     margin: 20px 20px 0px 0px;
 }
 .icon-profile-edit {
-    background: url("icons.png") no-repeat scroll -150px 0px transparent;
-    border: 0 none;
+    background: url("icons.png") -150px 0px no-repeat;
+    border: 0;
+	cursor: pointer;
     display: block;
     float: right;
+	width: 20px;
     height: 20px;
     margin: 0 0 -18px;
+	position: absolute;
     text-decoration: none;
-	cursor: pointer;
+	top: 18px;
+	right: 226px;
 }
 #profile-edit-links ul {
     margin: 20px 0;
-- 
cgit v1.2.3


From 7684f63ecdfce560f24475630144f6058df15ca9 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 15 Mar 2012 16:38:26 -0700
Subject: track whether contact is a community page or not

---
 boot.php             |  4 ++--
 database.sql         |  2 ++
 include/items.php    |  5 +++++
 mod/dfrn_confirm.php |  6 ++++++
 mod/dfrn_notify.php  | 12 ++++++++----
 update.php           |  7 ++++++-
 6 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/boot.php b/boot.php
index 04f36093b..86da3cd2e 100755
--- a/boot.php
+++ b/boot.php
@@ -9,9 +9,9 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1281' );
+define ( 'FRIENDICA_VERSION',      '2.3.1282' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1131      );
+define ( 'DB_UPDATE_VERSION',      1132      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
diff --git a/database.sql b/database.sql
index 35c257f02..5f69a1d00 100755
--- a/database.sql
+++ b/database.sql
@@ -92,6 +92,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
   `blocked` tinyint(1) NOT NULL DEFAULT '1',
   `readonly` tinyint(1) NOT NULL DEFAULT '0',
   `writable` tinyint(1) NOT NULL DEFAULT '0',
+  `forum` tinyint(1) NOT NULL DEFAULT '0',
   `hidden` tinyint(1) NOT NULL DEFAULT '0',
   `pending` tinyint(1) NOT NULL DEFAULT '1',
   `rating` tinyint(1) NOT NULL DEFAULT '0',
@@ -116,6 +117,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
   KEY `dfrn-id` (`dfrn-id`),
   KEY `blocked` (`blocked`),
   KEY `readonly` (`readonly`),
+  KEY `forum` (`forum`),
   KEY `hidden` (`hidden`),
   KEY `pending` (`pending`),
   KEY `closeness` (`closeness`)  
diff --git a/include/items.php b/include/items.php
index 4b1523ff6..68acb45f9 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1048,6 +1048,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 
 	$ssl_val = intval(get_config('system','ssl_policy'));
 	$ssl_policy = '';
+
 	switch($ssl_val){
 		case SSL_POLICY_FULL:
 			$ssl_policy = 'full';
@@ -1092,6 +1093,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 	$challenge    = hex2bin((string) $res->challenge);
 	$dfrn_version = (float) (($res->dfrn_version) ? $res->dfrn_version : 2.0);
 	$rino_allowed = ((intval($res->rino) === 1) ? 1 : 0);
+	$page         = (($owner['page-flags'] == PAGE_COMMUNITY) ? 1 : 0);
 
 	$final_dfrn_id = '';
 
@@ -1135,6 +1137,9 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 
 	$postvars['ssl_policy'] = $ssl_policy;
 
+	if($page)
+		$postvars['page'] = '1';
+	
 	if($rino && $rino_allowed && (! $dissolve)) {
 		$key = substr(random_string(),0,16);
 		$data = bin2hex(aes_encrypt($postvars['data'],$key));
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 0bc3ea7df..2f4fb7045 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -207,6 +207,9 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			if($duplex == 1)
 				$params['duplex'] = 1;
 
+			if($user['page-flags'] == PAGE_COMMUNITY)
+				$params['page'] = 1;
+
 			logger('dfrn_confirm: Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params,true), LOGGER_DATA);
 
 			/**
@@ -522,6 +525,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 		$source_url = ((x($_POST,'source_url'))   ? hex2bin($_POST['source_url'])  : '');
 		$aes_key    = ((x($_POST,'aes_key'))      ? $_POST['aes_key']              : '');
 		$duplex     = ((x($_POST,'duplex'))       ? intval($_POST['duplex'])       : 0 );
+		$page       = ((x($_POST,'page'))         ? intval($_POST['page'])         : 0 );
 		$version_id = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version'] : 2.0);
 	
 		logger('dfrn_confirm: requestee contacted: ' . $node);
@@ -677,6 +681,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			`blocked` = 0, 
 			`pending` = 0,
 			`duplex` = %d, 
+			`forum` = %d,
 			`network` = '%s' WHERE `id` = %d LIMIT 1
 		",
 			dbesc($photos[0]),
@@ -687,6 +692,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			dbesc(datetime_convert()),
 			dbesc(datetime_convert()),
 			intval($duplex),
+			intval($page),
 			dbesc(NETWORK_DFRN),
 			intval($dfrn_record)
 		);
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 3dbdc5b32..71860ac3b 100755
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -15,6 +15,7 @@ function dfrn_notify_post(&$a) {
 	$dissolve     = ((x($_POST,'dissolve'))     ? intval($_POST['dissolve'])        :  0);
 	$perm         = ((x($_POST,'perm'))         ? notags(trim($_POST['perm']))      : 'r');
 	$ssl_policy   = ((x($_POST,'ssl_policy'))   ? notags(trim($_POST['ssl_policy'])): 'none');
+	$page         = ((x($_POST,'page'))         ? intval($_POST['page'])            :  0);
 
 	$writable = (-1);
 	if($dfrn_version >= 2.21) {
@@ -87,12 +88,15 @@ function dfrn_notify_post(&$a) {
 
 	$importer = $r[0];
 
-	if(($writable != (-1)) && ($writable != $importer['writable'])) {
-		q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d LIMIT 1",
-			intval($writable),
+	if((($writable != (-1)) && ($writable != $importer['writable'])) || ($importer['forum'] != $page)) {
+		q("UPDATE `contact` SET `writable` = %d, forum = %d WHERE `id` = %d LIMIT 1",
+			intval(($writable == (-1)) ? $importer['writable'] : $writable),
+			intval($page),
 			intval($importer['id'])
 		);
-		$importer['writable'] = $writable;
+		if($writable != (-1))
+			$importer['writable'] = $writable;
+		$importer['forum'] = $page;
 	}
 
 	// if contact's ssl policy changed, update our links
diff --git a/update.php b/update.php
index c29394b48..6a685a6ff 100755
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1131 );
+define( 'UPDATE_VERSION' , 1132 );
 
 /**
  *
@@ -1122,3 +1122,8 @@ function update_1130() {
 	q("ALTER TABLE `item` ADD `file` MEDIUMTEXT NOT NULL AFTER `inform`, ADD FULLTEXT KEY (`file`) ");
 }
 
+function update_1131() {
+	q("ALTER TABLE `contact` ADD `forum` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `writable` , ADD INDEX ( `forum` ) ");
+}
+
+
-- 
cgit v1.2.3


From 02395c8af5fd8112688920ae04e0971d1a4ee4f8 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Fri, 16 Mar 2012 03:49:43 +0100
Subject: added icons to profile_side, fixes in css

---
 view/theme/diabook-blue/icons/com_side.png  | Bin 0 -> 680 bytes
 view/theme/diabook-blue/icons/events.png    | Bin 0 -> 663 bytes
 view/theme/diabook-blue/icons/home.png      | Bin 0 -> 722 bytes
 view/theme/diabook-blue/icons/mess_side.png | Bin 0 -> 664 bytes
 view/theme/diabook-blue/icons/notes.png     | Bin 0 -> 739 bytes
 view/theme/diabook-blue/icons/pubgroups.png | Bin 0 -> 710 bytes
 view/theme/diabook-blue/photo_album.tpl     |   7 ++++
 view/theme/diabook-blue/photo_top.tpl       |   7 ++++
 view/theme/diabook-blue/photo_view.tpl      |   2 +-
 view/theme/diabook-blue/profile_side.tpl    |  12 +++----
 view/theme/diabook-blue/style.css           |  52 +++++++++++++++++++++++++---
 view/theme/diabook-blue/theme.php           |  13 ++++---
 view/theme/diabook/style.css                |   7 ++--
 view/theme/diabook/wall_item.tpl            |   7 ++--
 view/theme/diabook/wallwall_item.tpl        |  11 +++---
 15 files changed, 86 insertions(+), 32 deletions(-)
 create mode 100644 view/theme/diabook-blue/icons/com_side.png
 create mode 100644 view/theme/diabook-blue/icons/events.png
 create mode 100644 view/theme/diabook-blue/icons/home.png
 create mode 100644 view/theme/diabook-blue/icons/mess_side.png
 create mode 100644 view/theme/diabook-blue/icons/notes.png
 create mode 100644 view/theme/diabook-blue/icons/pubgroups.png
 create mode 100755 view/theme/diabook-blue/photo_album.tpl
 create mode 100755 view/theme/diabook-blue/photo_top.tpl

diff --git a/view/theme/diabook-blue/icons/com_side.png b/view/theme/diabook-blue/icons/com_side.png
new file mode 100644
index 000000000..bc5969ef1
Binary files /dev/null and b/view/theme/diabook-blue/icons/com_side.png differ
diff --git a/view/theme/diabook-blue/icons/events.png b/view/theme/diabook-blue/icons/events.png
new file mode 100644
index 000000000..4a0b3f3f1
Binary files /dev/null and b/view/theme/diabook-blue/icons/events.png differ
diff --git a/view/theme/diabook-blue/icons/home.png b/view/theme/diabook-blue/icons/home.png
new file mode 100644
index 000000000..be47a48fc
Binary files /dev/null and b/view/theme/diabook-blue/icons/home.png differ
diff --git a/view/theme/diabook-blue/icons/mess_side.png b/view/theme/diabook-blue/icons/mess_side.png
new file mode 100644
index 000000000..49ef896bc
Binary files /dev/null and b/view/theme/diabook-blue/icons/mess_side.png differ
diff --git a/view/theme/diabook-blue/icons/notes.png b/view/theme/diabook-blue/icons/notes.png
new file mode 100644
index 000000000..7d4afca90
Binary files /dev/null and b/view/theme/diabook-blue/icons/notes.png differ
diff --git a/view/theme/diabook-blue/icons/pubgroups.png b/view/theme/diabook-blue/icons/pubgroups.png
new file mode 100644
index 000000000..acf857f32
Binary files /dev/null and b/view/theme/diabook-blue/icons/pubgroups.png differ
diff --git a/view/theme/diabook-blue/photo_album.tpl b/view/theme/diabook-blue/photo_album.tpl
new file mode 100755
index 000000000..7e6c2f666
--- /dev/null
+++ b/view/theme/diabook-blue/photo_album.tpl
@@ -0,0 +1,7 @@
+<div class="photo-album-image-wrapper" id="photo-album-image-wrapper-$id">
+	<a href="$imgsrc" rel="gallery" class="fancy-album" id="photo-album-photo-link-$id" title="$phototitle">
+		<img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo lframe  resize" id="photo-album-photo-$id" />
+		<p class='caption'>$desc</p>		
+	</a>
+</div>
+<div class="photo-album-image-wrapper-end"></div>
diff --git a/view/theme/diabook-blue/photo_top.tpl b/view/theme/diabook-blue/photo_top.tpl
new file mode 100755
index 000000000..98ac9c457
--- /dev/null
+++ b/view/theme/diabook-blue/photo_top.tpl
@@ -0,0 +1,7 @@
+
+<div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-$id">
+	<a href="$photo.src" rel="$photo.album.name" class="fancy-album" id="photo-top-photo-link-$photo.id" title="$photo.title">
+		<img src="$photo.src" alt="$photo.alt" title="$photo.title" class="photo-top-album-img" id="photo-top-photo-$photo.id" />
+	</a>
+	<div class="photo-top-album-name"><a href="$photo.album.link" class="photo-top-album-link" title="$photo.album.alt" >$photo.album.name</a></div>
+</div>
diff --git a/view/theme/diabook-blue/photo_view.tpl b/view/theme/diabook-blue/photo_view.tpl
index 511fc73ac..902c2a0ed 100755
--- a/view/theme/diabook-blue/photo_view.tpl
+++ b/view/theme/diabook-blue/photo_view.tpl
@@ -12,7 +12,7 @@
 
 <div id="photo-photo">
 	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-	<a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a>
+	<a href="$photo.href" class="fancy-photo" title="$photo.title"><img src="$photo.src" /></a>
 	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
 </div>
 
diff --git a/view/theme/diabook-blue/profile_side.tpl b/view/theme/diabook-blue/profile_side.tpl
index 01da55ce1..a65677696 100644
--- a/view/theme/diabook-blue/profile_side.tpl
+++ b/view/theme/diabook-blue/profile_side.tpl
@@ -7,12 +7,12 @@
 	</div>
 	
 <ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
-	<li id="profile-side-photos" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
-	<li id="profile-side-events" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
-	<li id="profile-side-notes" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
-	<li id="profile-side-foren" class="menu-profile-list"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
-	<li id="profile-side-foren" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
+	<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
+	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
+	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
+	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
+	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
+	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
 </ul>
 
 </div>
diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css
index bdc79a350..738dde0e5 100644
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -891,22 +891,47 @@ ul.menu-popup .empty {
   text-decoration: none;	
 	}
 .menu-profile-side{
-	list-style: none;	
-  padding-left: 16px;
-  min-height: 16px;
+  list-style: none;	
+  padding-left: 0px;
+  min-height: 0px;
 	}
 .menu-profile-list{
   height: auto;
   overflow: auto;
   padding-top: 3px;
   padding-bottom: 3px;
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
 	}
 .menu-profile-list:hover{
 	background: #EEE;
 	}
+.menu-profile-list-item{
+	padding-left: 5px;
+	}	
 .menu-profile-list-item:hover{	
-	text-decoration: none;	
+	text-decoration: none;
    }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-list.home{
+	background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat;
+	}
+.menu-profile-list.photos{
+	background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat;
+	}
+.menu-profile-list.events{
+	background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat;
+	}
+.menu-profile-list.notes{
+	background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat;
+	}
+.menu-profile-list.foren{
+	background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat;
+	}
+.menu-profile-list.com_side{
+	background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
+	}
 /* aside */
 aside {
   display: table-cell;
@@ -1066,6 +1091,16 @@ aside #side-peoplefind-url {
   min-height: 16px;
   list-style: none;
 }
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+	}
+#side-bar-photos-albums ul li a{
+  color: #1872A2;
+}
 .widget .tool.selected {
   background: url("../../../view/theme/diabook-blue/icons/selected.png") no-repeat left center;
 }
@@ -2207,6 +2242,9 @@ a.mail-list-link {
 .calendar {
         font-family: Courier, monospace;
 }
+.calendar.eventcal a {
+  color: #1872A2;	
+	}
 .today {
         font-weight: bold;
         color: #FF0000;
@@ -2380,6 +2418,9 @@ float: left;
   padding-bottom: 20px;
   position: relative;
   margin: 0 10px 10px 0;
+  overflow: hidden;
+  float: left;
+  position: relative;
 }
 .photo-top-album-name {
   position: absolute;
@@ -2388,6 +2429,9 @@ float: left;
 }
 .photo-top-album-link{
   color: #1872A2;
+	}
+.photo-top-album-img{
+	
 	}
 /*.photo-top-image-wrapper {
         position: relative;
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 9093ac2ca..f9128ea1f 100755
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -11,9 +11,9 @@ $a->theme_info = array(
   'extends' => 'diabook',
 );
 
-//profile_side
-
+//fancybox: provide $photo.href to photo_top.tpl to img in org. scale
 
+//profile_side
 
 $nav['usermenu']=array();
 $userinfo = null;
@@ -110,10 +110,15 @@ $('html').click(function() {
      event.stopPropagation();
  });
  
- $(function() {
-	$('a.lightbox').fancybox(); // Select all links with lightbox class
+
+
+ $(document).ready(function() {
+	$("a.fancy-photo").fancybox(); // Select all links with lightbox class 
+	$("a.fancy-album").fancybox();
 });
 
+
+
  
  </script>
 EOT;
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index b7568631f..437f323fa 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -485,9 +485,6 @@ code {
 #sidebar-group-list .tool:hover {
 	background: #EEE;
 }
-#sidebar-pages-list .tool:hover {
-	background: #EEE;
-}
 .tool .label {
   float: left;
 }
@@ -1337,14 +1334,14 @@ body .pageheader{
 }
 .tag {
   /*background: url("../../../images/tag_b.png") repeat-x center left;*/
-  color: #999;
+  color: #3465A4;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
   /*background: url("../../../images/tag.png") no-repeat center right;*/
-  color: #999;
+  color: #3465A4;
 }
 .wwto {
   position: absolute !important;
diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl
index 321bbbe9e..ebe40fd4e 100644
--- a/view/theme/diabook/wall_item.tpl
+++ b/view/theme/diabook/wall_item.tpl
@@ -13,8 +13,7 @@
 				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
 					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
 				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" 
-id="wall-item-photo-menu-button-$item.id">menu</a>
+				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
 				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
 				$item.item_photo_menu
 				</ul>
@@ -22,8 +21,7 @@ id="wall-item-photo-menu-button-$item.id">menu</a>
 			</div>
 		</div>
 			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span 
-class="wall-item-name$item.sparkle">$item.name</span></a> 
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
 			<span class="wall-item-ago">-
 			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
 			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
@@ -97,4 +95,3 @@ class="wall-item-name$item.sparkle">$item.name</span></a>
 <div class="wall-item-comment-wrapper" >
 	$item.comment
 </div>
-
diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl
index 05ed4cc82..e02e5a8be 100644
--- a/view/theme/diabook/wallwall_item.tpl
+++ b/view/theme/diabook/wallwall_item.tpl
@@ -18,8 +18,7 @@
 				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
 					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
 				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" 
-id="wall-item-photo-menu-button-$item.id">menu</a>
+				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
 				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
 				$item.item_photo_menu
 				</ul>
@@ -27,10 +26,8 @@ id="wall-item-photo-menu-button-$item.id">menu</a>
 			</div>
 		</div>
 			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span 
-class="wall-item-name$item.sparkle">$item.name</span></a>
-				$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" 
-id="wall-item-ownername-$item.id">$item.owner_name</span></a>
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
+				$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a>
 				 $item.vwall <span class="wall-item-ago">- &nbsp;
 			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
 			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
@@ -103,4 +100,4 @@ id="wall-item-ownername-$item.id">$item.owner_name</span></a>
 
 <div class="wall-item-comment-wrapper" >
 	$item.comment
-</div>
+</div>
\ No newline at end of file
-- 
cgit v1.2.3


From 5a12383b78980d873f54ccbac2733d7267f7da36 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 15 Mar 2012 19:55:58 -0700
Subject: undo git stuffup

---
 view/theme/duepuntozero/style.css         | 4 ++--
 view/theme/duepuntozero/wall_item.tpl     | 5 +++--
 view/theme/duepuntozero/wallwall_item.tpl | 3 +++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 10ddb0090..b79b00ef4 100755
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2615,12 +2615,12 @@ aside input[type='text'] {
 	margin-top: 10px;
 }
 
-.body-tag {
+.body-tag, .filesavetags {
 	opacity: 0.5;
 	filter:alpha(opacity=50);
 }
 
-.body-tag:hover {
+.body-tag:hover, .filesavetags:hover {
 	opacity: 1.0 !important;
 	filter:alpha(opacity=100) !important;
 }
diff --git a/view/theme/duepuntozero/wall_item.tpl b/view/theme/duepuntozero/wall_item.tpl
index 2c88fc598..e2db70a14 100755
--- a/view/theme/duepuntozero/wall_item.tpl
+++ b/view/theme/duepuntozero/wall_item.tpl
@@ -56,9 +56,10 @@
 			{{ if $item.star }}
 			<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
 			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.star.filer"></a>
 			{{ endif }}
-			
+			{{ if $item.filer }}
+			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.star.filer"></a>
+			{{ endif }}			
 			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
 				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
 			</div>
diff --git a/view/theme/duepuntozero/wallwall_item.tpl b/view/theme/duepuntozero/wallwall_item.tpl
index 211906c93..420c0e08b 100755
--- a/view/theme/duepuntozero/wallwall_item.tpl
+++ b/view/theme/duepuntozero/wallwall_item.tpl
@@ -61,6 +61,9 @@
 			<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
 			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
 			{{ endif }}
+			{{ if $item.filer }}
+			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.star.filer"></a>
+			{{ endif }}			
 			
 			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
 				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-- 
cgit v1.2.3


From be4e4dfb0d552857c683ee7f7bf5cf0a4bdfb686 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 15 Mar 2012 20:07:30 -0700
Subject: turn indexes back off (this is from an errant checkin a year or more
 ago)

---
 .htaccess | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.htaccess b/.htaccess
index 5f9531a7e..28ac3dd80 100755
--- a/.htaccess
+++ b/.htaccess
@@ -1,4 +1,4 @@
-#Options -Indexes
+Options -Indexes
 AddType application/x-java-archive .jar
 AddType audio/ogg .oga
 
-- 
cgit v1.2.3

-- 
cgit v1.2.3


From 6bdb71f01c93c691a43caaf9686ce5ac0b687701 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Fri, 16 Mar 2012 01:55:34 -0400
Subject: more changes in dispy-dark

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy-dark/style.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index 6ab0c7921..d1ec4efd7 100644
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -1490,6 +1490,8 @@ div[id$="wrapper"] br {
 }
 #prvmail-subject {
     width: 100%;
+	color: #2e2f2e;
+	background: #eec;
 }
 #prvmail-submit-wrapper {
     margin-top: 10px;
@@ -1803,6 +1805,10 @@ div[id$="wrapper"] br {
 	background: #2e2f2e;
 	color: #eec;
 }
+#id_ssl_policy {
+	width: 374px;
+}
+
 
 /**
  * 	contacts selector
-- 
cgit v1.2.3


From d965f73ef149e6baaf058987c146901e3cc16fa0 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Fri, 16 Mar 2012 01:57:27 -0400
Subject: missing close double quote in mail_list.tpl

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/mail_list.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100755 => 100644 view/mail_list.tpl

diff --git a/view/mail_list.tpl b/view/mail_list.tpl
old mode 100755
new mode 100644
index b284ffb0e..22e35dec8
--- a/view/mail_list.tpl
+++ b/view/mail_list.tpl
@@ -1,6 +1,6 @@
 <div class="mail-list-outside-wrapper">
 	<div class="mail-list-sender" >
-		<a href="$from_url" class="mail-list-sender-url" ><img class="mail-list-sender-photo$sparkle" src="$from_photo" height="80 width="80" alt="$from_name" /></a>
+		<a href="$from_url" class="mail-list-sender-url" ><img class="mail-list-sender-photo$sparkle" src="$from_photo" height="80" width="80" alt="$from_name" /></a>
 	</div>
 	<div class="mail-list-detail">
 		<div class="mail-list-sender-name" >$from_name</div>
-- 
cgit v1.2.3