Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items

include/bb2diaspora.php

@@ -56,6 +56,8 @@ function diaspora2bb($s) {
 
 function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) {
 
+	$OriginalText = $Text;
+
 	// Since Diaspora is creating a summary for links, this function removes them before posting
 	if ($fordiaspora)
 		$Text = bb_remove_share_information($Text);
@@ -73,12 +75,24 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) {
 	$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $Text);
 
 	// Convert it to HTML - don't try oembed
-	if ($fordiaspora)
+	if ($fordiaspora) {
 		$Text = bbcode($Text, $preserve_nl, false, 3);
-	else {
+
+		// Add all tags that maybe were removed
+		if (preg_match_all("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",$OriginalText, $tags)) {
+			$tagline = "";
+			foreach($tags[2] as $tag)
+				if (!strpos($Text, "#".$tag))
+					$tagline .= "#".$tag." ";
+
+			$Text = $Text."<br />".$tagline;
+		}
+
+	} else {
 		$Text = bbcode($Text, $preserve_nl, false, 4);
+
 		// Libertree doesn't convert a harizontal rule if there isn't a linefeed
-		$Text = str_replace("<hr />", "<br /><hr />", $Text);
+		$Text = str_replace(array("<hr />", "<hr>"), array("<br /><hr />", "<br><hr>"), $Text);
 	}
 
 	// Now convert HTML to Markdown

include/bbcode.php

@@ -3,10 +3,10 @@ require_once("include/oembed.php");
 require_once('include/event.php');
 
 function bb_attachment($Text, $plaintext = false, $tryoembed = true) {
-	$Text = preg_replace_callback("/\[attachment(.*?)\](.*?)\[\/attachment\]/ism",
+	$Text = preg_replace_callback("/(.*?)\[attachment(.*?)\](.*?)\[\/attachment\]/ism",
 		function ($match) use ($plaintext){
 
-			$attributes = $match[1];
+			$attributes = $match[2];
 
 			$type = "";
 			preg_match("/type='(.*?)'/ism", $attributes, $matches);
@@ -65,6 +65,11 @@ function bb_attachment($Text, $plaintext = false, $tryoembed = true) {
 					$preview = $matches[1];
 			}
 
+			if (((strpos($match[1], "[img=") !== false) OR (strpos($match[1], "[img]") !== false)) AND ($image != "")) {
+				$preview = $image;
+				$image = "";
+			}
+
 			if ($plaintext)
 				$text = sprintf('<a href="%s" target="_blank">%s</a><br>', $url, $title);
 			else {
@@ -83,10 +88,10 @@ function bb_attachment($Text, $plaintext = false, $tryoembed = true) {
 
 				$text .= $oembed;
 
-				$text .= sprintf('<blockquote>%s</blockquote></span>', trim($match[2]));
+				$text .= sprintf('<blockquote>%s</blockquote></span>', trim($match[3]));
 			}
 
-			return($text);
+			return($match[1].$text);
 		},$Text);
 
 	return($Text);

include/gprobe.php

@@ -10,7 +10,7 @@ function gprobe_run(&$argv, &$argc){
 	if(is_null($a)) {
 		$a = new App;
 	}
-  
+
 	if(is_null($db)) {
 	    @include(".htconfig.php");
     	require_once("include/dba.php");
@@ -37,6 +37,8 @@ function gprobe_run(&$argv, &$argc){
 		dbesc(normalise_link($url))
 	);
 
+	logger("gprobe start for ".normalise_link($url), LOGGER_DEBUG);
+
 	if(! count($r)) {
 
 		$arr = probe_url($url);
@@ -55,7 +57,8 @@ function gprobe_run(&$argv, &$argc){
 	}
 	if(count($r))
 		poco_load(0,0,$r[0]['id'], str_replace('/profile/','/poco/',$r[0]['url']));
-		
+
+	logger("gprobe end for ".normalise_link($url), LOGGER_DEBUG);
 	return;
 }
 

include/items.php

@@ -872,9 +872,18 @@ function get_atom_elements($feed, $item, $contact = array()) {
 	}
 
 	if (isset($contact["network"]) AND ($contact["network"] == NETWORK_FEED) AND $contact['fetch_further_information']) {
-		$res["body"] = $res["title"].add_page_info($res['plink'], false, "", ($contact['fetch_further_information'] == 2), $contact['ffi_keyword_blacklist']);
+		$preview = "";
+
+		// Handle enclosures and treat them as preview picture
+		if (isset($attach))
+			foreach ($attach AS $attachment)
+				if ($attachment->type == "image/jpeg")
+					$preview = $attachment->link;
+
+		$res["body"] = $res["title"].add_page_info($res['plink'], false, $preview, ($contact['fetch_further_information'] == 2), $contact['ffi_keyword_blacklist']);
 		$res["title"] = "";
 		$res["object-type"] = ACTIVITY_OBJ_BOOKMARK;
+		unset($res["attach"]);
 	} elseif (isset($contact["network"]) AND ($contact["network"] == NETWORK_OSTATUS))
 		$res["body"] = add_page_info_to_body($res["body"]);
 	elseif (isset($contact["network"]) AND ($contact["network"] == NETWORK_FEED) AND strstr($res['plink'], ".app.net/")) {
@@ -903,6 +912,12 @@ function add_page_info_data($data) {
 	if ($no_photos AND ($data["type"] == "photo"))
 		return("");
 
+	// If the link contains BBCode stuff, make a short link out of this to avoid parsing problems
+	if (strpos($data["url"], '[') OR strpos($data["url"], ']')) {
+		require_once("include/network.php");
+		$data["url"] = short_link($data["url"]);
+	}
+
 	if (($data["type"] != "photo") AND is_string($data["title"]))
 		$text .= "[bookmark=".$data["url"]."]".trim($data["title"])."[/bookmark]";
 
@@ -935,6 +950,9 @@ function add_page_info($url, $no_photos = false, $photo = "", $keywords = false,
 
 	$data = parseurl_getsiteinfo($url, true);
 
+	if ($photo != "")
+		$data["images"][0]["src"] = $photo;
+
 	logger('add_page_info: fetch page info for '.$url.' '.print_r($data, true), LOGGER_DEBUG);
 
 	if (!$keywords AND isset($data["keywords"]))

include/network.php

@@ -1130,7 +1130,7 @@ function original_url($url, $depth=1, $fetchbody = false) {
 				if (in_array($param, array("utm_source", "utm_medium", "utm_term", "utm_content", "utm_campaign",
 							"wt_mc", "pk_campaign", "pk_kwd", "mc_cid", "mc_eid",
 							"fb_action_ids", "fb_action_types", "fb_ref",
-							"awesm",
+							"awesm", "wtrid",
 							"woo_campaign", "woo_source", "woo_medium", "woo_content", "woo_term"))) {
 
 					$pair = $param."=".urlencode($value);

include/oembed.php

@@ -78,6 +78,11 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
 	if (!is_object($j))
 		return false;
 
+	// Always embed the SSL version
+	if (isset($j->html))
+		$j->html = str_replace(array("http://www.youtube.com/", "http://player.vimeo.com/"),
+			array("https://www.youtube.com/", "https://player.vimeo.com/"), $j->html);
+
 	$j->embedurl = $embedurl;
 
 	// If fetching information doesn't work, then improve via internal functions

js/acl.js

@@ -62,7 +62,7 @@ ACL.prototype.add_mention = function(id) {
 		that.element.val( searchText + that.element.val() );
 	} else {
 		if ( tinyMCE.activeEditor.getContent({format : 'raw'}).search(searchText) >= 0 ) return;
-		tinyMCE.activeEditor.dom.add(tinyMCE.activeEditor.getBody(), 'span', {}, searchText);
+		tinyMCE.activeEditor.dom.add(tinyMCE.activeEditor.getBody(), 'dummy', {}, searchText);
 	}
 }
 

library/HTML5/Parser.php

@@ -17,6 +17,12 @@ class HTML5_Parser
      * @return Parsed HTML as DOMDocument
      */
     static public function parse($text, $builder = null) {
+
+	// Cleanup invalid HTML
+	$doc = new DOMDocument();
+	@$doc->loadHTML($text);
+	$text = $doc->saveHTML();
+
         $tokenizer = new HTML5_Tokenizer($text, $builder);
         $tokenizer->parse();
         return $tokenizer->save();

mod/oembed.php

@@ -9,17 +9,18 @@ function oembed_content(&$a){
 		echo oembed_replacecb($url);
 		killme();
 	}
-	
+
 	if ($a->argv[1]=='h2b'){
 		$text = trim(hex2bin($_REQUEST['text']));
 		echo oembed_html2bbcode($text);
 		killme();
 	}
-	
+
 	if ($a->argc == 2){
 		echo "<html><body>";
 		$url = base64url_decode($a->argv[1]);
 		$j = oembed_fetch_url($url);
+
 		echo $j->html;
 //		logger('mod-oembed ' . $j->html, LOGGER_ALL);
 		echo "</body></html>";

mod/parse_url.php

@@ -187,6 +187,9 @@ function parseurl_getsiteinfo($url, $no_guessing = false, $do_oembed = true, $co
 				case "description":
 					$siteinfo["text"] = $attr["content"];
 					break;
+				case "thumbnail":
+					$siteinfo["image"] = $attr["content"];
+					break;
 				case "twitter:image":
 					$siteinfo["image"] = $attr["content"];
 					break;
@@ -421,6 +424,12 @@ function parse_url_content(&$a) {
 
 	$url= $siteinfo["url"];
 
+	// If the link contains BBCode stuff, make a short link out of this to avoid parsing problems
+	if (strpos($url, '[') OR strpos($url, ']')) {
+		require_once("include/network.php");
+		$url = short_link($url);
+	}
+
 	$sitedata = "";
 
 	if($siteinfo["title"] == "") {

mod/settings.php

@@ -1022,7 +1022,7 @@ function settings_content(&$a) {
 	));
 
 	$hide_wall = replace_macros($opt_tpl,array(
-			'$field' 	=> array('hidewall',  t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], '', array(t('No'),t('Yes'))),
+			'$field' 	=> array('hidewall',  t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], t("If enabled, posting public messages to Diaspora and other networks isn't possible."), array(t('No'),t('Yes'))),
 
 	));
 

view/theme/vier/breathe.css

@@ -3,6 +3,7 @@
 
 body {
   background-color: #eeeeee !important;
+  font-family: "Lucida Sans Unicode","Lucida Sans", sans-serif;
 }
 
 header #banner #logo-text {

view/theme/vier/config.php

@@ -45,7 +45,8 @@ function vier_form(&$a, $style){
 		"flat"=>"Flat",
 		"netcolour"=>"Coloured Networks",
 		"breathe"=>"Breathe",
-		"plus"=>"Plus"
+		"plus"=>"Plus",
+		"dark"=>"Dark"
 	);
 	$t = get_markup_template("theme_settings.tpl" );
 	$o .= replace_macros($t, array(

view/theme/vier/dark.css

@@ -0,0 +1,61 @@
+*{ 
+	box-shadow: 0 0 0 0 !important;
+	border-color: #343434 !important;
+}
+
+hr { background-color: #343434 !important; }
+
+a, .wall-item-name, .fakelink { 
+	color: #989898 !important; 
+}
+
+nav { 
+	color: #989898 !important;
+	background-color: #1C2126 !important; 
+}
+
+nav .nav-notify {
+	background-color: #2C77AE !important
+}
+
+a.on {
+	color: #FFFFFF !important;
+	background-color: #2C77AE !important
+}
+
+aside, .menu-popup, .fc-state-highlight, a.off, .autocomplete { 
+	color: #989898 !important;
+	background-color: #252C33 !important;
+	border-right: 1px solid #D2D2D2;
+}
+
+body, section, blockquote, blockquote.shared_content, #profile-jot-form, 
+.dspr, .twit, .pump, .dfrn, .tread-wrapper, code, .mail-list-wrapper, div.pager, ul.tabs {
+	color: #989898 !important;
+	background-color: #171B1F !important;
+}
+
+div.rte, .mceContentBody {
+background:none repeat scroll 0 0 #333333!important;
+color:#FFF!important;
+text-align:left;
+}
+
+div.pager, ul.tabs {
+  box-shadow: unset;
+  border-bottom: unset;
+}
+
+input, option, textarea, select {
+	color: #989898 !important;
+	border: 2px solid #0C1116 !important;
+	background-color: #0C1116 !important;
+}
+
+input#side-peoplefind-submit, input#side-follow-submit {
+	margin-top: 2px !important;
+}
+
+li :hover {
+	color: #767676 !important;	
+}

view/theme/vier/flat.css

@@ -1,4 +1,11 @@
-*{ box-shadow: 0 0 0 0 !important;} 
+*{ 
+	box-shadow: 0 0 0 0 !important;
+	border-color: #EAEAEA !important;
+}
+
+nav { background-color: #27333F !important; }
+aside { background-color: #EAEEF4 !important }
+
 body, section { background-color: #ffffff !important;}
 #profile-jot-form { background-color: #ffffff !important;}
 .dspr, .twit, .pump, .dfrn { background-color: #ffffff !important;}
@@ -11,4 +18,4 @@ div.pager, ul.tabs {
 
 aside {
   border-right: 1px solid #D2D2D2;
-}
+}

view/theme/vier/theme.php

@@ -22,6 +22,8 @@ if ($style == "")
 
 if ($style == "flat")
 	$a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/vier/flat.css" type="text/css" media="screen"/>'."\n";
+if ($style == "dark")
+	$a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/vier/dark.css" type="text/css" media="screen"/>'."\n";
 else if ($style == "netcolour")
 	$a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/vier/netcolour.css" type="text/css" media="screen"/>'."\n";
 else if ($style == "breathe")