X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Feditpost.php;h=4c00201ca89fcf804f108d19b4a871d7876a4eb7;hb=2cee9ec5c830098b5c57ae0c3d2a3d4e6697bce2;hp=fd84fc26d5a4ba24f9ba386315221524854f7741;hpb=b3fa03d3b4175b565ae7ed9106cb83c43801b558;p=friendica.git

diff --git a/mod/editpost.php b/mod/editpost.php
index fd84fc26d5..4c00201ca8 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -28,20 +28,25 @@ function editpost_content(&$a) {
 		return;
 	}
 
+	$plaintext = false;
+	if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
+		$plaintext = true;
+
 
 	$o .= '<h2>' . t('Edit post') . '</h2>';
 
-	$tpl = load_view_file('view/jot-header.tpl');
+	$tpl = get_markup_template('jot-header.tpl');
 	
 	$a->page['htmlhead'] .= replace_macros($tpl, array(
 		'$baseurl' => $a->get_baseurl(),
-		'$ispublic' => t('Visible to <strong>everybody</strong>'),
+		'$editselect' =>  (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
+		'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
 		'$geotag' => $geotag,
 		'$nickname' => $a->user['nickname']
 	));
 
 
-	$tpl = load_view_file("view/jot.tpl");
+	$tpl = get_markup_template("jot.tpl");
 		
 	if(($group) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid'])))))
 		$lockstate = 'lock';
@@ -71,7 +76,7 @@ function editpost_content(&$a) {
 
 	if($mail_enabled) {
        $selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
-		$jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . 'value="1" /> '
+		$jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> '
           	. t("Post to Email") . '</div>';
 	}
 					
@@ -80,13 +85,16 @@ function editpost_content(&$a) {
 	call_hooks('jot_tool', $jotplugins);
 	call_hooks('jot_networks', $jotnets);
 
-	$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));	
+	
+	//$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));	
+	
 
 	$o .= replace_macros($tpl,array(
 		'$return_path' => $_SESSION['return_url'],
 		'$action' => 'item',
 		'$share' => t('Edit'),
 		'$upload' => t('Upload photo'),
+		'$attach' => t('Attach file'),
 		'$weblink' => t('Insert web link'),
 		'$youtube' => t('Insert YouTube video'),
 		'$video' => t('Insert Vorbis [.ogg] video'),
@@ -95,21 +103,29 @@ function editpost_content(&$a) {
 		'$noloc' => t('Clear browser location'),
 		'$wait' => t('Please wait'),
 		'$permset' => t('Permission settings'),
-		'$content' => $itm[0]['body'],
+		'$ptyp' => $itm[0]['type'],
+		'$content' => undo_post_tagging($itm[0]['body']),
 		'$post_id' => $post_id,
 		'$baseurl' => $a->get_baseurl(),
 		'$defloc' => $a->user['default-location'],
 		'$visitor' => 'none',
+		'$pvisit' => 'none',
 		'$emailcc' => t('CC: email addresses'),
+		'$public' => t('Public post'),
 		'$jotnets' => $jotnets,
+		'$title' => $itm[0]['title'],
+		'$placeholdertitle' => t('Set title'),
+                '$category' => file_tag_file_to_list($itm[0]['file'], 'category'),
+                '$placeholdercategory' => t('Categories (comma-separated list)'),
 		'$emtitle' => t('Example: bob@example.com, mary@example.com'),
 		'$lockstate' => $lockstate,
 		'$acl' => '', // populate_acl((($group) ? $group_acl : $a->user), $celeb),
 		'$bang' => (($group) ? '!' : ''),
-		'$profile_uid' => $_SESSION['uid']
+		'$profile_uid' => $_SESSION['uid'],
+		'$preview' => t('Preview'),
+		'$jotplugins' => $jotplugins,
 	));
 
-
 	return $o;
 
 }