'
+ . '" onclick="openClose(' . '\'icollapse-' . $item['parent'] . '\'); $(\'#icollapse-wrapper-' . $item['parent'] . '\').hide();" >'
. t('See more posts like this') . '
' . '';
}
@@ -294,13 +287,13 @@ function conversation(&$a, $items, $mode, $update) {
$comments_seen ++;
- $override_coment_box = (($page_writeable) && ($item_writeable) ? true : false);
+ $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) {
$o .= '
'
+ . '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\'); $(\'#ccollapse-wrapper-' . $item['parent'] . '\').hide();" >'
. sprintf( t('See all %d comments'), $comments[$item['parent']]) . '
'
. '
';
$comments_collapsed = true;
@@ -360,7 +353,7 @@ function conversation(&$a, $items, $mode, $update) {
if($page_writeable) {
if($toplevelpost) {
- $likebuttons = replace_macros((($item['private']) ? $noshare_tpl : $like_tpl),array(
+ $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"),
@@ -387,11 +380,20 @@ function conversation(&$a, $items, $mode, $update) {
}
}
- $edpost = ((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1))
+ $edpost = (((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1)) || ($mode === 'notes'))
? '
'
: '');
- $drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
+
+
+ $drop = '';
+ $dropping = false;
+
+ if((intval($item['contact-id']) && $item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
+ $dropping = true;
+
+ $drop = replace_macros((($dropping)? $droptpl : $fakedrop), array('$id' => $item['id'], '$select' => t('Select'), '$delete' => t('Delete')));
+
$photo = $item['photo'];
$thumb = $item['thumb'];
@@ -401,35 +403,25 @@ function conversation(&$a, $items, $mode, $update) {
$diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true);
$profile_name = (((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']);
- $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
- if($mode === 'profile') {
- if(local_user() && ($item['contact-uid'] == local_user()) && ($item['network'] === 'dfrn') && (! $item['self'] )) {
- $profile_link = $redirect_url;
- $sparkle = ' sparkle';
- }
- else {
- $profile_link = $item['url'];
- $sparkle = '';
- }
- }
- elseif(strlen($item['author-link'])) {
- $profile_link = $item['author-link'];
- if(link_compare($item['author-link'],$item['url']) && ($item['network'] === 'dfrn') && (! $item['self'])) {
- $profile_link = $redirect_url;
- $sparkle = ' sparkle';
- }
- elseif(isset($author_contacts[$item['author-link']])) {
- $profile_link = $a->get_baseurl() . '/redir/' . $author_contacts[$item['author-link']];
- $sparkle = ' sparkle';
- }
- }
- else
- $profile_link = $item['url'];
+ $sp = false;
+ $profile_link = best_link_url($item,$sp);
+ if($sp)
+ $sparkle = ' sparkle';
if($profile_link === 'mailbox')
$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'] : $thumb);
+
+
+
+
+
$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']) : '');
@@ -454,6 +446,9 @@ function conversation(&$a, $items, $mode, $update) {
// 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),
@@ -468,8 +463,8 @@ function conversation(&$a, $items, $mode, $update) {
'$osparkle' => $osparkle,
'$sparkle' => $sparkle,
'$title' => $item['title'],
- '$body' => smilies(bbcode($item['body'])),
- '$ago' => relative_date($item['created']),
+ '$body' => $body,
+ '$ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
'$lock' => $lock,
'$location' => $location,
'$indent' => $indent,
@@ -485,6 +480,7 @@ function conversation(&$a, $items, $mode, $update) {
'$comment' => $comment
));
+
$arr = array('item' => $item, 'output' => $tmp_item);
call_hooks('display_item', $arr);
@@ -499,102 +495,106 @@ function conversation(&$a, $items, $mode, $update) {
if($blowhard_count >= 3)
$o .= '
';
+ if($dropping)
+ $o .= '
' . t('Delete Selected Items') . '
';
+
return $o;
}
+if(! function_exists('load_contact_links')) {
+function load_contact_links($uid) {
+ $a = get_app();
-if(! function_exists('extract_item_authors')) {
-function extract_item_authors($arr,$uid) {
+ $ret = array();
- if((! $uid) || (! is_array($arr)) || (! count($arr)))
- return array();
- $urls = array();
- foreach($arr as $rr) {
- if(! in_array("'" . dbesc($rr['author-link']) . "'",$urls))
- $urls[] = "'" . dbesc($rr['author-link']) . "'";
+ 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) {
- // pre-quoted, don't put quotes on %s
- if(count($urls)) {
- $r = q("SELECT `id`,`network`,`url` FROM `contact` WHERE `uid` = %d AND `url` IN ( %s ) AND `self` = 0 AND `blocked` = 0 ",
- intval($uid),
- implode(',',$urls)
- );
- if(count($r)) {
- $ret = array();
- $authors = array();
- foreach($r as $rr){
- if ($rr['network']=='dfrn')
- $ret[$rr['url']] = $rr['id'];
- $authors[$r['url']]= $rr;
+ $a = get_app();
+
+ $best_url = '';
+ $sparkle = false;
+
+ $clean_url = normalise_link($item['author-link']);
+
+ if((local_user()) && (local_user() == $item['uid'])) {
+ if(isset($a->contacts) && x($a->contacts,$clean_url)) {
+ if($a->contacts[$clean_url]['network'] === NETWORK_DFRN) {
+ $best_url = $a->get_baseurl() . '/redir/' . $a->contacts[$clean_url]['id'];
+ $sparkle = true;
}
- $a->authors = $authors;
- return $ret;
+ else
+ $best_url = $a->contacts[$clean_url]['url'];
}
}
- return array();
-}}
+ if(! $best_url) {
+ if(strlen($item['author-link']))
+ $best_url = $item['author-link'];
+ else
+ $best_url = $item['url'];
+ }
+
+ return $best_url;
+}
+
if(! function_exists('item_photo_menu')){
function item_photo_menu($item){
$a = get_app();
- if (!isset($a->authors)){
- $rr = q("SELECT `id`, `network`, `url` FROM `contact` WHERE `uid`=%d AND `self`=0 AND `blocked`=0 ", intval(local_user()));
- $authors = array();
- foreach($rr as $r) $authors[$r['url']]= $r;
- $a->authors = $authors;
- }
-
+ if (local_user() && (! count($a->contacts)))
+ load_contact_links(local_user());
+
$contact_url="";
$pm_url="";
-
$status_link="";
$photos_link="";
$posts_link="";
- $profile_link = ((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
- $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
+ $sparkle = false;
+ $profile_link = best_link_url($item,$sparkle);
if($profile_link === 'mailbox')
$profile_link = '';
- // $item['contact-uid'] is only set on profile page and indicates the uid of the user who owns the profile.
-
- $profile_owner = ((x($item,'contact-uid')) && intval($item['contact-uid']) ? intval($item['contact-uid']) : 0);
-
- // So we are checking that this is a logged in user on some page that *isn't* a profile page
- // OR a profile page where the viewer owns the profile.
- // Then check if we can use a sparkle (redirect) link to the profile by virtue of it being our contact
- // or a friend's contact that we both have a connection to.
-
- if((local_user() && ($profile_owner == 0))
- || ($profile_owner && $profile_owner == local_user())) {
-
- if(strlen($item['author-link']) && link_compare($item['author-link'],$item['url'])) {
- $redir = $redirect_url;
- $cid = $item['cid'];
- }
- elseif(isset($a->authors[$item['author-link']])) {
- $redir = $a->get_baseurl() . '/redir/' . $a->authors[$item['author-link']]['id'];
- $cid = $a->authors[$item['author-link']]['id'];
- }
- if($item['author-link'] === 'mailbox')
- $cid = $item['cid'];
-
- if((isset($cid)) && (! $item['self'])) {
- $contact_url = $a->get_baseurl() . '/contacts/' . $cid;
- $posts_link = $a->get_baseurl() . '/network/?cid=' . $cid;
- if($item['network'] === 'dfrn') {
- $status_link = $redir . "?url=status";
- $profile_link = $redir . "?url=profile";
- $photos_link = $redir . "?url=photos";
- $pm_url = $a->get_baseurl() . '/message/new/' . $cid;
- }
+ if($sparkle) {
+ $cid = intval(basename($profile_link));
+ $status_link = $profile_link . "?url=status";
+ $photos_link = $profile_link . "?url=photos";
+ $profile_link = $profile_link . "?url=profile";
+ $pm_url = $a->get_baseurl() . '/message/new/' . $cid;
+ }
+ else {
+ if(local_user() && local_user() == $item['uid'] && link_compare($item['url'],$item['author-link'])) {
+ $cid = $item['contact-id'];
+ }
+ else {
+ $cid = 0;
}
}
-
+ if(($cid) && (! $item['self'])) {
+ $contact_url = $a->get_baseurl() . '/contacts/' . $cid;
+ $posts_link = $a->get_baseurl() . '/network/?cid=' . $cid;
+ }
$menu = Array(
t("View status") => $status_link,
@@ -675,18 +675,19 @@ function format_like($cnt,$arr,$type,$id) {
}}
-function status_editor($a,$x) {
+function status_editor($a,$x, $notes_cid = 0) {
$o = '';
- $geotag = (($x['allow_location']) ? load_view_file('view/jot_geotag.tpl') : '');
+ $geotag = (($x['allow_location']) ? get_markup_template('jot_geotag.tpl') : '');
- $tpl = load_view_file('view/jot-header.tpl');
+ $tpl = get_markup_template('jot-header.tpl');
$a->page['htmlhead'] .= replace_macros($tpl, array(
'$baseurl' => $a->get_baseurl(),
'$geotag' => $geotag,
'$nickname' => $x['nickname'],
+ '$ispublic' => t('Visible to
everybody'),
'$linkurl' => t('Please enter a link URL:'),
'$utubeurl' => t('Please enter a YouTube link:'),
'$vidurl' => t("Please enter a video\x28.ogg\x29 link/URL:"),
@@ -696,7 +697,7 @@ function status_editor($a,$x) {
));
- $tpl = load_view_file("view/jot.tpl");
+ $tpl = get_markup_template("jot.tpl");
$jotplugins = '';
$jotnets = '';
@@ -726,13 +727,17 @@ function status_editor($a,$x) {
call_hooks('jot_tool', $jotplugins);
call_hooks('jot_networks', $jotnets);
+ if($notes_cid)
+ $jotnets .= '
';
+
$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
$o .= replace_macros($tpl,array(
'$return_path' => $a->cmd,
'$action' => 'item',
- '$share' => t('Share'),
+ '$share' => (($x['button']) ? $x['button'] : t('Share')),
'$upload' => t('Upload photo'),
+ '$attach' => t('Attach file'),
'$weblink' => t('Insert web link'),
'$youtube' => t('Insert YouTube video'),
'$video' => t('Insert Vorbis [.ogg] video'),
@@ -742,12 +747,15 @@ function status_editor($a,$x) {
'$title' => t('Set title'),
'$wait' => t('Please wait'),
'$permset' => t('Permission settings'),
+ '$ptyp' => (($notes_cid) ? 'note' : 'wall'),
'$content' => '',
'$post_id' => '',
'$baseurl' => $a->get_baseurl(),
- '$defloc' => $x['default-location'],
+ '$defloc' => $x['default_location'],
'$visitor' => $x['visitor'],
+ '$pvisit' => (($notes_cid) ? 'none' : $x['visitor']),
'$emailcc' => t('CC: email addresses'),
+ '$public' => t('Public post'),
'$jotnets' => $jotnets,
'$emtitle' => t('Example: bob@example.com, mary@example.com'),
'$lockstate' => $x['lockstate'],