Merge pull request #845 from annando/master

Many small bugfixes and features ...

include/bbcode.php

@@ -260,6 +260,11 @@ function bb_ShareAttributes($match) {
                 $profile = $matches[1];
 
 	$posted = "";
+
+	$itemcache = get_config("system","itemcache");
+
+	// relative dates only make sense when they aren't cached
+	if ($itemcache == "") {
 		preg_match("/posted='(.*?)'/ism", $attributes, $matches);
 		if ($matches[1] != "")
 			$posted = $matches[1];
@@ -269,6 +274,7 @@ function bb_ShareAttributes($match) {
 			$posted = $matches[1];
 
 		$reldate = (($posted) ? " " . relative_date($posted) : '');
+	}
 
 	$headline = '<div class="shared_header">';
         //$headline = '<br /><div class="shared_header">';

include/diaspora.php

@@ -1041,10 +1041,10 @@ function diaspora_reshare($importer,$xml,$msg) {
 	$datarray['owner-link'] = $contact['url'];
 	$datarray['owner-avatar'] = ((x($contact,'thumb')) ? $contact['thumb'] : $contact['photo']);
 	if (!intval(get_config('system','wall-to-wall_share'))) {
-		$prefix = "[share author='".str_replace("'", "'",$person['name']).
+		$prefix = "[share author='".str_replace(array("'", "[", "]"), array("'", "[", "]"),$person['name']).
 				"' profile='".$person['url'].
 				"' avatar='".((x($person,'thumb')) ? $person['thumb'] : $person['photo']).
-				"' link='".$orig_url."']";
+				"' link='".str_replace(array("'", "[", "]"), array("'", "[", "]"),$orig_url)."']";
 		$datarray['author-name'] = $contact['name'];
 		$datarray['author-link'] = $contact['url'];
 		$datarray['author-avatar'] = $contact['thumb'];

include/oembed.php

@@ -29,7 +29,7 @@ function oembed_fetch_url($embedurl){
 		if (!in_array($ext, $noexts)){
 			// try oembed autodiscovery
 			$redirects = 0;
-			$html_text = fetch_url($embedurl, false, $redirects, 15, "text/*");
+			$html_text = fetch_url($embedurl, false, $redirects, 15, "text/*"); /**/
 			if($html_text){
 				$dom = @DOMDocument::loadHTML($html_text);
 				if ($dom){
@@ -111,10 +111,12 @@ function oembed_format_object($j){
 
 	// add link to source if not present in "rich" type
 	if ($j->type!='rich' || !strpos($j->html,$embedurl) ){
+		if (isset($j->provider_name)) $ret .= $j->provider_name.": ";
 		$embedlink = (isset($j->title))?$j->title:$embedurl;
 		$ret .= "<a href='$embedurl' rel='oembed'>$embedlink</a>";
-		if (isset($j->author_name)) $ret.=" by ".$j->author_name;
+		if (isset($j->author_name)) $ret.=" (".$j->author_name.")";
-		if (isset($j->provider_name)) $ret.=" on ".$j->provider_name;
+		//if (isset($j->author_name)) $ret.=" by ".$j->author_name;
+		//if (isset($j->provider_name)) $ret.=" on ".$j->provider_name;
 	} else {
 		// add <a> for html2bbcode conversion
 		$ret .= "<a href='$embedurl' rel='oembed'></a>";
@@ -195,6 +197,3 @@ function oembed_html2bbcode($text) {
 		return $text;
 	}
 }
-
-
-

include/plugin.php

@@ -145,7 +145,7 @@ if(! function_exists('load_hooks')) {
 function load_hooks() {
 	$a = get_app();
 	$a->hooks = array();
-	$r = q("SELECT * FROM `hook` WHERE 1 ORDER BY `priority` DESC");
+	$r = q("SELECT * FROM `hook` WHERE 1 ORDER BY `priority` DESC, `file`");
 	if(count($r)) {
 		foreach($r as $rr) {
 			if(! array_key_exists($rr['hook'],$a->hooks))

mod/dfrn_request.php

@@ -98,7 +98,7 @@ function dfrn_request_post(&$a) {
 				}
 
 				if(is_array($contact_record)) {
-					$r = q("UPDATE `contact` SET `ret-aes` = %d, hidden = %d WHERE `id` = %d LIMIT 1",
+					$r = q("UPDATE `contact` SET `ret-aes` = %d, hidden = %d WHERE `id` = %d",
 						intval($aes_allow),
 						intval($hidden),
 						intval($contact_record['id'])
@@ -406,7 +406,7 @@ function dfrn_request_post(&$a) {
 					`uri-date` = '%s', 
 					`avatar-date` = '%s', 
 					`hidden` = 0,
-					WHERE `id` = %d LIMIT 1
+					WHERE `id` = %d
 				",
 					dbesc($photos[0]),
 					dbesc($photos[1]),
@@ -486,7 +486,7 @@ function dfrn_request_post(&$a) {
 			if(is_array($contact_record)) {
 				// There is a contact record but no issued-id, so this
 				// is a reciprocal introduction from a known contact
-				$r = q("UPDATE `contact` SET `issued-id` = '%s' WHERE `id` = %d LIMIT 1",
+				$r = q("UPDATE `contact` SET `issued-id` = '%s' WHERE `id` = %d",
 					dbesc($issued_id),
 					intval($contact_record['id'])
 				);
@@ -741,7 +741,7 @@ function dfrn_request_content(&$a) {
 				// If we are auto_confirming, this record will have already been nuked
 				// in dfrn_confirm_post()
 
-				$r = q("UPDATE `intro` SET `blocked` = 0 WHERE `hash` = '%s' LIMIT 1",
+				$r = q("UPDATE `intro` SET `blocked` = 0 WHERE `hash` = '%s'",
 					dbesc($_GET['confirm_key'])
 				);
 			}

mod/notifications.php

@@ -49,7 +49,7 @@ function notifications_post(&$a) {
 			goaway($a->get_baseurl(true) . '/notifications/intros');
 		}
 		if($_POST['submit'] == t('Ignore')) {
-			$r = q("UPDATE `intro` SET `ignore` = 1 WHERE `id` = %d LIMIT 1",
+			$r = q("UPDATE `intro` SET `ignore` = 1 WHERE `id` = %d",
 				intval($intro_id));
 			goaway($a->get_baseurl(true) . '/notifications/intros');
 		}

mod/parse_url.php

@@ -50,7 +50,7 @@ function completeurl($url, $scheme) {
         return($complete);
 }
 
-function parseurl_getsiteinfo($url) {
+function parseurl_getsiteinfo($url, $no_guessing = false) {
 	$siteinfo = array();
 	$ch = curl_init();
 	curl_setopt($ch, CURLOPT_URL, $url);
@@ -184,7 +184,7 @@ function parseurl_getsiteinfo($url) {
 		}
 	}
 
-	if (@$siteinfo["image"] == "") {
+	if ((@$siteinfo["image"] == "") AND !$no_guessing) {
             $list = $xpath->query("//img[@src]");
             foreach ($list as $node) {
                 $attr = array();
@@ -223,7 +223,7 @@ function parseurl_getsiteinfo($url) {
 							"height"=>$photodata[1]);
 	}
 
-	if (@$siteinfo["text"] == "") {
+	if ((@$siteinfo["text"] == "") AND (@$siteinfo["title"] != "") AND !$no_guessing) {
 		$text = "";
 
 		$list = $xpath->query("//div[@class='article']");