resolve merge conflict

1 files changed, 36 insertions, 0 deletions

diff --git a/Zotlabs/Widget/Wiki_pages.php b/Zotlabs/Widget/Wiki_pages.php
index 39d4b1717..46f12f092 100644
--- a/Zotlabs/Widget/Wiki_pages.php
+++ b/Zotlabs/Widget/Wiki_pages.php
@@ -5,6 +5,42 @@ namespace Zotlabs\Widget;
 
 class Wiki_pages {
 
+	function create_missing_page($arr) {
+		if(argc() < 4)
+			return;
+
+		$c = channelx_by_nick(argv(1));
+		$w = \Zotlabs\Lib\NativeWiki::exists_by_name($c['channel_id'],urldecode(argv(2)));
+		$arr = array(
+			'resource_id' => $w['resource_id'],
+			'channel_id' => $c['channel_id'],
+			'channel_address' => $c['channel_address'],
+			'refresh' => false
+		);
+
+		$can_create = perm_is_allowed(\App::$profile['uid'],get_observer_hash(),'write_wiki');
+
+		$can_delete = ((local_channel() && (local_channel() == \App::$profile['uid'])) ? true : false);
+		$pageName = urlencode(escape_tags(urldecode(argv(3))));
+
+		return replace_macros(get_markup_template('wiki_page_not_found.tpl'), array(
+				'$resource_id' => $arr['resource_id'],
+				'$channel_address' => $arr['channel_address'],
+				'$wikiname' => $wikiname,
+				'$canadd' => $can_create,
+				'$candel' => $can_delete,
+				'$addnew' => t('Add new page'),
+				'$typelock' => $typelock,
+				'$lockedtype' => $w['mimeType'],
+				'$mimetype' => mimetype_select(0,$w['mimeType'], 
+					[ 'text/markdown' => t('Markdown'), 'text/bbcode' => t('BBcode'), 'text/plain' => t('Text') ]),
+				'$pageName' => array('missingPageName', 'Create Page' , $pageName),
+				'$refresh' => $arr['refresh'],
+				'$options' => t('Options'),
+				'$submit' => t('Submit')
+		));
+	}
+
 	function widget($arr) {
 
 		if(argc() < 3)