Docs: add a note on adding `use` on theme.php

[friendica.git] / mod / item.php
diff --git a/mod/item.php b/mod/item.php

index ccf98667c8793ee99cfc7208905cda10e32b57a0..1bbc08527953cc76cad4b2f680670ddb14317fc8 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -24,7 +24,6 @@ use Friendica\Core\System;
  use Friendica\Core\Worker;
  use Friendica\Database\DBM;
  use Friendica\Model\Contact;
-use Friendica\Model\GContact;
  use Friendica\Model\Item;
  use Friendica\Protocol\Diaspora;
  use Friendica\Protocol\Email;
@@ -32,8 +31,6 @@ use Friendica\Util\DateTimeFormat;
  use Friendica\Util\Emailer;
  
  require_once 'include/enotify.php';
-require_once 'include/tags.php';
-require_once 'include/threads.php';
  require_once 'include/text.php';
  require_once 'include/items.php';
  
@@ -232,7 +229,7 @@ function item_post(App $a) {
                 $verb              = notags(trim($_REQUEST['verb']));
                 $emailcc           = notags(trim($_REQUEST['emailcc']));
                 $body              = escape_tags(trim($_REQUEST['body']));
-               $network           = notags(trim($_REQUEST['network']));
+               $network           = notags(trim(defaults($_REQUEST, 'network', NETWORK_DFRN)));
                 $guid              = get_guid(32);
  
                 $postopts = defaults($_REQUEST, 'postopts', '');
@@ -596,11 +593,11 @@ function item_post(App $a) {
         $datarray['owner-name']    = $contact_record['name'];
         $datarray['owner-link']    = $contact_record['url'];
         $datarray['owner-avatar']  = $contact_record['thumb'];
-       $datarray['owner-id']      = Contact::getIdForURL($datarray['owner-link'], 0);
+       $datarray['owner-id']      = Contact::getIdForURL($datarray['owner-link']);
         $datarray['author-name']   = $author['name'];
         $datarray['author-link']   = $author['url'];
         $datarray['author-avatar'] = $author['thumb'];
-       $datarray['author-id']     = Contact::getIdForURL($datarray['author-link'], 0);
+       $datarray['author-id']     = Contact::getIdForURL($datarray['author-link']);
         $datarray['created']       = DateTimeFormat::utcNow();
         $datarray['edited']        = DateTimeFormat::utcNow();
         $datarray['commented']     = DateTimeFormat::utcNow();
@@ -634,8 +631,6 @@ function item_post(App $a) {
         $datarray['postopts']      = $postopts;
         $datarray['origin']        = $origin;
         $datarray['moderated']     = false;
-       $datarray['gcontact-id']   = GContact::getId(["url" => $datarray['author-link'], "network" => $datarray['network'],
-                                                       "photo" => $datarray['author-avatar'], "name" => $datarray['author-name']]);
         $datarray['object']        = $object;
  
         /*
@@ -813,7 +808,6 @@ function item_post(App $a) {
                                 $link = '<a href="' . System::baseUrl() . '/profile/' . $a->user['nickname'] . '"><img src="' . $author['thumb'] . '" alt="' . $a->user['username'] . '" /></a><br /><br />';
                                 $html    = prepare_body($datarray);
                                 $message = '<html><body>' . $link . $html . $disclaimer . '</body></html>';
-                               include_once 'include/html2plain.php';
                                 $params =  [
                                         'fromName' => $a->user['username'],
                                         'fromEmail' => $a->user['email'],
@@ -821,7 +815,7 @@ function item_post(App $a) {
                                         'replyTo' => $a->user['email'],
                                         'messageSubject' => $subject,
                                         'htmlVersion' => $message,
-                                       'textVersion' => html2plain($html.$disclaimer)
+                                       'textVersion' => Friendica\Content\Text\HTML::toPlaintext($html.$disclaimer)
                                 ];
                                 Emailer::send($params);
                         }
@@ -878,7 +872,7 @@ function item_content(App $a) {
         $o = '';
         if (($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) {
                 if (is_ajax()) {
-                       $o = Item::delete($a->argv[2]);
+                       $o = Item::deleteById($a->argv[2]);
                 } else {
                         $o = drop_item($a->argv[2]);
                 }