X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=include%2Fconversation.php;h=6069afb03b7c7b0530fc95a0a0d541c55cbc873b;hb=8bfd405beef2224628e1666c1a1248e3c5a2205c;hp=6b52f51cdb300a36a56679aa5171809d586521c0;hpb=8cc6e69705c40b942ff74f757d8db743c479646a;p=friendica.git
diff --git a/include/conversation.php b/include/conversation.php
index 6b52f51cdb..6069afb03b 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -5,8 +5,7 @@
*/
function localize_item(&$item){
- if ($item['verb']=="http://activitystrea.ms/schema/1.0/like" ||
- $item['verb']=="http://activitystrea.ms/schema/1.0/dislike"){
+ if ($item['verb']=== ACTIVITY_LIKE || $item['verb']=== ACTIVITY_DISLIKE){
$r = q("SELECT * from `item`,`contact` WHERE
`item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';",
@@ -18,9 +17,9 @@ function localize_item(&$item){
$objauthor = '[url=' . $obj['author-link'] . ']' . $obj['author-name'] . '[/url]';
switch($obj['verb']){
- case 'http://activitystrea.ms/schema/1.0/post':
+ case ACTIVITY_POST:
switch ($obj['object-type']){
- case 'http://activitystrea.ms/schema/1.0/event':
+ case ACTIVITY_OBJ_EVENT:
$post_type = t('event');
break;
default:
@@ -40,19 +39,19 @@ function localize_item(&$item){
$plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]';
switch($item['verb']){
- case "http://activitystrea.ms/schema/1.0/like":
+ case ACTIVITY_LIKE :
$bodyverb = t('%1$s likes %2$s\'s %3$s');
break;
- case "http://activitystrea.ms/schema/1.0/dislike":
+ case ACTIVITY_DISLIKE:
$bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
break;
}
$item['body'] = sprintf($bodyverb, $author, $objauthor, $plink);
}
- if ($item['verb']=='http://activitystrea.ms/schema/1.0/make-friend'){
+ if ($item['verb']=== ACTIVITY_FRIEND){
- if ($item['object-type']=="" || $item['object-type']!='http://activitystrea.ms/schema/1.0/person') return;
+ if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) return;
$Aname = $item['author-name'];
$Alink = $item['author-link'];
@@ -81,6 +80,7 @@ function localize_item(&$item){
}
+
}
/**
@@ -111,7 +111,7 @@ function conversation(&$a, $items, $mode, $update) {
}
if($mode === 'notes') {
- $profile_owner = $a->profile['profile_uid'];
+ $profile_owner = local_user();
$page_writeable = true;
}
@@ -134,16 +134,17 @@ function conversation(&$a, $items, $mode, $update) {
$cmnt_tpl = get_markup_template('comment_item.tpl');
- $like_tpl = get_markup_template('like.tpl');
- $noshare_tpl = get_markup_template('like_noshare.tpl');
$tpl = get_markup_template('wall_item.tpl');
$wallwall = get_markup_template('wallwall_item.tpl');
- $droptpl = get_markup_template('wall_item_drop.tpl');
- $fakedrop = get_markup_template('wall_fake_drop.tpl');
$alike = array();
$dlike = array();
+
+ // array with html for each thread (parent+comments)
+ $treads = array();
+ $treadsid = -1;
+
if(count($items)) {
if($mode === 'network-new' || $mode === 'search' || $mode === 'community') {
@@ -154,6 +155,7 @@ function conversation(&$a, $items, $mode, $update) {
$tpl = get_markup_template('search_item.tpl');
foreach($items as $item) {
+ $treadsid++;
$comment = '';
$owner_url = '';
@@ -195,372 +197,393 @@ function conversation(&$a, $items, $mode, $update) {
$location = '' . $coord . '';
}
- $drop = '';
localize_item($item);
if($mode === 'network-new')
- $t = $droptpl;
+ $dropping = true;
else
- $t = $fakedrop;
+ $dropping = false;
+
- $drop = replace_macros($t,array('$id' => $item['id']));
- $lock = '
';
- $star = '';
+ $drop = array(
+ 'dropping' => $dropping,
+ 'select' => t('Select'),
+ 'delete' => t('Delete'),
+ );
+
+ $star = false;
+ $isstarred = "unstarred";
+
+ $lock = false;
+ $likebuttons = false;
+ $shareable = false;
$body = prepare_body($item,true);
- $o .= replace_macros($tpl,array(
+ $tmp_item = replace_macros($tpl,array(
'$id' => $item['item_id'],
- '$linktitle' => sprintf( t('View %s\'s profile'), $profile_name),
+ '$linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
'$profile_url' => $profile_link,
'$item_photo_menu' => item_photo_menu($item),
- '$name' => $profile_name,
+ '$name' => template_escape($profile_name),
'$sparkle' => $sparkle,
'$lock' => $lock,
'$thumb' => $profile_avatar,
- '$title' => $item['title'],
- '$body' => $body,
+ '$title' => template_escape($item['title']),
+ '$body' => template_escape($body),
'$ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
- '$location' => $location,
+ '$lock' => $lock,
+ '$location' => template_escape($location),
'$indent' => '',
+ '$owner_name' => template_escape($owner_name),
'$owner_url' => $owner_url,
'$owner_photo' => $owner_photo,
- '$owner_name' => $owner_name,
+ '$plink' => get_plink($item),
+ '$edpost' => false,
+ '$isstarred' => $isstarred,
'$star' => $star,
'$drop' => $drop,
- '$conv' => '' . t('View in context') . ''
+ '$vote' => $likebuttons,
+ '$like' => '',
+ '$dislike' => '',
+ '$comment' => '',
+ '$conv' => array('href'=> $a->get_baseurl() . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context')),
+ '$wait' => t('Please wait'),
));
- }
-
- return $o;
- }
+ $arr = array('item' => $item, 'output' => $tmp_item);
+ call_hooks('display_item', $arr);
+ $treads[$treadsid] .= $arr['output'];
-
-
- // Normal View
-
-
- // Figure out how many comments each parent has
- // (Comments all have gravity of 6)
- // Store the result in the $comments array
-
- $comments = array();
- foreach($items as $item) {
- if((intval($item['gravity']) == 6) && ($item['id'] != $item['parent'])) {
- if(! x($comments,$item['parent']))
- $comments[$item['parent']] = 1;
- else
- $comments[$item['parent']] += 1;
}
+
}
+ else
+ {
+ // Normal View
- // map all the like/dislike activities for each parent item
- // Store these in the $alike and $dlike arrays
- foreach($items as $item) {
- like_puller($a,$item,$alike,'like');
- like_puller($a,$item,$dlike,'dislike');
- }
+ // Figure out how many comments each parent has
+ // (Comments all have gravity of 6)
+ // Store the result in the $comments array
- $comments_collapsed = false;
- $blowhard = 0;
- $blowhard_count = 0;
+ $comments = array();
+ foreach($items as $item) {
+ if((intval($item['gravity']) == 6) && ($item['id'] != $item['parent'])) {
+ if(! x($comments,$item['parent']))
+ $comments[$item['parent']] = 1;
+ else
+ $comments[$item['parent']] += 1;
+ }
+ }
- foreach($items as $item) {
+ // map all the like/dislike activities for each parent item
+ // Store these in the $alike and $dlike arrays
- $comment = '';
- $template = $tpl;
- $commentww = '';
- $sparkle = '';
- $owner_url = $owner_photo = $owner_name = '';
+ foreach($items as $item) {
+ like_puller($a,$item,$alike,'like');
+ like_puller($a,$item,$dlike,'dislike');
+ }
- // We've already parsed out like/dislike for special treatment. We can ignore them now
+ $comments_collapsed = false;
+ $blowhard = 0;
+ $blowhard_count = 0;
- if(((activity_match($item['verb'],ACTIVITY_LIKE))
- || (activity_match($item['verb'],ACTIVITY_DISLIKE)))
- && ($item['id'] != $item['parent']))
- continue;
- $toplevelpost = (($item['id'] == $item['parent']) ? true : false);
+ foreach($items as $item) {
+ $comment = '';
+ $template = $tpl;
+ $commentww = '';
+ $sparkle = '';
+ $owner_url = $owner_photo = $owner_name = '';
- // Take care of author collapsing and comment collapsing
- // If a single author has more than 3 consecutive top-level posts, squash the remaining ones.
- // If there are more than two comments, squash all but the last 2.
+ // We've already parsed out like/dislike for special treatment. We can ignore them now
- if($toplevelpost) {
+ if(((activity_match($item['verb'],ACTIVITY_LIKE))
+ || (activity_match($item['verb'],ACTIVITY_DISLIKE)))
+ && ($item['id'] != $item['parent']))
+ continue;
- $item_writeable = (($item['writable'] || $item['self']) ? true : false);
+ $toplevelpost = (($item['id'] == $item['parent']) ? true : false);
+ $toplevelprivate = false;
- if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile') && ($mode != 'notes')) {
- $blowhard_count ++;
- if($blowhard_count == 3) {
- $o .= ''
- . t('See more posts like this') . '
' . '';
+ // Take care of author collapsing and comment collapsing
+ // If a single author has more than 3 consecutive top-level posts, squash the remaining ones.
+ // If there are more than two comments, squash all but the last 2.
+
+ if($toplevelpost) {
+ $toplevelprivate = (($toplevelpost && $item['private']) ? true : false);
+ $item_writeable = (($item['writable'] || $item['self']) ? true : false);
+
+ /*if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile') && ($mode != 'notes')) {
+ $blowhard_count ++;
+ if($blowhard_count == 3) {
+ $o .= '
'
+ . t('See more posts like this') . '
' . '
';
+ }
}
+ else {
+ $blowhard = $item['cid'];
+ if($blowhard_count >= 3)
+ $o .= '
';
+ $blowhard_count = 0;
+ }*/
+
+ $comments_seen = 0;
+ $comments_collapsed = false;
+
+ $treadsid++;
+ $treads[$treadsid] = "";
}
else {
- $blowhard = $item['cid'];
- if($blowhard_count >= 3)
- $o .= '
';
- $blowhard_count = 0;
+ // prevent private email from leaking into public conversation
+ if((! $toplevelpost) && (! toplevelprivate) && ($item['private']) && ($profile_owner != local_user()))
+ continue;
+ $comments_seen ++;
+ }
+
+ $override_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
+ $show_comment_box = ((($page_writeable) && ($item_writeable) && ($comments_seen == $comments[$item['parent']])) ? true : false);
+
+ if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
+ if(! $comments_collapsed) {
+ $treads[$treadsid] .= ''
+ . sprintf( t('See all %d comments'), $comments[$item['parent']]) . '
'
+ . '';
+ $comments_collapsed = true;
+ }
+ }
+ if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) {
+ $treads[$treadsid] .= '
';
}
- $comments_seen = 0;
- $comments_collapsed = false;
- }
- else
- $comments_seen ++;
-
+ $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
- $override_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
- $show_comment_box = ((($page_writeable) && ($item_writeable) && ($comments_seen == $comments[$item['parent']])) ? true : false);
+ $lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
+ || strlen($item['deny_cid']) || strlen($item['deny_gid']))))
+ ? t('Private Message')
+ : false);
- if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
- if(! $comments_collapsed) {
- $o .= ''
- . sprintf( t('See all %d comments'), $comments[$item['parent']]) . '
'
- . '';
- $comments_collapsed = true;
- }
- }
- if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) {
- $o .= '
';
- }
- $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
+ // Top-level wall post not written by the wall owner (wall-to-wall)
+ // First figure out who owns it.
- $lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
- || strlen($item['deny_cid']) || strlen($item['deny_gid']))))
- ? ''
- : '');
+ $osparkle = '';
+ if(($toplevelpost) && (! $item['self']) && ($mode !== 'profile')) {
- // Top-level wall post not written by the wall owner (wall-to-wall)
- // First figure out who owns it.
+ if($item['wall']) {
- $osparkle = '';
+ // 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 on the left of the wall-to-wall notice.
- if(($toplevelpost) && (! $item['self']) && ($mode !== 'profile')) {
+ $owner_url = $a->page_contact['url'];
+ $owner_photo = $a->page_contact['thumb'];
+ $owner_name = $a->page_contact['name'];
+ $template = $wallwall;
+ $commentww = 'ww';
+ }
+ if((! $item['wall']) && (strlen($item['owner-link'])) && ($item['owner-link'] != $item['author-link'])) {
+
+ // Could be anybody.
+
+ $owner_url = $item['owner-link'];
+ $owner_photo = $item['owner-avatar'];
+ $owner_name = $item['owner-name'];
+ $template = $wallwall;
+ $commentww = 'ww';
+ // If it is our contact, use a friendly redirect link
+ if((link_compare($item['owner-link'],$item['url']))
+ && ($item['network'] === 'dfrn')) {
+ $owner_url = $redirect_url;
+ $osparkle = ' sparkle';
+ }
+ }
+ }
- if($item['type'] === 'wall') {
+ $likebuttons = '';
+ $shareable = ((($profile_owner == local_user()) && ($mode != 'display') && (! $item['private'])) ? true : false);
- // 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 on the left of the wall-to-wall notice.
+ if($page_writeable) {
+ if($toplevelpost) {
+ $likebuttons = 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) $likebuttons['share'] = array( t('Share this'), t('share'));
+ }
- $owner_url = $a->page_contact['url'];
- $owner_photo = $a->page_contact['thumb'];
- $owner_name = $a->page_contact['name'];
- $template = $wallwall;
- $commentww = 'ww';
- }
- if(($item['type'] === 'remote') && (strlen($item['owner-link'])) && ($item['owner-link'] != $item['author-link'])) {
-
- // Could be anybody.
-
- $owner_url = $item['owner-link'];
- $owner_photo = $item['owner-avatar'];
- $owner_name = $item['owner-name'];
- $template = $wallwall;
- $commentww = 'ww';
- // If it is our contact, use a friendly redirect link
- if((link_compare($item['owner-link'],$item['url']))
- && ($item['network'] === 'dfrn')) {
- $owner_url = $redirect_url;
- $osparkle = ' sparkle';
+ if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) {
+ $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['parent'],
+ '$profile_uid' => $profile_owner,
+ '$mylink' => $a->contact['url'],
+ '$mytitle' => t('This is you'),
+ '$myphoto' => $a->contact['thumb'],
+ '$comment' => t('Comment'),
+ '$submit' => t('Submit'),
+ '$ww' => (($mode === 'network') ? $commentww : '')
+ ));
}
}
- }
+ $edpost = (((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1)) || ($mode === 'notes'))
+ ? array($a->get_baseurl()."/editpost/".$item['id'], t("Edit"))
+ : False);
- $likebuttons = '';
- if($page_writeable) {
- if($toplevelpost) {
- $likebuttons = replace_macros((($item['private'] || ($profile_owner != local_user())) ? $noshare_tpl : $like_tpl),array(
- '$id' => $item['id'],
- '$likethis' => t("I like this \x28toggle\x29"),
- '$nolike' => t("I don't like this \x28toggle\x29"),
- '$share' => t('Share'),
- '$wait' => t('Please wait')
- ));
+ $drop = '';
+ $dropping = 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'),
+ );
+
+ $star = false;
+ $starred = "unstarred";
+ if ($profile_owner == local_user() && $toplevelpost) {
+ $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'),
+ );
}
- if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) {
- $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['parent'],
- '$profile_uid' => $profile_owner,
- '$mylink' => $a->contact['url'],
- '$mytitle' => t('This is you'),
- '$myphoto' => $a->contact['thumb'],
- '$comment' => t('Comment'),
- '$submit' => t('Submit'),
- '$ww' => (($mode === 'network') ? $commentww : '')
- ));
- }
- }
- $edpost = (((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1)) || ($mode === 'notes'))
- ? ''
- : '');
+ $photo = $item['photo'];
+ $thumb = $item['thumb'];
- $drop = '';
- $dropping = false;
+ // Post was remotely authored.
- if((intval($item['contact-id']) && $item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
- $dropping = true;
+ $diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true);
- $drop = replace_macros((($dropping)? $droptpl : $fakedrop), array('$id' => $item['id'], '$select' => t('Select'), '$delete' => t('Delete')));
+ $profile_name = (((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']);
- $star = (($profile_owner == local_user() && $toplevelpost) ? '' : '');
+ $sp = false;
+ $profile_link = best_link_url($item,$sp);
+ if($sp)
+ $sparkle = ' sparkle';
+ if($profile_link === 'mailbox')
+ $profile_link = '';
- $photo = $item['photo'];
- $thumb = $item['thumb'];
+ $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'] : $thumb);
- // Post was remotely authored.
- $diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true);
- $profile_name = (((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']);
- $sp = false;
- $profile_link = best_link_url($item,$sp);
- if($sp)
- $sparkle = ' sparkle';
- if($profile_link === 'mailbox')
- $profile_link = '';
+ $like = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
+ $dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
- $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'] : $thumb);
+ $location = (($item['location']) ? '' . $item['location'] . '' : '');
+ $coord = (($item['coord']) ? '' . $item['coord'] . '' : '');
+ if($coord) {
+ if($location)
+ $location .= '
(' . $coord . ')';
+ else
+ $location = '' . $coord . '';
+ }
+
+ $indent = (($toplevelpost) ? '' : ' comment');
+ if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
+ $indent .= ' shiny';
+ //
+ localize_item($item);
+ // Build the HTML
+ $body = prepare_body($item,true);
- $like = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
- $dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
- $location = (($item['location']) ? '' . $item['location'] . '' : '');
- $coord = (($item['coord']) ? '' . $item['coord'] . '' : '');
- if($coord) {
- if($location)
- $location .= '
(' . $coord . ')';
- else
- $location = '' . $coord . '';
- }
+ $tmp_item = replace_macros($template,array(
+ '$body' => 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'), $profile_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']) && ($item['id'] == $item['parent'])) ? 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,
+ '$drop' => $drop,
+ '$vote' => $likebuttons,
+ '$like' => $like,
+ '$dislike' => $dislike,
+ '$comment' => $comment,
+ '$wait' => t('Please wait'),
+
+ ));
+
- $indent = (($toplevelpost) ? '' : ' comment');
-
- if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
- $indent .= ' shiny';
-
- //
- localize_item($item);
-
- // Build the HTML
-
- $body = prepare_body($item,true);
-
-
- $tmp_item = replace_macros($template,array(
- '$id' => $item['item_id'],
- '$linktitle' => sprintf( t('View %s\'s profile'), $profile_name),
- '$olinktitle' => sprintf( t('View %s\'s profile'), $owner_name),
- '$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' => $profile_name,
- '$thumb' => $profile_avatar,
- '$osparkle' => $osparkle,
- '$sparkle' => $sparkle,
- '$title' => $item['title'],
- '$body' => $body,
- '$ago' => ((($item['app']) && ($item['id'] == $item['parent'])) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
- '$lock' => $lock,
- '$location' => $location,
- '$indent' => $indent,
- '$owner_url' => $owner_url,
- '$owner_photo' => $owner_photo,
- '$owner_name' => $owner_name,
- '$plink' => get_plink($item),
- '$edpost' => $edpost,
- '$star' => $star,
- '$drop' => $drop,
- '$vote' => $likebuttons,
- '$like' => $like,
- '$dislike' => $dislike,
- '$comment' => $comment
- ));
-
-
- $arr = array('item' => $item, 'output' => $tmp_item);
- call_hooks('display_item', $arr);
-
- $o .= $arr['output'];
+ $arr = array('item' => $item, 'output' => $tmp_item);
+ call_hooks('display_item', $arr);
+ $treads[$treadsid] .= $arr['output'];
+ }
}
}
// if author collapsing is in force but didn't get closed, close it off now.
- if($blowhard_count >= 3)
- $o .= '';
+ /*if($blowhard_count >= 3)
+ $treads[$treadsid] .= '';*/
- if($dropping)
- $o .= '' . t('Delete Selected Items') . '
';
+ $page_template = get_markup_template("conversation.tpl");
+ $o .= replace_macros($page_template, array(
+ '$treads' => $treads,
+ '$dropping' => ($dropping?t('Delete Selected Items'):False),
+ ));
return $o;
}
-
-if(! function_exists('load_contact_links')) {
-function load_contact_links($uid) {
-
- $a = get_app();
-
- $ret = array();
-
- if(! $uid || x($a->contacts,'empty'))
- return;
-
- $r = q("SELECT `id`,`network`,`url`,`thumb` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 ",
- intval($uid)
- );
- if(count($r)) {
- foreach($r as $rr){
- $url = normalise_link($rr['url']);
- $ret[$url] = $rr;
- }
- }
- else
- $ret['empty'] = true;
- $a->contacts = $ret;
- return;
-}}
-
-
function best_link_url($item,&$sparkle) {
$a = get_app();
@@ -753,7 +776,7 @@ function status_editor($a,$x, $notes_cid = 0) {
if($mail_enabled) {
$selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
- $jotnets .= '