X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=a5884847662d9b8ac2a6aa5310d4a7240a882f09;hb=0406fe7adeb48775bd5a25638042f61c8d2b4fd1;hp=b27cfe0c81493e41464b0546e77b9c741dda956c;hpb=c037e9143cf5ea73fbc1e1d85ce7176c7be4f119;p=friendica.git
diff --git a/include/conversation.php b/include/conversation.php
index b27cfe0c81..a588484766 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -4,22 +4,17 @@
*/
use Friendica\App;
-use Friendica\BaseObject;
use Friendica\Content\ContactSelector;
use Friendica\Content\Feature;
-use Friendica\Content\Item as ContentItem;
use Friendica\Content\Pager;
use Friendica\Content\Text\BBCode;
-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\Session;
-use Friendica\Core\System;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Item;
use Friendica\Model\Profile;
@@ -87,8 +82,8 @@ function item_redir_and_replace_images($body, $images, $cid) {
while ($pos !== false && $cnt < 1000) {
$search = '/\[url\=(.*?)\]\[!#saved_image([0-9]*)#!\]\[\/url\]' . '/is';
- $replace = '[url=' . System::baseUrl() . '/redir/' . $cid
- . '?f=1&url=' . '$1' . '][!#saved_image' . '$2' .'#!][/url]';
+ $replace = '[url=' . DI::baseUrl() . '/redir/' . $cid
+ . '?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']);
@@ -141,8 +136,7 @@ function localize_item(&$item)
During the further steps of the database restructuring I would like to address this issue.
*/
- /** @var Activity $activity */
- $activity = BaseObject::getClass(Activity::class);
+ $activity = DI::activity();
$xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
if ($activity->match($item['verb'], Activity::LIKE)
@@ -164,20 +158,20 @@ function localize_item(&$item)
case Activity::POST:
switch ($obj['object-type']) {
case Activity\ObjectType::EVENT:
- $post_type = L10n::t('event');
+ $post_type = DI::l10n()->t('event');
break;
default:
- $post_type = L10n::t('status');
+ $post_type = DI::l10n()->t('status');
}
break;
default:
if ($obj['resource-id']) {
- $post_type = L10n::t('photo');
+ $post_type = DI::l10n()->t('photo');
$m = [];
preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
$rr['plink'] = $m[1];
} else {
- $post_type = L10n::t('status');
+ $post_type = DI::l10n()->t('status');
}
}
@@ -185,15 +179,15 @@ function localize_item(&$item)
$bodyverb = '';
if ($activity->match($item['verb'], Activity::LIKE)) {
- $bodyverb = L10n::t('%1$s likes %2$s\'s %3$s');
+ $bodyverb = DI::l10n()->t('%1$s likes %2$s\'s %3$s');
} elseif ($activity->match($item['verb'], Activity::DISLIKE)) {
- $bodyverb = L10n::t('%1$s doesn\'t like %2$s\'s %3$s');
+ $bodyverb = DI::l10n()->t('%1$s doesn\'t like %2$s\'s %3$s');
} elseif ($activity->match($item['verb'], Activity::ATTEND)) {
- $bodyverb = L10n::t('%1$s attends %2$s\'s %3$s');
+ $bodyverb = DI::l10n()->t('%1$s attends %2$s\'s %3$s');
} elseif ($activity->match($item['verb'], Activity::ATTENDNO)) {
- $bodyverb = L10n::t('%1$s doesn\'t attend %2$s\'s %3$s');
+ $bodyverb = DI::l10n()->t('%1$s doesn\'t attend %2$s\'s %3$s');
} elseif ($activity->match($item['verb'], Activity::ATTENDMAYBE)) {
- $bodyverb = L10n::t('%1$s attends maybe %2$s\'s %3$s');
+ $bodyverb = DI::l10n()->t('%1$s attends maybe %2$s\'s %3$s');
}
$item['body'] = sprintf($bodyverb, $author, $objauthor, $plink);
@@ -228,7 +222,7 @@ function localize_item(&$item)
$Bphoto = '[url=' . Contact::magicLink($Blink) . '][img]' . $Bphoto . '[/img][/url]';
}
- $item['body'] = L10n::t('%1$s is now friends with %2$s', $A, $B)."\n\n\n".$Bphoto;
+ $item['body'] = DI::l10n()->t('%1$s is now friends with %2$s', $A, $B)."\n\n\n".$Bphoto;
}
if (stristr($item['verb'], Activity::POKE)) {
@@ -269,11 +263,11 @@ function localize_item(&$item)
* we can't have a translation string with three positions but no distinguishable text
* So here is the translate string.
*/
- $txt = L10n::t('%1$s poked %2$s');
+ $txt = DI::l10n()->t('%1$s poked %2$s');
// now translate the verb
$poked_t = trim(sprintf($txt, "", ""));
- $txt = str_replace($poked_t, L10n::t($verb), $txt);
+ $txt = str_replace($poked_t, DI::l10n()->t($verb), $txt);
// then do the sprintf on the translation string
@@ -301,19 +295,19 @@ function localize_item(&$item)
case Activity::POST:
switch ($obj['object-type']) {
case Activity\ObjectType::EVENT:
- $post_type = L10n::t('event');
+ $post_type = DI::l10n()->t('event');
break;
default:
- $post_type = L10n::t('status');
+ $post_type = DI::l10n()->t('status');
}
break;
default:
if ($obj['resource-id']) {
- $post_type = L10n::t('photo');
+ $post_type = DI::l10n()->t('photo');
$m=[]; preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
$rr['plink'] = $m[1];
} else {
- $post_type = L10n::t('status');
+ $post_type = DI::l10n()->t('status');
}
// Let's break everthing ... ;-)
break;
@@ -323,7 +317,7 @@ function localize_item(&$item)
$parsedobj = XML::parseString($xmlhead.$item['object']);
$tag = sprintf('#[url=%s]%s[/url]', $parsedobj->id, $parsedobj->content);
- $item['body'] = L10n::t('%1$s tagged %2$s\'s %3$s with %4$s', $author, $objauthor, $plink, $tag);
+ $item['body'] = DI::l10n()->t('%1$s tagged %2$s\'s %3$s with %4$s', $author, $objauthor, $plink, $tag);
}
if ($activity->match($item['verb'], Activity::FAVORITE)) {
@@ -345,8 +339,8 @@ function localize_item(&$item)
$Blink = $target['author-link'];
$A = '[url=' . Contact::magicLink($Alink) . ']' . $Aname . '[/url]';
$B = '[url=' . Contact::magicLink($Blink) . ']' . $Bname . '[/url]';
- $P = '[url=' . $target['plink'] . ']' . L10n::t('post/item') . '[/url]';
- $item['body'] = L10n::t('%1$s marked %2$s\'s %3$s as favorite', $A, $B, $P)."\n";
+ $P = '[url=' . $target['plink'] . ']' . DI::l10n()->t('post/item') . '[/url]';
+ $item['body'] = DI::l10n()->t('%1$s marked %2$s\'s %3$s as favorite', $A, $B, $P)."\n";
}
}
}
@@ -399,8 +393,7 @@ function count_descendants($item) {
function visible_activity($item) {
- /** @var Activity $activity */
- $activity = BaseObject::getClass(Activity::class);
+ $activity = DI::activity();
if (empty($item['verb']) || $activity->isHidden($item['verb'])) {
return false;
@@ -423,7 +416,7 @@ function conv_get_blocklist()
return [];
}
- $str_blocked = PConfig::get(local_user(), 'system', 'blocked');
+ $str_blocked = DI::pConfig()->get(local_user(), 'system', 'blocked');
if (empty($str_blocked)) {
return [];
}
@@ -483,7 +476,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
*/
$live_update_div = '' . "\r\n"
. "\r\n";
}
}
@@ -543,7 +536,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
if (!$update) {
$live_update_div = '' . "\r\n"
- . "\r\n";
}
} elseif ($mode === 'contacts') {
@@ -552,7 +545,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
if (!$update) {
$live_update_div = '' . "\r\n"
- . "\r\n";
}
} elseif ($mode === 'search') {
@@ -562,7 +555,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
$page_dropping = ((local_user() && local_user() == $profile_owner) ? true : false);
if (!$update) {
- $_SESSION['return_path'] = $a->query_string;
+ $_SESSION['return_path'] = DI::args()->getQueryString();
}
$cb = ['items' => $items, 'mode' => $mode, 'update' => $update, 'preview' => $preview];
@@ -571,12 +564,12 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
$items = $cb['items'];
$conv_responses = [
- 'like' => ['title' => L10n::t('Likes','title')],
- 'dislike' => ['title' => L10n::t('Dislikes','title')],
- 'attendyes' => ['title' => L10n::t('Attending','title')],
- 'attendno' => ['title' => L10n::t('Not attending','title')],
- 'attendmaybe' => ['title' => L10n::t('Might attend','title')],
- 'announce' => ['title' => L10n::t('Reshares','title')]
+ 'like' => ['title' => DI::l10n()->t('Likes','title')],
+ 'dislike' => ['title' => DI::l10n()->t('Dislikes','title')],
+ 'attendyes' => ['title' => DI::l10n()->t('Attending','title')],
+ 'attendno' => ['title' => DI::l10n()->t('Not attending','title')],
+ 'attendmaybe' => ['title' => DI::l10n()->t('Might attend','title')],
+ 'announce' => ['title' => DI::l10n()->t('Reshares','title')]
];
// array with html for each thread (parent+comments)
@@ -656,8 +649,8 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
$drop = [
'dropping' => $dropping,
'pagedrop' => $page_dropping,
- 'select' => L10n::t('Select'),
- 'delete' => L10n::t('Delete'),
+ 'select' => DI::l10n()->t('Select'),
+ 'delete' => DI::l10n()->t('Delete'),
];
$star = false;
@@ -668,12 +661,9 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
$body = Item::prepareBody($item, true, $preview);
- /** @var ContentItem $contItem */
- $contItem = BaseObject::getClass(ContentItem::class);
-
- list($categories, $folders) = $contItem->determineCategoriesTerms($item);
+ list($categories, $folders) = DI::contentItem()->determineCategoriesTerms($item);
- if (!empty($item['content-warning']) && PConfig::get(local_user(), 'system', 'disable_cw', false)) {
+ if (!empty($item['content-warning']) && DI::pConfig()->get(local_user(), 'system', 'disable_cw', false)) {
$title = ucfirst($item['content-warning']);
} else {
$title = $item['title'];
@@ -686,33 +676,33 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
'network' => $item['network'],
'network_name' => ContactSelector::networkToName($item['author-network'], $item['author-link'], $item['network']),
'network_icon' => ContactSelector::networkToIcon($item['network'], $item['author-link']),
- 'linktitle' => L10n::t('View %s\'s profile @ %s', $profile_name, $item['author-link']),
+ 'linktitle' => DI::l10n()->t('View %s\'s profile @ %s', $profile_name, $item['author-link']),
'profile_url' => $profile_link,
'item_photo_menu' => item_photo_menu($item),
'name' => $profile_name,
'sparkle' => $sparkle,
'lock' => $lock,
- 'thumb' => System::removedBaseUrl(ProxyUtils::proxifyUrl($item['author-avatar'], false, ProxyUtils::SIZE_THUMB)),
+ 'thumb' => DI::baseUrl()->remove(ProxyUtils::proxifyUrl($item['author-avatar'], false, ProxyUtils::SIZE_THUMB)),
'title' => $title,
'body' => $body,
'tags' => $tags['tags'],
'hashtags' => $tags['hashtags'],
'mentions' => $tags['mentions'],
'implicit_mentions' => $tags['implicit_mentions'],
- 'txt_cats' => L10n::t('Categories:'),
- 'txt_folders' => L10n::t('Filed under:'),
+ 'txt_cats' => DI::l10n()->t('Categories:'),
+ 'txt_folders' => DI::l10n()->t('Filed under:'),
'has_cats' => ((count($categories)) ? 'true' : ''),
'has_folders' => ((count($folders)) ? 'true' : ''),
'categories' => $categories,
'folders' => $folders,
'text' => strip_tags($body),
'localtime' => DateTimeFormat::local($item['created'], 'r'),
- 'ago' => (($item['app']) ? L10n::t('%s from %s', Temporal::getRelativeDate($item['created']),$item['app']) : Temporal::getRelativeDate($item['created'])),
+ 'ago' => (($item['app']) ? DI::l10n()->t('%s from %s', Temporal::getRelativeDate($item['created']),$item['app']) : Temporal::getRelativeDate($item['created'])),
'location' => $location,
'indent' => '',
'owner_name' => $owner_name,
'owner_url' => $owner_url,
- 'owner_photo' => System::removedBaseUrl(ProxyUtils::proxifyUrl($item['owner-avatar'], false, ProxyUtils::SIZE_THUMB)),
+ 'owner_photo' => DI::baseUrl()->remove(ProxyUtils::proxifyUrl($item['owner-avatar'], false, ProxyUtils::SIZE_THUMB)),
'plink' => Item::getPlink($item),
'edpost' => false,
'isstarred' => $isstarred,
@@ -722,9 +712,9 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
'like' => '',
'dislike' => '',
'comment' => '',
- 'conv' => (($preview) ? '' : ['href'=> 'display/'.$item['guid'], 'title'=> L10n::t('View in context')]),
+ 'conv' => (($preview) ? '' : ['href'=> 'display/'.$item['guid'], 'title'=> DI::l10n()->t('View in context')]),
'previewing' => $previewing,
- 'wait' => L10n::t('Please wait'),
+ 'wait' => DI::l10n()->t('Please wait'),
'thread_level' => 1,
];
@@ -785,14 +775,14 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
}
$o = Renderer::replaceMacros($page_template, [
- '$baseurl' => System::baseUrl($ssl_state),
- '$return_path' => $a->query_string,
+ '$baseurl' => DI::baseUrl()->get($ssl_state),
+ '$return_path' => DI::args()->getQueryString(),
'$live_update' => $live_update_div,
- '$remove' => L10n::t('remove'),
+ '$remove' => DI::l10n()->t('remove'),
'$mode' => $mode,
'$user' => $a->user,
'$threads' => $threads,
- '$dropping' => ($page_dropping ? L10n::t('Delete Selected Items') : False),
+ '$dropping' => ($page_dropping ? DI::l10n()->t('Delete Selected Items') : False),
]);
return $o;
@@ -801,7 +791,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
/**
* Fetch all comments from a query. Additionally set the newest resharer as thread owner.
*
- * @param array $thread_items Database statement with thread posts
+ * @param mixed $thread_items Database statement with thread posts
* @param boolean $pinned Is the item pinned?
*
* @return array items with parents and comments
@@ -845,7 +835,7 @@ function conversation_fetch_comments($thread_items, $pinned) {
}
/**
- * @brief Add comments to top level entries that had been fetched before
+ * 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.
@@ -859,7 +849,7 @@ function conversation_fetch_comments($thread_items, $pinned) {
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
function conversation_add_children(array $parents, $block_authors, $order, $uid) {
- $max_comments = Config::get('system', 'max_comments', 100);
+ $max_comments = DI::config()->get('system', 'max_comments', 100);
$params = ['order' => ['uid', 'commented' => true]];
@@ -929,9 +919,9 @@ function item_photo_menu($item) {
}
if ($sparkle) {
- $status_link = $profile_link . '?tab=status';
+ $status_link = $profile_link . '/status';
$photos_link = str_replace('/profile/', '/photos/', $profile_link);
- $profile_link = $profile_link . '?=profile';
+ $profile_link = $profile_link . '/profile';
}
if (!empty($pcid)) {
@@ -942,7 +932,7 @@ function item_photo_menu($item) {
}
if ($cid && !$item['self']) {
- $poke_link = 'poke/?f=&c=' . $cid;
+ $poke_link = 'poke?c=' . $cid;
$contact_url = 'contact/' . $cid;
$posts_link = 'contact/' . $cid . '/posts';
@@ -953,27 +943,27 @@ function item_photo_menu($item) {
if (local_user()) {
$menu = [
- L10n::t('Follow Thread') => $sub_link,
- L10n::t('View Status') => $status_link,
- L10n::t('View Profile') => $profile_link,
- L10n::t('View Photos') => $photos_link,
- L10n::t('Network Posts') => $posts_link,
- L10n::t('View Contact') => $contact_url,
- L10n::t('Send PM') => $pm_url,
- L10n::t('Block') => $block_link,
- L10n::t('Ignore') => $ignore_link
+ DI::l10n()->t('Follow Thread') => $sub_link,
+ DI::l10n()->t('View Status') => $status_link,
+ DI::l10n()->t('View Profile') => $profile_link,
+ DI::l10n()->t('View Photos') => $photos_link,
+ DI::l10n()->t('Network Posts') => $posts_link,
+ DI::l10n()->t('View Contact') => $contact_url,
+ DI::l10n()->t('Send PM') => $pm_url,
+ DI::l10n()->t('Block') => $block_link,
+ DI::l10n()->t('Ignore') => $ignore_link
];
if ($network == Protocol::DFRN) {
- $menu[L10n::t("Poke")] = $poke_link;
+ $menu[DI::l10n()->t("Poke")] = $poke_link;
}
if ((($cid == 0) || ($rel == Contact::FOLLOWER)) &&
in_array($item['network'], Protocol::FEDERATED)) {
- $menu[L10n::t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']);
+ $menu[DI::l10n()->t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']);
}
} else {
- $menu = [L10n::t('View Profile') => $item['author-link']];
+ $menu = [DI::l10n()->t('View Profile') => $item['author-link']];
}
$args = ['item' => $item, 'menu' => $menu];
@@ -995,7 +985,8 @@ 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.)
+ * 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
@@ -1031,10 +1022,7 @@ function builtin_activity_puller($item, &$conv_responses) {
return;
}
- /** @var Activity $activity */
- $activity = BaseObject::getClass(Activity::class);
-
- if (!empty($item['verb']) && $activity->match($item['verb'], $verb) && ($item['id'] != $item['parent'])) {
+ if (!empty($item['verb']) && DI::activity()->match($item['verb'], $verb) && ($item['id'] != $item['parent'])) {
$author = ['uid' => 0, 'id' => $item['author-id'],
'network' => $item['author-network'], 'url' => $item['author-link']];
$url = Contact::magicLinkByContact($author);
@@ -1098,22 +1086,22 @@ function format_like($cnt, array $arr, $type, $id) {
// list which show all likers
switch ($type) {
case 'like' :
- $phrase = L10n::t('%s likes this.', $likers);
+ $phrase = DI::l10n()->t('%s likes this.', $likers);
break;
case 'dislike' :
- $phrase = L10n::t('%s doesn\'t like this.', $likers);
+ $phrase = DI::l10n()->t('%s doesn\'t like this.', $likers);
break;
case 'attendyes' :
- $phrase = L10n::t('%s attends.', $likers);
+ $phrase = DI::l10n()->t('%s attends.', $likers);
break;
case 'attendno' :
- $phrase = L10n::t('%s doesn\'t attend.', $likers);
+ $phrase = DI::l10n()->t('%s doesn\'t attend.', $likers);
break;
case 'attendmaybe' :
- $phrase = L10n::t('%s attends maybe.', $likers);
+ $phrase = DI::l10n()->t('%s attends maybe.', $likers);
break;
case 'announce' :
- $phrase = L10n::t('%s reshared this.', $likers);
+ $phrase = DI::l10n()->t('%s reshared this.', $likers);
break;
}
}
@@ -1121,13 +1109,13 @@ function format_like($cnt, array $arr, $type, $id) {
if ($cnt > 1) {
$total = count($arr);
if ($total < MAX_LIKERS) {
- $last = L10n::t('and') . ' ' . $arr[count($arr)-1];
+ $last = DI::l10n()->t('and') . ' ' . $arr[count($arr)-1];
$arr2 = array_slice($arr, 0, -1);
$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 .= DI::l10n()->t('and %d other people', $total - MAX_LIKERS);
}
$spanatts = "class=\"fakelink\" onclick=\"openClose('{$type}list-$id');\"";
@@ -1135,28 +1123,28 @@ function format_like($cnt, array $arr, $type, $id) {
$explikers = '';
switch ($type) {
case 'like':
- $phrase = L10n::t('%2$d people like this', $spanatts, $cnt);
- $explikers = L10n::t('%s like this.', $likers);
+ $phrase = DI::l10n()->t('%2$d people like this', $spanatts, $cnt);
+ $explikers = DI::l10n()->t('%s like this.', $likers);
break;
case 'dislike':
- $phrase = L10n::t('%2$d people don\'t like this', $spanatts, $cnt);
- $explikers = L10n::t('%s don\'t like this.', $likers);
+ $phrase = DI::l10n()->t('%2$d people don\'t like this', $spanatts, $cnt);
+ $explikers = DI::l10n()->t('%s don\'t like this.', $likers);
break;
case 'attendyes':
- $phrase = L10n::t('%2$d people attend', $spanatts, $cnt);
- $explikers = L10n::t('%s attend.', $likers);
+ $phrase = DI::l10n()->t('%2$d people attend', $spanatts, $cnt);
+ $explikers = DI::l10n()->t('%s attend.', $likers);
break;
case 'attendno':
- $phrase = L10n::t('%2$d people don\'t attend', $spanatts, $cnt);
- $explikers = L10n::t('%s don\'t attend.', $likers);
+ $phrase = DI::l10n()->t('%2$d people don\'t attend', $spanatts, $cnt);
+ $explikers = DI::l10n()->t('%s don\'t attend.', $likers);
break;
case 'attendmaybe':
- $phrase = L10n::t('%2$d people attend maybe', $spanatts, $cnt);
- $explikers = L10n::t('%s attend maybe.', $likers);
+ $phrase = DI::l10n()->t('%2$d people attend maybe', $spanatts, $cnt);
+ $explikers = DI::l10n()->t('%s attend maybe.', $likers);
break;
case 'announce':
- $phrase = L10n::t('%2$d people reshared this', $spanatts, $cnt);
- $explikers = L10n::t('%s reshared this.', $likers);
+ $phrase = DI::l10n()->t('%2$d people reshared this', $spanatts, $cnt);
+ $explikers = DI::l10n()->t('%s reshared this.', $likers);
break;
}
@@ -1180,17 +1168,17 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
$geotag = !empty($x['allow_location']) ? Renderer::replaceMacros(Renderer::getMarkupTemplate('jot_geotag.tpl'), []) : '';
$tpl = Renderer::getMarkupTemplate('jot-header.tpl');
- $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
+ DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
'$newpost' => 'true',
- '$baseurl' => System::baseUrl(true),
+ '$baseurl' => DI::baseUrl()->get(true),
'$geotag' => $geotag,
'$nickname' => $x['nickname'],
- '$ispublic' => L10n::t('Visible to everybody'),
- '$linkurl' => L10n::t('Please enter a image/video/audio/webpage URL:'),
- '$term' => L10n::t('Tag term:'),
- '$fileas' => L10n::t('Save to Folder:'),
- '$whereareu' => L10n::t('Where are you right now?'),
- '$delitems' => L10n::t("Delete item\x28s\x29?")
+ '$ispublic' => DI::l10n()->t('Visible to everybody'),
+ '$linkurl' => DI::l10n()->t('Please enter a image/video/audio/webpage URL:'),
+ '$term' => DI::l10n()->t('Tag term:'),
+ '$fileas' => DI::l10n()->t('Save to Folder:'),
+ '$whereareu' => DI::l10n()->t('Where are you right now?'),
+ '$delitems' => DI::l10n()->t("Delete item\x28s\x29?")
]);
$jotplugins = '';
@@ -1202,7 +1190,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
$private_post = 0;
}
- $query_str = $a->query_string;
+ $query_str = DI::args()->getQueryString();
if (strpos($query_str, 'public=1') !== false) {
$query_str = str_replace(['?public=1', '&public=1'], ['', ''], $query_str);
}
@@ -1222,63 +1210,64 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
$tpl = Renderer::getMarkupTemplate("jot.tpl");
$o .= Renderer::replaceMacros($tpl,[
- '$new_post' => L10n::t('New Post'),
+ '$new_post' => DI::l10n()->t('New Post'),
'$return_path' => $query_str,
'$action' => 'item',
- '$share' => ($x['button'] ?? '') ?: L10n::t('Share'),
- '$upload' => L10n::t('Upload photo'),
- '$shortupload' => L10n::t('upload photo'),
- '$attach' => L10n::t('Attach file'),
- '$shortattach' => L10n::t('attach file'),
- '$edbold' => L10n::t('Bold'),
- '$editalic' => L10n::t('Italic'),
- '$eduline' => L10n::t('Underline'),
- '$edquote' => L10n::t('Quote'),
- '$edcode' => L10n::t('Code'),
- '$edimg' => L10n::t('Image'),
- '$edurl' => L10n::t('Link'),
- '$edattach' => L10n::t('Link or Media'),
- '$setloc' => L10n::t('Set your location'),
- '$shortsetloc' => L10n::t('set location'),
- '$noloc' => L10n::t('Clear browser location'),
- '$shortnoloc' => L10n::t('clear location'),
+ '$share' => ($x['button'] ?? '') ?: DI::l10n()->t('Share'),
+ '$loading' => DI::l10n()->t('Loading...'),
+ '$upload' => DI::l10n()->t('Upload photo'),
+ '$shortupload' => DI::l10n()->t('upload photo'),
+ '$attach' => DI::l10n()->t('Attach file'),
+ '$shortattach' => DI::l10n()->t('attach file'),
+ '$edbold' => DI::l10n()->t('Bold'),
+ '$editalic' => DI::l10n()->t('Italic'),
+ '$eduline' => DI::l10n()->t('Underline'),
+ '$edquote' => DI::l10n()->t('Quote'),
+ '$edcode' => DI::l10n()->t('Code'),
+ '$edimg' => DI::l10n()->t('Image'),
+ '$edurl' => DI::l10n()->t('Link'),
+ '$edattach' => DI::l10n()->t('Link or Media'),
+ '$setloc' => DI::l10n()->t('Set your location'),
+ '$shortsetloc' => DI::l10n()->t('set location'),
+ '$noloc' => DI::l10n()->t('Clear browser location'),
+ '$shortnoloc' => DI::l10n()->t('clear location'),
'$title' => $x['title'] ?? '',
- '$placeholdertitle' => L10n::t('Set title'),
+ '$placeholdertitle' => DI::l10n()->t('Set title'),
'$category' => $x['category'] ?? '',
- '$placeholdercategory' => Feature::isEnabled(local_user(), 'categories') ? L10n::t("Categories \x28comma-separated list\x29") : '',
- '$wait' => L10n::t('Please wait'),
- '$permset' => L10n::t('Permission settings'),
- '$shortpermset' => L10n::t('permissions'),
+ '$placeholdercategory' => Feature::isEnabled(local_user(), 'categories') ? DI::l10n()->t("Categories \x28comma-separated list\x29") : '',
+ '$wait' => DI::l10n()->t('Please wait'),
+ '$permset' => DI::l10n()->t('Permission settings'),
+ '$shortpermset' => DI::l10n()->t('permissions'),
'$wall' => $notes_cid ? 0 : 1,
'$posttype' => $notes_cid ? Item::PT_PERSONAL_NOTE : Item::PT_ARTICLE,
'$content' => $x['content'] ?? '',
'$post_id' => $x['post_id'] ?? '',
- '$baseurl' => System::baseUrl(true),
+ '$baseurl' => DI::baseUrl()->get(true),
'$defloc' => $x['default_location'],
'$visitor' => $x['visitor'],
'$pvisit' => $notes_cid ? 'none' : $x['visitor'],
- '$public' => L10n::t('Public post'),
+ '$public' => DI::l10n()->t('Public post'),
'$lockstate' => $x['lockstate'],
'$bang' => $x['bang'],
'$profile_uid' => $x['profile_uid'],
- '$preview' => L10n::t('Preview'),
+ '$preview' => DI::l10n()->t('Preview'),
'$jotplugins' => $jotplugins,
'$notes_cid' => $notes_cid,
- '$sourceapp' => L10n::t($a->sourcename),
- '$cancel' => L10n::t('Cancel'),
+ '$sourceapp' => DI::l10n()->t($a->sourcename),
+ '$cancel' => DI::l10n()->t('Cancel'),
'$rand_num' => Crypto::randomDigits(12),
// ACL permissions box
'$acl' => $x['acl'],
- '$group_perms' => L10n::t('Post to Groups'),
- '$contact_perms' => L10n::t('Post to Contacts'),
- '$private' => L10n::t('Private post'),
+ '$group_perms' => DI::l10n()->t('Post to Groups'),
+ '$contact_perms' => DI::l10n()->t('Post to Contacts'),
+ '$private' => DI::l10n()->t('Private post'),
'$is_private' => $private_post,
'$public_link' => $public_post_link,
//jot nav tab (used in some themes)
- '$message' => L10n::t('Message'),
- '$browser' => L10n::t('Browser'),
+ '$message' => DI::l10n()->t('Message'),
+ '$browser' => DI::l10n()->t('Browser'),
]);
@@ -1292,8 +1281,6 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
/**
* 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
@@ -1326,7 +1313,7 @@ function get_item_children(array &$item_list, array $parent, $recursive = true)
}
/**
- * @brief Recursively sorts a tree-like item array
+ * Recursively sorts a tree-like item array
*
* @param array $items
* @return array
@@ -1344,7 +1331,7 @@ function sort_item_children(array $items)
}
/**
- * @brief Recursively add all children items at the top level of a list
+ * Recursively add all children items at the top level of a list
*
* @param array $children List of items to append
* @param array $item_list
@@ -1360,6 +1347,8 @@ function add_children_to_list(array $children, array &$item_list)
}
/**
+ * Selectively flattens a tree-like item structure to prevent threading stairs
+ *
* 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.
@@ -1370,8 +1359,6 @@ function add_children_to_list(array $children, array &$item_list)
* 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
*/
@@ -1418,12 +1405,11 @@ function smart_flatten_conversation(array $parent)
/**
- * Expands a flat list of items into corresponding tree-like conversation structures,
+ * Expands a flat list of items into corresponding tree-like conversation structures.
+ *
* sort the top-level posts either on "received" 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 "received" or "commented"
* @return array
@@ -1479,7 +1465,7 @@ function conv_sort(array $item_list, $order)
$parents[$i]['children'] = sort_item_children($parents[$i]['children']);
}
- if (!PConfig::get(local_user(), 'system', 'no_smart_threading', 0)) {
+ if (!DI::pConfig()->get(local_user(), 'system', 'no_smart_threading', 0)) {
foreach ($parents as $i => $parent) {
$parents[$i] = smart_flatten_conversation($parent);
}
@@ -1497,7 +1483,7 @@ function conv_sort(array $item_list, $order)
}
/**
- * @brief usort() callback to sort item arrays by pinned and the received key
+ * usort() callback to sort item arrays by pinned and the received key
*
* @param array $a
* @param array $b
@@ -1515,7 +1501,7 @@ function sort_thr_pinned_received(array $a, array $b)
}
/**
- * @brief usort() callback to sort item arrays by the received key
+ * usort() callback to sort item arrays by the received key
*
* @param array $a
* @param array $b
@@ -1527,7 +1513,7 @@ function sort_thr_received(array $a, array $b)
}
/**
- * @brief usort() callback to reverse sort item arrays by the received key
+ * usort() callback to reverse sort item arrays by the received key
*
* @param array $a
* @param array $b
@@ -1539,7 +1525,7 @@ function sort_thr_received_rev(array $a, array $b)
}
/**
- * @brief usort() callback to sort item arrays by the commented key
+ * usort() callback to sort item arrays by the commented key
*
* @param array $a
* @param array $b
@@ -1570,7 +1556,7 @@ function get_responses(array $conv_responses, array $response_verbs, array $item
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'], '' . L10n::t('View all') . '');
+ . (($ob) ? $ob->getId() : $item['id']) . '">' . DI::l10n()->t('View all') . '');
} else {
$ret[$v]['list_part'] = '';
}
@@ -1594,19 +1580,19 @@ function get_response_button_text($v, $count)
$return = '';
switch ($v) {
case 'like':
- $return = L10n::tt('Like', 'Likes', $count);
+ $return = DI::l10n()->tt('Like', 'Likes', $count);
break;
case 'dislike':
- $return = L10n::tt('Dislike', 'Dislikes', $count);
+ $return = DI::l10n()->tt('Dislike', 'Dislikes', $count);
break;
case 'attendyes':
- $return = L10n::tt('Attending', 'Attending', $count);
+ $return = DI::l10n()->tt('Attending', 'Attending', $count);
break;
case 'attendno':
- $return = L10n::tt('Not Attending', 'Not Attending', $count);
+ $return = DI::l10n()->tt('Not Attending', 'Not Attending', $count);
break;
case 'attendmaybe':
- $return = L10n::tt('Undecided', 'Undecided', $count);
+ $return = DI::l10n()->tt('Undecided', 'Undecided', $count);
break;
}