X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fitems.php;h=85da1d1ccf892f68abd8edc45ac59d445b213e15;hb=df7bdbfc66566a5063fa754fdcc83ec9230f9b6e;hp=c36b842b4b149b638a62063ab1287b3d5a496145;hpb=2b180d780427c83e57b16b5222aea94a09cd154a;p=friendica.git diff --git a/include/items.php b/include/items.php index c36b842b4b..85da1d1ccf 100644 --- a/include/items.php +++ b/include/items.php @@ -1,52 +1,54 @@ 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"]."'"; @@ -201,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."'"; @@ -214,19 +182,20 @@ 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); @@ -237,11 +206,11 @@ function query_page_info($url, $no_photos = false, $photo = "", $keywords = fals 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"])) { + if (($keyword_blacklist != "") && isset($data["keywords"])) { $list = explode(", ", $keyword_blacklist); foreach ($list AS $keyword) { $keyword = trim($keyword); @@ -255,26 +224,28 @@ function query_page_info($url, $no_photos = false, $photo = "", $keywords = fals 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 .= ", "; } - $tags .= "#[url=" . App::get_baseurl() . "/search?tag=" . rawurlencode($hashtag) . "]" . $hashtag . "[/url]"; + $tags .= "#[url=" . System::baseUrl() . "/search?tag=" . rawurlencode($hashtag) . "]" . $hashtag . "[/url]"; } } 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); @@ -283,6 +254,7 @@ function add_page_info($url, $no_photos = false, $photo = "", $keywords = false, 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); @@ -301,7 +273,7 @@ function add_page_info_to_body($body, $texturl = false, $no_photos = false) { } // 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 :) @@ -315,169 +287,31 @@ function add_page_info_to_body($body, $texturl = false, $no_photos = false) { } // 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]); + $url = str_replace(['/', '.'], ['\/', '\.'], $matches[1]); $removedlink = preg_replace("/\[url\=" . $url . "\](.*?)\[\/url\]/ism", '', $body); - if (($removedlink == "") OR strstr($body, $removedlink)) { + 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', '<')) { - // LanguageDetect.php not available ? - return; - } - - 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; -} - -/** - * @brief Store the conversation data - * - * @param array $arr Item array with conversation data - * @return array Item array with removed conversation data - */ -function store_conversation($arr) { - if (in_array($arr['network'], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) { - $conversation = array('item-uri' => $arr['uri'], 'received' => dbm::date()); - - if (isset($arr['parent-uri']) AND ($arr['parent-uri'] != $arr['uri'])) { - $conversation['reply-to-uri'] = $arr['parent-uri']; - } - if (isset($arr['thr-parent']) AND ($arr['thr-parent'] != $arr['uri'])) { - $conversation['reply-to-uri'] = $arr['thr-parent']; - } - - if (isset($arr['conversation-uri'])) { - $conversation['conversation-uri'] = $arr['conversation-uri']; - } - - if (isset($arr['conversation-href'])) { - $conversation['conversation-href'] = $arr['conversation-href']; - } - - if (isset($arr['protocol'])) { - $conversation['protocol'] = $arr['protocol']; - } - - if (isset($arr['source'])) { - $conversation['source'] = $arr['source']; - } - - $old_conv = dba::fetch_first("SELECT `item-uri`, `reply-to-uri`, `conversation-uri`, `conversation-href`, `protocol`, `source` - FROM `conversation` WHERE `item-uri` = ?", $conversation['item-uri']); - if (dbm::is_result($old_conv)) { - // Don't update when only the source has changed. - // Only do this when there had been no source before. - if ($old_conv['source'] != '') { - unset($old_conv['source']); - } - // Update structure data all the time but the source only when its from a better protocol. - if (($old_conv['protocol'] < $conversation['protocol']) AND ($old_conv['protocol'] != 0)) { - unset($conversation['protocol']); - unset($conversation['source']); - } - if (!dba::update('conversation', $conversation, array('item-uri' => $conversation['item-uri']), $old_conv)) { - logger('Conversation: update for '.$conversation['item-uri'].' from '.$conv['protocol'].' to '.$conversation['protocol'].' failed', LOGGER_DEBUG); - } - } else { - if (!dba::insert('conversation', $conversation)) { - logger('Conversation: insert for '.$conversation['item-uri'].' (protocol '.$conversation['protocol'].') failed', LOGGER_DEBUG); - } - } - } - - unset($arr['conversation-uri']); - unset($arr['conversation-href']); - unset($arr['protocol']); - unset($arr['source']); - - return $arr; -} - /// @TODO add type-hint array -function item_store($arr, $force_parent = false, $notify = false, $dontcache = false) { - +/// @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 @@ -485,28 +319,29 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f $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['guid'])) { if (isset($arr['plink'])) { - $arr['guid'] = uri_to_guid($arr['plink'], $a->get_hostname()); + $arr['guid'] = Item::guidFromUri($arr['plink'], $a->get_hostname()); } elseif (isset($arr['uri'])) { - $arr['guid'] = uri_to_guid($arr['uri'], $a->get_hostname()); + $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']) == "") 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']); + } 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"]); @@ -516,7 +351,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f $arr['uri'] = ((x($arr, 'uri')) ? notags(trim($arr['uri'])) : item_new_uri($a->get_hostname(), $uid, $arr['guid'])); // Store conversation data - $arr = store_conversation($arr); + $arr = Conversation::insert($arr); /* * If a Diaspora signature structure was passed in, pull it out of the @@ -531,11 +366,12 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f } // 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']); + $arr['plink'] = OStatus::convertHref($arr['plink']); } elseif (isset($arr['uri'])) { - $arr['plink'] = ostatus::convert_href($arr['uri']); + $arr['plink'] = OStatus::convertHref($arr['uri']); } } @@ -553,18 +389,22 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f $arr['type'] = 'remote'; } - // 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; - } + + // check for create date and expire time + $expire_interval = Config::get('system', 'dbclean-expire-days', 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; } } @@ -573,7 +413,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f * 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, ""))) { + 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), @@ -581,7 +421,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f dbesc(NETWORK_DFRN), dbesc(NETWORK_OSTATUS) ); - if (dbm::is_result($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) { 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']); @@ -592,12 +432,12 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f } /// @TODO old-lost code? - // Shouldn't happen but we want to make absolutely sure it doesn't leak from a plugin. + // 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); + Item::addLanguageInPostopts($arr); $arr['wall'] = ((x($arr, 'wall')) ? intval($arr['wall']) : 0); $arr['extid'] = ((x($arr, 'extid')) ? notags(trim($arr['extid'])) : ''); @@ -607,15 +447,14 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f $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['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['last-child'] = ((x($arr, 'last-child')) ? intval($arr['last-child']) : 0 ); $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']); @@ -636,13 +475,17 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f $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']) : ''); + // 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()) { $arr['created'] = datetime_convert(); @@ -653,35 +496,36 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f $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"]; } @@ -700,19 +544,19 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f * 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); + $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); + $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 (dbm::is_result($r)) { + if (DBM::is_result($r)) { $arr["contact-id"] = $r[0]["id"]; } } @@ -720,27 +564,37 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f 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) { + 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"] = get_gcontact_id(array("url" => $arr['owner-link'], "network" => $arr['network'], - "photo" => $arr['owner-avatar'], "name" => $arr['owner-name'])); + $arr["gcontact-id"] = GContact::getId(["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'])); + $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"] = get_contact($arr["author-link"], 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["owner-id"] == 0) { - $arr["owner-id"] = get_contact($arr["owner-link"], 0); + $arr["owner-id"] = Contact::getIdForURL($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'] != "") { @@ -749,7 +603,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f $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; } @@ -778,7 +632,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f 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 @@ -793,7 +647,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f intval($arr['uid']) ); - if (dbm::is_result($z)) { + if (DBM::is_result($z)) { $r = $z; } } @@ -821,19 +675,18 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f * 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'])) { + 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 (dbm::is_result($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); } } @@ -862,18 +715,18 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f 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; } @@ -886,7 +739,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f 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; } @@ -897,11 +750,11 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f $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"] = (dbm::is_result($isglobal) && count($isglobal) > 0); + $arr["global"] = (DBM::is_result($isglobal) && count($isglobal) > 0); } // ACL settings @@ -922,13 +775,17 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f put_item_in_cache($arr); if ($notify) { - call_hooks('post_local', $arr); + Addon::callHooks('post_local', $arr); } else { - call_hooks('post_remote', $arr); + 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.'); + logger('item_store: post cancelled by addon.'); return 0; } @@ -938,40 +795,21 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f * 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; - - dbm::esc_array($arr, true); - logger('item_store: ' . print_r($arr,true), LOGGER_DATA); dba::transaction(); - - $r = dbq("INSERT INTO `item` (`" - . implode("`, `", array_keys($arr)) - . "`) VALUES (" - . implode(", ", array_values($arr)) - . ")"); - - // And restore it - $arr = $unescaped; + $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. dba::rollback(); @@ -1011,7 +849,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f 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 ..."); dba::rollback(); @@ -1023,7 +861,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f 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. - dba::delete('item', array('id' => $current_post)); + dba::delete('item', ['id' => $current_post]); dba::commit(); return 0; } elseif ($r[0]["entries"] == 0) { @@ -1034,34 +872,24 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f } logger('item_store: created item '.$current_post); - item_set_last_item($arr); + Item::updateContact($arr); 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) - ); + if (($arr['verb'] == ACTIVITY_POST) || !Config::get("system", "like_no_comment")) { + dba::update('item', ['commented' => datetime_convert(), 'changed' => datetime_convert()], ['id' => $parent_id]); } else { - q("UPDATE `item` SET `changed` = '%s' WHERE `id` = %d", - dbesc(datetime_convert()), - intval($parent_id) - ); + dba::update('item', ['changed' => datetime_convert()], ['id' => $parent_id]); } if ($dsprsig) { @@ -1075,12 +903,8 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f 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); @@ -1089,14 +913,14 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f * current post can be deleted if is for a community page and no mention are * in it. */ - if (!$deleted AND !$dontcache) { + if (!$deleted && !$dontcache) { $r = q('SELECT * FROM `item` WHERE `id` = %d', intval($current_post)); - if ((dbm::is_result($r)) && (count($r) == 1)) { + if ((DBM::is_result($r)) && (count($r) == 1)) { if ($notify) { - call_hooks('post_local_end', $r[0]); + Addon::callHooks('post_local_end', $r[0]); } else { - call_hooks('post_remote_end', $r[0]); + Addon::callHooks('post_remote_end', $r[0]); } } else { logger('item_store: new item not found in DB, id ' . $current_post); @@ -1116,82 +940,24 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f * 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); + check_user_notification($current_post); if ($notify) { - proc_run(PRIORITY_HIGH, "include/notifier.php", $notify_type, $current_post); + Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], "Notifier", $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"]))); - - // 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 (dbm::is_result($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']) - ); - } - // 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']) - ); - } - } -} - +/// @TODO move to src/Model/Item.php function item_body_set_hashtags(&$item) { $tags = get_tags($item["body"]); @@ -1205,17 +971,16 @@ function item_body_set_hashtags(&$item) { // Otherwise there could be problems with hashtags like #test and #test2 rsort($tags); - $a = get_app(); - $URLSearchString = "^\[\]"; - /// @TODO old-lost code? - // 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", @@ -1244,7 +1009,7 @@ function item_body_set_hashtags(&$item) { $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"]); @@ -1260,9 +1025,10 @@ 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)) { + if (DBM::is_result($r)) { return $r[0]["guid"]; } else { /// @TODO This else-block can be elimited again @@ -1270,6 +1036,7 @@ function get_item_guid($id) { } } +/// @TODO move to src/Model/Item.php function get_item_id($guid, $uid = 0) { $nick = ""; @@ -1282,9 +1049,9 @@ function get_item_id($guid, $uid = 0) { // 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"]; } @@ -1293,20 +1060,21 @@ 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 +/// @TODO move to src/Model/Item.php function get_item_contact($item, $contacts) { if (! count($contacts) || (! is_array($item))) { return false; @@ -1314,7 +1082,6 @@ function get_item_contact($item, $contacts) { foreach ($contacts as $contact) { if ($contact['id'] == $item['contact-id']) { return $contact; - break; // NOTREACHED } } return false; @@ -1326,41 +1093,38 @@ 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", intval($uid) ); - - if (! dbm::is_result($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", intval($item_id), intval($uid) ); - if (! dbm::is_result($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 */ - $dlink = normalise_link(App::get_baseurl() . '/u/' . $u[0]['nickname']); + $dlink = normalise_link(System::baseUrl() . '/u/' . $u[0]['nickname']); $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism', $item['body'], $matches, PREG_SET_ORDER); if ($cnt) { @@ -1378,15 +1142,15 @@ function tag_deliver($uid, $item_id) { // 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."); - dba::delete('item', array('id' => $item_id)); + 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)) { return; @@ -1405,7 +1169,7 @@ function tag_deliver($uid, $item_id) { $c = q("SELECT `name`, `url`, `thumb` FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", intval($u[0]['uid']) ); - if (! dbm::is_result($c)) { + if (! DBM::is_result($c)) { return; } @@ -1430,12 +1194,11 @@ 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); } - - +/// @TODO move to src/Protocol/DFRN.php function tgroup_check($uid, $item) { $mention = false; @@ -1450,20 +1213,20 @@ function tgroup_check($uid, $item) { $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid) ); - if (! dbm::is_result($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(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 */ - $dlink = normalise_link(App::get_baseurl() . '/u/' . $u[0]['nickname']); + $dlink = normalise_link(System::baseUrl() . '/u/' . $u[0]['nickname']); $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism', $item['body'], $matches, PREG_SET_ORDER); if ($cnt) { @@ -1491,9 +1254,10 @@ function tgroup_check($uid, $item) { * 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 fix type-hints (both array) */ -function edited_timestamp_is_newer ($existing, $update) { +/// @TODO move to src/Protocol/DFRN.php +function edited_timestamp_is_newer($existing, $update) { if (!x($existing, 'edited') || !$existing['edited']) { return true; } @@ -1532,8 +1296,9 @@ function edited_timestamp_is_newer ($existing, $update) { * to get all the feed items into a mostly linear ordering, and might still require * recursion. * - * @todo find proper type-hints + * @TODO find proper type-hints */ +/// @TODO move to ??? function consume_feed($xml, $importer, &$contact, &$hub, $datedir = 0, $pass = 0) { if ($contact['network'] === NETWORK_OSTATUS) { if ($pass < 2) { @@ -1541,7 +1306,7 @@ function consume_feed($xml, $importer, &$contact, &$hub, $datedir = 0, $pass = 0 //$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; } @@ -1549,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; } @@ -1569,15 +1334,16 @@ 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 (dbm::is_result($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(); @@ -1600,7 +1366,7 @@ function item_is_remote_self($contact, &$datarray) { return false; } - if (($contact['network'] != NETWORK_FEED) AND $datarray['private']) { + if (($contact['network'] != NETWORK_FEED) && $datarray['private']) { return false; } @@ -1609,7 +1375,7 @@ function item_is_remote_self($contact, &$datarray) { 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"]; @@ -1619,6 +1385,9 @@ 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) { @@ -1642,10 +1411,18 @@ function item_is_remote_self($contact, &$datarray) { $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; } /// @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'])); @@ -1663,18 +1440,13 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) { 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']), @@ -1684,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']) ); - - 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) ); @@ -1751,30 +1514,27 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) { } } -function lose_follower($importer, $contact, array $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, array $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']); } } +/// @TODO move to ??? function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') { $a = get_app(); @@ -1790,11 +1550,11 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') { * 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) { + 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()); @@ -1803,11 +1563,8 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') { 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); @@ -1818,16 +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 = ''; @@ -1835,19 +1599,18 @@ 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); + $i = str_replace(['.jpg', '.png', '.gif'], ['', '', ''], $i); $x = strpos($i, '-'); if ($x) { @@ -1857,9 +1620,8 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { dbesc($i), intval($res), intval($uid) - ); - if (dbm::is_result($r)) { + 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 @@ -1892,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(); } } @@ -1925,6 +1687,7 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { } /// @TODO type-hint is array +/// @TODO move to src/Model/Item.php function has_permissions($obj) { return ( ( @@ -1940,6 +1703,7 @@ function has_permissions($obj) { } /// @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']) @@ -1961,25 +1725,27 @@ function compare_permissions($obj1, $obj2) { // 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'])); + $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); if ($cnt) { for ($x = 0; $x < $cnt; $x ++) { if ($matches[1][$x]) { - $ret[$matches[2][$x]] = array('#', $matches[1][$x], $matches[2][$x]); + $ret[$matches[2][$x]] = ['#', $matches[1][$x], $matches[2][$x]]; } } } @@ -1988,16 +1754,17 @@ function item_getfeedtags($item) { if ($cnt) { for ($x = 0; $x < $cnt; $x ++) { if ($matches[1][$x]) { - $ret[] = array('@', $matches[1][$x], $matches[2][$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; } @@ -2005,8 +1772,8 @@ function item_expire($uid, $days, $network = "", $force = false) { * $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 = 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)); @@ -2030,28 +1797,22 @@ 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) { $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) { @@ -2073,38 +1834,30 @@ function item_expire($uid, $days, $network = "", $force = false) { 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); + $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(); @@ -2114,17 +1867,16 @@ 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; @@ -2139,180 +1891,50 @@ 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']) { //