diff --git a/include/conversation.php b/include/conversation.php index 0e814c666..7abe97e06 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1,7 +1,11 @@ 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']) . '">' . t('View all') . ''); } else { $ret[$v]['list_part'] = ''; } diff --git a/index.php b/index.php index 591549890..c31b1adc0 100644 --- a/index.php +++ b/index.php @@ -1,26 +1,21 @@ 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); diff --git a/object/BaseObject.php b/object/BaseObject.php deleted file mode 100644 index 15c7d8dc6..000000000 --- a/object/BaseObject.php +++ /dev/null @@ -1,35 +0,0 @@ -set_mode($mode); $this->preview = $preview; } @@ -27,13 +32,15 @@ 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(); - switch($mode) { + switch ($mode) { case 'network': case 'notes': $this->profile_owner = local_user(); @@ -41,11 +48,11 @@ class Conversation extends BaseObject { break; case 'profile': $this->profile_owner = $a->profile['profile_uid']; - $this->writable = can_write_wall($a,$this->profile_owner); + $this->writable = can_write_wall($a, $this->profile_owner); break; case 'display': $this->profile_owner = $a->profile['uid']; - $this->writable = can_write_wall($a,$this->profile_owner); + $this->writable = can_write_wall($a, $this->profile_owner); break; default: logger('[ERROR] Conversation::set_mode : Unhandled mode ('. $mode .').', LOGGER_DEBUG); @@ -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(); - if(!$item_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')) + foreach ($this->threads as $item) { + 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); + if (!$item_data) { + logger('[ERROR] Conversation::get_template_data : Failed to get item template data ('. $item->getId() .').', LOGGER_DEBUG); return false; } $result[] = $item_data; @@ -155,10 +173,12 @@ class Conversation extends BaseObject { * _ The found item on success * _ false on failure */ - private function get_thread($id) { - foreach($this->threads as $item) { - if($item->get_id() == $id) + private function get_thread($id) + { + foreach ($this->threads as $item) { + if ($item->getId() == $id) { return $item; + } } return false; diff --git a/object/Item.php b/src/Core/Item.php similarity index 67% rename from object/Item.php rename to src/Core/Item.php index 80bbf255d..20d4db005 100644 --- a/object/Item.php +++ b/src/Core/Item.php @@ -1,20 +1,24 @@ 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,16 +128,16 @@ 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'])))) ? t('Private Message') : false); $shareable = ((($conv->get_profile_owner() == local_user()) && ($item['private'] != 1)) ? true : false); - 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) { $edpost = array("events/event/".$item['event-id'], t("Edit")); } else { @@ -141,27 +147,27 @@ 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; } $drop = array( 'dropping' => $dropping, - 'pagedrop' => ((feature_enabled($conv->get_profile_owner(),'multi_delete')) ? $item['pagedrop'] : ''), + 'pagedrop' => ((feature_enabled($conv->get_profile_owner(), 'multi_delete')) ? $item['pagedrop'] : ''), 'select' => t('Select'), 'delete' => t('Delete'), ); $filer = (($conv->get_profile_owner() == local_user()) ? t("save to folder") : false); - $diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true); - $profile_name = htmlentities(((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']); + $diff_author = ((link_compare($item['url'], $item['author-link'])) ? false : true); + $profile_name = htmlentities(((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']); if ($item['author-link'] && (! $item['author-name'])) { $profile_name = $item['author-link']; } $sp = false; - $profile_link = best_link_url($item,$sp); + $profile_link = best_link_url($item, $sp); if ($profile_link === 'mailbox') { $profile_link = ''; } @@ -191,14 +197,13 @@ class Item extends BaseObject { } $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => ''); - call_hooks('render_location',$locate); + call_hooks('render_location', $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!="") { @@ -213,9 +218,10 @@ class Item extends BaseObject { // process action responses - e.g. like/dislike/attend/agree/whatever $response_verbs = array('like'); - if (feature_enabled($conv->get_profile_owner(),'dislike')) { + if (feature_enabled($conv->get_profile_owner(), 'dislike')) { $response_verbs[] = 'dislike'; } + if ($item['object-type'] === ACTIVITY_OBJ_EVENT) { $response_verbs[] = 'attendyes'; $response_verbs[] = 'attendno'; @@ -226,10 +232,10 @@ class Item 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) { - $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']) : ''); + 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']) : ''); } /* @@ -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"); @@ -268,7 +274,7 @@ class Item extends BaseObject { } $tagger = ''; - if(feature_enabled($conv->get_profile_owner(),'commtag')) { + if (feature_enabled($conv->get_profile_owner(), 'commtag')) { $tagger = array( 'add' => t("add tag"), 'class' => "", @@ -282,22 +288,22 @@ class Item extends BaseObject { if ($conv->is_writable()) { $buttons = array( 'like' => array( t("I like this \x28toggle\x29"), t("like")), - 'dislike' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? array( t("I don't like this \x28toggle\x29"), t("dislike")) : ''), + 'dislike' => ((feature_enabled($conv->get_profile_owner(), 'dislike')) ? array( t("I don't like this \x28toggle\x29"), t("dislike")) : ''), ); if ($shareable) { $buttons['share'] = array( t('Share this'), t('share')); } } - $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'; } localize_item($item); - $body = prepare_body($item,true); + $body = prepare_body($item, true); list($categories, $folders) = get_cats_and_terms($item); @@ -307,21 +313,21 @@ 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 /// @todo Add NETWORK_DIASPORA when it will pass this information if (!in_array($item["item_network"], array(NETWORK_DFRN)) && isset($buttons["dislike"])) { - unset($buttons["dislike"],$isevent); + unset($buttons["dislike"], $isevent); $tagger = ''; } @@ -334,8 +340,8 @@ class Item extends BaseObject { } $tmp_item = array( - 'template' => $this->get_template(), - 'type' => implode("",array_slice(explode("/",$item['verb']),-1)), + 'template' => $this->getTemplate(), + 'type' => implode("", array_slice(explode("/", $item['verb']), -1)), 'tags' => $item['tags'], 'hashtags' => $item['hashtags'], 'mentions' => $item['mentions'], @@ -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'])), + '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->getOwnerName()), ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])), 'to' => t('to'), 'via' => t('via'), 'wall' => t('Wall-to-Wall'), @@ -365,23 +371,23 @@ class Item extends BaseObject { 'sparkle' => $sparkle, 'title' => $title_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'])), + 'ago' => (($item['app']) ? sprintf(t('%s from %s'), relative_date($item['created']), $item['app']) : relative_date($item['created'])), 'app' => $item['app'], 'created' => relative_date($item['created']), 'lock' => $lock, '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), - 'edpost' => ((feature_enabled($conv->get_profile_owner(),'edit_posts')) ? $edpost : ''), + 'edpost' => ((feature_enabled($conv->get_profile_owner(), 'edit_posts')) ? $edpost : ''), 'isstarred' => $isstarred, - 'star' => ((feature_enabled($conv->get_profile_owner(),'star_posts')) ? $star : ''), - 'ignore' => ((feature_enabled($conv->get_profile_owner(),'ignore_posts')) ? $ignore : ''), + 'star' => ((feature_enabled($conv->get_profile_owner(), 'star_posts')) ? $star : ''), + 'ignore' => ((feature_enabled($conv->get_profile_owner(), 'ignore_posts')) ? $ignore : ''), 'tagger' => $tagger, - 'filer' => ((feature_enabled($conv->get_profile_owner(),'filing')) ? $filer : ''), + 'filer' => ((feature_enabled($conv->get_profile_owner(), 'filing')) ? $filer : ''), 'drop' => $drop, 'vote' => $buttons, 'like' => $responses['like']['output'], @@ -406,16 +412,16 @@ 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)) { $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'] = sprintf(tt('%d comment', '%d comments', $total_children), $total_children); $result['children'][0]['hidden_comments_num'] = $total_children; $result['children'][0]['hidden_comments_text'] = tt('comment', 'comments', $total_children); $result['children'][0]['hide_text'] = t('show more'); @@ -427,15 +433,15 @@ class Item extends BaseObject { } } - if ($this->is_toplevel()) { - $result['total_comments_num'] = "$total_children"; - $result['total_comments_text'] = tt('comment', 'comments', $total_children); - } + 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(); - if($parent) { - $parent->remove_child($this); + protected function setParent($item) + { + $parent = $this->getParent(); + if ($parent) { + $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,38 +694,43 @@ 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; /* * Hmmm, code depending on the presence of a particular plugin? * This should be better if done by a hook */ - if (in_array('qcomment',$a->plugins)) { - $qc = ((local_user()) ? PConfig::get(local_user(),'qcomment','words') : null); - $qcomment = (($qc) ? explode("\n",$qc) : null); + if (in_array('qcomment', $a->plugins)) { + $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(), -// '$jsreload' => (($conv->get_mode() === 'display') ? $_SESSION['return_url'] : ''), + '$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']), @@ -712,32 +746,34 @@ class Item extends BaseObject { '$edimg' => t('Image'), '$edurl' => t('Link'), '$edvideo' => t('Video'), - '$preview' => ((feature_enabled($conv->get_profile_owner(),'preview')) ? t('Preview') : ''), + '$preview' => ((feature_enabled($conv->get_profile_owner(), 'preview')) ? t('Preview') : ''), '$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($conv->get_mode() !== 'profile') { - if($this->get_data_value('wall') && !$this->get_data_value('self')) { + if ($this->isToplevel()) { + if ($conv->get_mode() !== 'profile') { + 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; } - }