See issue 1855. OOhembed is removed.
This commit is contained in:
		
					parent
					
						
							
								445dcd3051
							
						
					
				
			
			
				commit
				
					
						6942b16ef5
					
				
			
		
					 3 changed files with 19 additions and 15 deletions
				
			
		| 
						 | 
				
			
			@ -56,25 +56,24 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
 | 
			
		|||
 | 
			
		||||
		if ($txt==false || $txt==""){
 | 
			
		||||
			$embedly = get_config("system", "embedly");
 | 
			
		||||
			if ($embedly == "") {
 | 
			
		||||
				// try oohembed service
 | 
			
		||||
				$ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl).'&maxwidth=' . $a->videowidth;
 | 
			
		||||
				$txt = fetch_url($ourl);
 | 
			
		||||
			} else {
 | 
			
		||||
			if ($embedly != "") {
 | 
			
		||||
				// try embedly service
 | 
			
		||||
				$ourl = "https://api.embed.ly/1/oembed?key=".$embedly."&url=".urlencode($embedurl);
 | 
			
		||||
				$txt = fetch_url($ourl);
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			logger("oembed_fetch_url: ".$txt, LOGGER_DEBUG);
 | 
			
		||||
				logger("oembed_fetch_url: ".$txt, LOGGER_DEBUG);
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		$txt=trim($txt);
 | 
			
		||||
		if ($txt[0]!="{") $txt='{"type":"error"}';
 | 
			
		||||
 | 
			
		||||
		//save in cache
 | 
			
		||||
		Cache::set($a->videowidth . $embedurl,$txt, CACHE_DAY);
 | 
			
		||||
		if ($txt==false || $txt=="")
 | 
			
		||||
			return false;
 | 
			
		||||
 | 
			
		||||
		if ($txt[0]!="{")
 | 
			
		||||
			$txt='{"type":"error"}';
 | 
			
		||||
		else	//save in cache
 | 
			
		||||
			Cache::set($a->videowidth . $embedurl,$txt, CACHE_DAY);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	$j = json_decode($txt);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue