[frio] Improve admin/users/* page display

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index 911a9530c9b72eb61a35b67777c3c33bf55c3787..9828d1acb28d40984bcb2eaa97d27e50f7c901bf 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -35,7 +35,6 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
-use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
@@ -48,14 +47,14 @@ use Friendica\Model\FileTag;
 use Friendica\Model\Item;
 use Friendica\Model\Notify\Type;
 use Friendica\Model\Photo;
+use Friendica\Model\Post;
 use Friendica\Model\Tag;
 use Friendica\Network\HTTPException;
 use Friendica\Object\EMail\ItemCCEMail;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\Diaspora;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Security;
-use Friendica\Util\Strings;
+use Friendica\Security\Security;
 use Friendica\Worker\Delivery;
 
 function item_post(App $a) {
@@ -260,7 +259,7 @@ function item_post(App $a) {
                $objecttype        = $orig_post['object-type'];
                $app               = $orig_post['app'];
                $categories        = $orig_post['file'] ?? '';
-               $title             = Strings::escapeTags(trim($_REQUEST['title']));
+               $title             = trim($_REQUEST['title'] ?? '');
                $body              = trim($body);
                $private           = $orig_post['private'];
                $pubmail_enabled   = $orig_post['pubmail'];
@@ -281,13 +280,13 @@ function item_post(App $a) {
                        $str_group_deny    = isset($_REQUEST['group_deny'])    ? $aclFormatter->toString($_REQUEST['group_deny'])    : $user['deny_gid']  ?? '';
                }
 
-               $title             = Strings::escapeTags(trim($_REQUEST['title']    ?? ''));
-               $location          = Strings::escapeTags(trim($_REQUEST['location'] ?? ''));
-               $coord             = Strings::escapeTags(trim($_REQUEST['coord']    ?? ''));
-               $verb              = Strings::escapeTags(trim($_REQUEST['verb']     ?? ''));
-               $emailcc           = Strings::escapeTags(trim($_REQUEST['emailcc']  ?? ''));
+               $title             = trim($_REQUEST['title']    ?? '');
+               $location          = trim($_REQUEST['location'] ?? '');
+               $coord             = trim($_REQUEST['coord']    ?? '');
+               $verb              = trim($_REQUEST['verb']     ?? '');
+               $emailcc           = trim($_REQUEST['emailcc']  ?? '');
                $body              = trim($body);
-               $network           = Strings::escapeTags(trim(($_REQUEST['network']  ?? '') ?: Protocol::DFRN));
+               $network           = trim(($_REQUEST['network']  ?? '') ?: Protocol::DFRN);
                $guid              = System::createUUID();
 
                $postopts = $_REQUEST['postopts'] ?? '';
@@ -532,9 +531,8 @@ function item_post(App $a) {
                                if (strlen($attachments)) {
                                        $attachments .= ',';
                                }
-                               $attachments .= '[attach]href="' . DI::baseUrl() . '/attach/' . $attachment['id'] .
-                                               '" length="' . $attachment['filesize'] . '" type="' . $attachment['filetype'] .
-                                               '" title="' . ($attachment['filename'] ? $attachment['filename'] : '') . '"[/attach]';
+                               $attachments .= Post\Media::getAttachElement(DI::baseUrl() . '/attach/' . $attachment['id'],
+                                       $attachment['filesize'], $attachment['filetype'], $attachment['filename'] ?? '');
                        }
                        $body = str_replace($match[1],'',$body);
                }
@@ -807,12 +805,6 @@ function item_post(App $a) {
                }
        }
 
-       // Insert an item entry for UID=0 for global entries.
-       // We now do it in the background to save some time.
-       // This is important in interactive environments like the frontend or the API.
-       // We don't fork a new process since this is done anyway with the following command
-       Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], "CreateShadowEntry", $post_id);
-
        // When we are doing some forum posting via ! we have to start the notifier manually.
        // These kind of posts don't initiate the notifier call in the item class.
        if ($only_to_forum) {