X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=7b358d3dd6f52a254f4cb635634e121cec3d96b8;hb=b4d14164bb47a76e62977447816fae5b65ea4da7;hp=a937eb69f5fb0abe2fb7f75ab1837bc4e176433b;hpb=fbd559a8234d33a053b99dd10ecfcb3162a5e53a;p=friendica.git diff --git a/include/conversation.php b/include/conversation.php index a937eb69f5..7b358d3dd6 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1,16 +1,26 @@ $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; @@ -60,14 +71,15 @@ function item_redir_and_replace_images($body, $images, $cid) { while ($pos !== false && $cnt < 1000) { $search = '/\[url\=(.*?)\]\[!#saved_image([0-9]*)#!\]\[\/url\]' . '/is'; - $replace = '[url=' . z_path() . '/redir/' . $cid + $replace = '[url=' . System::baseUrl() . '/redir/' . $cid . '?f=1&url=' . '$1' . '][!#saved_image' . '$2' .'#!][/url]'; $newbody .= substr($origbody, 0, $pos['start']['open']); $subject = substr($origbody, $pos['start']['open'], $pos['end']['close'] - $pos['start']['open']); $origbody = substr($origbody, $pos['end']['close']); - if ($origbody === false) + if ($origbody === false) { $origbody = ''; + } $subject = preg_replace($search, $replace, $subject); $newbody .= $subject; @@ -79,45 +91,51 @@ function item_redir_and_replace_images($body, $images, $cid) { $cnt = 0; foreach ($images as $image) { - // We're depending on the property of 'foreach' (specified on the PHP website) that - // it loops over the array starting from the first element and going sequentially - // to the last element + /* + * We're depending on the property of 'foreach' (specified on the PHP website) that + * it loops over the array starting from the first element and going sequentially + * to the last element. + */ $newbody = str_replace('[!#saved_image' . $cnt . '#!]', '[img]' . $image . '[/img]', $newbody); $cnt++; } return $newbody; -}} - - +} /** * Render actions localized */ -function localize_item(&$item){ +function localize_item(&$item) { $extracted = item_extract_images($item['body']); - if ($extracted['images']) + if ($extracted['images']) { $item['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $item['contact-id']); + } - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; - if (activity_match($item['verb'],ACTIVITY_LIKE) - || activity_match($item['verb'],ACTIVITY_DISLIKE) - || activity_match($item['verb'],ACTIVITY_ATTEND) - || activity_match($item['verb'],ACTIVITY_ATTENDNO) - || activity_match($item['verb'],ACTIVITY_ATTENDMAYBE)){ - - $r = q("SELECT * from `item`,`contact` WHERE - `item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';", - dbesc($item['parent-uri'])); - if (!dbm::is_result($r)) return; - $obj=$r[0]; + /// @Separted ??? + $xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">"; + if (activity_match($item['verb'], ACTIVITY_LIKE) + || activity_match($item['verb'], ACTIVITY_DISLIKE) + || activity_match($item['verb'], ACTIVITY_ATTEND) + || activity_match($item['verb'], ACTIVITY_ATTENDNO) + || activity_match($item['verb'], ACTIVITY_ATTENDMAYBE)) { + + /// @TODO may hurt performance + $r = q("SELECT * FROM `item`, `contact` + WHERE `item`.`contact-id`=`contact`.`id` + AND `item`.`uri`='%s'", + dbesc($item['parent-uri'])); + if (!DBM::is_result($r)) { + return; + } + $obj = $r[0]; $author = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]'; $objauthor = '[url=' . $obj['author-link'] . ']' . $obj['author-name'] . '[/url]'; - switch($obj['verb']){ + switch ($obj['verb']) { case ACTIVITY_POST: - switch ($obj['object-type']){ + switch ($obj['object-type']) { case ACTIVITY_OBJ_EVENT: $post_type = t('event'); break; @@ -126,9 +144,10 @@ function localize_item(&$item){ } break; default: - if ($obj['resource-id']){ + 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'); @@ -137,25 +156,25 @@ function localize_item(&$item){ $plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]'; - if (activity_match($item['verb'],ACTIVITY_LIKE)) { + if (activity_match($item['verb'], ACTIVITY_LIKE)) { $bodyverb = t('%1$s likes %2$s\'s %3$s'); } - elseif (activity_match($item['verb'],ACTIVITY_DISLIKE)) { + elseif (activity_match($item['verb'], ACTIVITY_DISLIKE)) { $bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s'); } - elseif (activity_match($item['verb'],ACTIVITY_ATTEND)) { + elseif (activity_match($item['verb'], ACTIVITY_ATTEND)) { $bodyverb = t('%1$s attends %2$s\'s %3$s'); } - elseif (activity_match($item['verb'],ACTIVITY_ATTENDNO)) { + elseif (activity_match($item['verb'], ACTIVITY_ATTENDNO)) { $bodyverb = t('%1$s doesn\'t attend %2$s\'s %3$s'); } - elseif (activity_match($item['verb'],ACTIVITY_ATTENDMAYBE)) { + elseif (activity_match($item['verb'], ACTIVITY_ATTENDMAYBE)) { $bodyverb = t('%1$s attends maybe %2$s\'s %3$s'); } $item['body'] = sprintf($bodyverb, $author, $objauthor, $plink); } - if (activity_match($item['verb'],ACTIVITY_FRIEND)) { + if (activity_match($item['verb'], ACTIVITY_FRIEND)) { if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) return; @@ -169,57 +188,65 @@ function localize_item(&$item){ $Bname = $obj->title; $Blink = ""; $Bphoto = ""; - foreach ($links->link as $l){ + foreach ($links->link as $l) { $atts = $l->attributes(); - switch($atts['rel']){ + switch ($atts['rel']) { case "alternate": $Blink = $atts['href']; case "photo": $Bphoto = $atts['href']; } - } - $A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]'; - $B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]'; - if ($Bphoto!="") $Bphoto = '[url=' . zrl($Blink) . '][img]' . $Bphoto . '[/img][/url]'; + $A = '[url=' . Profile::zrl($Alink) . ']' . $Aname . '[/url]'; + $B = '[url=' . Profile::zrl($Blink) . ']' . $Bname . '[/url]'; + if ($Bphoto != "") { + $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; } - if (stristr($item['verb'],ACTIVITY_POKE)) { + if (stristr($item['verb'], ACTIVITY_POKE)) { $verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1)); - if (! $verb) + if (! $verb) { return; - if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) return; + } + if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) { + return; + } $Aname = $item['author-name']; $Alink = $item['author-link']; - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; + $xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">"; $obj = parse_xml_string($xmlhead.$item['object']); $links = parse_xml_string($xmlhead."".unxmlify($obj->link).""); $Bname = $obj->title; - $Blink = ""; $Bphoto = ""; - foreach ($links->link as $l){ + $Blink = ""; + $Bphoto = ""; + foreach ($links->link as $l) { $atts = $l->attributes(); - switch($atts['rel']){ + switch ($atts['rel']) { case "alternate": $Blink = $atts['href']; case "photo": $Bphoto = $atts['href']; } - } - $A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]'; - $B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]'; - if ($Bphoto!="") $Bphoto = '[url=' . zrl($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]'; + $A = '[url=' . Profile::zrl($Alink) . ']' . $Aname . '[/url]'; + $B = '[url=' . Profile::zrl($Blink) . ']' . $Bname . '[/url]'; + if ($Bphoto != "") { + $Bphoto = '[url=' . Profile::zrl($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]'; + } - // we can't have a translation string with three positions but no distinguishable text - // So here is the translate string. + /* + * we can't have a translation string with three positions but no distinguishable text + * So here is the translate string. + */ $txt = t('%1$s poked %2$s'); // now translate the verb - $poked_t = trim(sprintf($txt, "","")); + $poked_t = trim(sprintf($txt, "", "")); $txt = str_replace( $poked_t, t($verb), $txt); // then do the sprintf on the translation string @@ -227,33 +254,26 @@ function localize_item(&$item){ $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]'; + if (activity_match($item['verb'], ACTIVITY_TAG)) { + /// @TODO may hurt performance "joining" two tables + asterisk + $r = q("SELECT * FROM `item`, `contact` + WHERE `item`.`contact-id`=`contact`.`id` + AND `item`.`uri`='%s'", + dbesc($item['parent-uri'])); - $txt = t('%1$s is currently %2$s'); - - $item['body'] = sprintf($txt, $A, t($verb)); - } + if (!DBM::is_result($r)) { + return; + } - if (activity_match($item['verb'],ACTIVITY_TAG)) { - $r = q("SELECT * from `item`,`contact` WHERE - `item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';", - dbesc($item['parent-uri'])); - if (!dbm::is_result($r)) return; - $obj=$r[0]; + $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']){ + switch ($obj['verb']) { case ACTIVITY_POST: - switch ($obj['object-type']){ + switch ($obj['object-type']) { case ACTIVITY_OBJ_EVENT: $post_type = t('event'); break; @@ -262,13 +282,15 @@ function localize_item(&$item){ } break; default: - if ($obj['resource-id']){ + 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'); } + // Let's break everthing ... ;-) + break; } $plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]'; @@ -278,47 +300,48 @@ function localize_item(&$item){ $item['body'] = sprintf( t('%1$s tagged %2$s\'s %3$s with %4$s'), $author, $objauthor, $plink, $tag ); } - if (activity_match($item['verb'],ACTIVITY_FAVORITE)){ + if (activity_match($item['verb'], ACTIVITY_FAVORITE)) { - if ($item['object-type']== "") + if ($item['object-type'] == "") { return; + } $Aname = $item['author-name']; $Alink = $item['author-link']; - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; + $xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">"; $obj = parse_xml_string($xmlhead.$item['object']); if (strlen($obj->id)) { - $r = q("select * from item where uri = '%s' and uid = %d limit 1", + $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($obj->id), intval($item['uid']) ); - if (dbm::is_result($r) && $r[0]['plink']) { + + if (DBM::is_result($r) && $r[0]['plink']) { $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"; - } } } $matches = null; - if (preg_match_all('/@\[url=(.*?)\]/is',$item['body'],$matches,PREG_SET_ORDER)) { + 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']); + if (! strpos($mtch[1], 'zrl=')) { + $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]'; + if (preg_match($photo_pattern, $item['body'])) { + $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']); } @@ -327,27 +350,26 @@ function localize_item(&$item){ $x = stristr($item['plink'],'/display/'); if ($x) { $sparkle = false; - $y = best_link_url($item,$sparkle,true); + $y = best_link_url($item, $sparkle); - if (strstr($y,'/redir/')) { + if (strstr($y, '/redir/')) { $item['plink'] = $y . '?f=&url=' . $item['plink']; } } - - - } /** * Count the total of comments on this item and its desendants + * @TODO proper type-hint + doc-tag */ function count_descendants($item) { $total = count($item['children']); if ($total > 0) { foreach ($item['children'] as $child) { - if (! visible_activity($child)) + if (! visible_activity($child)) { $total --; + } $total += count_descendants($child); } } @@ -357,17 +379,18 @@ function count_descendants($item) { function visible_activity($item) { - // 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); + /* + * likes (etc.) can apply to other things besides posts. Check if they are post children, + * in which case we handle them specially + */ + $hidden_activities = [ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE]; foreach ($hidden_activities as $act) { - if (activity_match($item['verb'],$act)) { + if (activity_match($item['verb'], $act)) { return false; } } - if (activity_match($item['verb'],ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE) { + if (activity_match($item['verb'], ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE) { if (! (($item['self']) && ($item['uid'] == local_user()))) { return false; } @@ -380,9 +403,8 @@ function visible_activity($item) { * @brief SQL query for items */ function item_query() { - - return "SELECT ".item_fieldlists()." FROM `item` ". - item_joins()." WHERE ".item_condition(); + return "SELECT " . item_fieldlists() . " FROM `item` " . + item_joins() . " WHERE " . item_condition(); } /** @@ -394,7 +416,6 @@ function item_fieldlists() { These Fields are not added below (yet). They are here to for bug search. `item`.`type`, `item`.`extid`, -`item`.`received`, `item`.`changed`, `item`.`moderated`, `item`.`target-type`, @@ -410,7 +431,6 @@ These Fields are not added below (yet). They are here to for bug search. `item`.`deleted`, `item`.`origin`, `item`.`forum_mode`, -`item`.`last-child`, `item`.`mention`, `item`.`global`, `item`.`gcontact-id`, @@ -421,7 +441,7 @@ These Fields are not added below (yet). They are here to for bug search. `item`.`owner-id`, `item`.`owner-link`, `item`.`owner-name`, `item`.`owner-avatar`, `item`.`contact-id`, `item`.`uid`, `item`.`id`, `item`.`parent`, `item`.`uri`, `item`.`thr-parent`, `item`.`parent-uri`, - `item`.`commented`, `item`.`created`, `item`.`edited`, + `item`.`commented`, `item`.`created`, `item`.`edited`, `item`.`received`, `item`.`verb`, `item`.`object-type`, `item`.`postopts`, `item`.`plink`, `item`.`guid`, `item`.`wall`, `item`.`private`, `item`.`starred`, `item`.`title`, `item`.`body`, `item`.`file`, `item`.`event-id`, @@ -433,25 +453,31 @@ These Fields are not added below (yet). They are here to for bug search. `author`.`thumb` AS `author-thumb`, `owner`.`thumb` AS `owner-thumb`, `contact`.`network`, `contact`.`url`, `contact`.`name`, `contact`.`writable`, - `contact`.`self`, `contact`.`id` AS `cid`, `contact`.`alias`"; + `contact`.`self`, `contact`.`id` AS `cid`, `contact`.`alias`, + + `event`.`created` AS `event-created`, `event`.`edited` AS `event-edited`, + `event`.`start` AS `event-start`,`event`.`finish` AS `event-finish`, + `event`.`summary` AS `event-summary`,`event`.`desc` AS `event-desc`, + `event`.`location` AS `event-location`, `event`.`type` AS `event-type`, + `event`.`nofinish` AS `event-nofinish`,`event`.`adjust` AS `event-adjust`, + `event`.`ignore` AS `event-ignore`, `event`.`id` AS `event-id`"; } /** * @brief SQL join for contacts that are needed for displaying items */ function item_joins() { - return "STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND (NOT `contact`.`blocked` OR `contact`.`pending`) LEFT JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id` - LEFT JOIN `contact` AS `owner` ON `owner`.`id`=`item`.`owner-id`"; + LEFT JOIN `contact` AS `owner` ON `owner`.`id`=`item`.`owner-id` + LEFT JOIN `event` ON `event-id` = `event`.`id`"; } /** * @brief SQL condition for items that are needed for displaying items */ function item_condition() { - return "`item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`"; } @@ -465,26 +491,21 @@ function item_condition() { * that are based on unique features of the calling module. * */ - -if (!function_exists('conversation')) { function conversation(App $a, $items, $mode, $update, $preview = false) { - - require_once('include/bbcode.php'); - require_once('include/Contact.php'); - require_once('mod/proxy.php'); + require_once 'include/bbcode.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 (local_user()) { - $str_blocked = get_pconfig(local_user(),'system','blocked'); + $str_blocked = PConfig::get(local_user(), 'system', 'blocked'); if ($str_blocked) { - $arr_blocked = explode(',',$str_blocked); + $arr_blocked = explode(',', $str_blocked); for ($x = 0; $x < count($arr_blocked); $x ++) { $arr_blocked[$x] = trim($arr_blocked[$x]); } @@ -496,114 +517,128 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { 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. - // We only launch liveUpdate if you aren't filtering in some incompatible - // way and also you aren't writing a comment (discovered in javascript). - + /* + * The special div is needed for liveUpdate to kick in for this page. + * We only launch liveUpdate if you aren't filtering in some incompatible + * way and also you aren't writing a comment (discovered in javascript). + */ $live_update_div = '
' . "\r\n" . "\r\n"; } - } - else if ($mode === 'profile') { + } 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, - // because browser prefetching might change it on us. We have to deliver it with the page. + /* + * This is ugly, but we can't pass the profile_uid through the session to the ajax updater, + * because browser prefetching might change it on us. We have to deliver it with the page. + */ $live_update_div = '
' . "\r\n" . "\r\n"; } } - } - else if ($mode === 'notes') { + } elseif ($mode === 'notes') { $profile_owner = local_user(); - $page_writeable = true; if (!$update) { $live_update_div = '
' . "\r\n" . "\r\n"; } - } - else if ($mode === 'display') { + } elseif ($mode === 'display') { $profile_owner = $a->profile['uid']; - $page_writeable = can_write_wall($a,$profile_owner); if (!$update) { $live_update_div = '
' . "\r\n" . ""; } - } - else if ($mode === 'community') { + } elseif ($mode === 'community') { + if (!$community_readonly) { + $items = community_add_items($items); + } $profile_owner = 0; - $page_writeable = false; if (!$update) { $live_update_div = '
' . "\r\n" - . "\r\n"; + . "\r\n"; } - } - else if ($mode === 'search') { + } elseif ($mode === 'search') { $live_update_div = '' . "\r\n"; } $page_dropping = ((local_user() && local_user() == $profile_owner) ? true : false); + if (!$update) { + $_SESSION['return_url'] = $a->query_string; + } - if ($update) - $return_url = $_SESSION['return_url']; - else - $return_url = $_SESSION['return_url'] = $a->query_string; - - $cb = array('items' => $items, 'mode' => $mode, 'update' => $update, 'preview' => $preview); - call_hooks('conversation_start',$cb); + $cb = ['items' => $items, 'mode' => $mode, 'update' => $update, 'preview' => $preview]; + Addon::callHooks('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 - // - just loop through the items and format them minimally for display + /* + * "New Item View" on network page or search page results + * - just loop through the items and format them minimally for display + */ -// $tpl = get_markup_template('search_item.tpl'); + /// @TODO old lost code? + // $tpl = get_markup_template('search_item.tpl'); $tpl = 'search_item.tpl'; foreach ($items as $item) { @@ -611,156 +646,146 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { if ($arr_blocked) { $blocked = false; foreach ($arr_blocked as $b) { - if ($b && link_compare($item['author-link'],$b)) { + if ($b && link_compare($item['author-link'], $b)) { $blocked = true; break; } } - if ($blocked) + if ($blocked) { continue; + } } $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; + if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) { + continue; + } - $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']); - if ($item['author-link'] && (! $item['author-name'])) + $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']); + if ($item['author-link'] && (! $item['author-name'])) { $profile_name = $item['author-link']; + } + $tags = []; + $hashtags = []; + $mentions = []; + $searchpath = System::baseUrl()."/search?tag="; - $tags=array(); - $hashtags = array(); - $mentions = array(); - - $taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`", - intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION)); + $taglist = dba::select('term', ['type', 'term', 'url'], + ["`otype` = ? AND `oid` = ? AND `type` IN (?, ?)", TERM_OBJ_POST, $item['id'], TERM_HASHTAG, TERM_MENTION], + ['order' => ['tid']]); - foreach ($taglist as $tag) { + while ($tag = dba::fetch($taglist)) { + if ($tag["url"] == "") { + $tag["url"] = $searchpath . strtolower($tag["term"]); + } - if ($tag["url"] == "") - $tag["url"] = $searchpath.strtolower($tag["term"]); + $tag["url"] = best_link_url($item, $sp, $tag["url"]); if ($tag["type"] == TERM_HASHTAG) { - $hashtags[] = "#".$tag["term"].""; + $hashtags[] = "#" . $tag["term"] . ""; $prefix = "#"; } elseif ($tag["type"] == TERM_MENTION) { - $mentions[] = "@".$tag["term"].""; + $mentions[] = "@" . $tag["term"] . ""; $prefix = "@"; } - $tags[] = $prefix."".$tag["term"].""; + $tags[] = $prefix."" . $tag["term"] . ""; } + dba::close($taglist); $sp = false; - $profile_link = best_link_url($item,$sp); - if ($profile_link === 'mailbox') + $profile_link = best_link_url($item, $sp); + if ($profile_link === 'mailbox') { $profile_link = ''; - if ($sp) + } + + if ($sp) { $sparkle = ' sparkle'; - else - $profile_link = zrl($profile_link); + } else { + $profile_link = Profile::zrl($profile_link); + } - if (!isset($item['author-thumb']) OR ($item['author-thumb'] == "")) { - $author_contact = get_contact_details_by_url($item['author-link'], $profile_owner); - if ($author_contact["thumb"]) + if (!x($item, 'author-thumb') || ($item['author-thumb'] == "")) { + $author_contact = Contact::getDetailsByURL($item['author-link'], $profile_owner); + if ($author_contact["thumb"]) { $item['author-thumb'] = $author_contact["thumb"]; - else + } else { $item['author-thumb'] = $item['author-avatar']; + } } - if (!isset($item['owner-thumb']) OR ($item['owner-thumb'] == "")) { - $owner_contact = get_contact_details_by_url($item['owner-link'], $profile_owner); - if ($owner_contact["thumb"]) + if (!isset($item['owner-thumb']) || ($item['owner-thumb'] == "")) { + $owner_contact = Contact::getDetailsByURL($item['owner-link'], $profile_owner); + if ($owner_contact["thumb"]) { $item['owner-thumb'] = $owner_contact["thumb"]; - else + } else { $item['owner-thumb'] = $item['owner-avatar']; + } } - $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => ''); - call_hooks('render_location',$locate); + $locate = ['location' => $item['location'], 'coord' => $item['coord'], 'html' => '']; + Addon::callHooks('render_location',$locate); $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate)); localize_item($item); - if ($mode === 'network-new') + if ($mode === 'network-new') { $dropping = true; - else + } else { $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); + $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'] == "") + 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), 'name' => $profile_name_e, 'sparkle' => $sparkle, 'lock' => $lock, - 'thumb' => App::remove_baseurl(proxy_url($item['author-thumb'], false, PROXY_SIZE_THUMB)), + 'thumb' => System::removedBaseUrl(proxy_url($item['author-thumb'], false, PROXY_SIZE_THUMB)), 'title' => $item['title_e'], 'body' => $body_e, 'tags' => $tags_e, @@ -779,7 +804,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { 'indent' => '', 'owner_name' => $owner_name_e, 'owner_url' => $owner_url, - 'owner_photo' => App::remove_baseurl(proxy_url($item['owner-thumb'], false, PROXY_SIZE_THUMB)), + 'owner_photo' => System::removedBaseUrl(proxy_url($item['owner-thumb'], false, PROXY_SIZE_THUMB)), 'plink' => get_plink($item), 'edpost' => false, 'isstarred' => $isstarred, @@ -789,54 +814,45 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { '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); - call_hooks('display_item', $arr); + $arr = ['item' => $item, 'output' => $tmp_item]; + Addon::callHooks('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 - { + } else { // Normal View $page_template = get_markup_template("threaded_conversation.tpl"); - require_once('object/Conversation.php'); - 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(); + /* + * 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 + */ foreach ($items as $item) { - if ($arr_blocked) { $blocked = false; foreach ($arr_blocked as $b) { - - if ($b && link_compare($item['author-link'],$b)) { + if ($b && link_compare($item['author-link'], $b)) { $blocked = true; break; } } - if ($blocked) + if ($blocked) { continue; + } } - - // Can we put this after the visibility check? builtin_activity_puller($item, $conv_responses); @@ -844,44 +860,108 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) { continue; } + if (! visible_activity($item)) { continue; } - call_hooks('display_item', $arr); + Addon::callHooks('display_item', $arr); $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( - '$baseurl' => App::get_baseurl($ssl_state), + $o = replace_macros($page_template, [ + '$baseurl' => System::baseUrl($ssl_state), '$return_path' => $a->query_string, '$live_update' => $live_update_div, '$remove' => t('remove'), '$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]); + } + } -function best_link_url($item,&$sparkle,$ssl_state = false) { + $items = conv_sort($items, "`commented`"); + + return $items; +} + +function best_link_url($item, &$sparkle, $url = '') { $best_url = ''; $sparkle = false; @@ -889,33 +969,41 @@ function best_link_url($item,&$sparkle,$ssl_state = false) { $clean_url = normalise_link($item['author-link']); if (local_user()) { - $r = q("SELECT `id` FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `nurl` = '%s' AND NOT `pending` LIMIT 1", - dbesc(NETWORK_DFRN), intval(local_user()), dbesc(normalise_link($clean_url))); - if ($r) { - $best_url = 'redir/'.$r[0]['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(); + if (!strstr($url, $hostname)) { + $best_url .= "?url=".$url; + } else { + $best_url = $url; + } + } } } if (! $best_url) { - if (strlen($item['author-link'])) + if ($url != '') { + $best_url = $url; + } elseif (strlen($item['author-link'])) { $best_url = $item['author-link']; - else + } else { $best_url = $item['url']; + } } return $best_url; } -if (! function_exists('item_photo_menu')) { -function item_photo_menu($item) -{ - $ssl_state = false; - - if (local_user()) { - $ssl_state = true; - } - +function item_photo_menu($item) { $sub_link = ''; $poke_link = ''; $contact_url = ''; @@ -923,14 +1011,13 @@ function item_photo_menu($item) $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;'; } $sparkle = false; - $profile_link = best_link_url($item, $sparkle, $ssl_state); + $profile_link = best_link_url($item, $sparkle); if ($profile_link === 'mailbox') { $profile_link = ''; } @@ -938,21 +1025,20 @@ function item_photo_menu($item) $cid = 0; $network = ''; $rel = 0; - $r = q("SELECT `id`, `network`, `rel` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1", - intval(local_user()), dbesc(normalise_link($item['author-link']))); - if ($r) { - $cid = $r[0]['id']; - $network = $r[0]['network']; - $rel = $r[0]['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']) { @@ -960,13 +1046,13 @@ function item_photo_menu($item) $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, @@ -974,23 +1060,23 @@ function item_photo_menu($item) 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) OR ($rel == CONTACT_IS_FOLLOWER)) AND - in_array($item['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) { + if ((($cid == 0) || ($rel == CONTACT_IS_FOLLOWER)) && + 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); + Addon::callHooks('item_photo_menu', $args); $menu = $args['menu']; @@ -1004,7 +1090,7 @@ function item_photo_menu($item) } } return $o; -}} +} /** * @brief Checks item to see if it is one of the builtin activities (like/dislike, event attendance, consensus items, etc.) @@ -1014,13 +1100,12 @@ function item_photo_menu($item) * @param array &$conv_responses (already created with builtin activity structure) * @return void */ -if (! function_exists('builtin_activity_puller')) { function builtin_activity_puller($item, &$conv_responses) { foreach ($conv_responses as $mode => $v) { $url = ''; $sparkle = ''; - switch($mode) { + switch ($mode) { case 'like': $verb = ACTIVITY_LIKE; break; @@ -1038,35 +1123,38 @@ function builtin_activity_puller($item, &$conv_responses) { break; default: return; - break; } if ((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) { $url = $item['author-link']; - if ((local_user()) && (local_user() == $item['uid']) && ($item['network'] === NETWORK_DFRN) && (! $item['self']) && (link_compare($item['author-link'],$item['url']))) { + if ((local_user()) && (local_user() == $item['uid']) && ($item['network'] === NETWORK_DFRN) && (! $item['self']) && (link_compare($item['author-link'], $item['url']))) { $url = 'redir/' . $item['contact-id']; $sparkle = ' class="sparkle" '; + } else { + $url = Profile::zrl($url); } - else - $url = zrl($url); $url = '' . htmlentities($item['author-name']) . ''; - if (! $item['thr-parent']) + if (! $item['thr-parent']) { $item['thr-parent'] = $item['parent-uri']; + } 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(); + && (is_array($conv_responses[$mode][$item['thr-parent'] . '-l'])))) { + $conv_responses[$mode][$item['thr-parent'] . '-l'] = []; + } // only list each unique author once - if (in_array($url,$conv_responses[$mode][$item['thr-parent'] . '-l'])) + if (in_array($url,$conv_responses[$mode][$item['thr-parent'] . '-l'])) { continue; + } - if (! isset($conv_responses[$mode][$item['thr-parent']])) + if (! isset($conv_responses[$mode][$item['thr-parent']])) { $conv_responses[$mode][$item['thr-parent']] = 1; - else + } else { $conv_responses[$mode][$item['thr-parent']] ++; + } if (public_contact() == $item['author-id']) { $conv_responses[$mode][$item['thr-parent'] . '-self'] = 1; @@ -1078,17 +1166,17 @@ function builtin_activity_puller($item, &$conv_responses) { return; } } -}} - -// Format the vote text for a profile item -// $cnt = number of people who vote the item -// $arr = array of pre-linked names of likers/dislikers -// $type = one of 'like, 'dislike', 'attendyes', 'attendno', 'attendmaybe' -// $id = item id -// returns formatted text +} -if (! function_exists('format_like')) { -function format_like($cnt,$arr,$type,$id) { +/** + * Format the vote text for a profile item + * @param int $cnt = number of people who vote the item + * @param array $arr = array of pre-linked names of likers/dislikers + * @param string $type = one of 'like, 'dislike', 'attendyes', 'attendno', 'attendmaybe' + * @param int $id = item id + * @return formatted text + */ +function format_like($cnt, array $arr, $type, $id) { $o = ''; $expanded = ''; @@ -1097,7 +1185,7 @@ function format_like($cnt,$arr,$type,$id) { // Phrase if there is only one liker. In other cases it will be uses for the expanded // list which show all likers - switch($type) { + switch ($type) { case 'like' : $phrase = sprintf( t('%s likes this.'), $likers); break; @@ -1118,8 +1206,9 @@ function format_like($cnt,$arr,$type,$id) { if ($cnt > 1) { $total = count($arr); - if ($total >= MAX_LIKERS) + if ($total >= MAX_LIKERS) { $arr = array_slice($arr, 0, MAX_LIKERS - 1); + } if ($total < MAX_LIKERS) { $last = t('and') . ' ' . $arr[count($arr)-1]; $arr2 = array_slice($arr, 0, -1); @@ -1134,7 +1223,7 @@ function format_like($cnt,$arr,$type,$id) { $spanatts = "class=\"fakelink\" onclick=\"openClose('{$type}list-$id');\""; - switch($type) { + switch ($type) { case 'like': $phrase = sprintf( t('%2$d people like this'), $spanatts, $cnt); $explikers = sprintf( t('%s like this.'), $likers); @@ -1161,301 +1250,406 @@ function format_like($cnt,$arr,$type,$id) { } $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($a,$x, $notes_cid = 0, $popup=false) { +function status_editor(App $a, $x, $notes_cid = 0, $popup = false) +{ $o = ''; - $geotag = (($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' => App::get_baseurl(true), - '$geotag' => $geotag, - '$nickname' => $x['nickname'], - '$ispublic' => t('Visible to everybody'), - '$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 everybody'), + '$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' => App::get_baseurl(true), - '$geotag' => $geotag, - '$nickname' => $x['nickname'], - '$ispublic' => t('Visible to everybody'), - '$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 everybody'), + '$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); + Addon::callHooks('jot_tool', $jotplugins); // Private/public post links for the non-JS ACL form $private_post = 1; - if ($_REQUEST['public']) + if (x($_REQUEST, 'public')) { $private_post = 0; + } $query_str = $a->query_string; - if (strpos($query_str, 'public=1') !== false) - $query_str = str_replace(array('?public=1', '&public=1'), array('', ''), $query_str); + if (strpos($query_str, 'public=1') !== false) { + $query_str = str_replace(['?public=1', '&public=1'], ['', ''], $query_str); + } - // I think $a->query_string may never have ? in it, but I could be wrong - // It looks like it's from the index.php?q=[etc] rewrite that the web - // server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61 - if (strpos($query_str, '?') === false) + /* + * I think $a->query_string may never have ? in it, but I could be wrong + * It looks like it's from the index.php?q=[etc] rewrite that the web + * server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61 + */ + if (strpos($query_str, '?') === false) { $public_post_link = '?public=1'; - else + } else { $public_post_link = '&public=1'; + } - - -// $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); + // $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' => App::get_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 = ''; - + if ($popup == true) { + $o = ''; } 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 (get_config('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 == '') { $thr_parent = $item['parent-uri']; + } 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]); } - } - else if ($item['parent'] == $parent['id']) { + } elseif ($item['parent'] == $parent['id']) { $children[] = $item; + unset($item_list[$i]); } } } return $children; } -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'); + 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; } -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); + } } } -function conv_sort($arr,$order) { +/** + * 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; + } - if ((!(is_array($arr) && count($arr)))) - return 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]; - $parents = array(); - $children = array(); - $newarr = array(); + if (isset($child['children']) && count($child['children'])) { + // This helps counting only the regular posts + $count_post_closure = function($var) { + return $var['verb'] === ACTIVITY_POST; + }; - // 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; + $child_post_count = count(array_filter($child['children'], $count_post_closure)); - $arr = $newarr; + $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 ++; + } - foreach ($arr as $x) { - if ($x['id'] == $x['parent']) { - $parents[] = $x; + $moved_item = $child['children'][$j]; + unset($parent['children'][$i]['children'][$j]); + $parent['children'][] = $moved_item; + } else { + $parent['children'][$i] = smart_flatten_conversation($child); + } } } - if (stristr($order,'created')) { - usort($parents,'sort_thr_created'); - } elseif (stristr($order,'commented')) { - usort($parents,'sort_thr_commented'); + 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; } - if (count($parents)) { - foreach($parents as $i=>$_x) { - $parents[$i]['children'] = get_item_children($arr, $_x); - } + $item_array = []; + + // Dedupes the item list on the uri to prevent infinite loops + foreach ($item_list as $item) { + $item_array[$item['uri']] = $item; } - /*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']); - /*$y = $parents[$k]['children']; - usort($y,'sort_thr_created_rev'); - $parents[$k]['children'] = $y;*/ - } + // Extract the top level items + foreach ($item_array as $item) { + if ($item['id'] == $item['parent']) { + $parents[] = $item; } } - $ret = array(); - if (count($parents)) { - foreach ($parents as $x) { - $ret[] = $x; - if (count($x['children'])) - add_children_to_list($x['children'], $ret); - /*foreach ($x['children'] as $y) - $ret[] = $y;*/ - } + if (stristr($order, 'created')) { + usort($parents, 'sort_thr_created'); + } elseif (stristr($order, 'commented')) { + usort($parents, 'sort_thr_commented'); } - return $ret; -} + /* + * 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)); + } + 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); + } + } -function sort_thr_created($a,$b) { - return strcmp($b['created'],$a['created']); + /// @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 $parents; } -function sort_thr_created_rev($a,$b) { - return strcmp($a['created'],$b['created']); +/** + * @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']); } -function sort_thr_commented($a,$b) { - return strcmp($b['commented'],$a['commented']); +/** + * @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']); } -function find_thread_parent_index($arr,$x) { - foreach ($arr as $k => $v) { - if ($v['id'] == $x['parent']) { - return $k; - } - } - return false; +/** + * @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 render_location_dummy($item) { - if ($item['location'] != "") + if ($item['location'] != "") { return $item['location']; + } - if ($item['coord'] != "") + if ($item['coord'] != "") { return $item['coord']; + } } -function get_responses($conv_responses,$response_verbs,$ob,$item) { - $ret = array(); +/// @TODO Add type-hint +function get_responses($conv_responses, $response_verbs, $ob, $item) { + $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'], '' . t('View all') . ''); + . (($ob) ? $ob->getId() : $item['id']) . '">' . t('View all') . ''); } else { $ret[$v]['list_part'] = ''; } - $ret[$v]['button'] = get_response_button_text($v,$ret[$v]['count']); + $ret[$v]['button'] = get_response_button_text($v, $ret[$v]['count']); $ret[$v]['title'] = $conv_responses[$v]['title']; } @@ -1470,22 +1664,25 @@ function get_responses($conv_responses,$response_verbs,$ob,$item) { return $ret; } -function get_response_button_text($v,$count) { - switch($v) { +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; }