X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FItem.php;h=ca6556d275e6325d3d68463e9bf0d8b87591e3ad;hb=93082472912afaec56637e542650e715e41567a5;hp=0c420550b8fa1d28ce3551aa43fe7d718ccaeda5;hpb=c77926be03608833537ffe041c010bc27b216e2e;p=friendica.git

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 0c420550b8..ca6556d275 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -36,10 +36,6 @@ use Friendica\Util\Security;
 use Friendica\Util\Strings;
 use Text_LanguageDetect;
 
-require_once 'boot.php';
-require_once 'include/items.php';
-require_once 'include/text.php';
-
 class Item extends BaseObject
 {
 	// Posting types, inspired by https://www.w3.org/TR/activitystreams-vocabulary/#object-types
@@ -1152,7 +1148,7 @@ class Item extends BaseObject
 		if ($notify) {
 			// We have to avoid duplicates. So we create the GUID in form of a hash of the plink or uri.
 			// We add the hash of our own host because our host is the original creator of the post.
-			$prefix_host = get_app()->getHostName();
+			$prefix_host = \get_app()->getHostName();
 		} else {
 			$prefix_host = '';
 
@@ -1242,7 +1238,7 @@ class Item extends BaseObject
 
 	public static function insert($item, $force_parent = false, $notify = false, $dontcache = false)
 	{
-		$a = get_app();
+		$a = \get_app();
 
 		// If it is a posting where users should get notifications, then define it as wall posting
 		if ($notify) {
@@ -1359,15 +1355,15 @@ class Item extends BaseObject
 		$item['owner-name']    = trim(defaults($item, 'owner-name', ''));
 		$item['owner-link']    = trim(defaults($item, 'owner-link', ''));
 		$item['owner-avatar']  = trim(defaults($item, 'owner-avatar', ''));
-		$item['received']      = ((x($item, 'received') !== false) ? DateTimeFormat::utc($item['received']) : DateTimeFormat::utcNow());
-		$item['created']       = ((x($item, 'created') !== false) ? DateTimeFormat::utc($item['created']) : $item['received']);
-		$item['edited']        = ((x($item, 'edited') !== false) ? DateTimeFormat::utc($item['edited']) : $item['created']);
-		$item['changed']       = ((x($item, 'changed') !== false) ? DateTimeFormat::utc($item['changed']) : $item['created']);
-		$item['commented']     = ((x($item, 'commented') !== false) ? DateTimeFormat::utc($item['commented']) : $item['created']);
+		$item['received']      = (isset($item['received'])  ? DateTimeFormat::utc($item['received'])  : DateTimeFormat::utcNow());
+		$item['created']       = (isset($item['created'])   ? DateTimeFormat::utc($item['created'])   : $item['received']);
+		$item['edited']        = (isset($item['edited'])    ? DateTimeFormat::utc($item['edited'])    : $item['created']);
+		$item['changed']       = (isset($item['changed'])   ? DateTimeFormat::utc($item['changed'])   : $item['created']);
+		$item['commented']     = (isset($item['commented']) ? DateTimeFormat::utc($item['commented']) : $item['created']);
 		$item['title']         = trim(defaults($item, 'title', ''));
 		$item['location']      = trim(defaults($item, 'location', ''));
 		$item['coord']         = trim(defaults($item, 'coord', ''));
-		$item['visible']       = ((x($item, 'visible') !== false) ? intval($item['visible'])         : 1);
+		$item['visible']       = (isset($item['visible']) ? intval($item['visible']) : 1);
 		$item['deleted']       = 0;
 		$item['parent-uri']    = trim(defaults($item, 'parent-uri', $item['uri']));
 		$item['post-type']     = defaults($item, 'post-type', self::PT_ARTICLE);
@@ -1626,7 +1622,7 @@ class Item extends BaseObject
 		// It is mainly used in the "post_local" hook.
 		unset($item['api_source']);
 
-		if (x($item, 'cancel')) {
+		if (!empty($item['cancel'])) {
 			Logger::log('post cancelled by addon.');
 			return 0;
 		}
@@ -2615,7 +2611,7 @@ class Item extends BaseObject
 
 	public static function isRemoteSelf($contact, &$datarray)
 	{
-		$a = get_app();
+		$a = \get_app();
 
 		if (!$contact['remote_self']) {
 			return false;
@@ -3214,7 +3210,7 @@ class Item extends BaseObject
 		}
 	}
 
-	public static function getPermissionsSQLByUserId($owner_id, $remote_verified = false, $groups = null)
+	public static function getPermissionsSQLByUserId($owner_id, $remote_verified = false, $groups = null, $remote_cid = null)
 	{
 		$local_user = local_user();
 		$remote_user = remote_user();
@@ -3237,7 +3233,7 @@ class Item extends BaseObject
 			 * If pre-verified, the caller is expected to have already
 			 * done this and passed the groups into this function.
 			 */
-			$set = PermissionSet::get($owner_id, $remote_user, $groups);
+			$set = PermissionSet::get($owner_id, $remote_cid, $groups);
 
 			if (!empty($set)) {
 				$sql_set = " OR (`item`.`private` IN (1,2) AND `item`.`wall` AND `item`.`psid` IN (" . implode(',', $set) . "))";
@@ -3443,7 +3439,7 @@ class Item extends BaseObject
 				$filesubtype = 'unkn';
 			}
 
-			$title = Strings::escapeHtml(trim(!empty($mtch[4]) ? $mtch[4] : $mtch[1]));
+			$title = Strings::escapeHtml(trim(defaults($mtch, 4, $mtch[1])));
 			$title .= ' ' . $mtch[2] . ' ' . L10n::t('bytes');
 
 			$icon = '<div class="attachtype icon s22 type-' . $filetype . ' subtype-' . $filesubtype . '"></div>';
@@ -3455,7 +3451,7 @@ class Item extends BaseObject
 		}
 
 		// Map.
-		if (strpos($s, '<div class="map">') !== false && x($item, 'coord')) {
+		if (strpos($s, '<div class="map">') !== false && !empty($item['coord'])) {
 			$x = Map::byCoordinates(trim($item['coord']));
 			if ($x) {
 				$s = preg_replace('/\<div class\=\"map\"\>/', '$0' . $x, $s);