X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Feditpost.php;h=f3746317a14ba25e7cf70b9fd2aa8b2c0f925480;hb=e1d22ef5d4333cff860079c92fea92d82fe58fda;hp=9a80d0b2f4ba622badbaac42f617e973eeed926a;hpb=8a5fada863364c729decea75c7b6e1549a7b81ce;p=friendica.git

diff --git a/mod/editpost.php b/mod/editpost.php
index 9a80d0b2f4..f3746317a1 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -2,18 +2,18 @@
 
 require_once('include/acl_selectors.php');
 
-function editpost_content(&$a) {
+function editpost_content(App $a) {
 
 	$o = '';
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
 
 	$post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
-	if(! $post_id) {
+	if (! $post_id) {
 		notice( t('Item not found') . EOL);
 		return;
 	}
@@ -23,27 +23,18 @@ function editpost_content(&$a) {
 		intval(local_user())
 	);
 
-	if(! count($itm)) {
+	if (! dbm::is_result($itm)) {
 		notice( t('Item not found') . EOL);
 		return;
 	}
 
-/*	$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 .= 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)/'),
+		'$baseurl' => App::get_baseurl(),
 		'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
 		'$geotag' => $geotag,
 		'$nickname' => $a->user['nickname']
@@ -51,8 +42,7 @@ function editpost_content(&$a) {
 
 	$tpl = get_markup_template('jot-end.tpl');
 	$a->page['end'] .= replace_macros($tpl, array(
-		'$baseurl' => $a->get_baseurl(),
-		'$editselect' =>  (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
+		'$baseurl' => App::get_baseurl(),
 		'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
 		'$geotag' => $geotag,
 		'$nickname' => $a->user['nickname']
@@ -78,7 +68,7 @@ function editpost_content(&$a) {
 		$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
 			intval(local_user())
 		);
-		if(count($r)) {
+		if (dbm::is_result($r)) {
 			$mail_enabled = true;
 			if(intval($r[0]['pubmail']))
 				$pubmail_enabled = true;
@@ -126,7 +116,7 @@ function editpost_content(&$a) {
 		'$ptyp' => $itm[0]['type'],
 		'$content' => undo_post_tagging($itm[0]['body']),
 		'$post_id' => $post_id,
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => App::get_baseurl(),
 		'$defloc' => $a->user['default-location'],
 		'$visitor' => 'none',
 		'$pvisit' => 'none',
@@ -146,7 +136,12 @@ function editpost_content(&$a) {
 		'$jotplugins' => $jotplugins,
 		'$sourceapp' => t($a->sourcename),
 		'$cancel' => t('Cancel'),
-		'$rand_num' => random_digits(12)
+		'$rand_num' => random_digits(12),
+
+		//jot nav tab (used in some themes)
+		'$message' => t('Message'),
+		'$browser' => t('Browser'),
+		'$shortpermset' => t('permissions'),
 	));
 
 	return $o;