From c583d1620955b8d170b8cbf7a106cefeecad56c8 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 3 Jan 2012 14:27:00 -0800
Subject: fix reference variable effects on sorting

---
 boot.php                 |  2 +-
 include/conversation.php | 10 +++++++---
 include/items.php        |  2 +-
 view/atom_feed.tpl       |  2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/boot.php b/boot.php
index fe8491332..619a3fead 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1214' );
+define ( 'FRIENDICA_VERSION',      '2.3.1215' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1114      );
 
diff --git a/include/conversation.php b/include/conversation.php
index f4432bfd9..1b1d09d6b 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -911,9 +911,13 @@ function conv_sort($arr,$order) {
 			$parents[$p]['children'][] = $x;
 		}
 	}
-	foreach($parents as $x)
-		if(count($x['children']))
-			usort($x['children'],'sort_thr_created_rev');
+	foreach($parents as $k => $v) {
+		if(count($parents[$k]['children'])) {
+			$y = $parents[$k]['children'];
+			usort($y,'sort_thr_created_rev');
+			$parents[$k]['children'] = $y;
+		}
+	}
 
 	$ret = array();
 	foreach($parents as $x) {
diff --git a/include/items.php b/include/items.php
index 9becb9ffb..7f003ab57 100644
--- a/include/items.php
+++ b/include/items.php
@@ -945,7 +945,7 @@ function tgroup_deliver($uid,$item_id) {
 
 	$link = normalise_link($a->get_baseurl() . '/profile/' . $u[0]['nickname']);
 
-	$cnt = preg_match_all('/\@\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER);
+	$cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER);
 	if($cnt) {
 		foreach($matches as $mtch) {
 			if(link_compare($link,$mtch[1])) {
diff --git a/view/atom_feed.tpl b/view/atom_feed.tpl
index c7cc08297..72cf8e4fd 100644
--- a/view/atom_feed.tpl
+++ b/view/atom_feed.tpl
@@ -12,7 +12,7 @@
 
   <id>$feed_id</id>
   <title>$feed_title</title>
-  <generator uri="http://friendika.com" version="$version">Friendika</generator>
+  <generator uri="http://friendica.com" version="$version">Friendica</generator>
   <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
   $hub
   $salmon
-- 
cgit v1.2.3


From 969cd145ce0e717399dbfff6cbc1a45342206e1a Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 3 Jan 2012 17:29:07 -0800
Subject: suggestion notifications

---
 boot.php                 |  3 +++
 include/conversation.php | 35 +++++++++++++++++++++--------------
 include/enotify.php      | 13 +++++++++++++
 include/items.php        | 13 ++++++++++++-
 mod/settings.php         |  6 +++++-
 view/settings.tpl        |  1 +
 6 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/boot.php b/boot.php
index 619a3fead..df9daf483 100644
--- a/boot.php
+++ b/boot.php
@@ -127,6 +127,9 @@ define ( 'NOTIFY_CONFIRM', 0x0002 );
 define ( 'NOTIFY_WALL',    0x0004 );
 define ( 'NOTIFY_COMMENT', 0x0008 );
 define ( 'NOTIFY_MAIL',    0x0010 );
+define ( 'NOTIFY_SUGGEST', 0x0020 );
+define ( 'NOTIFY_PROFILE', 0x0040 );
+
 
 /**
  * various namespaces we may need to parse
diff --git a/include/conversation.php b/include/conversation.php
index 1b1d09d6b..a30a78271 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -902,29 +902,35 @@ function conv_sort($arr,$order) {
 	elseif(stristr($order,'commented'))
 		usort($parents,'sort_thr_commented');
 
-	foreach($parents as $x) 
-		$x['children'] = array();
+	if(count($parents))
+		foreach($parents as $x) 
+			$x['children'] = array();
 
 	foreach($arr as $x) {
 		if($x['id'] != $x['parent']) {
 			$p = find_thread_parent_index($parents,$x);
-			$parents[$p]['children'][] = $x;
+			if($p !== false)
+				$parents[$p]['children'][] = $x;
 		}
 	}
-	foreach($parents as $k => $v) {
-		if(count($parents[$k]['children'])) {
-			$y = $parents[$k]['children'];
-			usort($y,'sort_thr_created_rev');
-			$parents[$k]['children'] = $y;
-		}
+	if(count($parents)) {
+		foreach($parents as $k => $v) {
+			if(count($parents[$k]['children'])) {
+				$y = $parents[$k]['children'];
+				usort($y,'sort_thr_created_rev');
+				$parents[$k]['children'] = $y;
+			}
+		}	
 	}
 
 	$ret = array();
-	foreach($parents as $x) {
-		$ret[] = $x;
-		if(count($x['children']))
-			foreach($x['children'] as $y)
-				$ret[] = $y;
+	if(count($parents)) {
+		foreach($parents as $x) {
+			$ret[] = $x;
+			if(count($x['children']))
+				foreach($x['children'] as $y)
+					$ret[] = $y;
+		}
 	}
 
 	return $ret;
@@ -947,4 +953,5 @@ function find_thread_parent_index($arr,$x) {
 	foreach($arr as $k => $v)
 		if($v['id'] == $x['parent'])
 			return $k;
+	return false;
 }
\ No newline at end of file
diff --git a/include/enotify.php b/include/enotify.php
index f6f291e5d..9df9b57e5 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -65,6 +65,19 @@ function notification($params) {
 		$itemlink =  $params['link'];
 	}
 
+	if($params['type'] == NOTIFY_SUGGEST) {
+		$subject = sprintf( t('Friend suggestion received at %s'), $sitename);
+		$preamble = sprintf( t('You\'ve received a friend suggestion from \'%s\' at %s'), $params['source_name'], $sitename); 
+		$body = t('Name:') . ' ' . $params['item']['name'] . "\n";
+		$body .= t('Photo:') . ' ' . $params['item']['photo'] . "\n";
+		$body .= sprintf( t('You may visit their profile at %s'),$params['item']['url']);
+
+		$sitelink = t('Please visit %s to approve or reject the suggestion.');
+		$tsitelink = sprintf( $sitelink, $siteurl );
+		$hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '">' . $sitename . '</a>');
+		$itemlink =  $params['link'];
+	}
+
 	if($params['type'] == NOTIFY_CONFIRM) {
 
 	}
diff --git a/include/items.php b/include/items.php
index 7f003ab57..9f006306f 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1788,7 +1788,18 @@ function local_delivery($importer,$data) {
 			intval(0)
 		);
 
-		// TODO - send email notify (which may require a new notification preference)
+		notification(array(
+			'type'         => NOTIFY_SUGGEST,
+			'notify_flags' => $importer['notify-flags'],
+			'language'     => $importer['language'],
+			'to_name'      => $importer['username'],
+			'to_email'     => $importer['email'],
+			'item'         => $fsugg,
+			'link'         => $a->get_baseurl() . '/notifications/intros',
+			'source_name'  => $importer['name'],
+			'source_link'  => $importer['url'],
+			'source_photo' => $importer['photo']
+		));
 
 		return 0;
 	}
diff --git a/mod/settings.php b/mod/settings.php
index 35902f831..8ca0bb7f8 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -255,6 +255,10 @@ function settings_post(&$a) {
 		$notify += intval($_POST['notify4']);
 	if(x($_POST,'notify5'))
 		$notify += intval($_POST['notify5']);
+	if(x($_POST,'notify6'))
+		$notify += intval($_POST['notify6']);
+	if(x($_POST,'notify7'))
+		$notify += intval($_POST['notify7']);
 
 	$email_changed = false;
 
@@ -807,7 +811,7 @@ function settings_content(&$a) {
 		'$notify3'	=> array('notify3', t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), NOTIFY_WALL, ''),
 		'$notify4'	=> array('notify4', t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), NOTIFY_COMMENT, ''),
 		'$notify5'	=> array('notify5', t('You receive a private message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, ''),
-		
+		'$notify6'  => array('notify6', t('You receive a friend suggestion'), ($notify & NOTIFY_SUGGEST), NOTIFY_SUGGEST, ''),		
 		
 		
 		'$h_advn' => t('Advanced Page Settings'),
diff --git a/view/settings.tpl b/view/settings.tpl
index e15976581..6310ff47e 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -107,6 +107,7 @@ $suggestme
 {{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
 {{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
 {{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
 </div>
 
 
-- 
cgit v1.2.3


From 8e6c02cda383b7655ef7c045a1c9cb2c63541b60 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 3 Jan 2012 18:12:58 -0800
Subject: remove some old email templates

---
 view/en/cmnt_received_eml.tpl           | 18 ------------------
 view/en/cmnt_received_html_body_eml.tpl | 25 -------------------------
 view/en/cmnt_received_text_body_eml.tpl | 14 --------------
 view/en/mail_received_html_body_eml.tpl | 26 --------------------------
 view/en/mail_received_text_body_eml.tpl | 10 ----------
 view/en/wall_received_eml.tpl           | 18 ------------------
 view/en/wall_received_html_body_eml.tpl | 24 ------------------------
 view/en/wall_received_text_body_eml.tpl | 18 ------------------
 8 files changed, 153 deletions(-)
 delete mode 100644 view/en/cmnt_received_eml.tpl
 delete mode 100644 view/en/cmnt_received_html_body_eml.tpl
 delete mode 100644 view/en/cmnt_received_text_body_eml.tpl
 delete mode 100644 view/en/mail_received_html_body_eml.tpl
 delete mode 100644 view/en/mail_received_text_body_eml.tpl
 delete mode 100644 view/en/wall_received_eml.tpl
 delete mode 100644 view/en/wall_received_html_body_eml.tpl
 delete mode 100644 view/en/wall_received_text_body_eml.tpl

diff --git a/view/en/cmnt_received_eml.tpl b/view/en/cmnt_received_eml.tpl
deleted file mode 100644
index d60fcd375..000000000
--- a/view/en/cmnt_received_eml.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-
-Dear $username,
-
-	'$from' commented on an item/conversation which you have been following.
-
------
-$body
------
-
-Please login at $siteurl to view the complete conversation:
-
-$display
-
-Thank you,
-	$sitename administrator
-
- 
-
diff --git a/view/en/cmnt_received_html_body_eml.tpl b/view/en/cmnt_received_html_body_eml.tpl
deleted file mode 100644
index 95f56a4d5..000000000
--- a/view/en/cmnt_received_html_body_eml.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
-<html>
-<head>
-	<title>Friendica Message</title>
-	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<table style="border:1px solid #ccc">
-	<tbody>
-	<tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendica</div><div style="clear: both;"></div></td></tr>
-
-	<tr><td style="padding-top:22px;" colspan="2">$from commented on an item/conversation which you have been following.</td></tr>
-
-
-	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
-		<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
-	<tr><td style="padding-bottom:5px;"></td></tr>
-	<tr><td style="padding-right:22px;">$body</td></tr>
-	<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Please login to <a href="$display">view the complete conversation</a>.</td></tr>
-	<tr><td></td><td>Thank You,</td></tr>
-	<tr><td></td><td>$sitename Administrator</td></tr>
-	</tbody>
-</table>
-</body>
-</html>
diff --git a/view/en/cmnt_received_text_body_eml.tpl b/view/en/cmnt_received_text_body_eml.tpl
deleted file mode 100644
index 7dcedeb0c..000000000
--- a/view/en/cmnt_received_text_body_eml.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-Dear $username,
-
-	'$from' commented on an item/conversation which you have been following.
-	
------
-$body
------
-
-Please login at $siteurl to view the complete conversation:
-
-$display
-
-Thank you,
-	$sitename administrator
\ No newline at end of file
diff --git a/view/en/mail_received_html_body_eml.tpl b/view/en/mail_received_html_body_eml.tpl
deleted file mode 100644
index bd105a61b..000000000
--- a/view/en/mail_received_html_body_eml.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
-<html>
-<head>
-	<title>Friendica Message</title>
-	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<table style="border:1px solid #ccc">
-	<tbody>
-	<tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendica</div><div style="clear: both;"></div></td></tr>
-
-
-	<tr><td style="padding-top:22px;" colspan="2">$from sent you a new private message at $siteName.</td></tr>
-
-
-	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
-		<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
-	<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
-	<tr><td style="padding-right:22px;">$htmlversion</td></tr>
-	<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Please login at <a href="$siteurl/message">$siteurl/message</a> to read and reply to your private messages.</td></tr>
-	<tr><td></td><td>Thank You,</td></tr>
-	<tr><td></td><td>$siteName Administrator</td></tr>
-	</tbody>
-</table>
-</body>
-</html>
diff --git a/view/en/mail_received_text_body_eml.tpl b/view/en/mail_received_text_body_eml.tpl
deleted file mode 100644
index 023867304..000000000
--- a/view/en/mail_received_text_body_eml.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-$from sent you a new private message at $siteName.
-	
-$title
-
-$textversion
-				
-Please login at $siteurl to read and reply to your private messages.
-
-Thank you,
-$siteName administrator
diff --git a/view/en/wall_received_eml.tpl b/view/en/wall_received_eml.tpl
deleted file mode 100644
index c296de785..000000000
--- a/view/en/wall_received_eml.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-
-Dear $username,
-
-	'$from' posted something to your profile wall.
-
------
-$body
------
-
-Please login at $siteurl to view or delete the item:
-
-$display
-
-Thank you,
-	$sitename administrator
-
- 
-
diff --git a/view/en/wall_received_html_body_eml.tpl b/view/en/wall_received_html_body_eml.tpl
deleted file mode 100644
index 91ef61e29..000000000
--- a/view/en/wall_received_html_body_eml.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
-<html>
-<head>
-	<title>Friendica Message</title>
-	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<table style="border:1px solid #ccc">
-	<tbody>
-	<tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendica</div><div style="clear: both;"></div></td></tr>
-
-	<tr><td style="padding-top:22px;" colspan="2">$from posted something to your profile wall.</td></tr>
-
-
-	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
-		<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
-	<tr><td style="padding-right:22px;">$body</td></tr>
-	<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Please login at <a href="$siteurl">$siteurl</a> to <a href="$display">view or delete the post</a>.</td></tr>
-	<tr><td></td><td>Thank You,</td></tr>
-	<tr><td></td><td>$sitename Administrator</td></tr>
-	</tbody>
-</table>
-</body>
-</html>
diff --git a/view/en/wall_received_text_body_eml.tpl b/view/en/wall_received_text_body_eml.tpl
deleted file mode 100644
index c296de785..000000000
--- a/view/en/wall_received_text_body_eml.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-
-Dear $username,
-
-	'$from' posted something to your profile wall.
-
------
-$body
------
-
-Please login at $siteurl to view or delete the item:
-
-$display
-
-Thank you,
-	$sitename administrator
-
- 
-
-- 
cgit v1.2.3


From fc7d0360bb059bf87c5c531a2bfd5bcee3aef3f6 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 3 Jan 2012 20:26:20 -0800
Subject: add verb and item to notifications to aid in localisation

---
 boot.php             |  6 +++---
 database.sql         | 17 +++++++++++++++++
 include/diaspora.php |  2 ++
 include/items.php    | 16 +++++++++++++---
 mod/dfrn_request.php |  4 +++-
 mod/item.php         |  8 ++++++--
 update.php           | 20 +++++++++++++++++++-
 7 files changed, 63 insertions(+), 10 deletions(-)

diff --git a/boot.php b/boot.php
index df9daf483..61deae18b 100644
--- a/boot.php
+++ b/boot.php
@@ -4,14 +4,14 @@ require_once('include/config.php');
 require_once('include/network.php');
 require_once('include/plugin.php');
 require_once('include/text.php');
-require_once("include/pgettext.php");
+require_once('include/pgettext.php');
 require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_VERSION',      '2.3.1215' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
-define ( 'DB_UPDATE_VERSION',      1114      );
+define ( 'DB_UPDATE_VERSION',      1115      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -103,7 +103,7 @@ define ( 'NETWORK_MAIL',             'mail');    // IMAP/POP
 define ( 'NETWORK_FACEBOOK',         'face');    // Facebook API     
 define ( 'NETWORK_LINKEDIN',         'lnkd');    // LinkedIn
 define ( 'NETWORK_XMPP',             'xmpp');    // XMPP     
-
+define ( 'NETWORK_MYSPACE',          'mysp');    // MySpace
 
 /**
  * Maximum number of "people who like (or don't like) this"  that we will list by name
diff --git a/database.sql b/database.sql
index 4dc1973ed..6826aa6f8 100644
--- a/database.sql
+++ b/database.sql
@@ -751,3 +751,20 @@ INDEX ( `uid` ),
 INDEX ( `seen` ),
 INDEX ( `date` )
 ) ENGINE = MyISAM DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `item_id` (
+`iid` INT NOT NULL ,
+`uid` INT NOT NULL ,
+`face` CHAR( 255 ) NOT NULL ,
+`dspr` CHAR( 255 ) NOT NULL ,
+`twit` CHAR( 255 ) NOT NULL ,
+`stat` CHAR( 255 ) NOT NULL ,
+PRIMARY KEY ( `iid` ),
+INDEX ( `uid` ),
+INDEX ( `face` ),
+INDEX ( `dspr` ),
+INDEX ( `twit` ),
+INDEX ( `stat` )
+) ENGINE = MyISAM DEFAULT CHARSET=utf8;
+
+
diff --git a/include/diaspora.php b/include/diaspora.php
index 2d139c77c..25ca11ed0 100644
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -1235,6 +1235,8 @@ function diaspora_conversation($importer,$xml,$msg) {
 			'source_name' => $person['name'],
 			'source_link' => $person['url'],
 			'source_photo' => $person['thumb'],
+			'verb' => ACTIVITY_POST,
+			'otype' => 'mail'
 		));
 	}	
 
diff --git a/include/items.php b/include/items.php
index 9f006306f..a63468d92 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1798,7 +1798,9 @@ function local_delivery($importer,$data) {
 			'link'         => $a->get_baseurl() . '/notifications/intros',
 			'source_name'  => $importer['name'],
 			'source_link'  => $importer['url'],
-			'source_photo' => $importer['photo']
+			'source_photo' => $importer['photo'],
+			'verb'         => ACTIVITY_REQ_FRIEND,
+			'otype'        => 'intro'
 		));
 
 		return 0;
@@ -1847,6 +1849,8 @@ function local_delivery($importer,$data) {
 			'source_name' => $msg['from-name'],
 			'source_link' => $importer['url'],
 			'source_photo' => $importer['thumb'],
+			'verb' => ACTIVITY_POST,
+			'otype' => 'mail'
 		);
 			
 		notification($notif_params);
@@ -2118,7 +2122,10 @@ function local_delivery($importer,$data) {
 								'source_name'  => stripslashes($datarray['author-name']),
 								'source_link'  => $datarray['author-link'],
 								'source_photo' => ((link_compare($datarray['author-link'],$importer['url'])) 
-									? $importer['thumb'] : $datarray['author-avatar'])
+									? $importer['thumb'] : $datarray['author-avatar']),
+								'verb'         => ACTIVITY_POST,
+								'otype'        => 'item'
+
 							));
 
 						}
@@ -2234,7 +2241,10 @@ function local_delivery($importer,$data) {
 								'source_name'  => stripslashes($datarray['author-name']),
 								'source_link'  => $datarray['author-link'],
 								'source_photo' => ((link_compare($datarray['author-link'],$importer['url'])) 
-									? $importer['thumb'] : $datarray['author-avatar'])
+									? $importer['thumb'] : $datarray['author-avatar']),
+								'verb'         => ACTIVITY_POST,
+								'otype'        => 'item'
+
 							));
 
 							break;
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index a96860403..aa14bc473 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -580,7 +580,9 @@ function dfrn_request_content(&$a) {
 						'link'		   => $a->get_baseurl() . '/notifications/intros',
 						'source_name'  => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')),
 						'source_link'  => $r[0]['url'],
-						'source_photo' => $r[0]['photo']
+						'source_photo' => $r[0]['photo'],
+						'verb'         => ACTIVITY_REQ_FRIEND,
+						'otype'        => 'intro'
 					));
 				}
 
diff --git a/mod/item.php b/mod/item.php
index ece92f0f3..c4e66ebeb 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -691,7 +691,9 @@ function item_post(&$a) {
 					'link'		   => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
 					'source_name'  => $datarray['author-name'],
 					'source_link'  => $datarray['author-link'],
-					'source_photo' => $datarray['author-avatar']
+					'source_photo' => $datarray['author-avatar'],
+					'verb'         => ACTIVITY_POST,
+					'otype'        => 'item'
 				));
 			
 			}
@@ -731,7 +733,9 @@ function item_post(&$a) {
 					'link'		   => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
 					'source_name'  => $datarray['author-name'],
 					'source_link'  => $datarray['author-link'],
-					'source_photo' => $datarray['author-avatar']
+					'source_photo' => $datarray['author-avatar'],
+					'verb'         => ACTIVITY_POST,
+					'otype'        => 'item'
 				));
 			}
 		}
diff --git a/update.php b/update.php
index 6eade22f7..4dff59c98 100644
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1114 );
+define( 'UPDATE_VERSION' , 1115 );
 
 /**
  *
@@ -972,3 +972,21 @@ function update_1113() {
 	q("ALTER TABLE `notify` ADD `verb` CHAR( 255 ) NOT NULL ,
 ADD `otype` CHAR( 16 ) NOT NULL");
 }
+
+function update_1114() {
+	q("CREATE TABLE IF NOT EXISTS `item_id` (
+`iid` INT NOT NULL ,
+`uid` INT NOT NULL ,
+`face` CHAR( 255 ) NOT NULL ,
+`dspr` CHAR( 255 ) NOT NULL ,
+`twit` CHAR( 255 ) NOT NULL ,
+`stat` CHAR( 255 ) NOT NULL ,
+PRIMARY KEY ( `iid` ),
+INDEX ( `uid` ),
+INDEX ( `face` ),
+INDEX ( `dspr` ),
+INDEX ( `twit` ),
+INDEX ( `stat` )
+) ENGINE = MYISAM ");
+
+}
-- 
cgit v1.2.3


From 0077997eb69ecda0567f73e8dbf5835ce03d9250 Mon Sep 17 00:00:00 2001
From: 23n <23n@zenzor.de>
Date: Wed, 4 Jan 2012 07:05:44 +0100
Subject: Update view/de/strings.php

---
 view/de/strings.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/view/de/strings.php b/view/de/strings.php
index b752ef2ea..7c110c093 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -239,11 +239,11 @@ $a->strings["Automatically expire posts after days:"] = "Einträge verfallen aut
 $a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Wenn leer verfallen Einträge nie automatisch. Verfallene Einträge werden gelöscht.";
 $a->strings["Notification Settings"] = "Benachrichtigungseinstellungen";
 $a->strings["Send a notification email when:"] = "Benachrichtigungs-Email senden wenn:";
-$a->strings["You receive an introduction"] = "Du eine Vorstellung erhälst";
+$a->strings["You receive an introduction"] = "Du eine Vorstellung erhältst";
 $a->strings["Your introductions are confirmed"] = "Eine deiner Vorstellungen angenommen wurde";
 $a->strings["Someone writes on your profile wall"] = "Jemand etwas auf deiner Pinnwand postet";
 $a->strings["Someone writes a followup comment"] = "Jemand auch einen Kommentar verfasst";
-$a->strings["You receive a private message"] = "Du eine private Nachricht erhälst";
+$a->strings["You receive a private message"] = "Du eine private Nachricht erhältst";
 $a->strings["Advanced Page Settings"] = "Erweiterte Seiten Einstellungen";
 $a->strings["Saved Searches"] = "Gespeicherte Suchen";
 $a->strings["Remove term"] = "Begriff entfernen";
@@ -822,7 +822,7 @@ $a->strings["Post to Twitter"] = "Nach Twitter senden";
 $a->strings["Twitter settings updated."] = "Twitter Einstellungen aktualisiert.";
 $a->strings["Twitter Posting Settings"] = "Twitter Posting Einstellungen";
 $a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Kein Consumer Schlüsselpaar für Twitter gefunden. Bitte wende dich an den Administrator der Seite.";
-$a->strings["At this Friendika instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "Auf dieser Friendika Instanz wurde das Twitter Plugin aktiviert dein Account ist allerdings noch nicht mit einem Twitter Account verbunden. Um deinen Account mit Twitter zu verbinden, klick auf den Button weiter unten und gib die PIN die du auf Twitter erhälst hier ein. Es werden ausschließlich deine <strong>öffentlichen</strong> Nachrichten auf Twitter veröffentlicht.";
+$a->strings["At this Friendika instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "Auf dieser Friendika Instanz wurde das Twitter Plugin aktiviert dein Account ist allerdings noch nicht mit einem Twitter Account verbunden. Um deinen Account mit Twitter zu verbinden, klick auf den Button weiter unten und gib die PIN die du auf Twitter erhältst hier ein. Es werden ausschließlich deine <strong>öffentlichen</strong> Nachrichten auf Twitter veröffentlicht.";
 $a->strings["Log in with Twitter"] = "bei Twitter anmelden";
 $a->strings["Copy the PIN from Twitter here"] = "Kopiere die Twitter PIN hier her";
 $a->strings["Currently connected to: "] = "Momentan verbunden mit: ";
-- 
cgit v1.2.3


From 48a5a2484e762a9804237ae28c24dafe5db7f953 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 4 Jan 2012 00:04:19 -0800
Subject: new smiley

---
 images/smiley-Oo.gif | Bin 0 -> 1045 bytes
 include/text.php     |   4 +++-
 view/jot-header.tpl  |   1 +
 view/jot.tpl         |   4 +++-
 4 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 images/smiley-Oo.gif

diff --git a/images/smiley-Oo.gif b/images/smiley-Oo.gif
new file mode 100644
index 000000000..a125d0ff2
Binary files /dev/null and b/images/smiley-Oo.gif differ
diff --git a/include/text.php b/include/text.php
index f32aaad07..1db88ca2c 100644
--- a/include/text.php
+++ b/include/text.php
@@ -678,7 +678,7 @@ function smilies($s) {
 	$a = get_app();
 
 	$s = str_replace(
-	array( '&lt;3', '&lt;/3', '&lt;\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', '\\o/',
+	array( '&lt;3', '&lt;/3', '&lt;\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', '\\o/', 'o.O', 'O.o',
 		'~friendika', '~friendica', 'Diaspora*' ),
 	array(
 		'<img src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />',
@@ -698,6 +698,8 @@ function smilies($s) {
 		'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-|" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-O" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-thumbsup.gif" alt="\\o/" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="o.O" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="O.o" />',
 		'<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
 		'<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendica" /></a>',
 		'<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index ecfed6c42..941a8f3e2 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -7,6 +7,7 @@ var textlen = 0;
 function initEditor(cb){
 	if (editor==false){
 		$("#profile-jot-text-loading").show();	
+//		$("#jot-title").show();
 		tinyMCE.init({
 			theme : "advanced",
 			mode : "specific_textareas",
diff --git a/view/jot.tpl b/view/jot.tpl
index 71b92986d..83af1ae37 100644
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -12,8 +12,10 @@
 		<input type="hidden" name="return" value="$return_path" />
 		<input type="hidden" name="location" id="jot-location" value="$defloc" />
 		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="title" id="jot-title" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
+		<div id="jot-title-wrapper">
+		<input type="text" name="title" id="jot-title" value="" style="display: none;" />
+		</div>
 
 		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-- 
cgit v1.2.3


From c1cf6e48c225725c380472e1f730f6dc02917ecd Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 4 Jan 2012 13:50:12 -0800
Subject: Allow Diaspora to post to forums

---
 boot.php          | 2 +-
 include/items.php | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/boot.php b/boot.php
index 61deae18b..b06c2d0bf 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1215' );
+define ( 'FRIENDICA_VERSION',      '2.3.1216' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1115      );
 
diff --git a/include/items.php b/include/items.php
index a63468d92..0bd77582a 100644
--- a/include/items.php
+++ b/include/items.php
@@ -945,10 +945,15 @@ function tgroup_deliver($uid,$item_id) {
 
 	$link = normalise_link($a->get_baseurl() . '/profile/' . $u[0]['nickname']);
 
+	// Diaspora uses their own hardwired link URL in @-tags
+	// instead of the one we supply with webfinger
+
+	$dlink = normalise_link($a->get_baseurl() . '/u/' . $u[0]['nickname']);
+
 	$cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER);
 	if($cnt) {
 		foreach($matches as $mtch) {
-			if(link_compare($link,$mtch[1])) {
+			if(link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) {
 				$deliver_to_tgroup = true;
 				logger('tgroup_deliver: local group mention found: ' . $mtch[2]);
 			}
-- 
cgit v1.2.3


From d0b743529d5f0034e08456473fe32e38c7144f74 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 4 Jan 2012 14:30:25 -0800
Subject: support auto-friend page types for Diaspora

---
 include/diaspora.php | 53 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 50 insertions(+), 3 deletions(-)

diff --git a/include/diaspora.php b/include/diaspora.php
index 25ca11ed0..f32113668 100644
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -464,7 +464,7 @@ function diaspora_request($importer,$xml) {
 			intval($importer['uid'])
 		);
 
-		if((count($r)) && ($r[0]['hide-friends'] == 0)) {
+		if((count($r)) && (! $r[0]['hide-friends']) && (! $contact['hidden'])) {
 			require_once('include/items.php');
 
 			$self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
@@ -527,6 +527,8 @@ function diaspora_request($importer,$xml) {
 
 	$batch = (($ret['batch']) ? $ret['batch'] : implode('/', array_slice(explode('/',$ret['url']),0,3)) . '/receive/public');
 
+
+
 	$r = q("INSERT INTO `contact` (`uid`, `network`,`addr`,`created`,`url`,`nurl`,`batch`,`name`,`nick`,`photo`,`pubkey`,`notify`,`poll`,`blocked`,`priority`)
 		VALUES ( %d, '%s', '%s', '%s', '%s','%s','%s','%s','%s','%s','%s','%s','%s',%d,%d) ",
 		intval($importer['uid']),
@@ -550,9 +552,15 @@ function diaspora_request($importer,$xml) {
 
 	$contact_record = diaspora_get_contact_by_handle($importer['uid'],$sender_handle);
 
-	$hash = random_string() . (string) time();   // Generate a confirm_key
+	if(! $contact_record) {
+		logger('diaspora_request: unable to locate newly created contact record.');
+		return;
+	}
+
+	if($importer['page-flags'] == PAGE_NORMAL) {
+
+		$hash = random_string() . (string) time();   // Generate a confirm_key
 	
-	if($contact_record) {
 		$ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime` )
 			VALUES ( %d, %d, %d, %d, '%s', '%s', '%s' )",
 			intval($importer['uid']),
@@ -564,6 +572,45 @@ function diaspora_request($importer,$xml) {
 			dbesc(datetime_convert())
 		);
 	}
+	else {
+
+		// automatic friend approval
+
+		require_once('include/Photo.php');
+
+		$photos = import_profile_photo($contact_record['photo'],$importer['uid'],$contact_record['id']);
+		
+		// technically they are sharing with us (CONTACT_IS_SHARING), 
+		// but if our page-type is PAGE_COMMUNITY or PAGE_SOAPBOX
+		// we are going to change the relationship and make them a follower.
+
+		if($importer['page-flags'] == PAGE_FREELOVE)
+			$new_relation = CONTACT_IS_FRIEND;
+		else
+			$new_relation = CONTACT_IS_FOLLOWER;
+
+		$r = q("UPDATE `contact` SET 
+			`photo` = '%s', 
+			`thumb` = '%s',
+			`micro` = '%s', 
+			`rel` = %d, 
+			`name-date` = '%s', 
+			`uri-date` = '%s', 
+			`avatar-date` = '%s', 
+			`blocked` = 0, 
+			`pending` = 0,
+			WHERE `id` = %d LIMIT 1
+			",
+			dbesc($photos[0]),
+			dbesc($photos[1]),
+			dbesc($photos[2]),
+			intval($new_relation),
+			dbesc(datetime_convert()),
+			dbesc(datetime_convert()),
+			dbesc(datetime_convert()),
+			intval($contact_record['id'])
+		);
+	}
 
 	return;
 }
-- 
cgit v1.2.3


From b0c3dc00b9252d896d233747bdd317fb5c360d51 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 4 Jan 2012 16:14:26 -0800
Subject: fix registration request pings

---
 mod/ping.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mod/ping.php b/mod/ping.php
index e74ef8314..5b9159fa4 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -128,9 +128,9 @@ function ping_init(&$a) {
 		);
 		$mail = $mails[0]['total'];
 		
-		if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()){
-			$regs = q("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) as `total` FROM `contact` RIGHT JOIN `register` ON `register`.`uid`=`contact`.`uid` WHERE `contact`.`self`=1");
-			$register = $regs[0]['total'];
+		if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()) {
+			$regs = q("select register.created, contact.name, contact.url, contact.micro from register left join contact on register.uid = contact.uid where contact.self = 1");
+			$register = count($regs);
 		} else {
 			$register = "0";
 		}
-- 
cgit v1.2.3


From 47edaf9ad79b59d96f908b4501d564e5e63cc210 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 4 Jan 2012 18:03:09 -0800
Subject: dynamic title input box - via fabrixxm

---
 include/conversation.php             |  5 ++++-
 mod/ping.php                         | 29 +++++++----------------------
 view/jot-header.tpl                  |  8 ++++++--
 view/jot.tpl                         |  4 +---
 view/theme/dispy/jot-header.tpl      |  7 +++++++
 view/theme/dispy/jot.tpl             |  8 ++++----
 view/theme/dispy/style.css           | 13 +++++++++++++
 view/theme/duepuntozero/style.css    | 13 +++++++++++++
 view/theme/loozah/style.css          | 14 ++++++++++++++
 view/theme/quattro/jot.tpl           |  8 ++++----
 view/theme/quattro/quattro.less      |  2 ++
 view/theme/testbubble/jot-header.tpl |  8 ++++++++
 view/theme/testbubble/jot.tpl        |  9 +++++----
 view/theme/testbubble/style.css      | 14 ++++++++++++++
 14 files changed, 102 insertions(+), 40 deletions(-)

diff --git a/include/conversation.php b/include/conversation.php
index a30a78271..ec1fd4152 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -812,7 +812,8 @@ function status_editor($a,$x, $notes_cid = 0) {
 			'$audurl' => t("Please enter an audio link/URL:"),
 			'$term' => t('Tag term:'),
 			'$whereareu' => t('Where are you right now?'),
-			'$title' => t('Enter a title for this item') 
+			'$title' => t('Enter a title for this item'),
+			'$addtitle' => t('click here to add a title') 
 		));
 
 
@@ -880,6 +881,8 @@ function status_editor($a,$x, $notes_cid = 0) {
 			'$acl' => $x['acl'],
 			'$bang' => $x['bang'],
 			'$profile_uid' => $x['profile_uid'],
+			'$addtitle' => t('click here to add a title') 
+
 		));
 
 	return $o;
diff --git a/mod/ping.php b/mod/ping.php
index 5b9159fa4..df07cb768 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -7,7 +7,6 @@ function ping_init(&$a) {
 	header("Content-type: text/xml");
 	echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>
 		<result>";
-	
 
 	$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
 	if(local_user()){
@@ -18,11 +17,10 @@ function ping_init(&$a) {
 		$dislikes = array();
 		$friends = array();
 		$posts = array();
-		$cit = array();
 		
 
 		$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, 
-				`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`, `item`.`body`, 
+				`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`, 
 				`pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink` 
 				FROM `item` INNER JOIN `item` as `pitem` ON  `pitem`.`id`=`item`.`parent`
 				WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
@@ -31,8 +29,6 @@ function ping_init(&$a) {
 			intval(local_user())
 		);
 		
-		
-		
 		$network = count($r);
 		foreach ($r as $it) {
 			switch($it['verb']){
@@ -53,11 +49,8 @@ function ping_init(&$a) {
 					$friends[] = $it;
 					break;
 				default:
-					$reg = "|@\[url=".$a->get_baseurl()."/profile/".$a->user['nickname']."|";
 					if ($it['parent']!=$it['id']) { 
 						$comments[] = $it;
-					} else if(preg_match( $reg, $it['body'])){
-						$cit[] = $it;
 					} else {
 						$posts[] = $it;
 					}
@@ -93,9 +86,6 @@ function ping_init(&$a) {
 					break;
 				default:
 					if ($it['parent']!=$it['id']) $comments[] = $it;
-					if(preg_match("/@\[[^]]*\]".$a->user['username']."/", $it['body'])){
-						$cit[] = $it;
-					}					
 			}
 		}
 
@@ -128,9 +118,9 @@ function ping_init(&$a) {
 		);
 		$mail = $mails[0]['total'];
 		
-		if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()) {
-			$regs = q("select register.created, contact.name, contact.url, contact.micro from register left join contact on register.uid = contact.uid where contact.self = 1");
-			$register = count($regs);
+		if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()){
+			$regs = q("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) as `total` FROM `contact` RIGHT JOIN `register` ON `register`.`uid`=`contact`.`uid` WHERE `contact`.`self`=1");
+			$register = $regs[0]['total'];
 		} else {
 			$register = "0";
 		}
@@ -150,12 +140,12 @@ function ping_init(&$a) {
 				<home>$home</home>";
 		if ($register!=0) echo "<register>$register</register>";
 		
-		$tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends)+count($posts)+count($tags)+count($cit);
+		$tot = $mail+$intro+$register+count($comments)+count($likes)+count($dislikes)+count($friends)+count($posts)+count($tags);
 		
 		echo '	<notif count="'.$tot.'">';
 		if ($intro>0){
 			foreach ($intros as $i) { 
-				echo xmlize( $a->get_baseurl().'/notifications/intros/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), t("{0} wants to be your friend") );
+				echo xmlize( $a->get_baseurl().'/notifications/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), t("{0} wants to be your friend") );
 			};
 		}
 		if ($mail>0){
@@ -191,7 +181,7 @@ function ping_init(&$a) {
 		}
 		if (count($posts)){
 			foreach ($posts as $i) {
-				echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']),  t("{0} posted")  );
+				echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), sprintf( t("{0} posted") ) );
 			};
 		}
 		if (count($tags)){
@@ -199,11 +189,6 @@ function ping_init(&$a) {
 				echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), sprintf( t("{0} tagged %s's post with #%s"), $i['pname'], $i['tname'] ) );
 			};
 		}
-		if (count($cit)){
-			foreach ($cit as $i) {
-				echo xmlize( $a->get_baseurl().'/display/'.$a->user['nickname']."/".$i['parent'], $i['author-name'], $i['author-link'], $i['author-avatar'], relative_date($i['created']), t("{0} mentioned you in a post") );
-			};
-		}
 
 		echo "  </notif>";
 	}
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 941a8f3e2..f35cbee17 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -7,7 +7,7 @@ var textlen = 0;
 function initEditor(cb){
 	if (editor==false){
 		$("#profile-jot-text-loading").show();	
-//		$("#jot-title").show();
+		$("#jot-title-desc").show();
 		tinyMCE.init({
 			theme : "advanced",
 			mode : "specific_textareas",
@@ -111,7 +111,11 @@ function initEditor(cb){
 			$(this).val("");
 			initEditor();
 		});
-		
+
+		$("#jot-title-desc").click(function() {
+			$("#jot-title-desc").hide();
+			$("#jot-title").show();
+		});		
 	
 		var uploader = new window.AjaxUpload(
 			'wall-image-upload',
diff --git a/view/jot.tpl b/view/jot.tpl
index 83af1ae37..cb4eb64d4 100644
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -14,6 +14,7 @@
 		<input type="hidden" name="coord" id="jot-coord" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
 		<div id="jot-title-wrapper">
+		<span id="jot-title-desc" style="display: none;">$addtitle</span>
 		<input type="text" name="title" id="jot-title" value="" style="display: none;" />
 		</div>
 
@@ -46,9 +47,6 @@
 	<div id="profile-nolocation-wrapper" style="display: none;" >
 		<a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
 	</div> 
-	<div id="profile-title-wrapper" style="display: $visitor;" >
-		<a id="profile-title" class="icon article" title="$title" onclick="jotTitle();return false;"></a>
-	</div> 
 
 	<div id="profile-jot-plugin-wrapper">
   	$jotplugins
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 7a1012230..a3464f3f7 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -8,6 +8,7 @@ var textlen = 0;
 function initEditor(cb) {
     if (editor==false) {
         $("#profile-jot-text-loading").show();
+		$("#jot-title-desc").show();
         tinyMCE.init({
                 theme : "advanced",
                 mode : "specific_textareas",
@@ -100,6 +101,12 @@ function initEditor(cb) {
                     $(this).val("");
                     initEditor();
                 }); 
+
+		$("#jot-title-desc").click(function() {
+			$("#jot-title-desc").hide();
+			$("#jot-title").show();
+		});		
+
 		var uploader = new window.AjaxUpload(
 			'wall-image-upload',
 			{ action: 'wall_upload/$nickname',
diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl
index a2c883e4b..b340b532b 100644
--- a/view/theme/dispy/jot.tpl
+++ b/view/theme/dispy/jot.tpl
@@ -14,8 +14,11 @@
 		<input type="hidden" name="return" value="$return_path" />
 		<input type="hidden" name="location" id="jot-location" value="$defloc" />
 		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="title" id="jot-title" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
+		<div id="jot-title-wrapper">
+		<span id="jot-title-desc" style="display: none;">$addtitle</span>
+		<input type="text" name="title" id="jot-title" value="" style="display: none;" />
+		</div>
 
                 <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
                 <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
@@ -49,9 +52,6 @@
 	<div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;" >
 		<a id="profile-nolocation" class="icon border  noglobe" title="$noloc" onclick="jotClearLocation(); return false;"></a>
 	</div> 
-	<div id="profile-title-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-title" class="icon border  article" title="$title" onclick="jotTitle(); return false;"></a>
-	</div> 
 
 	<div id="profile-jot-plugin-wrapper" style="display: none;">
   	$jotplugins
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 0d8b54698..59425a05a 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -342,6 +342,19 @@ aside #viewcontacts { text-align: right;}
 #acl-deny-text-end { clear: both; }
 
 
+#jot-title-desc {
+	color: #cccccc;
+}
+
+#jot-title-wrapper {
+	margin-bottom: 5px;
+}
+
+#jot-title {
+	border: 1px solid #cccccc;
+	width: 530px;
+}
+
 
 /**
  * section
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index c6582d068..f3c0e7a90 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -269,6 +269,19 @@ div.wall-item-content-wrapper.shiny {
 	float: left;
 }
 
+#jot-title-desc {
+	color: #cccccc;
+}
+
+#jot-title-wrapper {
+	margin-bottom: 5px;
+}
+
+#jot-title {
+	border: 1px solid #cccccc;
+	width: 530px;
+}
+
 .fakelink, .fakelink:visited, .fakelink:link {
 	color: #3465a4;
 	text-decoration: none;
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 222edc166..daacba7fc 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -131,6 +131,20 @@ blockquote:before {
 	float: left;
 }
 
+#jot-title-desc {
+	color: #cccccc;
+}
+
+#jot-title-wrapper {
+	margin-bottom: 5px;
+}
+
+#jot-title {
+	border: 1px solid #cccccc;
+	width: 530px;
+}
+
+
 .fakelink, .fakelink:visited {
 	color: #15607B;
 	text-decoration: none;
diff --git a/view/theme/quattro/jot.tpl b/view/theme/quattro/jot.tpl
index d65ac8b17..9aeea2df9 100644
--- a/view/theme/quattro/jot.tpl
+++ b/view/theme/quattro/jot.tpl
@@ -12,8 +12,11 @@
 		<input type="hidden" name="return" value="$return_path" />
 		<input type="hidden" name="location" id="jot-location" value="$defloc" />
 		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="title" id="jot-title" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
+		<div id="jot-title-wrapper">
+		<span id="jot-title-desc" style="display: none;">$addtitle</span>
+		<input type="text" name="title" id="jot-title" value="" style="display: none;" />
+		</div>
 
 		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
@@ -43,9 +46,6 @@
 	<div id="profile-nolocation-wrapper" style="display: none;" >
 		<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;">no location</a>
 	</div> 
-	<div id="profile-title-wrapper" style="display: $visitor;" >
-		<a id="profile-title" class="article" title="$title" onclick="jotTitle();return false;">title</a>
-	</div> 
 	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
 		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="$lockstate"  title="$permset" >permissions</a>$bang
 	</div>
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 2e61b9182..a29559859 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -528,6 +528,8 @@ section {
 #about-jot-submit-wrapper {
 	margin-top: 15px;
 }
+
+
 /** buttons **/
 /*input[type="submit"] {
 	border: 0px;
diff --git a/view/theme/testbubble/jot-header.tpl b/view/theme/testbubble/jot-header.tpl
index 62351e173..dba6cfd2b 100644
--- a/view/theme/testbubble/jot-header.tpl
+++ b/view/theme/testbubble/jot-header.tpl
@@ -8,6 +8,7 @@ var textlen = 0;
 function initEditor(cb) {
     if (editor==false) {
         $("#profile-jot-text-loading").show();
+		$("#jot-title-desc").show();
         tinyMCE.init({
                 theme : "advanced",
                 mode : "specific_textareas",
@@ -122,6 +123,13 @@ function initEditor(cb) {
                     $(this).val("");
                     initEditor();
                 }); 
+
+		$("#jot-title-desc").click(function() {
+            $("#jot-title-desc").hide();
+            $("#jot-title").show();
+        });
+
+
 		var uploader = new window.AjaxUpload(
 			'wall-image-upload',
 			{ action: 'wall_upload/$nickname',
diff --git a/view/theme/testbubble/jot.tpl b/view/theme/testbubble/jot.tpl
index 7ccaf2aa2..dce5fb616 100644
--- a/view/theme/testbubble/jot.tpl
+++ b/view/theme/testbubble/jot.tpl
@@ -14,9 +14,13 @@
 		<input type="hidden" name="return" value="$return_path" />
 		<input type="hidden" name="location" id="jot-location" value="$defloc" />
 		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="title" id="jot-title" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
 
+		<div id="jot-title-wrapper">
+        <span id="jot-title-desc" style="display: none;">$addtitle</span>
+        <input type="text" name="title" id="jot-title" value="" style="display: none;" />
+        </div>
+
                 <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
                 <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
                 {{ if $content }}<script>initEditor();</script>{{ endif }}
@@ -42,9 +46,6 @@
 	<div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;" >
 		<a id="profile-nolocation" class="icon border  noglobe" title="$noloc" onclick="jotClearLocation(); return false;"></a>
 	</div> 
-	<div id="profile-title-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-title" class="icon border  article" title="$title" onclick="jotTitle(); return false;"></a>
-	</div> 
 
 	<div id="profile-jot-submit-wrapper" style="display:none;padding-left: 400px;">
 		<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index d1d344ef9..5c31f2f41 100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -744,6 +744,20 @@ ul .sidebar-group-li .icon{
 #profile-jot-submit-wrapper { 
 }
 
+#jot-title-desc {
+	color: #cccccc;
+}
+
+#jot-title-wrapper {
+	margin-bottom: 5px;
+}
+
+#jot-title {
+	border: 1px solid #cccccc;
+	width: 460px;
+}
+
+
 #profile-jot-perms, #profile-jot-submit {
 	width: 60px;
 	font-size: 12px;
-- 
cgit v1.2.3


From f1c7db593cbbba6a1eec84e1f8c2681dbc94a97f Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 4 Jan 2012 20:09:14 -0800
Subject: better title handling (duepuntozero only at this time)

---
 view/jot-header.tpl | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index f35cbee17..829629f44 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -103,6 +103,8 @@ function initEditor(cb){
 <script type="text/javascript" src="js/ajaxupload.js" ></script>
 <script>
 	var ispublic = '$ispublic';
+	var addtitle = '$addtitle';
+
 	$(document).ready(function() {
 		
 		/* enable tinymce on focus */
@@ -112,9 +114,17 @@ function initEditor(cb){
 			initEditor();
 		});
 
+		$("#jot-title").mouseout(function() {
+			$("#jot-title").hide();
+			var ttl = $("#jot-title").val();
+			$("#jot-title-desc").html((ttl.length) ? "<strong>" + ttl + "</strong>" : addtitle );
+			$("#jot-title-desc").show();
+		});
+
 		$("#jot-title-desc").click(function() {
 			$("#jot-title-desc").hide();
 			$("#jot-title").show();
+			$("#jot-title").focus();
 		});		
 	
 		var uploader = new window.AjaxUpload(
-- 
cgit v1.2.3


From dbb59554690d3e77b3816423aab2be610e183cd9 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 4 Jan 2012 20:35:32 -0800
Subject: bit more improvement on dynamic title

---
 view/jot-header.tpl               | 15 +++++++++++++--
 view/jot.tpl                      |  1 +
 view/theme/duepuntozero/style.css |  3 +++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 829629f44..cd04e05af 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -117,10 +117,21 @@ function initEditor(cb){
 		$("#jot-title").mouseout(function() {
 			$("#jot-title").hide();
 			var ttl = $("#jot-title").val();
-			$("#jot-title-desc").html((ttl.length) ? "<strong>" + ttl + "</strong>" : addtitle );
-			$("#jot-title-desc").show();
+			$('#jot-title-display').html(ttl);
+			if(ttl.length) {
+				$("#jot-title-display").show();
+			}
+			else {
+				$("#jot-title-desc").show();
+			}
 		});
 
+		$("#jot-title-display").click(function() {
+			$("#jot-title-display").hide();
+			$("#jot-title").show();
+			$("#jot-title").focus();
+		});		
+
 		$("#jot-title-desc").click(function() {
 			$("#jot-title-desc").hide();
 			$("#jot-title").show();
diff --git a/view/jot.tpl b/view/jot.tpl
index cb4eb64d4..66621db5e 100644
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -15,6 +15,7 @@
 		<input type="hidden" name="post_id" value="$post_id" />
 		<div id="jot-title-wrapper">
 		<span id="jot-title-desc" style="display: none;">$addtitle</span>
+		<span id="jot-title-display" style="display: none;"></span>
 		<input type="text" name="title" id="jot-title" value="" style="display: none;" />
 		</div>
 
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index f3c0e7a90..6ce4c52c0 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -276,6 +276,9 @@ div.wall-item-content-wrapper.shiny {
 #jot-title-wrapper {
 	margin-bottom: 5px;
 }
+#jot-title-display {
+	font-weight: bold;
+}
 
 #jot-title {
 	border: 1px solid #cccccc;
-- 
cgit v1.2.3


From c5d27c48f5d5e45d119ccf133ebc42678deb8e38 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 4 Jan 2012 20:43:38 -0800
Subject: more title stuff

---
 view/theme/dispy/jot-header.tpl      | 19 +++++++++++++++++++
 view/theme/dispy/jot.tpl             |  1 +
 view/theme/dispy/style.css           |  3 +++
 view/theme/loozah/style.css          |  3 +++
 view/theme/quattro/jot.tpl           |  1 +
 view/theme/testbubble/jot-header.tpl | 27 +++++++++++++++++++++++----
 view/theme/testbubble/jot.tpl        |  1 +
 view/theme/testbubble/style.css      |  3 +++
 8 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index a3464f3f7..a30b41825 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -102,9 +102,28 @@ function initEditor(cb) {
                     initEditor();
                 }); 
 
+		$("#jot-title").mouseout(function() {
+			$("#jot-title").hide();
+			var ttl = $("#jot-title").val();
+			$('#jot-title-display').html(ttl);
+			if(ttl.length) {
+				$("#jot-title-display").show();
+			}
+			else {
+				$("#jot-title-desc").show();
+			}
+		});
+
+		$("#jot-title-display").click(function() {
+			$("#jot-title-display").hide();
+			$("#jot-title").show();
+			$("#jot-title").focus();
+		});		
+
 		$("#jot-title-desc").click(function() {
 			$("#jot-title-desc").hide();
 			$("#jot-title").show();
+			$("#jot-title").focus();
 		});		
 
 		var uploader = new window.AjaxUpload(
diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl
index b340b532b..57f320d4c 100644
--- a/view/theme/dispy/jot.tpl
+++ b/view/theme/dispy/jot.tpl
@@ -17,6 +17,7 @@
 		<input type="hidden" name="post_id" value="$post_id" />
 		<div id="jot-title-wrapper">
 		<span id="jot-title-desc" style="display: none;">$addtitle</span>
+		<span id="jot-title-display" style="display: none;"></span>
 		<input type="text" name="title" id="jot-title" value="" style="display: none;" />
 		</div>
 
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 59425a05a..08582f1d5 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -354,6 +354,9 @@ aside #viewcontacts { text-align: right;}
 	border: 1px solid #cccccc;
 	width: 530px;
 }
+#jot-title-display {
+	font-weight: bold;
+}
 
 
 /**
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index daacba7fc..6b8aef500 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -144,6 +144,9 @@ blockquote:before {
 	width: 530px;
 }
 
+#jot-title-display {
+	font-weight: bold;
+}
 
 .fakelink, .fakelink:visited {
 	color: #15607B;
diff --git a/view/theme/quattro/jot.tpl b/view/theme/quattro/jot.tpl
index 9aeea2df9..61ba75234 100644
--- a/view/theme/quattro/jot.tpl
+++ b/view/theme/quattro/jot.tpl
@@ -15,6 +15,7 @@
 		<input type="hidden" name="post_id" value="$post_id" />
 		<div id="jot-title-wrapper">
 		<span id="jot-title-desc" style="display: none;">$addtitle</span>
+		<span id="jot-title-display" style="display: none;"></span>
 		<input type="text" name="title" id="jot-title" value="" style="display: none;" />
 		</div>
 
diff --git a/view/theme/testbubble/jot-header.tpl b/view/theme/testbubble/jot-header.tpl
index dba6cfd2b..bf3b3cbe7 100644
--- a/view/theme/testbubble/jot-header.tpl
+++ b/view/theme/testbubble/jot-header.tpl
@@ -124,11 +124,30 @@ function initEditor(cb) {
                     initEditor();
                 }); 
 
-		$("#jot-title-desc").click(function() {
-            $("#jot-title-desc").hide();
-            $("#jot-title").show();
-        });
 
+		$("#jot-title").mouseout(function() {
+			$("#jot-title").hide();
+			var ttl = $("#jot-title").val();
+			$('#jot-title-display').html(ttl);
+			if(ttl.length) {
+				$("#jot-title-display").show();
+			}
+			else {
+				$("#jot-title-desc").show();
+			}
+		});
+
+		$("#jot-title-display").click(function() {
+			$("#jot-title-display").hide();
+			$("#jot-title").show();
+			$("#jot-title").focus();
+		});		
+
+		$("#jot-title-desc").click(function() {
+			$("#jot-title-desc").hide();
+			$("#jot-title").show();
+			$("#jot-title").focus();
+		});		
 
 		var uploader = new window.AjaxUpload(
 			'wall-image-upload',
diff --git a/view/theme/testbubble/jot.tpl b/view/theme/testbubble/jot.tpl
index dce5fb616..be536aff4 100644
--- a/view/theme/testbubble/jot.tpl
+++ b/view/theme/testbubble/jot.tpl
@@ -18,6 +18,7 @@
 
 		<div id="jot-title-wrapper">
         <span id="jot-title-desc" style="display: none;">$addtitle</span>
+		<span id="jot-title-display" style="display: none;"></span>
         <input type="text" name="title" id="jot-title" value="" style="display: none;" />
         </div>
 
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index 5c31f2f41..3a5d9f178 100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -757,6 +757,9 @@ ul .sidebar-group-li .icon{
 	width: 460px;
 }
 
+#jot-title-display {
+	font-weight: bold;
+}
 
 #profile-jot-perms, #profile-jot-submit {
 	width: 60px;
-- 
cgit v1.2.3


From 2f73be326ea518b5521f5b52c9ca9c080cff47a7 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 4 Jan 2012 21:01:24 -0800
Subject: change to hover function

---
 view/jot-header.tpl                  | 2 +-
 view/theme/dispy/jot-header.tpl      | 2 +-
 view/theme/testbubble/jot-header.tpl | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index cd04e05af..1a9016f5d 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -126,7 +126,7 @@ function initEditor(cb){
 			}
 		});
 
-		$("#jot-title-display").click(function() {
+		$("#jot-title-display").hover(function() {
 			$("#jot-title-display").hide();
 			$("#jot-title").show();
 			$("#jot-title").focus();
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index a30b41825..79db0ec5a 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -114,7 +114,7 @@ function initEditor(cb) {
 			}
 		});
 
-		$("#jot-title-display").click(function() {
+		$("#jot-title-display").hover(function() {
 			$("#jot-title-display").hide();
 			$("#jot-title").show();
 			$("#jot-title").focus();
diff --git a/view/theme/testbubble/jot-header.tpl b/view/theme/testbubble/jot-header.tpl
index bf3b3cbe7..7b2dca9fe 100644
--- a/view/theme/testbubble/jot-header.tpl
+++ b/view/theme/testbubble/jot-header.tpl
@@ -137,7 +137,7 @@ function initEditor(cb) {
 			}
 		});
 
-		$("#jot-title-display").click(function() {
+		$("#jot-title-display").hover(function() {
 			$("#jot-title-display").hide();
 			$("#jot-title").show();
 			$("#jot-title").focus();
-- 
cgit v1.2.3


From 5b809328af800e73990e7a056d2a6d883a67bd25 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 5 Jan 2012 13:25:43 -0800
Subject: send diaspora share notification back to originator for auto
 friending

---
 INSTALL.txt          |  2 +-
 boot.php             |  2 +-
 include/diaspora.php | 25 ++++---------------------
 3 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/INSTALL.txt b/INSTALL.txt
index 053c33902..70027dc4c 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -38,7 +38,7 @@ with the Diaspora network and improved security.
 		- PHP *command line* access with register_argc_argv set to true in the 
 php.ini file [or see 'poormancron' in section 8]
 
-		- curl, gd, mysql, mbstring, mcrypt, and openssl extensions
+		- curl, gd (with at least jpeg support), mysql, mbstring, mcrypt, and openssl extensions
 
 		- some form of email server or email gateway such that PHP mail() works
 
diff --git a/boot.php b/boot.php
index b06c2d0bf..1f2b47b2e 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1216' );
+define ( 'FRIENDICA_VERSION',      '2.3.1217' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1115      );
 
diff --git a/include/diaspora.php b/include/diaspora.php
index f32113668..5a19400da 100644
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -610,6 +610,10 @@ function diaspora_request($importer,$xml) {
 			dbesc(datetime_convert()),
 			intval($contact_record['id'])
 		);
+
+		$u = q("select * from user where id = %d limit 1",intval($importer['uid']));
+		if($u)
+			$ret = diaspora_share($u[0],$contact_record);
 	}
 
 	return;
@@ -1781,27 +1785,6 @@ function diaspora_profile($importer,$xml) {
 
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 function diaspora_share($me,$contact) {
 	$a = get_app();
 	$myaddr = $me['nickname'] . '@' .  substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
-- 
cgit v1.2.3


From 53878625f6ecc014283cefbd84f92b6f1294b8a3 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 5 Jan 2012 15:02:44 -0800
Subject: backend support for post preview

---
 mod/item.php                  | 24 +++++++++++++++---------
 view/jot.tpl                  |  1 +
 view/theme/dispy/jot.tpl      |  1 +
 view/theme/quattro/jot.tpl    |  1 +
 view/theme/testbubble/jot.tpl |  1 +
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/mod/item.php b/mod/item.php
index c4e66ebeb..d4d337584 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -54,6 +54,8 @@ function item_post(&$a) {
 	$parid = 0;
 	$r = false;
 
+	$preview = ((x($_POST,'preview')) ? intval($_POST['preview']) : 0);
+
 	if($parent || $parent_uri) {
 
 		if(! x($_POST,'type'))
@@ -280,7 +282,7 @@ function item_post(&$a) {
 
 	$match = null;
 
-	if(preg_match_all("/\[img\](.*?)\[\/img\]/",$body,$match)) {
+	if((! $preview) && preg_match_all("/\[img\](.*?)\[\/img\]/",$body,$match)) {
 		$images = $match[1];
 		if(count($images)) {
 			foreach($images as $image) {
@@ -323,7 +325,7 @@ function item_post(&$a) {
 
 	$match = false;
 
-	if(preg_match_all("/\[attachment\](.*?)\[\/attachment\]/",$body,$match)) {
+	if((! $preview) && preg_match_all("/\[attachment\](.*?)\[\/attachment\]/",$body,$match)) {
 		$attaches = $match[1];
 		if(count($attaches)) {
 			foreach($attaches as $attach) {
@@ -351,13 +353,6 @@ function item_post(&$a) {
 	$bookmark = 0;
 	if(preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",$body,$match,PREG_SET_ORDER)) {
 		$bookmark = 1;
-//		foreach($match as $mtch) {
-//			$body = str_replace(
-//				'[bookmark=' . $mtch[1] . ']' . $mtch[2] . '[/bookmark]',
-//				'[url=' . $mtch[1] . ']' . $mtch[2] . '[/url]',
-//				$body
-//			);
-//		}
 	}
 
 	$body = bb_translate_video($body);
@@ -588,6 +583,17 @@ function item_post(&$a) {
 	else
 		$datarray['guid']      = get_guid();
 
+	// preview mode - prepare the body for display and send it via json
+
+	if($preview) {
+		$b = prepare_body($datarray,true);
+		require_once('include/conversation.php');
+		$o = conversation(&$a,array(array_merge($datarray,$contact_record)),'search',false);
+		$json = array('preview' => $o);
+		echo json_encode($json);
+		killme();
+	}
+
 
 	call_hooks('post_local',$datarray);
 
diff --git a/view/jot.tpl b/view/jot.tpl
index 66621db5e..e81c8eb3f 100644
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -13,6 +13,7 @@
 		<input type="hidden" name="location" id="jot-location" value="$defloc" />
 		<input type="hidden" name="coord" id="jot-coord" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
 		<div id="jot-title-wrapper">
 		<span id="jot-title-desc" style="display: none;">$addtitle</span>
 		<span id="jot-title-display" style="display: none;"></span>
diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl
index 57f320d4c..0ceddb3b7 100644
--- a/view/theme/dispy/jot.tpl
+++ b/view/theme/dispy/jot.tpl
@@ -15,6 +15,7 @@
 		<input type="hidden" name="location" id="jot-location" value="$defloc" />
 		<input type="hidden" name="coord" id="jot-coord" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
 		<div id="jot-title-wrapper">
 		<span id="jot-title-desc" style="display: none;">$addtitle</span>
 		<span id="jot-title-display" style="display: none;"></span>
diff --git a/view/theme/quattro/jot.tpl b/view/theme/quattro/jot.tpl
index 61ba75234..36008c5a1 100644
--- a/view/theme/quattro/jot.tpl
+++ b/view/theme/quattro/jot.tpl
@@ -13,6 +13,7 @@
 		<input type="hidden" name="location" id="jot-location" value="$defloc" />
 		<input type="hidden" name="coord" id="jot-coord" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
 		<div id="jot-title-wrapper">
 		<span id="jot-title-desc" style="display: none;">$addtitle</span>
 		<span id="jot-title-display" style="display: none;"></span>
diff --git a/view/theme/testbubble/jot.tpl b/view/theme/testbubble/jot.tpl
index be536aff4..fa655a13e 100644
--- a/view/theme/testbubble/jot.tpl
+++ b/view/theme/testbubble/jot.tpl
@@ -15,6 +15,7 @@
 		<input type="hidden" name="location" id="jot-location" value="$defloc" />
 		<input type="hidden" name="coord" id="jot-coord" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
 
 		<div id="jot-title-wrapper">
         <span id="jot-title-desc" style="display: none;">$addtitle</span>
-- 
cgit v1.2.3