clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

New hook "getsiteinfo", separating fetching site info from generating bbcode

This commit is contained in:
Michael Vogel 2014-10-20 08:03:47 +02:00
parent bb0b1918a1
commit 3600289262
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/items.php
View File

@ -888,13 +888,7 @@ function get_atom_elements($feed, $item, $contact = array()) {
return $res; return $res;
} }
function add_page_info($url, $no_photos = false, $photo = "", $keywords = false) { function add_page_info_data($data) {
require_once("mod/parse_url.php");
$data = parseurl_getsiteinfo($url, true);
logger('add_page_info: fetch page info for '.$url.' '.print_r($data, true), LOGGER_DEBUG);
// It maybe is a rich content, but if it does have everything that a link has, // It maybe is a rich content, but if it does have everything that a link has,
// then treat it that way // then treat it that way
if (($data["type"] == "rich") AND is_string($data["title"]) AND if (($data["type"] == "rich") AND is_string($data["title"]) AND
@ -921,7 +915,7 @@ function add_page_info($url, $no_photos = false, $photo = "", $keywords = false)
$text .= "[quote]".$data["text"]."[/quote]"; $text .= "[quote]".$data["text"]."[/quote]";
$hashtags = ""; $hashtags = "";
if ($keywords AND isset($data["keywords"])) { if (isset($data["keywords"]) AND count($data["keywords"])) {
$a = get_app(); $a = get_app();
$hashtags = "\n"; $hashtags = "\n";
foreach ($data["keywords"] AS $keyword) { foreach ($data["keywords"] AS $keyword) {
@ -933,6 +927,21 @@ function add_page_info($url, $no_photos = false, $photo = "", $keywords = false)
return("\n[class=type-".$data["type"]."]".$text."[/class]".$hashtags); return("\n[class=type-".$data["type"]."]".$text."[/class]".$hashtags);
} }
function add_page_info($url, $no_photos = false, $photo = "", $keywords = false) {
require_once("mod/parse_url.php");
$data = parseurl_getsiteinfo($url, true);
logger('add_page_info: fetch page info for '.$url.' '.print_r($data, true), LOGGER_DEBUG);
if (!$keywords AND isset($data["keywords"]))
unset($data["keywords"]);
$text = add_page_info_data($data);
return($text);
}
function add_page_info_to_body($body, $texturl = false, $no_photos = false) { function add_page_info_to_body($body, $texturl = false, $no_photos = false) {
logger('add_page_info_to_body: fetch page info for body '.$body, LOGGER_DEBUG); logger('add_page_info_to_body: fetch page info for body '.$body, LOGGER_DEBUG);

9
mod/parse_url.php
View File

@ -333,6 +333,8 @@ function parseurl_getsiteinfo($url, $no_guessing = false, $do_oembed = true, $co
logger("parseurl_getsiteinfo: Siteinfo for ".$url." ".print_r($siteinfo, true), LOGGER_DEBUG); logger("parseurl_getsiteinfo: Siteinfo for ".$url." ".print_r($siteinfo, true), LOGGER_DEBUG);
call_hooks('getsiteinfo', $siteinfo);
return($siteinfo); return($siteinfo);
} }
@ -410,6 +412,13 @@ function parse_url_content(&$a) {
$siteinfo = parseurl_getsiteinfo($url); $siteinfo = parseurl_getsiteinfo($url);
// if ($textmode) {
// require_once("include/items.php");
//
// echo add_page_info_data($siteinfo);
// killme();
// }
$url= $siteinfo["url"]; $url= $siteinfo["url"];
$sitedata = ""; $sitedata = "";