Merge branch 'master' of git://github.com/friendica/friendica

Conflicts:
	boot.php
	database.sql
	include/template_processor.php
	update.php

1 files changed, 107 insertions, 97 deletions

diff --git a/mod/item.php b/mod/item.php
index e4336b974..ee6c5c9a7 100755
--- a/mod/item.php
+++ b/mod/item.php
@@ -243,6 +243,7 @@ function item_post(&$a) {
 		}
 
 
+
 		if(! strlen($body)) {
 			if($preview)
 				killme();
@@ -253,6 +254,15 @@ function item_post(&$a) {
 		}
 	}
 
+	// Work around doubled linefeeds in Tinymce 3.5b2
+	// First figure out if it's a status post that would've been
+	// created using tinymce. Otherwise leave it alone. 
+
+	$plaintext = (local_user() ? intval(get_pconfig(local_user(),'system','plaintext')) : 0);
+	if((! $parent) && (! $api_source) && (! $plaintext)) {
+		$body = str_replace("\r\n","\n",$body);
+		$body = str_replace("\n\n","\n",$body);
+	}
 
 
 	// get contact info for poster
@@ -524,7 +534,7 @@ function item_post(&$a) {
 
 	if($preview) {
 		require_once('include/conversation.php');
-		$o = conversation(&$a,array(array_merge($contact_record,$datarray)),'search',false,true);
+		$o = conversation($a,array(array_merge($contact_record,$datarray)),'search',false,true);
 		logger('preview: ' . $o);
 		echo json_encode(array('preview' => $o));
 		killme();
@@ -832,129 +842,129 @@ function item_content(&$a) {
  */
 function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
 	//is it a hash tag? 
-	if(strpos($tag,'#') === 0) {

+	if(strpos($tag,'#') === 0) {
 		//if the tag is replaced...
 		if(strpos($tag,'[url='))
-			//...do nothing

-			continue;
-		//base tag has the tags name only

-		$basetag = str_replace('_',' ',substr($tag,1));

+			//...do nothing
+			return;
+		//base tag has the tags name only
+		$basetag = str_replace('_',' ',substr($tag,1));
 		//create text for link
 		$newtag = '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
-		//replace tag by the link

-		$body = str_replace($tag, $newtag, $body);

+		//replace tag by the link
+		$body = str_replace($tag, $newtag, $body);
 	
-		//is the link already in str_tags?

-		if(! stristr($str_tags,$newtag)) {

+		//is the link already in str_tags?
+		if(! stristr($str_tags,$newtag)) {
 			//append or set str_tags
-			if(strlen($str_tags))

-				$str_tags .= ',';

-			$str_tags .= $newtag;

-		}

-		return;

+			if(strlen($str_tags))
+				$str_tags .= ',';
+			$str_tags .= $newtag;
+		}
+		return;
 	}
-	//is it a person tag? 

-	if(strpos($tag,'@') === 0) {

+	//is it a person tag? 
+	if(strpos($tag,'@') === 0) {
 		//is it already replaced? 
-		if(strpos($tag,'[url='))

-			continue;

-		$stat = false;

+		if(strpos($tag,'[url='))
+			return;
+		$stat = false;
 		//get the person's name
 		$name = substr($tag,1);
-		//is it a link or a full dfrn address? 

-		if((strpos($name,'@')) || (strpos($name,'http://'))) {

-			$newname = $name;

+		//is it a link or a full dfrn address? 
+		if((strpos($name,'@')) || (strpos($name,'http://'))) {
+			$newname = $name;
 			//get the profile links
-			$links = @lrdd($name);

-			if(count($links)) {

+			$links = @lrdd($name);
+			if(count($links)) {
 				//for all links, collect how is to inform and how's profile is to link
-				foreach($links as $link) {

-					if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')

-						$profile = $link['@attributes']['href'];

-					if($link['@attributes']['rel'] === 'salmon') {

-						if(strlen($inform))

-							$inform .= ',';

-						$inform .= 'url:' . str_replace(',','%2c',$link['@attributes']['href']);

-					}

-				}

-			}

-		} else { //if it is a name rather than an address

-			$newname = $name;

-			$alias = '';

+				foreach($links as $link) {
+					if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
+						$profile = $link['@attributes']['href'];
+					if($link['@attributes']['rel'] === 'salmon') {
+						if(strlen($inform))
+							$inform .= ',';
+						$inform .= 'url:' . str_replace(',','%2c',$link['@attributes']['href']);
+					}
+				}
+			}
+		} else { //if it is a name rather than an address
+			$newname = $name;
+			$alias = '';
 			$tagcid = 0;
-			//is it some generated name?

-			if(strrpos($newname,'+')) {

+			//is it some generated name?
+			if(strrpos($newname,'+')) {
 				//get the id
-				$tagcid = intval(substr($newname,strrpos($newname,'+') + 1));

+				$tagcid = intval(substr($newname,strrpos($newname,'+') + 1));
 				//remove the next word from tag's name
-				if(strpos($name,' ')) {

+				if(strpos($name,' ')) {
 					$name = substr($name,0,strpos($name,' '));
-				}

+				}
 			}
 			if($tagcid) { //if there was an id
-				//select contact with that id from the logged in user's contact list

-				$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",

-						intval($tagcid),

+				//select contact with that id from the logged in user's contact list
+				$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+						intval($tagcid),
 						intval($profile_uid)
-				);

+				);
 			} elseif(strstr($name,'_') || strstr($name,' ')) { //no id
-				//get the real name

-				$newname = str_replace('_',' ',$name);

+				//get the real name
+				$newname = str_replace('_',' ',$name);
 				//select someone from this user's contacts by name
-				$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",

-						dbesc($newname),

-						intval($profile_uid)

-				);

+				$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
+						dbesc($newname),
+						intval($profile_uid)
+				);
 			} else {
-				//select someone by attag or nick and the name passed in

-				$r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",

-						dbesc($name),

-						dbesc($name),

-						intval($profile_uid)

-				);

+				//select someone by attag or nick and the name passed in
+				$r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
+						dbesc($name),
+						dbesc($name),
+						intval($profile_uid)
+				);
 			}
-			//$r is set, if someone could be selected

-			if(count($r)) {

+			//$r is set, if someone could be selected
+			if(count($r)) {
 				$profile = $r[0]['url'];
-				//set newname to nick, find alias

-				if($r[0]['network'] === 'stat') {

-					$newname = $r[0]['nick'];

-					$stat = true;

-					if($r[0]['alias'])

-						$alias = $r[0]['alias'];

-				}

-				else

-					$newname = $r[0]['name'];

+				//set newname to nick, find alias
+				if($r[0]['network'] === 'stat') {
+					$newname = $r[0]['nick'];
+					$stat = true;
+					if($r[0]['alias'])
+						$alias = $r[0]['alias'];
+				}
+				else
+					$newname = $r[0]['name'];
 				//add person's id to $inform
-				if(strlen($inform))

-					$inform .= ',';

-				$inform .= 'cid:' . $r[0]['id'];

-			}

+				if(strlen($inform))
+					$inform .= ',';
+				$inform .= 'cid:' . $r[0]['id'];
+			}
 		}
-		//if there is an url for this persons profile

-		if(isset($profile)) {

+		//if there is an url for this persons profile
+		if(isset($profile)) {
 			//create profile link
-			$profile = str_replace(',','%2c',$profile);

-			$newtag = '@[url=' . $profile . ']' . $newname	. '[/url]';

-			$body = str_replace('@' . $name, $newtag, $body);

+			$profile = str_replace(',','%2c',$profile);
+			$newtag = '@[url=' . $profile . ']' . $newname	. '[/url]';
+			$body = str_replace('@' . $name, $newtag, $body);
 			//append tag to str_tags
-			if(! stristr($str_tags,$newtag)) {

-				if(strlen($str_tags))

-					$str_tags .= ',';

-				$str_tags .= $newtag;

-			}

-	

-			// Status.Net seems to require the numeric ID URL in a mention if the person isn't

-			// subscribed to you. But the nickname URL is OK if they are. Grrr. We'll tag both.

-	

-			if(strlen($alias)) {

-				$newtag = '@[url=' . $alias . ']' . $newname	. '[/url]';

-				if(! stristr($str_tags,$newtag)) {

-					if(strlen($str_tags))

-						$str_tags .= ',';

-					$str_tags .= $newtag;

-				}

-			}

-		}

+			if(! stristr($str_tags,$newtag)) {
+				if(strlen($str_tags))
+					$str_tags .= ',';
+				$str_tags .= $newtag;
+			}
+	
+			// Status.Net seems to require the numeric ID URL in a mention if the person isn't
+			// subscribed to you. But the nickname URL is OK if they are. Grrr. We'll tag both.
+	
+			if(strlen($alias)) {
+				$newtag = '@[url=' . $alias . ']' . $newname	. '[/url]';
+				if(! stristr($str_tags,$newtag)) {
+					if(strlen($str_tags))
+						$str_tags .= ',';
+					$str_tags .= $newtag;
+				}
+			}
+		}
 	}
 }