X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnetwork.php;h=2ff15a29b780fe8fc4541b3c7cb0f0adacd52aff;hb=a41b4c6e6726b1158a8d05f37c1630d67e462fe5;hp=5073b8a61d28269a11b3462a26c534d7d20b9254;hpb=8b997791819ba419e7e2ceb7861bb0e3e37d87dd;p=friendica.git
diff --git a/mod/network.php b/mod/network.php
index 5073b8a61d..2ff15a29b7 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -2,9 +2,25 @@
function network_init(&$a) {
+ if(! local_user()) {
+ notice( t('Permission denied.') . EOL);
+ return;
+ }
+
+
require_once('include/group.php');
if(! x($a->page,'aside'))
$a->page['aside'] = '';
+
+ $a->page['aside'] .= '
';
+
$a->page['aside'] .= group_side('network','network');
}
@@ -12,7 +28,7 @@ function network_init(&$a) {
function network_content(&$a, $update = 0) {
if(! local_user())
- return '';
+ return login(false);
$o = '';
@@ -22,14 +38,24 @@ function network_content(&$a, $update = 0) {
$group = 0;
- if(! $update) {
- $o .= '';
+ $nouveau = false;
+ require_once('include/acl_selectors.php');
- // pull out the group here because the updater might have different args
- if($a->argc > 1) {
+ if(($a->argc > 2) && $a->argv[2] === 'new')
+ $nouveau = true;
+
+ if($a->argc > 1) {
+ if($a->argv[1] === 'new')
+ $nouveau = true;
+ else {
$group = intval($a->argv[1]);
$group_acl = array('allow_gid' => '<' . $group . '>');
}
+ }
+
+ if(! $update) {
+ $o .= '';
+
$_SESSION['return_url'] = $a->cmd;
$geotag = (($a->user['allow_location']) ? load_view_file('view/jot_geotag.tpl') : '');
@@ -39,10 +65,14 @@ function network_content(&$a, $update = 0) {
$a->page['htmlhead'] .= replace_macros($tpl, array(
'$baseurl' => $a->get_baseurl(),
'$geotag' => $geotag,
- '$nickname' => $a->user['nickname']
+ '$nickname' => $a->user['nickname'],
+ '$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?')
));
- require_once('include/acl_selectors.php');
$tpl = load_view_file("view/jot.tpl");
@@ -53,15 +83,38 @@ function network_content(&$a, $update = 0) {
$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
+ $jotplugins = '';
+ $jotnets = '';
+ 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'),
+ '$wait' => t('Please wait'),
+ '$permset' => t('Permission settings'),
+ '$content' => '',
+ '$post_id' => '',
'$baseurl' => $a->get_baseurl(),
'$defloc' => $a->user['default-location'],
'$visitor' => 'block',
+ '$emailcc' => t('CC: email addresses'),
+ '$jotnets' => $jotnets,
+ '$emtitle' => t('Example: bob@example.com, mary@example.com'),
'$lockstate' => $lockstate,
'$acl' => populate_acl((($group) ? $group_acl : $a->user), $celeb),
'$bang' => (($group) ? '!' : ''),
- '$profile_uid' => $_SESSION['uid']
+ '$profile_uid' => local_user()
));
@@ -70,10 +123,10 @@ function network_content(&$a, $update = 0) {
// filtering by group and also you aren't writing a comment (the last
// criteria is discovered in javascript).
- if($a->pager['start'] == 0 && $a->argc == 1) {
$o .= '' . "\r\n";
- $o .= "\r\n";
- }
+ $o .= "\r\n";
}
@@ -98,6 +151,8 @@ function network_content(&$a, $update = 0) {
intval($_SESSION['uid'])
);
if(! count($r)) {
+ if($update)
+ killme();
notice( t('No such group') . EOL );
goaway($a->get_baseurl() . '/network');
return; // NOTREACHED
@@ -111,8 +166,9 @@ function network_content(&$a, $update = 0) {
$contact_str = ' 0 ';
notice( t('Group is empty'));
}
+
$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND `contact-id` IN ( $contact_str )) ";
- $o = '' . t('Group: ') . $r[0]['name'] . '
' . $o;
+ $o = '' . t('Group: ') . $r[0]['name'] . '
' . $o;
}
if((! $group) && (! $update))
@@ -127,26 +183,85 @@ function network_content(&$a, $update = 0) {
intval($_SESSION['uid'])
);
- if(count($r))
+ if(count($r)) {
$a->set_pager_total($r[0]['total']);
+ $a->set_pager_itemspage(40);
+ }
- $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
- `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
- `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
- `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
- FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
- WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
- AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
- $sql_extra
- ORDER BY `parent` DESC, `gravity` ASC, `created` ASC LIMIT %d ,%d ",
- intval($_SESSION['uid']),
- intval($a->pager['start']),
- intval($a->pager['itemspage'])
- );
+ if($nouveau) {
+
+ // "New Item View" - show all items unthreaded in reverse created date order
+
+ $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
+ `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+ `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
+ `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
+ FROM `item`, `contact`
+ WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+ AND `contact`.`id` = `item`.`contact-id`
+ AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+ $sql_extra
+ ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
+ intval($_SESSION['uid']),
+ intval($a->pager['start']),
+ intval($a->pager['itemspage'])
+ );
+ }
+ else {
+
+ // Normal conversation view
+ // First fetch a known number of parent items
+
+ $r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact_uid`
+ FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+ WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+ AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+ AND `item`.`parent` = `item`.`id`
+ $sql_extra
+ ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
+ intval(local_user()),
+ intval($a->pager['start']),
+ intval($a->pager['itemspage'])
+ );
+
+
+ // Then fetch all the children of the parents that are on this page
+
+ $parents_arr = array();
+ $parents_str = '';
+
+ if(count($r)) {
+ foreach($r as $rr)
+ $parents_arr[] = $rr['item_id'];
+ $parents_str = implode(', ', $parents_arr);
+
+ $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
+ `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+ `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
+ `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
+ FROM `item`, (SELECT `p`.`id`,`p`.`created` FROM `item` AS `p` WHERE `p`.`parent`=`p`.`id`) as `parentitem`, `contact`
+ WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+ AND `contact`.`id` = `item`.`contact-id`
+ AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+ AND `item`.`parent` = `parentitem`.`id` AND `item`.`parent` IN ( %s )
+ $sql_extra
+ ORDER BY `parentitem`.`created` DESC, `item`.`gravity` ASC, `item`.`created` ASC ",
+ intval(local_user()),
+ dbesc($parents_str)
+ );
+ }
+ }
+
+ // 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($r,local_user());
$cmnt_tpl = load_view_file('view/comment_item.tpl');
$like_tpl = load_view_file('view/like.tpl');
+ $noshare_tpl = load_view_file('view/like_noshare.tpl');
$tpl = load_view_file('view/wall_item.tpl');
$wallwall = load_view_file('view/wallwall_item.tpl');
@@ -155,25 +270,161 @@ function network_content(&$a, $update = 0) {
if(count($r)) {
+ if($nouveau) {
+
+ // "New Item View" - just loop through the items and format them minimally for display
+
+ $tpl = load_view_file('view/search_item.tpl');
+ $droptpl = load_view_file('view/wall_fake_drop.tpl');
+
+ foreach($r as $item) {
+
+ $comment = '';
+ $owner_url = '';
+ $owner_photo = '';
+ $owner_name = '';
+ $sparkle = '';
+
+ $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']);
+
+ $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'] . '' : '');
+ if($coord) {
+ if($location)
+ $location .= '
(' . $coord . ')';
+ else
+ $location = '' . $coord . '';
+ }
+
+ $drop = replace_macros($droptpl,array('$id' => $item['id']));
+ $lock = '';
+
+ $o .= replace_macros($tpl,array(
+ '$id' => $item['item_id'],
+ '$linktitle' => t('View $name\'s profile'),
+ '$profile_url' => $profile_link,
+ '$name' => $profile_name,
+ '$sparkle' => $sparkle,
+ '$lock' => $lock,
+ '$thumb' => $profile_avatar,
+ '$title' => $item['title'],
+ '$body' => smilies(bbcode($item['body'])),
+ '$ago' => relative_date($item['created']),
+ '$location' => $location,
+ '$indent' => '',
+ '$owner_url' => $owner_url,
+ '$owner_photo' => $owner_photo,
+ '$owner_name' => $owner_name,
+ '$drop' => $drop,
+ '$conv' => '' . t('View in context') . ''
+ ));
+
+ }
+ $o .= paginate($a);
+
+ return $o;
+
+ }
+
+ // 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($r as $rr) {
+ if(intval($rr['gravity']) == 6) {
+ if(! x($comments,$rr['parent']))
+ $comments[$rr['parent']] = 1;
+ else
+ $comments[$rr['parent']] += 1;
+ }
+ }
+
+ // map all the like/dislike activities for each parent item
+ // Store these in the $alike and $dlike arrays
+
foreach($r as $item) {
like_puller($a,$item,$alike,'like');
like_puller($a,$item,$dlike,'dislike');
}
+ $comments_collapsed = false;
+ $blowhard = 0;
+ $blowhard_count = 0;
+
foreach($r as $item) {
$comment = '';
$template = $tpl;
$commentww = '';
+ $sparkle = '';
$owner_url = $owner_photo = $owner_name = '';
- $profile_url = $item['url'];
- $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
+ // We've already parsed out like/dislike for special treatment. We can ignore them now
- if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) && ($item['id'] != $item['parent']))
+ if(((activity_match($item['verb'],ACTIVITY_LIKE))
+ || (activity_match($item['verb'],ACTIVITY_DISLIKE)))
+ && ($item['id'] != $item['parent']))
continue;
+ // 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($item['id'] == $item['parent']) {
+ if($blowhard == $item['cid'] && (! $item['self'])) {
+ $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;
+ }
+ else
+ $comments_seen ++;
+
+
+ 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']]) . '
';
+ $o .= '';
+ $comments_collapsed = true;
+ }
+ }
+ if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) {
+ $o .= '
';
+ }
+
+
+
+ $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
$lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
@@ -204,12 +455,11 @@ function network_content(&$a, $update = 0) {
$template = $wallwall;
$commentww = 'ww';
// If it is our contact, use a friendly redirect link
- if(($item['owner-link'] == $item['url'])
+ if((link_compare($item['owner-link'],$item['url']))
&& ($item['network'] === 'dfrn')) {
$owner_url = $redirect_url;
$osparkle = ' sparkle';
}
-
}
}
@@ -220,12 +470,19 @@ function network_content(&$a, $update = 0) {
$likebuttons = '';
if($item['id'] == $item['parent']) {
- $likebuttons = replace_macros($like_tpl,array('$id' => $item['id']));
+ $likebuttons = replace_macros((($item['private']) ? $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')
+ ));
}
if($item['last-child']) {
$comment = replace_macros($cmnt_tpl,array(
- '$return_path' => $_SESSION['return_url'],
+ '$return_path' => '',
+ '$jsreload' => '', // $_SESSION['return_url'],
'$type' => 'net-comment',
'$id' => $item['item_id'],
'$parent' => $item['parent'],
@@ -237,47 +494,40 @@ function network_content(&$a, $update = 0) {
));
}
- $drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id']));
-
-
-
- if(($item['network'] === 'dfrn') && (! $item['self'] )) {
- $profile_url = $redirect_url;
- $sparkle = ' sparkle';
- }
+ $edpost = '';
+ if(($item['id'] == $item['parent']) && (intval($item['wall']) == 1))
+ $edpost = '';
+ $drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
$photo = $item['photo'];
$thumb = $item['thumb'];
// Post was remotely authored.
- $diff_author = (($item['url'] !== $item['author-link']) ? true : 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']);
$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
-
- $profile_link = $profile_url;
-
- // Can we use our special contact URL for this author?
-
if(strlen($item['author-link'])) {
- if($item['author-link'] == $item['url'] && ($item['network'] === 'dfrn') && (! $item['self'])) {
+ $profile_link = $item['author-link'];
+ if(link_compare($item['author-link'],$item['url']) && ($item['network'] === 'dfrn') && (! $item['self'])) {
$profile_link = $redirect_url;
$sparkle = ' sparkle';
}
- else {
- $profile_link = $item['author-link'];
- $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'];
$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'] . '' : '');
+ $location = (($item['location']) ? '' . $item['location'] . '' : '');
+ $coord = (($item['coord']) ? '' . $item['coord'] . '' : '');
if($coord) {
if($location)
$location .= '
(' . $coord . ')';
@@ -295,7 +545,11 @@ function network_content(&$a, $update = 0) {
$tmp_item = replace_macros($template,array(
'$id' => $item['item_id'],
- '$title' => t('View $name\'s profile'),
+ '$linktitle' => t('View $name\'s profile'),
+ '$olinktitle' => t('View $owner_name\'s profile'),
+ '$to' => t('to'),
+ '$wall' => t('Wall-to-Wall'),
+ '$vwall' => t('via Wall-To-Wall:'),
'$profile_url' => $profile_link,
'$name' => $profile_name,
'$thumb' => $profile_avatar,
@@ -310,6 +564,8 @@ function network_content(&$a, $update = 0) {
'$owner_url' => $owner_url,
'$owner_photo' => $owner_photo,
'$owner_name' => $owner_name,
+ '$plink' => get_plink($item),
+ '$edpost' => $edpost,
'$drop' => $drop,
'$vote' => $likebuttons,
'$like' => $like,
@@ -325,8 +581,17 @@ function network_content(&$a, $update = 0) {
}
}
- if(! $update)
+ if(! $update) {
+
+ // if author collapsing is in force but didn't get closed, close it off now.
+
+ if($blowhard_count >= 3)
+ $o .= '';
+
+
$o .= paginate($a);
+ $o .= '';
+ }
return $o;
}
\ No newline at end of file