Merge pull request #3909 from zeroadam/BaseObject-#3878
Objects moved to src
This commit is contained in:
commit
83861a01cc
7 changed files with 306 additions and 241 deletions
|
@ -1,7 +1,11 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @file include/conversation.php
|
||||
*/
|
||||
use Friendica\App;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Core\Conversation;
|
||||
use Friendica\Core\Item;
|
||||
use Friendica\Core\PConfig;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Database\DBM;
|
||||
|
@ -860,9 +864,6 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
|
|||
// Normal View
|
||||
$page_template = get_markup_template("threaded_conversation.tpl");
|
||||
|
||||
require_once 'object/Conversation.php';
|
||||
require_once 'object/Item.php';
|
||||
|
||||
$conv = new Conversation($mode, $preview);
|
||||
|
||||
/*
|
||||
|
@ -1531,7 +1532,7 @@ function get_responses($conv_responses, $response_verbs, $ob, $item) {
|
|||
if (count($ret[$v]['list']) > MAX_LIKERS) {
|
||||
$ret[$v]['list_part'] = array_slice($ret[$v]['list'], 0, MAX_LIKERS);
|
||||
array_push($ret[$v]['list_part'], '<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 {
|
||||
$ret[$v]['list_part'] = '';
|
||||
}
|
||||
|
|
13
index.php
13
index.php
|
@ -1,26 +1,21 @@
|
|||
<?php
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* @file index.php
|
||||
* Friendica
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
*
|
||||
* bootstrap the application
|
||||
*
|
||||
* Bootstrap the application
|
||||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\BaseObject;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Core\Worker;
|
||||
use Friendica\Database\DBM;
|
||||
|
||||
require_once 'boot.php';
|
||||
require_once 'object/BaseObject.php';
|
||||
|
||||
if (empty($a)) {
|
||||
$a = new App(__DIR__);
|
||||
|
@ -32,11 +27,9 @@ BaseObject::set_app($a);
|
|||
$a->backend = false;
|
||||
|
||||
/**
|
||||
*
|
||||
* Load the configuration file which contains our DB credentials.
|
||||
* Ignore errors. If the file doesn't exist or is empty, we are running in
|
||||
* installation mode.
|
||||
*
|
||||
*/
|
||||
|
||||
$install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false : true);
|
||||
|
|
|
@ -1,35 +0,0 @@
|
|||
<?php
|
||||
if(class_exists('BaseObject'))
|
||||
return;
|
||||
|
||||
require_once('boot.php');
|
||||
|
||||
/**
|
||||
* Basic object
|
||||
*
|
||||
* Contains what is usefull to any object
|
||||
*/
|
||||
class BaseObject {
|
||||
private static $app = null;
|
||||
|
||||
/**
|
||||
* Get the app
|
||||
*
|
||||
* Same as get_app from boot.php
|
||||
*/
|
||||
public function get_app() {
|
||||
if(self::$app)
|
||||
return self::$app;
|
||||
|
||||
self::$app = get_app();
|
||||
|
||||
return self::$app;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the app
|
||||
*/
|
||||
public static function set_app($app) {
|
||||
self::$app = $app;
|
||||
}
|
||||
}
|
|
@ -1,11 +1,15 @@
|
|||
<?php
|
||||
require_once 'boot.php';
|
||||
/**
|
||||
* @file object/TemplateEngine.php
|
||||
*/
|
||||
|
||||
require_once 'boot.php';
|
||||
|
||||
/**
|
||||
* Interface for template engines
|
||||
*/
|
||||
interface ITemplateEngine {
|
||||
interface ITemplateEngine
|
||||
{
|
||||
public function replace_macros($s, $v);
|
||||
public function get_template_file($file, $root = '');
|
||||
}
|
||||
|
|
43
src/Core/BaseObject.php
Normal file
43
src/Core/BaseObject.php
Normal file
|
@ -0,0 +1,43 @@
|
|||
<?php
|
||||
/**
|
||||
* @file src/Core/BaseObject.php
|
||||
*/
|
||||
namespace Friendica\Core;
|
||||
|
||||
require_once 'boot.php';
|
||||
|
||||
/**
|
||||
* Basic object
|
||||
*
|
||||
* Contains what is useful to any object
|
||||
*/
|
||||
class BaseObject
|
||||
{
|
||||
private static $app = null;
|
||||
|
||||
/**
|
||||
* Get the app
|
||||
*
|
||||
* Same as get_app from boot.php
|
||||
*/
|
||||
public function get_app()
|
||||
{
|
||||
if (self::$app) {
|
||||
return self::$app;
|
||||
}
|
||||
|
||||
self::$app = boot::get_app();
|
||||
|
||||
return self::$app;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the app
|
||||
*
|
||||
* @param object $app App
|
||||
*/
|
||||
public static function set_app($app)
|
||||
{
|
||||
self::$app = $app;
|
||||
}
|
||||
}
|
|
@ -1,25 +1,30 @@
|
|||
<?php
|
||||
if(class_exists('Conversation'))
|
||||
return;
|
||||
/**
|
||||
* @file src/Core/Conversation.php
|
||||
*/
|
||||
namespace Friendica\Core;
|
||||
|
||||
require_once('boot.php');
|
||||
require_once('object/BaseObject.php');
|
||||
require_once('object/Item.php');
|
||||
require_once('include/text.php');
|
||||
use Friendica\Core\BaseObject;
|
||||
use Friendica\Core\Item;
|
||||
|
||||
require_once 'boot.php';
|
||||
require_once 'include/text.php';
|
||||
|
||||
/**
|
||||
* A list of threads
|
||||
*
|
||||
* We should think about making this a SPL Iterator
|
||||
*/
|
||||
class Conversation extends BaseObject {
|
||||
class Conversation extends BaseObject
|
||||
{
|
||||
private $threads = array();
|
||||
private $mode = null;
|
||||
private $writable = false;
|
||||
private $profile_owner = 0;
|
||||
private $preview = false;
|
||||
|
||||
public function __construct($mode, $preview) {
|
||||
public function __construct($mode, $preview)
|
||||
{
|
||||
$this->set_mode($mode);
|
||||
$this->preview = $preview;
|
||||
}
|
||||
|
@ -27,9 +32,11 @@ class Conversation extends BaseObject {
|
|||
/**
|
||||
* Set the mode we'll be displayed on
|
||||
*/
|
||||
private function set_mode($mode) {
|
||||
if($this->get_mode() == $mode)
|
||||
private function set_mode($mode)
|
||||
{
|
||||
if ($this->get_mode() == $mode) {
|
||||
return;
|
||||
}
|
||||
|
||||
$a = $this->get_app();
|
||||
|
||||
|
@ -58,28 +65,32 @@ class Conversation extends BaseObject {
|
|||
/**
|
||||
* Get mode
|
||||
*/
|
||||
public function get_mode() {
|
||||
public function get_mode()
|
||||
{
|
||||
return $this->mode;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if page is writable
|
||||
*/
|
||||
public function is_writable() {
|
||||
public function is_writable()
|
||||
{
|
||||
return $this->writable;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if page is a preview
|
||||
*/
|
||||
public function is_preview() {
|
||||
public function is_preview()
|
||||
{
|
||||
return $this->preview;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get profile owner
|
||||
*/
|
||||
public function get_profile_owner() {
|
||||
public function get_profile_owner()
|
||||
{
|
||||
return $this->profile_owner;
|
||||
}
|
||||
|
||||
|
@ -90,30 +101,36 @@ class Conversation extends BaseObject {
|
|||
* _ The inserted item on success
|
||||
* _ false on failure
|
||||
*/
|
||||
public function add_thread($item) {
|
||||
$item_id = $item->get_id();
|
||||
public function add_thread($item)
|
||||
{
|
||||
$item_id = $item->getId();
|
||||
|
||||
if (!$item_id) {
|
||||
logger('[ERROR] Conversation::add_thread : Item has no ID!!', LOGGER_DEBUG);
|
||||
return false;
|
||||
}
|
||||
if($this->get_thread($item->get_id())) {
|
||||
logger('[WARN] Conversation::add_thread : Thread already exists ('. $item->get_id() .').', LOGGER_DEBUG);
|
||||
|
||||
if ($this->get_thread($item->getId())) {
|
||||
logger('[WARN] Conversation::add_thread : Thread already exists ('. $item->getId() .').', LOGGER_DEBUG);
|
||||
return false;
|
||||
}
|
||||
|
||||
/*
|
||||
* Only add will be displayed
|
||||
*/
|
||||
if($item->get_data_value('network') === NETWORK_MAIL && local_user() != $item->get_data_value('uid')) {
|
||||
logger('[WARN] Conversation::add_thread : Thread is a mail ('. $item->get_id() .').', LOGGER_DEBUG);
|
||||
if ($item->getDataValue('network') === NETWORK_MAIL && local_user() != $item->getDataValue('uid')) {
|
||||
logger('[WARN] Conversation::add_thread : Thread is a mail ('. $item->getId() .').', LOGGER_DEBUG);
|
||||
return false;
|
||||
}
|
||||
if($item->get_data_value('verb') === ACTIVITY_LIKE || $item->get_data_value('verb') === ACTIVITY_DISLIKE) {
|
||||
logger('[WARN] Conversation::add_thread : Thread is a (dis)like ('. $item->get_id() .').', LOGGER_DEBUG);
|
||||
|
||||
if ($item->getDataValue('verb') === ACTIVITY_LIKE || $item->getDataValue('verb') === ACTIVITY_DISLIKE) {
|
||||
logger('[WARN] Conversation::add_thread : Thread is a (dis)like ('. $item->getId() .').', LOGGER_DEBUG);
|
||||
return false;
|
||||
}
|
||||
$item->set_conversation($this);
|
||||
|
||||
$item->setConversation($this);
|
||||
$this->threads[] = $item;
|
||||
|
||||
return end($this->threads);
|
||||
}
|
||||
|
||||
|
@ -126,20 +143,21 @@ class Conversation extends BaseObject {
|
|||
* _ The data requested on success
|
||||
* _ false on failure
|
||||
*/
|
||||
public function get_template_data($conv_responses) {
|
||||
public function get_template_data($conv_responses)
|
||||
{
|
||||
$a = get_app();
|
||||
$result = array();
|
||||
|
||||
$i = 0;
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
$item_data = $item->get_template_data($conv_responses);
|
||||
$item_data = $item->getTemplateData($conv_responses);
|
||||
|
||||
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;
|
||||
}
|
||||
$result[] = $item_data;
|
||||
|
@ -155,11 +173,13 @@ class Conversation extends BaseObject {
|
|||
* _ The found item on success
|
||||
* _ false on failure
|
||||
*/
|
||||
private function get_thread($id) {
|
||||
private function get_thread($id)
|
||||
{
|
||||
foreach ($this->threads as $item) {
|
||||
if($item->get_id() == $id)
|
||||
if ($item->getId() == $id) {
|
||||
return $item;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
|
@ -1,20 +1,24 @@
|
|||
<?php
|
||||
if(class_exists('Item'))
|
||||
return;
|
||||
/**
|
||||
* @file src/Core/Item.php
|
||||
*/
|
||||
namespace Friendica\Core;
|
||||
|
||||
use Friendica\Core\BaseObject;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Core\PConfig;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Protocol\Diaspora;
|
||||
use dba;
|
||||
|
||||
require_once('object/BaseObject.php');
|
||||
require_once('include/text.php');
|
||||
require_once('boot.php');
|
||||
require_once 'include/text.php';
|
||||
require_once 'boot.php';
|
||||
|
||||
/**
|
||||
* An item
|
||||
*/
|
||||
class Item extends BaseObject {
|
||||
class Item extends BaseObject
|
||||
{
|
||||
private $data = array();
|
||||
private $template = null;
|
||||
private $available_templates = array(
|
||||
|
@ -35,28 +39,29 @@ class Item extends BaseObject {
|
|||
private $threaded = false;
|
||||
private $visiting = false;
|
||||
|
||||
public function __construct($data) {
|
||||
public function __construct($data)
|
||||
{
|
||||
$a = $this->get_app();
|
||||
|
||||
$this->data = $data;
|
||||
$this->set_template('wall');
|
||||
$this->toplevel = ($this->get_id() == $this->get_data_value('parent'));
|
||||
$this->setTemplate('wall');
|
||||
$this->toplevel = ($this->getId() == $this->getDataValue('parent'));
|
||||
|
||||
if (is_array($_SESSION['remote'])) {
|
||||
foreach ($_SESSION['remote'] as $visitor) {
|
||||
if ($visitor['cid'] == $this->get_data_value('contact-id')) {
|
||||
if ($visitor['cid'] == $this->getDataValue('contact-id')) {
|
||||
$this->visiting = true;
|
||||
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);
|
||||
$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;
|
||||
}
|
||||
|
||||
|
@ -79,7 +84,7 @@ class Item extends BaseObject {
|
|||
|
||||
$item['pagedrop'] = $data['pagedrop'];
|
||||
$child = new Item($item);
|
||||
$this->add_child($child);
|
||||
$this->addChild($child);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -91,14 +96,15 @@ class Item extends BaseObject {
|
|||
* _ The data requested on success
|
||||
* _ false on failure
|
||||
*/
|
||||
public function get_template_data($conv_responses, $thread_level=1) {
|
||||
require_once("mod/proxy.php");
|
||||
public function getTemplateData($conv_responses, $thread_level = 1)
|
||||
{
|
||||
require_once "mod/proxy.php";
|
||||
|
||||
$result = array();
|
||||
|
||||
$a = $this->get_app();
|
||||
|
||||
$item = $this->get_data();
|
||||
$item = $this->getData();
|
||||
$edited = false;
|
||||
// If the time between "created" and "edited" differs we add
|
||||
// a notice that the post was edited.
|
||||
|
@ -122,9 +128,9 @@ class Item extends BaseObject {
|
|||
$indent = '';
|
||||
$shiny = '';
|
||||
$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'])
|
||||
|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
|
||||
|
@ -141,7 +147,7 @@ class Item extends BaseObject {
|
|||
$edpost = false;
|
||||
}
|
||||
|
||||
if (($this->get_data_value('uid') == local_user()) || $this->is_visiting()) {
|
||||
if (($this->getDataValue('uid') == local_user()) || $this->isVisiting()) {
|
||||
$dropping = true;
|
||||
}
|
||||
|
||||
|
@ -198,7 +204,6 @@ class Item extends BaseObject {
|
|||
$hashtags = array();
|
||||
$mentions = array();
|
||||
|
||||
|
||||
/*foreach(explode(',',$item['tag']) as $tag){
|
||||
$tag = trim($tag);
|
||||
if ($tag!="") {
|
||||
|
@ -216,6 +221,7 @@ class Item extends BaseObject {
|
|||
if (feature_enabled($conv->get_profile_owner(), 'dislike')) {
|
||||
$response_verbs[] = 'dislike';
|
||||
}
|
||||
|
||||
if ($item['object-type'] === ACTIVITY_OBJ_EVENT) {
|
||||
$response_verbs[] = 'attendyes';
|
||||
$response_verbs[] = 'attendno';
|
||||
|
@ -237,13 +243,13 @@ class Item extends BaseObject {
|
|||
* 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
|
||||
*/
|
||||
$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';
|
||||
}
|
||||
|
||||
if ($this->is_toplevel()) {
|
||||
if ($this->isToplevel()) {
|
||||
if ($conv->get_profile_owner() == local_user()) {
|
||||
$isstarred = (($item['starred']) ? "starred" : "unstarred");
|
||||
|
||||
|
@ -289,7 +295,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) {
|
||||
$shiny = 'shiny';
|
||||
|
@ -307,14 +313,14 @@ class Item extends BaseObject {
|
|||
$name_e = template_escape($profile_name);
|
||||
$title_e = template_escape($item['title']);
|
||||
$location_e = template_escape($location);
|
||||
$owner_name_e = template_escape($this->get_owner_name());
|
||||
$owner_name_e = template_escape($this->getOwnerName());
|
||||
} else {
|
||||
$body_e = $body;
|
||||
$text_e = strip_tags($body);
|
||||
$name_e = $profile_name;
|
||||
$title_e = $item['title'];
|
||||
$location_e = $location;
|
||||
$owner_name_e = $this->get_owner_name();
|
||||
$owner_name_e = $this->getOwnerName();
|
||||
}
|
||||
|
||||
// Disable features that aren't available in several networks
|
||||
|
@ -334,7 +340,7 @@ class Item extends BaseObject {
|
|||
}
|
||||
|
||||
$tmp_item = array(
|
||||
'template' => $this->get_template(),
|
||||
'template' => $this->getTemplate(),
|
||||
'type' => implode("", array_slice(explode("/", $item['verb']), -1)),
|
||||
'tags' => $item['tags'],
|
||||
'hashtags' => $item['hashtags'],
|
||||
|
@ -347,12 +353,12 @@ class Item extends BaseObject {
|
|||
'folders' => $folders,
|
||||
'body' => $body_e,
|
||||
'text' => $text_e,
|
||||
'id' => $this->get_id(),
|
||||
'id' => $this->getId(),
|
||||
'guid' => urlencode($item['guid']),
|
||||
'isevent' => $isevent,
|
||||
'attend' => $attend,
|
||||
'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'),
|
||||
'via' => t('via'),
|
||||
'wall' => t('Wall-to-Wall'),
|
||||
|
@ -372,7 +378,7 @@ class Item extends BaseObject {
|
|||
'location' => $location_e,
|
||||
'indent' => $indent,
|
||||
'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_name' => htmlentities($owner_name_e),
|
||||
'plink' => get_plink($item),
|
||||
|
@ -406,11 +412,11 @@ class Item extends BaseObject {
|
|||
$result = $arr['output'];
|
||||
|
||||
$result['children'] = array();
|
||||
$children = $this->get_children();
|
||||
$children = $this->getChildren();
|
||||
$nb_children = count($children);
|
||||
if ($nb_children > 0) {
|
||||
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
|
||||
if (($nb_children > 2) || ($thread_level > 1)) {
|
||||
|
@ -427,15 +433,15 @@ class Item extends BaseObject {
|
|||
}
|
||||
}
|
||||
|
||||
if ($this->is_toplevel()) {
|
||||
if ($this->isToplevel()) {
|
||||
$result['total_comments_num'] = "$total_children";
|
||||
$result['total_comments_text'] = tt('comment', 'comments', $total_children);
|
||||
}
|
||||
|
||||
$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['threaded'] = true;
|
||||
} else {
|
||||
|
@ -446,75 +452,85 @@ class Item extends BaseObject {
|
|||
return $result;
|
||||
}
|
||||
|
||||
public function get_id() {
|
||||
return $this->get_data_value('id');
|
||||
public function getId()
|
||||
{
|
||||
return $this->getDataValue('id');
|
||||
}
|
||||
|
||||
public function is_threaded() {
|
||||
public function isThreaded()
|
||||
{
|
||||
return $this->threaded;
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a child item
|
||||
*/
|
||||
public function add_child(Item $item) {
|
||||
$item_id = $item->get_id();
|
||||
public function addChild(Item $item)
|
||||
{
|
||||
$item_id = $item->getId();
|
||||
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;
|
||||
} elseif ($this->get_child($item->get_id())) {
|
||||
logger('[WARN] Item::add_child : Item already exists ('. $item->get_id() .').', LOGGER_DEBUG);
|
||||
} elseif ($this->getChild($item->getId())) {
|
||||
logger('[WARN] Item::addChild : Item already exists ('. $item->getId() .').', LOGGER_DEBUG);
|
||||
return false;
|
||||
}
|
||||
/*
|
||||
* 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;
|
||||
} 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;
|
||||
}
|
||||
|
||||
$item->set_parent($this);
|
||||
$item->setParent($this);
|
||||
$this->children[] = $item;
|
||||
|
||||
return end($this->children);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a child by its ID
|
||||
*/
|
||||
public function get_child($id) {
|
||||
foreach ($this->get_children() as $child) {
|
||||
if ($child->get_id() == $id) {
|
||||
public function getChild($id)
|
||||
{
|
||||
foreach ($this->getChildren() as $child) {
|
||||
if ($child->getId() == $id) {
|
||||
return $child;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all ou children
|
||||
*/
|
||||
public function get_children() {
|
||||
public function getChildren()
|
||||
{
|
||||
return $this->children;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set our parent
|
||||
*/
|
||||
protected function set_parent($item) {
|
||||
$parent = $this->get_parent();
|
||||
protected function setParent($item)
|
||||
{
|
||||
$parent = $this->getParent();
|
||||
if ($parent) {
|
||||
$parent->remove_child($this);
|
||||
$parent->removeChild($this);
|
||||
}
|
||||
|
||||
$this->parent = $item;
|
||||
$this->set_conversation($item->get_conversation());
|
||||
$this->setConversation($item->getConversation());
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove our parent
|
||||
*/
|
||||
protected function remove_parent() {
|
||||
protected function removeParent()
|
||||
{
|
||||
$this->parent = null;
|
||||
$this->conversation = null;
|
||||
}
|
||||
|
@ -522,46 +538,50 @@ class Item extends BaseObject {
|
|||
/**
|
||||
* Remove a child
|
||||
*/
|
||||
public function remove_child($item) {
|
||||
$id = $item->get_id();
|
||||
foreach ($this->get_children() as $key => $child) {
|
||||
if ($child->get_id() == $id) {
|
||||
$child->remove_parent();
|
||||
public function removeChild($item)
|
||||
{
|
||||
$id = $item->getId();
|
||||
foreach ($this->getChildren() as $key => $child) {
|
||||
if ($child->getId() == $id) {
|
||||
$child->removeParent();
|
||||
unset($this->children[$key]);
|
||||
// Reindex the array, in order to make sure there won't be any trouble on loops using count()
|
||||
$this->children = array_values($this->children);
|
||||
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;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get parent item
|
||||
*/
|
||||
protected function get_parent() {
|
||||
protected function getParent()
|
||||
{
|
||||
return $this->parent;
|
||||
}
|
||||
|
||||
/**
|
||||
* set conversation
|
||||
*/
|
||||
public function set_conversation($conv) {
|
||||
public function setConversation($conv)
|
||||
{
|
||||
$previous_mode = ($this->conversation ? $this->conversation->get_mode() : '');
|
||||
|
||||
$this->conversation = $conv;
|
||||
|
||||
// Set it on our children too
|
||||
foreach ($this->get_children() as $child) {
|
||||
$child->set_conversation($conv);
|
||||
foreach ($this->getChildren() as $child) {
|
||||
$child->setConversation($conv);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* get conversation
|
||||
*/
|
||||
public function get_conversation() {
|
||||
public function getConversation()
|
||||
{
|
||||
return $this->conversation;
|
||||
}
|
||||
|
||||
|
@ -570,7 +590,8 @@ class Item extends BaseObject {
|
|||
*
|
||||
* We shouldn't need this
|
||||
*/
|
||||
public function get_data() {
|
||||
public function getData()
|
||||
{
|
||||
return $this->data;
|
||||
}
|
||||
|
||||
|
@ -581,9 +602,10 @@ class Item extends BaseObject {
|
|||
* _ value on success
|
||||
* _ false on failure
|
||||
*/
|
||||
public function get_data_value($name) {
|
||||
public function getDataValue($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;
|
||||
}
|
||||
|
||||
|
@ -593,9 +615,10 @@ class Item extends BaseObject {
|
|||
/**
|
||||
* Set template
|
||||
*/
|
||||
private function set_template($name) {
|
||||
private function setTemplate($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;
|
||||
}
|
||||
|
||||
|
@ -605,22 +628,25 @@ class Item extends BaseObject {
|
|||
/**
|
||||
* Get template
|
||||
*/
|
||||
private function get_template() {
|
||||
private function getTemplate()
|
||||
{
|
||||
return $this->template;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if this is a toplevel post
|
||||
*/
|
||||
private function is_toplevel() {
|
||||
private function isToplevel()
|
||||
{
|
||||
return $this->toplevel;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if this is writable
|
||||
*/
|
||||
private function is_writable() {
|
||||
$conv = $this->get_conversation();
|
||||
private function isWritable()
|
||||
{
|
||||
$conv = $this->getConversation();
|
||||
|
||||
if ($conv) {
|
||||
// This will allow us to comment on wall-to-wall items owned by our friends
|
||||
|
@ -632,7 +658,7 @@ class Item extends BaseObject {
|
|||
}
|
||||
|
||||
// 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;
|
||||
}
|
||||
|
@ -640,21 +666,24 @@ class Item extends BaseObject {
|
|||
/**
|
||||
* Count the total of our descendants
|
||||
*/
|
||||
private function count_descendants() {
|
||||
$children = $this->get_children();
|
||||
private function countDescendants()
|
||||
{
|
||||
$children = $this->getChildren();
|
||||
$total = count($children);
|
||||
if ($total > 0) {
|
||||
foreach ($children as $child) {
|
||||
$total += $child->count_descendants();
|
||||
$total += $child->countDescendants();
|
||||
}
|
||||
}
|
||||
|
||||
return $total;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the template for the comment box
|
||||
*/
|
||||
private function get_comment_box_template() {
|
||||
private function getCommentBoxTemplate()
|
||||
{
|
||||
return $this->comment_box_template;
|
||||
}
|
||||
|
||||
|
@ -665,20 +694,22 @@ class Item extends BaseObject {
|
|||
* _ The comment box string (empty if no comment box)
|
||||
* _ false on failure
|
||||
*/
|
||||
private function get_comment_box($indent) {
|
||||
private function getCommentBox($indent)
|
||||
{
|
||||
$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 '';
|
||||
}
|
||||
|
||||
$comment_box = '';
|
||||
$conv = $this->get_conversation();
|
||||
$template = get_markup_template($this->get_comment_box_template());
|
||||
$conv = $this->getConversation();
|
||||
$template = get_markup_template($this->getCommentBoxTemplate());
|
||||
$ww = '';
|
||||
if ( ($conv->get_mode() === 'network') && $this->is_wall_to_wall() )
|
||||
if (($conv->get_mode() === 'network') && $this->isWallToWall()) {
|
||||
$ww = 'ww';
|
||||
}
|
||||
|
||||
if ($conv->is_writable() && $this->is_writable()) {
|
||||
if ($conv->is_writable() && $this->isWritable()) {
|
||||
$qc = $qcomment = null;
|
||||
|
||||
/*
|
||||
|
@ -689,14 +720,17 @@ class Item extends BaseObject {
|
|||
$qc = ((local_user()) ? PConfig::get(local_user(), 'qcomment', 'words') : null);
|
||||
$qcomment = (($qc) ? explode("\n", $qc) : null);
|
||||
}
|
||||
$comment_box = replace_macros($template,array(
|
||||
|
||||
$comment_box = replace_macros(
|
||||
$template,
|
||||
array(
|
||||
'$return_path' => $a->query_string,
|
||||
'$threaded' => $this->is_threaded(),
|
||||
'$threaded' => $this->isThreaded(),
|
||||
// '$jsreload' => (($conv->get_mode() === 'display') ? $_SESSION['return_url'] : ''),
|
||||
'$jsreload' => '',
|
||||
'$type' => (($conv->get_mode() === 'profile') ? 'wall-comment' : 'net-comment'),
|
||||
'$id' => $this->get_id(),
|
||||
'$parent' => $this->get_id(),
|
||||
'$id' => $this->getId(),
|
||||
'$parent' => $this->getId(),
|
||||
'$qcomment' => $qcomment,
|
||||
'$profile_uid' => $conv->get_profile_owner(),
|
||||
'$mylink' => $a->remove_baseurl($a->contact['url']),
|
||||
|
@ -716,28 +750,30 @@ class Item extends BaseObject {
|
|||
'$indent' => $indent,
|
||||
'$sourceapp' => t($a->sourcename),
|
||||
'$ww' => (($conv->get_mode() === 'network') ? $ww : ''),
|
||||
'$rand_num' => random_digits(12)
|
||||
));
|
||||
'$rand_num' => random_digits(12))
|
||||
);
|
||||
}
|
||||
|
||||
return $comment_box;
|
||||
}
|
||||
|
||||
private function get_redirect_url() {
|
||||
private function getRedirectUrl()
|
||||
{
|
||||
return $this->redirect_url;
|
||||
}
|
||||
|
||||
/**
|
||||
* 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();
|
||||
$conv = $this->get_conversation();
|
||||
$conv = $this->getConversation();
|
||||
$this->wall_to_wall = false;
|
||||
|
||||
if($this->is_toplevel()) {
|
||||
if ($this->isToplevel()) {
|
||||
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.
|
||||
// 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.
|
||||
|
@ -746,14 +782,12 @@ class Item extends BaseObject {
|
|||
$this->owner_photo = $a->page_contact['thumb'];
|
||||
$this->owner_name = $a->page_contact['name'];
|
||||
$this->wall_to_wall = true;
|
||||
} elseif($this->get_data_value('owner-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->get_data_value('alias')) && link_compare($this->get_data_value('alias'),$this->get_data_value('author-link')));
|
||||
$owner_namematch = (($this->get_data_value('owner-name')) && $this->get_data_value('owner-name') == $this->get_data_value('author-name'));
|
||||
} elseif ($this->getDataValue('owner-link')) {
|
||||
$owner_linkmatch = (($this->getDataValue('owner-link')) && link_compare($this->getDataValue('owner-link'), $this->getDataValue('author-link')));
|
||||
$alias_linkmatch = (($this->getDataValue('alias')) && link_compare($this->getDataValue('alias'), $this->getDataValue('author-link')));
|
||||
$owner_namematch = (($this->getDataValue('owner-name')) && $this->getDataValue('owner-name') == $this->getDataValue('author-name'));
|
||||
|
||||
if ((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) {
|
||||
|
||||
// The author url doesn't match the owner (typically the contact)
|
||||
// and also doesn't match the contact alias.
|
||||
// The name match is a hack to catch several weird cases where URLs are
|
||||
|
@ -764,15 +798,16 @@ class Item extends BaseObject {
|
|||
// 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_name = $this->get_data_value('owner-name');
|
||||
$this->owner_photo = $this->getDataValue('owner-avatar');
|
||||
$this->owner_name = $this->getDataValue('owner-name');
|
||||
$this->wall_to_wall = true;
|
||||
// If it is our contact, use a friendly redirect link
|
||||
if ((link_compare($this->get_data_value('owner-link'),$this->get_data_value('url')))
|
||||
&& ($this->get_data_value('network') === NETWORK_DFRN)) {
|
||||
$this->owner_url = $this->get_redirect_url();
|
||||
if ((link_compare($this->getDataValue('owner-link'), $this->getDataValue('url')))
|
||||
&& ($this->getDataValue('network') === NETWORK_DFRN)
|
||||
) {
|
||||
$this->owner_url = $this->getRedirectUrl();
|
||||
} else {
|
||||
$this->owner_url = zrl($this->get_data_value('owner-link'));
|
||||
$this->owner_url = zrl($this->getDataValue('owner-link'));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -780,31 +815,35 @@ class Item extends BaseObject {
|
|||
}
|
||||
|
||||
if (!$this->wall_to_wall) {
|
||||
$this->set_template('wall');
|
||||
$this->setTemplate('wall');
|
||||
$this->owner_url = '';
|
||||
$this->owner_photo = '';
|
||||
$this->owner_name = '';
|
||||
}
|
||||
}
|
||||
|
||||
private function is_wall_to_wall() {
|
||||
private function isWallToWall()
|
||||
{
|
||||
return $this->wall_to_wall;
|
||||
}
|
||||
|
||||
private function get_owner_url() {
|
||||
private function getOwnerUrl()
|
||||
{
|
||||
return $this->owner_url;
|
||||
}
|
||||
|
||||
private function get_owner_photo() {
|
||||
private function getOwnerPhoto()
|
||||
{
|
||||
return $this->owner_photo;
|
||||
}
|
||||
|
||||
private function get_owner_name() {
|
||||
private function getOwnerName()
|
||||
{
|
||||
return $this->owner_name;
|
||||
}
|
||||
|
||||
private function is_visiting() {
|
||||
private function isVisiting()
|
||||
{
|
||||
return $this->visiting;
|
||||
}
|
||||
|
||||
}
|
Loading…
Reference in a new issue