Improved the margins of the headers

[friendica.git] / include / oembed.php

diff --git a/include/oembed.php b/include/oembed.php
index 29d462d8f7d2252629e1cd3fb75b6508b90c04f2..19bdc474f545aa4b14e690970e0bf7b7a9042f2a 100755 (executable)
--- a/include/oembed.php
+++ b/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
@@ -105,10 +110,14 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
                }
        }
 
+       call_hooks('oembed_fetch_url', $embedurl, $j);
+
        return $j;
 }
 
 function oembed_format_object($j){
+       require_once("mod/proxy.php");
+
        $a = get_app();
        $embedurl = $j->embedurl;
        $jhtml = oembed_iframe($j->embedurl,(isset($j->width) ? $j->width : null), (isset($j->height) ? $j->height : null) );
@@ -138,8 +147,8 @@ function oembed_format_object($j){
                        $ret.="<br>";
                }; break;
                case "photo": {
-                       $ret.= "<img width='".$j->width."' src='".$j->url."'>";
-                       //$ret.= "<img width='".$j->width."' height='".$j->height."' src='".$j->url."'>";
+                       $ret.= "<img width='".$j->width."' src='".proxy_url($j->url)."'>";
+                       //$ret.= "<img width='".$j->width."' height='".$j->height."' src='".proxy_url($j->url)."'>";
                        $ret.="<br>";
                }; break;
                case "link": {
@@ -154,6 +163,7 @@ function oembed_format_object($j){
 
        // add link to source if not present in "rich" type
        if ($j->type!='rich' || !strpos($j->html,$embedurl) ){
+               $ret .= "<h4>";
                if (isset($j->title)) {
                        if (isset($j->provider_name))
                                $ret .= $j->provider_name.": ";
@@ -173,15 +183,19 @@ function oembed_format_object($j){
 
                                $embedlink .= $j->author_name;
                        }
+                       if (trim($embedlink) == "")
+                               $embedlink = $embedurl;
+
                        $ret .= "<a href='$embedurl' rel='oembed'>$embedlink</a>";
                }
                //if (isset($j->author_name)) $ret.=" by ".$j->author_name;
                //if (isset($j->provider_name)) $ret.=" on ".$j->provider_name;
+               $ret .= "</h4>";
        } else {
                // add <a> for html2bbcode conversion
-               $ret .= "<a href='$embedurl' rel='oembed'></a>";
+               $ret .= "<a href='$embedurl' rel='oembed'>$embedurl</a>";
+               $ret.="<br style='clear:left'></span>";
        }
-       $ret.="<br style='clear:left'></span>";
        return  mb_convert_encoding($ret, 'HTML-ENTITIES', mb_detect_encoding($ret));
 }