]> git.mxchange.org Git - friendica.git/commitdiff
Rendering is now done by Item objects
authorDomovoy <domovoy@errlock.org>
Fri, 10 Aug 2012 17:57:39 +0000 (19:57 +0200)
committerDomovoy <domovoy@errlock.org>
Fri, 10 Aug 2012 17:57:39 +0000 (19:57 +0200)
include/conversation.php
index.php
object/BaseObject.php [new file with mode: 0644]
object/Conversation.php
object/Item.php

index 8468c72290f7c08f01e28cca2c2f3a6454029a58..7d9dfa1e74bb874d064e6c7659c79d330563fef6 100644 (file)
@@ -837,7 +837,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                        require_once('object/Conversation.php');
                        require_once('object/Item.php');
 
-                       $conv = new Conversation();
+                       $conv = new Conversation($mode);
 
                        // get all the topmost parents
                        // this shouldn't be needed, as we should have only them in our array
@@ -853,11 +853,12 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                        }
 
                        //$threads = prepare_threads_body($a, $threads, $cmnt_tpl, $page_writeable, $mode, $profile_owner);
-                       $threads = $conv->get_template_data($a, $cmnt_tpl, $page_writeable, $mode, $profile_owner);
+                       $threads = $conv->get_template_data($cmnt_tpl);
                        if(!$threads) {
                                logger('[ERROR] conversation : Failed to get template data.', LOGGER_DEBUG);
                                $threads = array();
                        }
+                       logger('[DEBUG] conversation : $threads = '. print_r($threads, true), LOGGER_DEBUG);
                }
        }
                
index c9b7f34d72ac14719dad0db5d567f08a085df060..eaa7295e26cd8e565e8097410a749c2bf11c4df4 100644 (file)
--- a/index.php
+++ b/index.php
  */
 
 require_once('boot.php');
+require_once('object/BaseObject.php');
 
 $a = new App;
+BaseObject::set_app($a);
 
 /**
  *
diff --git a/object/BaseObject.php b/object/BaseObject.php
new file mode 100644 (file)
index 0000000..14f0d8f
--- /dev/null
@@ -0,0 +1,37 @@
+<?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;
+
+               global $a;
+               self::$app = $a;
+
+               return self::$app;
+       }
+
+       /**
+        * Set the app
+        */
+       public static function set_app($app) {
+               self::$app = $app;
+       }
+}
+?>
index 4154dd9cb69ad463d6ef282fab92bcd025d93307..0ce016649bc110c02bd3ba7baa23ff7fd0e7d32c 100644 (file)
@@ -2,6 +2,8 @@
 if(class_exists('Conversation'))
        return;
 
+require_once('boot.php');
+require_once('object/BaseObject.php');
 require_once('object/Item.php');
 require_once('include/text.php');
 
@@ -10,8 +12,13 @@ require_once('include/text.php');
  *
  * We should think about making this a SPL Iterator
  */
