X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Feditpost.php;h=b039341023c7e00140e23d295f32af321087797d;hb=d80888842926eba272ae0e86d7666daeef201dc3;hp=1dc6aea21e054a3af159ebbda149cab5414a7538;hpb=f076d7f0dc3619604872c48f41f66e3fa4c4af79;p=friendica.git

diff --git a/mod/editpost.php b/mod/editpost.php
index 1dc6aea21e..b039341023 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once('acl_selectors.php');
+require_once('include/acl_selectors.php');
 
 function editpost_content(&$a) {
 
@@ -28,17 +28,22 @@ function editpost_content(&$a) {
 		return;
 	}
 
-	$plaintext = false;
-	if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
-		$plaintext = true;
+/*	$plaintext = false;
+	if( local_user() && intval(get_pconfig(local_user(),'system','plaintext')) || !feature_enabled(local_user(),'richtext') )
+		$plaintext = true;*/
+	$plaintext = true;
+	if( local_user() && feature_enabled(local_user(),'richtext') )
+		$plaintext = false;
 
 
-	$o .= '<h2>' . t('Edit post') . '</h2>';
+	$o .= replace_macros(get_markup_template("section_title.tpl"),array(
+		'$title' => t('Edit post')
+	));
 
 	$tpl = get_markup_template('jot-header.tpl');
 	$a->page['htmlhead'] .= replace_macros($tpl, array(
 		'$baseurl' => $a->get_baseurl(),
-		'$editselect' =>  (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
+		'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
 		'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
 		'$geotag' => $geotag,
 		'$nickname' => $a->user['nickname']
@@ -61,8 +66,6 @@ function editpost_content(&$a) {
 	else
 		$lockstate = 'unlock';
 
-	$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
-
 	$jotplugins = '';
 	$jotnets = '';
 
@@ -82,16 +85,19 @@ function editpost_content(&$a) {
 		}
 	}
 
-	if($mail_enabled) {
+	// I don't think there's any need for the $jotnets when editing the post,
+	// and including them makes it difficult for the JS-free theme, so let's
+	// disable them
+/*	if($mail_enabled) {
        $selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
 		$jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> '
           	. t("Post to Email") . '</div>';
-	}
+	}*/
 					
 
 
 	call_hooks('jot_tool', $jotplugins);
-	call_hooks('jot_networks', $jotnets);
+	//call_hooks('jot_networks', $jotnets);
 
 	
 	//$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));	
@@ -100,7 +106,7 @@ function editpost_content(&$a) {
 	$o .= replace_macros($tpl,array(
 		'$return_path' => $_SESSION['return_url'],
 		'$action' => 'item',
-		'$share' => t('Edit'),
+		'$share' => t('Save'),
 		'$upload' => t('Upload photo'),
 		'$shortupload' => t('upload photo'),
 		'$attach' => t('Attach file'),
@@ -127,13 +133,13 @@ function editpost_content(&$a) {
 		'$emailcc' => t('CC: email addresses'),
 		'$public' => t('Public post'),
 		'$jotnets' => $jotnets,
-		'$title' => $itm[0]['title'],
+		'$title' => htmlspecialchars($itm[0]['title']),
 		'$placeholdertitle' => t('Set title'),
 		'$category' => file_tag_file_to_list($itm[0]['file'], 'category'),
-		'$placeholdercategory' => t('Categories (comma-separated list)'),
+		'$placeholdercategory' => (feature_enabled(local_user(),'categories') ? 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),
+		'$acl' => '', // populate_acl((($group) ? $group_acl : $a->user)),
 		'$bang' => (($group) ? '!' : ''),
 		'$profile_uid' => $_SESSION['uid'],
 		'$preview' => t('Preview'),