diff options
| author | Michael <icarus@dabo.de> | 2012-04-11 18:47:21 +0200 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-04-11 18:47:21 +0200 |
| commit | c3139fa0fd49b0b4de4568d46a6946c75ccb2a62 (patch) | |
| tree | a46d809d2e11fefba938717d38b1371572e4d815 /include/oembed.php | |
| parent | 81a8d4f9dbd32de133e647c87a5394dd52f009fe (diff) | |
| parent | fe257a20324fe68838e5829e19d18777045a41b4 (diff) | |
| download | volse-hubzilla-c3139fa0fd49b0b4de4568d46a6946c75ccb2a62.tar.gz volse-hubzilla-c3139fa0fd49b0b4de4568d46a6946c75ccb2a62.tar.bz2 volse-hubzilla-c3139fa0fd49b0b4de4568d46a6946c75ccb2a62.zip | |
Merge branch 'master' of github.com:annando/friendica
Diffstat (limited to 'include/oembed.php')
| -rw-r--r--[-rwxr-xr-x] | include/oembed.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/oembed.php b/include/oembed.php index 5c3c595f5..1f45d2814 100755..100644 --- a/include/oembed.php +++ b/include/oembed.php @@ -1,6 +1,6 @@ <?php function oembed_replacecb($matches){ - logger('oembedcb'); +// logger('oembedcb'); $embedurl=$matches[1]; $j = oembed_fetch_url($embedurl); $s = oembed_format_object($j); @@ -14,6 +14,9 @@ function oembed_fetch_url($embedurl){ $txt = Cache::get($embedurl); + // These media files should now be caught in bbcode.php + // left here as a fallback in case this is called from another source + $noexts = array("mp3","mp4","ogg","ogv","oga","ogm","webm"); $ext = pathinfo(strtolower($embedurl),PATHINFO_EXTENSION); @@ -35,7 +38,8 @@ function oembed_fetch_url($embedurl){ $entries = $xpath->query("//link[@type='application/json+oembed']"); foreach($entries as $e){ $href = $e->getAttributeNode("href")->nodeValue; - $txt = fetch_url($href); + $txt = fetch_url($href . '&maxwidth=425'); + break; } } } @@ -43,7 +47,7 @@ function oembed_fetch_url($embedurl){ if ($txt==false || $txt==""){ // try oohembed service - $ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl); + $ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl).'&maxwidth=425'; $txt = fetch_url($ourl); } @@ -62,7 +66,7 @@ function oembed_fetch_url($embedurl){ function oembed_format_object($j){ $embedurl = $j->embedurl; - $jhtml = oembed_iframe($j->embedurl,$j->width,$j->height ); + $jhtml = oembed_iframe($j->embedurl,(isset($j->width) ? $j->width : null), (isset($j->height) ? $j->height : null) ); $ret="<span class='oembed ".$j->type."'>"; switch ($j->type) { case "video": { |