X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=21b700f2fe0e42de4f0c9477ecd12b462454b8a1;hb=e0ecbd0b95454ed2ff4b0082b41d388d2938e3ae;hp=0e45de5587ecccfb436317a8b29cf0b18163e00a;hpb=91198cb53d19999079806438d818c6a20554f4e1;p=friendica.git
diff --git a/include/conversation.php b/include/conversation.php
index 0e45de5587..21b700f2fe 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -2,23 +2,29 @@
/**
* @file include/conversation.php
*/
+
use Friendica\App;
use Friendica\Content\ContactSelector;
use Friendica\Content\Feature;
+use Friendica\Content\Text\BBCode;
+use Friendica\Core\Addon;
use Friendica\Core\Config;
+use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
-use Friendica\Object\Thread;
+use Friendica\Model\Profile;
+use Friendica\Model\Item;
use Friendica\Object\Post;
-
-require_once "include/bbcode.php";
-require_once "include/acl_selectors.php";
+use Friendica\Object\Thread;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Temporal;
+use Friendica\Util\XML;
function item_extract_images($body) {
- $saved_image = array();
+ $saved_image = [];
$orig_body = $body;
$new_body = '';
@@ -31,7 +37,7 @@ function item_extract_images($body) {
$img_st_close++; // make it point to AFTER the closing bracket
$img_end += $img_start;
- if (! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) {
+ if (!strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) {
// This is an embedded image
$saved_image[$cnt] = substr($orig_body, $img_start + $img_st_close, $img_end - ($img_start + $img_st_close));
@@ -56,7 +62,7 @@ function item_extract_images($body) {
$new_body = $new_body . $orig_body;
- return array('body' => $new_body, 'images' => $saved_image);
+ return ['body' => $new_body, 'images' => $saved_image];
}
function item_redir_and_replace_images($body, $images, $cid) {
@@ -65,7 +71,7 @@ function item_redir_and_replace_images($body, $images, $cid) {
$newbody = '';
$cnt = 1;
- $pos = get_bb_tag_pos($origbody, 'url', 1);
+ $pos = BBCode::getTagPosition($origbody, 'url', 0);
while ($pos !== false && $cnt < 1000) {
$search = '/\[url\=(.*?)\]\[!#saved_image([0-9]*)#!\]\[\/url\]' . '/is';
@@ -83,7 +89,8 @@ function item_redir_and_replace_images($body, $images, $cid) {
$newbody .= $subject;
$cnt++;
- $pos = get_bb_tag_pos($origbody, 'url', 1);
+ // Isn't this supposed to use $cnt value for $occurrences? - @MrPetovan
+ $pos = BBCode::getTagPosition($origbody, 'url', 0);
}
$newbody .= $origbody;
@@ -103,14 +110,21 @@ function item_redir_and_replace_images($body, $images, $cid) {
/**
* Render actions localized
*/
-function localize_item(&$item) {
-
+function localize_item(&$item)
+{
$extracted = item_extract_images($item['body']);
if ($extracted['images']) {
$item['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $item['contact-id']);
}
- /// @Separted ???
+ /*
+ heluecht 2018-06-19: from my point of view this whole code part is useless.
+ It just renders the body message of technical posts (Like, dislike, ...).
+ But: The body isn't visible at all. So we do this stuff just because we can.
+ Even if these messages were visible, this would only mean that something went wrong.
+ During the further steps of the database restructuring I would like to address this issue.
+ */
+
$xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
if (activity_match($item['verb'], ACTIVITY_LIKE)
|| activity_match($item['verb'], ACTIVITY_DISLIKE)
@@ -118,15 +132,11 @@ function localize_item(&$item) {
|| 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)) {
+ $fields = ['author-link', 'author-name', 'verb', 'object-type', 'resource-id', 'body', 'plink'];
+ $obj = Item::selectFirst($fields, ['uri' => $item['parent-uri']]);
+ if (!DBM::is_result($obj)) {
return;
}
- $obj = $r[0];
$author = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
$objauthor = '[url=' . $obj['author-link'] . ']' . $obj['author-name'] . '[/url]';
@@ -135,43 +145,40 @@ function localize_item(&$item) {
case ACTIVITY_POST:
switch ($obj['object-type']) {
case ACTIVITY_OBJ_EVENT:
- $post_type = t('event');
+ $post_type = L10n::t('event');
break;
default:
- $post_type = t('status');
+ $post_type = L10n::t('status');
}
break;
default:
if ($obj['resource-id']) {
- $post_type = t('photo');
- $m = array();
+ $post_type = L10n::t('photo');
+ $m = [];
preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
$rr['plink'] = $m[1];
} else {
- $post_type = t('status');
+ $post_type = L10n::t('status');
}
}
$plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]';
if (activity_match($item['verb'], ACTIVITY_LIKE)) {
- $bodyverb = t('%1$s likes %2$s\'s %3$s');
- }
- 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)) {
- $bodyverb = t('%1$s attends %2$s\'s %3$s');
+ $bodyverb = 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');
+ } elseif (activity_match($item['verb'], ACTIVITY_ATTEND)) {
+ $bodyverb = 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');
+ } elseif (activity_match($item['verb'], ACTIVITY_ATTENDMAYBE)) {
+ $bodyverb = L10n::t('%1$s attends maybe %2$s\'s %3$s');
}
- 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)) {
- $bodyverb = t('%1$s attends maybe %2$s\'s %3$s');
- }
- $item['body'] = sprintf($bodyverb, $author, $objauthor, $plink);
+ $item['body'] = sprintf($bodyverb, $author, $objauthor, $plink);
}
+
if (activity_match($item['verb'], ACTIVITY_FRIEND)) {
if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) return;
@@ -181,11 +188,12 @@ function localize_item(&$item) {
$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
- $obj = parse_xml_string($xmlhead.$item['object']);
- $links = parse_xml_string($xmlhead."".unxmlify($obj->link)."");
+ $obj = XML::parseString($xmlhead.$item['object']);
+ $links = XML::parseString($xmlhead."".unxmlify($obj->link)."");
$Bname = $obj->title;
- $Blink = ""; $Bphoto = "";
+ $Blink = "";
+ $Bphoto = "";
foreach ($links->link as $l) {
$atts = $l->attributes();
switch ($atts['rel']) {
@@ -194,18 +202,18 @@ function localize_item(&$item) {
}
}
- $A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
- $B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]';
+ $A = '[url=' . Contact::magicLink($Alink) . ']' . $Aname . '[/url]';
+ $B = '[url=' . Contact::magicLink($Blink) . ']' . $Bname . '[/url]';
if ($Bphoto != "") {
- $Bphoto = '[url=' . zrl($Blink) . '][img]' . $Bphoto . '[/img][/url]';
+ $Bphoto = '[url=' . Contact::magicLink($Blink) . '][img]' . $Bphoto . '[/img][/url]';
}
- $item['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto;
+ $item['body'] = L10n::t('%1$s is now friends with %2$s', $A, $B)."\n\n\n".$Bphoto;
}
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) {
@@ -217,8 +225,8 @@ function localize_item(&$item) {
$xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
- $obj = parse_xml_string($xmlhead.$item['object']);
- $links = parse_xml_string($xmlhead."".unxmlify($obj->link)."");
+ $obj = XML::parseString($xmlhead.$item['object']);
+ $links = XML::parseString($xmlhead."".unxmlify($obj->link)."");
$Bname = $obj->title;
$Blink = "";
@@ -231,21 +239,21 @@ function localize_item(&$item) {
}
}
- $A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
- $B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]';
+ $A = '[url=' . Contact::magicLink($Alink) . ']' . $Aname . '[/url]';
+ $B = '[url=' . Contact::magicLink($Blink) . ']' . $Bname . '[/url]';
if ($Bphoto != "") {
- $Bphoto = '[url=' . zrl($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]';
+ $Bphoto = '[url=' . Contact::magicLink($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.
*/
- $txt = t('%1$s poked %2$s');
+ $txt = L10n::t('%1$s poked %2$s');
// now translate the verb
$poked_t = trim(sprintf($txt, "", ""));
- $txt = str_replace( $poked_t, t($verb), $txt);
+ $txt = str_replace($poked_t, L10n::t($verb), $txt);
// then do the sprintf on the translation string
@@ -254,52 +262,51 @@ function localize_item(&$item) {
}
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']));
-
- if (!DBM::is_result($r)) {
+ $fields = ['author-id', 'author-link', 'author-name', 'author-network',
+ 'verb', 'object-type', 'resource-id', 'body', 'plink'];
+ $obj = Item::selectFirst($fields, ['uri' => $item['parent-uri']]);
+ if (!DBM::is_result($obj)) {
return;
}
- $obj = $r[0];
+ $author_arr = ['uid' => 0, 'id' => $item['author-id'],
+ 'network' => $item['author-network'], 'url' => $item['author-link']];
+ $author = '[url=' . Contact::magicLinkByContact($author_arr) . ']' . $item['author-name'] . '[/url]';
- $author = '[url=' . zrl($item['author-link']) . ']' . $item['author-name'] . '[/url]';
- $objauthor = '[url=' . zrl($obj['author-link']) . ']' . $obj['author-name'] . '[/url]';
+ $author_arr = ['uid' => 0, 'id' => $obj['author-id'],
+ 'network' => $obj['author-network'], 'url' => $obj['author-link']];
+ $objauthor = '[url=' . Contact::magicLinkByContact($author_arr) . ']' . $obj['author-name'] . '[/url]';
switch ($obj['verb']) {
case ACTIVITY_POST:
switch ($obj['object-type']) {
case ACTIVITY_OBJ_EVENT:
- $post_type = t('event');
+ $post_type = L10n::t('event');
break;
default:
- $post_type = t('status');
+ $post_type = L10n::t('status');
}
break;
default:
if ($obj['resource-id']) {
- $post_type = t('photo');
- $m=array(); preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
+ $post_type = L10n::t('photo');
+ $m=[]; preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
$rr['plink'] = $m[1];
} else {
- $post_type = t('status');
+ $post_type = L10n::t('status');
}
// Let's break everthing ... ;-)
break;
}
$plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]';
- $parsedobj = parse_xml_string($xmlhead.$item['object']);
+ $parsedobj = XML::parseString($xmlhead.$item['object']);
$tag = sprintf('#[url=%s]%s[/url]', $parsedobj->id, $parsedobj->content);
- $item['body'] = sprintf( t('%1$s tagged %2$s\'s %3$s with %4$s'), $author, $objauthor, $plink, $tag );
-
+ $item['body'] = L10n::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'] == "") {
return;
}
@@ -309,29 +316,25 @@ function localize_item(&$item) {
$xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
- $obj = parse_xml_string($xmlhead.$item['object']);
+ $obj = XML::parseString($xmlhead.$item['object']);
if (strlen($obj->id)) {
- $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']) {
- $target = $r[0];
+ $fields = ['author-link', 'author-name', 'plink'];
+ $target = Item::selectFirst($fields, ['uri' => $obj->id, 'uid' => $item['uid']]);
+ if (DBM::is_result($target) && $target['plink']) {
$Bname = $target['author-name'];
$Blink = $target['author-link'];
- $A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
- $B = '[url=' . 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";
+ $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";
}
}
}
$matches = null;
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=' . Contact::magicLink($mtch[1]) . ']', $item['body']);
}
}
}
@@ -339,20 +342,16 @@ function localize_item(&$item) {
// 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]';
- $item['body'] = bb_tag_preg_replace($photo_pattern, $photo_replace, 'url', $item['body']);
+ $photo_replace = '[url=' . Profile::zrl('$1' . '/photos/' . '$2' . '/image/' . '$3' ,true) . '][img' . '$4' . ']h' . '$5' . '[/img][/url]';
+ $item['body'] = BBCode::pregReplaceInTag($photo_pattern, $photo_replace, 'url', $item['body']);
}
// add sparkle links to appropriate permalinks
+ $author = ['uid' => 0, 'id' => $item['author-id'],
+ 'network' => $item['author-network'], 'url' => $item['author-link']];
- $x = stristr($item['plink'],'/display/');
- if ($x) {
- $sparkle = false;
- $y = best_link_url($item, $sparkle);
-
- if (strstr($y, '/redir/')) {
- $item['plink'] = $y . '?f=&url=' . $item['plink'];
- }
+ if (!empty($item['plink'])) {
+ $item['plink'] = Contact::magicLinkbyContact($author, $item['plink']);
}
}
@@ -365,7 +364,7 @@ function count_descendants($item) {
if ($total > 0) {
foreach ($item['children'] as $child) {
- if (! visible_activity($child)) {
+ if (!visible_activity($child)) {
$total --;
}
$total += count_descendants($child);
@@ -381,105 +380,21 @@ 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);
+ $hidden_activities = [ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE];
foreach ($hidden_activities as $act) {
if (activity_match($item['verb'], $act)) {
return false;
}
}
- if (activity_match($item['verb'], ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE) {
- if (! (($item['self']) && ($item['uid'] == local_user()))) {
- return false;
- }
+ // @TODO below if() block can be rewritten to a single line: $isVisible = allConditionsHere;
+ if (activity_match($item['verb'], ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE && empty($item['self']) && $item['uid'] == local_user()) {
+ return false;
}
return true;
}
-/**
- * @brief SQL query for items
- */
-function item_query() {
- return "SELECT " . item_fieldlists() . " FROM `item` " .
- item_joins() . " WHERE " . item_condition();
-}
-
-/**
- * @brief List of all data fields that are needed for displaying items
- */
-function item_fieldlists() {
-
-/*
-These Fields are not added below (yet). They are here to for bug search.
-`item`.`type`,
-`item`.`extid`,
-`item`.`changed`,
-`item`.`moderated`,
-`item`.`target-type`,
-`item`.`target`,
-`item`.`resource-id`,
-`item`.`tag`,
-`item`.`inform`,
-`item`.`pubmail`,
-`item`.`visible`,
-`item`.`spam`,
-`item`.`bookmark`,
-`item`.`unseen`,
-`item`.`deleted`,
-`item`.`origin`,
-`item`.`forum_mode`,
-`item`.`last-child`,
-`item`.`mention`,
-`item`.`global`,
-`item`.`gcontact-id`,
-`item`.`shadow`,
-*/
-
- return "`item`.`author-id`, `item`.`author-link`, `item`.`author-name`, `item`.`author-avatar`,
- `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`.`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`,
- `item`.`location`, `item`.`coord`, `item`.`app`, `item`.`attach`,
- `item`.`rendered-hash`, `item`.`rendered-html`, `item`.`object`,
- `item`.`allow_cid`, `item`.`allow_gid`, `item`.`deny_cid`, `item`.`deny_gid`,
- `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
-
- `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`,
-
- `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 `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`";
-}
-
/**
* "Render" a conversation or list of items for HTML display.
* There are two major forms of display:
@@ -490,8 +405,7 @@ function item_condition() {
* that are based on unique features of the calling module.
*
*/
-function conversation(App $a, $items, $mode, $update, $preview = false) {
- require_once 'include/bbcode.php';
+function conversation(App $a, array $items, $mode, $update, $preview = false, $order = 'commented', $uid = 0) {
require_once 'mod/proxy.php';
$ssl_state = ((local_user()) ? true : false);
@@ -515,6 +429,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
$previewing = (($preview) ? ' preview ' : '');
if ($mode === 'network') {
+ $items = conversation_add_children($items, false, $order, $uid);
$profile_owner = local_user();
if (!$update) {
/*
@@ -533,7 +448,6 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
. ((x($_GET, 'bmark')) ? '&bmark=' . $_GET['bmark'] : '')
. ((x($_GET, 'liked')) ? '&liked=' . $_GET['liked'] : '')
. ((x($_GET, 'conv')) ? '&conv=' . $_GET['conv'] : '')
- . ((x($_GET, 'spam')) ? '&spam=' . $_GET['spam'] : '')
. ((x($_GET, 'nets')) ? '&nets=' . $_GET['nets'] : '')
. ((x($_GET, 'cmin')) ? '&cmin=' . $_GET['cmin'] : '')
. ((x($_GET, 'cmax')) ? '&cmax=' . $_GET['cmax'] : '')
@@ -571,13 +485,11 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
$profile_owner = $a->profile['uid'];
if (!$update) {
$live_update_div = '' . "\r\n"
- . "";
}
} elseif ($mode === 'community') {
- if (!$community_readonly) {
- $items = community_add_items($items);
- }
+ $items = conversation_add_children($items, true, $order, $uid);
$profile_owner = 0;
if (!$update) {
$live_update_div = '' . "\r\n"
@@ -594,54 +506,48 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
$_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'];
- $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' => 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')]
+ ];
// 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'], array(NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_DFRN));
- }
+ if ($mode === 'community') {
+ $writable = true;
} else {
- $writable = false;
+ $writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], [NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_DFRN]);
}
if (!local_user()) {
$writable = false;
}
- if (in_array($mode, ['network-new', 'search', 'contact-posts']) || $community_readonly) {
+ if (in_array($mode, ['network-new', 'search', 'contact-posts'])) {
/*
* "New Item View" on network page or search page results
* - just loop through the items and format them minimally for display
*/
- /// @TODO old lost code?
- // $tpl = get_markup_template('search_item.tpl');
$tpl = 'search_item.tpl';
foreach ($items as $item) {
+ if (!visible_activity($item)) {
+ continue;
+ }
+
if ($arr_blocked) {
$blocked = false;
foreach ($arr_blocked as $b) {
@@ -667,71 +573,23 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
continue;
}
- $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']);
- if ($item['author-link'] && (! $item['author-name'])) {
+ $profile_name = $item['author-name'];
+ if (!empty($item['author-link']) && empty($item['author-name'])) {
$profile_name = $item['author-link'];
}
- $tags = array();
- $hashtags = array();
- $mentions = array();
+ $tags = \Friendica\Model\Term::populateTagsFromItem($item);
- $searchpath = System::baseUrl()."/search?tag=";
+ $author = ['uid' => 0, 'id' => $item['author-id'],
+ 'network' => $item['author-network'], 'url' => $item['author-link']];
+ $profile_link = Contact::magicLinkbyContact($author);
- $taglist = dba::select('term', array('type', 'term', 'url'),
- array("`otype` = ? AND `oid` = ? AND `type` IN (?, ?)", TERM_OBJ_POST, $item['id'], TERM_HASHTAG, TERM_MENTION),
- array('order' => array('tid')));
-
- while ($tag = dba::fetch($taglist)) {
- 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"] . "";
- $prefix = "#";
- } elseif ($tag["type"] == TERM_MENTION) {
- $mentions[] = "@" . $tag["term"] . "";
- $prefix = "@";
- }
- $tags[] = $prefix."" . $tag["term"] . "";
- }
- dba::close($taglist);
-
- $sp = false;
- $profile_link = best_link_url($item, $sp);
- if ($profile_link === 'mailbox') {
- $profile_link = '';
- }
-
- if ($sp) {
+ if (strpos($profile_link, 'redir/') === 0) {
$sparkle = ' sparkle';
- } else {
- $profile_link = zrl($profile_link);
}
- 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 {
- $item['author-thumb'] = $item['author-avatar'];
- }
- }
-
- 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 {
- $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));
@@ -742,12 +600,12 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
$dropping = false;
}
- $drop = array(
+ $drop = [
'dropping' => $dropping,
'pagedrop' => $page_dropping,
- 'select' => t('Select'),
- 'delete' => t('Delete'),
- );
+ 'select' => L10n::t('Select'),
+ 'delete' => L10n::t('Delete'),
+ ];
$star = false;
$isstarred = "unstarred";
@@ -760,50 +618,52 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
list($categories, $folders) = get_cats_and_terms($item);
$profile_name_e = $profile_name;
- $item['title_e'] = $item['title'];
+
+ if (!empty($item['content-warning']) && PConfig::get(local_user(), 'system', 'disable_cw', false)) {
+ $title_e = ucfirst($item['content-warning']);
+ } else {
+ $title_e = $item['title'];
+ }
+
$body_e = $body;
- $tags_e = $tags;
- $hashtags_e = $hashtags;
- $mentions_e = $mentions;
+ $tags_e = $tags['tags'];
+ $hashtags_e = $tags['hashtags'];
+ $mentions_e = $tags['mentions'];
$location_e = $location;
$owner_name_e = $owner_name;
- if ($item['item_network'] == "") {
- $item['item_network'] = $item['network'];
- }
-
- $tmp_item = array(
+ $tmp_item = [
'template' => $tpl,
- 'id' => (($preview) ? 'P0' : $item['item_id']),
- 'guid' => (($preview) ? 'Q0' : $item['guid']),
- 'network' => $item['item_network'],
- 'network_name' => 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'])),
+ 'id' => ($preview ? 'P0' : $item['id']),
+ 'guid' => ($preview ? 'Q0' : $item['guid']),
+ 'network' => $item['network'],
+ 'network_name' => ContactSelector::networkToName($item['network'], $profile_link),
+ 'linktitle' => 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_e,
'sparkle' => $sparkle,
'lock' => $lock,
- 'thumb' => System::removedBaseUrl(proxy_url($item['author-thumb'], false, PROXY_SIZE_THUMB)),
- 'title' => $item['title_e'],
+ 'thumb' => System::removedBaseUrl(proxy_url($item['author-avatar'], false, PROXY_SIZE_THUMB)),
+ 'title' => $title_e,
'body' => $body_e,
'tags' => $tags_e,
'hashtags' => $hashtags_e,
'mentions' => $mentions_e,
- 'txt_cats' => t('Categories:'),
- 'txt_folders' => t('Filed under:'),
+ 'txt_cats' => L10n::t('Categories:'),
+ 'txt_folders' => L10n::t('Filed under:'),
'has_cats' => ((count($categories)) ? 'true' : ''),
'has_folders' => ((count($folders)) ? 'true' : ''),
'categories' => $categories,
'folders' => $folders,
'text' => strip_tags($body_e),
- 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'),
- 'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
+ 'localtime' => DateTimeFormat::local($item['created'], 'r'),
+ 'ago' => (($item['app']) ? L10n::t('%s from %s', Temporal::getRelativeDate($item['created']),$item['app']) : Temporal::getRelativeDate($item['created'])),
'location' => $location_e,
'indent' => '',
'owner_name' => $owner_name_e,
'owner_url' => $owner_url,
- 'owner_photo' => System::removedBaseUrl(proxy_url($item['owner-thumb'], false, PROXY_SIZE_THUMB)),
+ 'owner_photo' => System::removedBaseUrl(proxy_url($item['owner-avatar'], false, PROXY_SIZE_THUMB)),
'plink' => get_plink($item),
'edpost' => false,
'isstarred' => $isstarred,
@@ -813,18 +673,18 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
'like' => '',
'dislike' => '',
'comment' => '',
- 'conv' => (($preview) ? '' : array('href'=> 'display/'.$item['guid'], 'title'=> t('View in context'))),
+ 'conv' => (($preview) ? '' : ['href'=> 'display/'.$item['guid'], 'title'=> L10n::t('View in context')]),
'previewing' => $previewing,
- 'wait' => t('Please wait'),
+ 'wait' => L10n::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]['id'] = $item['id'];
+ $threads[$threadsid]['network'] = $item['network'];
+ $threads[$threadsid]['items'] = [$arr['output']];
}
} else {
@@ -860,11 +720,13 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
continue;
}
- if (! visible_activity($item)) {
+ if (!visible_activity($item)) {
continue;
}
- call_hooks('display_item', $arr);
+ /// @todo Check if this call is needed or not
+ $arr = ['item' => $item];
+ Addon::callHooks('display_item', $arr);
$item['pagedrop'] = $page_dropping;
@@ -877,21 +739,21 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
$threads = $conv->getTemplateData($conv_responses);
if (!$threads) {
logger('[ERROR] conversation : Failed to get template data.', LOGGER_DEBUG);
- $threads = array();
+ $threads = [];
}
}
}
- $o = replace_macros($page_template, array(
+ $o = replace_macros($page_template, [
'$baseurl' => System::baseUrl($ssl_state),
'$return_path' => $a->query_string,
'$live_update' => $live_update_div,
- '$remove' => t('remove'),
+ '$remove' => L10n::t('remove'),
'$mode' => $mode,
'$user' => $a->user,
'$threads' => $threads,
- '$dropping' => ($page_dropping && Feature::isEnabled(local_user(), 'multi_delete') ? t('Delete Selected Items') : False),
- ));
+ '$dropping' => ($page_dropping && Feature::isEnabled(local_user(), 'multi_delete') ? L10n::t('Delete Selected Items') : False),
+ ]);
return $o;
}
@@ -906,43 +768,26 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
*
* @return array items with parents and comments
*/
-function community_add_items($parents) {
- $max_comments = Config::get("system", "max_comments", 100);
+function conversation_add_children(array $parents, $block_authors, $order, $uid) {
+ $max_comments = Config::get('system', 'max_comments', 100);
+
+ $params = ['order' => ['uid', 'commented' => true]];
+
+ if ($max_comments > 0) {
+ $params['limit'] = $max_comments;
+ }
- $items = array();
+ $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 = array();
- }
+ $condition = ["`item`.`parent-uri` = ? AND `item`.`uid` IN (0, ?) ",
+ $parent['uri'], local_user()];
+ if ($block_authors) {
+ $condition[0] .= "AND NOT `author`.`hidden`";
}
+ $thread_items = Item::selectForUser(local_user(), [], $condition, $params);
- 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);
- }
+ $comments = Item::inArray($thread_items);
if (count($comments) != 0) {
$items = array_merge($items, $comments);
@@ -955,53 +800,11 @@ function community_add_items($parents) {
}
}
- $items = conv_sort($items, "`commented`");
+ $items = conv_sort($items, $order);
return $items;
}
-function best_link_url($item, &$sparkle, $url = '') {
-
- $best_url = '';
- $sparkle = false;
-
- $clean_url = normalise_link($item['author-link']);
-
- if (local_user()) {
- $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 ($url != '') {
- $best_url = $url;
- } elseif (strlen($item['author-link'])) {
- $best_url = $item['author-link'];
- } else {
- $best_url = $item['url'];
- }
- }
-
- return $best_url;
-}
-
-
function item_photo_menu($item) {
$sub_link = '';
$poke_link = '';
@@ -1011,15 +814,14 @@ function item_photo_menu($item) {
$photos_link = '';
$posts_link = '';
- if ((local_user()) && local_user() == $item['uid'] && $item['parent'] == $item['id'] && (! $item['self'])) {
+ 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);
- if ($profile_link === 'mailbox') {
- $profile_link = '';
- }
+ $author = ['uid' => 0, 'id' => $item['author-id'],
+ 'network' => $item['author-network'], 'url' => $item['author-link']];
+ $profile_link = Contact::magicLinkbyContact($author);
+ $sparkle = (strpos($profile_link, 'redir/') === 0);
$cid = 0;
$network = '';
@@ -1036,8 +838,6 @@ function item_photo_menu($item) {
$status_link = $profile_link . '?url=status';
$photos_link = $profile_link . '?url=photos';
$profile_link = $profile_link . '?url=profile';
- } else {
- $profile_link = zrl($profile_link);
}
if ($cid && !$item['self']) {
@@ -1045,37 +845,37 @@ 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(
- t('Follow Thread') => $sub_link,
- t('View Status') => $status_link,
- t('View Profile') => $profile_link,
- t('View Photos') => $photos_link,
- t('Network Posts') => $posts_link,
- t('View Contact') => $contact_url,
- t('Send PM') => $pm_url
- );
+ $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
+ ];
if ($network == NETWORK_DFRN) {
- $menu[t("Poke")] = $poke_link;
+ $menu[L10n::t("Poke")] = $poke_link;
}
if ((($cid == 0) || ($rel == CONTACT_IS_FOLLOWER)) &&
- in_array($item['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) {
- $menu[t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']);
+ in_array($item['network'], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA])) {
+ $menu[L10n::t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']);
}
} else {
- $menu = array(t('View Profile') => $item['author-link']);
+ $menu = [L10n::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'];
@@ -1124,24 +924,23 @@ function builtin_activity_puller($item, &$conv_responses) {
return;
}
- 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']))) {
- $url = 'redir/' . $item['contact-id'];
+ if (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);
+ if (strpos($url, 'redir/') === 0) {
$sparkle = ' class="sparkle" ';
- } else {
- $url = zrl($url);
}
$url = '' . htmlentities($item['author-name']) . '';
- if (! $item['thr-parent']) {
+ if (!x($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();
+ 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'] = [];
}
// only list each unique author once
@@ -1149,7 +948,7 @@ function builtin_activity_puller($item, &$conv_responses) {
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 {
$conv_responses[$mode][$item['thr-parent']] ++;
@@ -1173,7 +972,7 @@ function builtin_activity_puller($item, &$conv_responses) {
* @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
+ * @return string formatted text
*/
function format_like($cnt, array $arr, $type, $id) {
$o = '';
@@ -1186,19 +985,19 @@ function format_like($cnt, array $arr, $type, $id) {
// list which show all likers
switch ($type) {
case 'like' :
- $phrase = sprintf( t('%s likes this.'), $likers);
+ $phrase = L10n::t('%s likes this.', $likers);
break;
case 'dislike' :
- $phrase = sprintf( t('%s doesn\'t like this.'), $likers);
+ $phrase = L10n::t('%s doesn\'t like this.', $likers);
break;
case 'attendyes' :
- $phrase = sprintf( t('%s attends.'), $likers);
+ $phrase = L10n::t('%s attends.', $likers);
break;
case 'attendno' :
- $phrase = sprintf( t('%s doesn\'t attend.'), $likers);
+ $phrase = L10n::t('%s doesn\'t attend.', $likers);
break;
case 'attendmaybe' :
- $phrase = sprintf( t('%s attends maybe.'), $likers);
+ $phrase = L10n::t('%s attends maybe.', $likers);
break;
}
}
@@ -1209,13 +1008,13 @@ function format_like($cnt, array $arr, $type, $id) {
$arr = array_slice($arr, 0, MAX_LIKERS - 1);
}
if ($total < MAX_LIKERS) {
- $last = t('and') . ' ' . $arr[count($arr)-1];
+ $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 .= sprintf( t(', and %d other people'), $total - MAX_LIKERS );
+ $str .= L10n::t('and %d other people', $total - MAX_LIKERS);
}
$likers = $str;
@@ -1224,24 +1023,24 @@ function format_like($cnt, array $arr, $type, $id) {
switch ($type) {
case 'like':
- $phrase = sprintf( t('%2$d people like this'), $spanatts, $cnt);
- $explikers = sprintf( t('%s like this.'), $likers);
+ $phrase = L10n::t('%2$d people like this', $spanatts, $cnt);
+ $explikers = L10n::t('%s like this.', $likers);
break;
case 'dislike':
- $phrase = sprintf( t('%2$d people don\'t like this'), $spanatts, $cnt);
- $explikers = sprintf( t('%s don\'t like this.'), $likers);
+ $phrase = L10n::t('%2$d people don\'t like this', $spanatts, $cnt);
+ $explikers = L10n::t('%s don\'t like this.', $likers);
break;
case 'attendyes':
- $phrase = sprintf( t('%2$d people attend'), $spanatts, $cnt);
- $explikers = sprintf( t('%s attend.'), $likers);
+ $phrase = L10n::t('%2$d people attend', $spanatts, $cnt);
+ $explikers = L10n::t('%s attend.', $likers);
break;
case 'attendno':
- $phrase = sprintf( t('%2$d people don\'t attend'), $spanatts, $cnt);
- $explikers = sprintf( t('%s don\'t attend.'), $likers);
+ $phrase = L10n::t('%2$d people don\'t attend', $spanatts, $cnt);
+ $explikers = L10n::t('%s don\'t attend.', $likers);
break;
case 'attendmaybe':
- $phrase = sprintf( t('%2$d people attend maybe'), $spanatts, $cnt);
- $explikers = sprintf( t('%s anttend maybe.'), $likers);
+ $phrase = L10n::t('%2$d people attend maybe', $spanatts, $cnt);
+ $explikers = L10n::t('%s attend maybe.', $likers);
break;
}
@@ -1249,11 +1048,11 @@ function format_like($cnt, array $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;
@@ -1263,41 +1062,41 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
{
$o = '';
- $geotag = x($x, 'allow_location') ? replace_macros(get_markup_template('jot_geotag.tpl'), array()) : '';
+ $geotag = x($x, 'allow_location') ? replace_macros(get_markup_template('jot_geotag.tpl'), []) : '';
$tpl = get_markup_template('jot-header.tpl');
- $a->page['htmlhead'] .= replace_macros($tpl, array(
+ $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)?')
- ));
+ '$ispublic' => L10n::t('Visible to everybody'),
+ '$linkurl' => L10n::t('Please enter a link URL:'),
+ '$vidurl' => L10n::t("Please enter a video link/URL:"),
+ '$audurl' => L10n::t("Please enter an audio link/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?")
+ ]);
$tpl = get_markup_template('jot-end.tpl');
- $a->page['end'] .= replace_macros($tpl, array(
+ $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?')
- ));
+ '$ispublic' => L10n::t('Visible to everybody'),
+ '$linkurl' => L10n::t('Please enter a link URL:'),
+ '$vidurl' => L10n::t("Please enter a video link/URL:"),
+ '$audurl' => L10n::t("Please enter an audio link/URL:"),
+ '$term' => L10n::t('Tag term:'),
+ '$fileas' => L10n::t('Save to Folder:'),
+ '$whereareu' => L10n::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;
@@ -1307,7 +1106,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
$query_str = $a->query_string;
if (strpos($query_str, 'public=1') !== false) {
- $query_str = str_replace(array('?public=1', '&public=1'), array('', ''), $query_str);
+ $query_str = str_replace(['?public=1', '&public=1'], ['', ''], $query_str);
}
/*
@@ -1324,31 +1123,32 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
// $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
$tpl = get_markup_template("jot.tpl");
- $o .= replace_macros($tpl,array(
+ $o .= replace_macros($tpl,[
+ '$new_post' => L10n::t('New Post'),
'$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'),
+ '$share' => defaults($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'),
+ '$weblink' => L10n::t('Insert web link'),
+ '$shortweblink' => L10n::t('web link'),
+ '$video' => L10n::t('Insert video link'),
+ '$shortvideo' => L10n::t('video link'),
+ '$audio' => L10n::t('Insert audio link'),
+ '$shortaudio' => L10n::t('audio link'),
+ '$setloc' => L10n::t('Set your location'),
+ '$shortsetloc' => L10n::t('set location'),
+ '$noloc' => L10n::t('Clear browser location'),
+ '$shortnoloc' => L10n::t('clear location'),
'$title' => defaults($x, 'title', ''),
- '$placeholdertitle' => t('Set title'),
+ '$placeholdertitle' => L10n::t('Set title'),
'$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'),
+ '$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'),
'$ptyp' => $notes_cid ? 'note' : 'wall',
'$content' => defaults($x, 'content', ''),
'$post_id' => defaults($x, 'post_id', ''),
@@ -1356,29 +1156,29 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
'$defloc' => $x['default_location'],
'$visitor' => $x['visitor'],
'$pvisit' => $notes_cid ? 'none' : $x['visitor'],
- '$public' => t('Public post'),
+ '$public' => L10n::t('Public post'),
'$lockstate' => $x['lockstate'],
'$bang' => $x['bang'],
'$profile_uid' => $x['profile_uid'],
- '$preview' => Feature::isEnabled($x['profile_uid'], 'preview') ? t('Preview') : '',
+ '$preview' => Feature::isEnabled($x['profile_uid'], 'preview') ? L10n::t('Preview') : '',
'$jotplugins' => $jotplugins,
'$notes_cid' => $notes_cid,
- '$sourceapp' => t($a->sourcename),
- '$cancel' => t('Cancel'),
+ '$sourceapp' => L10n::t($a->sourcename),
+ '$cancel' => L10n::t('Cancel'),
'$rand_num' => random_digits(12),
// ACL permissions box
'$acl' => $x['acl'],
- '$group_perms' => t('Post to Groups'),
- '$contact_perms' => t('Post to Contacts'),
- '$private' => t('Private post'),
+ '$group_perms' => L10n::t('Post to Groups'),
+ '$contact_perms' => L10n::t('Post to Contacts'),
+ '$private' => L10n::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'),
- ));
+ '$message' => L10n::t('Message'),
+ '$browser' => L10n::t('Browser'),
+ ]);
if ($popup == true) {
@@ -1476,7 +1276,7 @@ function add_children_to_list(array $children, array &$item_list)
*/
function smart_flatten_conversation(array $parent)
{
- if (! isset($parent['children']) || count($parent['children']) == 0) {
+ if (!isset($parent['children']) || count($parent['children']) == 0) {
return $parent;
}
@@ -1622,29 +1422,27 @@ 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'] != "") {
+function render_location_dummy(array $item) {
+ if (x($item, 'location') && !empty($item['location'])) {
return $item['location'];
}
- if ($item['coord'] != "") {
+ if (x($item, 'coord') && !empty($item['coord'])) {
return $item['coord'];
}
}
-/// @TODO Add type-hint
-function get_responses($conv_responses, $response_verbs, $ob, $item) {
- $ret = array();
+function get_responses(array $conv_responses, array $response_verbs, $ob, array $item) {
+ $ret = [];
foreach ($response_verbs as $v) {
- $ret[$v] = array();
+ $ret[$v] = [];
$ret[$v]['count'] = defaults($conv_responses[$v], $item['uri'], '');
- $ret[$v]['list'] = defaults($conv_responses[$v], $item['uri'] . '-l', '');
+ $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']) . '">' . L10n::t('View all') . '');
} else {
$ret[$v]['list_part'] = '';
}
@@ -1667,19 +1465,19 @@ function get_response_button_text($v, $count)
{
switch ($v) {
case 'like':
- $return = tt('Like', 'Likes', $count);
+ $return = L10n::tt('Like', 'Likes', $count);
break;
case 'dislike':
- $return = tt('Dislike', 'Dislikes', $count);
+ $return = L10n::tt('Dislike', 'Dislikes', $count);
break;
case 'attendyes':
- $return = tt('Attending', 'Attending', $count);
+ $return = L10n::tt('Attending', 'Attending', $count);
break;
case 'attendno':
- $return = tt('Not Attending', 'Not Attending', $count);
+ $return = L10n::tt('Not Attending', 'Not Attending', $count);
break;
case 'attendmaybe':
- $return = tt('Undecided', 'Undecided', $count);
+ $return = L10n::tt('Undecided', 'Undecided', $count);
break;
}