-class Conversation {
+class Conversation extends BaseObject {
        private $threads = array();
+       private $mode = null;
+
+       public function __construct($mode) {
+               $this->mode = $mode;
+       }
 
        /**
         * Add a thread to the conversation
@@ -43,26 +50,19 @@ class Conversation {
         *              _ The data requested on success
         *              _ false on failure
         */
-       public function get_template_data($a, $cmnt_tpl, $page_writeable, $mode, $profile_owner) {
+       public function get_template_data($cmnt_tpl) {
                $result = array();
 
-               /*foreach($this->threads as $item) {
-                       $item_data = $item->get_template_data();
+               foreach($this->threads as $item) {
+                       if($item->get_network() === NETWORK_MAIL && local_user() != $item->get_uid())
+                               continue;
+                       $item_data = $item->get_template_data($cmnt_tpl, $this->mode);
                        if(!$item_data) {
                                logger('[ERROR] Conversation::get_template_data : Failed to get item template data ('. $item->get_id() .').', LOGGER_DEBUG);
                                return false;
                        }
                        $result[] = $item_data;
-               }*/
-
-               /*
-                * This should be moved on the item object;
-                */
-               $threads = array();
-               foreach($this->threads as $item) {
-                       $threads[] = $item->get_data();
                }
-               return $this->prepare_threads_body($a, $threads, $cmnt_tpl, $page_writeable, $mode, $profile_owner);
 
                return $result;
        }
@@ -75,325 +75,12 @@ class Conversation {
         *              _ false on failure
         */
        private function get_thread($id) {
-       foreach($this->threads as $item) {
-               if($item->get_id() == $id)
-                       return $item;
-       }
-
-       return false;
-       }
-
-       /**
-        * Recursively prepare a thread for HTML
-        */
-
-       private function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $profile_owner, $thread_level=1) {
-               $result = array();
-
-               $wall_template = 'wall_thread.tpl';
-               $wallwall_template = 'wallwall_thread.tpl';
-               $items_seen = 0;
-               $nb_items = count($items);
-               
-               $total_children = $nb_items;
-               
-               foreach($items as $item) {
-                       // prevent private email reply to public conversation from leaking.
-                       if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
-                               // Don't count it as a visible item
-                               $nb_items--;
-                               continue;
-                       }
-                       
-                       $items_seen++;
-                       
-                       $alike = array();
-                       $dlike = array();
-                       $comment = '';
-                       $template = $wall_template;
-                       $commentww = '';
-                       $sparkle = '';
-                       $owner_url = $owner_photo = $owner_name = '';
-                       $buttons = '';
-                       $dropping = false;
-                       $star = false;
-                       $isstarred = "unstarred";
-                       $photo = $item['photo'];
-                       $thumb = $item['thumb'];
-                       $indent = '';
-                       $osparkle = '';
-                       $lastcollapsed = false;
-                       $firstcollapsed = false;
-                       $total_children += count_descendants($item);
-
-                       $toplevelpost = (($item['id'] == $item['parent']) ? true : false);
-                       $item_writeable = (($item['writable'] || $item['self']) ? true : false);
-                       $show_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
-                       $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);
-                       $redirect_url = $a->get_baseurl($ssl_state) . '/redir/' . $item['cid'] ;
-                       $shareable = ((($profile_owner == local_user()) && ($item['private'] != 1)) ? true : false);
-                       if(local_user() && link_compare($a->contact['url'],$item['author-link']))
-                               $edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"));
-                       else
-                               $edpost = false;
-                       if((intval($item['contact-id']) && $item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
-                               $dropping = true;
-
-                       $drop = array(
-                               'dropping' => $dropping,
-                               'select' => t('Select'), 
-                               'delete' => t('Delete'),
-                       );
-                       
-                       $filer = (($profile_owner == local_user()) ? t("save to folder") : false);
-
-                       $diff_author    = ((link_compare($item['url'],$item['author-link'])) ? false : true);
-                       $profile_name   = (((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);
-                       if($profile_link === 'mailbox')
-                               $profile_link = '';
-                       if($sp)
-                               $sparkle = ' sparkle';
-                       else
-                               $profile_link = zrl($profile_link);                                     
-
-                       $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
-                       if(($normalised != 'mailbox') && (x($a->contacts,$normalised)))
-                               $profile_avatar = $a->contacts[$normalised]['thumb'];
-                       else
-                               $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $a->get_cached_avatar_image($thumb));
-
-                       $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
-                       call_hooks('render_location',$locate);
-                       $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
-
-                       $tags=array();
-                       foreach(explode(',',$item['tag']) as $tag){
-                               $tag = trim($tag);
-                               if ($tag!="") $tags[] = bbcode($tag);
-                       }
-                       
-                       like_puller($a,$item,$alike,'like');
-                       like_puller($a,$item,$dlike,'dislike');
-
-                       $like    = ((x($alike,$item['uri'])) ? format_like($alike[$item['uri']],$alike[$item['uri'] . '-l'],'like',$item['uri']) : '');
-                       $dislike = ((x($dlike,$item['uri'])) ? format_like($dlike[$item['uri']],$dlike[$item['uri'] . '-l'],'dislike',$item['uri']) : '');
-
-                       if($toplevelpost) {
-                               if((! $item['self']) && ($mode !== 'profile')) {
-                                       if($item['wall']) {
-
-                                               // 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.
-
-                                               $owner_url = zrl($a->page_contact['url']);
-                                               $owner_photo = $a->page_contact['thumb'];
-                                               $owner_name = $a->page_contact['name'];
-                                               $template = $wallwall_template;
-                                               $commentww = 'ww';      
-                                       }
-                               }
-                               else if($item['owner-link']) {
-
-                                       $owner_linkmatch = (($item['owner-link']) && link_compare($item['owner-link'],$item['author-link']));
-                                       $alias_linkmatch = (($item['alias']) && link_compare($item['alias'],$item['author-link']));
-                                       $owner_namematch = (($item['owner-name']) && $item['owner-name'] == $item['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 
-                                               // all over the park. It can be tricked, but this prevents you from
-                                               // seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn
-                                               // well that it's the same Bob Smith. 
-
-                                               // But it could be somebody else with the same name. It just isn't highly likely. 
-                                               
-
-                                               $owner_url = $item['owner-link'];
-                                               $owner_photo = $item['owner-avatar'];
-                                               $owner_name = $item['owner-name'];
-                                               $template = $wallwall_template;
-                                               $commentww = 'ww';
-                                               // If it is our contact, use a friendly redirect link
-                                               if((link_compare($item['owner-link'],$item['url'])) 
-                                                       && ($item['network'] === NETWORK_DFRN)) {
-                                                       $owner_url = $redirect_url;
-                                                       $osparkle = ' sparkle';
-                                               }
-                                               else
-                                                       $owner_url = zrl($owner_url);
-                                       }
-                               }
-                               if($profile_owner == local_user()) {
-                                       $isstarred = (($item['starred']) ? "starred" : "unstarred");
-
-                                       $star = array(
-                                               'do' => t("add star"),
-                                               'undo' => t("remove star"),
-                                               'toggle' => t("toggle star status"),
-                                               'classdo' => (($item['starred']) ? "hidden" : ""),
-                                               'classundo' => (($item['starred']) ? "" : "hidden"),
-                                               'starred' =>  t('starred'),
-                                               'tagger' => t("add tag"),
-                                               'classtagger' => "",
-                                       );
-                               }
-                       } else {
-                               $indent = 'comment';
-                               // Collapse comments
-                               if(($nb_items > 2) || ($thread_level > 2)) {
-                                       if($items_seen == 1) {
-                                               $firstcollapsed = true;
-                                       }
-                                       if($thread_level > 2) {
-                                               if($items_seen == $nb_items)
-                                                       $lastcollapsed = true;
-                                       }
-                                       else if($items_seen == ($nb_items - 2)) {
-                                               $lastcollapsed = true;
-                                       }
-                               }
-                       }
-
-                       if($page_writeable) {
-                               $buttons = array(
-                                       'like' => array( t("I like this \x28toggle\x29"), t("like")),
-                                       'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")),
-                               );
-                               if ($shareable) $buttons['share'] = array( t('Share this'), t('share'));
-
-
-                               if($show_comment_box) {
-                                       $qc = $qcomment =  null;
-
-                                       if(in_array('qcomment',$a->plugins)) {
-                                               $qc = ((local_user()) ? get_pconfig(local_user(),'qcomment','words') : null);
-                                               $qcomment = (($qc) ? explode("\n",$qc) : null);
-                                       }
-                                       $comment = replace_macros($cmnt_tpl,array(
-                                               '$return_path' => '', 
-                                               '$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
-                                               '$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'),
-                                               '$id' => $item['item_id'],
-                                               '$parent' => $item['item_id'],
-                                               '$qcomment' => $qcomment,
-                                               '$profile_uid' =>  $profile_owner,
-                                               '$mylink' => $a->contact['url'],
-                                               '$mytitle' => t('This is you'),
-                                               '$myphoto' => $a->contact['thumb'],
-                                               '$comment' => t('Comment'),
-                                               '$submit' => t('Submit'),
-                                               '$edbold' => t('Bold'),
-                                               '$editalic' => t('Italic'),
-                                               '$eduline' => t('Underline'),
-                                               '$edquote' => t('Quote'),
-                                               '$edcode' => t('Code'),
-                                               '$edimg' => t('Image'),
-                                               '$edurl' => t('Link'),
-                                               '$edvideo' => t('Video'),
-                                               '$preview' => t('Preview'),
-                                               '$sourceapp' => t($a->sourcename),
-                                               '$ww' => (($mode === 'network') ? $commentww : '')
-                                       ));
-                               }
-                       }
-
-                       if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
-                               $indent .= ' shiny';
-
-                       localize_item($item);
-
-                       $body = prepare_body($item,true);
-
-                       $tmp_item = array(
-                               // collapse comments in template. I don't like this much...
-                               'comment_firstcollapsed' => $firstcollapsed,
-                               'comment_lastcollapsed' => $lastcollapsed,
-                               // template to use to render item (wall, walltowall, search)
-                               'template' => $template,
-                               
-                               'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
-                               'tags' => $tags,
-                               'body' => template_escape($body),
-                               'text' => strip_tags(template_escape($body)),
-                               'id' => $item['item_id'],
-                               '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'), $owner_name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
-                               'to' => t('to'),
-                               'wall' => t('Wall-to-Wall'),
-                               'vwall' => t('via Wall-To-Wall:'),
-                               'profile_url' => $profile_link,
-                               'item_photo_menu' => item_photo_menu($item),
-                               'name' => template_escape($profile_name),
-                               'thumb' => $profile_avatar,
-                               'osparkle' => $osparkle,
-                               'sparkle' => $sparkle,
-                               'title' => template_escape($item['title']),
-                               'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
-                               'lock' => $lock,
-                               'location' => template_escape($location),
-                               'indent' => $indent,
-                               'owner_url' => $owner_url,
-                               'owner_photo' => $owner_photo,
-                               'owner_name' => template_escape($owner_name),
-                               'plink' => get_plink($item),
-                               'edpost' => $edpost,
-                               'isstarred' => $isstarred,
-                               'star' => $star,
-                               'filer' => $filer,
-                               'drop' => $drop,
-                               'vote' => $buttons,
-                               'like' => $like,
-                               'dislike' => $dislike,
-                               'comment' => $comment,
-                               'previewing' => $previewing,
-                               'wait' => t('Please wait'),
-                       );
-
-                       $arr = array('item' => $item, 'output' => $tmp_item);
-                       call_hooks('display_item', $arr);
-
-                       $item_result = $arr['output'];
-                       if($firstcollapsed) {
-                               $item_result['num_comments'] = sprintf( tt('%d comment','%d comments',$total_children),$total_children );
-                               $item_result['hide_text'] = t('show more');
-                       }
-
-                       $item_result['children'] = array();
-                       if(count($item['children'])) {
-                               $item_result['children'] = prepare_threads_body($a, $item['children'], $cmnt_tpl, $page_writeable, $mode, $profile_owner, ($thread_level + 1));
-                       }
-                       $item_result['private'] = $item['private'];
-                       $item_result['toplevel'] = ($toplevelpost ? 'toplevel_item' : '');
-
-                       /*
-                        * I don't like this very much...
-                        */
-                       if(get_config('system','thread_allow')) {
-                               $item_result['flatten'] = false;
-                               $item_result['threaded'] = true;
-                       }
-                       else {
-                               $item_result['flatten'] = true;
-                               $item_result['threaded'] = false;
-                               if(!$toplevelpost) {
-                                       $item_result['comment'] = false;
-                               }
-                       }
-                       
-                       $result[] = $item_result;
+               foreach($this->threads as $item) {
+                       if($item->get_id() == $id)
+                               return $item;
                }
 
-               return $result;
+               return false;
        }
 }
 ?>
index 0f474e5de6416a4750871d7dd5dd02422492f136..fbdb1a22095d2757f5976e06464609e278728b83 100644 (file)
@@ -2,32 +2,23 @@
 if(class_exists('Item'))
        return;
 
+require_once('object/BaseObject.php');
 require_once('include/text.php');
 
 /**
  * An item
  */
-class Item {
+class Item extends BaseObject {
        private $data = array();
+       private $template = null;
+       private $available_templates = array(
+               'wall' => 'wall_thread.tpl',
+               'wall2wall' => 'wallwall_thread.tpl'
+       );
 
        public function __construct($data) {
                $this->data = $data;
-       }
-
-       /**
-        * Get the item ID
-        *
-        * Returns:
-        *              _ the ID on success
-        *              _ false on failure
-        */
-       public function get_id() {
-               if(!x($this->data['id'])) {
-                       logger('[ERROR] Item::get_id : Item has no ID!!', LOGGER_DEBUG);
-                       return false;
-               }
-
-               return $this->data['id'];
+               $this->template = $this->available_templates['wall'];
        }
 
        /**
@@ -37,13 +28,332 @@ class Item {
         *              _ The data requested on success
         *              _ false on failure
         */
-       public function get_template_data() {
+       public function get_template_data($cmnt_tpl, $mode) {
                $result = array();
 
+               $a = $this->get_app();
+
+               $page_writeable = false;
+               $profile_owner = 0;
+
+               switch($mode) {
+                       case 'network':
+                       case 'notes':
+                               $profile_owner = local_user();
+                               $page_writeable = true;
+                               break;
+                       case 'profile':
+                               $profile_owner = $a->profile['profile_uid'];
+                               $page_writeable = can_write_wall($a,$profile_owner);
+                               break;
+                       case 'display':
+                               $profile_owner = $a->profile['uid'];
+                               $page_writeable = can_write_wall($a,$profile_owner);
+                               break;
+                       default:
+                               logger('[ERROR] Item::prepare_threads_body : Unhandled mode ('. $mode .').', LOGGER_DEBUG);
+                               return false;
+                               break;
+               }
+
+               $item = $this->get_data();
+
+               $alike = array();
+               $dlike = array();
+               $template = $this->available_templates['wall'];
+               $comment = '';
+               $commentww = '';
+               $sparkle = '';
+               $owner_url = $owner_photo = $owner_name = '';
+               $buttons = '';
+               $dropping = false;
+               $star = false;
+               $isstarred = "unstarred";
+               $photo = $item['photo'];
+               $thumb = $item['thumb'];
+               $indent = '';
+               $osparkle = '';
+               $lastcollapsed = false;
+               $firstcollapsed = false;
+               $total_children += count_descendants($item);
+
+               $toplevelpost = (($item['id'] == $item['parent']) ? true : false);
+               $item_writeable = (($item['writable'] || $item['self']) ? true : false);
+               $show_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
+               $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);
+               $redirect_url = $a->get_baseurl($ssl_state) . '/redir/' . $item['cid'] ;
+               $shareable = ((($profile_owner == local_user()) && ($item['private'] != 1)) ? true : false);
+               if(local_user() && link_compare($a->contact['url'],$item['author-link']))
+                       $edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"));
+               else
+                       $edpost = false;
+               if((intval($item['contact-id']) && $item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
+                       $dropping = true;
+
+               $drop = array(
+                       'dropping' => $dropping,
+                       'select' => t('Select'), 
+                       'delete' => t('Delete'),
+               );
                
+               $filer = (($profile_owner == local_user()) ? t("save to folder") : false);
+
+               $diff_author    = ((link_compare($item['url'],$item['author-link'])) ? false : true);
+               $profile_name   = (((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);
+               if($profile_link === 'mailbox')
+                       $profile_link = '';
+               if($sp)
+                       $sparkle = ' sparkle';
+               else
+                       $profile_link = zrl($profile_link);                                     
+
+               $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
+               if(($normalised != 'mailbox') && (x($a->contacts,$normalised)))
+                       $profile_avatar = $a->contacts[$normalised]['thumb'];
+               else
+                       $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $a->get_cached_avatar_image($thumb));
+
+               $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
+               call_hooks('render_location',$locate);
+               $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
+
+               $tags=array();
+               foreach(explode(',',$item['tag']) as $tag){
+                       $tag = trim($tag);
+                       if ($tag!="") $tags[] = bbcode($tag);
+               }
+               
+               like_puller($a,$item,$alike,'like');
+               like_puller($a,$item,$dlike,'dislike');
+
+               $like    = ((x($alike,$item['uri'])) ? format_like($alike[$item['uri']],$alike[$item['uri'] . '-l'],'like',$item['uri']) : '');
+               $dislike = ((x($dlike,$item['uri'])) ? format_like($dlike[$item['uri']],$dlike[$item['uri'] . '-l'],'dislike',$item['uri']) : '');
+
+               if($toplevelpost) {
+                       if((! $item['self']) && ($mode !== 'profile')) {
+                               if($item['wall']) {
+
+                                       // 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.
+
+                                       $owner_url = zrl($a->page_contact['url']);
+                                       $owner_photo = $a->page_contact['thumb'];
+                                       $owner_name = $a->page_contact['name'];
+                                       $template = $this->available_templates['wall2wall'];
+                                       $commentww = 'ww';      
+                               }
+                       }
+                       else if($item['owner-link']) {
+
+                               $owner_linkmatch = (($item['owner-link']) && link_compare($item['owner-link'],$item['author-link']));
+                               $alias_linkmatch = (($item['alias']) && link_compare($item['alias'],$item['author-link']));
+                               $owner_namematch = (($item['owner-name']) && $item['owner-name'] == $item['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 
+                                       // all over the park. It can be tricked, but this prevents you from
+                                       // seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn
+                                       // well that it's the same Bob Smith. 
+
+                                       // But it could be somebody else with the same name. It just isn't highly likely. 
+                                       
+
+                                       $owner_url = $item['owner-link'];
+                                       $owner_photo = $item['owner-avatar'];
+                                       $owner_name = $item['owner-name'];
+                                       $template = $this->available_templates['wall2wall'];
+                                       $commentww = 'ww';
+                                       // If it is our contact, use a friendly redirect link
+                                       if((link_compare($item['owner-link'],$item['url'])) 
+                                               && ($item['network'] === NETWORK_DFRN)) {
+                                               $owner_url = $redirect_url;
+                                               $osparkle = ' sparkle';
+                                       }
+                                       else
+                                               $owner_url = zrl($owner_url);
+                               }
+                       }
+                       if($profile_owner == local_user()) {
+                               $isstarred = (($item['starred']) ? "starred" : "unstarred");
+
+                               $star = array(
+                                       'do' => t("add star"),
+                                       'undo' => t("remove star"),
+                                       'toggle' => t("toggle star status"),
+                                       'classdo' => (($item['starred']) ? "hidden" : ""),
+                                       'classundo' => (($item['starred']) ? "" : "hidden"),
+                                       'starred' =>  t('starred'),
+                                       'tagger' => t("add tag"),
+                                       'classtagger' => "",
+                               );
+                       }
+               } else {
+                       $indent = 'comment';
+                       // Collapse comments
+                       if(($nb_items > 2) || ($thread_level > 2)) {
+                               if($items_seen == 1) {
+                                       $firstcollapsed = true;
+                               }
+                               if($thread_level > 2) {
+                                       if($items_seen == $nb_items)
+                                               $lastcollapsed = true;
+                               }
+                               else if($items_seen == ($nb_items - 2)) {
+                                       $lastcollapsed = true;
+                               }
+                       }
+               }
+
+               if($page_writeable) {
+                       $buttons = array(
+                               'like' => array( t("I like this \x28toggle\x29"), t("like")),
+                               'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")),
+                       );
+                       if ($shareable) $buttons['share'] = array( t('Share this'), t('share'));
+
+
+                       if($show_comment_box) {
+                               $qc = $qcomment =  null;
+
+                               if(in_array('qcomment',$a->plugins)) {
+                                       $qc = ((local_user()) ? get_pconfig(local_user(),'qcomment','words') : null);
+                                       $qcomment = (($qc) ? explode("\n",$qc) : null);
+                               }
+                               $comment = replace_macros($cmnt_tpl,array(
+                                       '$return_path' => '', 
+                                       '$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
+                                       '$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'),
+                                       '$id' => $item['item_id'],
+                                       '$parent' => $item['item_id'],
+                                       '$qcomment' => $qcomment,
+                                       '$profile_uid' =>  $profile_owner,
+                                       '$mylink' => $a->contact['url'],
+                                       '$mytitle' => t('This is you'),
+                                       '$myphoto' => $a->contact['thumb'],
+                                       '$comment' => t('Comment'),
+                                       '$submit' => t('Submit'),
+                                       '$edbold' => t('Bold'),
+                                       '$editalic' => t('Italic'),
+                                       '$eduline' => t('Underline'),
+                                       '$edquote' => t('Quote'),
+                                       '$edcode' => t('Code'),
+                                       '$edimg' => t('Image'),
+                                       '$edurl' => t('Link'),
+                                       '$edvideo' => t('Video'),
+                                       '$preview' => t('Preview'),
+                                       '$sourceapp' => t($a->sourcename),
+                                       '$ww' => (($mode === 'network') ? $commentww : '')
+                               ));
+                       }
+               }
+
+               if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
+                       $indent .= ' shiny';
+
+               localize_item($item);
+
+               $body = prepare_body($item,true);
+
+               $tmp_item = array(
+                       // collapse comments in template. I don't like this much...
+                       'comment_firstcollapsed' => $firstcollapsed,
+                       'comment_lastcollapsed' => $lastcollapsed,
+                       // template to use to render item (wall, walltowall, search)
+                       'template' => $template,
+                       
+                       'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
+                       'tags' => $tags,
+                       'body' => template_escape($body),
+                       'text' => strip_tags(template_escape($body)),
+                       'id' => $item['item_id'],
+                       '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'), $owner_name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
+                       'to' => t('to'),
+                       'wall' => t('Wall-to-Wall'),
+                       'vwall' => t('via Wall-To-Wall:'),
+                       'profile_url' => $profile_link,
+                       'item_photo_menu' => item_photo_menu($item),
+                       'name' => template_escape($profile_name),
+                       'thumb' => $profile_avatar,
+                       'osparkle' => $osparkle,
+                       'sparkle' => $sparkle,
+                       'title' => template_escape($item['title']),
+                       'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
+                       'lock' => $lock,
+                       'location' => template_escape($location),
+                       'indent' => $indent,
+                       'owner_url' => $owner_url,
+                       'owner_photo' => $owner_photo,
+                       'owner_name' => template_escape($owner_name),
+                       'plink' => get_plink($item),
+                       'edpost' => $edpost,
+                       'isstarred' => $isstarred,
+                       'star' => $star,
+                       'filer' => $filer,
+                       'drop' => $drop,
+                       'vote' => $buttons,
+                       'like' => $like,
+                       'dislike' => $dislike,
+                       'comment' => $comment,
+                       'previewing' => $previewing,
+                       'wait' => t('Please wait'),
+               );
+
+               $arr = array('item' => $item, 'output' => $tmp_item);
+               call_hooks('display_item', $arr);
+
+               $item_result = $arr['output'];
+               if($firstcollapsed) {
+                       $item_result['num_comments'] = sprintf( tt('%d comment','%d comments',$total_children),$total_children );
+                       $item_result['hide_text'] = t('show more');
+               }
+
+               $item_result['children'] = array();
+               if(count($item['children'])) {
+                       $item_result['children'] = prepare_threads_body($a, $item['children'], $cmnt_tpl, $page_writeable, $mode, $profile_owner, ($thread_level + 1));
+               }
+               $item_result['private'] = $item['private'];
+               $item_result['toplevel'] = ($toplevelpost ? 'toplevel_item' : '');
+
+               if(get_config('system','thread_allow')) {
+                       $item_result['flatten'] = false;
+                       $item_result['threaded'] = true;
+               }
+               else {
+                       $item_result['flatten'] = true;
+                       $item_result['threaded'] = false;
+                       if(!$toplevelpost) {
+                               $item_result['comment'] = false;
+                       }
+               }
+               
+               $result = $item_result;
 
                return $result;
        }
+       
+       public function get_id() {
+               return $this->get_data_value('id');
+       }
+       
+       public function get_network() {
+               return $this->get_data_value('network');
+       }
+       
+       public function get_uid() {
+               return $this->get_data_value('uid');
+       }
 
        /**
         * Get raw data
@@ -53,5 +363,31 @@ class Item {
        public function get_data() {
                return $this->data;
        }
+
+       /**
+        * Get a data value
+        *
+        * Returns:
+        *              _ value on success
+        *              _ false on failure
+        */
+       private function get_data_value($name) {
+               if(!x($this->data[$name])) {
+                       logger('[ERROR] Item::get_data_value : Item has no value name "'. $name .'".', LOGGER_DEBUG);
+                       return false;
+               }
+
+               return $this->data[$name];
+       }
+
+       /**
+        * Set the mode we'll be displayed on
+        */
+       private function set_mode($mode) {
+               if($this->get_mode() == $mode)
+                       return;
+
+               
+       }
 }
 ?>