X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=object%2FItem.php;h=b8afe2213a547651b49607a973ef5f542157683a;hb=c8b4ce9ccad9e710bdc40086368aba1c6ec05f6d;hp=0ddafff2a9bf48905080d3aa0602d2aadd79db23;hpb=4e4774ff4ffca4ec31de3c92117eb53508739423;p=friendica.git diff --git a/object/Item.php b/object/Item.php index 0ddafff2a9..b8afe2213a 100644 --- a/object/Item.php +++ b/object/Item.php @@ -18,11 +18,17 @@ class Item extends BaseObject { ); private $comment_box_template = 'comment_item.tpl'; private $toplevel = false; - private $writeable = false; + private $writable = false; private $children = array(); private $parent = null; private $conversation = null; private $redirect_url = null; + private $owner_url = ''; + private $owner_photo = ''; + private $owner_name = ''; + private $wall_to_wall = false; + private $threaded = false; + private $visiting = false; public function __construct($data) { $a = $this->get_app(); @@ -30,14 +36,36 @@ class Item extends BaseObject { $this->data = $data; $this->set_template('wall'); $this->toplevel = ($this->get_id() == $this->get_data_value('parent')); - $this->writeable = ($this->get_data_value('writeable') || $this->get_data_value('self')); + + if(is_array($_SESSION['remote'])) { + foreach($_SESSION['remote'] as $visitor) { + if($visitor['cid'] == $this->get_data_value('contact-id')) { + $this->visiting = true; + break; + } + } + } + + $this->writable = ($this->get_data_value('writable') || $this->get_data_value('self')); $ssl_state = ((local_user()) ? true : false); $this->redirect_url = $a->get_baseurl($ssl_state) . '/redir/' . $this->get_data_value('cid') ; + if(get_config('system','thread_allow') && $a->theme_thread_allow && !$this->is_toplevel()) + $this->threaded = true; + // Prepare the children if(count($data['children'])) { foreach($data['children'] as $item) { + /* + * Only add will be displayed + */ + if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) { + continue; + } + if(! visible_activity($item)) { + continue; + } $child = new Item($item); $this->add_child($child); } @@ -48,8 +76,8 @@ class Item extends BaseObject { * Get data in a form usable by a conversation template * * Returns: - * _ The data requested on success - * _ false on failure + * _ The data requested on success + * _ false on failure */ public function get_template_data($alike, $dlike, $thread_level=1) { $result = array(); @@ -60,12 +88,12 @@ class Item extends BaseObject { $commentww = ''; $sparkle = ''; - $owner_url = $owner_photo = $owner_name = ''; $buttons = ''; $dropping = false; $star = false; $isstarred = "unstarred"; $indent = ''; + $shiny = ''; $osparkle = ''; $total_children = $this->count_descendants(); @@ -80,11 +108,12 @@ class Item extends BaseObject { $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())) + if(($this->get_data_value('uid') == local_user()) || $this->is_visiting()) $dropping = true; $drop = array( 'dropping' => $dropping, + 'pagedrop' => $item['pagedrop'], 'select' => t('Select'), 'delete' => t('Delete'), ); @@ -103,7 +132,7 @@ class Item extends BaseObject { if($sp) $sparkle = ' sparkle'; else - $profile_link = zrl($profile_link); + $profile_link = zrl($profile_link); $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']); if(($normalised != 'mailbox') && (x($a->contacts,$normalised))) @@ -116,61 +145,35 @@ class Item extends BaseObject { $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate)); $tags=array(); + $hashtags = array(); + $mentions = array(); foreach(explode(',',$item['tag']) as $tag){ $tag = trim($tag); - if ($tag!="") $tags[] = bbcode($tag); - } + if ($tag!="") { + $t = bbcode($tag); + $tags[] = $t; + if($t[0] == '#') + $hashtags[] = $t; + elseif($t[0] == '@') + $mentions[] = $t; + } + + } $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']) : ''); + /* + * We should avoid doing this all the time, but it depends on the conversation mode + * And the conv mode may change when we change the conv, or it changes its mode + * Maybe we should establish a way to be notified about conversation changes + */ + $this->check_wall_to_wall(); + + if($this->is_wall_to_wall() && ($this->get_owner_url() == $this->get_redirect_url())) + $osparkle = ' sparkle'; + if($this->is_toplevel()) { - if((! $item['self']) && ($conv->get_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']; - $this->set_template('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']; - $this->set_template('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 = $this->get_redirect_url(); - $osparkle = ' sparkle'; - } - else - $owner_url = zrl($owner_url); - } - } if($conv->get_profile_owner() == local_user()) { $isstarred = (($item['starred']) ? "starred" : "unstarred"); @@ -189,7 +192,7 @@ class Item extends BaseObject { $indent = 'comment'; } - if($conv->is_writeable()) { + if($conv->is_writable()) { $buttons = array( 'like' => array( t("I like this \x28toggle\x29"), t("like")), 'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")), @@ -197,24 +200,34 @@ class Item extends BaseObject { if ($shareable) $buttons['share'] = array( t('Share this'), t('share')); } - if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0) - $indent .= ' shiny'; + 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); + list($categories, $folders) = get_cats_and_terms($item); + $tmp_item = array( - // template to use to render item (wall, walltowall, search) 'template' => $this->get_template(), 'type' => implode("",array_slice(explode("/",$item['verb']),-1)), 'tags' => $tags, + 'hashtags' => $hashtags, + 'mentions' => $mentions, + 'txt_cats' => t('Categories:'), + 'txt_folders' => t('Filed under:'), + 'has_cats' => ((count($categories)) ? 'true' : ''), + 'has_folders' => ((count($folders)) ? 'true' : ''), + 'categories' => $categories, + 'folders' => $folders, 'body' => template_escape($body), 'text' => strip_tags(template_escape($body)), 'id' => $this->get_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'])), + 'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $this->get_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:'), @@ -225,13 +238,15 @@ class Item extends BaseObject { 'osparkle' => $osparkle, 'sparkle' => $sparkle, 'title' => template_escape($item['title']), + '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'])), 'lock' => $lock, 'location' => template_escape($location), 'indent' => $indent, - 'owner_url' => $owner_url, - 'owner_photo' => $owner_photo, - 'owner_name' => template_escape($owner_name), + 'shiny' => $shiny, + 'owner_url' => $this->get_owner_url(), + 'owner_photo' => $this->get_owner_photo(), + 'owner_name' => template_escape($this->get_owner_name()), 'plink' => get_plink($item), 'edpost' => $edpost, 'isstarred' => $isstarred, @@ -241,50 +256,56 @@ class Item extends BaseObject { 'vote' => $buttons, 'like' => $like, 'dislike' => $dislike, - 'comment' => $this->get_comment_box($commentww), - 'previewing' => $previewing, + 'comment' => $this->get_comment_box($indent), + 'previewing' => ($conv->is_preview() ? ' preview ' : ''), 'wait' => t('Please wait'), + 'thread_level' => $thread_level ); $arr = array('item' => $item, 'output' => $tmp_item); call_hooks('display_item', $arr); - $item_result = $arr['output']; + $result = $arr['output']; - $item_result['children'] = array(); + $result['children'] = array(); $children = $this->get_children(); $nb_children = count($children); if($nb_children > 0) { - foreach($this->get_children() as $child) { - $item_result['children'][] = $child->get_template_data($alike, $dlike, $thread_level + 1); + foreach($children as $child) { + $result['children'][] = $child->get_template_data($alike, $dlike, $thread_level + 1); } // Collapse if(($nb_children > 2) || ($thread_level > 1)) { - $item_result['children'][0]['comment_firstcollapsed'] = true; - $item_result['children'][0]['num_comments'] = sprintf( tt('%d comment','%d comments',$total_children),$total_children ); - $item_result['children'][0]['hide_text'] = t('show more'); + $result['children'][0]['comment_firstcollapsed'] = true; + $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'); if($thread_level > 1) { - $item_result['children'][$nb_children - 1]['comment_lastcollapsed'] = true; + $result['children'][$nb_children - 1]['comment_lastcollapsed'] = true; } else { - $item_result['children'][$nb_children - 3]['comment_lastcollapsed'] = true; + $result['children'][$nb_children - 3]['comment_lastcollapsed'] = true; } } } - $item_result['private'] = $item['private']; - $item_result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : ''); - - if(get_config('system','thread_allow')) { - $item_result['flatten'] = false; - $item_result['threaded'] = true; + if ($this->is_toplevel()) { + $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' : ''); + + if($this->is_threaded()) { + $result['flatten'] = false; + $result['threaded'] = true; } else { - $item_result['flatten'] = true; - $item_result['threaded'] = false; + $result['flatten'] = true; + $result['threaded'] = false; } - - $result = $item_result; return $result; } @@ -293,6 +314,10 @@ class Item extends BaseObject { return $this->get_data_value('id'); } + public function is_threaded() { + return $this->threaded; + } + /** * Add a child item */ @@ -306,6 +331,16 @@ class Item extends BaseObject { logger('[WARN] Item::add_child : Item already exists ('. $item->get_id() .').', 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')) { + return false; + } + if(activity_match($item->get_data_value('verb'),ACTIVITY_LIKE) || activity_match($item->get_data_value('verb'),ACTIVITY_DISLIKE)) { + return false; + } + $item->set_parent($this); $this->children[] = $item; return end($this->children); @@ -378,6 +413,8 @@ class Item extends BaseObject { * set conversation */ public function set_conversation($conv) { + $previous_mode = ($this->conversation ? $this->conversation->get_mode() : ''); + $this->conversation = $conv; // Set it on our children too @@ -405,11 +442,11 @@ class Item extends BaseObject { * Get a data value * * Returns: - * _ value on success - * _ false on failure + * _ value on success + * _ false on failure */ public function get_data_value($name) { - if(!x($this->data, $name)) { + if(!isset($this->data[$name])) { logger('[ERROR] Item::get_data_value : Item has no value name "'. $name .'".', LOGGER_DEBUG); return false; } @@ -443,10 +480,17 @@ class Item extends BaseObject { } /** - * Check if this is writeable + * Check if this is writable */ - private function is_writeable() { - return $this->writeable; + private function is_writable() { + $conv = $this->get_conversation(); + + if($conv) { + // This will allow us to comment on wall-to-wall items owned by our friends + // and community forums even if somebody else wrote the post. + return ($this->writable || ($this->is_visiting() && $conv->get_mode() == 'profile')); + } + return $this->writable; } /** @@ -474,20 +518,23 @@ class Item extends BaseObject { * Get the comment box * * Returns: - * _ The comment box string (empty if no comment box) - * _ false on failure + * _ The comment box string (empty if no comment box) + * _ false on failure */ - private function get_comment_box($ww) { - if(!$this->is_toplevel() && !get_config('system','thread_allow')) { + private function get_comment_box($indent) { + $a = $this->get_app(); + if(!$this->is_toplevel() && !(get_config('system','thread_allow') && $a->theme_thread_allow)) { return ''; } $comment_box = ''; $conv = $this->get_conversation(); $template = get_markup_template($this->get_comment_box_template()); + $ww = ''; + if( ($conv->get_mode() === 'network') && $this->is_wall_to_wall() ) + $ww = 'ww'; - if($conv->is_writeable() && $this->is_writeable()) { - $a = $this->get_app(); + if($conv->is_writable() && $this->is_writable()) { $qc = $qcomment = null; /* @@ -499,8 +546,10 @@ class Item extends BaseObject { $qcomment = (($qc) ? explode("\n",$qc) : null); } $comment_box = replace_macros($template,array( - '$return_path' => '', - '$jsreload' => (($conv->get_mode() === 'display') ? $_SESSION['return_url'] : ''), + '$return_path' => '', + '$threaded' => $this->is_threaded(), +// '$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(), @@ -520,8 +569,10 @@ class Item extends BaseObject { '$edurl' => t('Link'), '$edvideo' => t('Video'), '$preview' => t('Preview'), + '$indent' => $indent, '$sourceapp' => t($a->sourcename), - '$ww' => (($conv->get_mode() === 'network') ? $ww : '') + '$ww' => (($conv->get_mode() === 'network') ? $ww : ''), + '$rand_num' => random_digits(12) )); } @@ -531,5 +582,90 @@ class Item extends BaseObject { private function get_redirect_url() { return $this->redirect_url; } + + /** + * Check if we are a wall to wall item and set the relevant properties + */ + protected function check_wall_to_wall() { + $a = $this->get_app(); + $conv = $this->get_conversation(); + $this->wall_to_wall = false; + + if($this->is_toplevel()) { + if( (! $this->get_data_value('self')) && ($conv->get_mode() !== 'profile')) { + if($this->get_data_value('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. + + $this->owner_url = zrl($a->page_contact['url']); + $this->owner_photo = $a->page_contact['thumb']; + $this->owner_name = $a->page_contact['name']; + $this->wall_to_wall = true; + } + else if($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')); + 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. + + + $this->owner_photo = $this->get_data_value('owner-avatar'); + $this->owner_name = $this->get_data_value('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(); + } + else + $this->owner_url = zrl($this->get_data_value('owner-link')); + } + } + } + } + + if(!$this->wall_to_wall) { + $this->set_template('wall'); + $this->owner_url = ''; + $this->owner_photo = ''; + $this->owner_name = ''; + } + } + + private function is_wall_to_wall() { + return $this->wall_to_wall; + } + + private function get_owner_url() { + return $this->owner_url; + } + + private function get_owner_photo() { + return $this->owner_photo; + } + + private function get_owner_name() { + return $this->owner_name; + } + + private function is_visiting() { + return $this->visiting; + } + + + + } ?>