Merge pull request #6530 from Ixiter/develop-theme-frio

[friendica.git] / mod / editpost.php

diff --git a/mod/editpost.php b/mod/editpost.php
index 0023e35edd963dd069f0c934cff44512a0f183e9..c1c0d16d7fd712497476e6c7742a23624dac119d 100644 (file)
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -2,16 +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 Friendica\Model\FileTag;
 use Friendica\Model\Item;
 use Friendica\Database\DBA;
+use Friendica\Util\Crypto;
 
 function editpost_content(App $a)
 {
@@ -53,8 +54,6 @@ function editpost_content(App $a)
                '$nickname' => $a->user['nickname']
        ]);
 
-       $tpl = Renderer::getMarkupTemplate("jot.tpl");
-
        if (strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) {
                $lockstate = 'lock';
        } else {
@@ -64,28 +63,9 @@ 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);
 
+       $tpl = Renderer::getMarkupTemplate("jot.tpl");
        $o .= Renderer::replaceMacros($tpl, [
                '$is_edit' => true,
                '$return_path' => '/display/' . $item['guid'],
@@ -118,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") : ''),
@@ -131,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'),