diff options
| -rw-r--r-- | Zotlabs/Lib/NativeWikiPage.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 7 | ||||
| -rw-r--r-- | include/widgets.php | 39 | ||||
| -rw-r--r-- | view/tpl/wikilist.tpl | 2 |
4 files changed, 17 insertions, 33 deletions
diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php index aa9365993..aa1510da8 100644 --- a/Zotlabs/Lib/NativeWikiPage.php +++ b/Zotlabs/Lib/NativeWikiPage.php @@ -541,7 +541,7 @@ class NativeWikiPage { $s = str_replace(array('[baseurl]', '[sitename]'), array(z_root(), get_config('system', 'sitename')), $s); - $observer = App::get_observer(); + $observer = \App::get_observer(); if ($observer) { $s1 = '<span class="bb_observer" title="' . t('Different viewers will see this text differently') . '">'; $s2 = '</span>'; diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 60a1fb665..9adcc91b0 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -39,7 +39,6 @@ class Wiki extends \Zotlabs\Web\Controller { return; } - require_once('include/wiki.php'); require_once('include/acl_selectors.php'); require_once('include/conversation.php'); require_once('include/bbcode.php'); @@ -239,8 +238,8 @@ class Wiki extends \Zotlabs\Web\Controller { } else { require_once('library/markdown.php'); - $html = wiki_generate_toc(zidify_text(purify_html(Markdown(wiki_bbcode(json_decode($content)))))); - $renderedContent = wiki_convert_links($html, argv(0) . '/' . argv(1) . '/' . $wikiUrlName); + $html = Zlib\NativeWikiPage::generate_toc(zidify_text(purify_html(Markdown(Zlib\NativeWikiPage::bbcode(json_decode($content)))))); + $renderedContent = Zlib\NativeWikiPage::convert_links($html, argv(0) . '/' . argv(1) . '/' . $wikiUrlName); } $showPageControls = $wiki_editor; break; @@ -296,7 +295,7 @@ class Wiki extends \Zotlabs\Web\Controller { } function post() { - require_once('include/wiki.php'); + require_once('include/bbcode.php'); $nick = argv(1); diff --git a/include/widgets.php b/include/widgets.php index ecbefff76..799310908 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -901,13 +901,10 @@ function widget_chatroom_members() { } function widget_wiki_list($arr) { - require_once("include/wiki.php"); + $channel = channelx_by_n(App::$profile_uid); - if(defined('NATIVE_WIKI')) - $wikis = Zotlabs\Lib\NativeWiki::listwikis($channel,get_observer_hash()); - else - $wikis = wiki_list($channel, get_observer_hash()); + $wikis = Zotlabs\Lib\NativeWiki::listwikis($channel,get_observer_hash()); if($wikis) { return replace_macros(get_markup_template('wikilist_widget.tpl'), array( @@ -921,7 +918,6 @@ function widget_wiki_list($arr) { function widget_wiki_pages($arr) { - require_once("include/wiki.php"); $channelname = ((array_key_exists('channel',$arr)) ? $arr['channel'] : ''); $c = channelx_by_nick($channelname); @@ -935,10 +931,7 @@ function widget_wiki_pages($arr) { if (! array_key_exists('resource_id', $arr)) { $hide = true; } else { - if(defined('NATIVE_WIKI')) - $p = Zotlabs\Lib\NativeWikiPage::page_list($c['channel_id'],get_observer_hash(),$arr['resource_id']); - else - $p = wiki_page_list($arr['resource_id']); + $p = Zotlabs\Lib\NativeWikiPage::page_list($c['channel_id'],get_observer_hash(),$arr['resource_id']); if($p['pages']) { $pages = $p['pages']; @@ -967,26 +960,18 @@ function widget_wiki_pages($arr) { } function widget_wiki_page_history($arr) { - require_once("include/wiki.php"); + $pageUrlName = ((array_key_exists('pageUrlName', $arr)) ? $arr['pageUrlName'] : ''); $resource_id = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : ''); - if(defined('NATIVE_WIKI')) { - $pageHistory = Zotlabs\Lib\NativeWikiPage::page_history(array('channel_id' => App::$profile_uid, 'observer_hash' => get_observer_hash(), 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName)); - return replace_macros(get_markup_template('nwiki_page_history.tpl'), array( - '$pageHistory' => $pageHistory['history'], - '$permsWrite' => $arr['permsWrite'], - '$name_lbl' => t('Name'), - '$msg_label' => t('Message','wiki_history') - )); - } - else { - $pageHistory = wiki_page_history(array('resource_id' => $resource_id, 'pageUrlName' => $pageUrlName)); - return replace_macros(get_markup_template('wiki_page_history.tpl'), array( - '$pageHistory' => $pageHistory['history'], - '$permsWrite' => $arr['permsWrite'] - )); - } + $pageHistory = Zotlabs\Lib\NativeWikiPage::page_history(array('channel_id' => App::$profile_uid, 'observer_hash' => get_observer_hash(), 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName)); + return replace_macros(get_markup_template('nwiki_page_history.tpl'), array( + '$pageHistory' => $pageHistory['history'], + '$permsWrite' => $arr['permsWrite'], + '$name_lbl' => t('Name'), + '$msg_label' => t('Message','wiki_history') + )); + } function widget_bookmarkedchats($arr) { diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl index eeaf7cd7e..af566dc98 100644 --- a/view/tpl/wikilist.tpl +++ b/view/tpl/wikilist.tpl @@ -45,7 +45,7 @@ <ul id="panel-{{$wiki.id}}" class="lockview-panel dropdown-menu dropdown-menu-right"></ul> {{/if}} </td> - <td class="wiki-index-tool"><i class="fa fa-download fakelink" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;"></i></td> + <!-- td class="wiki-index-tool"><i class="fa fa-download fakelink" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;"></i></td --!> {{if $owner}} <td><i class="fa fa-trash-o drop-icons" onclick="wiki_delete_wiki('{{$wiki.title}}', '{{$wiki.resource_id}}'); return false;"></i></td> {{/if}} |