keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add missing include/probe require for probe_url support

Browse source
This commit is contained in:
Hypolite Petovan 2017-05-07 17:08:32 -04:00
parent 92550861e9
commit 45ec3fb5d8
4 changed files with 10 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/NotificationsManager.php
View file

@ -5,6 +5,7 @@
* or for formatting notifications * or for formatting notifications
*/ */
require_once 'include/html2plain.php'; require_once 'include/html2plain.php';
require_once 'include/probe.php';
require_once 'include/datetime.php'; require_once 'include/datetime.php';
require_once 'include/bbcode.php'; require_once 'include/bbcode.php';

5
include/discover_poco.php
View file

@ -2,8 +2,9 @@
use Friendica\Core\Config; use Friendica\Core\Config;
require_once('include/socgraph.php'); require_once 'include/probe.php';
require_once('include/datetime.php'); require_once 'include/socgraph.php';
require_once 'include/datetime.php';
function discover_poco_run(&$argv, &$argc) { function discover_poco_run(&$argv, &$argc) {

68
include/event.php
View file

@ -83,74 +83,6 @@ function format_event_html($ev, $simple = false) {
return $o; return $o;
} }
/*
@TODO old-lost code found?
function parse_event($h) {
require_once 'include/probe.php';
require_once 'include/html2bbcode';
$h = '<html><body>' . $h . '</body></html>';
$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) { function format_event_bbcode($ev) {
$o = ''; $o = '';

11
mod/dirfind.php
View file

@ -2,11 +2,12 @@
use Friendica\App; use Friendica\App;
require_once('include/contact_widgets.php'); require_once 'include/contact_widgets.php';
require_once('include/socgraph.php'); require_once 'include/probe.php';
require_once('include/Contact.php'); require_once 'include/socgraph.php';
require_once('include/contact_selectors.php'); require_once 'include/Contact.php';
require_once('mod/contacts.php'); require_once 'include/contact_selectors.php';
require_once 'mod/contacts.php';
function dirfind_init(App $a) { function dirfind_init(App $a) {