MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #998 from annando/master

Browse source 
"Vier": New font version, fallback for oembed, more tracking variables removed
This commit is contained in:
fabrixxm 2014-05-29 14:04:04 +02:00
commit 77a54c66be
17 changed files with 3881 additions and 1159 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/html2bbcode.php
View file

@ -167,6 +167,7 @@ function html2bbcode($message)
// Test
//node2bbcode($doc, 'span', array('class'=>'/([\w ]+)/'), '[class=$1]', '[/class]');
node2bbcode($doc, 'span', array('class'=>'type-link'), '[class=type-link]', '[/class]');
node2bbcode($doc, 'span', array('class'=>'type-video'), '[class=type-video]', '[/class]');
node2bbcode($doc, 'strong', array(), '[b]', '[/b]');
node2bbcode($doc, 'em', array(), '[i]', '[/i]');

1
include/network.php
View file

@ -1125,6 +1125,7 @@ function original_url($url, $depth=1, $fetchbody = false) {
foreach ($querydata AS $param=>$value)
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",
"woo_campaign", "woo_source", "woo_medium", "woo_content", "woo_term"))) {
$pair = $param."=".$value;
$url = str_replace($pair, "", $url);

28
include/oembed.php
View file

@ -10,7 +10,7 @@ function oembed_replacecb($matches){
}
function oembed_fetch_url($embedurl){
function oembed_fetch_url($embedurl, $no_rich_type = false){
$embedurl = trim($embedurl, "'");
$embedurl = trim($embedurl, '"');
@ -79,6 +79,32 @@ function oembed_fetch_url($embedurl){
return false;
$j->embedurl = $embedurl;
// If fetching information doesn't work, then improve via internal functions
if (($j->type == "error") OR ($no_rich_type AND ($j->type == "rich"))) {
require_once("mod/parse_url.php");
$data = parseurl_getsiteinfo($embedurl, true, false);
$j->type = $data["type"];
if ($j->type == "photo") {
$j->url = $data["url"];
//$j->width = $data["images"][0]["width"];
//$j->height = $data["images"][0]["height"];
}
if (isset($data["title"]))
$j->title = $data["title"];
if (isset($data["text"]))
$j->description = $data["text"];
if (is_array($data["images"])) {
$j->thumbnail_url = $data["images"][0]["src"];
$j->thumbnail_width = $data["images"][0]["width"];
$j->thumbnail_height = $data["images"][0]["height"];
}
}
return $j;
}