Fix formatting in mod/parse_url
This commit is contained in:
parent
f9177e827e
commit
475d3f8f3a
|
@ -8,128 +8,127 @@
|
||||||
* information and does format this information to BBCode
|
* information and does format this information to BBCode
|
||||||
*
|
*
|
||||||
* @see ParseUrl::getSiteinfo() for more information about scraping embeddable content
|
* @see ParseUrl::getSiteinfo() for more information about scraping embeddable content
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Friendica\App;
|
use Friendica\App;
|
||||||
use Friendica\Core\Addon;
|
use Friendica\Core\Addon;
|
||||||
use Friendica\Util\Network;
|
use Friendica\Util\Network;
|
||||||
use Friendica\Util\ParseUrl;
|
use Friendica\Util\ParseUrl;
|
||||||
|
|
||||||
require_once("include/items.php");
|
require_once 'include/items.php';
|
||||||
|
|
||||||
function parse_url_content(App $a) {
|
|
||||||
|
|
||||||
|
function parse_url_content(App $a)
|
||||||
|
{
|
||||||
$text = null;
|
$text = null;
|
||||||
$str_tags = "";
|
$str_tags = '';
|
||||||
|
|
||||||
$br = "\n";
|
$br = "\n";
|
||||||
|
|
||||||
if (!empty($_GET["binurl"])) {
|
if (!empty($_GET['binurl'])) {
|
||||||
$url = trim(hex2bin($_GET["binurl"]));
|
$url = trim(hex2bin($_GET['binurl']));
|
||||||
} else {
|
} else {
|
||||||
$url = trim($_GET["url"]);
|
$url = trim($_GET['url']);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($_GET["title"])) {
|
if (!empty($_GET['title'])) {
|
||||||
$title = strip_tags(trim($_GET["title"]));
|
$title = strip_tags(trim($_GET['title']));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($_GET["description"])) {
|
if (!empty($_GET['description'])) {
|
||||||
$text = strip_tags(trim($_GET["description"]));
|
$text = strip_tags(trim($_GET['description']));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($_GET["tags"])) {
|
if (!empty($_GET['tags'])) {
|
||||||
$arr_tags = ParseUrl::convertTagsToArray($_GET["tags"]);
|
$arr_tags = ParseUrl::convertTagsToArray($_GET['tags']);
|
||||||
if (count($arr_tags)) {
|
if (count($arr_tags)) {
|
||||||
$str_tags = $br . implode(" ", $arr_tags) . $br;
|
$str_tags = $br . implode(' ', $arr_tags) . $br;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add url scheme if it is missing
|
// Add url scheme if it is missing
|
||||||
$arrurl = parse_url($url);
|
$arrurl = parse_url($url);
|
||||||
if (!x($arrurl, "scheme")) {
|
if (!x($arrurl, 'scheme')) {
|
||||||
if (x($arrurl, "host")) {
|
if (x($arrurl, 'host')) {
|
||||||
$url = "http:".$url;
|
$url = 'http:' . $url;
|
||||||
} else {
|
} else {
|
||||||
$url = "http://".$url;
|
$url = 'http://' . $url;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
logger("prse_url: " . $url);
|
logger($url);
|
||||||
|
|
||||||
// Check if the URL is an image, video or audio file. If so format
|
// Check if the URL is an image, video or audio file. If so format
|
||||||
// the URL with the corresponding BBCode media tag
|
// the URL with the corresponding BBCode media tag
|
||||||
$redirects = 0;
|
$redirects = 0;
|
||||||
// Fetch the header of the URL
|
// Fetch the header of the URL
|
||||||
$result = Network::curl($url, false, $redirects, ["novalidate" => true, "nobody" => true]);
|
$result = Network::curl($url, false, $redirects, ['novalidate' => true, 'nobody' => true]);
|
||||||
if($result["success"]) {
|
|
||||||
|
if ($result['success']) {
|
||||||
// Convert the header fields into an array
|
// Convert the header fields into an array
|
||||||
$hdrs = [];
|
$hdrs = [];
|
||||||
$h = explode("\n", $result["header"]);
|
$h = explode("\n", $result['header']);
|
||||||
foreach ($h as $l) {
|
foreach ($h as $l) {
|
||||||
$header = array_map("trim", explode(":", trim($l), 2));
|
$header = array_map('trim', explode(':', trim($l), 2));
|
||||||
if (count($header) == 2) {
|
if (count($header) == 2) {
|
||||||
list($k,$v) = $header;
|
list($k, $v) = $header;
|
||||||
$hdrs[$k] = $v;
|
$hdrs[$k] = $v;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (array_key_exists("Content-Type", $hdrs)) {
|
if (array_key_exists('Content-Type', $hdrs)) {
|
||||||
$type = $hdrs["Content-Type"];
|
$type = $hdrs['Content-Type'];
|
||||||
}
|
}
|
||||||
if ($type) {
|
if ($type) {
|
||||||
if(stripos($type, "image/") !== false) {
|
if (stripos($type, 'image/') !== false) {
|
||||||
echo $br . "[img]" . $url . "[/img]" . $br;
|
echo $br . '[img]' . $url . '[/img]' . $br;
|
||||||
killme();
|
exit();
|
||||||
}
|
}
|
||||||
if (stripos($type, "video/") !== false) {
|
if (stripos($type, 'video/') !== false) {
|
||||||
echo $br . "[video]" . $url . "[/video]" . $br;
|
echo $br . '[video]' . $url . '[/video]' . $br;
|
||||||
killme();
|
exit();
|
||||||
}
|
}
|
||||||
if (stripos($type, "audio/") !== false) {
|
if (stripos($type, 'audio/') !== false) {
|
||||||
echo $br . "[audio]" . $url . "[/audio]" . $br;
|
echo $br . '[audio]' . $url . '[/audio]' . $br;
|
||||||
killme();
|
exit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$template = "[bookmark=%s]%s[/bookmark]%s";
|
$template = '[bookmark=%s]%s[/bookmark]%s';
|
||||||
|
|
||||||
$arr = ["url" => $url, "text" => ""];
|
$arr = ['url' => $url, 'text' => ''];
|
||||||
|
|
||||||
Addon::callHooks("parse_link", $arr);
|
Addon::callHooks('parse_link', $arr);
|
||||||
|
|
||||||
if (strlen($arr["text"])) {
|
if (strlen($arr['text'])) {
|
||||||
echo $arr["text"];
|
echo $arr['text'];
|
||||||
killme();
|
exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
// If there is already some content information submitted we don't
|
// If there is already some content information submitted we don't
|
||||||
// need to parse the url for content.
|
// need to parse the url for content.
|
||||||
if (!empty($url) && !empty($title) && !empty($text)) {
|
if (!empty($url) && !empty($title) && !empty($text)) {
|
||||||
|
$title = str_replace(["\r", "\n"], ['', ''], $title);
|
||||||
|
|
||||||
$title = str_replace(["\r","\n"],["",""],$title);
|
$text = '[quote]' . trim($text) . '[/quote]' . $br;
|
||||||
|
|
||||||
$text = "[quote]" . trim($text) . "[/quote]" . $br;
|
|
||||||
|
|
||||||
$result = sprintf($template, $url, ($title) ? $title : $url, $text) . $str_tags;
|
$result = sprintf($template, $url, ($title) ? $title : $url, $text) . $str_tags;
|
||||||
|
|
||||||
logger("parse_url (unparsed): returns: " . $result);
|
logger('(unparsed): returns: ' . $result);
|
||||||
|
|
||||||
echo $result;
|
echo $result;
|
||||||
killme();
|
exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fetch the information directly from the webpage
|
// Fetch the information directly from the webpage
|
||||||
$siteinfo = ParseUrl::getSiteinfo($url);
|
$siteinfo = ParseUrl::getSiteinfo($url);
|
||||||
|
|
||||||
unset($siteinfo["keywords"]);
|
unset($siteinfo['keywords']);
|
||||||
|
|
||||||
// Format it as BBCode attachment
|
// Format it as BBCode attachment
|
||||||
$info = add_page_info_data($siteinfo);
|
$info = add_page_info_data($siteinfo);
|
||||||
|
|
||||||
echo $info;
|
echo $info;
|
||||||
|
|
||||||
killme();
|
exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -151,7 +150,8 @@ function parse_url_content(App $a) {
|
||||||
* @todo Remove this function after all Addons has been changed to use
|
* @todo Remove this function after all Addons has been changed to use
|
||||||
* ParseUrl::getSiteinfoCached
|
* ParseUrl::getSiteinfoCached
|
||||||
*/
|
*/
|
||||||
function parseurl_getsiteinfo_cached($url, $no_guessing = false, $do_oembed = true) {
|
function parseurl_getsiteinfo_cached($url, $no_guessing = false, $do_oembed = true)
|
||||||
|
{
|
||||||
$siteinfo = ParseUrl::getSiteinfoCached($url, $no_guessing, $do_oembed);
|
$siteinfo = ParseUrl::getSiteinfoCached($url, $no_guessing, $do_oembed);
|
||||||
return $siteinfo;
|
return $siteinfo;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user