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 d6493b3c0c1a8aa34f4d9c547ca1688fe3ca8759..690cb2ac0d0947d40da1e0a5b9c6994b8f0653d8 100644 (file)
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -2,14 +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\System;
-use Friendica\Model\Item;
+use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
+use Friendica\Model\Contact;
+use Friendica\Model\FileTag;
+use Friendica\Model\Item;
+use Friendica\Util\Crypto;
 
 function editpost_content(App $a)
 {
@@ -21,20 +24,14 @@ function editpost_content(App $a)
        }
 
        $post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
-       $return_url = (($a->argc > 2) ? base64_decode($a->argv[2]) : '');
 
        if (!$post_id) {
                notice(L10n::t('Item not found') . EOL);
                return;
        }
 
-       // Fallback to SESSION return_path
-       if (empty($return_url)) {
-               $return_url = $_SESSION['return_url'];
-       }
-
        $fields = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
-               'type', 'body', 'title', 'file', 'wall', 'post-type'];
+               'type', 'body', 'title', 'file', 'wall', 'post-type', 'guid'];
 
        $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $post_id, 'uid' => local_user()]);
 
@@ -45,20 +42,17 @@ 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, [
-               '$baseurl' => System::baseUrl(),
+       $tpl = Renderer::getMarkupTemplate('jot-header.tpl');
+       $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
                '$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 {
@@ -68,31 +62,12 @@ 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())
-               );
+       Hook::callAll('jot_tool', $jotplugins);
 
-               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);
-
-       $o .= replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate("jot.tpl");
+       $o .= Renderer::replaceMacros($tpl, [
                '$is_edit' => true,
-               '$return_path' => $return_url,
+               '$return_path' => '/display/' . $item['guid'],
                '$action' => 'item',
                '$share' => L10n::t('Save'),
                '$upload' => L10n::t('Upload photo'),
@@ -115,16 +90,15 @@ 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' => file_tag_file_to_list($item['file'], 'category'),
+               '$category' => FileTag::fileToList($item['file'], 'category'),
                '$placeholdercategory' => (Feature::isEnabled(local_user(),'categories') ? L10n::t("Categories \x28comma-separated list\x29") : ''),
                '$emtitle' => L10n::t('Example: bob@example.com, mary@example.com'),
                '$lockstate' => $lockstate,
@@ -135,7 +109,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'),
@@ -145,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;
+}