X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Feditpost.php;h=c1c0d16d7fd712497476e6c7742a23624dac119d;hb=41663c7592abe55a958632c3a48265e0a8544d2b;hp=83fcdca56627287114b38f44c2d49ba5078dad32;hpb=c6ce9ddaa41a59496cbe5cd93ace9bc552478ccd;p=friendica.git

diff --git a/mod/editpost.php b/mod/editpost.php
index 83fcdca566..c1c0d16d7f 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -2,15 +2,17 @@
 /**
  * @file mod/editpost.php
  */
+
 use Friendica\App;
 use Friendica\Content\Feature;
-use Friendica\Core\Addon;
-use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
-use Friendcia\Model\FileTag;
+use Friendica\Model\FileTag;
 use Friendica\Model\Item;
 use Friendica\Database\DBA;
+use Friendica\Util\Crypto;
 
 function editpost_content(App $a)
 {
@@ -40,20 +42,18 @@ function editpost_content(App $a)
 
 	$geotag = '';
 
-	$o .= replace_macros(get_markup_template("section_title.tpl"), [
+	$o .= Renderer::replaceMacros(Renderer::getMarkupTemplate("section_title.tpl"), [
 		'$title' => L10n::t('Edit post')
 	]);
 
-	$tpl = get_markup_template('jot-header.tpl');
-	$a->page['htmlhead'] .= replace_macros($tpl, [
+	$tpl = Renderer::getMarkupTemplate('jot-header.tpl');
+	$a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
 		'$baseurl' => System::baseUrl(),
 		'$ispublic' => '&nbsp;', // L10n::t('Visible to <strong>everybody</strong>'),
 		'$geotag' => $geotag,
 		'$nickname' => $a->user['nickname']
 	]);
 
-	$tpl = get_markup_template("jot.tpl");
-
 	if (strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) {
 		$lockstate = 'lock';
 	} else {
@@ -63,29 +63,10 @@ function editpost_content(App $a)
 	$jotplugins = '';
 	$jotnets = '';
 
-	$mail_disabled = ((function_exists('imap_open') && !Config::get('system', 'imap_disabled')) ? 0 : 1);
-
-	$mail_enabled = false;
-	$pubmail_enabled = false;
-
-	if (!$mail_disabled) {
-		$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
-			intval(local_user())
-		);
-
-		if (DBA::isResult($r)) {
-			$mail_enabled = true;
-
-			if (intval($r[0]['pubmail'])) {
-				$pubmail_enabled = true;
-			}
-		}
-	}
-
-	Addon::callHooks('jot_tool', $jotplugins);
-	//Addon::callHooks('jot_networks', $jotnets);
+	Hook::callAll('jot_tool', $jotplugins);
 
-	$o .= replace_macros($tpl, [
+	$tpl = Renderer::getMarkupTemplate("jot.tpl");
+	$o .= Renderer::replaceMacros($tpl, [
 		'$is_edit' => true,
 		'$return_path' => '/display/' . $item['guid'],
 		'$action' => 'item',
@@ -117,7 +98,7 @@ function editpost_content(App $a)
 		'$emailcc' => L10n::t('CC: email addresses'),
 		'$public' => L10n::t('Public post'),
 		'$jotnets' => $jotnets,
-		'$title' => htmlspecialchars($item['title']),
+		'$title' => $item['title'],
 		'$placeholdertitle' => L10n::t('Set title'),
 		'$category' => FileTag::fileToList($item['file'], 'category'),
 		'$placeholdercategory' => (Feature::isEnabled(local_user(),'categories') ? L10n::t("Categories \x28comma-separated list\x29") : ''),
@@ -130,7 +111,7 @@ function editpost_content(App $a)
 		'$jotplugins' => $jotplugins,
 		'$sourceapp' => L10n::t($a->sourcename),
 		'$cancel' => L10n::t('Cancel'),
-		'$rand_num' => random_digits(12),
+		'$rand_num' => Crypto::randomDigits(12),
 
 		//jot nav tab (used in some themes)
 		'$message' => L10n::t('Message'),