X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=1059941b9e0bcb274b12f678ff37d4f7b6895601;hb=3f03f3b4b7e5bdaefe80d50ec9185e1bf668b927;hp=4a05c916ba777b6397e0c3e3127a013c65414c04;hpb=920ffab43948d4a3081d248eb2e9f6dd5b1398e6;p=friendica.git
diff --git a/include/conversation.php b/include/conversation.php
index 4a05c916ba..1059941b9e 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -6,12 +6,15 @@
use Friendica\App;
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\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;
@@ -23,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) {
@@ -192,7 +197,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 = "";
@@ -384,7 +389,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,8 +438,8 @@ function conv_get_blocklist()
* that are based on unique features of the calling module.
*
*/
-function conversation(App $a, array $items, $mode, $update, $preview = false, $order = 'commented', $uid = 0) {
-
+function conversation(App $a, array $items, Pager $pager, $mode, $update, $preview = false, $order = 'commented', $uid = 0)
+{
$ssl_state = (local_user() ? true : false);
$profile_owner = 0;
@@ -457,19 +462,19 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
. "\r\n";
+ . (!empty($_GET['cid']) ? '&cid=' . rawurlencode($_GET['cid']) : '')
+ . (!empty($_GET['search']) ? '&search=' . rawurlencode($_GET['search']) : '')
+ . (!empty($_GET['star']) ? '&star=' . rawurlencode($_GET['star']) : '')
+ . (!empty($_GET['order']) ? '&order=' . rawurlencode($_GET['order']) : '')
+ . (!empty($_GET['bmark']) ? '&bmark=' . rawurlencode($_GET['bmark']) : '')
+ . (!empty($_GET['liked']) ? '&liked=' . rawurlencode($_GET['liked']) : '')
+ . (!empty($_GET['conv']) ? '&conv=' . rawurlencode($_GET['conv']) : '')
+ . (!empty($_GET['nets']) ? '&nets=' . rawurlencode($_GET['nets']) : '')
+ . (!empty($_GET['cmin']) ? '&cmin=' . rawurlencode($_GET['cmin']) : '')
+ . (!empty($_GET['cmax']) ? '&cmax=' . rawurlencode($_GET['cmax']) : '')
+ . (!empty($_GET['file']) ? '&file=' . rawurlencode($_GET['file']) : '')
+
+ . "'; var profile_page = " . $pager->getPage() . "; \r\n";
}
} elseif ($mode === 'profile') {
$items = conversation_add_children($items, false, $order, $uid);
@@ -477,8 +482,8 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
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') {
/*
@@ -488,17 +493,17 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
$live_update_div = '' . "\r\n"
. "\r\n";
+ . "; var netargs = '?f='; var profile_page = " . $pager->getPage() . "; \r\n";
}
}
} 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) {
$live_update_div = '' . "\r\n"
. "\r\n";
+ . "; var netargs = '/?f='; var profile_page = " . $pager->getPage() . "; \r\n";
}
} elseif ($mode === 'display') {
$items = conversation_add_children($items, false, $order, $uid);
@@ -516,16 +521,16 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
if (!$update) {
$live_update_div = '' . "\r\n"
. "\r\n";
+ ."/?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) {
$live_update_div = '' . "\r\n"
. "\r\n";
+ ."/?f='; var profile_page = " . $pager->getPage() . "; \r\n";
}
} elseif ($mode === 'search') {
$live_update_div = '' . "\r\n";
@@ -551,7 +556,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
$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'])) {
@@ -634,7 +639,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
$lock = false;
$likebuttons = false;
- $body = prepare_body($item, true, $preview);
+ $body = Item::prepareBody($item, true, $preview);
list($categories, $folders) = get_cats_and_terms($item);
@@ -685,7 +690,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
'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,
@@ -710,7 +715,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
}
} else {
// Normal View
- $page_template = get_markup_template("threaded_conversation.tpl");
+ $page_template = Renderer::getMarkupTemplate("threaded_conversation.tpl");
$conv = new Thread($mode, $preview, $writable);
@@ -750,13 +755,13 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
$threads = $conv->getTemplateData($conv_responses);
if (!$threads) {
- logger('[ERROR] conversation : Failed to get template data.', LOGGER_DEBUG);
+ Logger::log('[ERROR] conversation : Failed to get template data.', Logger::DEBUG);
$threads = [];
}
}
}
- $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,
@@ -764,7 +769,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
'$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;
@@ -793,7 +798,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`";
}
@@ -838,7 +843,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'];
@@ -946,7 +951,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'];
}
@@ -989,6 +994,7 @@ function builtin_activity_puller($item, &$conv_responses) {
function format_like($cnt, array $arr, $type, $id) {
$o = '';
$expanded = '';
+ $phrase = '';
if ($cnt == 1) {
$likers = $arr[0];
@@ -1059,8 +1065,8 @@ function format_like($cnt, array $arr, $type, $id) {
$expanded .= "\t" . '' . $explikers . EOL . '
';
}
- $phrase .= EOL ;
- $o .= replace_macros(get_markup_template('voting_fakelink.tpl'), [
+ $phrase .= EOL;
+ $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('voting_fakelink.tpl'), [
'$phrase' => $phrase,
'$type' => $type,
'$id' => $id
@@ -1074,10 +1080,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,
@@ -1095,7 +1101,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
// Private/public post links for the non-JS ACL form
$private_post = 1;
- if (x($_REQUEST, 'public')) {
+ if (!empty($_REQUEST['public'])) {
$private_post = 0;
}
@@ -1115,10 +1121,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',
@@ -1158,12 +1164,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'],
@@ -1427,11 +1433,11 @@ 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'];
}
}