X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Feditpost.php;h=57c9339047707e2c95ce4889d30c8f201f82e170;hb=2196a0577b29dcec1ba4d2c32be10fa5f0e91034;hp=a655801d7727ec11b60837fd3e2fbb4fcc76bc13;hpb=42c2e09382d3b2846a0cb709d88cda97e717424f;p=friendica.git

diff --git a/mod/editpost.php b/mod/editpost.php
index a655801d77..57c9339047 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -1,8 +1,13 @@
 <?php
 
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+
 require_once('include/acl_selectors.php');
 
-function editpost_content(App &$a) {
+function editpost_content(App $a) {
 
 	$o = '';
 
@@ -23,27 +28,18 @@ function editpost_content(App &$a) {
 		intval(local_user())
 	);
 
-	if (! dbm::is_result($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' => App::get_baseurl(),
-		'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
+		'$baseurl' => System::baseUrl(),
 		'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
 		'$geotag' => $geotag,
 		'$nickname' => $a->user['nickname']
@@ -51,8 +47,7 @@ function editpost_content(App &$a) {
 
 	$tpl = get_markup_template('jot-end.tpl');
 	$a->page['end'] .= replace_macros($tpl, array(
-		'$baseurl' => App::get_baseurl(),
-		'$editselect' =>  (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
+		'$baseurl' => System::baseUrl(),
 		'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
 		'$geotag' => $geotag,
 		'$nickname' => $a->user['nickname']
@@ -69,7 +64,7 @@ function editpost_content(App &$a) {
 	$jotplugins = '';
 	$jotnets = '';
 
-	$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+	$mail_disabled = ((function_exists('imap_open') && (! Config::get('system','imap_disabled'))) ? 0 : 1);
 
 	$mail_enabled = false;
 	$pubmail_enabled = false;
@@ -78,7 +73,7 @@ function editpost_content(App &$a) {
 		$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
 			intval(local_user())
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$mail_enabled = true;
 			if(intval($r[0]['pubmail']))
 				$pubmail_enabled = true;
@@ -126,7 +121,7 @@ function editpost_content(App &$a) {
 		'$ptyp' => $itm[0]['type'],
 		'$content' => undo_post_tagging($itm[0]['body']),
 		'$post_id' => $post_id,
-		'$baseurl' => App::get_baseurl(),
+		'$baseurl' => System::baseUrl(),
 		'$defloc' => $a->user['default-location'],
 		'$visitor' => 'none',
 		'$pvisit' => 'none',