Fix formatting and PHP notices in Object\Post
- Use x() and defaults() to fix undefined indexes - Simplify boolean variable assignments - Simplify sprintf(t()) structures
This commit is contained in:
parent
4e6050489d
commit
e8e2e41d73
|
@ -1,7 +1,9 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @file src/Object/Post.php
|
* @file src/Object/Post.php
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace Friendica\Object;
|
namespace Friendica\Object;
|
||||||
|
|
||||||
use Friendica\BaseObject;
|
use Friendica\BaseObject;
|
||||||
|
@ -52,9 +54,9 @@ class Post extends BaseObject
|
||||||
|
|
||||||
$this->data = $data;
|
$this->data = $data;
|
||||||
$this->setTemplate('wall');
|
$this->setTemplate('wall');
|
||||||
$this->toplevel = ($this->getId() == $this->getDataValue('parent'));
|
$this->toplevel = $this->getId() == $this->getDataValue('parent');
|
||||||
|
|
||||||
if (is_array($_SESSION['remote'])) {
|
if (x($_SESSION, 'remote') && is_array($_SESSION['remote'])) {
|
||||||
foreach ($_SESSION['remote'] as $visitor) {
|
foreach ($_SESSION['remote'] as $visitor) {
|
||||||
if ($visitor['cid'] == $this->getDataValue('contact-id')) {
|
if ($visitor['cid'] == $this->getDataValue('contact-id')) {
|
||||||
$this->visiting = true;
|
$this->visiting = true;
|
||||||
|
@ -63,9 +65,7 @@ class Post extends BaseObject
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->writable = ($this->getDataValue('writable') || $this->getDataValue('self'));
|
$this->writable = $this->getDataValue('writable') || $this->getDataValue('self');
|
||||||
|
|
||||||
$ssl_state = ((local_user()) ? true : false);
|
|
||||||
$this->redirect_url = 'redir/' . $this->getDataValue('cid');
|
$this->redirect_url = 'redir/' . $this->getDataValue('cid');
|
||||||
|
|
||||||
if (!$this->isToplevel()) {
|
if (!$this->isToplevel()) {
|
||||||
|
@ -75,9 +75,7 @@ class Post extends BaseObject
|
||||||
// Prepare the children
|
// Prepare the children
|
||||||
if (count($data['children'])) {
|
if (count($data['children'])) {
|
||||||
foreach ($data['children'] as $item) {
|
foreach ($data['children'] as $item) {
|
||||||
/*
|
// Only add will be displayed
|
||||||
* Only add will be displayed
|
|
||||||
*/
|
|
||||||
if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
|
if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
|
||||||
continue;
|
continue;
|
||||||
} elseif (!visible_activity($item)) {
|
} elseif (!visible_activity($item)) {
|
||||||
|
@ -145,7 +143,7 @@ class Post extends BaseObject
|
||||||
|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
|
|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
|
||||||
? t('Private Message')
|
? t('Private Message')
|
||||||
: false);
|
: false);
|
||||||
$shareable = ((in_array($conv->getProfileOwner(), [0, local_user()]) && ($item['private'] != 1)) ? true : false);
|
$shareable = in_array($conv->getProfileOwner(), [0, local_user()]) && $item['private'] != 1;
|
||||||
|
|
||||||
if (local_user() && link_compare($a->contact['url'], $item['author-link'])) {
|
if (local_user() && link_compare($a->contact['url'], $item['author-link'])) {
|
||||||
if ($item["event-id"] != 0) {
|
if ($item["event-id"] != 0) {
|
||||||
|
@ -210,25 +208,11 @@ class Post extends BaseObject
|
||||||
call_hooks('render_location', $locate);
|
call_hooks('render_location', $locate);
|
||||||
$location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate));
|
$location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate));
|
||||||
|
|
||||||
$tags=array();
|
|
||||||
$hashtags = array();
|
|
||||||
$mentions = array();
|
|
||||||
|
|
||||||
/*foreach(explode(',',$item['tag']) as $tag){
|
|
||||||
$tag = trim($tag);
|
|
||||||
if ($tag!="") {
|
|
||||||
$t = bbcode($tag);
|
|
||||||
$tags[] = $t;
|
|
||||||
if($t[0] == '#')
|
|
||||||
$hashtags[] = $t;
|
|
||||||
elseif($t[0] == '@')
|
|
||||||
$mentions[] = $t;
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
|
|
||||||
// process action responses - e.g. like/dislike/attend/agree/whatever
|
// process action responses - e.g. like/dislike/attend/agree/whatever
|
||||||
$response_verbs = array('like', 'dislike');
|
$response_verbs = array('like', 'dislike');
|
||||||
|
|
||||||
|
$isevent = false;
|
||||||
|
$attend = [];
|
||||||
if ($item['object-type'] === ACTIVITY_OBJ_EVENT) {
|
if ($item['object-type'] === ACTIVITY_OBJ_EVENT) {
|
||||||
$response_verbs[] = 'attendyes';
|
$response_verbs[] = 'attendyes';
|
||||||
$response_verbs[] = 'attendno';
|
$response_verbs[] = 'attendno';
|
||||||
|
@ -242,7 +226,7 @@ class Post extends BaseObject
|
||||||
$responses = get_responses($conv_responses, $response_verbs, $this, $item);
|
$responses = get_responses($conv_responses, $response_verbs, $this, $item);
|
||||||
|
|
||||||
foreach ($response_verbs as $value => $verbs) {
|
foreach ($response_verbs as $value => $verbs) {
|
||||||
$responses[$verbs]['output'] = ((x($conv_responses[$verbs], $item['uri'])) ? format_like($conv_responses[$verbs][$item['uri']], $conv_responses[$verbs][$item['uri'] . '-l'], $verbs, $item['uri']) : '');
|
$responses[$verbs]['output'] = x($conv_responses[$verbs], $item['uri']) ? format_like($conv_responses[$verbs][$item['uri']], $conv_responses[$verbs][$item['uri'] . '-l'], $verbs, $item['uri']) : '';
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -256,6 +240,8 @@ class Post extends BaseObject
|
||||||
$osparkle = ' sparkle';
|
$osparkle = ' sparkle';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$tagger = '';
|
||||||
|
|
||||||
if ($this->isToplevel()) {
|
if ($this->isToplevel()) {
|
||||||
if ($conv->getProfileOwner() == local_user()) {
|
if ($conv->getProfileOwner() == local_user()) {
|
||||||
$isstarred = (($item['starred']) ? "starred" : "unstarred");
|
$isstarred = (($item['starred']) ? "starred" : "unstarred");
|
||||||
|
@ -264,8 +250,8 @@ class Post extends BaseObject
|
||||||
'do' => t("add star"),
|
'do' => t("add star"),
|
||||||
'undo' => t("remove star"),
|
'undo' => t("remove star"),
|
||||||
'toggle' => t("toggle star status"),
|
'toggle' => t("toggle star status"),
|
||||||
'classdo' => (($item['starred']) ? "hidden" : ""),
|
'classdo' => $item['starred'] ? "hidden" : "",
|
||||||
'classundo' => (($item['starred']) ? "" : "hidden"),
|
'classundo' => $item['starred'] ? "" : "hidden",
|
||||||
'starred' => t('starred'),
|
'starred' => t('starred'),
|
||||||
);
|
);
|
||||||
$r = dba::select('thread', array('ignored'), array('uid' => $item['uid'], 'iid' => $item['id']), array('limit' => 1));
|
$r = dba::select('thread', array('ignored'), array('uid' => $item['uid'], 'iid' => $item['id']), array('limit' => 1));
|
||||||
|
@ -274,13 +260,12 @@ class Post extends BaseObject
|
||||||
'do' => t("ignore thread"),
|
'do' => t("ignore thread"),
|
||||||
'undo' => t("unignore thread"),
|
'undo' => t("unignore thread"),
|
||||||
'toggle' => t("toggle ignore status"),
|
'toggle' => t("toggle ignore status"),
|
||||||
'classdo' => (($r['ignored']) ? "hidden" : ""),
|
'classdo' => $r['ignored'] ? "hidden" : "",
|
||||||
'classundo' => (($r['ignored']) ? "" : "hidden"),
|
'classundo' => $r['ignored'] ? "" : "hidden",
|
||||||
'ignored' => t('ignored'),
|
'ignored' => t('ignored'),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
$tagger = '';
|
|
||||||
if (Feature::isEnabled($conv->getProfileOwner(), 'commtag')) {
|
if (Feature::isEnabled($conv->getProfileOwner(), 'commtag')) {
|
||||||
$tagger = array(
|
$tagger = array(
|
||||||
'add' => t("add tag"),
|
'add' => t("add tag"),
|
||||||
|
@ -295,7 +280,7 @@ class Post extends BaseObject
|
||||||
if ($conv->isWritable()) {
|
if ($conv->isWritable()) {
|
||||||
$buttons = array(
|
$buttons = array(
|
||||||
'like' => array(t("I like this \x28toggle\x29"), t("like")),
|
'like' => array(t("I like this \x28toggle\x29"), t("like")),
|
||||||
'dislike' => ((Feature::isEnabled($conv->getProfileOwner(), 'dislike')) ? array( t("I don't like this \x28toggle\x29"), t("dislike")) : ''),
|
'dislike' => Feature::isEnabled($conv->getProfileOwner(), 'dislike') ? array(t("I don't like this \x28toggle\x29"), t("dislike")) : '',
|
||||||
);
|
);
|
||||||
if ($shareable) {
|
if ($shareable) {
|
||||||
$buttons['share'] = array(t('Share this'), t('share'));
|
$buttons['share'] = array(t('Share this'), t('share'));
|
||||||
|
@ -322,10 +307,10 @@ class Post extends BaseObject
|
||||||
$owner_name_e = $this->getOwnerName();
|
$owner_name_e = $this->getOwnerName();
|
||||||
|
|
||||||
// Disable features that aren't available in several networks
|
// Disable features that aren't available in several networks
|
||||||
|
|
||||||
/// @todo Add NETWORK_DIASPORA when it will pass this information
|
/// @todo Add NETWORK_DIASPORA when it will pass this information
|
||||||
if (!in_array($item["item_network"], array(NETWORK_DFRN)) && isset($buttons["dislike"])) {
|
if (!in_array($item["item_network"], array(NETWORK_DFRN)) && isset($buttons["dislike"])) {
|
||||||
unset($buttons["dislike"], $isevent);
|
unset($buttons["dislike"]);
|
||||||
|
$isevent = false;
|
||||||
$tagger = '';
|
$tagger = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -355,8 +340,8 @@ class Post extends BaseObject
|
||||||
'guid' => urlencode($item['guid']),
|
'guid' => urlencode($item['guid']),
|
||||||
'isevent' => $isevent,
|
'isevent' => $isevent,
|
||||||
'attend' => $attend,
|
'attend' => $attend,
|
||||||
'linktitle' => sprintf(t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
|
'linktitle' => t('View %s\'s profile @ %s', $profile_name, defaults($item, 'author-link', $item['url'])),
|
||||||
'olinktitle' => sprintf(t('View %s\'s profile @ %s'), htmlentities($this->getOwnerName()), ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
|
'olinktitle' => t('View %s\'s profile @ %s', htmlentities($this->getOwnerName()), defaults($item, 'owner-link', $item['url'])),
|
||||||
'to' => t('to'),
|
'to' => t('to'),
|
||||||
'via' => t('via'),
|
'via' => t('via'),
|
||||||
'wall' => t('Wall-to-Wall'),
|
'wall' => t('Wall-to-Wall'),
|
||||||
|
@ -369,7 +354,7 @@ class Post extends BaseObject
|
||||||
'sparkle' => $sparkle,
|
'sparkle' => $sparkle,
|
||||||
'title' => $title_e,
|
'title' => $title_e,
|
||||||
'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'),
|
'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'])),
|
'ago' => $item['app'] ? t('%s from %s', relative_date($item['created']), $item['app']) : relative_date($item['created']),
|
||||||
'app' => $item['app'],
|
'app' => $item['app'],
|
||||||
'created' => relative_date($item['created']),
|
'created' => relative_date($item['created']),
|
||||||
'lock' => $lock,
|
'lock' => $lock,
|
||||||
|
@ -380,12 +365,12 @@ class Post extends BaseObject
|
||||||
'owner_photo' => $a->remove_baseurl(proxy_url($item['owner-thumb'], false, PROXY_SIZE_THUMB)),
|
'owner_photo' => $a->remove_baseurl(proxy_url($item['owner-thumb'], false, PROXY_SIZE_THUMB)),
|
||||||
'owner_name' => htmlentities($owner_name_e),
|
'owner_name' => htmlentities($owner_name_e),
|
||||||
'plink' => get_plink($item),
|
'plink' => get_plink($item),
|
||||||
'edpost' => ((Feature::isEnabled($conv->getProfileOwner(), 'edit_posts')) ? $edpost : ''),
|
'edpost' => Feature::isEnabled($conv->getProfileOwner(), 'edit_posts') ? $edpost : '',
|
||||||
'isstarred' => $isstarred,
|
'isstarred' => $isstarred,
|
||||||
'star' => ((Feature::isEnabled($conv->getProfileOwner(), 'star_posts')) ? $star : ''),
|
'star' => Feature::isEnabled($conv->getProfileOwner(), 'star_posts') ? $star : '',
|
||||||
'ignore' => ((Feature::isEnabled($conv->getProfileOwner(), 'ignore_posts')) ? $ignore : ''),
|
'ignore' => Feature::isEnabled($conv->getProfileOwner(), 'ignore_posts') ? $ignore : '',
|
||||||
'tagger' => $tagger,
|
'tagger' => $tagger,
|
||||||
'filer' => ((Feature::isEnabled($conv->getProfileOwner(), 'filing')) ? $filer : ''),
|
'filer' => Feature::isEnabled($conv->getProfileOwner(), 'filing') ? $filer : '',
|
||||||
'drop' => $drop,
|
'drop' => $drop,
|
||||||
'vote' => $buttons,
|
'vote' => $buttons,
|
||||||
'like' => $responses['like']['output'],
|
'like' => $responses['like']['output'],
|
||||||
|
@ -393,7 +378,7 @@ class Post extends BaseObject
|
||||||
'responses' => $responses,
|
'responses' => $responses,
|
||||||
'switchcomment' => t('Comment'),
|
'switchcomment' => t('Comment'),
|
||||||
'comment' => $comment,
|
'comment' => $comment,
|
||||||
'previewing' => ($conv->isPreview() ? ' preview ' : ''),
|
'previewing' => $conv->isPreview() ? ' preview ' : '',
|
||||||
'wait' => t('Please wait'),
|
'wait' => t('Please wait'),
|
||||||
'thread_level' => $thread_level,
|
'thread_level' => $thread_level,
|
||||||
'edited' => $edited,
|
'edited' => $edited,
|
||||||
|
@ -419,7 +404,7 @@ class Post extends BaseObject
|
||||||
// Collapse
|
// Collapse
|
||||||
if (($nb_children > 2) || ($thread_level > 1)) {
|
if (($nb_children > 2) || ($thread_level > 1)) {
|
||||||
$result['children'][0]['comment_firstcollapsed'] = true;
|
$result['children'][0]['comment_firstcollapsed'] = true;
|
||||||
$result['children'][0]['num_comments'] = sprintf(tt('%d comment', '%d comments', $total_children), $total_children);
|
$result['children'][0]['num_comments'] = tt('%d comment', '%d comments', $total_children);
|
||||||
$result['children'][0]['hidden_comments_num'] = $total_children;
|
$result['children'][0]['hidden_comments_num'] = $total_children;
|
||||||
$result['children'][0]['hidden_comments_text'] = tt('comment', 'comments', $total_children);
|
$result['children'][0]['hidden_comments_text'] = tt('comment', 'comments', $total_children);
|
||||||
$result['children'][0]['hide_text'] = t('show more');
|
$result['children'][0]['hide_text'] = t('show more');
|
||||||
|
@ -696,7 +681,6 @@ class Post extends BaseObject
|
||||||
if ($conv) {
|
if ($conv) {
|
||||||
// This will allow us to comment on wall-to-wall items owned by our friends
|
// This will allow us to comment on wall-to-wall items owned by our friends
|
||||||
// and community forums even if somebody else wrote the post.
|
// and community forums even if somebody else wrote the post.
|
||||||
|
|
||||||
// bug #517 - this fixes for conversation owner
|
// bug #517 - this fixes for conversation owner
|
||||||
if ($conv->getMode() == 'profile' && $conv->getProfileOwner() == local_user()) {
|
if ($conv->getMode() == 'profile' && $conv->getProfileOwner() == local_user()) {
|
||||||
return true;
|
return true;
|
||||||
|
@ -750,7 +734,6 @@ class Post extends BaseObject
|
||||||
|
|
||||||
$comment_box = '';
|
$comment_box = '';
|
||||||
$conv = $this->getThread();
|
$conv = $this->getThread();
|
||||||
$template = get_markup_template($this->getCommentBoxTemplate());
|
|
||||||
$ww = '';
|
$ww = '';
|
||||||
if (($conv->getMode() === 'network') && $this->isWallToWall()) {
|
if (($conv->getMode() === 'network') && $this->isWallToWall()) {
|
||||||
$ww = 'ww';
|
$ww = 'ww';
|
||||||
|
@ -768,14 +751,12 @@ class Post extends BaseObject
|
||||||
$qcomment = (($qc) ? explode("\n", $qc) : null);
|
$qcomment = (($qc) ? explode("\n", $qc) : null);
|
||||||
}
|
}
|
||||||
|
|
||||||
$comment_box = replace_macros(
|
$template = get_markup_template($this->getCommentBoxTemplate());
|
||||||
$template,
|
$comment_box = replace_macros($template, array(
|
||||||
array(
|
|
||||||
'$return_path' => $a->query_string,
|
'$return_path' => $a->query_string,
|
||||||
'$threaded' => $this->isThreaded(),
|
'$threaded' => $this->isThreaded(),
|
||||||
// '$jsreload' => (($conv->getMode() === 'display') ? $_SESSION['return_url'] : ''),
|
|
||||||
'$jsreload' => '',
|
'$jsreload' => '',
|
||||||
'$type' => (($conv->getMode() === 'profile') ? 'wall-comment' : 'net-comment'),
|
'$type' => $conv->getMode() === 'profile' ? 'wall-comment' : 'net-comment',
|
||||||
'$id' => $this->getId(),
|
'$id' => $this->getId(),
|
||||||
'$parent' => $this->getId(),
|
'$parent' => $this->getId(),
|
||||||
'$qcomment' => $qcomment,
|
'$qcomment' => $qcomment,
|
||||||
|
@ -796,9 +777,9 @@ class Post extends BaseObject
|
||||||
'$preview' => ((Feature::isEnabled($conv->getProfileOwner(), 'preview')) ? t('Preview') : ''),
|
'$preview' => ((Feature::isEnabled($conv->getProfileOwner(), 'preview')) ? t('Preview') : ''),
|
||||||
'$indent' => $indent,
|
'$indent' => $indent,
|
||||||
'$sourceapp' => t($a->sourcename),
|
'$sourceapp' => t($a->sourcename),
|
||||||
'$ww' => (($conv->getMode() === 'network') ? $ww : ''),
|
'$ww' => $conv->getMode() === 'network' ? $ww : '',
|
||||||
'$rand_num' => random_digits(12))
|
'$rand_num' => random_digits(12)
|
||||||
);
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
return $comment_box;
|
return $comment_box;
|
||||||
|
@ -846,7 +827,6 @@ class Post extends BaseObject
|
||||||
// all over the park. It can be tricked, but this prevents you from
|
// all over the park. It can be tricked, but this prevents you from
|
||||||
// seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn
|
// seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn
|
||||||
// well that it's the same Bob Smith.
|
// well that it's the same Bob Smith.
|
||||||
|
|
||||||
// But it could be somebody else with the same name. It just isn't highly likely.
|
// But it could be somebody else with the same name. It just isn't highly likely.
|
||||||
|
|
||||||
|
|
||||||
|
@ -854,8 +834,8 @@ class Post extends BaseObject
|
||||||
$this->owner_name = $this->getDataValue('owner-name');
|
$this->owner_name = $this->getDataValue('owner-name');
|
||||||
$this->wall_to_wall = true;
|
$this->wall_to_wall = true;
|
||||||
// If it is our contact, use a friendly redirect link
|
// If it is our contact, use a friendly redirect link
|
||||||
if ((link_compare($this->getDataValue('owner-link'), $this->getDataValue('url')))
|
if ($this->getDataValue('network') === NETWORK_DFRN
|
||||||
&& ($this->getDataValue('network') === NETWORK_DFRN)
|
&& link_compare($this->getDataValue('owner-link'), $this->getDataValue('url'))
|
||||||
) {
|
) {
|
||||||
$this->owner_url = $this->getRedirectUrl();
|
$this->owner_url = $this->getRedirectUrl();
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user