API is now working on my nginx server.

2 files changed, 19 insertions, 11 deletions

diff --git a/include/api.php b/include/api.php
index 7b8709659..a621f1aa7 100755
--- a/include/api.php
+++ b/include/api.php
@@ -99,6 +99,10 @@
 	 **************************/
 	function api_call(&$a){
 		GLOBAL $API, $called_api;
+
+		// preset
+		$type="json";
+
 		foreach ($API as $p=>$info){
 			if (strpos($a->query_string, $p)===0){
 				$called_api= explode("/",$p);
@@ -109,14 +113,14 @@
 
 				load_contact_links(local_user());
 
-				logger('API call for ' . $a->user['username'] . ': ' . $a->query_string);		
+				logger('API call for ' . $a->user['username'] . ': ' . $a->query_string);
 				logger('API parameters: ' . print_r($_REQUEST,true));
-				$type="json";		
+				$type="json";
 				if (strpos($a->query_string, ".xml")>0) $type="xml";
 				if (strpos($a->query_string, ".json")>0) $type="json";
 				if (strpos($a->query_string, ".rss")>0) $type="rss";
-				if (strpos($a->query_string, ".atom")>0) $type="atom";				
-				
+				if (strpos($a->query_string, ".atom")>0) $type="atom";
+
 				$r = call_user_func($info['func'], $a, $type);
 				if ($r===false) return;
 
@@ -126,8 +130,8 @@
 						header ("Content-Type: text/xml");
 						return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
 						break;
-					case "json": 
-						//header ("Content-Type: application/json");  
+					case "json":
+						//header ("Content-Type: application/json");
 						foreach($r as $rr)
 						    return json_encode($rr);
 						break;
@@ -139,7 +143,7 @@
 						header ("Content-Type: application/atom+xml");
 						return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
 						break;
-						
+
 				}
 				//echo "<pre>"; var_dump($r); die();
 			}
@@ -150,8 +154,8 @@
 				header ("Content-Type: text/xml");
 				return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
 				break;
-			case "json": 
-				header ("Content-Type: application/json");  
+			case "json":
+				header ("Content-Type: application/json");
 			    return json_encode(array('error' => 'not implemented'));
 				break;
 			case "rss":
@@ -162,7 +166,6 @@
 				header ("Content-Type: application/atom+xml");
 				return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
 				break;
-				
 		}
 	}
 
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 6f0ab3d28..4bb9e5e47 100755
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -24,6 +24,9 @@ function diaspora2bb($s) {
 	// Simply remove cr.
 	$s = str_replace("\r","",$s);
 
+	// <br/> is invalid. Replace it with the valid expression
+	$s = str_replace("<br/>","<br />",$s);
+
 	$s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s);
 
 	// Escaping the hash tags - doesn't always seem to work
@@ -40,12 +43,14 @@ function diaspora2bb($s) {
 	$s = html2bbcode($s);
 //	$s = str_replace('&#42;','*',$s);
 
+	// Convert everything that looks like a link to a link
+	$s = preg_replace("/([^\]\=]|^)(https?\:\/\/)([a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1[url=$2$3]$2$3[/url]',$s);
 
+	//$s = preg_replace("/([^\]\=]|^)(https?\:\/\/)(vimeo|youtu|www\.youtube|soundcloud)([a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1[url=$2$3$4]$2$3$4[/url]',$s);
 	$s = preg_replace("/\[url\=?(.*?)\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/url\]/ism",'[youtube]$2[/youtube]',$s);
 	$s = preg_replace("/\[url\=https?:\/\/www.youtube.com\/watch\?v\=(.*?)\].*?\[\/url\]/ism",'[youtube]$1[/youtube]',$s);
 	$s = preg_replace("/\[url\=?(.*?)\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/url\]/ism",'[vimeo]$2[/vimeo]',$s);
 	$s = preg_replace("/\[url\=https?:\/\/vimeo.com\/([0-9]+)\](.*?)\[\/url\]/ism",'[vimeo]$1[/vimeo]',$s);
-	$s = preg_replace("/([^\]\=]|^)(https?\:\/\/)(vimeo|youtu|www\.youtube|soundcloud)([a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1[url]$2$3$4[/url]',$s);
 	// remove duplicate adjacent code tags
 	$s = preg_replace("/(\[code\])+(.*?)(\[\/code\])+/ism","[code]$2[/code]", $s);