X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fitems.php;h=6f93f78b312ee787b8e4733c0487852a192ea473;hb=c69d60644f46246978a7b52da79e7e58c74e31e6;hp=63c3218199a4c7e7b5aacd9e3c759c1825c63a6a;hpb=e5c2b7a2435ff72803dd23668eeb65b3446afb60;p=friendica.git diff --git a/include/items.php b/include/items.php index 63c3218199..6f93f78b31 100644 --- a/include/items.php +++ b/include/items.php @@ -3,31 +3,31 @@ * @file include/items.php */ use Friendica\App; -use Friendica\ParseUrl; use Friendica\Content\Feature; use Friendica\Core\Config; use Friendica\Core\PConfig; use Friendica\Core\Worker; use Friendica\Core\System; use Friendica\Database\DBM; -use Friendica\Model\GlobalContact; -use Friendica\Object\Contact; +use Friendica\Model\Contact; +use Friendica\Model\GContact; +use Friendica\Model\Group; +use Friendica\Model\Term; +use Friendica\Model\User; +use Friendica\Model\Item; +use Friendica\Object\Image; use Friendica\Protocol\DFRN; use Friendica\Protocol\OStatus; -use Friendica\Util\Lock; +use Friendica\Protocol\Feed; +use Friendica\Util\ParseUrl; require_once 'include/bbcode.php'; -require_once 'include/oembed.php'; -require_once 'include/crypto.php'; require_once 'include/tags.php'; -require_once 'include/files.php'; require_once 'include/text.php'; require_once 'include/threads.php'; require_once 'include/plaintext.php'; -require_once 'include/feed.php'; require_once 'mod/share.php'; require_once 'include/enotify.php'; -require_once 'include/group.php'; function construct_verb($item) { if ($item['verb']) { @@ -38,14 +38,20 @@ function construct_verb($item) { /* limit_body_size() * - * The purpose of this function is to apply system message length limits to - * imported messages without including any embedded photos in the length + * + * */ -if (! function_exists('limit_body_size')) { -function limit_body_size($body) { - -// logger('limit_body_size: start', LOGGER_DEBUG); +/** + * The purpose of this function is to apply system message length limits to + * imported messages without including any embedded photos in the length + * + * @brief Truncates imported message body string length to max_import_size + * @param string $body + * @return string + */ +function limit_body_size($body) +{ $maxlen = get_max_import_size(); // If the length of the body, including the embedded images, is smaller @@ -57,7 +63,6 @@ function limit_body_size($body) { $orig_body = $body; $new_body = ''; $textlen = 0; - $max_found = false; $img_start = strpos($orig_body, '[img'); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); @@ -112,31 +117,29 @@ function limit_body_size($body) { 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 { 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); + $title = str_replace(["\n", "\r", "\t", " "], ["", "", "", ""], $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); + $body = str_replace(["\n", "\r", "\t", " "], ["", "", "", ""], $body); if (strlen($title) < strlen($body)) { $body = substr($body, 0, strlen($title)); @@ -171,15 +174,9 @@ function add_page_info_data($data) { 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"]."'"; @@ -200,7 +197,7 @@ 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 (!Config::get('system', 'always_show_preview') && ($data["images"][0]["width"] >= 500) @@ -218,8 +215,8 @@ function add_page_info_data($data) { $hashtags = "\n"; foreach ($data["keywords"] AS $keyword) { /// @todo make a positive list of allowed characters - $hashtag = str_replace(array(" ", "+", "/", ".", "#", "'", "â", "`", "(", ")", "â", "â"), - array("", "", "", "", "", "", "", "", "", "", "", ""), $keyword); + $hashtag = str_replace([" ", "+", "/", ".", "#", "'", "â", "`", "(", ")", "â", "â"], + ["", "", "", "", "", "", "", "", "", "", "", ""], $keyword); $hashtags .= "#[url=" . System::baseUrl() . "/search?tag=" . rawurlencode($hashtag) . "]" . $hashtag . "[/url] "; } } @@ -261,8 +258,8 @@ function add_page_keywords($url, $no_photos = false, $photo = "", $keywords = fa $tags = ""; 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 .= ", "; @@ -321,7 +318,7 @@ function add_page_info_to_body($body, $texturl = false, $no_photos = false) { $body = $removedlink; } - $url = str_replace(array('/', '.'), array('\/', '\.'), $matches[1]); + $url = str_replace(['/', '.'], ['\/', '\.'], $matches[1]); $removedlink = preg_replace("/\[url\=" . $url . "\](.*?)\[\/url\]/ism", '', $body); if (($removedlink == "") || strstr($body, $removedlink)) { $body = $removedlink; @@ -423,8 +420,8 @@ function uri_to_guid($uri, $host = "") { * @return array Item array with removed conversation data */ function store_conversation($arr) { - if (in_array($arr['network'], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS)) && !empty($arr['uri'])) { - $conversation = array('item-uri' => $arr['uri'], 'received' => DBM::date()); + if (in_array(defaults($arr, 'network', NETWORK_PHANTOM), [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS]) && !empty($arr['uri'])) { + $conversation = ['item-uri' => $arr['uri'], 'received' => DBM::date()]; if (isset($arr['parent-uri']) && ($arr['parent-uri'] != $arr['uri'])) { $conversation['reply-to-uri'] = $arr['parent-uri']; @@ -462,7 +459,7 @@ function store_conversation($arr) { unset($conversation['protocol']); unset($conversation['source']); } - if (!dba::update('conversation', $conversation, array('item-uri' => $conversation['item-uri']), $old_conv)) { + if (!dba::update('conversation', $conversation, ['item-uri' => $conversation['item-uri']], $old_conv)) { logger('Conversation: update for '.$conversation['item-uri'].' from '.$conv['protocol'].' to '.$conversation['protocol'].' failed', LOGGER_DEBUG); } } else { @@ -481,8 +478,8 @@ function store_conversation($arr) { } /// @TODO add type-hint array -function item_store($arr, $force_parent = false, $notify = false, $dontcache = false) { - +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 @@ -504,6 +501,8 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f $arr['guid'] = uri_to_guid($arr['uri'], $a->get_hostname()); } } + } else { + $arr['network'] = trim(defaults($arr, 'network', NETWORK_PHANTOM)); } if ($notify) { @@ -564,9 +563,9 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f // check for create date and expire time $expire_interval = Config::get('system', 'dbclean-expire-days', 0); - $r = dba::select('user', array('expire'), array('uid' => $uid), array("limit" => 1)); - if (DBM::is_result($r) && ($r['expire'] > 0) && (($r['expire'] < $expire_interval) || ($expire_interval == 0))) { - $expire_interval = $r['expire']; + $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'])) { @@ -583,7 +582,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), @@ -646,7 +645,6 @@ 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 ); @@ -676,18 +674,19 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f $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)) { $r = q("SELECT `network` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", @@ -735,18 +734,18 @@ 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"] = GlobalContact::getId(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"] = GlobalContact::getId(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']]); } } @@ -854,11 +853,10 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f 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(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) || (normalise_link($arr['owner-link']) == $self)) { - dba::update('thread', array('mention' => true), array('iid' => $parent_id)); + dba::update('thread', ['mention' => true], ['iid' => $parent_id]); logger("item_store: tagged thread ".$parent_id." as mention for user ".$self, LOGGER_DEBUG); } } @@ -893,7 +891,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f } // 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']) @@ -922,7 +920,7 @@ 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 - dba::update('item', array('global' => true), array('uri' => $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"])); @@ -1033,7 +1031,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) { @@ -1051,7 +1049,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f } // Set parent id - $r = dba::update('item', array('parent' => $parent_id), array('id' => $current_post)); + dba::update('item', ['parent' => $parent_id], ['id' => $current_post]); $arr['id'] = $current_post; $arr['parent'] = $parent_id; @@ -1059,9 +1057,9 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f // update the commented timestamp on the parent // Only update "commented" if it is really a comment if (($arr['verb'] == ACTIVITY_POST) || !Config::get("system", "like_no_comment")) { - dba::update('item', array('commented' => datetime_convert(), 'changed' => datetime_convert()), array('id' => $parent_id)); + dba::update('item', ['commented' => datetime_convert(), 'changed' => datetime_convert()], ['id' => $parent_id]); } else { - dba::update('item', array('changed' => datetime_convert()), array('id' => $parent_id)); + dba::update('item', ['changed' => datetime_convert()], ['id' => $parent_id]); } if ($dsprsig) { @@ -1075,8 +1073,8 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f logger("Repaired double encoded signature from handle ".$dsprsig->signer, LOGGER_DEBUG); } - dba::insert('sign', array('iid' => $current_post, 'signed_text' => $dsprsig->signed_text, - 'signature' => $dsprsig->signature, 'signer' => $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); @@ -1112,14 +1110,14 @@ 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); + Term::createFromItem($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", + 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) @@ -1127,15 +1125,15 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f } 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) { - Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), "Notifier", $notify_type, $current_post); + Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], "Notifier", $notify_type, $current_post); } return $current_post; @@ -1152,14 +1150,14 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f */ function item_set_last_item($arr) { // Unarchive the author - $contact = dba::select('contact', [], ['id' => $arr["author-link"]], ['limit' => 1]); + $contact = dba::selectFirst('contact', [], ['id' => $arr["author-link"]]); if ($contact['term-date'] > NULL_DATE) { Contact::unmarkForArchival($contact); } // Unarchive the contact if it is a toplevel posting if ($arr["parent-uri"] === $arr["uri"]) { - $contact = dba::select('contact', [], ['id' => $arr["contact-id"]], ['limit' => 1]); + $contact = dba::selectFirst('contact', [], ['id' => $arr["contact-id"]]); if ($contact['term-date'] > NULL_DATE) { Contact::unmarkForArchival($contact); } @@ -1177,17 +1175,17 @@ function item_set_last_item($arr) { } if ($update) { - dba::update('contact', array('success_update' => $arr['received'], 'last-item' => $arr['received']), - array('id' => $arr['contact-id'])); + dba::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']], + ['id' => $arr['contact-id']]); } // Now do the same for the system wide contacts with uid=0 if (!$arr['private']) { - dba::update('contact', array('success_update' => $arr['received'], 'last-item' => $arr['received']), - array('id' => $arr['owner-id'])); + dba::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']], + ['id' => $arr['owner-id']]); if ($arr['owner-id'] != $arr['author-id']) { - dba::update('contact', array('success_update' => $arr['received'], 'last-item' => $arr['received']), - array('id' => $arr['author-id'])); + dba::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']], + ['id' => $arr['author-id']]); } } } @@ -1205,8 +1203,6 @@ function item_body_set_hashtags(&$item) { // 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 if "local_tags" is activated @@ -1304,7 +1300,7 @@ function get_item_id($guid, $uid = 0) { $nick = $r[0]["nickname"]; } } - return array("nick" => $nick, "id" => $id); + return ["nick" => $nick, "id" => $id]; } // return - test @@ -1315,7 +1311,6 @@ function get_item_contact($item, $contacts) { foreach ($contacts as $contact) { if ($contact['id'] == $item['contact-id']) { return $contact; - break; // NOTREACHED } } return false; @@ -1327,16 +1322,13 @@ 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(); - +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)) { return; } @@ -1344,7 +1336,6 @@ function tag_deliver($uid, $item_id) { $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) @@ -1379,13 +1370,13 @@ 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); @@ -1431,7 +1422,7 @@ function tag_deliver($uid, $item_id) { ); update_thread($item_id); - Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'Notifier', 'tgroup', $item_id); + Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], 'Notifier', 'tgroup', $item_id); } @@ -1550,7 +1541,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; } @@ -1674,15 +1665,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 = dba::update('contact', array('rel' => CONTACT_IS_FRIEND, 'writable' => true), - array('id' => $contact['id'], 'uid' => $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']), @@ -1695,6 +1684,7 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) { 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) @@ -1708,28 +1698,22 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) { $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer['uid']) ); - - if (DBM::is_result($r) && !in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY))) { - + 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)) { - dba::insert('intro', array('uid' => $importer['uid'], 'contact-id' => $contact_record['id'], + dba::insert('intro', ['uid' => $importer['uid'], 'contact-id' => $contact_record['id'], 'blocked' => false, 'knowyou' => false, - 'hash' => $hash, 'datetime' => datetime_convert())); + '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'], @@ -1742,11 +1726,11 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) { 'source_photo' => $contact_record['photo'], 'verb' => ($sharing ? ACTIVITY_FRIEND : ACTIVITY_FOLLOW), 'otype' => 'intro' - )); + ]); } - } elseif (DBM::is_result($r) && in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY))) { - $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) ); @@ -1755,19 +1739,19 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) { } } -function lose_follower($importer, $contact, array $datarray = array(), $item = "") { +function lose_follower($importer, $contact, array $datarray = [], $item = "") { if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_SHARING)) { - dba::update('contact', array('rel' => CONTACT_IS_SHARING), array('id' => $contact['id'])); + dba::update('contact', ['rel' => CONTACT_IS_SHARING], ['id' => $contact['id']]); } else { Contact::remove($contact['id']); } } -function lose_sharer($importer, $contact, array $datarray = array(), $item = "") { +function lose_sharer($importer, $contact, array $datarray = [], $item = "") { if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_FOLLOWER)) { - dba::update('contact', array('rel' => CONTACT_IS_FOLLOWER), array('id' => $contact['id'])); + dba::update('contact', ['rel' => CONTACT_IS_FOLLOWER], ['id' => $contact['id']]); } else { Contact::remove($contact['id']); } @@ -1802,7 +1786,7 @@ 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']) || ($contact['hub-verify'] != $verify_token)) { - $r = dba::update('contact', array('hub-verify' => $verify_token), array('id' => $contact['id'])); + dba::update('contact', ['hub-verify' => $verify_token], ['id' => $contact['id']]); } post_url($url, $params); @@ -1813,16 +1797,22 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') { } -function fix_private_photos($s, $uid, $item = null, $cid = 0) { - - if (Config::get('system','disable_embedded')) { +/** + * + * @param string $s + * @param int $uid + * @param array $item + * @param int $cid + * @return string + */ +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(System::baseUrl(),strpos(System::baseUrl(),'://')); + $site = substr(System::baseUrl(), strpos(System::baseUrl(), '://')); $orig_body = $s; $new_body = ''; @@ -1830,19 +1820,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) { @@ -1852,7 +1841,6 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) { dbesc($i), intval($res), intval($uid) - ); if (DBM::is_result($r)) { /* @@ -1887,11 +1875,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->isValid()) { - $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(); } } @@ -1958,9 +1946,9 @@ function compare_permissions($obj1, $obj2) { /// @TODO type-hint is array 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); @@ -1968,13 +1956,13 @@ function enumerate_permissions($obj) { } 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]]; } } } @@ -1983,7 +1971,7 @@ 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]]; } } } @@ -1992,7 +1980,7 @@ function item_getfeedtags($item) { function item_expire($uid, $days, $network = "", $force = false) { - if ((! $uid) || ($days < 1)) { + if (!$uid || ($days < 1)) { return; } @@ -2001,7 +1989,7 @@ function item_expire($uid, $days, $network = "", $force = false) { * 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 " : ""); + $sql_extra = (intval($expire_network_only) ? " AND wall = 0 " : ""); if ($network != "") { $sql_extra .= sprintf(" AND network = '%s' ", dbesc($network)); @@ -2025,7 +2013,7 @@ function item_expire($uid, $days, $network = "", $force = false) { intval($days) ); - if (! DBM::is_result($r)) { + if (!DBM::is_result($r)) { return; } @@ -2062,37 +2050,28 @@ function item_expire($uid, $days, $network = "", $force = false) { continue; } - drop_item($item['id'], false); + Item::delete($item['id'], PRIORITY_LOW); } - - Worker::add(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "Notifier", "expire", $uid); } /// @TODO type-hint is array 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) { - Worker::add(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "Notifier", "expire", $uid); - } } - -function drop_item($id, $interactive = true) { +function drop_item($id) { $a = get_app(); @@ -2102,11 +2081,8 @@ function drop_item($id, $interactive = true) { intval($id) ); - if (! DBM::is_result($r)) { - if (! $interactive) { - return 0; - } - notice( t('Item not found.') . EOL); + if (!DBM::is_result($r)) { + notice(t('Item not found.') . EOL); goaway(System::baseUrl() . '/' . $_SESSION['return_url']); } @@ -2116,8 +2092,6 @@ function drop_item($id, $interactive = true) { return 0; } - $owner = $item['uid']; - $contact_id = 0; // check if logged in user is either the author or owner of this item @@ -2131,23 +2105,22 @@ 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']) { //