harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix linkify_tags() so it works with xchans across multiple protocols, also some fixes to activity parsing from upstream.

Browse Source
This commit is contained in:
zotlabs
2019-02-03 16:53:49 -08:00
parent a56bc0e1e0
commit 8ff9a9ff08
11 changed files with 135 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Admin/Site.php
View File

@@ -119,7 +119,7 @@ class Site {
del_config('system', 'admininfo');
} else {
require_once('include/text.php');
linkify_tags($a, $admininfo, local_channel());
linkify_tags($admininfo, local_channel());
set_config('system', 'admininfo', $admininfo);
}
set_config('system','siteinfo',$siteinfo);

4
Zotlabs/Module/Events.php
View File

@@ -97,8 +97,8 @@ class Events extends \Zotlabs\Web\Controller {
$type = escape_tags(trim($_POST['type']));
require_once('include/text.php');
linkify_tags($a, $desc, local_channel());
linkify_tags($a, $location, local_channel());
linkify_tags($desc, local_channel());
linkify_tags($location, local_channel());
//$action = ($event_hash == '') ? 'new' : "event/" . $event_hash;

4
Zotlabs/Module/Item.php
View File

@@ -553,8 +553,8 @@ class Item extends Controller {
// Look for tags and linkify them
$results = linkify_tags($a, $summary, ($uid) ? $uid : $profile_uid);
$results = linkify_tags($a, $body, ($uid) ? $uid : $profile_uid);
$results = linkify_tags($summary, ($uid) ? $uid : $profile_uid);
$results = linkify_tags($body, ($uid) ? $uid : $profile_uid);
if($results) {

4
Zotlabs/Module/Mail.php
View File

@@ -34,7 +34,7 @@ class Mail extends \Zotlabs\Web\Controller {
}
else {
$body = cleanup_bbcode($body);
$results = linkify_tags($a, $body, local_channel());
$results = linkify_tags($body, local_channel());
if(preg_match_all('/(\[attachment\](.*?)\[\/attachment\])/',$body,$match)) {
$attachments = array();
@@ -111,7 +111,7 @@ class Mail extends \Zotlabs\Web\Controller {
}
require_once('include/text.php');
linkify_tags($a, $body, local_channel());
linkify_tags($body, local_channel());
if(! $recipient) {

2
Zotlabs/Module/Photos.php
View File

@@ -422,7 +422,7 @@ class Photos extends \Zotlabs\Web\Controller {
require_once('include/text.php');
$profile_uid = \App::$profile['profile_uid'];
$results = linkify_tags($a, $rawtags, (local_channel()) ? local_channel() : $profile_uid);
$results = linkify_tags($rawtags, (local_channel()) ? local_channel() : $profile_uid);
$success = $results['success'];
$post_tags = array();

28
Zotlabs/Module/Profiles.php
View File

@@ -354,20 +354,20 @@ class Profiles extends \Zotlabs\Web\Controller {
require_once('include/text.php');
linkify_tags($a, $likes, local_channel());
linkify_tags($a, $dislikes, local_channel());
linkify_tags($a, $about, local_channel());
linkify_tags($a, $interest, local_channel());
linkify_tags($a, $interest, local_channel());
linkify_tags($a, $contact, local_channel());
linkify_tags($a, $channels, local_channel());
linkify_tags($a, $music, local_channel());
linkify_tags($a, $book, local_channel());
linkify_tags($a, $tv, local_channel());
linkify_tags($a, $film, local_channel());
linkify_tags($a, $romance, local_channel());
linkify_tags($a, $work, local_channel());
linkify_tags($a, $education, local_channel());
linkify_tags($likes, local_channel());
linkify_tags($dislikes, local_channel());
linkify_tags($about, local_channel());
linkify_tags($interest, local_channel());
linkify_tags($interest, local_channel());
linkify_tags($contact, local_channel());
linkify_tags($channels, local_channel());
linkify_tags($music, local_channel());
linkify_tags($book, local_channel());
linkify_tags($tv, local_channel());
linkify_tags($film, local_channel());
linkify_tags($romance, local_channel());
linkify_tags($work, local_channel());
linkify_tags($education, local_channel());
$with = ((x($_POST,'with')) ? escape_tags(trim($_POST['with'])) : '');