X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fitems.php;h=85da1d1ccf892f68abd8edc45ac59d445b213e15;hb=df7bdbfc66566a5063fa754fdcc83ec9230f9b6e;hp=e91c7088ab297da633a1546b8dc88cc7f09d1564;hpb=0436782e70f496c96f30ee7822865f777ae1d73e;p=friendica.git diff --git a/include/items.php b/include/items.php index e91c7088ab..85da1d1ccf 100644 --- a/include/items.php +++ b/include/items.php @@ -1,49 +1,54 @@ $maxlen ) { + if (($textlen + $img_start) > $maxlen ) { if ($textlen < $maxlen) { logger('limit_body_size: the limit happens before an embedded image', LOGGER_DEBUG); $new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen); @@ -83,7 +87,7 @@ function limit_body_size($body) { $new_body = $new_body . substr($orig_body, $img_start, $img_end - $img_start); } else { - if ( ($textlen + $img_end) > $maxlen ) { + if (($textlen + $img_end) > $maxlen ) { if ($textlen < $maxlen) { logger('limit_body_size: the limit happens before the end of a non-embedded image', LOGGER_DEBUG); $new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen); @@ -96,84 +100,54 @@ function limit_body_size($body) { } $orig_body = substr($orig_body, $img_end); - if ($orig_body === false) // in case the body ends on a closing image tag + if ($orig_body === false) { + // in case the body ends on a closing image tag $orig_body = ''; + } $img_start = strpos($orig_body, '[img'); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); $img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false); } - if ( ($textlen + strlen($orig_body)) > $maxlen) { + if (($textlen + strlen($orig_body)) > $maxlen) { if ($textlen < $maxlen) { logger('limit_body_size: the limit happens after the end of the last image', LOGGER_DEBUG); $new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen); - $textlen = $maxlen; } } else { logger('limit_body_size: the text size with embedded images extracted did not violate the limit', LOGGER_DEBUG); $new_body = $new_body . $orig_body; - $textlen += strlen($orig_body); } return $new_body; - } else + } else { return $body; -}} - -function title_is_body($title, $body) { - - $title = strip_tags($title); - $title = trim($title); - $title = html_entity_decode($title, ENT_QUOTES, 'UTF-8'); - $title = str_replace(array("\n", "\r", "\t", " "), array("","","",""), $title); - - $body = strip_tags($body); - $body = trim($body); - $body = html_entity_decode($body, ENT_QUOTES, 'UTF-8'); - $body = str_replace(array("\n", "\r", "\t", " "), array("","","",""), $body); - - if (strlen($title) < strlen($body)) - $body = substr($body, 0, strlen($title)); - - if (($title != $body) and (substr($title, -3) == "...")) { - $pos = strrpos($title, "..."); - if ($pos > 0) { - $title = substr($title, 0, $pos); - $body = substr($body, 0, $pos); - } } - - return($title == $body); } +/// @TODO move to ??? function add_page_info_data($data) { - call_hooks('page_info_data', $data); + Addon::callHooks('page_info_data', $data); // It maybe is a rich content, but if it does have everything that a link has, // then treat it that way - if (($data["type"] == "rich") AND is_string($data["title"]) AND - is_string($data["text"]) AND (sizeof($data["images"]) > 0)) { + if (($data["type"] == "rich") && is_string($data["title"]) && + is_string($data["text"]) && (sizeof($data["images"]) > 0)) { $data["type"] = "link"; } - if ((($data["type"] != "link") AND ($data["type"] != "video") AND ($data["type"] != "photo")) OR ($data["title"] == $data["url"])) { + if ((($data["type"] != "link") && ($data["type"] != "video") && ($data["type"] != "photo")) || ($data["title"] == $data["url"])) { return ""; } - if ($no_photos AND ($data["type"] == "photo")) { + if ($no_photos && ($data["type"] == "photo")) { return ""; } - if (sizeof($data["images"]) > 0) { - $preview = $data["images"][0]; - } else { - $preview = ""; - } - // Escape some bad characters - $data["url"] = str_replace(array("[", "]"), array("[", "]"), htmlentities($data["url"], ENT_QUOTES, 'UTF-8', false)); - $data["title"] = str_replace(array("[", "]"), array("[", "]"), htmlentities($data["title"], ENT_QUOTES, 'UTF-8', false)); + $data["url"] = str_replace(["[", "]"], ["[", "]"], htmlentities($data["url"], ENT_QUOTES, 'UTF-8', false)); + $data["title"] = str_replace(["[", "]"], ["[", "]"], htmlentities($data["title"], ENT_QUOTES, 'UTF-8', false)); $text = "[attachment type='".$data["type"]."'"; @@ -194,10 +168,11 @@ function add_page_info_data($data) { } if (sizeof($data["images"]) > 0) { - $preview = str_replace(array("[", "]"), array("[", "]"), htmlentities($data["images"][0]["src"], ENT_QUOTES, 'UTF-8', false)); + $preview = str_replace(["[", "]"], ["[", "]"], htmlentities($data["images"][0]["src"], ENT_QUOTES, 'UTF-8', false)); // if the preview picture is larger than 500 pixels then show it in a larger mode // But only, if the picture isn't higher than large (To prevent huge posts) - if (($data["images"][0]["width"] >= 500) AND ($data["images"][0]["width"] >= $data["images"][0]["height"])) { + if (!Config::get('system', 'always_show_preview') && ($data["images"][0]["width"] >= 500) + && ($data["images"][0]["width"] >= $data["images"][0]["height"])) { $text .= " image='".$preview."'"; } else { $text .= " preview='".$preview."'"; @@ -207,193 +182,136 @@ function add_page_info_data($data) { $text .= "]".$data["text"]."[/attachment]"; $hashtags = ""; - if (isset($data["keywords"]) AND count($data["keywords"])) { + if (isset($data["keywords"]) && count($data["keywords"])) { $hashtags = "\n"; foreach ($data["keywords"] AS $keyword) { - /// @todo make a positive list of allowed characters - $hashtag = str_replace(array(" ", "+", "/", ".", "#", "'", "â", "`", "(", ")", "â", "â"), - array("","", "", "", "", "", "", "", "", "", "", ""), $keyword); - $hashtags .= "#[url=".App::get_baseurl()."/search?tag=".rawurlencode($hashtag)."]".$hashtag."[/url] "; + /// @TODO make a positive list of allowed characters + $hashtag = str_replace([" ", "+", "/", ".", "#", "'", "â", "`", "(", ")", "â", "â"], + ["", "", "", "", "", "", "", "", "", "", "", ""], $keyword); + $hashtags .= "#[url=" . System::baseUrl() . "/search?tag=" . rawurlencode($hashtag) . "]" . $hashtag . "[/url] "; } } return "\n".$text.$hashtags; } +/// @TODO move to ??? function query_page_info($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "") { $data = ParseUrl::getSiteinfoCached($url, true); - if ($photo != "") + if ($photo != "") { $data["images"][0]["src"] = $photo; + } - logger('fetch page info for '.$url.' '.print_r($data, true), LOGGER_DEBUG); + logger('fetch page info for ' . $url . ' ' . print_r($data, true), LOGGER_DEBUG); - if (!$keywords AND isset($data["keywords"])) + if (!$keywords && isset($data["keywords"])) { unset($data["keywords"]); + } - if (($keyword_blacklist != "") AND isset($data["keywords"])) { - $list = explode(",", $keyword_blacklist); + if (($keyword_blacklist != "") && isset($data["keywords"])) { + $list = explode(", ", $keyword_blacklist); foreach ($list AS $keyword) { $keyword = trim($keyword); $index = array_search($keyword, $data["keywords"]); - if ($index !== false) + if ($index !== false) { unset($data["keywords"][$index]); + } } } - return($data); + return $data; } +/// @TODO move to ??? function add_page_keywords($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "") { $data = query_page_info($url, $no_photos, $photo, $keywords, $keyword_blacklist); $tags = ""; - if (isset($data["keywords"]) AND count($data["keywords"])) { + if (isset($data["keywords"]) && count($data["keywords"])) { foreach ($data["keywords"] AS $keyword) { - $hashtag = str_replace(array(" ", "+", "/", ".", "#", "'"), - array("","", "", "", "", ""), $keyword); + $hashtag = str_replace([" ", "+", "/", ".", "#", "'"], + ["", "", "", "", "", ""], $keyword); - if ($tags != "") - $tags .= ","; + if ($tags != "") { + $tags .= ", "; + } - $tags .= "#[url=".App::get_baseurl()."/search?tag=".rawurlencode($hashtag)."]".$hashtag."[/url]"; + $tags .= "#[url=" . System::baseUrl() . "/search?tag=" . rawurlencode($hashtag) . "]" . $hashtag . "[/url]"; } } - return($tags); + return $tags; } +/// @TODO move to ??? function add_page_info($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "") { $data = query_page_info($url, $no_photos, $photo, $keywords, $keyword_blacklist); $text = add_page_info_data($data); - return($text); + return $text; } +/// @TODO move to ??? function add_page_info_to_body($body, $texturl = false, $no_photos = false) { - logger('add_page_info_to_body: fetch page info for body '.$body, LOGGER_DEBUG); + logger('add_page_info_to_body: fetch page info for body ' . $body, LOGGER_DEBUG); $URLSearchString = "^\[\]"; // Fix for Mastodon where the mentions are in a different format $body = preg_replace("/\[url\=([$URLSearchString]*)\]([#!@])(.*?)\[\/url\]/ism", - '$2[url=$1]$3[/url]', $body); + '$2[url=$1]$3[/url]', $body); // Adding these spaces is a quick hack due to my problems with regular expressions :) - preg_match("/[^!#@]\[url\]([$URLSearchString]*)\[\/url\]/ism", " ".$body, $matches); + preg_match("/[^!#@]\[url\]([$URLSearchString]*)\[\/url\]/ism", " " . $body, $matches); - if (!$matches) - preg_match("/[^!#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", " ".$body, $matches); + if (!$matches) { + preg_match("/[^!#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", " " . $body, $matches); + } // Convert urls without bbcode elements - if (!$matches AND $texturl) { + if (!$matches && $texturl) { preg_match("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", " ".$body, $matches); // Yeah, a hack. I really hate regular expressions :) - if ($matches) + if ($matches) { $matches[1] = $matches[2]; + } } - if ($matches) + if ($matches) { $footer = add_page_info($matches[1], $no_photos); + } // Remove the link from the body if the link is attached at the end of the post - if (isset($footer) AND (trim($footer) != "") AND (strpos($footer, $matches[1]))) { + if (isset($footer) && (trim($footer) != "") && (strpos($footer, $matches[1]))) { $removedlink = trim(str_replace($matches[1], "", $body)); - if (($removedlink == "") OR strstr($body, $removedlink)) + if (($removedlink == "") || strstr($body, $removedlink)) { $body = $removedlink; + } - $url = str_replace(array('/', '.'), array('\/', '\.'), $matches[1]); - $removedlink = preg_replace("/\[url\=".$url."\](.*?)\[\/url\]/ism", '', $body); - if (($removedlink == "") OR strstr($body, $removedlink)) + $url = str_replace(['/', '.'], ['\/', '\.'], $matches[1]); + $removedlink = preg_replace("/\[url\=" . $url . "\](.*?)\[\/url\]/ism", '', $body); + if (($removedlink == "") || strstr($body, $removedlink)) { $body = $removedlink; + } } // Add the page information to the bottom - if (isset($footer) AND (trim($footer) != "")) + if (isset($footer) && (trim($footer) != "")) { $body .= $footer; - - return $body; -} - -/** - * Adds a "lang" specification in a "postopts" element of given $arr, - * if possible and not already present. - * Expects "body" element to exist in $arr. - * - * @todo Add a parameter to request forcing override - */ -function item_add_language_opt(&$arr) { - - if (version_compare(PHP_VERSION, '5.3.0', '<')) return; // LanguageDetect.php not available ? - - if ( x($arr, 'postopts') ) - { - if ( strstr($arr['postopts'], 'lang=') ) - { - // do not override - /// @TODO Add parameter to request overriding - return; - } - $postopts = $arr['postopts']; - } else { - $postopts = ""; - } - - require_once('library/langdet/Text/LanguageDetect.php'); - $naked_body = preg_replace('/\[(.+?)\]/','',$arr['body']); - $l = new Text_LanguageDetect; - //$lng = $l->detectConfidence($naked_body); - //$arr['postopts'] = (($lng['language']) ? 'lang=' . $lng['language'] . ';' . $lng['confidence'] : ''); - $lng = $l->detect($naked_body, 3); - - if (sizeof($lng) > 0) { - if ($postopts != "") $postopts .= '&'; // arbitrary separator, to be reviewed - $postopts .= 'lang='; - $sep = ""; - foreach ($lng as $language => $score) { - $postopts .= $sep . $language.";".$score; - $sep = ':'; - } - $arr['postopts'] = $postopts; - } -} - -/** - * @brief Creates an unique guid out of a given uri - * - * @param string $uri uri of an item entry - * @param string $host (Optional) hostname for the GUID prefix - * @return string unique guid - */ -function uri_to_guid($uri, $host = "") { - - // Our regular guid routine is using this kind of prefix as well - // We have to avoid that different routines could accidentally create the same value - $parsed = parse_url($uri); - - if ($host == "") { - $host = $parsed["host"]; } - $guid_prefix = hash("crc32", $host); - - // Remove the scheme to make sure that "https" and "http" doesn't make a difference - unset($parsed["scheme"]); - - $host_id = implode("/", $parsed); - - // We could use any hash algorithm since it isn't a security issue - $host_hash = hash("ripemd128", $host_id); - - return $guid_prefix.$host_hash; + return $body; } -function item_store($arr,$force_parent = false, $notify = false, $dontcache = false) { - +/// @TODO add type-hint array +/// @TODO move to src/Model/Item.php +function item_store($arr, $force_parent = false, $notify = false, $dontcache = false) +{ $a = get_app(); // If it is a posting where users should get notifications, then define it as wall posting @@ -401,69 +319,101 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa $arr['wall'] = 1; $arr['type'] = 'wall'; $arr['origin'] = 1; - $arr['last-child'] = 1; $arr['network'] = NETWORK_DFRN; + $arr['protocol'] = PROTOCOL_DFRN; // We have to avoid duplicates. So we create the GUID in form of a hash of the plink or uri. - // In difference to the call to "uri_to_guid" several lines below we add the hash of our own host. + // In difference to the call to "Item::guidFromUri" several lines below we add the hash of our own host. // This is done because our host is the original creator of the post. - if (isset($arr['plink'])) { - $arr['guid'] = uri_to_guid($arr['plink'], $a->get_hostname()); - } elseif (isset($arr['uri'])) { - $arr['guid'] = uri_to_guid($arr['uri'], $a->get_hostname()); + if (!isset($arr['guid'])) { + if (isset($arr['plink'])) { + $arr['guid'] = Item::guidFromUri($arr['plink'], $a->get_hostname()); + } elseif (isset($arr['uri'])) { + $arr['guid'] = Item::guidFromUri($arr['uri'], $a->get_hostname()); + } } + } else { + $arr['network'] = trim(defaults($arr, 'network', NETWORK_PHANTOM)); + } + + if ($notify) { + $guid_prefix = ""; + } elseif ((trim($arr['guid']) == "") && (trim($arr['plink']) != "")) { + $arr['guid'] = Item::guidFromUri($arr['plink']); + } elseif ((trim($arr['guid']) == "") && (trim($arr['uri']) != "")) { + $arr['guid'] = Item::guidFromUri($arr['uri']); + } else { + $parsed = parse_url($arr["author-link"]); + $guid_prefix = hash("crc32", $parsed["host"]); } - // If a Diaspora signature structure was passed in, pull it out of the - // item array and set it aside for later storage. + $arr['guid'] = ((x($arr, 'guid')) ? notags(trim($arr['guid'])) : get_guid(32, $guid_prefix)); + $arr['uri'] = ((x($arr, 'uri')) ? notags(trim($arr['uri'])) : item_new_uri($a->get_hostname(), $uid, $arr['guid'])); + + // Store conversation data + $arr = Conversation::insert($arr); + + /* + * If a Diaspora signature structure was passed in, pull it out of the + * item array and set it aside for later storage. + */ $dsprsig = null; - if (x($arr,'dsprsig')) { + if (x($arr, 'dsprsig')) { $encoded_signature = $arr['dsprsig']; $dsprsig = json_decode(base64_decode($arr['dsprsig'])); unset($arr['dsprsig']); } // Converting the plink + /// @TODO Check if this is really still needed if ($arr['network'] == NETWORK_OSTATUS) { - if (isset($arr['plink'])) - $arr['plink'] = ostatus::convert_href($arr['plink']); - elseif (isset($arr['uri'])) - $arr['plink'] = ostatus::convert_href($arr['uri']); + if (isset($arr['plink'])) { + $arr['plink'] = OStatus::convertHref($arr['plink']); + } elseif (isset($arr['uri'])) { + $arr['plink'] = OStatus::convertHref($arr['uri']); + } } - if (x($arr, 'gravity')) + if (x($arr, 'gravity')) { $arr['gravity'] = intval($arr['gravity']); - elseif ($arr['parent-uri'] === $arr['uri']) + } elseif ($arr['parent-uri'] === $arr['uri']) { $arr['gravity'] = 0; - elseif (activity_match($arr['verb'],ACTIVITY_POST)) + } elseif (activity_match($arr['verb'],ACTIVITY_POST)) { $arr['gravity'] = 6; - else + } else { $arr['gravity'] = 6; // extensible catchall + } - if (! x($arr,'type')) + if (! x($arr, 'type')) { $arr['type'] = 'remote'; + } + $uid = intval($arr['uid']); + // check for create date and expire time + $expire_interval = Config::get('system', 'dbclean-expire-days', 0); - /* check for create date and expire time */ - $uid = intval($arr['uid']); - $r = q("SELECT expire FROM user WHERE uid = %d", intval($uid)); - if (dbm::is_result($r)) { - $expire_interval = $r[0]['expire']; - if ($expire_interval>0) { - $expire_date = new DateTime( '- '.$expire_interval.' days', new DateTimeZone('UTC')); - $created_date = new DateTime($arr['created'], new DateTimeZone('UTC')); - if ($created_date < $expire_date) { - logger('item-store: item created ('.$arr['created'].') before expiration time ('.$expire_date->format(DateTime::W3C).'). ignored. ' . print_r($arr,true), LOGGER_DEBUG); - return 0; - } + $user = dba::selectFirst('user', ['expire'], ['uid' => $uid]); + if (DBM::is_result($user) && ($user['expire'] > 0) && (($user['expire'] < $expire_interval) || ($expire_interval == 0))) { + $expire_interval = $user['expire']; + } + + if (($expire_interval > 0) && !empty($arr['created'])) { + $expire_date = time() - ($expire_interval * 86400); + $created_date = strtotime($arr['created']); + if ($created_date < $expire_date) { + logger('item-store: item created ('.date('c', $created_date).') before expiration time ('.date('c', $expire_date).'). ignored. ' . print_r($arr,true), LOGGER_DEBUG); + return 0; } } - // Do we already have this item? - // We have to check several networks since Friendica posts could be repeated via OStatus (maybe Diasporsa as well) - if (in_array(trim($arr['network']), array(NETWORK_DIASPORA, NETWORK_DFRN, NETWORK_OSTATUS, ""))) { + /* + * Do we already have this item? + * We have to check several networks since Friendica posts could be repeated + * via OStatus (maybe Diasporsa as well) + */ + if (in_array($arr['network'], [NETWORK_DIASPORA, NETWORK_DFRN, NETWORK_OSTATUS, ""])) { $r = q("SELECT `id`, `network` FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `network` IN ('%s', '%s', '%s') LIMIT 1", dbesc(trim($arr['uri'])), intval($uid), @@ -471,159 +421,181 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa dbesc(NETWORK_DFRN), dbesc(NETWORK_OSTATUS) ); - if ($r) { + if (DBM::is_result($r)) { // We only log the entries with a different user id than 0. Otherwise we would have too many false positives - if ($uid != 0) + if ($uid != 0) { logger("Item with uri ".$arr['uri']." already existed for user ".$uid." with id ".$r[0]["id"]." target network ".$r[0]["network"]." - new network: ".$arr['network']); - return($r[0]["id"]); + } + + return $r[0]["id"]; } } - // Shouldn't happen but we want to make absolutely sure it doesn't leak from a plugin. + /// @TODO old-lost code? + // Shouldn't happen but we want to make absolutely sure it doesn't leak from an addon. // Deactivated, since the bbcode parser can handle with it - and it destroys posts with some smileys that contain "<" //if ((strpos($arr['body'],'<') !== false) || (strpos($arr['body'],'>') !== false)) // $arr['body'] = strip_tags($arr['body']); - item_add_language_opt($arr); - - if ($notify) - $guid_prefix = ""; - elseif ((trim($arr['guid']) == "") AND (trim($arr['plink']) != "")) - $arr['guid'] = uri_to_guid($arr['plink']); - elseif ((trim($arr['guid']) == "") AND (trim($arr['uri']) != "")) - $arr['guid'] = uri_to_guid($arr['uri']); - else { - $parsed = parse_url($arr["author-link"]); - $guid_prefix = hash("crc32", $parsed["host"]); - } - - $arr['wall'] = ((x($arr,'wall')) ? intval($arr['wall']) : 0); - $arr['guid'] = ((x($arr,'guid')) ? notags(trim($arr['guid'])) : get_guid(32, $guid_prefix)); - $arr['uri'] = ((x($arr,'uri')) ? notags(trim($arr['uri'])) : item_new_uri($a->get_hostname(), $uid, $arr['guid'])); - $arr['extid'] = ((x($arr,'extid')) ? notags(trim($arr['extid'])) : ''); - $arr['author-name'] = ((x($arr,'author-name')) ? trim($arr['author-name']) : ''); - $arr['author-link'] = ((x($arr,'author-link')) ? notags(trim($arr['author-link'])) : ''); - $arr['author-avatar'] = ((x($arr,'author-avatar')) ? notags(trim($arr['author-avatar'])) : ''); - $arr['owner-name'] = ((x($arr,'owner-name')) ? trim($arr['owner-name']) : ''); - $arr['owner-link'] = ((x($arr,'owner-link')) ? notags(trim($arr['owner-link'])) : ''); - $arr['owner-avatar'] = ((x($arr,'owner-avatar')) ? notags(trim($arr['owner-avatar'])) : ''); - $arr['created'] = ((x($arr,'created') !== false) ? datetime_convert('UTC','UTC',$arr['created']) : datetime_convert()); - $arr['edited'] = ((x($arr,'edited') !== false) ? datetime_convert('UTC','UTC',$arr['edited']) : datetime_convert()); - $arr['commented'] = ((x($arr,'commented') !== false) ? datetime_convert('UTC','UTC',$arr['commented']) : datetime_convert()); - $arr['received'] = ((x($arr,'received') !== false) ? datetime_convert('UTC','UTC',$arr['received']) : datetime_convert()); - $arr['changed'] = ((x($arr,'changed') !== false) ? datetime_convert('UTC','UTC',$arr['changed']) : datetime_convert()); - $arr['title'] = ((x($arr,'title')) ? trim($arr['title']) : ''); - $arr['location'] = ((x($arr,'location')) ? trim($arr['location']) : ''); - $arr['coord'] = ((x($arr,'coord')) ? notags(trim($arr['coord'])) : ''); - $arr['last-child'] = ((x($arr,'last-child')) ? intval($arr['last-child']) : 0 ); - $arr['visible'] = ((x($arr,'visible') !== false) ? intval($arr['visible']) : 1 ); + Item::addLanguageInPostopts($arr); + + $arr['wall'] = ((x($arr, 'wall')) ? intval($arr['wall']) : 0); + $arr['extid'] = ((x($arr, 'extid')) ? notags(trim($arr['extid'])) : ''); + $arr['author-name'] = ((x($arr, 'author-name')) ? trim($arr['author-name']) : ''); + $arr['author-link'] = ((x($arr, 'author-link')) ? notags(trim($arr['author-link'])) : ''); + $arr['author-avatar'] = ((x($arr, 'author-avatar')) ? notags(trim($arr['author-avatar'])) : ''); + $arr['owner-name'] = ((x($arr, 'owner-name')) ? trim($arr['owner-name']) : ''); + $arr['owner-link'] = ((x($arr, 'owner-link')) ? notags(trim($arr['owner-link'])) : ''); + $arr['owner-avatar'] = ((x($arr, 'owner-avatar')) ? notags(trim($arr['owner-avatar'])) : ''); + $arr['received'] = ((x($arr, 'received') !== false) ? datetime_convert('UTC','UTC', $arr['received']) : datetime_convert()); + $arr['created'] = ((x($arr, 'created') !== false) ? datetime_convert('UTC','UTC', $arr['created']) : $arr['received']); + $arr['edited'] = ((x($arr, 'edited') !== false) ? datetime_convert('UTC','UTC', $arr['edited']) : $arr['created']); + $arr['changed'] = ((x($arr, 'changed') !== false) ? datetime_convert('UTC','UTC', $arr['changed']) : $arr['created']); + $arr['commented'] = ((x($arr, 'commented') !== false) ? datetime_convert('UTC','UTC', $arr['commented']) : $arr['created']); + $arr['title'] = ((x($arr, 'title')) ? trim($arr['title']) : ''); + $arr['location'] = ((x($arr, 'location')) ? trim($arr['location']) : ''); + $arr['coord'] = ((x($arr, 'coord')) ? notags(trim($arr['coord'])) : ''); + $arr['visible'] = ((x($arr, 'visible') !== false) ? intval($arr['visible']) : 1 ); $arr['deleted'] = 0; - $arr['parent-uri'] = ((x($arr,'parent-uri')) ? notags(trim($arr['parent-uri'])) : $arr['uri']); - $arr['verb'] = ((x($arr,'verb')) ? notags(trim($arr['verb'])) : ''); - $arr['object-type'] = ((x($arr,'object-type')) ? notags(trim($arr['object-type'])) : ''); - $arr['object'] = ((x($arr,'object')) ? trim($arr['object']) : ''); - $arr['target-type'] = ((x($arr,'target-type')) ? notags(trim($arr['target-type'])) : ''); - $arr['target'] = ((x($arr,'target')) ? trim($arr['target']) : ''); - $arr['plink'] = ((x($arr,'plink')) ? notags(trim($arr['plink'])) : ''); - $arr['allow_cid'] = ((x($arr,'allow_cid')) ? trim($arr['allow_cid']) : ''); - $arr['allow_gid'] = ((x($arr,'allow_gid')) ? trim($arr['allow_gid']) : ''); - $arr['deny_cid'] = ((x($arr,'deny_cid')) ? trim($arr['deny_cid']) : ''); - $arr['deny_gid'] = ((x($arr,'deny_gid')) ? trim($arr['deny_gid']) : ''); - $arr['private'] = ((x($arr,'private')) ? intval($arr['private']) : 0 ); - $arr['bookmark'] = ((x($arr,'bookmark')) ? intval($arr['bookmark']) : 0 ); - $arr['body'] = ((x($arr,'body')) ? trim($arr['body']) : ''); - $arr['tag'] = ((x($arr,'tag')) ? notags(trim($arr['tag'])) : ''); - $arr['attach'] = ((x($arr,'attach')) ? notags(trim($arr['attach'])) : ''); - $arr['app'] = ((x($arr,'app')) ? notags(trim($arr['app'])) : ''); - $arr['origin'] = ((x($arr,'origin')) ? intval($arr['origin']) : 0 ); - $arr['network'] = ((x($arr,'network')) ? trim($arr['network']) : ''); - $arr['postopts'] = ((x($arr,'postopts')) ? trim($arr['postopts']) : ''); - $arr['resource-id'] = ((x($arr,'resource-id')) ? trim($arr['resource-id']) : ''); - $arr['event-id'] = ((x($arr,'event-id')) ? intval($arr['event-id']) : 0 ); - $arr['inform'] = ((x($arr,'inform')) ? trim($arr['inform']) : ''); - $arr['file'] = ((x($arr,'file')) ? trim($arr['file']) : ''); + $arr['parent-uri'] = ((x($arr, 'parent-uri')) ? notags(trim($arr['parent-uri'])) : $arr['uri']); + $arr['verb'] = ((x($arr, 'verb')) ? notags(trim($arr['verb'])) : ''); + $arr['object-type'] = ((x($arr, 'object-type')) ? notags(trim($arr['object-type'])) : ''); + $arr['object'] = ((x($arr, 'object')) ? trim($arr['object']) : ''); + $arr['target-type'] = ((x($arr, 'target-type')) ? notags(trim($arr['target-type'])) : ''); + $arr['target'] = ((x($arr, 'target')) ? trim($arr['target']) : ''); + $arr['plink'] = ((x($arr, 'plink')) ? notags(trim($arr['plink'])) : ''); + $arr['allow_cid'] = ((x($arr, 'allow_cid')) ? trim($arr['allow_cid']) : ''); + $arr['allow_gid'] = ((x($arr, 'allow_gid')) ? trim($arr['allow_gid']) : ''); + $arr['deny_cid'] = ((x($arr, 'deny_cid')) ? trim($arr['deny_cid']) : ''); + $arr['deny_gid'] = ((x($arr, 'deny_gid')) ? trim($arr['deny_gid']) : ''); + $arr['private'] = ((x($arr, 'private')) ? intval($arr['private']) : 0 ); + $arr['bookmark'] = ((x($arr, 'bookmark')) ? intval($arr['bookmark']) : 0 ); + $arr['body'] = ((x($arr, 'body')) ? trim($arr['body']) : ''); + $arr['tag'] = ((x($arr, 'tag')) ? notags(trim($arr['tag'])) : ''); + $arr['attach'] = ((x($arr, 'attach')) ? notags(trim($arr['attach'])) : ''); + $arr['app'] = ((x($arr, 'app')) ? notags(trim($arr['app'])) : ''); + $arr['origin'] = ((x($arr, 'origin')) ? intval($arr['origin']) : 0 ); + $arr['postopts'] = ((x($arr, 'postopts')) ? trim($arr['postopts']) : ''); + $arr['resource-id'] = ((x($arr, 'resource-id')) ? trim($arr['resource-id']) : ''); + $arr['event-id'] = ((x($arr, 'event-id')) ? intval($arr['event-id']) : 0 ); + $arr['inform'] = ((x($arr, 'inform')) ? trim($arr['inform']) : ''); + $arr['file'] = ((x($arr, 'file')) ? trim($arr['file']) : ''); + + // When there is no content then we don't post it + if ($arr['body'].$arr['title'] == '') { + return 0; + } // Items cannot be stored before they happen ... - if ($arr['created'] > datetime_convert()) + if ($arr['created'] > datetime_convert()) { $arr['created'] = datetime_convert(); + } // We haven't invented time travel by now. - if ($arr['edited'] > datetime_convert()) + if ($arr['edited'] > datetime_convert()) { $arr['edited'] = datetime_convert(); + } - if (($arr['author-link'] == "") AND ($arr['owner-link'] == "")) - logger("Both author-link and owner-link are empty. Called by: ".App::callstack(), LOGGER_DEBUG); + if (($arr['author-link'] == "") && ($arr['owner-link'] == "")) { + logger("Both author-link and owner-link are empty. Called by: " . System::callstack(), LOGGER_DEBUG); + } if ($arr['plink'] == "") { - $arr['plink'] = App::get_baseurl().'/display/'.urlencode($arr['guid']); + $arr['plink'] = System::baseUrl() . '/display/' . urlencode($arr['guid']); } - if ($arr['network'] == "") { + if ($arr['network'] == NETWORK_PHANTOM) { $r = q("SELECT `network` FROM `contact` WHERE `network` IN ('%s', '%s', '%s') AND `nurl` = '%s' AND `uid` = %d LIMIT 1", dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS), dbesc(normalise_link($arr['author-link'])), intval($arr['uid']) ); - if (!dbm::is_result($r)) + if (!DBM::is_result($r)) { $r = q("SELECT `network` FROM `gcontact` WHERE `network` IN ('%s', '%s', '%s') AND `nurl` = '%s' LIMIT 1", dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS), dbesc(normalise_link($arr['author-link'])) ); + } - if (!dbm::is_result($r)) + if (!DBM::is_result($r)) { $r = q("SELECT `network` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($arr['contact-id']), intval($arr['uid']) ); + } - if (dbm::is_result($r)) + if (DBM::is_result($r)) { $arr['network'] = $r[0]["network"]; + } // Fallback to friendica (why is it empty in some cases?) - if ($arr['network'] == "") + if ($arr['network'] == "") { $arr['network'] = NETWORK_DFRN; + } - logger("item_store: Set network to ".$arr["network"]." for ".$arr["uri"], LOGGER_DEBUG); + logger("item_store: Set network to " . $arr["network"] . " for " . $arr["uri"], LOGGER_DEBUG); } // The contact-id should be set before "item_store" was called - but there seems to be some issues if ($arr["contact-id"] == 0) { - // First we are looking for a suitable contact that matches with the author of the post - // This is done only for comments (See below explanation at "gcontact-id") - if ($arr['parent-uri'] != $arr['uri']) - $arr["contact-id"] = get_contact($arr['author-link'], $uid); + /* + * First we are looking for a suitable contact that matches with the author of the post + * This is done only for comments (See below explanation at "gcontact-id") + */ + if ($arr['parent-uri'] != $arr['uri']) { + $arr["contact-id"] = Contact::getIdForURL($arr['author-link'], $uid); + } // If not present then maybe the owner was found - if ($arr["contact-id"] == 0) - $arr["contact-id"] = get_contact($arr['owner-link'], $uid); + if ($arr["contact-id"] == 0) { + $arr["contact-id"] = Contact::getIdForURL($arr['owner-link'], $uid); + } // Still missing? Then use the "self" contact of the current user if ($arr["contact-id"] == 0) { $r = q("SELECT `id` FROM `contact` WHERE `self` AND `uid` = %d", intval($uid)); - if ($r) + + if (DBM::is_result($r)) { $arr["contact-id"] = $r[0]["id"]; + } } + logger("Contact-id was missing for post ".$arr["guid"]." from user id ".$uid." - now set to ".$arr["contact-id"], LOGGER_DEBUG); } - if ($arr["gcontact-id"] == 0) { - // The gcontact should mostly behave like the contact. But is is supposed to be global for the system. - // This means that wall posts, repeated posts, etc. should have the gcontact id of the owner. - // On comments the author is the better choice. - if ($arr['parent-uri'] === $arr['uri']) - $arr["gcontact-id"] = get_gcontact_id(array("url" => $arr['owner-link'], "network" => $arr['network'], - "photo" => $arr['owner-avatar'], "name" => $arr['owner-name'])); - else - $arr["gcontact-id"] = get_gcontact_id(array("url" => $arr['author-link'], "network" => $arr['network'], - "photo" => $arr['author-avatar'], "name" => $arr['author-name'])); + if (!x($arr, "gcontact-id")) { + /* + * The gcontact should mostly behave like the contact. But is is supposed to be global for the system. + * This means that wall posts, repeated posts, etc. should have the gcontact id of the owner. + * On comments the author is the better choice. + */ + if ($arr['parent-uri'] === $arr['uri']) { + $arr["gcontact-id"] = GContact::getId(["url" => $arr['owner-link'], "network" => $arr['network'], + "photo" => $arr['owner-avatar'], "name" => $arr['owner-name']]); + } else { + $arr["gcontact-id"] = GContact::getId(["url" => $arr['author-link'], "network" => $arr['network'], + "photo" => $arr['author-avatar'], "name" => $arr['author-name']]); + } + } + + if ($arr["author-id"] == 0) { + $arr["author-id"] = Contact::getIdForURL($arr["author-link"], 0); + } + + if (Contact::isBlocked($arr["author-id"])) { + logger('Contact '.$arr["author-id"].' is blocked, item '.$arr["uri"].' will not be stored'); + return 0; } - if ($arr["author-id"] == 0) - $arr["author-id"] = get_contact($arr["author-link"], 0); + if ($arr["owner-id"] == 0) { + $arr["owner-id"] = Contact::getIdForURL($arr["owner-link"], 0); + } - if ($arr["owner-id"] == 0) - $arr["owner-id"] = get_contact($arr["owner-link"], 0); + if (Contact::isBlocked($arr["owner-id"])) { + logger('Contact '.$arr["owner-id"].' is blocked, item '.$arr["uri"].' will not be stored'); + return 0; + } if ($arr['guid'] != "") { // Checking if there is already an item with the same guid @@ -631,7 +603,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa $r = q("SELECT `guid` FROM `item` WHERE `guid` = '%s' AND `network` = '%s' AND `uid` = '%d' LIMIT 1", dbesc($arr['guid']), dbesc($arr['network']), intval($arr['uid'])); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { logger('found item with guid '.$arr['guid'].' for user '.$arr['uid'].' on network '.$arr['network'], LOGGER_DEBUG); return 0; } @@ -641,6 +613,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa item_body_set_hashtags($arr); $arr['thr-parent'] = $arr['parent-uri']; + if ($arr['parent-uri'] === $arr['uri']) { $parent_id = 0; $parent_deleted = 0; @@ -659,7 +632,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa intval($arr['uid']) ); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { // is the new message multi-level threaded? // even though we don't support it now, preserve the info @@ -673,8 +646,10 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa dbesc($r[0]['parent-uri']), intval($arr['uid']) ); - if ($z && count($z)) + + if (DBM::is_result($z)) { $r = $z; + } } $parent_id = $r[0]['id']; @@ -686,38 +661,40 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa $arr['wall'] = $r[0]['wall']; $notify_type = 'comment-new'; - // if the parent is private, force privacy for the entire conversation - // This differs from the above settings as it subtly allows comments from - // email correspondents to be private even if the overall thread is not. - - if ($r[0]['private']) + /* + * If the parent is private, force privacy for the entire conversation + * This differs from the above settings as it subtly allows comments from + * email correspondents to be private even if the overall thread is not. + */ + if ($r[0]['private']) { $arr['private'] = $r[0]['private']; + } - // Edge case. We host a public forum that was originally posted to privately. - // The original author commented, but as this is a comment, the permissions - // weren't fixed up so it will still show the comment as private unless we fix it here. - - if ((intval($r[0]['forum_mode']) == 1) && (! $r[0]['private'])) + /* + * Edge case. We host a public forum that was originally posted to privately. + * The original author commented, but as this is a comment, the permissions + * weren't fixed up so it will still show the comment as private unless we fix it here. + */ + if ((intval($r[0]['forum_mode']) == 1) && $r[0]['private']) { $arr['private'] = 0; - + } // If its a post from myself then tag the thread as "mention" logger("item_store: Checking if parent ".$parent_id." has to be tagged as mention for user ".$arr['uid'], LOGGER_DEBUG); $u = q("SELECT `nickname` FROM `user` WHERE `uid` = %d", intval($arr['uid'])); - if (count($u)) { - $a = get_app(); - $self = normalise_link(App::get_baseurl() . '/profile/' . $u[0]['nickname']); + if (DBM::is_result($u)) { + $self = normalise_link(System::baseUrl() . '/profile/' . $u[0]['nickname']); logger("item_store: 'myself' is ".$self." for parent ".$parent_id." checking against ".$arr['author-link']." and ".$arr['owner-link'], LOGGER_DEBUG); - if ((normalise_link($arr['author-link']) == $self) OR (normalise_link($arr['owner-link']) == $self)) { - q("UPDATE `thread` SET `mention` = 1 WHERE `iid` = %d", intval($parent_id)); + if ((normalise_link($arr['author-link']) == $self) || (normalise_link($arr['owner-link']) == $self)) { + dba::update('thread', ['mention' => true], ['iid' => $parent_id]); logger("item_store: tagged thread ".$parent_id." as mention for user ".$self, LOGGER_DEBUG); } } } else { - - // Allow one to see reply tweets from status.net even when - // we don't have or can't see the original post. - + /* + * Allow one to see reply tweets from status.net even when + * we don't have or can't see the original post. + */ if ($force_parent) { logger('item_store: $force_parent=true, reply converted to top-level post.'); $parent_id = 0; @@ -738,18 +715,18 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa dbesc(NETWORK_DFRN), intval($arr['uid']) ); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { logger('duplicated item with the same uri found. '.print_r($arr,true)); return 0; } // On Friendica and Diaspora the GUID is unique - if (in_array($arr['network'], array(NETWORK_DFRN, NETWORK_DIASPORA))) { + if (in_array($arr['network'], [NETWORK_DFRN, NETWORK_DIASPORA])) { $r = q("SELECT `id` FROM `item` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1", dbesc($arr['guid']), intval($arr['uid']) ); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { logger('duplicated item with the same guid found. '.print_r($arr,true)); return 0; } @@ -762,7 +739,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa intval($arr['contact-id']), intval($arr['uid']) ); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { logger('duplicated item with the same body found. '.print_r($arr,true)); return 0; } @@ -773,18 +750,19 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa $arr["global"] = true; // Set the global flag on all items if this was a global item entry - q("UPDATE `item` SET `global` = 1 WHERE `uri` = '%s'", dbesc($arr["uri"])); + dba::update('item', ['global' => true], ['uri' => $arr["uri"]]); } else { $isglobal = q("SELECT `global` FROM `item` WHERE `uid` = 0 AND `uri` = '%s'", dbesc($arr["uri"])); - $arr["global"] = (count($isglobal) > 0); + $arr["global"] = (DBM::is_result($isglobal) && count($isglobal) > 0); } // ACL settings - if (strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid)) + if (strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid)) { $private = 1; - else + } else { $private = $arr['private']; + } $arr["allow_cid"] = $allow_cid; $arr["allow_gid"] = $allow_gid; @@ -796,58 +774,45 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa // Fill the cache field put_item_in_cache($arr); - if ($notify) - call_hooks('post_local',$arr); - else - call_hooks('post_remote',$arr); + if ($notify) { + Addon::callHooks('post_local', $arr); + } else { + Addon::callHooks('post_remote', $arr); + } + + // This array field is used to trigger some automatic reactions + // It is mainly used in the "post_local" hook. + unset($arr['api_source']); - if (x($arr,'cancel')) { - logger('item_store: post cancelled by plugin.'); + if (x($arr, 'cancel')) { + logger('item_store: post cancelled by addon.'); return 0; } - // Check for already added items. - // There is a timing issue here that sometimes creates double postings. - // An unique index would help - but the limitations of MySQL (maximum size of index values) prevent this. + /* + * Check for already added items. + * There is a timing issue here that sometimes creates double postings. + * An unique index would help - but the limitations of MySQL (maximum size of index values) prevent this. + */ if ($arr["uid"] == 0) { - $r = qu("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc(trim($arr['uri']))); - if (dbm::is_result($r)) { + $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc(trim($arr['uri']))); + if (DBM::is_result($r)) { logger('Global item already stored. URI: '.$arr['uri'].' on network '.$arr['network'], LOGGER_DEBUG); return 0; } } - // Store the unescaped version - $unescaped = $arr; - - dbesc_array($arr); - logger('item_store: ' . print_r($arr,true), LOGGER_DATA); - q("COMMIT"); - q("START TRANSACTION;"); - - $r = dbq("INSERT INTO `item` (`" - . implode("`, `", array_keys($arr)) - . "`) VALUES ('" - . implode("', '", array_values($arr)) - . "')"); - - // And restore it - $arr = $unescaped; + dba::transaction(); + $r = dba::insert('item', $arr); // When the item was successfully stored we fetch the ID of the item. - if (dbm::is_result($r)) { - $r = q("SELECT LAST_INSERT_ID() AS `item-id`"); - if (dbm::is_result($r)) { - $current_post = $r[0]['item-id']; - } else { - // This shouldn't happen - $current_post = 0; - } + if (DBM::is_result($r)) { + $current_post = dba::lastInsertId(); } else { // This can happen - for example - if there are locking timeouts. - q("ROLLBACK"); + dba::rollback(); // Store the data into a spool file so that we can try again later. @@ -857,17 +822,22 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa } // Now we store the data in the spool directory - $file = 'item-'.round(microtime(true) * 10000).".msg"; - $spool = get_spoolpath().'/'.$file; - file_put_contents($spool, json_encode($arr)); - logger("Item wasn't stored - Item was spooled into file ".$file, LOGGER_DEBUG); + // 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(); + if ($spoolpath != "") { + $spool = $spoolpath.'/'.$file; + file_put_contents($spool, json_encode($arr)); + logger("Item wasn't stored - Item was spooled into file ".$file, LOGGER_DEBUG); + } return 0; } if ($current_post == 0) { // This is one of these error messages that never should occur. logger("couldn't find created item - we better quit now."); - q("ROLLBACK"); + dba::rollback(); return 0; } @@ -879,88 +849,82 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa dbesc($arr['network']) ); - if (!dbm::is_result($r)) { + if (!DBM::is_result($r)) { // This shouldn't happen, since COUNT always works when the database connection is there. logger("We couldn't count the stored entries. Very strange ..."); - q("ROLLBACK"); + dba::rollback(); return 0; } if ($r[0]["entries"] > 1) { // There are duplicates. We delete our just created entry. - logger('Duplicated post occurred. uri = '.$arr['uri'].' uid = '.$arr['uid']); + logger('Duplicated post occurred. uri = ' . $arr['uri'] . ' uid = ' . $arr['uid']); // Yes, we could do a rollback here - but we are having many users with MyISAM. - q("DELETE FROM `item` WHERE `id` = %d", intval($current_post)); - q("COMMIT"); + dba::delete('item', ['id' => $current_post]); + dba::commit(); return 0; } elseif ($r[0]["entries"] == 0) { // This really should never happen since we quit earlier if there were problems. logger("Something is terribly wrong. We haven't found our created entry."); - q("ROLLBACK"); + dba::rollback(); return 0; } logger('item_store: created item '.$current_post); - item_set_last_item($arr); + Item::updateContact($arr); - if (!$parent_id || ($arr['parent-uri'] === $arr['uri'])) + if (!$parent_id || ($arr['parent-uri'] === $arr['uri'])) { $parent_id = $current_post; + } // Set parent id - $r = q("UPDATE `item` SET `parent` = %d WHERE `id` = %d", - intval($parent_id), - intval($current_post) - ); + dba::update('item', ['parent' => $parent_id], ['id' => $current_post]); $arr['id'] = $current_post; $arr['parent'] = $parent_id; // update the commented timestamp on the parent // Only update "commented" if it is really a comment - if (($arr['verb'] == ACTIVITY_POST) OR !get_config("system", "like_no_comment")) - q("UPDATE `item` SET `commented` = '%s', `changed` = '%s' WHERE `id` = %d", - dbesc(datetime_convert()), - dbesc(datetime_convert()), - intval($parent_id) - ); - else - q("UPDATE `item` SET `changed` = '%s' WHERE `id` = %d", - dbesc(datetime_convert()), - intval($parent_id) - ); + if (($arr['verb'] == ACTIVITY_POST) || !Config::get("system", "like_no_comment")) { + dba::update('item', ['commented' => datetime_convert(), 'changed' => datetime_convert()], ['id' => $parent_id]); + } else { + dba::update('item', ['changed' => datetime_convert()], ['id' => $parent_id]); + } if ($dsprsig) { - // Friendica servers lower than 3.4.3-2 had double encoded the signature ... - // We can check for this condition when we decode and encode the stuff again. + /* + * Friendica servers lower than 3.4.3-2 had double encoded the signature ... + * We can check for this condition when we decode and encode the stuff again. + */ if (base64_encode(base64_decode(base64_decode($dsprsig->signature))) == base64_decode($dsprsig->signature)) { $dsprsig->signature = base64_decode($dsprsig->signature); logger("Repaired double encoded signature from handle ".$dsprsig->signer, LOGGER_DEBUG); } - q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ", - intval($current_post), - dbesc($dsprsig->signed_text), - dbesc($dsprsig->signature), - dbesc($dsprsig->signer) - ); + dba::insert('sign', ['iid' => $current_post, 'signed_text' => $dsprsig->signed_text, + 'signature' => $dsprsig->signature, 'signer' => $dsprsig->signer]); } - $deleted = tag_deliver($arr['uid'],$current_post); + $deleted = tag_deliver($arr['uid'], $current_post); - // current post can be deleted if is for a community page and no mention are - // in it. - if (!$deleted AND !$dontcache) { + /* + * current post can be deleted if is for a community page and no mention are + * in it. + */ + if (!$deleted && !$dontcache) { - $r = q('SELECT * FROM `item` WHERE id = %d', intval($current_post)); - if (count($r) == 1) { - if ($notify) - call_hooks('post_local_end', $r[0]); - else - call_hooks('post_remote_end', $r[0]); - } else + $r = q('SELECT * FROM `item` WHERE `id` = %d', intval($current_post)); + if ((DBM::is_result($r)) && (count($r) == 1)) { + if ($notify) { + Addon::callHooks('post_local_end', $r[0]); + } else { + Addon::callHooks('post_remote_end', $r[0]); + } + } else { logger('item_store: new item not found in DB, id ' . $current_post); + } } if ($arr['parent-uri'] === $arr['uri']) { @@ -969,144 +933,90 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa update_thread($parent_id); } - q("COMMIT"); + dba::commit(); - // Due to deadlock issues with the "term" table we are doing these steps after the commit. - // This is not perfect - but a workable solution until we found the reason for the problem. + /* + * Due to deadlock issues with the "term" table we are doing these steps after the commit. + * This is not perfect - but a workable solution until we found the reason for the problem. + */ create_tags_from_item($current_post); - create_files_from_item($current_post); - - // If this is now the last-child, force all _other_ children of this parent to *not* be last-child - // It is done after the transaction to avoid dead locks. - if ($arr['last-child']) { - $r = q("UPDATE `item` SET `last-child` = 0 WHERE `parent-uri` = '%s' AND `uid` = %d AND `id` != %d", - dbesc($arr['uri']), - intval($arr['uid']), - intval($current_post) - ); - } + Term::createFromItem($current_post); if ($arr['parent-uri'] === $arr['uri']) { - add_shadow_thread($current_post); + Item::addShadow($current_post); } else { - add_shadow_entry($current_post); + Item::addShadowPost($current_post); } - check_item_notification($current_post, $uid); - - if ($notify) - proc_run(PRIORITY_HIGH, "include/notifier.php", $notify_type, $current_post); - - return $current_post; -} - -/** - * @brief Set "success_update" and "last-item" to the date of the last time we heard from this contact - * - * This can be used to filter for inactive contacts. - * Only do this for public postings to avoid privacy problems, since poco data is public. - * Don't set this value if it isn't from the owner (could be an author that we don't know) - * - * @param array $arr Contains the just posted item record - */ -function item_set_last_item($arr) { - - $update = (!$arr['private'] AND (($arr["author-link"] === $arr["owner-link"]) OR ($arr["parent-uri"] === $arr["uri"]))); + check_user_notification($current_post); - // Is it a forum? Then we don't care about the rules from above - if (!$update AND ($arr["network"] == NETWORK_DFRN) AND ($arr["parent-uri"] === $arr["uri"])) { - $isforum = q("SELECT `forum` FROM `contact` WHERE `id` = %d AND `forum`", - intval($arr['contact-id'])); - if ($isforum) { - $update = true; - } - } - - if ($update) { - q("UPDATE `contact` SET `success_update` = '%s', `last-item` = '%s' WHERE `id` = %d", - dbesc($arr['received']), - dbesc($arr['received']), - intval($arr['contact-id']) - ); + if ($notify) { + Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], "Notifier", $notify_type, $current_post); } - // Now do the same for the system wide contacts with uid=0 - if (!$arr['private']) { - q("UPDATE `contact` SET `success_update` = '%s', `last-item` = '%s' WHERE `id` = %d", - dbesc($arr['received']), - dbesc($arr['received']), - intval($arr['owner-id']) - ); - if ($arr['owner-id'] != $arr['author-id']) { - q("UPDATE `contact` SET `success_update` = '%s', `last-item` = '%s' WHERE `id` = %d", - dbesc($arr['received']), - dbesc($arr['received']), - intval($arr['author-id']) - ); - } - } + return $current_post; } +/// @TODO move to src/Model/Item.php function item_body_set_hashtags(&$item) { $tags = get_tags($item["body"]); // No hashtags? - if (!count($tags)) - return(false); + if (!count($tags)) { + return false; + } // This sorting is important when there are hashtags that are part of other hashtags // Otherwise there could be problems with hashtags like #test and #test2 rsort($tags); - $a = get_app(); - $URLSearchString = "^\[\]"; - // All hashtags should point to the home server - //$item["body"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", - // "#[url=".App::get_baseurl()."/search?tag=$2]$2[/url]", $item["body"]); + // All hashtags should point to the home server if "local_tags" is activated + if (Config::get('system', 'local_tags')) { + $item["body"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", + "#[url=".System::baseUrl()."/search?tag=$2]$2[/url]", $item["body"]); - //$item["tag"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", - // "#[url=".App::get_baseurl()."/search?tag=$2]$2[/url]", $item["tag"]); + $item["tag"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", + "#[url=".System::baseUrl()."/search?tag=$2]$2[/url]", $item["tag"]); + } // mask hashtags inside of url, bookmarks and attachments to avoid urls in urls $item["body"] = preg_replace_callback("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", - function ($match){ - return("[url=".str_replace("#", "#", $match[1])."]".str_replace("#", "#", $match[2])."[/url]"); - },$item["body"]); + function ($match) { + return ("[url=" . str_replace("#", "#", $match[1]) . "]" . str_replace("#", "#", $match[2]) . "[/url]"); + }, $item["body"]); $item["body"] = preg_replace_callback("/\[bookmark\=([$URLSearchString]*)\](.*?)\[\/bookmark\]/ism", - function ($match){ - return("[bookmark=".str_replace("#", "#", $match[1])."]".str_replace("#", "#", $match[2])."[/bookmark]"); - },$item["body"]); + function ($match) { + return ("[bookmark=" . str_replace("#", "#", $match[1]) . "]" . str_replace("#", "#", $match[2]) . "[/bookmark]"); + }, $item["body"]); $item["body"] = preg_replace_callback("/\[attachment (.*)\](.*?)\[\/attachment\]/ism", - function ($match){ - return("[attachment ".str_replace("#", "#", $match[1])."]".$match[2]."[/attachment]"); - },$item["body"]); + function ($match) { + return ("[attachment " . str_replace("#", "#", $match[1]) . "]" . $match[2] . "[/attachment]"); + }, $item["body"]); // Repair recursive urls $item["body"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", "#$2", $item["body"]); - - foreach($tags as $tag) { - if (strpos($tag,'#') !== 0) - continue; - - if (strpos($tag,'[url=')) + foreach ($tags as $tag) { + if ((strpos($tag, '#') !== 0) || (strpos($tag, '[url='))) { continue; + } $basetag = str_replace('_',' ',substr($tag,1)); - $newtag = '#[url='.App::get_baseurl().'/search?tag='.rawurlencode($basetag).']'.$basetag.'[/url]'; + $newtag = '#[url=' . System::baseUrl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]'; $item["body"] = str_replace($tag, $newtag, $item["body"]); - if (!stristr($item["tag"],"/search?tag=".$basetag."]".$basetag."[/url]")) { - if (strlen($item["tag"])) + if (!stristr($item["tag"], "/search?tag=" . $basetag . "]" . $basetag . "[/url]")) { + if (strlen($item["tag"])) { $item["tag"] = ','.$item["tag"]; + } $item["tag"] = $newtag.$item["tag"]; } } @@ -1115,28 +1025,33 @@ function item_body_set_hashtags(&$item) { $item["body"] = str_replace("#", "#", $item["body"]); } +/// @TODO move to src/Model/Item.php function get_item_guid($id) { $r = q("SELECT `guid` FROM `item` WHERE `id` = %d LIMIT 1", intval($id)); - if (dbm::is_result($r)) - return($r[0]["guid"]); - else - return(""); + if (DBM::is_result($r)) { + return $r[0]["guid"]; + } else { + /// @TODO This else-block can be elimited again + return ""; + } } +/// @TODO move to src/Model/Item.php function get_item_id($guid, $uid = 0) { $nick = ""; $id = 0; - if ($uid == 0) + if ($uid == 0) { $uid == local_user(); + } // Does the given user have this item? if ($uid) { $r = q("SELECT `item`.`id`, `user`.`nickname` FROM `item` INNER JOIN `user` ON `user`.`uid` = `item`.`uid` - WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 + WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `item`.`moderated` = 0 AND `item`.`guid` = '%s' AND `item`.`uid` = %d", dbesc($guid), intval($uid)); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { $id = $r[0]["id"]; $nick = $r[0]["nickname"]; } @@ -1145,27 +1060,28 @@ function get_item_id($guid, $uid = 0) { // Or is it anywhere on the server? if ($nick == "") { $r = q("SELECT `item`.`id`, `user`.`nickname` FROM `item` INNER JOIN `user` ON `user`.`uid` = `item`.`uid` - WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 + WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `item`.`moderated` = 0 AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `item`.`guid` = '%s'", dbesc($guid)); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { $id = $r[0]["id"]; $nick = $r[0]["nickname"]; } } - return(array("nick" => $nick, "id" => $id)); + return ["nick" => $nick, "id" => $id]; } // return - test -function get_item_contact($item,$contacts) { - if (! count($contacts) || (! is_array($item))) +/// @TODO move to src/Model/Item.php +function get_item_contact($item, $contacts) { + if (! count($contacts) || (! is_array($item))) { return false; - foreach($contacts as $contact) { + } + foreach ($contacts as $contact) { if ($contact['id'] == $item['contact-id']) { return $contact; - break; // NOTREACHED } } return false; @@ -1177,88 +1093,85 @@ function get_item_contact($item,$contacts) { * @param int $item_id * @return bool true if item was deleted, else false */ -function tag_deliver($uid,$item_id) { - - // - - $a = get_app(); - +/// @TODO move to src/Model/Item.php +function tag_deliver($uid, $item_id) +{ $mention = false; - $u = q("select * from user where uid = %d limit 1", + $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid) ); - if (! count($u)) + if (! DBM::is_result($u)) { return; + } $community_page = (($u[0]['page-flags'] == PAGE_COMMUNITY) ? true : false); $prvgroup = (($u[0]['page-flags'] == PAGE_PRVGROUP) ? true : false); - - $i = q("select * from item where id = %d and uid = %d limit 1", + $i = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($item_id), intval($uid) ); - if (! count($i)) + if (! DBM::is_result($i)) { return; + } $item = $i[0]; - $link = normalise_link(App::get_baseurl() . '/profile/' . $u[0]['nickname']); + $link = normalise_link(System::baseUrl() . '/profile/' . $u[0]['nickname']); - // Diaspora uses their own hardwired link URL in @-tags - // instead of the one we supply with webfinger + /* + * Diaspora uses their own hardwired link URL in @-tags + * instead of the one we supply with webfinger + */ + $dlink = normalise_link(System::baseUrl() . '/u/' . $u[0]['nickname']); - $dlink = normalise_link(App::get_baseurl() . '/u/' . $u[0]['nickname']); - - $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER); + $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism', $item['body'], $matches, PREG_SET_ORDER); if ($cnt) { - foreach($matches as $mtch) { - if (link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) { + foreach ($matches as $mtch) { + if (link_compare($link, $mtch[1]) || link_compare($dlink, $mtch[1])) { $mention = true; logger('tag_deliver: mention found: ' . $mtch[2]); } } } - if (! $mention){ - if ( ($community_page || $prvgroup) && - (!$item['wall']) && (!$item['origin']) && ($item['id'] == $item['parent'])){ + if (! $mention) { + if (($community_page || $prvgroup) && + (!$item['wall']) && (!$item['origin']) && ($item['id'] == $item['parent'])) { // mmh.. no mention.. community page or private group... no wall.. no origin.. top-post (not a comment) // delete it! logger("tag_deliver: no-mention top-level post to communuty or private group. delete."); - q("DELETE FROM item WHERE id = %d and uid = %d", - intval($item_id), - intval($uid) - ); + dba::delete('item', ['id' => $item_id]); return true; } return; } - $arr = array('item' => $item, 'user' => $u[0], 'contact' => $r[0]); + $arr = ['item' => $item, 'user' => $u[0], 'contact' => $r[0]]; - call_hooks('tagged', $arr); + Addon::callHooks('tagged', $arr); - if ((! $community_page) && (! $prvgroup)) + if ((! $community_page) && (! $prvgroup)) { return; + } - - // tgroup delivery - setup a second delivery chain - // prevent delivery looping - only proceed - // if the message originated elsewhere and is a top-level post - - if (($item['wall']) || ($item['origin']) || ($item['id'] != $item['parent'])) + /* + * tgroup delivery - setup a second delivery chain + * prevent delivery looping - only proceed + * if the message originated elsewhere and is a top-level post + */ + if (($item['wall']) || ($item['origin']) || ($item['id'] != $item['parent'])) { return; + } // now change this copy of the post to a forum head message and deliver to all the tgroup members - - - $c = q("select name, url, thumb from contact where self = 1 and uid = %d limit 1", + $c = q("SELECT `name`, `url`, `thumb` FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", intval($u[0]['uid']) ); - if (! count($c)) + if (! DBM::is_result($c)) { return; + } // also reset all the privacy bits to the forum default permissions @@ -1266,8 +1179,8 @@ function tag_deliver($uid,$item_id) { $forum_mode = (($prvgroup) ? 2 : 1); - q("update item set wall = 1, origin = 1, forum_mode = %d, `owner-name` = '%s', `owner-link` = '%s', `owner-avatar` = '%s', - `private` = %d, `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' where id = %d", + q("UPDATE `item` SET `wall` = 1, `origin` = 1, `forum_mode` = %d, `owner-name` = '%s', `owner-link` = '%s', `owner-avatar` = '%s', + `private` = %d, `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' WHERE `id` = %d", intval($forum_mode), dbesc($c[0]['name']), dbesc($c[0]['url']), @@ -1281,78 +1194,80 @@ function tag_deliver($uid,$item_id) { ); update_thread($item_id); - proc_run(PRIORITY_HIGH,'include/notifier.php', 'tgroup', $item_id); + Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], 'Notifier', 'tgroup', $item_id); } - - -function tgroup_check($uid,$item) { - - $a = get_app(); +/// @TODO move to src/Protocol/DFRN.php +function tgroup_check($uid, $item) { $mention = false; // check that the message originated elsewhere and is a top-level post - if (($item['wall']) || ($item['origin']) || ($item['uri'] != $item['parent-uri'])) + if (($item['wall']) || ($item['origin']) || ($item['uri'] != $item['parent-uri'])) { return false; + } - - $u = q("select * from user where uid = %d limit 1", + /// @TODO Encapsulate this or find it encapsulated and replace all occurrances + $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid) ); - if (! count($u)) + if (! DBM::is_result($u)) { return false; + } $community_page = (($u[0]['page-flags'] == PAGE_COMMUNITY) ? true : false); $prvgroup = (($u[0]['page-flags'] == PAGE_PRVGROUP) ? true : false); + $link = normalise_link(System::baseUrl() . '/profile/' . $u[0]['nickname']); - $link = normalise_link(App::get_baseurl() . '/profile/' . $u[0]['nickname']); - - // Diaspora uses their own hardwired link URL in @-tags - // instead of the one we supply with webfinger - - $dlink = normalise_link(App::get_baseurl() . '/u/' . $u[0]['nickname']); + /* + * Diaspora uses their own hardwired link URL in @-tags + * instead of the one we supply with webfinger + */ + $dlink = normalise_link(System::baseUrl() . '/u/' . $u[0]['nickname']); - $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER); + $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism', $item['body'], $matches, PREG_SET_ORDER); if ($cnt) { - foreach($matches as $mtch) { - if (link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) { + foreach ($matches as $mtch) { + if (link_compare($link, $mtch[1]) || link_compare($dlink, $mtch[1])) { $mention = true; logger('tgroup_check: mention found: ' . $mtch[2]); } } } - if (! $mention) - return false; - - if ((! $community_page) && (! $prvgroup)) + if (! $mention) { return false; + } - return true; + /// @TODO Combine both return statements into one + return (($community_page) || ($prvgroup)); } -/* - This function returns true if $update has an edited timestamp newer - than $existing, i.e. $update contains new data which should override - what's already there. If there is no timestamp yet, the update is - assumed to be newer. If the update has no timestamp, the existing - item is assumed to be up-to-date. If the timestamps are equal it - assumes the update has been seen before and should be ignored. - */ +/** + * This function returns true if $update has an edited timestamp newer + * than $existing, i.e. $update contains new data which should override + * what's already there. If there is no timestamp yet, the update is + * assumed to be newer. If the update has no timestamp, the existing + * item is assumed to be up-to-date. If the timestamps are equal it + * assumes the update has been seen before and should be ignored. + * + * @TODO fix type-hints (both array) + */ +/// @TODO move to src/Protocol/DFRN.php function edited_timestamp_is_newer($existing, $update) { - if (!x($existing,'edited') || !$existing['edited']) { - return true; - } - if (!x($update,'edited') || !$update['edited']) { - return false; - } - $existing_edited = datetime_convert('UTC', 'UTC', $existing['edited']); - $update_edited = datetime_convert('UTC', 'UTC', $update['edited']); - return (strcmp($existing_edited, $update_edited) < 0); + if (!x($existing, 'edited') || !$existing['edited']) { + return true; + } + if (!x($update, 'edited') || !$update['edited']) { + return false; + } + + $existing_edited = datetime_convert('UTC', 'UTC', $existing['edited']); + $update_edited = datetime_convert('UTC', 'UTC', $update['edited']); + return (strcmp($existing_edited, $update_edited) < 0); } /** @@ -1380,16 +1295,18 @@ function edited_timestamp_is_newer($existing, $update) { * 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. + * + * @TODO find proper type-hints */ - -function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) { +/// @TODO move to ??? +function consume_feed($xml, $importer, &$contact, &$hub, $datedir = 0, $pass = 0) { if ($contact['network'] === NETWORK_OSTATUS) { if ($pass < 2) { // Test - remove before flight //$tempfile = tempnam(get_temppath(), "ostatus2"); //file_put_contents($tempfile, $xml); logger("Consume OStatus messages ", LOGGER_DEBUG); - ostatus::import($xml,$importer,$contact, $hub); + OStatus::import($xml, $importer, $contact, $hub); } return; } @@ -1397,7 +1314,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) if ($contact['network'] === NETWORK_FEED) { if ($pass < 2) { logger("Consume feeds", LOGGER_DEBUG); - feed_import($xml,$importer,$contact, $hub); + Feed::import($xml, $importer, $contact, $hub); } return; } @@ -1405,7 +1322,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) if ($contact['network'] === NETWORK_DFRN) { logger("Consume DFRN messages", LOGGER_DEBUG); - $r = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`, + $r = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`, `contact`.`pubkey` AS `cpubkey`, `contact`.`prvkey` AS `cprvkey`, `contact`.`thumb` AS `thumb`, @@ -1417,41 +1334,48 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) WHERE `contact`.`id` = %d AND `user`.`uid` = %d", dbesc($contact["id"]), dbesc($importer["uid"]) ); - if ($r) { + if (DBM::is_result($r)) { logger("Now import the DFRN feed"); - dfrn::import($xml,$r[0], true); + DFRN::import($xml, $r[0], true); return; } } } +/// @TODO type-hint is array +/// @TODO move to src/Model/Item.php function item_is_remote_self($contact, &$datarray) { $a = get_app(); - if (!$contact['remote_self']) + if (!$contact['remote_self']) { return false; + } // Prevent the forwarding of posts that are forwarded - if ($datarray["extid"] == NETWORK_DFRN) + if ($datarray["extid"] == NETWORK_DFRN) { return false; + } // Prevent to forward already forwarded posts - if ($datarray["app"] == $a->get_hostname()) + if ($datarray["app"] == $a->get_hostname()) { return false; + } // Only forward posts - if ($datarray["verb"] != ACTIVITY_POST) + if ($datarray["verb"] != ACTIVITY_POST) { return false; + } - if (($contact['network'] != NETWORK_FEED) AND $datarray['private']) + if (($contact['network'] != NETWORK_FEED) && $datarray['private']) { return false; + } $datarray2 = $datarray; logger('remote-self start - Contact '.$contact['url'].' - '.$contact['remote_self'].' Item '.print_r($datarray, true), LOGGER_DEBUG); if ($contact['remote_self'] == 2) { $r = q("SELECT `id`,`url`,`name`,`thumb` FROM `contact` WHERE `uid` = %d AND `self`", intval($contact['uid'])); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { $datarray['contact-id'] = $r[0]["id"]; $datarray['owner-name'] = $r[0]["name"]; @@ -1461,57 +1385,68 @@ function item_is_remote_self($contact, &$datarray) { $datarray['author-name'] = $datarray['owner-name']; $datarray['author-link'] = $datarray['owner-link']; $datarray['author-avatar'] = $datarray['owner-avatar']; + + unset($datarray['created']); + unset($datarray['edited']); } if ($contact['network'] != NETWORK_FEED) { $datarray["guid"] = get_guid(32); unset($datarray["plink"]); - $datarray["uri"] = item_new_uri($a->get_hostname(),$contact['uid'], $datarray["guid"]); + $datarray["uri"] = item_new_uri($a->get_hostname(), $contact['uid'], $datarray["guid"]); $datarray["parent-uri"] = $datarray["uri"]; $datarray["extid"] = $contact['network']; $urlpart = parse_url($datarray2['author-link']); $datarray["app"] = $urlpart["host"]; - } else + } else { $datarray['private'] = 0; + } } if ($contact['network'] != NETWORK_FEED) { // Store the original post $r = item_store($datarray2, false, false); logger('remote-self post original item - Contact '.$contact['url'].' return '.$r.' Item '.print_r($datarray2, true), LOGGER_DEBUG); - } else + } else { $datarray["app"] = "Feed"; + } + + // Trigger automatic reactions for addons + $datarray['api_source'] = true; + + // We have to tell the hooks who we are - this really should be improved + $_SESSION["authenticated"] = true; + $_SESSION["uid"] = $contact['uid']; return true; } -function new_follower($importer,$contact,$datarray,$item,$sharing = false) { +/// @TODO find proper type-hints +/// @TODO move to src/Model/Item.php +function new_follower($importer, $contact, $datarray, $item, $sharing = false) { $url = notags(trim($datarray['author-link'])); $name = notags(trim($datarray['author-name'])); $photo = notags(trim($datarray['author-avatar'])); if (is_object($item)) { $rawtag = $item->get_item_tags(NAMESPACE_ACTIVITY,'actor'); - if ($rawtag && $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data']) + if ($rawtag && $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data']) { $nick = $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data']; - } else + } + } else { $nick = $item; + } if (is_array($contact)) { if (($contact['network'] == NETWORK_OSTATUS && $contact['rel'] == CONTACT_IS_SHARING) || ($sharing && $contact['rel'] == CONTACT_IS_FOLLOWER)) { - $r = q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d", - intval(CONTACT_IS_FRIEND), - intval($contact['id']), - intval($importer['uid']) - ); + dba::update('contact', ['rel' => CONTACT_IS_FRIEND, 'writable' => true], + ['id' => $contact['id'], 'uid' => $importer['uid']]); } // send email notification to owner? } else { - // create contact record - - $r = q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `name`, `nick`, `photo`, `network`, `rel`, + q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `name`, `nick`, `photo`, `network`, `rel`, `blocked`, `readonly`, `pending`, `writable`) VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, 1)", intval($importer['uid']), @@ -1521,65 +1456,56 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) { dbesc($name), dbesc($nick), dbesc($photo), - dbesc(($sharing) ? NETWORK_ZOT : NETWORK_OSTATUS), - intval(($sharing) ? CONTACT_IS_SHARING : CONTACT_IS_FOLLOWER) + dbesc(NETWORK_OSTATUS), + intval(CONTACT_IS_FOLLOWER) ); + $r = q("SELECT `id`, `network` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `pending` = 1 LIMIT 1", intval($importer['uid']), dbesc($url) ); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { $contact_record = $r[0]; - update_contact_avatar($photo, $importer["uid"], $contact_record["id"], true); + Contact::updateAvatar($photo, $importer["uid"], $contact_record["id"], true); } - + /// @TODO Encapsulate this into a function/method $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer['uid']) ); - $a = get_app(); - - if (dbm::is_result($r) AND !in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) { - + if (DBM::is_result($r) && !in_array($r[0]['page-flags'], [PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY])) { // create notification $hash = random_string(); if (is_array($contact_record)) { - $ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `hash`, `datetime`) - VALUES ( %d, %d, 0, 0, '%s', '%s' )", - intval($importer['uid']), - intval($contact_record['id']), - dbesc($hash), - dbesc(datetime_convert()) - ); + dba::insert('intro', ['uid' => $importer['uid'], 'contact-id' => $contact_record['id'], + 'blocked' => false, 'knowyou' => false, + 'hash' => $hash, 'datetime' => datetime_convert()]); } - $def_gid = get_default_group($importer['uid'], $contact_record["network"]); - - if (intval($def_gid)) - group_add_member($importer['uid'],'',$contact_record['id'],$def_gid); + Group::addMember(User::getDefaultGroup($importer['uid'], $contact_record["network"]), $contact_record['id']); if (($r[0]['notify-flags'] & NOTIFY_INTRO) && - in_array($r[0]['page-flags'], array(PAGE_NORMAL))) { + in_array($r[0]['page-flags'], [PAGE_NORMAL])) { - notification(array( + notification([ 'type' => NOTIFY_INTRO, 'notify_flags' => $r[0]['notify-flags'], 'language' => $r[0]['language'], 'to_name' => $r[0]['username'], 'to_email' => $r[0]['email'], 'uid' => $r[0]['uid'], - 'link' => App::get_baseurl() . '/notifications/intro', - 'source_name' => ((strlen(stripslashes($contact_record['name']))) ? stripslashes($contact_record['name']) : t('[Name Withheld]')), + 'link' => System::baseUrl() . '/notifications/intro', + 'source_name' => ((strlen(stripslashes($contact_record['name']))) ? stripslashes($contact_record['name']) : L10n::t('[Name Withheld]')), 'source_link' => $contact_record['url'], 'source_photo' => $contact_record['photo'], 'verb' => ($sharing ? ACTIVITY_FRIEND : ACTIVITY_FOLLOW), 'otype' => 'intro' - )); + ]); } - } elseif (dbm::is_result($r) AND in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) { - $r = q("UPDATE `contact` SET `pending` = 0 WHERE `uid` = %d AND `url` = '%s' AND `pending` LIMIT 1", + } elseif (DBM::is_result($r) && in_array($r[0]['page-flags'], [PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY])) { + q("UPDATE `contact` SET `pending` = 0 WHERE `uid` = %d AND `url` = '%s' AND `pending` LIMIT 1", intval($importer['uid']), dbesc($url) ); @@ -1588,31 +1514,28 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) { } } -function lose_follower($importer,$contact,$datarray = array(),$item = "") { +/// @TODO move to src/Model/Item.php +function lose_follower($importer, $contact, array $datarray = [], $item = "") { if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_SHARING)) { - q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d", - intval(CONTACT_IS_SHARING), - intval($contact['id']) - ); + dba::update('contact', ['rel' => CONTACT_IS_SHARING], ['id' => $contact['id']]); } else { - contact_remove($contact['id']); + Contact::remove($contact['id']); } } -function lose_sharer($importer,$contact,$datarray = array(),$item = "") { +/// @TODO move to src/Model/Item.php +function lose_sharer($importer, $contact, array $datarray = [], $item = "") { if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_FOLLOWER)) { - q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d", - intval(CONTACT_IS_FOLLOWER), - intval($contact['id']) - ); + dba::update('contact', ['rel' => CONTACT_IS_FOLLOWER], ['id' => $contact['id']]); } else { - contact_remove($contact['id']); + Contact::remove($contact['id']); } } -function subscribe_to_hub($url,$importer,$contact,$hubmode = 'subscribe') { +/// @TODO move to ??? +function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') { $a = get_app(); @@ -1622,31 +1545,29 @@ function subscribe_to_hub($url,$importer,$contact,$hubmode = 'subscribe') { ); } - // Diaspora has different message-ids in feeds than they do - // through the direct Diaspora protocol. If we try and use - // the feed, we'll get duplicates. So don't. - - if ((! dbm::is_result($r)) || $contact['network'] === NETWORK_DIASPORA) + /* + * Diaspora has different message-ids in feeds than they do + * through the direct Diaspora protocol. If we try and use + * the feed, we'll get duplicates. So don't. + */ + if ((! DBM::is_result($r)) || $contact['network'] === NETWORK_DIASPORA) { return; + } - $push_url = get_config('system','url') . '/pubsub/' . $r[0]['nickname'] . '/' . $contact['id']; + $push_url = Config::get('system','url') . '/pubsub/' . $r[0]['nickname'] . '/' . $contact['id']; // Use a single verify token, even if multiple hubs - $verify_token = ((strlen($contact['hub-verify'])) ? $contact['hub-verify'] : random_string()); $params= 'hub.mode=' . $hubmode . '&hub.callback=' . urlencode($push_url) . '&hub.topic=' . urlencode($contact['poll']) . '&hub.verify=async&hub.verify_token=' . $verify_token; logger('subscribe_to_hub: ' . $hubmode . ' ' . $contact['name'] . ' to hub ' . $url . ' endpoint: ' . $push_url . ' with verifier ' . $verify_token); - if (!strlen($contact['hub-verify']) OR ($contact['hub-verify'] != $verify_token)) { - $r = q("UPDATE `contact` SET `hub-verify` = '%s' WHERE `id` = %d", - dbesc($verify_token), - intval($contact['id']) - ); + if (!strlen($contact['hub-verify']) || ($contact['hub-verify'] != $verify_token)) { + dba::update('contact', ['hub-verify' => $verify_token], ['id' => $contact['id']]); } - post_url($url,$params); + post_url($url, $params); logger('subscribe_to_hub: returns: ' . $a->get_curl_code(), LOGGER_DEBUG); @@ -1654,15 +1575,23 @@ function subscribe_to_hub($url,$importer,$contact,$hubmode = 'subscribe') { } -function fix_private_photos($s, $uid, $item = null, $cid = 0) { - - if (get_config('system','disable_embedded')) +/** + * + * @param string $s + * @param int $uid + * @param array $item + * @param int $cid + * @return string + */ +/// @TODO move to src/Model/Item.php +function fix_private_photos($s, $uid, $item = null, $cid = 0) +{ + if (Config::get('system', 'disable_embedded')) { return $s; - - $a = get_app(); + } logger('fix_private_photos: check for photos', LOGGER_DEBUG); - $site = substr(App::get_baseurl(),strpos(App::get_baseurl(),'://')); + $site = substr(System::baseUrl(), strpos(System::baseUrl(), '://')); $orig_body = $s; $new_body = ''; @@ -1670,39 +1599,38 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { $img_start = strpos($orig_body, '[img'); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); $img_len = ($img_start !== false ? strpos(substr($orig_body, $img_start + $img_st_close + 1), '[/img]') : false); - while( ($img_st_close !== false) && ($img_len !== false) ) { + while (($img_st_close !== false) && ($img_len !== false)) { $img_st_close++; // make it point to AFTER the closing bracket $image = substr($orig_body, $img_start + $img_st_close, $img_len); logger('fix_private_photos: found photo ' . $image, LOGGER_DEBUG); - - if (stristr($image , $site . '/photo/')) { + if (stristr($image, $site . '/photo/')) { // Only embed locally hosted photos $replace = false; $i = basename($image); - $i = str_replace(array('.jpg','.png','.gif'),array('','',''),$i); - $x = strpos($i,'-'); + $i = str_replace(['.jpg', '.png', '.gif'], ['', '', ''], $i); + $x = strpos($i, '-'); if ($x) { - $res = substr($i,$x+1); - $i = substr($i,0,$x); + $res = substr($i, $x + 1); + $i = substr($i, 0, $x); $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` = %d AND `uid` = %d", dbesc($i), intval($res), intval($uid) ); - if ($r) { - - // Check to see if we should replace this photo link with an embedded image - // 1. No need to do so if the photo is public - // 2. If there's a contact-id provided, see if they're in the access list - // for the photo. If so, embed it. - // 3. Otherwise, if we have an item, see if the item permissions match the photo - // permissions, regardless of order but first check to see if they're an exact - // match to save some processing overhead. - + if (DBM::is_result($r)) { + /* + * Check to see if we should replace this photo link with an embedded image + * 1. No need to do so if the photo is public + * 2. If there's a contact-id provided, see if they're in the access list + * for the photo. If so, embed it. + * 3. Otherwise, if we have an item, see if the item permissions match the photo + * permissions, regardless of order but first check to see if they're an exact + * match to save some processing overhead. + */ if (has_permissions($r[0])) { if ($cid) { $recips = enumerate_permissions($r[0]); @@ -1710,8 +1638,9 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { $replace = true; } } elseif ($item) { - if (compare_permissions($item,$r[0])) + if (compare_permissions($item, $r[0])) { $replace = true; + } } } if ($replace) { @@ -1725,11 +1654,11 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { $width = intval($match[1]); $height = intval($match[2]); - $ph = new Photo($data, $type); - if ($ph->is_valid()) { - $ph->scaleImage(max($width, $height)); - $data = $ph->imageString(); - $type = $ph->getType(); + $Image = new Image($data, $type); + if ($Image->isValid()) { + $Image->scaleDown(max($width, $height)); + $data = $Image->asString(); + $type = $Image->getType(); } } @@ -1743,8 +1672,9 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { $new_body = $new_body . substr($orig_body, 0, $img_start + $img_st_close) . $image . '[/img]'; $orig_body = substr($orig_body, $img_start + $img_st_close + $img_len + strlen('[/img]')); - if ($orig_body === false) + if ($orig_body === false) { $orig_body = ''; + } $img_start = strpos($orig_body, '[img'); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); @@ -1753,87 +1683,110 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { $new_body = $new_body . $orig_body; - return($new_body); + return $new_body; } +/// @TODO type-hint is array +/// @TODO move to src/Model/Item.php function has_permissions($obj) { - if (($obj['allow_cid'] != '') || ($obj['allow_gid'] != '') || ($obj['deny_cid'] != '') || ($obj['deny_gid'] != '')) - return true; - return false; + return ( + ( + x($obj, 'allow_cid') + ) || ( + x($obj, 'allow_gid') + ) || ( + x($obj, 'deny_cid') + ) || ( + x($obj, 'deny_gid') + ) + ); } -function compare_permissions($obj1,$obj2) { +/// @TODO type-hint is array +/// @TODO move to src/Model/Item.php +function compare_permissions($obj1, $obj2) { // first part is easy. Check that these are exactly the same. if (($obj1['allow_cid'] == $obj2['allow_cid']) && ($obj1['allow_gid'] == $obj2['allow_gid']) && ($obj1['deny_cid'] == $obj2['deny_cid']) - && ($obj1['deny_gid'] == $obj2['deny_gid'])) + && ($obj1['deny_gid'] == $obj2['deny_gid'])) { return true; + } // This is harder. Parse all the permissions and compare the resulting set. - $recipients1 = enumerate_permissions($obj1); $recipients2 = enumerate_permissions($obj2); sort($recipients1); sort($recipients2); - if ($recipients1 == $recipients2) - return true; - return false; + + /// @TODO Comparison of arrays, maybe use array_diff_assoc() here? + return ($recipients1 == $recipients2); } // returns an array of contact-ids that are allowed to see this object - +/// @TODO type-hint is array +/// @TODO move to src/Model/Item.php function enumerate_permissions($obj) { $allow_people = expand_acl($obj['allow_cid']); - $allow_groups = expand_groups(expand_acl($obj['allow_gid'])); + $allow_groups = Group::expand(expand_acl($obj['allow_gid'])); $deny_people = expand_acl($obj['deny_cid']); - $deny_groups = expand_groups(expand_acl($obj['deny_gid'])); - $recipients = array_unique(array_merge($allow_people,$allow_groups)); - $deny = array_unique(array_merge($deny_people,$deny_groups)); - $recipients = array_diff($recipients,$deny); + $deny_groups = Group::expand(expand_acl($obj['deny_gid'])); + $recipients = array_unique(array_merge($allow_people, $allow_groups)); + $deny = array_unique(array_merge($deny_people, $deny_groups)); + $recipients = array_diff($recipients, $deny); return $recipients; } +/// @TODO move to src/Model/Item.php function item_getfeedtags($item) { - $ret = array(); + $ret = []; $matches = false; - $cnt = preg_match_all('|\#\[url\=(.*?)\](.*?)\[\/url\]|',$item['tag'],$matches); + $cnt = preg_match_all('|\#\[url\=(.*?)\](.*?)\[\/url\]|', $item['tag'], $matches); if ($cnt) { - for($x = 0; $x < $cnt; $x ++) { - if ($matches[1][$x]) - $ret[$matches[2][$x]] = array('#',$matches[1][$x], $matches[2][$x]); + for ($x = 0; $x < $cnt; $x ++) { + if ($matches[1][$x]) { + $ret[$matches[2][$x]] = ['#', $matches[1][$x], $matches[2][$x]]; + } } } $matches = false; - $cnt = preg_match_all('|\@\[url\=(.*?)\](.*?)\[\/url\]|',$item['tag'],$matches); + $cnt = preg_match_all('|\@\[url\=(.*?)\](.*?)\[\/url\]|', $item['tag'], $matches); if ($cnt) { - for($x = 0; $x < $cnt; $x ++) { - if ($matches[1][$x]) - $ret[] = array('@',$matches[1][$x], $matches[2][$x]); + for ($x = 0; $x < $cnt; $x ++) { + if ($matches[1][$x]) { + $ret[] = ['@', $matches[1][$x], $matches[2][$x]]; + } } } return $ret; } +/// @TODO move to src/Model/Item.php function item_expire($uid, $days, $network = "", $force = false) { - if ((! $uid) || ($days < 1)) + if (!$uid || ($days < 1)) { return; + } - // $expire_network_only = save your own wall posts - // and just expire conversations started by others - - $expire_network_only = get_pconfig($uid,'expire','network_only'); - $sql_extra = ((intval($expire_network_only)) ? " AND wall = 0 " : ""); + /* + * $expire_network_only = save your own wall posts + * and just expire conversations started by others + */ + $expire_network_only = PConfig::get($uid,'expire', 'network_only'); + $sql_extra = (intval($expire_network_only) ? " AND wall = 0 " : ""); if ($network != "") { $sql_extra .= sprintf(" AND network = '%s' ", dbesc($network)); - // There is an index "uid_network_received" but not "uid_network_created" - // This avoids the creation of another index just for one purpose. - // And it doesn't really matter wether to look at "received" or "created" + + /* + * There is an index "uid_network_received" but not "uid_network_created" + * This avoids the creation of another index just for one purpose. + * And it doesn't really matter wether to look at "received" or "created" + */ $range = "AND `received` < UTC_TIMESTAMP() - INTERVAL %d DAY "; - } else + } else { $range = "AND `created` < UTC_TIMESTAMP() - INTERVAL %d DAY "; + } $r = q("SELECT `file`, `resource-id`, `starred`, `type`, `id` FROM `item` WHERE `uid` = %d $range @@ -1844,75 +1797,67 @@ function item_expire($uid, $days, $network = "", $force = false) { intval($days) ); - if (! dbm::is_result($r)) + if (!DBM::is_result($r)) { return; + } - $expire_items = get_pconfig($uid, 'expire','items'); - $expire_items = (($expire_items===false)?1:intval($expire_items)); // default if not set: 1 + $expire_items = PConfig::get($uid, 'expire', 'items', 1); // Forcing expiring of items - but not notes and marked items - if ($force) + if ($force) { $expire_items = true; + } - $expire_notes = get_pconfig($uid, 'expire','notes'); - $expire_notes = (($expire_notes===false)?1:intval($expire_notes)); // default if not set: 1 - - $expire_starred = get_pconfig($uid, 'expire','starred'); - $expire_starred = (($expire_starred===false)?1:intval($expire_starred)); // default if not set: 1 - - $expire_photos = get_pconfig($uid, 'expire','photos'); - $expire_photos = (($expire_photos===false)?0:intval($expire_photos)); // default if not set: 0 + $expire_notes = PConfig::get($uid, 'expire', 'notes', 1); + $expire_starred = PConfig::get($uid, 'expire', 'starred', 1); + $expire_photos = PConfig::get($uid, 'expire', 'photos', 0); - logger('expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos"); + logger('User '.$uid.': expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos"); - foreach($r as $item) { + foreach ($r as $item) { // don't expire filed items - if (strpos($item['file'],'[') !== false) + if (strpos($item['file'],'[') !== false) { continue; + } // Only expire posts, not photos and photo comments - if ($expire_photos==0 && strlen($item['resource-id'])) + if ($expire_photos == 0 && strlen($item['resource-id'])) { continue; - if ($expire_starred==0 && intval($item['starred'])) + } elseif ($expire_starred == 0 && intval($item['starred'])) { continue; - if ($expire_notes==0 && $item['type']=='note') + } elseif ($expire_notes == 0 && $item['type'] == 'note') { continue; - if ($expire_items==0 && $item['type']!='note') + } elseif ($expire_items == 0 && $item['type'] != 'note') { continue; + } - drop_item($item['id'],false); + Item::delete($item['id'], PRIORITY_LOW); } - - proc_run(PRIORITY_HIGH,"include/notifier.php", "expire", $uid); - } - +/// @TODO type-hint is array +/// @TODO move to ... function drop_items($items) { $uid = 0; - if (! local_user() && ! remote_user()) + if (!local_user() && !remote_user()) { return; + } if (count($items)) { - foreach($items as $item) { - $owner = drop_item($item,false); + foreach ($items as $item) { + $owner = Item::delete($item); if ($owner && ! $uid) $uid = $owner; } } - - // multiple threads may have been deleted, send an expire notification - - if ($uid) - proc_run(PRIORITY_HIGH,"include/notifier.php", "expire", $uid); } - -function drop_item($id,$interactive = true) { +/// @TODO move to ... +function drop_item($id) { $a = get_app(); @@ -1922,23 +1867,23 @@ function drop_item($id,$interactive = true) { intval($id) ); - if (! dbm::is_result($r)) { - if (! $interactive) - return 0; - notice( t('Item not found.') . EOL); - goaway(App::get_baseurl() . '/' . $_SESSION['return_url']); + if (!DBM::is_result($r)) { + notice(L10n::t('Item not found.') . EOL); + goaway(System::baseUrl() . '/' . $_SESSION['return_url']); } $item = $r[0]; - $owner = $item['uid']; + if ($item['deleted']) { + return 0; + } $contact_id = 0; // check if logged in user is either the author or owner of this item if (is_array($_SESSION['remote'])) { - foreach($_SESSION['remote'] as $visitor) { + foreach ($_SESSION['remote'] as $visitor) { if ($visitor['uid'] == $item['uid'] && $visitor['cid'] == $item['contact-id']) { $contact_id = $visitor['cid']; break; @@ -1946,302 +1891,139 @@ function drop_item($id,$interactive = true) { } } - - if ((local_user() == $item['uid']) || ($contact_id) || (! $interactive)) { + if ((local_user() == $item['uid']) || $contact_id) { // Check if we should do HTML-based delete confirmation if ($_REQUEST['confirm']) { //