some work on making mod editpost use status_editor() - if you find anything related to jot broken please revert this commit

1 files changed, 28 insertions, 87 deletions

diff --git a/Zotlabs/Module/Editpost.php b/Zotlabs/Module/Editpost.php
index d8b971f6c..fd9912fe9 100644
--- a/Zotlabs/Module/Editpost.php
+++ b/Zotlabs/Module/Editpost.php
@@ -5,7 +5,7 @@ require_once('include/acl_selectors.php');
 require_once('include/crypto.php');
 require_once('include/items.php');
 require_once('include/taxonomy.php');
-
+require_once('include/conversation.php');
 
 class Editpost extends \Zotlabs\Web\Controller {
 
@@ -49,20 +49,7 @@ class Editpost extends \Zotlabs\Web\Controller {
 	//		$plaintext = false;
 	
 		$channel = \App::get_channel();
-	
-		\App::$page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
-			'$baseurl' => z_root(),
-			'$editselect' =>  (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
-			'$pretext' => '',
-			'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
-			'$geotag' => $geotag,
-			'$nickname' => $channel['channel_address'],
-			'$expireswhen' => t('Expires YYYY-MM-DD HH:MM'),
-			'$confirmdelete' => t('Delete item?'),
-			'$editor_autocomplete'=> true,
-			'$bbco_autocomplete'=> 'bbcode'
-		));
-	
+
 		if(intval($itm[0]['item_obscured'])) {
 			$key = get_config('system','prvkey');
 			if($itm[0]['title'])
@@ -71,18 +58,6 @@ class Editpost extends \Zotlabs\Web\Controller {
 				$itm[0]['body'] = crypto_unencapsulate(json_decode_plus($itm[0]['body']),$key);
 		}
 	
-		$tpl = get_markup_template("jot.tpl");
-			
-		$jotplugins = '';
-		$jotnets = '';
-	
-		call_hooks('jot_tool', $jotplugins);
-		call_hooks('jot_networks', $jotnets);
-	
-		//$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));	
-	
-		$voting = feature_enabled($owner_uid,'consensus_tools');	
-	
 		$category = '';
 		$catsenabled = ((feature_enabled($owner_uid,'categories')) ? 'categories' : '');
 	
@@ -106,66 +81,32 @@ class Editpost extends \Zotlabs\Web\Controller {
 				}
 			}
 		}
-	
-		$cipher = get_pconfig(\App::$profile['profile_uid'],'system','default_cipher');
-		if(! $cipher)
-			$cipher = 'aes256';
-	
-	
-		$editor = replace_macros($tpl,array(
-			'$return_path' => $_SESSION['return_url'],
-			'$action' => 'item',
-			'$share' => t('Edit'),
-			'$bold' => t('Bold'),
-			'$italic' => t('Italic'),
-			'$underline' => t('Underline'),
-			'$quote' => t('Quote'),
-			'$code' => t('Code'),
-			'$upload' => t('Upload photo'),
-			'$attach' => t('Attach file'),
-			'$weblink' => t('Insert web link'),
-			'$youtube' => t('Insert YouTube video'),
-			'$video' => t('Insert Vorbis [.ogg] video'),
-			'$audio' => t('Insert Vorbis [.ogg] audio'),
-			'$setloc' => t('Set your location'),
-			'$noloc' => t('Clear browser location'),
-			'$voting' => t('Toggle voting'),
-			'$feature_voting' => $voting,
-			'$consensus' => intval($itm[0]['item_consensus']),
-			'$wait' => t('Please wait'),
-			'$permset' => t('Permission settings'),
-			'$ptyp' => $itm[0]['obj_type'],
-			'$content' => undo_post_tagging($itm[0]['body']),
-			'$post_id' => $post_id,
-			'$parent' => (($itm[0]['parent'] != $itm[0]['id']) ? $itm[0]['parent'] : ''),
-			'$baseurl' => z_root(),
-			'$defloc' => $channel['channel_location'],
-			'$visitor' => false,
-			'$public' => t('Public post'),
-			'$jotnets' => $jotnets,
-			'$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
-			'$placeholdertitle' => t('Title (optional)'),
-			'$category' => $category,
-			'$placeholdercategory' => t('Categories (optional, comma-separated list)'),
-			'$emtitle' => t('Example: bob@example.com, mary@example.com'),
-			'$lockstate' => $lockstate,
-			'$acl' => '', 
-			'$bang' => '',
-			'$profile_uid' => $owner_uid,
-			'$preview' => t('Preview'),
-			'$jotplugins' => $jotplugins,
-			'$sourceapp' => t(\App::$sourcename),
-			'$catsenabled' => $catsenabled,
-			'$defexpire' => datetime_convert('UTC', date_default_timezone_get(),$itm[0]['expires']),
-			'$feature_expire' => ((feature_enabled(\App::$profile['profile_uid'],'content_expire') && (! $webpage)) ? true : false),
-			'$expires' => t('Set expiration date'),
-			'$feature_encrypt' => ((feature_enabled(\App::$profile['profile_uid'],'content_encrypt') && (! $webpage)) ? true : false),
-			'$encrypt' => t('Encrypt text'),
-			'$cipher' => $cipher,
-			'$expiryModalOK' => t('OK'),
-			'$expiryModalCANCEL' => t('Cancel'),
-			'$bbcode' => true
-		));
+
+		$x = array(
+			'ispublic' => '&nbsp;',
+			'nickname' => $channel['channel_address'],
+			'editor_autocomplete'=> true,
+			'bbco_autocomplete'=> 'bbcode',
+			'return_path' => $_SESSION['return_url'],
+			'button' => t('Edit'),
+			'hide_voting' => true,
+			'hide_future' => true,
+			'hide_location' => true,
+			'ptyp' => $itm[0]['obj_type'],
+			'body' => undo_post_tagging($itm[0]['body']),
+			'post_id' => $post_id,
+			'defloc' => $channel['channel_location'],
+			'visitor' => true,
+			'title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
+			'category' => $category,
+			'showacl' => false,
+			'profile_uid' => $owner_uid,
+			'catsenabled' => $catsenabled,
+			'hide_expire' => true,
+			'bbcode' => true
+		);
+
+		$editor = status_editor($a, $x);
 	
 		$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
 			'$title' => t('Edit post'),