]> git.mxchange.org Git - friendica.git/commitdiff
Remove include/oembed and mod/oembed
authorHypolite Petovan <mrpetovan@gmail.com>
Mon, 1 Jan 2018 01:58:32 +0000 (20:58 -0500)
committerHypolite Petovan <mrpetovan@gmail.com>
Mon, 1 Jan 2018 01:58:32 +0000 (20:58 -0500)
include/bb2diaspora.php
include/bbcode.php
include/items.php
include/oembed.php [deleted file]
mod/oembed.php [deleted file]
src/ParseUrl.php
src/Protocol/DFRN.php

index e1a67d432d261600cae885ed2185b422275288cd..714d780048b9724fe48f5570cd78ed6a433f65a7 100644 (file)
@@ -7,7 +7,6 @@ use Friendica\Network\Probe;
 
 use League\HTMLToMarkdown\HtmlConverter;
 
-require_once 'include/oembed.php';
 require_once 'include/event.php';
 require_once 'library/markdown.php';
 require_once 'include/html2bbcode.php';
index e672001937677848650fe8421fc72b439e022e44..30d01657701ca48957fbf4cde77c55a0e1492e8d 100644 (file)
@@ -9,7 +9,6 @@ use Friendica\Core\Config;
 use Friendica\Model\Contact;
 use Friendica\Util\Map;
 
-require_once 'include/oembed.php';
 require_once 'include/event.php';
 require_once 'mod/proxy.php';
 require_once 'include/plaintext.php';
index a3f3c823b74432f09de3950dae4db50f368c0c5c..4d495d35151b7c184d1c27ebe9b6c04e45f102d6 100644 (file)
@@ -20,7 +20,6 @@ use Friendica\Protocol\OStatus;
 use Friendica\Protocol\Feed;
 
 require_once 'include/bbcode.php';
-require_once 'include/oembed.php';
 require_once 'include/tags.php';
 require_once 'include/files.php';
 require_once 'include/text.php';
