From 45ec3fb5d8d26c69733491394a298b37b3e93260 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 7 May 2017 17:08:32 -0400 Subject: [PATCH] Add missing include/probe require for probe_url support --- include/NotificationsManager.php | 1 + include/discover_poco.php | 5 ++- include/event.php | 68 -------------------------------- mod/dirfind.php | 11 +++--- 4 files changed, 10 insertions(+), 75 deletions(-) diff --git a/include/NotificationsManager.php b/include/NotificationsManager.php index add19a177c..7183393801 100644 --- a/include/NotificationsManager.php +++ b/include/NotificationsManager.php @@ -5,6 +5,7 @@ * or for formatting notifications */ require_once 'include/html2plain.php'; +require_once 'include/probe.php'; require_once 'include/datetime.php'; require_once 'include/bbcode.php'; diff --git a/include/discover_poco.php b/include/discover_poco.php index e371080d19..e71c26fc18 100644 --- a/include/discover_poco.php +++ b/include/discover_poco.php @@ -2,8 +2,9 @@ use Friendica\Core\Config; -require_once('include/socgraph.php'); -require_once('include/datetime.php'); +require_once 'include/probe.php'; +require_once 'include/socgraph.php'; +require_once 'include/datetime.php'; function discover_poco_run(&$argv, &$argc) { diff --git a/include/event.php b/include/event.php index 5ef8b010f3..089fe705db 100644 --- a/include/event.php +++ b/include/event.php @@ -83,74 +83,6 @@ function format_event_html($ev, $simple = false) { return $o; } -/* -@TODO old-lost code found? -function parse_event($h) { - - require_once 'include/probe.php'; - require_once 'include/html2bbcode'; - - $h = '' . $h . ''; - - $ret = array(); - - - try { - $dom = HTML5_Parser::parse($h); - } catch (DOMException $e) { - logger('parse_event: parse error: ' . $e); - } - - if (! $dom) - return $ret; - - $items = $dom->getElementsByTagName('*'); - - foreach ($items as $item) { - if (attribute_contains($item->getAttribute('class'), 'vevent')) { - $level2 = $item->getElementsByTagName('*'); - foreach ($level2 as $x) { - if (attribute_contains($x->getAttribute('class'),'dtstart') && $x->getAttribute('title')) { - $ret['start'] = $x->getAttribute('title'); - if (! strpos($ret['start'],'Z')) - $ret['adjust'] = true; - } - if (attribute_contains($x->getAttribute('class'),'dtend') && $x->getAttribute('title')) - $ret['finish'] = $x->getAttribute('title'); - - if (attribute_contains($x->getAttribute('class'),'description')) - $ret['desc'] = $x->textContent; - if (attribute_contains($x->getAttribute('class'),'location')) - $ret['location'] = $x->textContent; - } - } - } - - // sanitise - - if ((x($ret,'desc')) && ((strpos($ret['desc'],'<') !== false) || (strpos($ret['desc'],'>') !== false))) { - $config = HTMLPurifier_Config::createDefault(); - $config->set('Cache.DefinitionImpl', null); - $purifier = new HTMLPurifier($config); - $ret['desc'] = html2bbcode($purifier->purify($ret['desc'])); - } - - if ((x($ret,'location')) && ((strpos($ret['location'],'<') !== false) || (strpos($ret['location'],'>') !== false))) { - $config = HTMLPurifier_Config::createDefault(); - $config->set('Cache.DefinitionImpl', null); - $purifier = new HTMLPurifier($config); - $ret['location'] = html2bbcode($purifier->purify($ret['location'])); - } - - if (x($ret,'start')) - $ret['start'] = datetime_convert('UTC','UTC',$ret['start']); - if (x($ret,'finish')) - $ret['finish'] = datetime_convert('UTC','UTC',$ret['finish']); - - return $ret; -} -*/ - function format_event_bbcode($ev) { $o = ''; diff --git a/mod/dirfind.php b/mod/dirfind.php index c24ab9dbdb..a64a804ba8 100644 --- a/mod/dirfind.php +++ b/mod/dirfind.php @@ -2,11 +2,12 @@ use Friendica\App; -require_once('include/contact_widgets.php'); -require_once('include/socgraph.php'); -require_once('include/Contact.php'); -require_once('include/contact_selectors.php'); -require_once('mod/contacts.php'); +require_once 'include/contact_widgets.php'; +require_once 'include/probe.php'; +require_once 'include/socgraph.php'; +require_once 'include/Contact.php'; +require_once 'include/contact_selectors.php'; +require_once 'mod/contacts.php'; function dirfind_init(App $a) { -- 2.39.5