* @file include/conversation.php
*/
use Friendica\App;
+use Friendica\Content\ContactSelector;
+use Friendica\Content\Feature;
use Friendica\Core\Config;
-use Friendica\Core\Conversation;
use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Database\DBM;
+use Friendica\Model\Contact;
+use Friendica\Model\Profile;
+use Friendica\Object\Thread;
+use Friendica\Object\Post;
require_once "include/bbcode.php";
require_once "include/acl_selectors.php";
-/*
- * Note: the code in 'item_extract_images' and 'item_redir_and_replace_images'
- * is identical to the code in mod/message.php for 'item_extract_images' and
- * 'item_redir_and_replace_images'
- */
-if (! function_exists('item_extract_images')) {
function item_extract_images($body) {
- $saved_image = array();
+ $saved_image = [];
$orig_body = $body;
$new_body = '';
$new_body = $new_body . $orig_body;
- return array('body' => $new_body, 'images' => $saved_image);
-}}
+ return ['body' => $new_body, 'images' => $saved_image];
+}
-if (! function_exists('item_redir_and_replace_images')) {
function item_redir_and_replace_images($body, $images, $cid) {
$origbody = $body;
$cnt++;
}
return $newbody;
-}}
+}
/**
* Render actions localized
default:
if ($obj['resource-id']) {
$post_type = t('photo');
- $m = array();
+ $m = [];
preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
$rr['plink'] = $m[1];
} else {
}
}
- $A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
- $B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]';
+ $A = '[url=' . Profile::zrl($Alink) . ']' . $Aname . '[/url]';
+ $B = '[url=' . Profile::zrl($Blink) . ']' . $Bname . '[/url]';
if ($Bphoto != "") {
- $Bphoto = '[url=' . zrl($Blink) . '][img]' . $Bphoto . '[/img][/url]';
+ $Bphoto = '[url=' . Profile::zrl($Blink) . '][img]' . $Bphoto . '[/img][/url]';
}
$item['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto;
}
}
- $A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
- $B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]';
+ $A = '[url=' . Profile::zrl($Alink) . ']' . $Aname . '[/url]';
+ $B = '[url=' . Profile::zrl($Blink) . ']' . $Bname . '[/url]';
if ($Bphoto != "") {
- $Bphoto = '[url=' . zrl($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]';
+ $Bphoto = '[url=' . Profile::zrl($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]';
}
/*
$item['body'] = sprintf($txt, $A, $B). "\n\n\n" . $Bphoto;
}
- if (stristr($item['verb'], ACTIVITY_MOOD)) {
- $verb = urldecode(substr($item['verb'], strpos($item['verb'], '#') + 1));
- if (! $verb) {
- return;
- }
-
- $Aname = $item['author-name'];
- $Alink = $item['author-link'];
- $A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
-
- $txt = t('%1$s is currently %2$s');
-
- $item['body'] = sprintf($txt, $A, t($verb));
- }
if (activity_match($item['verb'], ACTIVITY_TAG)) {
/// @TODO may hurt performance "joining" two tables + asterisk
$obj = $r[0];
- $author = '[url=' . zrl($item['author-link']) . ']' . $item['author-name'] . '[/url]';
- $objauthor = '[url=' . zrl($obj['author-link']) . ']' . $obj['author-name'] . '[/url]';
+ $author = '[url=' . Profile::zrl($item['author-link']) . ']' . $item['author-name'] . '[/url]';
+ $objauthor = '[url=' . Profile::zrl($obj['author-link']) . ']' . $obj['author-name'] . '[/url]';
switch ($obj['verb']) {
case ACTIVITY_POST:
default:
if ($obj['resource-id']) {
$post_type = t('photo');
- $m=array(); preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
+ $m=[]; preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
$rr['plink'] = $m[1];
} else {
$post_type = t('status');
$target = $r[0];
$Bname = $target['author-name'];
$Blink = $target['author-link'];
- $A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
- $B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]';
+ $A = '[url=' . Profile::zrl($Alink) . ']' . $Aname . '[/url]';
+ $B = '[url=' . Profile::zrl($Blink) . ']' . $Bname . '[/url]';
$P = '[url=' . $target['plink'] . ']' . t('post/item') . '[/url]';
$item['body'] = sprintf( t('%1$s marked %2$s\'s %3$s as favorite'), $A, $B, $P)."\n";
}
if (preg_match_all('/@\[url=(.*?)\]/is', $item['body'], $matches, PREG_SET_ORDER)) {
foreach ($matches as $mtch) {
if (! strpos($mtch[1], 'zrl=')) {
- $item['body'] = str_replace($mtch[0], '@[url=' . zrl($mtch[1]) . ']', $item['body']);
+ $item['body'] = str_replace($mtch[0], '@[url=' . Profile::zrl($mtch[1]) . ']', $item['body']);
}
}
}
// add zrl's to public images
$photo_pattern = "/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is";
if (preg_match($photo_pattern, $item['body'])) {
- $photo_replace = '[url=' . zrl('$1' . '/photos/' . '$2' . '/image/' . '$3' ,true) . '][img' . '$4' . ']h' . '$5' . '[/img][/url]';
+ $photo_replace = '[url=' . Profile::zrl('$1' . '/photos/' . '$2' . '/image/' . '$3' ,true) . '][img' . '$4' . ']h' . '$5' . '[/img][/url]';
$item['body'] = bb_tag_preg_replace($photo_pattern, $photo_replace, 'url', $item['body']);
}
* likes (etc.) can apply to other things besides posts. Check if they are post children,
* in which case we handle them specially
*/
- $hidden_activities = array(ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE);
+ $hidden_activities = [ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE];
foreach ($hidden_activities as $act) {
if (activity_match($item['verb'], $act)) {
return false;
return "`item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`";
}
-if (!function_exists('conversation')) {
/**
* "Render" a conversation or list of items for HTML display.
* There are two major forms of display:
*
*/
function conversation(App $a, $items, $mode, $update, $preview = false) {
-
require_once 'include/bbcode.php';
- require_once 'include/Contact.php';
require_once 'mod/proxy.php';
$ssl_state = ((local_user()) ? true : false);
$profile_owner = 0;
- $page_writeable = false;
$live_update_div = '';
$arr_blocked = null;
if ($mode === 'network') {
$profile_owner = local_user();
- $page_writeable = true;
if (!$update) {
/*
* The special div is needed for liveUpdate to kick in for this page.
}
} elseif ($mode === 'profile') {
$profile_owner = $a->profile['profile_uid'];
- $page_writeable = can_write_wall($a,$profile_owner);
if (!$update) {
- $tab = notags(trim($_GET['tab']));
- $tab = ( $tab ? $tab : 'posts' );
+ $tab = 'posts';
+ if (x($_GET, 'tab')) {
+ $tab = notags(trim($_GET['tab']));
+ }
if ($tab === 'posts') {
/*
* This is ugly, but we can't pass the profile_uid through the session to the ajax updater,
}
} elseif ($mode === 'notes') {
$profile_owner = local_user();
- $page_writeable = true;
if (!$update) {
$live_update_div = '<div id="live-notes"></div>' . "\r\n"
. "<script> var profile_uid = " . local_user()
}
} elseif ($mode === 'display') {
$profile_owner = $a->profile['uid'];
- $page_writeable = can_write_wall($a,$profile_owner);
if (!$update) {
$live_update_div = '<div id="live-display"></div>' . "\r\n"
. "<script> var profile_uid = " . $_SESSION['uid'] . ";"
. " var profile_page = 1; </script>";
}
} elseif ($mode === 'community') {
+ if (!$community_readonly) {
+ $items = community_add_items($items);
+ }
$profile_owner = 0;
- $page_writeable = false;
if (!$update) {
$live_update_div = '<div id="live-community"></div>' . "\r\n"
- . "<script> var profile_uid = -1; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
+ . "<script> var profile_uid = -1; var netargs = '" . substr($a->cmd, 10)
+ ."/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
}
} elseif ($mode === 'search') {
$live_update_div = '<div id="live-search"></div>' . "\r\n";
$page_dropping = ((local_user() && local_user() == $profile_owner) ? true : false);
-
- if ($update) {
- $return_url = $_SESSION['return_url'];
- } else {
- $return_url = $_SESSION['return_url'] = $a->query_string;
+ if (!$update) {
+ $_SESSION['return_url'] = $a->query_string;
}
- $cb = array('items' => $items, 'mode' => $mode, 'update' => $update, 'preview' => $preview);
+ $cb = ['items' => $items, 'mode' => $mode, 'update' => $update, 'preview' => $preview];
call_hooks('conversation_start',$cb);
$items = $cb['items'];
- $cmnt_tpl = get_markup_template('comment_item.tpl');
- $hide_comments_tpl = get_markup_template('hide_comments.tpl');
-
- $conv_responses = array(
- 'like' => array('title' => t('Likes','title')), 'dislike' => array('title' => t('Dislikes','title')),
- 'attendyes' => array('title' => t('Attending','title')), 'attendno' => array('title' => t('Not attending','title')), 'attendmaybe' => array('title' => t('Might attend','title'))
- );
+ $conv_responses = [
+ 'like' => ['title' => t('Likes','title')], 'dislike' => ['title' => t('Dislikes','title')],
+ 'attendyes' => ['title' => t('Attending','title')], 'attendno' => ['title' => t('Not attending','title')], 'attendmaybe' => ['title' => t('Might attend','title')]
+ ];
// array with html for each thread (parent+comments)
- $threads = array();
+ $threads = [];
$threadsid = -1;
$page_template = get_markup_template("conversation.tpl");
if ($items && count($items)) {
+ $community_readonly = ($mode === 'community');
+
+ // Currently behind a config value. This allows the commenting and sharing of every public item.
+ if (Config::get('system', 'comment_public')) {
+ if ($mode === 'community') {
+ $community_readonly = false;
+ $writable = true;
+ } else {
+ $writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], [NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_DFRN]);
+ }
+ } else {
+ $writable = false;
+ }
+
+ if (!local_user()) {
+ $writable = false;
+ }
- if ($mode === 'network-new' || $mode === 'search' || $mode === 'community') {
+ if (in_array($mode, ['network-new', 'search', 'contact-posts']) || $community_readonly) {
/*
* "New Item View" on network page or search page results
$threadsid++;
- $comment = '';
$owner_url = '';
$owner_name = '';
$sparkle = '';
- if ($mode === 'search' || $mode === 'community') {
- if (((activity_match($item['verb'], ACTIVITY_LIKE)) || (activity_match($item['verb'], ACTIVITY_DISLIKE)))
- && ($item['id'] != $item['parent']))
- continue;
- $nickname = $item['nickname'];
- } else {
- $nickname = $a->user['nickname'];
- }
-
// prevent private email from leaking.
if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
continue;
$profile_name = $item['author-link'];
}
- $tags = array();
- $hashtags = array();
- $mentions = array();
+ $tags = [];
+ $hashtags = [];
+ $mentions = [];
$searchpath = System::baseUrl()."/search?tag=";
- $taglist = dba::select('term', array('type', 'term', 'url'),
- array("`otype` = ? AND `oid` = ? AND `type` IN (?, ?)", TERM_OBJ_POST, $item['id'], TERM_HASHTAG, TERM_MENTION),
- array('order' => array('tid')));
+ $taglist = dba::select('term', ['type', 'term', 'url'],
+ ["`otype` = ? AND `oid` = ? AND `type` IN (?, ?)", TERM_OBJ_POST, $item['id'], TERM_HASHTAG, TERM_MENTION],
+ ['order' => ['tid']]);
while ($tag = dba::fetch($taglist)) {
if ($tag["url"] == "") {
if ($sp) {
$sparkle = ' sparkle';
} else {
- $profile_link = zrl($profile_link);
+ $profile_link = Profile::zrl($profile_link);
}
if (!x($item, 'author-thumb') || ($item['author-thumb'] == "")) {
- $author_contact = get_contact_details_by_url($item['author-link'], $profile_owner);
+ $author_contact = Contact::getDetailsByURL($item['author-link'], $profile_owner);
if ($author_contact["thumb"]) {
$item['author-thumb'] = $author_contact["thumb"];
} else {
}
if (!isset($item['owner-thumb']) || ($item['owner-thumb'] == "")) {
- $owner_contact = get_contact_details_by_url($item['owner-link'], $profile_owner);
+ $owner_contact = Contact::getDetailsByURL($item['owner-link'], $profile_owner);
if ($owner_contact["thumb"]) {
$item['owner-thumb'] = $owner_contact["thumb"];
} else {
}
}
- $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
+ $locate = ['location' => $item['location'], 'coord' => $item['coord'], 'html' => ''];
call_hooks('render_location',$locate);
$location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate));
$dropping = false;
}
- $drop = array(
+ $drop = [
'dropping' => $dropping,
'pagedrop' => $page_dropping,
'select' => t('Select'),
'delete' => t('Delete'),
- );
+ ];
$star = false;
$isstarred = "unstarred";
$lock = false;
$likebuttons = false;
- $shareable = false;
$body = prepare_body($item, true, $preview);
list($categories, $folders) = get_cats_and_terms($item);
- if ($a->theme['template_engine'] === 'internal') {
- $profile_name_e = template_escape($profile_name);
- $item['title_e'] = template_escape($item['title']);
- $body_e = template_escape($body);
- $tags_e = template_escape($tags);
- $hashtags_e = template_escape($hashtags);
- $mentions_e = template_escape($mentions);
- $location_e = template_escape($location);
- $owner_name_e = template_escape($owner_name);
- } else {
- $profile_name_e = $profile_name;
- $item['title_e'] = $item['title'];
- $body_e = $body;
- $tags_e = $tags;
- $hashtags_e = $hashtags;
- $mentions_e = $mentions;
- $location_e = $location;
- $owner_name_e = $owner_name;
- }
+ $profile_name_e = $profile_name;
+ $item['title_e'] = $item['title'];
+ $body_e = $body;
+ $tags_e = $tags;
+ $hashtags_e = $hashtags;
+ $mentions_e = $mentions;
+ $location_e = $location;
+ $owner_name_e = $owner_name;
if ($item['item_network'] == "") {
$item['item_network'] = $item['network'];
}
- $tmp_item = array(
+ $tmp_item = [
'template' => $tpl,
'id' => (($preview) ? 'P0' : $item['item_id']),
'guid' => (($preview) ? 'Q0' : $item['guid']),
'network' => $item['item_network'],
- 'network_name' => network_to_name($item['item_network'], $profile_link),
+ 'network_name' => ContactSelector::networkToName($item['item_network'], $profile_link),
'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
'profile_url' => $profile_link,
'item_photo_menu' => item_photo_menu($item),
'like' => '',
'dislike' => '',
'comment' => '',
- //'conv' => (($preview) ? '' : array('href'=> 'display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context'))),
- 'conv' => (($preview) ? '' : array('href'=> 'display/'.$item['guid'], 'title'=> t('View in context'))),
+ 'conv' => (($preview) ? '' : ['href'=> 'display/'.$item['guid'], 'title'=> t('View in context')]),
'previewing' => $previewing,
'wait' => t('Please wait'),
'thread_level' => 1,
- );
+ ];
- $arr = array('item' => $item, 'output' => $tmp_item);
+ $arr = ['item' => $item, 'output' => $tmp_item];
call_hooks('display_item', $arr);
$threads[$threadsid]['id'] = $item['item_id'];
$threads[$threadsid]['network'] = $item['item_network'];
- $threads[$threadsid]['items'] = array($arr['output']);
+ $threads[$threadsid]['items'] = [$arr['output']];
}
} else {
// Normal View
$page_template = get_markup_template("threaded_conversation.tpl");
- require_once 'object/Item.php';
-
- $conv = new Conversation($mode, $preview);
+ $conv = new Thread($mode, $preview, $writable);
/*
* get all the topmost parents
* this shouldn't be needed, as we should have only them in our array
* But for now, this array respects the old style, just in case
*/
- $threads = array();
foreach ($items as $item) {
-
if ($arr_blocked) {
$blocked = false;
foreach ($arr_blocked as $b) {
$item['pagedrop'] = $page_dropping;
if ($item['id'] == $item['parent']) {
- $item_object = new Item($item);
- $conv->add_thread($item_object);
+ $item_object = new Post($item);
+ $conv->addParent($item_object);
}
}
- $threads = $conv->get_template_data($conv_responses);
-
+ $threads = $conv->getTemplateData($conv_responses);
if (!$threads) {
logger('[ERROR] conversation : Failed to get template data.', LOGGER_DEBUG);
- $threads = array();
+ $threads = [];
}
}
}
- $o = replace_macros($page_template, array(
+ $o = replace_macros($page_template, [
'$baseurl' => System::baseUrl($ssl_state),
'$return_path' => $a->query_string,
'$live_update' => $live_update_div,
'$mode' => $mode,
'$user' => $a->user,
'$threads' => $threads,
- '$dropping' => ($page_dropping && feature_enabled(local_user(), 'multi_delete') ? t('Delete Selected Items') : False),
- ));
+ '$dropping' => ($page_dropping && Feature::isEnabled(local_user(), 'multi_delete') ? t('Delete Selected Items') : False),
+ ]);
return $o;
-}}
+}
+
+/**
+ * @brief Add comments to top level entries that had been fetched before
+ *
+ * The system will fetch the comments for the local user whenever possible.
+ * This behaviour is currently needed to allow commenting on Friendica posts.
+ *
+ * @param array $parents Parent items
+ *
+ * @return array items with parents and comments
+ */
+function community_add_items($parents) {
+ $max_comments = Config::get("system", "max_comments", 100);
+
+ $items = [];
+
+ foreach ($parents AS $parent) {
+ $thread_items = dba::p(item_query()." AND `item`.`uid` = ?
+ AND `item`.`parent-uri` = ?
+ ORDER BY `item`.`commented` DESC LIMIT ".intval($max_comments + 1),
+ local_user(),
+ $parent['uri']
+ );
+ $comments = dba::inArray($thread_items);
+
+ // Check if the original item is in the result.
+ // When commenting from the community page there can be incomplete threads
+ if (count($comments) > 0) {
+ $parent_found = false;
+ foreach ($comments as $comment) {
+ if ($comment['uri'] == $comment['parent-uri']) {
+ $parent_found = true;
+ break;
+ }
+ }
+ if (!$parent_found) {
+ $comments = [];
+ }
+ }
+
+ if (count($comments) == 0) {
+ $thread_items = dba::p(item_query()." AND `item`.`uid` = 0
+ AND `item`.`parent-uri` = ?
+ ORDER BY `item`.`commented` DESC LIMIT ".intval($max_comments + 1),
+ $parent['uri']
+ );
+ $comments = dba::inArray($thread_items);
+ }
+
+ if (count($comments) != 0) {
+ $items = array_merge($items, $comments);
+ }
+ }
+
+ foreach ($items as $index => $item) {
+ if ($item['uid'] == 0) {
+ $items[$index]['writable'] = in_array($item['network'], [NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_DFRN]);
+ }
+ }
+
+ $items = conv_sort($items, "`commented`");
+
+ return $items;
+}
function best_link_url($item, &$sparkle, $url = '') {
$clean_url = normalise_link($item['author-link']);
if (local_user()) {
- $r = dba::select('contact', array('id'),
- array('network' => NETWORK_DFRN, 'uid' => local_user(), 'nurl' => normalise_link($clean_url), 'pending' => false),
- array('limit' => 1));
- if (DBM::is_result($r)) {
- $best_url = 'redir/' . $r['id'];
+ $condition = [
+ 'network' => NETWORK_DFRN,
+ 'uid' => local_user(),
+ 'nurl' => normalise_link($clean_url),
+ 'pending' => false
+ ];
+ $contact = dba::selectFirst('contact', ['id'], $condition);
+ if (DBM::is_result($contact)) {
+ $best_url = 'redir/' . $contact['id'];
$sparkle = true;
if ($url != '') {
$hostname = get_app()->get_hostname();
$status_link = '';
$photos_link = '';
$posts_link = '';
- $network = '';
if ((local_user()) && local_user() == $item['uid'] && $item['parent'] == $item['id'] && (! $item['self'])) {
$sub_link = 'javascript:dosubthread(' . $item['id'] . '); return false;';
$cid = 0;
$network = '';
$rel = 0;
- $r = dba::select('contact', array('id', 'network', 'rel'), array('uid' => local_user(), 'nurl' => normalise_link($item['author-link'])), array('limit' => 1));
- if (DBM::is_result($r)) {
- $cid = $r['id'];
- $network = $r['network'];
- $rel = $r['rel'];
+ $condition = ['uid' => local_user(), 'nurl' => normalise_link($item['author-link'])];
+ $contact = dba::selectFirst('contact', ['id', 'network', 'rel'], $condition);
+ if (DBM::is_result($contact)) {
+ $cid = $contact['id'];
+ $network = $contact['network'];
+ $rel = $contact['rel'];
}
if ($sparkle) {
$status_link = $profile_link . '?url=status';
$photos_link = $profile_link . '?url=photos';
$profile_link = $profile_link . '?url=profile';
- $zurl = '';
} else {
- $profile_link = zrl($profile_link);
+ $profile_link = Profile::zrl($profile_link);
}
if ($cid && !$item['self']) {
$contact_url = 'contacts/' . $cid;
$posts_link = 'contacts/' . $cid . '/posts';
- if (in_array($network, array(NETWORK_DFRN, NETWORK_DIASPORA))) {
+ if (in_array($network, [NETWORK_DFRN, NETWORK_DIASPORA])) {
$pm_url = 'message/new/' . $cid;
}
}
if (local_user()) {
- $menu = array(
+ $menu = [
t('Follow Thread') => $sub_link,
t('View Status') => $status_link,
t('View Profile') => $profile_link,
t('Network Posts') => $posts_link,
t('View Contact') => $contact_url,
t('Send PM') => $pm_url
- );
+ ];
if ($network == NETWORK_DFRN) {
$menu[t("Poke")] = $poke_link;
}
if ((($cid == 0) || ($rel == CONTACT_IS_FOLLOWER)) &&
- in_array($item['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) {
+ in_array($item['network'], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA])) {
$menu[t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']);
}
} else {
- $menu = array(t('View Profile') => $item['author-link']);
+ $menu = [t('View Profile') => $item['author-link']];
}
- $args = array('item' => $item, 'menu' => $menu);
+ $args = ['item' => $item, 'menu' => $menu];
call_hooks('item_photo_menu', $args);
return $o;
}
-if (! function_exists('builtin_activity_puller')) {
/**
* @brief Checks item to see if it is one of the builtin activities (like/dislike, event attendance, consensus items, etc.)
* Increments the count of each matching activity and adds a link to the author as needed.
break;
default:
return;
- break;
}
if ((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) {
$url = 'redir/' . $item['contact-id'];
$sparkle = ' class="sparkle" ';
} else {
- $url = zrl($url);
+ $url = Profile::zrl($url);
}
$url = '<a href="'. $url . '"'. $sparkle .'>' . htmlentities($item['author-name']) . '</a>';
if (! ((isset($conv_responses[$mode][$item['thr-parent'] . '-l']))
&& (is_array($conv_responses[$mode][$item['thr-parent'] . '-l'])))) {
- $conv_responses[$mode][$item['thr-parent'] . '-l'] = array();
+ $conv_responses[$mode][$item['thr-parent'] . '-l'] = [];
}
// only list each unique author once
return;
}
}
-}}
+}
-if (! function_exists('format_like')) {
/**
* Format the vote text for a profile item
* @param int $cnt = number of people who vote the item
}
$phrase .= EOL ;
- $o .= replace_macros(get_markup_template('voting_fakelink.tpl'), array(
+ $o .= replace_macros(get_markup_template('voting_fakelink.tpl'), [
'$phrase' => $phrase,
'$type' => $type,
'$id' => $id
- ));
+ ]);
$o .= $expanded;
return $o;
-}}
+}
-function status_editor(App $a, $x, $notes_cid = 0, $popup = false) {
+function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
+{
$o = '';
- $geotag = (x($x, 'allow_location') ? replace_macros(get_markup_template('jot_geotag.tpl'), array()) : '');
+ $geotag = x($x, 'allow_location') ? replace_macros(get_markup_template('jot_geotag.tpl'), []) : '';
$tpl = get_markup_template('jot-header.tpl');
- $a->page['htmlhead'] .= replace_macros($tpl, array(
- '$newpost' => 'true',
- '$baseurl' => System::baseUrl(true),
- '$geotag' => $geotag,
- '$nickname' => $x['nickname'],
- '$ispublic' => t('Visible to <strong>everybody</strong>'),
- '$linkurl' => t('Please enter a link URL:'),
- '$vidurl' => t("Please enter a video link/URL:"),
- '$audurl' => t("Please enter an audio link/URL:"),
- '$term' => t('Tag term:'),
- '$fileas' => t('Save to Folder:'),
+ $a->page['htmlhead'] .= replace_macros($tpl, [
+ '$newpost' => 'true',
+ '$baseurl' => System::baseUrl(true),
+ '$geotag' => $geotag,
+ '$nickname' => $x['nickname'],
+ '$ispublic' => t('Visible to <strong>everybody</strong>'),
+ '$linkurl' => t('Please enter a link URL:'),
+ '$vidurl' => t("Please enter a video link/URL:"),
+ '$audurl' => t("Please enter an audio link/URL:"),
+ '$term' => t('Tag term:'),
+ '$fileas' => t('Save to Folder:'),
'$whereareu' => t('Where are you right now?'),
- '$delitems' => t('Delete item(s)?')
- ));
+ '$delitems' => t('Delete item(s)?')
+ ]);
$tpl = get_markup_template('jot-end.tpl');
- $a->page['end'] .= replace_macros($tpl, array(
- '$newpost' => 'true',
- '$baseurl' => System::baseUrl(true),
- '$geotag' => $geotag,
- '$nickname' => $x['nickname'],
- '$ispublic' => t('Visible to <strong>everybody</strong>'),
- '$linkurl' => t('Please enter a link URL:'),
- '$vidurl' => t("Please enter a video link/URL:"),
- '$audurl' => t("Please enter an audio link/URL:"),
- '$term' => t('Tag term:'),
- '$fileas' => t('Save to Folder:'),
+ $a->page['end'] .= replace_macros($tpl, [
+ '$newpost' => 'true',
+ '$baseurl' => System::baseUrl(true),
+ '$geotag' => $geotag,
+ '$nickname' => $x['nickname'],
+ '$ispublic' => t('Visible to <strong>everybody</strong>'),
+ '$linkurl' => t('Please enter a link URL:'),
+ '$vidurl' => t("Please enter a video link/URL:"),
+ '$audurl' => t("Please enter an audio link/URL:"),
+ '$term' => t('Tag term:'),
+ '$fileas' => t('Save to Folder:'),
'$whereareu' => t('Where are you right now?')
- ));
+ ]);
$jotplugins = '';
call_hooks('jot_tool', $jotplugins);
$query_str = $a->query_string;
if (strpos($query_str, 'public=1') !== false) {
- $query_str = str_replace(array('?public=1', '&public=1'), array('', ''), $query_str);
+ $query_str = str_replace(['?public=1', '&public=1'], ['', ''], $query_str);
}
/*
// $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
$tpl = get_markup_template("jot.tpl");
- $o .= replace_macros($tpl,array(
- '$return_path' => $query_str,
- '$action' => 'item',
- '$share' => (x($x,'button') ? $x['button'] : t('Share')),
- '$upload' => t('Upload photo'),
- '$shortupload' => t('upload photo'),
- '$attach' => t('Attach file'),
- '$shortattach' => t('attach file'),
- '$weblink' => t('Insert web link'),
+ $o .= replace_macros($tpl,[
+ '$return_path' => $query_str,
+ '$action' => 'item',
+ '$share' => defaults($x, 'button', t('Share')),
+ '$upload' => t('Upload photo'),
+ '$shortupload' => t('upload photo'),
+ '$attach' => t('Attach file'),
+ '$shortattach' => t('attach file'),
+ '$weblink' => t('Insert web link'),
'$shortweblink' => t('web link'),
- '$video' => t('Insert video link'),
- '$shortvideo' => t('video link'),
- '$audio' => t('Insert audio link'),
- '$shortaudio' => t('audio link'),
- '$setloc' => t('Set your location'),
- '$shortsetloc' => t('set location'),
- '$noloc' => t('Clear browser location'),
- '$shortnoloc' => t('clear location'),
- '$title' => $x['title'],
+ '$video' => t('Insert video link'),
+ '$shortvideo' => t('video link'),
+ '$audio' => t('Insert audio link'),
+ '$shortaudio' => t('audio link'),
+ '$setloc' => t('Set your location'),
+ '$shortsetloc' => t('set location'),
+ '$noloc' => t('Clear browser location'),
+ '$shortnoloc' => t('clear location'),
+ '$title' => defaults($x, 'title', ''),
'$placeholdertitle' => t('Set title'),
- '$category' => $x['category'],
- '$placeholdercategory' => (feature_enabled(local_user(), 'categories') ? t('Categories (comma-separated list)') : ''),
- '$wait' => t('Please wait'),
- '$permset' => t('Permission settings'),
+ '$category' => defaults($x, 'category', ''),
+ '$placeholdercategory' => Feature::isEnabled(local_user(), 'categories') ? t('Categories (comma-separated list)') : '',
+ '$wait' => t('Please wait'),
+ '$permset' => t('Permission settings'),
'$shortpermset' => t('permissions'),
- '$ptyp' => (($notes_cid) ? 'note' : 'wall'),
- '$content' => $x['content'],
- '$post_id' => $x['post_id'],
- '$baseurl' => System::baseUrl(true),
- '$defloc' => $x['default_location'],
- '$visitor' => $x['visitor'],
- '$pvisit' => (($notes_cid) ? 'none' : $x['visitor']),
- '$public' => t('Public post'),
- '$jotnets' => $jotnets,
- '$lockstate' => $x['lockstate'],
- '$bang' => $x['bang'],
- '$profile_uid' => $x['profile_uid'],
- '$preview' => ((feature_enabled($x['profile_uid'],'preview')) ? t('Preview') : ''),
- '$jotplugins' => $jotplugins,
- '$notes_cid' => $notes_cid,
- '$sourceapp' => t($a->sourcename),
- '$cancel' => t('Cancel'),
- '$rand_num' => random_digits(12),
+ '$ptyp' => $notes_cid ? 'note' : 'wall',
+ '$content' => defaults($x, 'content', ''),
+ '$post_id' => defaults($x, 'post_id', ''),
+ '$baseurl' => System::baseUrl(true),
+ '$defloc' => $x['default_location'],
+ '$visitor' => $x['visitor'],
+ '$pvisit' => $notes_cid ? 'none' : $x['visitor'],
+ '$public' => t('Public post'),
+ '$lockstate' => $x['lockstate'],
+ '$bang' => $x['bang'],
+ '$profile_uid' => $x['profile_uid'],
+ '$preview' => Feature::isEnabled($x['profile_uid'], 'preview') ? t('Preview') : '',
+ '$jotplugins' => $jotplugins,
+ '$notes_cid' => $notes_cid,
+ '$sourceapp' => t($a->sourcename),
+ '$cancel' => t('Cancel'),
+ '$rand_num' => random_digits(12),
// ACL permissions box
- '$acl' => $x['acl'],
- '$acl_data' => $x['acl_data'],
- '$group_perms' => t('Post to Groups'),
+ '$acl' => $x['acl'],
+ '$group_perms' => t('Post to Groups'),
'$contact_perms' => t('Post to Contacts'),
- '$private' => t('Private post'),
- '$is_private' => $private_post,
- '$public_link' => $public_post_link,
+ '$private' => t('Private post'),
+ '$is_private' => $private_post,
+ '$public_link' => $public_post_link,
//jot nav tab (used in some themes)
'$message' => t('Message'),
'$browser' => t('Browser'),
- ));
+ ]);
if ($popup == true) {
- $o = '<div id="jot-popup" style="display: none;">'.$o.'</div>';
+ $o = '<div id="jot-popup" style="display: none;">' . $o . '</div>';
}
return $o;
}
-
-function get_item_children($arr, $parent) {
- $children = array();
- $a = get_app();
- foreach ($arr as $item) {
+/**
+ * Plucks the children of the given parent from a given item list.
+ *
+ * @brief Plucks all the children in the given item list of the given parent
+ *
+ * @param array $item_list
+ * @param array $parent
+ * @param bool $recursive
+ * @return type
+ */
+function get_item_children(array &$item_list, array $parent, $recursive = true)
+{
+ $children = [];
+ foreach ($item_list as $i => $item) {
if ($item['id'] != $item['parent']) {
- if (Config::get('system', 'thread_allow') && $a->theme_thread_allow) {
+ if ($recursive) {
// Fallback to parent-uri if thr-parent is not set
$thr_parent = $item['thr-parent'];
if ($thr_parent == '') {
}
if ($thr_parent == $parent['uri']) {
- $item['children'] = get_item_children($arr, $item);
+ $item['children'] = get_item_children($item_list, $item);
$children[] = $item;
+ unset($item_list[$i]);
}
} elseif ($item['parent'] == $parent['id']) {
$children[] = $item;
+ unset($item_list[$i]);
}
}
}
return $children;
}
-/// @TODO Add type-hint
-function sort_item_children($items) {
+/**
+ * @brief Recursively sorts a tree-like item array
+ *
+ * @param array $items
+ * @return array
+ */
+function sort_item_children(array $items)
+{
$result = $items;
usort($result, 'sort_thr_created_rev');
foreach ($result as $k => $i) {
- if (count($result[$k]['children'])) {
+ if (isset($result[$k]['children'])) {
$result[$k]['children'] = sort_item_children($result[$k]['children']);
}
}
return $result;
}
-/// @TODO Add type-hint
-function add_children_to_list($children, &$arr) {
- foreach ($children as $y) {
- $arr[] = $y;
- if (count($y['children'])) {
- add_children_to_list($y['children'], $arr);
+/**
+ * @brief Recursively add all children items at the top level of a list
+ *
+ * @param array $children List of items to append
+ * @param array $item_list
+ */
+function add_children_to_list(array $children, array &$item_list)
+{
+ foreach ($children as $child) {
+ $item_list[] = $child;
+ if (isset($child['children'])) {
+ add_children_to_list($child['children'], $item_list);
}
}
}
-/// @TODO Add type-hint
-function conv_sort($arr, $order) {
-
- if ((!(is_array($arr) && count($arr)))) {
- return array();
+/**
+ * This recursive function takes the item tree structure created by conv_sort() and
+ * flatten the extraneous depth levels when people reply sequentially, removing the
+ * stairs effect in threaded conversations limiting the available content width.
+ *
+ * The basic principle is the following: if a post item has only one reply and is
+ * the last reply of its parent, then the reply is moved to the parent.
+ *
+ * This process is rendered somewhat more complicated because items can be either
+ * replies or likes, and these don't factor at all in the reply count/last reply.
+ *
+ * @brief Selectively flattens a tree-like item structure to prevent threading stairs
+ *
+ * @param array $parent A tree-like array of items
+ * @return array
+ */
+function smart_flatten_conversation(array $parent)
+{
+ if (! isset($parent['children']) || count($parent['children']) == 0) {
+ return $parent;
}
- $parents = array();
- $children = array();
- $newarr = array();
+ // We use a for loop to ensure we process the newly-moved items
+ for ($i = 0; $i < count($parent['children']); $i++) {
+ $child = $parent['children'][$i];
- /*
- * This is a preparation for having two different items with the same uri in one thread
- * This will otherwise lead to an endless loop.
- */
- foreach ($arr as $x) {
- if (!isset($newarr[$x['uri']])) {
- $newarr[$x['uri']] = $x;
+ if (isset($child['children']) && count($child['children'])) {
+ // This helps counting only the regular posts
+ $count_post_closure = function($var) {
+ return $var['verb'] === ACTIVITY_POST;
+ };
+
+ $child_post_count = count(array_filter($child['children'], $count_post_closure));
+
+ $remaining_post_count = count(array_filter(array_slice($parent['children'], $i), $count_post_closure));
+
+ // If there's only one child's children post and this is the last child post
+ if ($child_post_count == 1 && $remaining_post_count == 1) {
+
+ // Searches the post item in the children
+ $j = 0;
+ while($child['children'][$j]['verb'] !== ACTIVITY_POST && $j < count($child['children'])) {
+ $j ++;
+ }
+
+ $moved_item = $child['children'][$j];
+ unset($parent['children'][$i]['children'][$j]);
+ $parent['children'][] = $moved_item;
+ } else {
+ $parent['children'][$i] = smart_flatten_conversation($child);
+ }
}
}
- $arr = $newarr;
+ return $parent;
+}
+
+
+/**
+ * Expands a flat list of items into corresponding tree-like conversation structures,
+ * sort the top-level posts either on "created" or "commented", and finally
+ * append all the items at the top level (???)
+ *
+ * @brief Expands a flat item list into a conversation array for display
+ *
+ * @param array $item_list A list of items belonging to one or more conversations
+ * @param string $order Either on "created" or "commented"
+ * @return array
+ */
+function conv_sort(array $item_list, $order)
+{
+ $parents = [];
+
+ if (!(is_array($item_list) && count($item_list))) {
+ return $parents;
+ }
+
+ $item_array = [];
- foreach ($arr as $x) {
- if ($x['id'] == $x['parent']) {
- $parents[] = $x;
+ // Dedupes the item list on the uri to prevent infinite loops
+ foreach ($item_list as $item) {
+ $item_array[$item['uri']] = $item;
+ }
+
+ // Extract the top level items
+ foreach ($item_array as $item) {
+ if ($item['id'] == $item['parent']) {
+ $parents[] = $item;
}
}
usort($parents, 'sort_thr_commented');
}
- if (count($parents)) {
- foreach ($parents as $i => $_x) {
- $parents[$i]['children'] = get_item_children($arr, $_x);
- }
+ /*
+ * Plucks children from the item_array, second pass collects eventual orphan
+ * items and add them as children of their top-level post.
+ */
+ foreach ($parents as $i => $parent) {
+ $parents[$i]['children'] =
+ array_merge(get_item_children($item_array, $parent, true),
+ get_item_children($item_array, $parent, false));
}
- /// @TODO Old-lost code?
- /*foreach ($arr as $x) {
- if ($x['id'] != $x['parent']) {
- $p = find_thread_parent_index($parents,$x);
- if ($p !== false)
- $parents[$p]['children'][] = $x;
- }
- }*/
- if (count($parents)) {
- foreach ($parents as $k => $v) {
- if (count($parents[$k]['children'])) {
- $parents[$k]['children'] = sort_item_children($parents[$k]['children']);
- /// @TODO Old-lost code?
- /*$y = $parents[$k]['children'];
- usort($y,'sort_thr_created_rev');
- $parents[$k]['children'] = $y;*/
- }
+ foreach ($parents as $i => $parent) {
+ $parents[$i]['children'] = sort_item_children($parents[$i]['children']);
+ }
+
+ if (PConfig::get(local_user(), 'system', 'smart_threading', 0)) {
+ foreach ($parents as $i => $parent) {
+ $parents[$i] = smart_flatten_conversation($parent);
}
}
- $ret = array();
- if (count($parents)) {
- foreach ($parents as $x) {
- $ret[] = $x;
- if (count($x['children'])) {
- add_children_to_list($x['children'], $ret);
- /// @TODO Old-lost code?
- /*foreach ($x['children'] as $y)
- $ret[] = $y;*/
- }
+ /// @TODO: Stop recusrsively adding all children back to the top level (!!!)
+ /// However, this apparently ensures responses (likes, attendance) display (?!)
+ foreach ($parents as $parent) {
+ if (count($parent['children'])) {
+ add_children_to_list($parent['children'], $parents);
}
}
- return $ret;
+ return $parents;
}
-/// @TODO Add type-hint
-function sort_thr_created($a, $b) {
+/**
+ * @brief usort() callback to sort item arrays by the created key
+ *
+ * @param array $a
+ * @param array $b
+ * @return int
+ */
+function sort_thr_created(array $a, array $b)
+{
return strcmp($b['created'], $a['created']);
}
-/// @TODO Add type-hint
-function sort_thr_created_rev($a, $b) {
+/**
+ * @brief usort() callback to reverse sort item arrays by the created key
+ *
+ * @param array $a
+ * @param array $b
+ * @return int
+ */
+function sort_thr_created_rev(array $a, array $b)
+{
return strcmp($a['created'], $b['created']);
}
-/// @TODO Add type-hint
-function sort_thr_commented($a, $b) {
+/**
+ * @brief usort() callback to sort item arrays by the commented key
+ *
+ * @param array $a
+ * @param array $b
+ * @return type
+ */
+function sort_thr_commented(array $a, array $b)
+{
return strcmp($b['commented'], $a['commented']);
}
-/// @TODO Add type-hint
-function find_thread_parent_index($arr, $x) {
- foreach ($arr as $k => $v) {
- if ($v['id'] == $x['parent']) {
- return $k;
- }
- }
- return false;
-}
-
/// @TODO Add type-hint
function render_location_dummy($item) {
if ($item['location'] != "") {
/// @TODO Add type-hint
function get_responses($conv_responses, $response_verbs, $ob, $item) {
- $ret = array();
+ $ret = [];
foreach ($response_verbs as $v) {
- $ret[$v] = array();
- $ret[$v]['count'] = ((x($conv_responses[$v], $item['uri'])) ? $conv_responses[$v][$item['uri']] : '');
- $ret[$v]['list'] = ((x($conv_responses[$v], $item['uri'])) ? $conv_responses[$v][$item['uri'] . '-l'] : '');
- $ret[$v]['self'] = ((x($conv_responses[$v], $item['uri'])) ? $conv_responses[$v][$item['uri'] . '-self'] : '0');
+ $ret[$v] = [];
+ $ret[$v]['count'] = defaults($conv_responses[$v], $item['uri'], '');
+ $ret[$v]['list'] = defaults($conv_responses[$v], $item['uri'] . '-l', '');
+ $ret[$v]['self'] = defaults($conv_responses[$v], $item['uri'] . '-self', '0');
if (count($ret[$v]['list']) > MAX_LIKERS) {
$ret[$v]['list_part'] = array_slice($ret[$v]['list'], 0, MAX_LIKERS);
array_push($ret[$v]['list_part'], '<a href="#" data-toggle="modal" data-target="#' . $v . 'Modal-'
- . (($ob) ? $ob->get_id() : $item['id']) . '"><b>' . t('View all') . '</b></a>');
+ . (($ob) ? $ob->getId() : $item['id']) . '"><b>' . t('View all') . '</b></a>');
} else {
$ret[$v]['list_part'] = '';
}
return $ret;
}
-function get_response_button_text($v, $count) {
+function get_response_button_text($v, $count)
+{
switch ($v) {
case 'like':
- return tt('Like', 'Likes', $count, 'noun');
+ $return = tt('Like', 'Likes', $count);
break;
case 'dislike':
- return tt('Dislike', 'Dislikes', $count, 'noun');
+ $return = tt('Dislike', 'Dislikes', $count);
break;
case 'attendyes':
- return tt('Attending', 'Attending', $count, 'noun');
+ $return = tt('Attending', 'Attending', $count);
break;
case 'attendno':
- return tt('Not Attending', 'Not Attending', $count, 'noun');
+ $return = tt('Not Attending', 'Not Attending', $count);
break;
case 'attendmaybe':
- return tt('Undecided', 'Undecided', $count, 'noun');
+ $return = tt('Undecided', 'Undecided', $count);
break;
}
+
+ return $return;
}