X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=12c3b2a20d38585c2367b36bdc4618c4288e510c;hb=2c63b65e3c66bcb0a047ce51c04d23376aa6c525;hp=4c858d818730e8b9f3c787ced014e53d44c671f7;hpb=229eb9c681d62edc5faa63bb1d66046d123c3f35;p=friendica.git diff --git a/include/conversation.php b/include/conversation.php index 4c858d8187..12c3b2a20d 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1,5 +1,69 @@ "; + + $obj = parse_xml_string($xmlhead.$item['object']); + $links = parse_xml_string($xmlhead."".unxmlify($obj->link).""); + + $Bname = $obj->title; + $Blink = ""; $Bphoto = ""; + foreach ($links->link as $l){ + $atts = $l->attributes(); + switch($atts['rel']){ + case "alternate": $Blink = $atts['href']; + case "photo": $Bphoto = $atts['href']; + } + + } + + $A = '[url=' . $Alink . ']' . $Aname . '[/url]'; + $B = '[url=' . $Blink . ']' . $Bname . '[/url]'; + if ($Bphoto!="") $Bphoto = '[url=' . $Blink . '][img]' . $Bphoto . '[/img][/url]'; + + $item['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto; + + } + +} + /** * "Render" a conversation or list of items for HTML display. * There are two major forms of display: @@ -10,7 +74,6 @@ * that are based on unique features of the calling module. * */ - function conversation(&$a, $items, $mode, $update) { require_once('bbcode.php'); @@ -38,12 +101,7 @@ function conversation(&$a, $items, $mode, $update) { else $return_url = $_SESSION['return_url'] = $a->cmd; - - // find all the authors involved in remote conversations - // We will use a local profile photo if they are one of our contacts - // otherwise we have to get the photo from the item owner's site - - $author_contacts = extract_item_authors($items,local_user()); + load_contact_links(local_user()); $cmnt_tpl = load_view_file('view/comment_item.tpl'); @@ -84,22 +142,14 @@ function conversation(&$a, $items, $mode, $update) { $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']); $profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']); - $profile_link = ((strlen($item['author-link'])) ? $item['author-link'] : $item['url']); + + $sp = false; + $profile_link = best_link_url($item,$sp); + if($sp) + $sparkle = ' sparkle'; if($profile_link === 'mailbox') $profile_link = ''; - $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ; - - if(strlen($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'; - } - } $location = (($item['location']) ? '' . $item['location'] . '' : ''); $coord = (($item['coord']) ? '' . $item['coord'] . '' : ''); @@ -118,7 +168,8 @@ function conversation(&$a, $items, $mode, $update) { $drop = replace_macros((($dropping)? $droptpl : $fakedrop), array('$id' => $item['id'], '$delete' => t('Delete'))); - + // + localize_item($item); $drop = replace_macros($droptpl,array('$id' => $item['id'])); $lock = '
'; @@ -161,7 +212,7 @@ function conversation(&$a, $items, $mode, $update) { $comments = array(); foreach($items as $item) { - if(intval($item['gravity']) == 6) { + if((intval($item['gravity']) == 6) && ($item['id'] != $item['parent'])) { if(! x($comments,$item['parent'])) $comments[$item['parent']] = 1; else @@ -230,6 +281,7 @@ function conversation(&$a, $items, $mode, $update) { $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)) { @@ -304,7 +356,7 @@ function conversation(&$a, $items, $mode, $update) { )); } - if(($show_comment_box) || (($show_comment_box == false) && ($item['last-child']))) { + 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'] : ''), @@ -338,33 +390,15 @@ function conversation(&$a, $items, $mode, $update) { $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 = ''; + $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']) : ''); @@ -384,6 +418,9 @@ function conversation(&$a, $items, $mode, $update) { if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0) $indent .= ' shiny'; + // + localize_item($item); + // Build the HTML $tmp_item = replace_macros($template,array( @@ -435,101 +472,105 @@ function conversation(&$a, $items, $mode, $update) { } +if(! function_exists('load_contact_links')) { +function load_contact_links($uid) { + + $a = get_app(); + $ret = array(); -if(! function_exists('extract_item_authors')) { -function extract_item_authors($arr,$uid) { + if(! $uid || x($a->contacts,'empty')) + return; - 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']) . "'"; + $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; +}} + - // 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; +function best_link_url($item,&$sparkle) { + + $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=""; - $photo_link=""; - $profile_link = ((strlen($item['author-link'])) ? $item['author-link'] : $item['url']); - $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ; + $photos_link=""; + $posts_link=""; + $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; - 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, t("View profile") => $profile_link, t("View photos") => $photos_link, + t("View recent") => $posts_link, t("Edit contact") => $contact_url, t("Send PM") => $pm_url, ); @@ -602,3 +643,89 @@ function format_like($cnt,$arr,$type,$id) { } return $o; }} + + +function status_editor($a,$x) { + + $o = ''; + + $geotag = (($x['allow_location']) ? load_view_file('view/jot_geotag.tpl') : ''); + + $tpl = load_view_file('view/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:"), + '$audurl' => t("Please enter an audio\x28.ogg\x29 link/URL:"), + '$whereareu' => t('Where are you right now?'), + '$title' => t('Enter a title for this item') + )); + + + $tpl = load_view_file("view/jot.tpl"); + + $jotplugins = ''; + $jotnets = ''; + + $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1); + + $mail_enabled = false; + $pubmail_enabled = false; + + if(($x['is_owner']) && (! $mail_disabled)) { + $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", + intval(local_user()) + ); + if(count($r)) { + $mail_enabled = true; + if(intval($r[0]['pubmail'])) + $pubmail_enabled = true; + } + } + + if($mail_enabled) { + $selected = (($pubmail_enabled) ? ' checked="checked" ' : ''); + $jotnets .= '
' + . t("Post to Email") . '
'; + } + + call_hooks('jot_tool', $jotplugins); + call_hooks('jot_networks', $jotnets); + + $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); + + $o .= replace_macros($tpl,array( + '$return_path' => $a->cmd, + '$action' => 'item', + '$share' => t('Share'), + '$upload' => t('Upload photo'), + '$weblink' => t('Insert web link'), + '$youtube' => t('Insert YouTube video'), + '$video' => t('Insert Vorbis [.ogg] video'), + '$audio' => t('Insert Vorbis [.ogg] audio'), + '$setloc' => t('Set your location'), + '$noloc' => t('Clear browser location'), + '$title' => t('Set title'), + '$wait' => t('Please wait'), + '$permset' => t('Permission settings'), + '$content' => '', + '$post_id' => '', + '$baseurl' => $a->get_baseurl(), + '$defloc' => $x['default_location'], + '$visitor' => $x['visitor'], + '$emailcc' => t('CC: email addresses'), + '$jotnets' => $jotnets, + '$emtitle' => t('Example: bob@example.com, mary@example.com'), + '$lockstate' => $x['lockstate'], + '$acl' => $x['acl'], + '$bang' => $x['bang'], + '$profile_uid' => $x['profile_uid'], + )); + + return $o; +} \ No newline at end of file