diff options
| author | git-marijus <mario@mariovavti.com> | 2016-11-28 13:44:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-28 13:44:41 +0100 |
| commit | 683a09781ad9c9be00ce67e35f560e6fca051f3b (patch) | |
| tree | bb4477d49f872b91913d77f8967ffea61f6bcead /include | |
| parent | d8774cda8ed0bec9dbbe8638fd7af5307d569805 (diff) | |
| parent | 5bcb373c00a500cd8120df41bc0788172fe7e347 (diff) | |
| download | volse-hubzilla-683a09781ad9c9be00ce67e35f560e6fca051f3b.tar.gz volse-hubzilla-683a09781ad9c9be00ce67e35f560e6fca051f3b.tar.bz2 volse-hubzilla-683a09781ad9c9be00ce67e35f560e6fca051f3b.zip | |
Merge pull request #602 from anaqreon/doco
Update context help content and context page element focus feature.
Diffstat (limited to 'include')
| -rw-r--r-- | include/bbcode.php | 42 | ||||
| -rw-r--r-- | include/help.php | 4 |
2 files changed, 44 insertions, 2 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 21bc6de77..1aabbc129 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -529,7 +529,49 @@ function bb_fixtable_lf($match) { } +function parseIdentityAwareHTML($Text) { + + // process [observer] tags before we do anything else because we might + // be stripping away stuff that then doesn't need to be worked on anymore + + $observer = App::get_observer(); + if ((strpos($Text,'[/observer]') !== false) || (strpos($Text,'[/rpost]') !== false)) { + if ($observer) { + $Text = preg_replace("/\[observer\=1\](.*?)\[\/observer\]/ism", '$1', $Text); + $Text = preg_replace("/\[observer\=0\].*?\[\/observer\]/ism", '', $Text); + $Text = preg_replace_callback("/\[rpost(=(.*?))?\](.*?)\[\/rpost\]/ism", 'rpost_callback', $Text); + } else { + $Text = preg_replace("/\[observer\=1\].*?\[\/observer\]/ism", '', $Text); + $Text = preg_replace("/\[observer\=0\](.*?)\[\/observer\]/ism", '$1', $Text); + $Text = preg_replace("/\[rpost(=.*?)?\](.*?)\[\/rpost\]/ism", '', $Text); + } + } + // replace [observer.baseurl] + if ($observer) { + $s1 = '<span class="bb_observer" title="' . t('Different viewers will see this text differently') . '">'; + $s2 = '</span>'; + $obsBaseURL = $observer['xchan_connurl']; + $obsBaseURL = preg_replace("/\/poco\/.*$/", '', $obsBaseURL); + $Text = str_replace('[observer.baseurl]', $obsBaseURL, $Text); + $Text = str_replace('[observer.url]',$observer['xchan_url'], $Text); + $Text = str_replace('[observer.name]',$s1 . $observer['xchan_name'] . $s2, $Text); + $Text = str_replace('[observer.address]',$s1 . $observer['xchan_addr'] . $s2, $Text); + $Text = str_replace('[observer.webname]', substr($observer['xchan_addr'],0,strpos($observer['xchan_addr'],'@')), $Text); + $Text = str_replace('[observer.photo]',$s1 . '[zmg]'.$observer['xchan_photo_l'].'[/zmg]' . $s2, $Text); + } else { + $Text = str_replace('[observer.baseurl]', '', $Text); + $Text = str_replace('[observer.url]','', $Text); + $Text = str_replace('[observer.name]','', $Text); + $Text = str_replace('[observer.address]','', $Text); + $Text = str_replace('[observer.webname]','',$Text); + $Text = str_replace('[observer.photo]','', $Text); + } + + $Text = str_replace(array('[baseurl]','[sitename]'),array(z_root(),get_config('system','sitename')),$Text); + + return $Text; +} // BBcode 2 HTML was written by WAY2WEB.net // extended to work with Mistpark/Friendica/Redmatrix/Hubzilla - Mike Macgirvin diff --git a/include/help.php b/include/help.php index f7fffc4d4..6efeeb57e 100644 --- a/include/help.php +++ b/include/help.php @@ -15,7 +15,7 @@ function get_help_content($tocpath = false) { $text = ''; $path = (($tocpath !== false) ? $tocpath : ''); - + if($tocpath === false && argc() > 1) { $path = ''; for($x = 1; $x < argc(); $x ++) { @@ -68,7 +68,7 @@ function get_help_content($tocpath = false) { } if($doctype === 'html') - $content = $text; + $content = parseIdentityAwareHTML($text); if($doctype === 'markdown') { require_once('library/markdown.php'); # escape #include tags |