Merge remote-tracking branch 'mike/master' into dev

10 files changed, 54 insertions, 23 deletions

diff --git a/Zotlabs/Lib/LDSignatures.php b/Zotlabs/Lib/LDSignatures.php
index 7d468782a..fa2758044 100644
--- a/Zotlabs/Lib/LDSignatures.php
+++ b/Zotlabs/Lib/LDSignatures.php
@@ -16,7 +16,8 @@ class LDSignatures {
 	}
 
 	static function dopplesign(&$data,$channel) {
-		$data['magicEnv'] = self::salmon_sign($data,$channel);
+	// remove for the time being - performance issues
+	//	$data['magicEnv'] = self::salmon_sign($data,$channel);
 		return self::sign($data,$channel);
 	}
 
diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php
index 78b54ebda..ffd5aec31 100644
--- a/Zotlabs/Lib/NativeWikiPage.php
+++ b/Zotlabs/Lib/NativeWikiPage.php
@@ -55,7 +55,12 @@ class NativeWikiPage {
 	}
 
 
-	static public function create_page($channel_id, $observer_hash, $name, $resource_id) {
+	static public function create_page($channel_id, $observer_hash, $name, $resource_id, $mimetype = 'text/bbcode') {
+
+		logger('mimetype: ' . $mimetype);
+
+		if(! in_array($mimetype,[ 'text/markdown','text/bbcode','text/plain','text/html' ]))
+			$mimetype = 'text/markdown';
 
 		$w = Zlib\NativeWiki::get_wiki($channel_id, $observer_hash, $resource_id);
 
@@ -68,6 +73,7 @@ class NativeWikiPage {
 		$arr = [];
 		$arr['uid']           = $channel_id;
 		$arr['author_xchan']  = $observer_hash;
+		$arr['mimetype']      = $mimetype;
 		$arr['resource_type'] = 'nwikipage';
 		$arr['resource_id']   = $resource_id;
 		$arr['allow_cid']     = $w['wiki']['allow_cid'];
@@ -167,10 +173,11 @@ class NativeWikiPage {
 			$content = $item['body'];
 
 			return [ 
-				'content' => $content,
-				'mimeType' => $w['mimeType'], 
-				'message' => '', 
-				'success' => true
+				'content'      => $content,
+				'mimeType'     => $w['mimeType'],
+				'pageMimeType' => $item['mimetype'], 
+				'message'      => '', 
+				'success'      => true
 			];
 		}
 	
@@ -333,7 +340,6 @@ class NativeWikiPage {
 			return array('message' => t('Error reading wiki'), 'success' => false);
 		}
 
-		$mimetype = $w['mimeType'];
 	
 		// fetch the most recently saved revision. 
 
@@ -342,6 +348,8 @@ class NativeWikiPage {
 			return array('message' => t('Page not found'), 'success' => false);
 		}
 
+		$mimetype = $item['mimetype'];
+
 		// change just the fields we need to change to create a revision; 
 
 		unset($item['id']);
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
index 4dc11c683..df747a07a 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -259,7 +259,7 @@ class Wiki extends \Zotlabs\Web\Controller {
 					goaway(z_root() . '/' . argv(0) . '/' . argv(1) );
 				}
 
-				$mimeType = $p['mimeType'];
+				$mimeType = $p['pageMimeType'];
 
 				$sampleContent = (($mimeType == 'text/bbcode') ? '[h3]' . t('New page') . '[/h3]' : '### ' . t('New page'));
 
@@ -323,7 +323,7 @@ class Wiki extends \Zotlabs\Web\Controller {
 			'$modalerroralbum' => t('Error getting album'),
 		));
 
-		if($p['mimeType'] != 'text/bbcode')
+		if($p['pageMimeType'] != 'text/bbcode')
 			head_add_js('/library/ace/ace.js');	// Ace Code Editor
 
 		return $o;
@@ -347,11 +347,12 @@ class Wiki extends \Zotlabs\Web\Controller {
 		if((argc() > 2) && (argv(2) === 'preview')) {
 			$content = $_POST['content'];
 			$resource_id = $_POST['resource_id'];
+
 			$w = Zlib\NativeWiki::get_wiki($owner['channel_id'],$observer_hash,$resource_id);
 
 			$wikiURL = argv(0) . '/' . argv(1) . '/' . $w['urlName'];
 
-			$mimeType = $w['mimeType'];
+			$mimeType = $_POST['mimetype'];
 
 			if($mimeType == 'text/bbcode') {
 				$html = Zlib\NativeWikiPage::convert_links(zidify_links(smilies(bbcode($content))),$wikiURL);
@@ -406,7 +407,7 @@ class Wiki extends \Zotlabs\Web\Controller {
 			$r = Zlib\NativeWiki::create_wiki($owner, $observer_hash, $wiki, $acl);
 			if($r['success']) {
 				Zlib\NativeWiki::sync_a_wiki_item($owner['channel_id'],$r['item_id'],$r['item']['resource_id']);
-				$homePage = Zlib\NativeWikiPage::create_page($owner['channel_id'],$observer_hash,'Home', $r['item']['resource_id']);
+				$homePage = Zlib\NativeWikiPage::create_page($owner['channel_id'],$observer_hash,'Home', $r['item']['resource_id'], $wiki['mimeType']);
 				if(! $homePage['success']) {
 					notice( t('Wiki created, but error creating Home page.'));
 					goaway(z_root() . '/wiki/' . $nick . '/' . $wiki['urlName']);
@@ -445,11 +446,13 @@ class Wiki extends \Zotlabs\Web\Controller {
 		// Create a page
 		if ((argc() === 4) && (argv(2) === 'create') && (argv(3) === 'page')) {
 
+			$mimetype = $_POST['mimetype'];
+
 			$resource_id = $_POST['resource_id']; 
 			// Determine if observer has permission to create a page
+			
 
-
-			$perms = Zlib\NativeWiki::get_permissions($resource_id, intval($owner['channel_id']), $observer_hash);
+			$perms = Zlib\NativeWiki::get_permissions($resource_id, intval($owner['channel_id']), $observer_hash, $mimetype);
 			if(! $perms['write']) {
 				logger('Wiki write permission denied. ' . EOL);
 				json_return_and_die(array('success' => false));					
@@ -459,7 +462,7 @@ class Wiki extends \Zotlabs\Web\Controller {
 			if(urlencode(escape_tags($_POST['pageName'])) === '') {				
 				json_return_and_die(array('message' => 'Error creating page. Invalid name.', 'success' => false));
 			}
-			$page = Zlib\NativeWikiPage::create_page($owner['channel_id'],$observer_hash, $name, $resource_id);
+			$page = Zlib\NativeWikiPage::create_page($owner['channel_id'],$observer_hash, $name, $resource_id, $mimetype);
 
 			if($page['item_id']) {
 				$commit = Zlib\NativeWikiPage::commit(array(
diff --git a/Zotlabs/Widget/Wiki_pages.php b/Zotlabs/Widget/Wiki_pages.php
index 7285e2b42..ac6549ffd 100644
--- a/Zotlabs/Widget/Wiki_pages.php
+++ b/Zotlabs/Widget/Wiki_pages.php
@@ -50,6 +50,7 @@ class Wiki_pages {
 				'$canadd' => $can_create,
 				'$candel' => $can_delete,
 				'$addnew' => t('Add new page'),
+				'$mimetype' => mimetype_select(0,$p['mimeType'], [ 'text/markdown','text/bbcode' ]),
 				'$pageName' => array('pageName', t('Page name')),
 				'$refresh' => $arr['refresh']
 		));
diff --git a/boot.php b/boot.php
index ad2e82c9d..d80a3b731 100755
--- a/boot.php
+++ b/boot.php
@@ -52,7 +52,7 @@ define ( 'PLATFORM_NAME',           'hubzilla' );
 define ( 'STD_VERSION',             '2.7.2' );
 define ( 'ZOT_REVISION',            '1.3' );
 
-define ( 'DB_UPDATE_VERSION',       1194  );
+define ( 'DB_UPDATE_VERSION',       1195  );
 
 define ( 'PROJECT_BASE',   __DIR__ );
 
diff --git a/include/network.php b/include/network.php
index 96cea4b6f..da1afc3ac 100644
--- a/include/network.php
+++ b/include/network.php
@@ -411,7 +411,7 @@ function http_status($val, $msg = '') {
 	if ($val >= 200 && $val < 300)
 		$msg = (($msg) ? $msg : 'OK');
 
-	logger('' . $val . ' ' . $msg);
+	logger(\App::$query_string . ':' . $val . ' ' . $msg);
 	header($_SERVER['SERVER_PROTOCOL'] . ' ' . $val . ' ' . $msg);
 }
 
diff --git a/include/text.php b/include/text.php
index 51d711021..c4d441e85 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1786,15 +1786,15 @@ function layout_select($channel_id, $current = '') {
 }
 
 
-function mimetype_select($channel_id, $current = 'text/bbcode') {
+function mimetype_select($channel_id, $current = 'text/bbcode', $choices = null, $element = 'mimetype') {
 
-	$x = array(
+	$x = (($choices) ? $choices : [
 		'text/bbcode',
 		'text/html',
 		'text/markdown',
 		'text/plain',
 		'application/x-pdl'
-	);
+	]);
 
 
 	if((App::$is_sys) || (channel_codeallowed($channel_id) && $channel_id == local_channel())){
@@ -1807,7 +1807,7 @@ function mimetype_select($channel_id, $current = 'text/bbcode') {
 	}
 
 	$o = replace_macros(get_markup_template('field_select_raw.tpl'), array(
-		'$field'	=> array('mimetype', t('Page content type'), $selected, '', $options)
+		'$field'	=> array( $element, t('Page content type'), $selected, '', $options)
 	));
 
 	return $o;
diff --git a/install/update.php b/install/update.php
index ce9a50913..8c9f83033 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1194 );
+define( 'UPDATE_VERSION' , 1195 );
 
 /**
  *
@@ -2992,3 +2992,19 @@ function update_r1193() {
 		return UPDATE_SUCCESS;
 	return UPDATE_FAILED;
 }
+
+
+function update_r1194() {
+	$r = q("select id, resource_id from item where resource_type = 'nwiki'"); 
+	if($r) {
+		foreach($r as $rv) {
+			$mimetype = get_iconfig($rv['id'],'wiki','mimeType');
+			q("update item set mimetype = '%s' where resource_type = 'nwikipage' and resource_id = '%s'",
+				dbesc($mimetype),
+				dbesc($rv['resource_id'])
+			);
+		}
+	}
+
+	return UPDATE_SUCCESS;
+}
\ No newline at end of file
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 7cd3708b8..681269002 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -183,7 +183,8 @@
 			{{else}}
 			content: editor.val(),
 			{{/if}}
-			resource_id: window.wiki_resource_id
+			resource_id: window.wiki_resource_id,
+			mimetype: '{{$mimeType}}'
 		},
 		function (data) {
 		if (data.success) {
diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl
index 6d09fcd5d..2e7fb8b9e 100644
--- a/view/tpl/wiki_page_list.tpl
+++ b/view/tpl/wiki_page_list.tpl
@@ -21,6 +21,7 @@
 	<div id="new-page-form-wrapper" class="sub-menu" style="display:none;">
 		<form id="new-page-form" action="wiki/{{$channel_address}}/create/page" method="post" >
 			<input type="hidden" name="resource_id" value="{{$resource_id}}">
+			{{$mimetype}}
 			{{include file="field_input.tpl" field=$pageName}}
 			<button id="new-page-submit" class="btn btn-primary" type="submit" name="submit" >Submit</button>
 		</form>
@@ -33,7 +34,7 @@
 {{if $canadd}}
 <script>
 	$('#new-page-submit').click(function (ev) {
-		$.post("wiki/{{$channel_address}}/create/page", {pageName: $('#id_pageName').val(), resource_id: window.wiki_resource_id},
+		$.post("wiki/{{$channel_address}}/create/page", {pageName: $('#id_pageName').val(), resource_id: window.wiki_resource_id, mimetype: $('#id_mimetype').val() },
 		function(data) {
 			if(data.success) {
 				window.location = data.url;