diff --git a/include/oembed.php b/include/oembed.php
deleted file mode 100644 (file)
index b7c1616..0000000
+++ /dev/null
@@ -1,317 +0,0 @@
-<?php
-
-/**
- * @file include/oembed.php
- */
-
-use Friendica\App;
-use Friendica\Core\Cache;
-use Friendica\Core\System;
-use Friendica\ParseUrl;
-use Friendica\Core\Config;
-use Friendica\Database\DBM;
-
-function oembed_replacecb($matches){
-       $embedurl=$matches[1];
-       $j = oembed_fetch_url($embedurl);
-       $s =  oembed_format_object($j);
-
-       return $s;
-}
-
-/**
- * @brief Get data from an URL to embed its content.
- *
- * @param string $embedurl The URL from which the data should be fetched.
- * @param bool $no_rich_type If set to true rich type content won't be fetched.
- *
- * @return bool|object Returns object with embed content or false if no embedable
- *      content exists
- */
-function oembed_fetch_url($embedurl, $no_rich_type = false) {
-       $embedurl = trim($embedurl, "'");
-       $embedurl = trim($embedurl, '"');
-
-       $a = get_app();
-
-       $condition = array('url' => normalise_link($embedurl));
-       $r = dba::select('oembed', array('content'), $condition, array('limit' => 1));
-
-       if (DBM::is_result($r)) {
-               $txt = $r["content"];
-       } else {
-               $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/*");
-                       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 . '&maxwidth=' . $a->videowidth);
-                                               break;
-                                       }
-                                       $entries = $xpath->query("//link[@type='text/json+oembed']");
-                                       foreach ($entries as $e) {
-                                               $href = $e->getAttributeNode("href")->nodeValue;
-                                               $txt = fetch_url($href . '&maxwidth=' . $a->videowidth);
-                                               break;
-                                       }
-                               }
-                       }
-               }
-
-               $txt = trim($txt);
-
-               if ($txt[0] != "{") {
-                       $txt = '{"type":"error"}';
-               } else {        //save in cache
-                       $j = json_decode($txt);
-                       if ($j->type != "error") {
-                               dba::insert('oembed', array('url' => normalise_link($embedurl),
-                                                       'content' => $txt, 'created' => datetime_convert()), true);
-                       }
-
-                       Cache::set($a->videowidth.$embedurl, $txt, CACHE_DAY);
-               }
-       }
-
-       $j = json_decode($txt);
-
-       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
-       if (($j->type == "error") || ($no_rich_type && ($j->type == "rich"))) {
-               $data = ParseUrl::getSiteinfoCached($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"];
-               }
-       }
-
-       call_hooks('oembed_fetch_url', $embedurl, $j);
-
-       return $j;
-}
-
-function oembed_format_object($j){
-       require_once("mod/proxy.php");
-
-       $embedurl = $j->embedurl;
-       $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) && 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'     => System::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."' src='".proxy_url($j->url)."'>";
-                       break;
-               case "link":
-                       break;
-               case "rich":
-                       // not so safe..
-                       if (!Config::get("system","no_oembed_rich_content")) {
-                               $ret.= proxy_parse_html($jhtml);
-                       }
-                       break;
-       }
-
-       // 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.": ";
-                       }
-
-                       $embedlink = (isset($j->title))?$j->title:$embedurl;
-                       $ret .= "<a href='$embedurl' rel='oembed'>$embedlink</a>";
-                       if (isset($j->author_name)) {
-                               $ret.=" (".$j->author_name.")";
-                       }
-               } elseif (isset($j->provider_name) || isset($j->author_name)) {
-                       $embedlink = "";
-                       if (isset($j->provider_name)) {
-                               $embedlink .= $j->provider_name;
-                       }
-
-                       if (isset($j->author_name)) {
-                               if ($embedlink != "") {
-                                       $embedlink .= ": ";
-                               }
-
-                               $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'>$embedurl</a>";
-       }
-       $ret.="</span>";
-       $ret = str_replace("\n","",$ret);
-       return mb_convert_encoding($ret, 'HTML-ENTITIES', mb_detect_encoding($ret));
-}
-
-/**
- * @brief Generates the iframe HTML for an oembed attachment.
- *
- * Width and height are given by the remote, and are regularly too small for
- * the generated iframe.
- *
- * The width is entirely discarded for the actual width of the post, while fixed
- * height is used as a starting point before the inevitable resizing.
- *
- * Since the iframe is automatically resized on load, there are no need for ugly
- * and impractical scrollbars.
- *
- * @param string $src Original remote URL to embed
- * @param string $width
- * @param string $height
- * @return string formatted HTML
- *
- * @see oembed_format_object()
- */
-function oembed_iframe($src, $width, $height) {
-       $a = get_app();
-
-       if (!$height || strstr($height,'%')) {
-               $height = '200';
-       }
-       $width = '100%';
-
-       $s = System::baseUrl() . '/oembed/' . base64url_encode($src);
-       return '<iframe onload="resizeIframe(this);" class="embed_rich" height="' . $height . '" width="' . $width . '" src="' . $s . '" allowfullscreen scrolling="no" frameborder="no">' . t('Embedded content') . '</iframe>';
-}
-
-
-
-function oembed_bbcode2html($text){
-       $stopoembed = Config::get("system","no_oembed");
-       if ($stopoembed == true){
-               return preg_replace("/\[embed\](.+?)\[\/embed\]/is", "<!-- oembed $1 --><i>". t('Embedding disabled') ." : $1</i><!-- /oembed $1 -->" ,$text);
-       }
-       return preg_replace_callback("/\[embed\](.+?)\[\/embed\]/is", 'oembed_replacecb' ,$text);
-}
-
-
-function oe_build_xpath($attr, $value){
-       // http://westhoffswelt.de/blog/0036_xpath_to_select_html_by_class.html
-       return "contains( normalize-space( @$attr ), ' $value ' ) or substring( normalize-space( @$attr ), 1, string-length( '$value' ) + 1 ) = '$value ' or substring( normalize-space( @$attr ), string-length( @$attr ) - string-length( '$value' ) ) = ' $value' or @$attr = '$value'";
-}
-
-function oe_get_inner_html($node) {
-       $innerHTML= '';
-       $children = $node->childNodes;
-       foreach ($children as $child) {
-               $innerHTML .= $child->ownerDocument->saveXML($child);
-       }
-       return $innerHTML;
-}
-
-/**
- * Find <span class='oembed'>..<a href='url' rel='oembed'>..</a></span>
- * and replace it with [embed]url[/embed]
- */
-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]");
-
-               $xattr = "@rel='oembed'";//oe_build_xpath("rel","oembed");
-               foreach ($entries as $e) {
-                       $href = $xpath->evaluate("a[$xattr]/@href", $e)->item(0)->nodeValue;
-                       if (!is_null($href)) {
-                               $e->parentNode->replaceChild(new DOMText("[embed]".$href."[/embed]"), $e);
-                       }
-               }
-               return oe_get_inner_html( $dom->getElementsByTagName("body")->item(0) );
-       } else {
-               return $text;
-       }
-}
diff --git a/mod/oembed.php b/mod/oembed.php
deleted file mode 100644 (file)
index 3266ad9..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-use Friendica\App;
-
-require_once("include/oembed.php");
-
-function oembed_content(App $a) {
-       // logger('mod_oembed ' . $a->query_string, LOGGER_ALL);
-
-       if ($a->argv[1]=='b2h'){
-               $url = array( "", trim(hex2bin($_REQUEST['url'])));
-               echo oembed_replacecb($url);
-               killme();
-       }
-
-       if ($a->argv[1]=='h2b'){
-               $text = trim(hex2bin($_REQUEST['text']));
-               echo oembed_html2bbcode($text);
-               killme();
-       }
-
-       if ($a->argc == 2){
-               echo "<html><body>";
-               $url = base64url_decode($a->argv[1]);
-               $j = oembed_fetch_url($url);
-
-               // workaround for media.ccc.de (and any other endpoint that return size 0)
-               if (substr($j->html, 0, 7) == "<iframe" && strstr($j->html, 'width="0"')) {
-                       $j->html = '<style>html,body{margin:0;padding:0;} iframe{width:100%;height:100%;}</style>'. $j->html;
-                       $j->html = str_replace('width="0"', '', $j->html);
-                       $j->html = str_replace('height="0"', '', $j->html);
-               }
-               echo $j->html;
-//             logger('mod-oembed ' . $j->html, LOGGER_ALL);
-               echo "</body></html>";
-       }
-       killme();
-}
index 6252e0b68a7b8d9ccc074ec60165357043e48b5d..0c67589ddf9a59ecfb1a85cfae00ead3fcfa874c 100644 (file)
@@ -15,7 +15,6 @@ use DOMDocument;
 
 require_once 'include/dba.php';
 require_once "include/network.php";
-require_once "include/oembed.php";
 
 /**
  * @brief Class with methods for extracting certain content from an url
index 1ec0c792e015850e24ed6565b1b594465c3a926d..752921424c008003d78a14361671836de0f09881 100644 (file)
@@ -34,7 +34,6 @@ require_once "include/tags.php";
 require_once "include/files.php";
 require_once "include/event.php";
 require_once "include/text.php";
-require_once "include/oembed.php";
 require_once "include/html2bbcode.php";
 require_once "include/bbcode.php";