clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Item to src 

object/Item moved to Friendica\Core namespace.
This commit is contained in:
Adam Magness 2017-11-16 15:54:03 -05:00
parent 7c00401c66
commit d127d06388
3 changed files with 200 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/conversation.php
View File

@ -5,6 +5,7 @@
use Friendica\App; use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\Conversation; use Friendica\Core\Conversation;
use Friendica\Core\Item;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
@ -863,8 +864,6 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
// Normal View // Normal View
$page_template = get_markup_template("threaded_conversation.tpl"); $page_template = get_markup_template("threaded_conversation.tpl");
require_once 'object/Item.php';
$conv = new Conversation($mode, $preview); $conv = new Conversation($mode, $preview);
/* /*
@ -1533,7 +1532,7 @@ function get_responses($conv_responses, $response_verbs, $ob, $item) {
if (count($ret[$v]['list']) > MAX_LIKERS) { if (count($ret[$v]['list']) > MAX_LIKERS) {
$ret[$v]['list_part'] = array_slice($ret[$v]['list'], 0, MAX_LIKERS); $ret[$v]['list_part'] = array_slice($ret[$v]['list'], 0, MAX_LIKERS);
array_push($ret[$v]['list_part'], '<a href="#" data-toggle="modal" data-target="#' . $v . 'Modal-' array_push($ret[$v]['list_part'], '<a href="#" data-toggle="modal" data-target="#' . $v . 'Modal-'
. (($ob) ? $ob->get_id() : $item['id']) . '"><b>' . t('View all') . '</b></a>'); . (($ob) ? $ob->getId() : $item['id']) . '"><b>' . t('View all') . '</b></a>');
} else { } else {
$ret[$v]['list_part'] = ''; $ret[$v]['list_part'] = '';
} }

25
src/Core/Conversation.php
View File

@ -9,9 +9,9 @@ if (class_exists('Conversation')) {
} }
use Friendica\Core\BaseObject; use Friendica\Core\BaseObject;
use Friendica\Core\Item;
require_once 'boot.php'; require_once 'boot.php';
require_once 'object/Item.php';
require_once 'include/text.php'; require_once 'include/text.php';
/** /**
@ -107,32 +107,32 @@ class Conversation extends BaseObject
*/ */
public function add_thread($item) public function add_thread($item)
{ {
$item_id = $item->get_id(); $item_id = $item->getId();
if (!$item_id) { if (!$item_id) {
logger('[ERROR] Conversation::add_thread : Item has no ID!!', LOGGER_DEBUG); logger('[ERROR] Conversation::add_thread : Item has no ID!!', LOGGER_DEBUG);
return false; return false;
} }
if ($this->get_thread($item->get_id())) { if ($this->get_thread($item->getId())) {
logger('[WARN] Conversation::add_thread : Thread already exists ('. $item->get_id() .').', LOGGER_DEBUG); logger('[WARN] Conversation::add_thread : Thread already exists ('. $item->getId() .').', LOGGER_DEBUG);
return false; return false;
} }
/* /*
* Only add will be displayed * Only add will be displayed
*/ */
if ($item->get_data_value('network') === NETWORK_MAIL && local_user() != $item->get_data_value('uid')) { if ($item->getDataValue('network') === NETWORK_MAIL && local_user() != $item->getDataValue('uid')) {
logger('[WARN] Conversation::add_thread : Thread is a mail ('. $item->get_id() .').', LOGGER_DEBUG); logger('[WARN] Conversation::add_thread : Thread is a mail ('. $item->getId() .').', LOGGER_DEBUG);
return false; return false;
} }
if ($item->get_data_value('verb') === ACTIVITY_LIKE || $item->get_data_value('verb') === ACTIVITY_DISLIKE) { if ($item->getDataValue('verb') === ACTIVITY_LIKE || $item->getDataValue('verb') === ACTIVITY_DISLIKE) {
logger('[WARN] Conversation::add_thread : Thread is a (dis)like ('. $item->get_id() .').', LOGGER_DEBUG); logger('[WARN] Conversation::add_thread : Thread is a (dis)like ('. $item->getId() .').', LOGGER_DEBUG);
return false; return false;
} }
$item->set_conversation($this); $item->setConversation($this);
$this->threads[] = $item; $this->threads[] = $item;
return end($this->threads); return end($this->threads);
@ -154,13 +154,14 @@ class Conversation extends BaseObject
$i = 0; $i = 0;
foreach ($this->threads as $item) { foreach ($this->threads as $item) {
if($item->get_data_value('network') === NETWORK_MAIL && local_user() != $item->get_data_value('uid')) if ($item->getDataValue('network') === NETWORK_MAIL && local_user() != $item->getDataValue('uid')) {
continue; continue;
}
$item_data = $item->get_template_data($conv_responses); $item_data = $item->get_template_data($conv_responses);
if (!$item_data) { if (!$item_data) {
logger('[ERROR] Conversation::get_template_data : Failed to get item template data ('. $item->get_id() .').', LOGGER_DEBUG); logger('[ERROR] Conversation::get_template_data : Failed to get item template data ('. $item->getId() .').', LOGGER_DEBUG);
return false; return false;
} }
$result[] = $item_data; $result[] = $item_data;
@ -179,7 +180,7 @@ class Conversation extends BaseObject
private function get_thread($id) private function get_thread($id)
{ {
foreach ($this->threads as $item) { foreach ($this->threads as $item) {
if ($item->get_id() == $id) { if ($item->getId() == $id) {
return $item; return $item;
} }
} }

265
object/Item.php → src/Core/Item.php
View File

@ -1,7 +1,9 @@
<?php <?php
/** /**
* @file object/Item.php * @file src/Core/Item.php
*/ */
namespace Friendica\Core;
if (class_exists('Item')) { if (class_exists('Item')) {
return; return;
} }
@ -11,6 +13,7 @@ use Friendica\Core\Config;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Protocol\Diaspora; use Friendica\Protocol\Diaspora;
use dba;
require_once 'include/text.php'; require_once 'include/text.php';
require_once 'boot.php'; require_once 'boot.php';
@ -18,7 +21,8 @@ require_once 'boot.php';
/** /**
* An item * An item
*/ */
class Item extends BaseObject { class Item extends BaseObject
{
private $data = array(); private $data = array();
private $template = null; private $template = null;
private $available_templates = array( private $available_templates = array(
@ -39,28 +43,29 @@ class Item extends BaseObject {
private $threaded = false; private $threaded = false;
private $visiting = false; private $visiting = false;
public function __construct($data) { public function __construct($data)
{
$a = $this->get_app(); $a = $this->get_app();
$this->data = $data; $this->data = $data;
$this->set_template('wall'); $this->setTemplate('wall');
$this->toplevel = ($this->get_id() == $this->get_data_value('parent')); $this->toplevel = ($this->getId() == $this->getDataValue('parent'));
if (is_array($_SESSION['remote'])) { if (is_array($_SESSION['remote'])) {
foreach ($_SESSION['remote'] as $visitor) { foreach ($_SESSION['remote'] as $visitor) {
if ($visitor['cid'] == $this->get_data_value('contact-id')) { if ($visitor['cid'] == $this->getDataValue('contact-id')) {
$this->visiting = true; $this->visiting = true;
break; break;
} }
} }
} }
$this->writable = ($this->get_data_value('writable') || $this->get_data_value('self')); $this->writable = ($this->getDataValue('writable') || $this->getDataValue('self'));
$ssl_state = ((local_user()) ? true : false); $ssl_state = ((local_user()) ? true : false);
$this->redirect_url = 'redir/' . $this->get_data_value('cid') ; $this->redirect_url = 'redir/' . $this->getDataValue('cid');
if (Config::get('system','thread_allow') && $a->theme_thread_allow && !$this->is_toplevel()) { if (Config::get('system', 'thread_allow') && $a->theme_thread_allow && !$this->isToplevel()) {
$this->threaded = true; $this->threaded = true;
} }
@ -83,7 +88,7 @@ class Item extends BaseObject {
$item['pagedrop'] = $data['pagedrop']; $item['pagedrop'] = $data['pagedrop'];
$child = new Item($item); $child = new Item($item);
$this->add_child($child); $this->addChild($child);
} }
} }
} }
@ -95,14 +100,15 @@ class Item extends BaseObject {
* _ The data requested on success * _ The data requested on success
* _ false on failure * _ false on failure
*/ */
public function get_template_data($conv_responses, $thread_level=1) { public function getTemplateData($conv_responses, $thread_level = 1)
require_once("mod/proxy.php"); {
require_once "mod/proxy.php";
$result = array(); $result = array();
$a = $this->get_app(); $a = $this->get_app();
$item = $this->get_data(); $item = $this->getData();
$edited = false; $edited = false;
// If the time between "created" and "edited" differs we add // If the time between "created" and "edited" differs we add
// a notice that the post was edited. // a notice that the post was edited.
@ -126,9 +132,9 @@ class Item extends BaseObject {
$indent = ''; $indent = '';
$shiny = ''; $shiny = '';
$osparkle = ''; $osparkle = '';
$total_children = $this->count_descendants(); $total_children = $this->countDescendants();
$conv = $this->get_conversation(); $conv = $this->getConversation();
$lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) $lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
|| strlen($item['deny_cid']) || strlen($item['deny_gid'])))) || strlen($item['deny_cid']) || strlen($item['deny_gid']))))
@ -145,7 +151,7 @@ class Item extends BaseObject {
$edpost = false; $edpost = false;
} }
if (($this->get_data_value('uid') == local_user()) || $this->is_visiting()) { if (($this->getDataValue('uid') == local_user()) || $this->isVisiting()) {
$dropping = true; $dropping = true;
} }
@ -202,7 +208,6 @@ class Item extends BaseObject {
$hashtags = array(); $hashtags = array();
$mentions = array(); $mentions = array();
/*foreach(explode(',',$item['tag']) as $tag){ /*foreach(explode(',',$item['tag']) as $tag){
$tag = trim($tag); $tag = trim($tag);
if ($tag!="") { if ($tag!="") {
@ -220,6 +225,7 @@ class Item extends BaseObject {
if (feature_enabled($conv->get_profile_owner(), 'dislike')) { if (feature_enabled($conv->get_profile_owner(), 'dislike')) {
$response_verbs[] = 'dislike'; $response_verbs[] = 'dislike';
} }
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';
@ -241,13 +247,13 @@ class Item extends BaseObject {
* And the conv mode may change when we change the conv, or it changes its mode * And the conv mode may change when we change the conv, or it changes its mode
* Maybe we should establish a way to be notified about conversation changes * Maybe we should establish a way to be notified about conversation changes
*/ */
$this->check_wall_to_wall(); $this->checkWallToWall();
if ($this->is_wall_to_wall() && ($this->get_owner_url() == $this->get_redirect_url())) { if ($this->isWallToWall() && ($this->getOwnerUrl() == $this->getRedirectUrl())) {
$osparkle = ' sparkle'; $osparkle = ' sparkle';
} }
if ($this->is_toplevel()) { if ($this->isToplevel()) {
if ($conv->get_profile_owner() == local_user()) { if ($conv->get_profile_owner() == local_user()) {
$isstarred = (($item['starred']) ? "starred" : "unstarred"); $isstarred = (($item['starred']) ? "starred" : "unstarred");
@ -293,7 +299,7 @@ class Item extends BaseObject {
} }
} }
$comment = $this->get_comment_box($indent); $comment = $this->getCommentBox($indent);
if (strcmp(datetime_convert('UTC', 'UTC', $item['created']), datetime_convert('UTC', 'UTC', 'now - 12 hours')) > 0) { if (strcmp(datetime_convert('UTC', 'UTC', $item['created']), datetime_convert('UTC', 'UTC', 'now - 12 hours')) > 0) {
$shiny = 'shiny'; $shiny = 'shiny';
@ -311,14 +317,14 @@ class Item extends BaseObject {
$name_e = template_escape($profile_name); $name_e = template_escape($profile_name);
$title_e = template_escape($item['title']); $title_e = template_escape($item['title']);
$location_e = template_escape($location); $location_e = template_escape($location);
$owner_name_e = template_escape($this->get_owner_name()); $owner_name_e = template_escape($this->getOwnerName());
} else { } else {
$body_e = $body; $body_e = $body;
$text_e = strip_tags($body); $text_e = strip_tags($body);
$name_e = $profile_name; $name_e = $profile_name;
$title_e = $item['title']; $title_e = $item['title'];
$location_e = $location; $location_e = $location;
$owner_name_e = $this->get_owner_name(); $owner_name_e = $this->getOwnerName();
} }
// Disable features that aren't available in several networks // Disable features that aren't available in several networks
@ -338,7 +344,7 @@ class Item extends BaseObject {
} }
$tmp_item = array( $tmp_item = array(
'template' => $this->get_template(), 'template' => $this->getTemplate(),
'type' => implode("", array_slice(explode("/", $item['verb']), -1)), 'type' => implode("", array_slice(explode("/", $item['verb']), -1)),
'tags' => $item['tags'], 'tags' => $item['tags'],
'hashtags' => $item['hashtags'], 'hashtags' => $item['hashtags'],
@ -351,12 +357,12 @@ class Item extends BaseObject {
'folders' => $folders, 'folders' => $folders,
'body' => $body_e, 'body' => $body_e,
'text' => $text_e, 'text' => $text_e,
'id' => $this->get_id(), 'id' => $this->getId(),
'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' => sprintf(t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
'olinktitle' => sprintf( t('View %s\'s profile @ %s'), htmlentities($this->get_owner_name()), ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])), 'olinktitle' => sprintf(t('View %s\'s profile @ %s'), htmlentities($this->getOwnerName()), ((strlen($item['owner-link'])) ? $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'),
@ -376,7 +382,7 @@ class Item extends BaseObject {
'location' => $location_e, 'location' => $location_e,
'indent' => $indent, 'indent' => $indent,
'shiny' => $shiny, 'shiny' => $shiny,
'owner_url' => $this->get_owner_url(), 'owner_url' => $this->getOwnerUrl(),
'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),
@ -410,11 +416,11 @@ class Item extends BaseObject {
$result = $arr['output']; $result = $arr['output'];
$result['children'] = array(); $result['children'] = array();
$children = $this->get_children(); $children = $this->getChildren();
$nb_children = count($children); $nb_children = count($children);
if ($nb_children > 0) { if ($nb_children > 0) {
foreach ($children as $child) { foreach ($children as $child) {
$result['children'][] = $child->get_template_data($conv_responses, $thread_level + 1); $result['children'][] = $child->getTemplateData($conv_responses, $thread_level + 1);
} }
// Collapse // Collapse
if (($nb_children > 2) || ($thread_level > 1)) { if (($nb_children > 2) || ($thread_level > 1)) {
@ -431,15 +437,15 @@ class Item extends BaseObject {
} }
} }
if ($this->is_toplevel()) { if ($this->isToplevel()) {
$result['total_comments_num'] = "$total_children"; $result['total_comments_num'] = "$total_children";
$result['total_comments_text'] = tt('comment', 'comments', $total_children); $result['total_comments_text'] = tt('comment', 'comments', $total_children);
} }
$result['private'] = $item['private']; $result['private'] = $item['private'];
$result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : ''); $result['toplevel'] = ($this->isToplevel() ? 'toplevel_item' : '');
if ($this->is_threaded()) { if ($this->isThreaded()) {
$result['flatten'] = false; $result['flatten'] = false;
$result['threaded'] = true; $result['threaded'] = true;
} else { } else {
@ -450,75 +456,85 @@ class Item extends BaseObject {
return $result; return $result;
} }
public function get_id() { public function getId()
return $this->get_data_value('id'); {
return $this->getDataValue('id');
} }
public function is_threaded() { public function isThreaded()
{
return $this->threaded; return $this->threaded;
} }
/** /**
* Add a child item * Add a child item
*/ */
public function add_child(Item $item) { public function addChild(Item $item)
$item_id = $item->get_id(); {
$item_id = $item->getId();
if (!$item_id) { if (!$item_id) {
logger('[ERROR] Item::add_child : Item has no ID!!', LOGGER_DEBUG); logger('[ERROR] Item::addChild : Item has no ID!!', LOGGER_DEBUG);
return false; return false;
} elseif ($this->get_child($item->get_id())) { } elseif ($this->getChild($item->getId())) {
logger('[WARN] Item::add_child : Item already exists ('. $item->get_id() .').', LOGGER_DEBUG); logger('[WARN] Item::addChild : Item already exists ('. $item->getId() .').', LOGGER_DEBUG);
return false; return false;
} }
/* /*
* Only add what will be displayed * Only add what will be displayed
*/ */
if ($item->get_data_value('network') === NETWORK_MAIL && local_user() != $item->get_data_value('uid')) { if ($item->getDataValue('network') === NETWORK_MAIL && local_user() != $item->getDataValue('uid')) {
return false; return false;
} elseif (activity_match($item->get_data_value('verb'),ACTIVITY_LIKE) || activity_match($item->get_data_value('verb'),ACTIVITY_DISLIKE)) { } elseif (activity_match($item->getDataValue('verb'), ACTIVITY_LIKE) || activity_match($item->getDataValue('verb'), ACTIVITY_DISLIKE)) {
return false; return false;
} }
$item->set_parent($this); $item->setParent($this);
$this->children[] = $item; $this->children[] = $item;
return end($this->children); return end($this->children);
} }
/** /**
* Get a child by its ID * Get a child by its ID
*/ */
public function get_child($id) { public function getChild($id)
foreach ($this->get_children() as $child) { {
if ($child->get_id() == $id) { foreach ($this->getChildren() as $child) {
if ($child->getId() == $id) {
return $child; return $child;
} }
} }
return null; return null;
} }
/** /**
* Get all ou children * Get all ou children
*/ */
public function get_children() { public function getChildren()
{
return $this->children; return $this->children;
} }
/** /**
* Set our parent * Set our parent
*/ */
protected function set_parent($item) { protected function setParent($item)
$parent = $this->get_parent(); {
$parent = $this->getParent();
if ($parent) { if ($parent) {
$parent->remove_child($this); $parent->removeChild($this);
} }
$this->parent = $item; $this->parent = $item;
$this->set_conversation($item->get_conversation()); $this->setConversation($item->getConversation());
} }
/** /**
* Remove our parent * Remove our parent
*/ */
protected function remove_parent() { protected function removeParent()
{
$this->parent = null; $this->parent = null;
$this->conversation = null; $this->conversation = null;
} }
@ -526,46 +542,50 @@ class Item extends BaseObject {
/** /**
* Remove a child * Remove a child
*/ */
public function remove_child($item) { public function removeChild($item)
$id = $item->get_id(); {
foreach ($this->get_children() as $key => $child) { $id = $item->getId();
if ($child->get_id() == $id) { foreach ($this->getChildren() as $key => $child) {
$child->remove_parent(); if ($child->getId() == $id) {
$child->removeParent();
unset($this->children[$key]); unset($this->children[$key]);
// Reindex the array, in order to make sure there won't be any trouble on loops using count() // Reindex the array, in order to make sure there won't be any trouble on loops using count()
$this->children = array_values($this->children); $this->children = array_values($this->children);
return true; return true;
} }
} }
logger('[WARN] Item::remove_child : Item is not a child ('. $id .').', LOGGER_DEBUG); logger('[WARN] Item::removeChild : Item is not a child ('. $id .').', LOGGER_DEBUG);
return false; return false;
} }
/** /**
* Get parent item * Get parent item
*/ */
protected function get_parent() { protected function getParent()
{
return $this->parent; return $this->parent;
} }
/** /**
* set conversation * set conversation
*/ */
public function set_conversation($conv) { public function setConversation($conv)
{
$previous_mode = ($this->conversation ? $this->conversation->get_mode() : ''); $previous_mode = ($this->conversation ? $this->conversation->get_mode() : '');
$this->conversation = $conv; $this->conversation = $conv;
// Set it on our children too // Set it on our children too
foreach ($this->get_children() as $child) { foreach ($this->getChildren() as $child) {
$child->set_conversation($conv); $child->setConversation($conv);
} }
} }
/** /**
* get conversation * get conversation
*/ */
public function get_conversation() { public function getConversation()
{
return $this->conversation; return $this->conversation;
} }
@ -574,7 +594,8 @@ class Item extends BaseObject {
* *
* We shouldn't need this * We shouldn't need this
*/ */
public function get_data() { public function getData()
{
return $this->data; return $this->data;
} }
@ -585,9 +606,10 @@ class Item extends BaseObject {
* _ value on success * _ value on success
* _ false on failure * _ false on failure
*/ */
public function get_data_value($name) { public function getDataValue($name)
{
if (!isset($this->data[$name])) { if (!isset($this->data[$name])) {
// logger('[ERROR] Item::get_data_value : Item has no value name "'. $name .'".', LOGGER_DEBUG); // logger('[ERROR] Item::getDataValue : Item has no value name "'. $name .'".', LOGGER_DEBUG);
return false; return false;
} }
@ -597,9 +619,10 @@ class Item extends BaseObject {
/** /**
* Set template * Set template
*/ */
private function set_template($name) { private function setTemplate($name)
{
if (!x($this->available_templates, $name)) { if (!x($this->available_templates, $name)) {
logger('[ERROR] Item::set_template : Template not available ("'. $name .'").', LOGGER_DEBUG); logger('[ERROR] Item::setTemplate : Template not available ("'. $name .'").', LOGGER_DEBUG);
return false; return false;
} }
@ -609,22 +632,25 @@ class Item extends BaseObject {
/** /**
* Get template * Get template
*/ */
private function get_template() { private function getTemplate()
{
return $this->template; return $this->template;
} }
/** /**
* Check if this is a toplevel post * Check if this is a toplevel post
*/ */
private function is_toplevel() { private function isToplevel()
{
return $this->toplevel; return $this->toplevel;
} }
/** /**
* Check if this is writable * Check if this is writable
*/ */
private function is_writable() { private function isWritable()
$conv = $this->get_conversation(); {
$conv = $this->getConversation();
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
@ -636,7 +662,7 @@ class Item extends BaseObject {
} }
// this fixes for visitors // this fixes for visitors
return ($this->writable || ($this->is_visiting() && $conv->get_mode() == 'profile')); return ($this->writable || ($this->isVisiting() && $conv->get_mode() == 'profile'));
} }
return $this->writable; return $this->writable;
} }
@ -644,21 +670,24 @@ class Item extends BaseObject {
/** /**
* Count the total of our descendants * Count the total of our descendants
*/ */
private function count_descendants() { private function countDescendants()
$children = $this->get_children(); {
$children = $this->getChildren();
$total = count($children); $total = count($children);
if ($total > 0) { if ($total > 0) {
foreach ($children as $child) { foreach ($children as $child) {
$total += $child->count_descendants(); $total += $child->countDescendants();
} }
} }
return $total; return $total;
} }
/** /**
* Get the template for the comment box * Get the template for the comment box
*/ */
private function get_comment_box_template() { private function getCommentBoxTemplate()
{
return $this->comment_box_template; return $this->comment_box_template;
} }
@ -669,20 +698,22 @@ class Item extends BaseObject {
* _ The comment box string (empty if no comment box) * _ The comment box string (empty if no comment box)
* _ false on failure * _ false on failure
*/ */
private function get_comment_box($indent) { private function getCommentBox($indent)
{
$a = $this->get_app(); $a = $this->get_app();
if (!$this->is_toplevel() && !(Config::get('system','thread_allow') && $a->theme_thread_allow)) { if (!$this->isToplevel() && !(Config::get('system', 'thread_allow') && $a->theme_thread_allow)) {
return ''; return '';
} }
$comment_box = ''; $comment_box = '';
$conv = $this->get_conversation(); $conv = $this->getConversation();
$template = get_markup_template($this->get_comment_box_template()); $template = get_markup_template($this->getCommentBoxTemplate());
$ww = ''; $ww = '';
if ( ($conv->get_mode() === 'network') && $this->is_wall_to_wall() ) if (($conv->get_mode() === 'network') && $this->isWallToWall()) {
$ww = 'ww'; $ww = 'ww';
}
if ($conv->is_writable() && $this->is_writable()) { if ($conv->is_writable() && $this->isWritable()) {
$qc = $qcomment = null; $qc = $qcomment = null;
/* /*
@ -693,14 +724,17 @@ class Item extends BaseObject {
$qc = ((local_user()) ? PConfig::get(local_user(), 'qcomment', 'words') : null); $qc = ((local_user()) ? PConfig::get(local_user(), 'qcomment', 'words') : null);
$qcomment = (($qc) ? explode("\n", $qc) : null); $qcomment = (($qc) ? explode("\n", $qc) : null);
} }
$comment_box = replace_macros($template,array(
$comment_box = replace_macros(
$template,
array(
'$return_path' => $a->query_string, '$return_path' => $a->query_string,
'$threaded' => $this->is_threaded(), '$threaded' => $this->isThreaded(),
// '$jsreload' => (($conv->get_mode() === 'display') ? $_SESSION['return_url'] : ''), // '$jsreload' => (($conv->get_mode() === 'display') ? $_SESSION['return_url'] : ''),
'$jsreload' => '', '$jsreload' => '',
'$type' => (($conv->get_mode() === 'profile') ? 'wall-comment' : 'net-comment'), '$type' => (($conv->get_mode() === 'profile') ? 'wall-comment' : 'net-comment'),
'$id' => $this->get_id(), '$id' => $this->getId(),
'$parent' => $this->get_id(), '$parent' => $this->getId(),
'$qcomment' => $qcomment, '$qcomment' => $qcomment,
'$profile_uid' => $conv->get_profile_owner(), '$profile_uid' => $conv->get_profile_owner(),
'$mylink' => $a->remove_baseurl($a->contact['url']), '$mylink' => $a->remove_baseurl($a->contact['url']),
@ -720,28 +754,30 @@ class Item extends BaseObject {
'$indent' => $indent, '$indent' => $indent,
'$sourceapp' => t($a->sourcename), '$sourceapp' => t($a->sourcename),
'$ww' => (($conv->get_mode() === 'network') ? $ww : ''), '$ww' => (($conv->get_mode() === 'network') ? $ww : ''),
'$rand_num' => random_digits(12) '$rand_num' => random_digits(12))
)); );
} }
return $comment_box; return $comment_box;
} }
private function get_redirect_url() { private function getRedirectUrl()
{
return $this->redirect_url; return $this->redirect_url;
} }
/** /**
* Check if we are a wall to wall item and set the relevant properties * Check if we are a wall to wall item and set the relevant properties
*/ */
protected function check_wall_to_wall() { protected function checkWallToWall()
{
$a = $this->get_app(); $a = $this->get_app();
$conv = $this->get_conversation(); $conv = $this->getConversation();
$this->wall_to_wall = false; $this->wall_to_wall = false;
if($this->is_toplevel()) { if ($this->isToplevel()) {
if ($conv->get_mode() !== 'profile') { if ($conv->get_mode() !== 'profile') {
if($this->get_data_value('wall') && !$this->get_data_value('self')) { if ($this->getDataValue('wall') && !$this->getDataValue('self')) {
// On the network page, I am the owner. On the display page it will be the profile owner. // On the network page, I am the owner. On the display page it will be the profile owner.
// This will have been stored in $a->page_contact by our calling page. // This will have been stored in $a->page_contact by our calling page.
// Put this person as the wall owner of the wall-to-wall notice. // Put this person as the wall owner of the wall-to-wall notice.
@ -750,14 +786,12 @@ class Item extends BaseObject {
$this->owner_photo = $a->page_contact['thumb']; $this->owner_photo = $a->page_contact['thumb'];
$this->owner_name = $a->page_contact['name']; $this->owner_name = $a->page_contact['name'];
$this->wall_to_wall = true; $this->wall_to_wall = true;
} elseif($this->get_data_value('owner-link')) { } elseif ($this->getDataValue('owner-link')) {
$owner_linkmatch = (($this->getDataValue('owner-link')) && link_compare($this->getDataValue('owner-link'), $this->getDataValue('author-link')));
$owner_linkmatch = (($this->get_data_value('owner-link')) && link_compare($this->get_data_value('owner-link'),$this->get_data_value('author-link'))); $alias_linkmatch = (($this->getDataValue('alias')) && link_compare($this->getDataValue('alias'), $this->getDataValue('author-link')));
$alias_linkmatch = (($this->get_data_value('alias')) && link_compare($this->get_data_value('alias'),$this->get_data_value('author-link'))); $owner_namematch = (($this->getDataValue('owner-name')) && $this->getDataValue('owner-name') == $this->getDataValue('author-name'));
$owner_namematch = (($this->get_data_value('owner-name')) && $this->get_data_value('owner-name') == $this->get_data_value('author-name'));
if ((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) { if ((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) {
// The author url doesn't match the owner (typically the contact) // The author url doesn't match the owner (typically the contact)
// and also doesn't match the contact alias. // and also doesn't match the contact alias.
// The name match is a hack to catch several weird cases where URLs are // The name match is a hack to catch several weird cases where URLs are
@ -768,15 +802,16 @@ class Item extends BaseObject {
// 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.
$this->owner_photo = $this->get_data_value('owner-avatar'); $this->owner_photo = $this->getDataValue('owner-avatar');
$this->owner_name = $this->get_data_value('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->get_data_value('owner-link'),$this->get_data_value('url'))) if ((link_compare($this->getDataValue('owner-link'), $this->getDataValue('url')))
&& ($this->get_data_value('network') === NETWORK_DFRN)) { && ($this->getDataValue('network') === NETWORK_DFRN)
$this->owner_url = $this->get_redirect_url(); ) {
$this->owner_url = $this->getRedirectUrl();
} else { } else {
$this->owner_url = zrl($this->get_data_value('owner-link')); $this->owner_url = zrl($this->getDataValue('owner-link'));
} }
} }
} }
@ -784,31 +819,35 @@ class Item extends BaseObject {
} }
if (!$this->wall_to_wall) { if (!$this->wall_to_wall) {
$this->set_template('wall'); $this->setTemplate('wall');
$this->owner_url = ''; $this->owner_url = '';
$this->owner_photo = ''; $this->owner_photo = '';
$this->owner_name = ''; $this->owner_name = '';
} }
} }
private function is_wall_to_wall() { private function isWallToWall()
{
return $this->wall_to_wall; return $this->wall_to_wall;
} }
private function get_owner_url() { private function getOwnerUrl()
{
return $this->owner_url; return $this->owner_url;
} }
private function get_owner_photo() { private function getOwnerPhoto()
{
return $this->owner_photo; return $this->owner_photo;
} }
private function get_owner_name() { private function getOwnerName()
{
return $this->owner_name; return $this->owner_name;
} }
private function is_visiting() { private function isVisiting()
{
return $this->visiting; return $this->visiting;
} }
} }