Merge pull request #7961 from MrPetovan/bug/fatal-errors

[friendica.git] / include / items.php

diff --git a/include/items.php b/include/items.php
index db60519a2ce8d6ba8d247ae207ce11fe06642862..3868db40a29770b186d918baa3d0651706bfb568 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -5,14 +5,15 @@
 
 use Friendica\BaseObject;
 use Friendica\Content\Feature;
-use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
+use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\Model\Item;
 use Friendica\Protocol\DFRN;
@@ -24,10 +25,11 @@ use Friendica\Util\ParseUrl;
 use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
 
-require_once 'mod/share.php';
+require_once __DIR__ . '/../mod/share.php';
+
 function add_page_info_data(array $data, $no_photos = false)
 {
-       Addon::callHooks('page_info_data', $data);
+       Hook::callAll('page_info_data', $data);
 
        if (empty($data['type'])) {
                return '';
@@ -40,7 +42,7 @@ function add_page_info_data(array $data, $no_photos = false)
                $data["type"] = "link";
        }
 
-       $data["title"] = defaults($data, "title", "");
+       $data["title"] = $data["title"] ?? '';
 
        if ((($data["type"] != "link") && ($data["type"] != "video") && ($data["type"] != "photo")) || ($data["title"] == $data["url"])) {
                return "";
@@ -242,26 +244,26 @@ function add_page_info_to_body($body, $texturl = false, $no_photos = false)
  * model where comments can have sub-threads. That would require some massive sorting
  * to get all the feed items into a mostly linear ordering, and might still require
  * recursion.
+ *
+ * @param       $xml
+ * @param array $importer
+ * @param array $contact
+ * @param       $hub
+ * @throws ImagickException
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
  */
-function consume_feed($xml, array $importer, array $contact, &$hub, $datedir = 0, $pass = 0)
+function consume_feed($xml, array $importer, array $contact, &$hub)
 {
        if ($contact['network'] === Protocol::OSTATUS) {
-               if ($pass < 2) {
-                       // Test - remove before flight
-                       //$tempfile = tempnam(get_temppath(), "ostatus2");
-                       //file_put_contents($tempfile, $xml);
-                       Logger::log("Consume OStatus messages ", Logger::DEBUG);
-                       OStatus::import($xml, $importer, $contact, $hub);
-               }
+               Logger::log("Consume OStatus messages ", Logger::DEBUG);
+               OStatus::import($xml, $importer, $contact, $hub);
 
                return;
        }
 
        if ($contact['network'] === Protocol::FEED) {
-               if ($pass < 2) {
-                       Logger::log("Consume feeds", Logger::DEBUG);
-                       Feed::import($xml, $importer, $contact, $hub);
-               }
+               Logger::log("Consume feeds", Logger::DEBUG);
+               Feed::import($xml, $importer, $contact, $hub);
 
                return;
        }
@@ -293,8 +295,6 @@ function subscribe_to_hub($url, array $importer, array $contact, $hubmode = 'sub
                return;
        }
 
-       $a = BaseObject::getApp();
-
        $user = DBA::selectFirst('user', ['nickname'], ['uid' => $importer['uid']]);
 
        // No user, no nickname, we quit
@@ -327,7 +327,7 @@ function drop_items(array $items)
 {
        $uid = 0;
 
-       if (!local_user() && !remote_user()) {
+       if (!Session::isAuthenticated()) {
                return;
        }
 
@@ -363,14 +363,8 @@ function drop_item($id, $return = '')
        $contact_id = 0;
 
        // check if logged in user is either the author or owner of this item
-
-       if (!empty($_SESSION['remote'])) {
-               foreach ($_SESSION['remote'] as $visitor) {
-                       if ($visitor['uid'] == $item['uid'] && $visitor['cid'] == $item['contact-id']) {
-                               $contact_id = $visitor['cid'];
-                               break;
-                       }
-               }
+       if (Session::getRemoteContactID($item['uid']) == $item['contact-id']) {
+               $contact_id = $item['contact-id'];
        }
 
        if ((local_user() == $item['uid']) || $contact_id) {
@@ -447,80 +441,3 @@ function drop_item($id, $return = '')
                //NOTREACHED
        }
 }
-
-/* arrange the list in years */
-function list_post_dates($uid, $wall)
-{
-       $dnow = DateTimeFormat::localNow('Y-m-d');
-
-       $dthen = Item::firstPostDate($uid, $wall);
-       if (!$dthen) {
-               return [];
-       }
-
-       // Set the start and end date to the beginning of the month
-       $dnow = substr($dnow, 0, 8) . '01';
-       $dthen = substr($dthen, 0, 8) . '01';
-
-       $ret = [];
-
-       /*
-        * Starting with the current month, get the first and last days of every
-        * month down to and including the month of the first post
-        */
-       while (substr($dnow, 0, 7) >= substr($dthen, 0, 7)) {
-               $dyear = intval(substr($dnow, 0, 4));
-               $dstart = substr($dnow, 0, 8) . '01';
-               $dend = substr($dnow, 0, 8) . Temporal::getDaysInMonth(intval($dnow), intval(substr($dnow, 5)));
-               $start_month = DateTimeFormat::utc($dstart, 'Y-m-d');
-               $end_month = DateTimeFormat::utc($dend, 'Y-m-d');
-               $str = L10n::getDay(DateTimeFormat::utc($dnow, 'F'));
-
-               if (empty($ret[$dyear])) {
-                       $ret[$dyear] = [];
-               }
-
-               $ret[$dyear][] = [$str, $end_month, $start_month];
-               $dnow = DateTimeFormat::utc($dnow . ' -1 month', 'Y-m-d');
-       }
-       return $ret;
-}
-
-function posted_date_widget($url, $uid, $wall)
-{
-       $o = '';
-
-       if (!Feature::isEnabled($uid, 'archives')) {
-               return $o;
-       }
-
-       // For former Facebook folks that left because of "timeline"
-       /*
-        * @TODO old-lost code?
-       if ($wall && intval(PConfig::get($uid, 'system', 'no_wall_archive_widget')))
-               return $o;
-       */
-
-       $visible_years = PConfig::get($uid, 'system', 'archive_visible_years', 5);
-
-       $ret = list_post_dates($uid, $wall);
-
-       if (!DBA::isResult($ret)) {
-               return $o;
-       }
-
-       $cutoff_year = intval(DateTimeFormat::localNow('Y')) - $visible_years;
-       $cutoff = ((array_key_exists($cutoff_year, $ret))? true : false);
-
-       $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('posted_date_widget.tpl'),[
-               '$title' => L10n::t('Archives'),
-               '$size' => $visible_years,
-               '$cutoff_year' => $cutoff_year,
-               '$cutoff' => $cutoff,
-               '$url' => $url,
-               '$dates' => $ret,
-               '$showmore' => L10n::t('show more')
-
-       ]);
-       return $o;
-}