X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=23a0dcbf29215318fc776b1cb7821cbf99bfd03c;hb=25ba78d0d8bae95f1401e78c38ac45cd49c56d58;hp=8317746dd3a39c1a91ae13cf99a3ec66b81379b8;hpb=c6ce9ddaa41a59496cbe5cd93ace9bc552478ccd;p=friendica.git
diff --git a/include/conversation.php b/include/conversation.php
index 8317746dd3..23a0dcbf29 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -8,12 +8,13 @@ use Friendica\Content\ContactSelector;
use Friendica\Content\Feature;
use Friendica\Content\Pager;
use Friendica\Content\Text\BBCode;
-use Friendica\Core\Addon;
use Friendica\Core\Config;
+use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\PConfig;
use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
@@ -25,7 +26,9 @@ use Friendica\Object\Thread;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Temporal;
+use Friendica\Util\Strings;
use Friendica\Util\XML;
+use Friendica\Util\Crypto;
function item_extract_images($body) {
@@ -114,6 +117,10 @@ function item_redir_and_replace_images($body, $images, $cid) {
/**
* Render actions localized
+ *
+ * @param $item
+ * @throws ImagickException
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
function localize_item(&$item)
{
@@ -169,6 +176,7 @@ function localize_item(&$item)
$plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]';
+ $bodyverb = '';
if (activity_match($item['verb'], ACTIVITY_LIKE)) {
$bodyverb = L10n::t('%1$s likes %2$s\'s %3$s');
} elseif (activity_match($item['verb'], ACTIVITY_DISLIKE)) {
@@ -194,7 +202,7 @@ function localize_item(&$item)
$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
$obj = XML::parseString($xmlhead.$item['object']);
- $links = XML::parseString($xmlhead."".unxmlify($obj->link)."");
+ $links = XML::parseString($xmlhead."".XML::unescape($obj->link)."");
$Bname = $obj->title;
$Blink = "";
@@ -202,8 +210,8 @@ function localize_item(&$item)
foreach ($links->link as $l) {
$atts = $l->attributes();
switch ($atts['rel']) {
- case "alternate": $Blink = $atts['href'];
- case "photo": $Bphoto = $atts['href'];
+ case "alternate": $Blink = $atts['href']; break;
+ case "photo": $Bphoto = $atts['href']; break;
}
}
@@ -364,6 +372,8 @@ function localize_item(&$item)
/**
* Count the total of comments on this item and its desendants
* @TODO proper type-hint + doc-tag
+ * @param $item
+ * @return int
*/
function count_descendants($item) {
$total = count($item['children']);
@@ -386,7 +396,7 @@ 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 = [ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE];
+ $hidden_activities = [ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE, ACTIVITY_FOLLOW];
foreach ($hidden_activities as $act) {
if (activity_match($item['verb'], $act)) {
return false;
@@ -433,7 +443,17 @@ function conv_get_blocklist()
* The $mode parameter decides between the various renderings and also
* figures out how to determine page owner and other contextual items
* that are based on unique features of the calling module.
- *
+ * @param App $a
+ * @param array $items
+ * @param Pager $pager
+ * @param $mode
+ * @param $update
+ * @param bool $preview
+ * @param string $order
+ * @param int $uid
+ * @return string
+ * @throws ImagickException
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
function conversation(App $a, array $items, Pager $pager, $mode, $update, $preview = false, $order = 'commented', $uid = 0)
{
@@ -459,17 +479,17 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
. "\r\n";
}
@@ -479,8 +499,8 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
if (!$update) {
$tab = 'posts';
- if (x($_GET, 'tab')) {
- $tab = notags(trim($_GET['tab']));
+ if (!empty($_GET['tab'])) {
+ $tab = Strings::escapeTags(trim($_GET['tab']));
}
if ($tab === 'posts') {
/*
@@ -494,7 +514,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
}
}
} elseif ($mode === 'notes') {
- $items = conversation_add_children($items, false, $order, $uid);
+ $items = conversation_add_children($items, false, $order, local_user());
$profile_owner = local_user();
if (!$update) {
@@ -521,7 +541,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
."/?f='; var profile_page = " . $pager->getPage() . "; \r\n";
}
} elseif ($mode === 'contacts') {
- $items = conversation_add_children($items, true, $order, $uid);
+ $items = conversation_add_children($items, false, $order, $uid);
$profile_owner = 0;
if (!$update) {
@@ -540,7 +560,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
}
$cb = ['items' => $items, 'mode' => $mode, 'update' => $update, 'preview' => $preview];
- Addon::callHooks('conversation_start',$cb);
+ Hook::callAll('conversation_start',$cb);
$items = $cb['items'];
@@ -553,7 +573,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
$threads = [];
$threadsid = -1;
- $page_template = get_markup_template("conversation.tpl");
+ $page_template = Renderer::getMarkupTemplate("conversation.tpl");
if (!empty($items)) {
if (in_array($mode, ['community', 'contacts'])) {
@@ -612,7 +632,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
}
$locate = ['location' => $item['location'], 'coord' => $item['coord'], 'html' => ''];
- Addon::callHooks('render_location',$locate);
+ Hook::callAll('render_location',$locate);
$location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate));
@@ -636,7 +656,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
$lock = false;
$likebuttons = false;
- $body = prepare_body($item, true, $preview);
+ $body = Item::prepareBody($item, true, $preview);
list($categories, $folders) = get_cats_and_terms($item);
@@ -687,7 +707,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
'owner_name' => $owner_name_e,
'owner_url' => $owner_url,
'owner_photo' => System::removedBaseUrl(ProxyUtils::proxifyUrl($item['owner-avatar'], false, ProxyUtils::SIZE_THUMB)),
- 'plink' => get_plink($item),
+ 'plink' => Item::getPlink($item),
'edpost' => false,
'isstarred' => $isstarred,
'star' => $star,
@@ -703,7 +723,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
];
$arr = ['item' => $item, 'output' => $tmp_item];
- Addon::callHooks('display_item', $arr);
+ Hook::callAll('display_item', $arr);
$threads[$threadsid]['id'] = $item['id'];
$threads[$threadsid]['network'] = $item['network'];
@@ -712,7 +732,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
}
} else {
// Normal View
- $page_template = get_markup_template("threaded_conversation.tpl");
+ $page_template = Renderer::getMarkupTemplate("threaded_conversation.tpl");
$conv = new Thread($mode, $preview, $writable);
@@ -740,7 +760,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
/// @todo Check if this call is needed or not
$arr = ['item' => $item];
- Addon::callHooks('display_item', $arr);
+ Hook::callAll('display_item', $arr);
$item['pagedrop'] = $page_dropping;
@@ -758,7 +778,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
}
}
- $o = replace_macros($page_template, [
+ $o = Renderer::replaceMacros($page_template, [
'$baseurl' => System::baseUrl($ssl_state),
'$return_path' => $a->query_string,
'$live_update' => $live_update_div,
@@ -766,7 +786,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
'$mode' => $mode,
'$user' => $a->user,
'$threads' => $threads,
- '$dropping' => ($page_dropping && Feature::isEnabled(local_user(), 'multi_delete') ? L10n::t('Delete Selected Items') : False),
+ '$dropping' => ($page_dropping ? L10n::t('Delete Selected Items') : False),
]);
return $o;
@@ -780,7 +800,11 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
*
* @param array $parents Parent items
*
+ * @param $block_authors
+ * @param $order
+ * @param $uid
* @return array items with parents and comments
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
function conversation_add_children(array $parents, $block_authors, $order, $uid) {
$max_comments = Config::get('system', 'max_comments', 100);
@@ -795,7 +819,7 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
foreach ($parents AS $parent) {
$condition = ["`item`.`parent-uri` = ? AND `item`.`uid` IN (0, ?) ",
- $parent['uri'], local_user()];
+ $parent['uri'], $uid];
if ($block_authors) {
$condition[0] .= "AND NOT `author`.`hidden`";
}
@@ -840,7 +864,7 @@ function item_photo_menu($item) {
$cid = 0;
$network = '';
$rel = 0;
- $condition = ['uid' => local_user(), 'nurl' => normalise_link($item['author-link'])];
+ $condition = ['uid' => local_user(), 'nurl' => Strings::normaliseLink($item['author-link'])];
$contact = DBA::selectFirst('contact', ['id', 'network', 'rel'], $condition);
if (DBA::isResult($contact)) {
$cid = $contact['id'];
@@ -889,7 +913,7 @@ function item_photo_menu($item) {
$args = ['item' => $item, 'menu' => $menu];
- Addon::callHooks('item_photo_menu', $args);
+ Hook::callAll('item_photo_menu', $args);
$menu = $args['menu'];
@@ -909,13 +933,14 @@ function item_photo_menu($item) {
* @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.
*
- * @param array $item
+ * @param array $item
* @param array &$conv_responses (already created with builtin activity structure)
* @return void
+ * @throws ImagickException
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
function builtin_activity_puller($item, &$conv_responses) {
foreach ($conv_responses as $mode => $v) {
- $url = '';
$sparkle = '';
switch ($mode) {
@@ -948,7 +973,7 @@ function builtin_activity_puller($item, &$conv_responses) {
$url = '' . htmlentities($item['author-name']) . '';
- if (!x($item, 'thr-parent')) {
+ if (empty($item['thr-parent'])) {
$item['thr-parent'] = $item['parent-uri'];
}
@@ -982,15 +1007,18 @@ function builtin_activity_puller($item, &$conv_responses) {
/**
* 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 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
+ * @param int $id = item id
* @return string formatted text
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
function format_like($cnt, array $arr, $type, $id) {
$o = '';
$expanded = '';
+ $phrase = '';
if ($cnt == 1) {
$likers = $arr[0];
@@ -1018,23 +1046,19 @@ function format_like($cnt, array $arr, $type, $id) {
if ($cnt > 1) {
$total = count($arr);
- if ($total >= MAX_LIKERS) {
- $arr = array_slice($arr, 0, MAX_LIKERS - 1);
- }
if ($total < MAX_LIKERS) {
$last = L10n::t('and') . ' ' . $arr[count($arr)-1];
$arr2 = array_slice($arr, 0, -1);
- $str = implode(', ', $arr2) . ' ' . $last;
- }
- if ($total >= MAX_LIKERS) {
- $str = implode(', ', $arr);
- $str .= L10n::t('and %d other people', $total - MAX_LIKERS);
+ $likers = implode(', ', $arr2) . ' ' . $last;
+ } else {
+ $arr = array_slice($arr, 0, MAX_LIKERS - 1);
+ $likers = implode(', ', $arr);
+ $likers .= L10n::t('and %d other people', $total - MAX_LIKERS);
}
- $likers = $str;
-
$spanatts = "class=\"fakelink\" onclick=\"openClose('{$type}list-$id');\"";
+ $explikers = '';
switch ($type) {
case 'like':
$phrase = L10n::t('%2$d people like this', $spanatts, $cnt);
@@ -1058,11 +1082,10 @@ function format_like($cnt, array $arr, $type, $id) {
break;
}
- $expanded .= "\t" . '
' . $explikers . EOL . '
';
+ $expanded .= "\t" . '' . $explikers . EOL . '
';
}
- $phrase .= EOL ;
- $o .= replace_macros(get_markup_template('voting_fakelink.tpl'), [
+ $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('voting_fakelink.tpl'), [
'$phrase' => $phrase,
'$type' => $type,
'$id' => $id
@@ -1076,10 +1099,10 @@ 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'), []) : '';
+ $geotag = !empty($x['allow_location']) ? Renderer::replaceMacros(Renderer::getMarkupTemplate('jot_geotag.tpl'), []) : '';
- $tpl = get_markup_template('jot-header.tpl');
- $a->page['htmlhead'] .= replace_macros($tpl, [
+ $tpl = Renderer::getMarkupTemplate('jot-header.tpl');
+ $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
'$newpost' => 'true',
'$baseurl' => System::baseUrl(true),
'$geotag' => $geotag,
@@ -1093,11 +1116,11 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
]);
$jotplugins = '';
- Addon::callHooks('jot_tool', $jotplugins);
+ Hook::callAll('jot_tool', $jotplugins);
// Private/public post links for the non-JS ACL form
$private_post = 1;
- if (x($_REQUEST, 'public')) {
+ if (!empty($_REQUEST['public'])) {
$private_post = 0;
}
@@ -1117,10 +1140,10 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
$public_post_link = '&public=1';
}
- // $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
- $tpl = get_markup_template("jot.tpl");
+ // $tpl = Renderer::replaceMacros($tpl,array('$jotplugins' => $jotplugins));
+ $tpl = Renderer::getMarkupTemplate("jot.tpl");
- $o .= replace_macros($tpl,[
+ $o .= Renderer::replaceMacros($tpl,[
'$new_post' => L10n::t('New Post'),
'$return_path' => $query_str,
'$action' => 'item',
@@ -1160,12 +1183,12 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
'$lockstate' => $x['lockstate'],
'$bang' => $x['bang'],
'$profile_uid' => $x['profile_uid'],
- '$preview' => Feature::isEnabled($x['profile_uid'], 'preview') ? L10n::t('Preview') : '',
+ '$preview' => L10n::t('Preview'),
'$jotplugins' => $jotplugins,
'$notes_cid' => $notes_cid,
'$sourceapp' => L10n::t($a->sourcename),
'$cancel' => L10n::t('Cancel'),
- '$rand_num' => random_digits(12),
+ '$rand_num' => Crypto::randomDigits(12),
// ACL permissions box
'$acl' => $x['acl'],
@@ -1195,8 +1218,8 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
*
* @param array $item_list
* @param array $parent
- * @param bool $recursive
- * @return type
+ * @param bool $recursive
+ * @return array
*/
function get_item_children(array &$item_list, array $parent, $recursive = true)
{
@@ -1326,6 +1349,7 @@ function smart_flatten_conversation(array $parent)
* @param array $item_list A list of items belonging to one or more conversations
* @param string $order Either on "created" or "commented"
* @return array
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
function conv_sort(array $item_list, $order)
{
@@ -1421,7 +1445,7 @@ function sort_thr_created_rev(array $a, array $b)
*
* @param array $a
* @param array $b
- * @return type
+ * @return int
*/
function sort_thr_commented(array $a, array $b)
{
@@ -1429,16 +1453,16 @@ function sort_thr_commented(array $a, array $b)
}
function render_location_dummy(array $item) {
- if (x($item, 'location') && !empty($item['location'])) {
+ if (!empty($item['location']) && !empty($item['location'])) {
return $item['location'];
}
- if (x($item, 'coord') && !empty($item['coord'])) {
+ if (!empty($item['coord']) && !empty($item['coord'])) {
return $item['coord'];
}
}
-function get_responses(array $conv_responses, array $response_verbs, $ob, array $item) {
+function get_responses(array $conv_responses, array $response_verbs, array $item, Post $ob = null) {
$ret = [];
foreach ($response_verbs as $v) {
$ret[$v] = [];
@@ -1469,6 +1493,7 @@ function get_responses(array $conv_responses, array $response_verbs, $ob, array
function get_response_button_text($v, $count)
{
+ $return = '';
switch ($v) {
case 'like':
$return = L10n::tt('Like', 'Likes', $count);