X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Foembed.php;h=d598b41ce31c405275d2d2bf8916c975e713e884;hb=28df35052a452ad992ad8d67cffbfa380759e414;hp=118f7fa4a39f45fdb5b91819f864f199df40365b;hpb=844a36e2b6c9cd8e934b57b7d56b7a9863f12929;p=friendica.git

diff --git a/include/oembed.php b/include/oembed.php
old mode 100644
new mode 100755
index 118f7fa4a3..d598b41ce3
--- 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);
@@ -11,103 +11,115 @@ function oembed_replacecb($matches){
 
 
 function oembed_fetch_url($embedurl){
-	
-	$txt = Cache::get($embedurl);
+
+	$a = get_app();
+
+	$txt = Cache::get($a->videowidth . $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);
-	
-				
+
+
 	if(is_null($txt)){
 		$txt = "";
-		
+
 		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){
 					$xpath = new DOMXPath($dom);
 					$attr = "oembed";
-				
+
 					$xattr = oe_build_xpath("class","oembed");
 					$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=' . $a->videowidth);
+						break;
 					}
 				}
 			}
 		}
-		
+
 		if ($txt==false || $txt==""){
 			// try oohembed service
-			$ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl);  
+			$ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl).'&maxwidth=' . $a->videowidth;  
 			$txt = fetch_url($ourl);
 		}
-		
+
 		$txt=trim($txt);
 		if ($txt[0]!="{") $txt='{"type":"error"}';
-	
+
 		//save in cache
-		Cache::set($embedurl,$txt);
+		Cache::set($a->videowidth . $embedurl,$txt);
 
 	}
-	
+
 	$j = json_decode($txt);
 	$j->embedurl = $embedurl;
 	return $j;
 }
-	
+
 function oembed_format_object($j){
+	$a = get_app();
 	$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": {
 			if (isset($j->thumbnail_url)) {
-				$tw = (isset($j->thumbnail_width)) ? $j->thumbnail_width:200;
-				$th = (isset($j->thumbnail_height)) ? $j->thumbnail_height:180;
-				$tr = $tw/$th;
-				
+				$tw = (isset($j->thumbnail_width) && intval($j->thumbnail_width)) ? $j->thumbnail_width:200;
+				$th = (isset($j->thumbnail_height) && intval($j->thumbnail_height)) ? $j->thumbnail_height:180;
+				// make sure we don't attempt divide by zero, fallback is a 1:1 ratio
+				$tr = (($th) ? $tw/$th : 1);
+
 				$th=120; $tw = $th*$tr;
 				$tpl=get_markup_template('oembed_video.tpl');
 				$ret.=replace_macros($tpl, array(
+                    '$baseurl' => $a->get_baseurl(),
 					'$embedurl'=>$embedurl,
 					'$escapedhtml'=>base64_encode($jhtml),
 					'$tw'=>$tw,
 					'$th'=>$th,
 					'$turl'=>$j->thumbnail_url,
 				));
-				
+
 			} else {
 				$ret=$jhtml;
 			}
 			$ret.="<br>";
 		}; break;
 		case "photo": {
-			$ret.= "<img width='".$j->width."' height='".$j->height."' src='".$j->url."'>";
+			$ret.= "<img width='".$j->width."' src='".$j->url."'>";
+			//$ret.= "<img width='".$j->width."' height='".$j->height."' src='".$j->url."'>";
 			$ret.="<br>";
-		}; break;  
+		}; break;
 		case "link": {
 			//$ret = "<a href='".$embedurl."'>".$j->title."</a>";
-		}; break;  
+		}; break;
 		case "rich": {
-			// not so safe.. 
+			// not so safe..
 			$ret.= $jhtml;
 		}; break;
 	}
 
 	// add link to source if not present in "rich" type
-	if (  $j->type!='rich' || !strpos($j->html,$embedurl) ){
+	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->provider_name)) $ret.=" on ".$j->provider_name;
+		if (isset($j->author_name)) $ret.=" (".$j->author_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'/>";
+		$ret .= "<a href='$embedurl' rel='oembed'></a>";
 	}
 	$ret.="<br style='clear:left'></span>";
 	return  mb_convert_encoding($ret, 'HTML-ENTITIES', mb_detect_encoding($ret));
@@ -118,14 +130,14 @@ function oembed_iframe($src,$width,$height) {
 		$width = '640';
 	if(! $height || strstr($height,'%'))
 		$height = '300';
-	// try and leave some room for the description line. 
+	// try and leave some room for the description line.
 	$height = intval($height) + 80;
 	$width  = intval($width) + 40;
 
 	$a = get_app();
 
 	$s = $a->get_baseurl()."/oembed/".base64url_encode($src);
-	return '<iframe height="' . $height . '" width="' . $width . '" src="' . $s . '" frameborder="no" >' . t('Embedded content') . '</iframe>'; 
+	return '<iframe height="' . $height . '" width="' . $width . '" src="' . $s . '" frameborder="no" >' . t('Embedded content') . '</iframe>';
 
 }
 
@@ -152,7 +164,7 @@ function oe_get_inner_html( $node ) {
         $innerHTML .= $child->ownerDocument->saveXML( $child );
     }
     return $innerHTML;
-} 
+}
 
 /**
  * Find <span class='oembed'>..<a href='url' rel='oembed'>..</a></span>
@@ -161,17 +173,17 @@ function oe_get_inner_html( $node ) {
 function oembed_html2bbcode($text) {
 	// start parser only if 'oembed' is in text
 	if (strpos($text, "oembed")){
-		
+
 		// convert non ascii chars to html entities
 		$html_text = mb_convert_encoding($text, 'HTML-ENTITIES', mb_detect_encoding($text));
-		
+
 		// If it doesn't parse at all, just return the text.
 		$dom = @DOMDocument::loadHTML($html_text);
 		if(! $dom)
 			return $text;
 		$xpath = new DOMXPath($dom);
 		$attr = "oembed";
-		
+
 		$xattr = oe_build_xpath("class","oembed");
 		$entries = $xpath->query("//span[$xattr]");
 
@@ -183,8 +195,5 @@ function oembed_html2bbcode($text) {
 		return oe_get_inner_html( $dom->getElementsByTagName("body")->item(0) );
 	} else {
 		return $text;
-	} 
+	}
 }
-
-
-