Replaced all preg calls in the calls with the new function

[friendica.git] / mod / editpost.php

diff --git a/mod/editpost.php b/mod/editpost.php
index b518588a591a46042cef3b7978295a42d9f58227..690cb2ac0d0947d40da1e0a5b9c6994b8f0653d8 100644 (file)
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -2,16 +2,16 @@
 /**
  * @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\Database\DBA;
+use Friendica\Model\Contact;
 use Friendica\Model\FileTag;
 use Friendica\Model\Item;
-use Friendica\Database\DBA;
 use Friendica\Util\Crypto;
 
 function editpost_content(App $a)
@@ -48,14 +48,11 @@ function editpost_content(App $a)
 
        $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 = Renderer::getMarkupTemplate("jot.tpl");
-
        if (strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) {
                $lockstate = 'lock';
        } else {
@@ -65,28 +62,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'],
@@ -112,14 +90,13 @@ function editpost_content(App $a)
                '$posttype' => $item['post-type'],
                '$content' => undo_post_tagging($item['body']),
                '$post_id' => $post_id,
-               '$baseurl' => System::baseUrl(),
                '$defloc' => $a->user['default-location'],
                '$visitor' => 'none',
                '$pvisit' => 'none',
                '$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") : ''),
@@ -142,3 +119,18 @@ function editpost_content(App $a)
 
        return $o;
 }
+
+function undo_post_tagging($s) {
+       $matches = null;
+       $cnt = preg_match_all('/([!#@])\[url=(.*?)\](.*?)\[\/url\]/ism', $s, $matches, PREG_SET_ORDER);
+       if ($cnt) {
+               foreach ($matches as $mtch) {
+                       if (in_array($mtch[1], ['!', '@'])) {
+                               $contact = Contact::getDetailsByURL($mtch[2]);
+                               $mtch[3] = empty($contact['addr']) ? $mtch[2] : $contact['addr'];
+                       }
+                       $s = str_replace($mtch[0], $mtch[1] . $mtch[3],$s);
+               }
+       }
+       return $s;
+}