diff options
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Cal.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Chatsvc.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Directory.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Events.php | 6 | ||||
| -rw-r--r-- | Zotlabs/Module/Message.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Search.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 4 |
7 files changed, 11 insertions, 11 deletions
diff --git a/Zotlabs/Module/Cal.php b/Zotlabs/Module/Cal.php index 1279a51b1..b982d19a8 100644 --- a/Zotlabs/Module/Cal.php +++ b/Zotlabs/Module/Cal.php @@ -292,8 +292,8 @@ class Cal extends \Zotlabs\Web\Controller { $title = strip_tags(html_entity_decode($title,ENT_QUOTES,'UTF-8')); } $html = format_event_html($rr); - $rr['desc'] = bbcode($rr['desc']); - $rr['location'] = bbcode($rr['location']); + $rr['desc'] = zidify_links(smilies(bbcode($rr['desc']))); + $rr['location'] = zidify_links(smilies(bbcode($rr['location']))); $events[] = array( 'id'=>$rr['id'], 'hash' => $rr['event_hash'], diff --git a/Zotlabs/Module/Chatsvc.php b/Zotlabs/Module/Chatsvc.php index 6a28a7c4d..b24b15317 100644 --- a/Zotlabs/Module/Chatsvc.php +++ b/Zotlabs/Module/Chatsvc.php @@ -143,7 +143,7 @@ class Chatsvc extends \Zotlabs\Web\Controller { 'name' => $rr['xchan_name'], 'isotime' => datetime_convert('UTC', date_default_timezone_get(), $rr['created'], 'c'), 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $rr['created'], 'r'), - 'text' => smilies(bbcode($rr['chat_text'])), + 'text' => zidify_links(smilies(bbcode($rr['chat_text']))), 'self' => ((get_observer_hash() == $rr['chat_xchan']) ? 'self' : '') ); } diff --git a/Zotlabs/Module/Directory.php b/Zotlabs/Module/Directory.php index da9bb146f..76f1937a2 100644 --- a/Zotlabs/Module/Directory.php +++ b/Zotlabs/Module/Directory.php @@ -262,7 +262,7 @@ class Directory extends \Zotlabs\Web\Controller { $hometown = ((x($profile,'hometown') == 1) ? $profile['hometown'] : False); - $about = ((x($profile,'about') == 1) ? bbcode($profile['about']) : False); + $about = ((x($profile,'about') == 1) ? zidify_links(bbcode($profile['about'])) : False); $keywords = ((x($profile,'keywords')) ? $profile['keywords'] : ''); diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php index b8910b644..863bdf3cb 100644 --- a/Zotlabs/Module/Events.php +++ b/Zotlabs/Module/Events.php @@ -625,14 +625,14 @@ class Events extends \Zotlabs\Web\Controller { $drop = array(z_root().'/events/drop/'.$rr['event_hash'],t('Delete event'),'',''); - $title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8')); + $title = strip_tags(html_entity_decode(zidify_links(bbcode($rr['summary'])),ENT_QUOTES,'UTF-8')); if(! $title) { list($title, $_trash) = explode("<br",bbcode($rr['desc']),2); $title = strip_tags(html_entity_decode($title,ENT_QUOTES,'UTF-8')); } $html = format_event_html($rr); - $rr['desc'] = bbcode($rr['desc']); - $rr['location'] = bbcode($rr['location']); + $rr['desc'] = zidify_links(smilies(bbcode($rr['desc']))); + $rr['location'] = zidify_links(smilies(bbcode($rr['location']))); $events[] = array( 'id'=>$rr['id'], 'hash' => $rr['event_hash'], diff --git a/Zotlabs/Module/Message.php b/Zotlabs/Module/Message.php index ea2127a1d..7494f4bf4 100644 --- a/Zotlabs/Module/Message.php +++ b/Zotlabs/Module/Message.php @@ -79,7 +79,7 @@ class Message extends \Zotlabs\Web\Controller { 'to_photo' => $rr['to']['xchan_photo_s'], 'subject' => (($rr['seen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'), 'delete' => t('Delete conversation'), - 'body' => smilies(bbcode($rr['body'])), + 'body' => zidify_links(smilies(bbcode($rr['body']))), 'date' => datetime_convert('UTC',date_default_timezone_get(),$rr['created'], t('D, d M Y - g:i A')), 'seen' => $rr['seen'] ); diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php index b319b19d6..89eaa4ffa 100644 --- a/Zotlabs/Module/Search.php +++ b/Zotlabs/Module/Search.php @@ -211,7 +211,7 @@ class Search extends \Zotlabs\Web\Controller { $result = array(); require_once('include/conversation.php'); foreach($items as $item) { - $item['html'] = bbcode($item['body']); + $item['html'] = zidify_links(bbcode($item['body'])); $x = encode_item($item); $x['html'] = prepare_text($item['body'],$item['mimetype']); $result[] = $x; diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 7b0ec9d83..95f7c8704 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -215,7 +215,7 @@ class Wiki extends \Zotlabs\Web\Controller { $content = ($p['content'] !== '' ? $rawContent : '"# New page\n"'); // Render the Markdown-formatted page content in HTML if($mimeType == 'text/bbcode') { - $renderedContent = wiki_convert_links(bbcode($content),argv(0).'/'.argv(1).'/'.$wikiUrlName); + $renderedContent = wiki_convert_links(zidify_links(smilies(bbcode($content))),argv(0).'/'.argv(1).'/'.$wikiUrlName); } else { require_once('library/markdown.php'); @@ -299,7 +299,7 @@ class Wiki extends \Zotlabs\Web\Controller { $mimeType = $w['mimeType']; if($mimeType == 'text/bbcode') { - $html = wiki_convert_links(bbcode($content),$wikiURL); + $html = wiki_convert_links(zidify_links(smilies(bbcode($content))),$wikiURL); } else { require_once('library/markdown.php'); |