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

add bbcode language conditionals to wiki

Browse Source
This commit is contained in:
Hubzilla
2017-01-20 15:42:15 -08:00
parent 9acd3ebd42
commit bb233a9872
2 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Zotlabs/Lib/NativeWikiPage.php
View File

@@ -539,30 +539,36 @@ class NativeWikiPage {
*/ */
static public function bbcode($s) { static public function bbcode($s) {
$s = str_replace(array('[baseurl]', '[sitename]'), array(z_root(), get_config('system', 'sitename')), $s); $s = str_replace(array('[baseurl]', '[sitename]'), array(z_root(), get_config('system', 'sitename')), $s);
$observer = \App::get_observer(); $s = preg_replace_callback("/\[observer\.language\=(.*?)\](.*?)\[\/observer\]/ism",'oblanguage_callback', $s);
if ($observer) {
$s1 = '<span class="bb_observer" title="' . t('Different viewers will see this text differently') . '">'; $s = preg_replace_callback("/\[observer\.language\!\=(.*?)\](.*?)\[\/observer\]/ism",'oblanguage_necallback', $s);
$s2 = '</span>';
$obsBaseURL = $observer['xchan_connurl'];
$obsBaseURL = preg_replace("/\/poco\/.*$/", '', $obsBaseURL); $observer = \App::get_observer();
$s = str_replace('[observer.baseurl]', $obsBaseURL, $s); if ($observer) {
$s = str_replace('[observer.url]', $observer['xchan_url'], $s); $s1 = '<span class="bb_observer" title="' . t('Different viewers will see this text differently') . '">';
$s = str_replace('[observer.name]', $s1 . $observer['xchan_name'] . $s2, $s); $s2 = '</span>';
$s = str_replace('[observer.address]', $s1 . $observer['xchan_addr'] . $s2, $s); $obsBaseURL = $observer['xchan_connurl'];
$s = str_replace('[observer.webname]', substr($observer['xchan_addr'], 0, strpos($observer['xchan_addr'], '@')), $s); $obsBaseURL = preg_replace("/\/poco\/.*$/", '', $obsBaseURL);
$s = str_replace('[observer.photo]', '', $s); $s = str_replace('[observer.baseurl]', $obsBaseURL, $s);
} else { $s = str_replace('[observer.url]', $observer['xchan_url'], $s);
$s = str_replace('[observer.baseurl]', '', $s); $s = str_replace('[observer.name]', $s1 . $observer['xchan_name'] . $s2, $s);
$s = str_replace('[observer.url]', '', $s); $s = str_replace('[observer.address]', $s1 . $observer['xchan_addr'] . $s2, $s);
$s = str_replace('[observer.name]', '', $s); $s = str_replace('[observer.webname]', substr($observer['xchan_addr'], 0, strpos($observer['xchan_addr'], '@')), $s);
$s = str_replace('[observer.address]', '', $s); $s = str_replace('[observer.photo]', '', $s);
$s = str_replace('[observer.webname]', '', $s); }
$s = str_replace('[observer.photo]', '', $s); else {
} $s = str_replace('[observer.baseurl]', '', $s);
$s = str_replace('[observer.url]', '', $s);
$s = str_replace('[observer.name]', '', $s);
$s = str_replace('[observer.address]', '', $s);
$s = str_replace('[observer.webname]', '', $s);
$s = str_replace('[observer.photo]', '', $s);
}
return $s; return $s;
} }
static public function get_file_ext($arr) { static public function get_file_ext($arr) {

8
Zotlabs/Module/Wiki.php
View File

@@ -4,6 +4,11 @@ namespace Zotlabs\Module;
use \Zotlabs\Lib as Zlib; use \Zotlabs\Lib as Zlib;
require_once('include/acl_selectors.php');
require_once('include/conversation.php');
require_once('include/bbcode.php');
class Wiki extends \Zotlabs\Web\Controller { class Wiki extends \Zotlabs\Web\Controller {
private $wiki = null; private $wiki = null;
@@ -39,9 +44,6 @@ class Wiki extends \Zotlabs\Web\Controller {
return; return;
} }
require_once('include/acl_selectors.php');
require_once('include/conversation.php');
require_once('include/bbcode.php');
// TODO: Combine the interface configuration into a unified object // TODO: Combine the interface configuration into a unified object
// Something like $interface = array('new_page_button' => false, 'new_wiki_button' => false, ...) // Something like $interface = array('new_page_button' => false, 'new_wiki_button' => false, ...)