Tests ...

[friendica.git] / src / Model / Item.php

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 285187e5fbe70c6db44de2c32b8394917f8b2209..923d72c11bcd37cf7955897553759bc9c93d2d45 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -366,7 +366,7 @@ class Item
        public static function guid($item, $notify)
        {
                if (!empty($item['guid'])) {
-                       return Strings::escapeTags(trim($item['guid']));
+                       return trim($item['guid']);
                }
 
                if ($notify) {
@@ -448,7 +448,7 @@ class Item
                // We use "microtime" to keep the arrival order and "mt_rand" to avoid duplicates
                $file = 'item-' . round(microtime(true) * 10000) . '-' . mt_rand() . '.msg';
 
-               $spoolpath = get_spoolpath();
+               $spoolpath = System::getSpoolPath();
                if ($spoolpath != "") {
                        $spool = $spoolpath . '/' . $file;
 
@@ -971,7 +971,7 @@ class Item
                }
 
                if (!empty($item['cancel'])) {
-                       Logger::log('post cancelled by addon.');
+                       Logger::notice('post cancelled by addon.');
                        return 0;
                }
 
@@ -1885,7 +1885,7 @@ class Item
                        foreach ($matches as $mtch) {
                                if (Strings::compareLink($link, $mtch[1]) || Strings::compareLink($dlink, $mtch[1])) {
                                        $mention = true;
-                                       Logger::log('mention found: ' . $mtch[2]);
+                                       Logger::notice('mention found', ['mention' => $mtch[2]]);
                                }
                        }
                }
@@ -2305,7 +2305,7 @@ class Item
                        ++$expired;
                }
                DBA::close($items);
-               Logger::log('User ' . $uid . ": expired $expired items; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos");
+               Logger::notice('User ' . $uid . ": expired $expired items; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos");
        }
 
        public static function firstPostDate($uid, $wall = false)
@@ -2354,7 +2354,7 @@ class Item
 
                $item = Post::selectFirst(self::ITEM_FIELDLIST, ['id' => $item_id]);
                if (!DBA::isResult($item)) {
-                       Logger::log('like: unknown item ' . $item_id);
+                       Logger::notice('like: unknown item', ['id' => $item_id]);
                        return false;
                }