X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnetwork.php;h=a9f369a894182fac5831c85d63438b3b04baa121;hb=0370a2e6f3149d667d4cac7510d93998aefe7d69;hp=a8faeb459e1dde4a016bd394fbe01863741fff25;hpb=4b0e370c4c2ec606833aa326fba49922a7c470ab;p=friendica.git diff --git a/mod/network.php b/mod/network.php index a8faeb459e..a9f369a894 100644 --- a/mod/network.php +++ b/mod/network.php @@ -1,6 +1,4 @@ argc > 1) { for($x = 1; $x < $a->argc; $x ++) { @@ -18,10 +18,12 @@ function network_init(&$a) { } } - // convert query string to array and remove first element (which is friendica args) - $query_array = array(); - parse_str($a->query_string, $query_array); - array_shift($query_array); + // convert query string to array. remove friendica args + $query_array = array(); + $query_string = str_replace($a->cmd."?", "", $a->query_string); + parse_str($query_string, $query_array); + array_shift($query_array); + // fetch last used network view and redirect if needed if(! $is_a_date_query) { @@ -48,37 +50,37 @@ function network_init(&$a) { if($remember_tab) { // redirect if current selected tab is '/network' and - // last selected tab is _not_ '/network?f=&order=comment'. + // last selected tab is _not_ '/network?f=&order=comment'. // and this isn't a date query $tab_baseurls = array( '', //all '', //postord '', //conv - '/new', //new + '/new', //new '', //starred '', //bookmarked '', //spam ); $tab_args = array( 'f=&order=comment', //all - 'f=&order=post', //postord - 'f=&conv=1', //conv - '', //new - 'f=&star=1', //starred - 'f=&bmark=1', //bookmarked - 'f=&spam=1', //spam + 'f=&order=post', //postord + 'f=&conv=1', //conv + '', //new + 'f=&star=1', //starred + 'f=&bmark=1', //bookmarked + 'f=&spam=1', //spam ); $k = array_search('active', $last_sel_tabs); $net_baseurl .= $tab_baseurls[$k]; - // parse out tab queries - $dest_qa = array(); - $dest_qs = $tab_args[$k]; - parse_str( $dest_qs, $dest_qa); - $net_args = array_merge($net_args, $dest_qa); + // parse out tab queries + $dest_qa = array(); + $dest_qs = $tab_args[$k]; + parse_str( $dest_qs, $dest_qa); + $net_args = array_merge($net_args, $dest_qa); } else if($sel_tabs[4] === 'active') { // The '/new' tab is selected @@ -88,57 +90,20 @@ function network_init(&$a) { if($remember_net) { $net_args['nets'] = $last_sel_nets; } + else if($sel_nets!==false) { + $net_args['nets'] = $sel_nets; + } if($remember_tab || $remember_net || $remember_group) { - $net_args = array_merge($query_array, $net_args); - $net_queries = build_querystring($net_args); - - // groups filter is in form of "network/nnn". Add it to $dest_url, if it's possible - //if ($a->argc==2 && is_numeric($a->argv[1]) && strpos($net_baseurl, "/",1)===false){ - // $net_baseurl .= "/".$a->argv[1]; - //} + $net_args = array_merge($query_array, $net_args); + $net_queries = build_querystring($net_args); $redir_url = ($net_queries ? $net_baseurl."?".$net_queries : $net_baseurl); + goaway($a->get_baseurl() . $redir_url); } } -/* $sel_tabs = network_query_get_sel_tab($a); - $last_sel_tabs = get_pconfig(local_user(), 'network.view','tab.selected'); - if (is_array($last_sel_tabs)){ - $tab_urls = array( - '/network?f=&order=comment',//all - '/network?f=&order=post', //postord - '/network?f=&conv=1', //conv - '/network/new', //new - '/network?f=&star=1', //starred - '/network?f=&bmark=1', //bookmarked - '/network?f=&spam=1', //spam - ); - - // redirect if current selected tab is 'no_active' and - // last selected tab is _not_ 'all_active'. - // and this isn't a date query - - if ($sel_tabs[0] == 'active' && $last_sel_tabs[0]!='active' && (! $is_a_date_query)) { - $k = array_search('active', $last_sel_tabs); - - // merge tab querystring with request querystring - $dest_qa = array(); - list($dest_url,$dest_qs) = explode("?", $tab_urls[$k]); - parse_str( $dest_qs, $dest_qa); - $dest_qa = array_merge($query_array, $dest_qa); - $dest_qs = build_querystring($dest_qa); - - // groups filter is in form of "network/nnn". Add it to $dest_url, if it's possible - if ($a->argc==2 && is_numeric($a->argv[1]) && strpos($dest_url, "/",1)===false){ - $dest_url .= "/".$a->argv[1]; - } - - goaway($a->get_baseurl() . $dest_url."?".$dest_qs); - } - }*/ - if(x($_GET['nets']) && $_GET['nets'] === 'all') unset($_GET['nets']); @@ -149,6 +114,7 @@ function network_init(&$a) { require_once('include/group.php'); require_once('include/contact_widgets.php'); require_once('include/items.php'); + require_once('include/ForumManager.php'); if(! x($a->page,'aside')) $a->page['aside'] = ''; @@ -156,19 +122,19 @@ function network_init(&$a) { $search = ((x($_GET,'search')) ? escape_tags($_GET['search']) : ''); if(x($_GET,'save')) { - $r = q("select * from `search` where `uid` = %d and `term` = '%s' limit 1", + $r = q("SELECT * FROM `search` WHERE `uid` = %d AND `term` = '%s' LIMIT 1", intval(local_user()), dbesc($search) ); if(! count($r)) { - q("insert into `search` ( `uid`,`term` ) values ( %d, '%s') ", + q("INSERT INTO `search` ( `uid`,`term` ) VALUES ( %d, '%s') ", intval(local_user()), dbesc($search) ); } } if(x($_GET,'remove')) { - q("delete from `search` where `uid` = %d and `term` = '%s'", + q("DELETE FROM `search` WHERE `uid` = %d AND `term` = '%s'", intval(local_user()), dbesc($search) ); @@ -176,14 +142,17 @@ function network_init(&$a) { // search terms header if(x($_GET,'search')) { - $a->page['content'] .= '
"; var_dump($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active); killme(); $cmd = (($datequery) ? '' : $a->cmd); $len_naked_cmd = strlen(str_replace('/new','',$cmd)); @@ -391,98 +362,67 @@ function network_content(&$a, $update = 0) { // tabs $tabs = array( array( - 'label' => t('Commented Order'), - 'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), - 'sel'=>$all_active, - 'title'=> t('Sort by Comment Date'), + 'label' => t('Commented Order'), + 'url' => str_replace('/new', '', $cmd) . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), + 'sel' => $all_active, + 'title' => t('Sort by Comment Date'), + 'id' => 'commented-order-tab', + 'accesskey' => "e", ), array( - 'label' => t('Posted Order'), - 'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), - 'sel'=>$postord_active, - 'title' => t('Sort by Post Date'), + 'label' => t('Posted Order'), + 'url' => str_replace('/new', '', $cmd) . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), + 'sel' => $postord_active, + 'title' => t('Sort by Post Date'), + 'id' => 'posted-order-tab', + 'accesskey' => "t", ), - -/* array( - 'label' => t('Personal'), - 'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&conv=1', - 'sel' => $conv_active, - 'title' => t('Posts that mention or involve you'), - ),*/ -/* array( - 'label' => t('New'), - 'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ($len_naked_cmd ? '/' : '') . 'new' . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : ''), - 'sel' => $new_active, - 'title' => t('Activity Stream - by date'), - ),*/ -/* array( - 'label' => t('Starred'), - 'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&star=1', - 'sel'=>$starred_active, - 'title' => t('Favourite Posts'), - ),*/ -/* array( - 'label' => t('Shared Links'), - 'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&bmark=1', - 'sel'=>$bookmarked_active, - 'title'=> t('Interesting Links'), - ), */ -// array( -// 'label' => t('Spam'), -// 'url'=>$a->get_baseurl(true) . '/network?f=&spam=1' -// 'sel'=> $spam_active, -// 'title' => t('Posts flagged as SPAM'), -// ), - ); if(feature_enabled(local_user(),'personal_tab')) { $tabs[] = array( - 'label' => t('Personal'), - 'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&conv=1', - 'sel' => $conv_active, - 'title' => t('Posts that mention or involve you'), + 'label' => t('Personal'), + 'url' => str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&conv=1', + 'sel' => $conv_active, + 'title' => t('Posts that mention or involve you'), + 'id' => 'personal-tab', + 'accesskey' => "r", ); } if(feature_enabled(local_user(),'new_tab')) { $tabs[] = array( - 'label' => t('New'), - 'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ($len_naked_cmd ? '/' : '') . 'new' . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : ''), - 'sel' => $new_active, - 'title' => t('Activity Stream - by date'), + 'label' => t('New'), + 'url' => str_replace('/new', '', $cmd) . ($len_naked_cmd ? '/' : '') . 'new' . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : ''), + 'sel' => $new_active, + 'title' => t('Activity Stream - by date'), + 'id' => 'activitiy-by-date-tab', + 'accesskey' => "w", ); } if(feature_enabled(local_user(),'link_tab')) { $tabs[] = array( - 'label' => t('Shared Links'), - 'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&bmark=1', - 'sel'=>$bookmarked_active, - 'title'=> t('Interesting Links'), + 'label' => t('Shared Links'), + 'url' => str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&bmark=1', + 'sel' => $bookmarked_active, + 'title' => t('Interesting Links'), + 'id' => 'shared-links-tab', + 'accesskey' => "b", ); } if(feature_enabled(local_user(),'star_posts')) { $tabs[] = array( - 'label' => t('Starred'), - 'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&star=1', - 'sel'=>$starred_active, - 'title' => t('Favourite Posts'), + 'label' => t('Starred'), + 'url' => str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&star=1', + 'sel' => $starred_active, + 'title' => t('Favourite Posts'), + 'id' => 'starred-posts-tab', + 'accesskey' => "m", ); } - // Not yet implemented - -/* if(feature_enabled(local_user(),'spam_filter')) { - $tabs[] = array( - 'label' => t('Spam'), - 'url'=>$a->get_baseurl(true) . '/network?f=&spam=1', - 'sel'=> $spam_active, - 'title' => t('Posts flagged as SPAM'), - ); - }*/ - // save selected tab, but only if not in search or file mode if(!x($_GET,'search') && !x($_GET,'file')) { set_pconfig( local_user(), 'network.view','tab.selected',array($all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active) ); @@ -519,7 +459,7 @@ function network_content(&$a, $update = 0) { $def_acl = array('allow_cid' => '<' . intval($cid) . '>'); if($nets) { - $r = q("select id from contact where uid = %d and network = '%s' and self = 0", + $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND network = '%s' AND `self` = 0", intval(local_user()), dbesc($nets) ); @@ -533,7 +473,7 @@ function network_content(&$a, $update = 0) { } set_pconfig(local_user(), 'network.view', 'net.selected', ($nets ? $nets : 'all')); - if(! $update) { + if(!$update AND !$rawmode) { if($group) { if(($t = group_public_members($group)) && (! get_pconfig(local_user(),'system','nowarn_insecure'))) { notice( sprintf( tt('Warning: This group contains %s member from an insecure network.', @@ -545,20 +485,33 @@ function network_content(&$a, $update = 0) { nav_set_selected('network'); - $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); + $content = ""; + + if ($cid) { + // If $cid belongs to a communitity forum or a privat goup,.add a mention to the status editor + $contact = q("SELECT `nick` FROM `contact` WHERE `id` = %d AND `uid` = %d AND (`forum` OR `prv`) ", + intval($cid), + intval(local_user()) + ); + if ($contact) + $content = "@".$contact[0]["nick"]."+".$cid; + } $x = array( 'is_owner' => true, 'allow_location' => $a->user['allow_location'], 'default_location' => $a->user['default-location'], 'nickname' => $a->user['nickname'], - 'lockstate' => ((($group) || ($cid) || ($nets) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'), - 'default_perms' => get_acl_permissions($a->user), - 'acl' => populate_acl((($group || $cid || $nets) ? $def_acl : $a->user), $celeb), - 'bang' => (($group || $cid || $nets) ? '!' : ''), + 'lockstate'=> ((($group) || ($cid) || ($nets) || (is_array($a->user) && + ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || + (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'), + 'default_perms' => get_acl_permissions($a->user), + 'acl' => populate_acl((($group || $cid || $nets) ? $def_acl : $a->user), true), + 'bang' => (($group || $cid || $nets) ? '!' : ''), 'visitor' => 'block', 'profile_uid' => local_user(), 'acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector + 'content' => $content, ); $o .= status_editor($a,$x); @@ -567,15 +520,23 @@ function network_content(&$a, $update = 0) { // We don't have to deal with ACLs on this page. You're looking at everything // that belongs to you, hence you can see all of it. We will filter by group if - // desired. + // desired. + $sql_post_table = ""; $sql_options = (($star) ? " and starred = 1 " : ''); $sql_options .= (($bmark) ? " and bookmark = 1 " : ''); + $sql_extra = $sql_options; + $sql_extra2 = ""; + $sql_extra3 = ""; + $sql_table = "`thread`"; + $sql_parent = "`iid`"; - //$sql_nets = (($nets) ? sprintf(" and `contact`.`network` = '%s' ", dbesc($nets)) : ''); - $sql_nets = (($nets) ? sprintf(" and `item`.`network` = '%s' ", dbesc($nets)) : ''); + if ($nouveau OR strlen($file) OR $update) { + $sql_table = "`item`"; + $sql_parent = "`parent`"; + } - $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $sql_options ) "; + $sql_nets = (($nets) ? sprintf(" and $sql_table.`network` = '%s' ", dbesc($nets)) : ''); if($group) { $r = q("SELECT `name`, `id` FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1", @@ -586,35 +547,63 @@ function network_content(&$a, $update = 0) { if($update) killme(); notice( t('No such group') . EOL ); - goaway($a->get_baseurl(true) . '/network/0'); + goaway('network/0'); // NOTREACHED } $contacts = expand_groups(array($group)); + $gcontacts = expand_groups(array($group), false, true); + if((is_array($contacts)) && count($contacts)) { + $contact_str_self = ""; + $gcontact_str_self = ""; + $contact_str = implode(',',$contacts); + $gcontact_str = implode(',',$gcontacts); + $self = q("SELECT `contact`.`id`, `gcontact`.`id` AS `gid` FROM `contact` + INNER JOIN `gcontact` ON `gcontact`.`nurl` = `contact`.`nurl` + WHERE `uid` = %d AND `self`", intval($_SESSION['uid'])); + if (count($self)) { + $contact_str_self = $self[0]["id"]; + $gcontact_str_self = $self[0]["gid"]; + } + + $sql_post_table = " INNER JOIN `item` AS `temp1` ON `temp1`.`id` = ".$sql_table.".".$sql_parent; + $sql_extra3 .= " AND ($sql_table.`contact-id` IN ($contact_str) "; + $sql_extra3 .= " OR ($sql_table.`contact-id` = '$contact_str_self' AND `temp1`.`allow_gid` LIKE '".protect_sprintf('%<'.intval($group).'>%')."' AND `temp1`.`private`))"; + } else { + $sql_extra3 .= " AND false "; + info( t('Group is empty')); } - else { - $contact_str = ' 0 '; - info( t('Group is empty')); - } - $sql_table = "`item` INNER JOIN (SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $sql_options AND (`contact-id` IN ($contact_str) OR `allow_gid` like '".protect_sprintf('%<'.intval($group).'>%')."') and deleted = 0 ORDER BY `created` DESC) AS `temp1` ON item.parent = `temp1`.parent "; - $sql_extra = ""; - //$sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $sql_options AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` like '" . protect_sprintf('%<' . intval($group) . '>%') . "' ) and deleted = 0 ) "; - $o = '' . t('Group: ') . $r[0]['name'] . '
' . $o; + $o = replace_macros(get_markup_template("section_title.tpl"),array( + '$title' => sprintf( t('Group: %s'), $r[0]['name']) + )) . $o; + } elseif($cid) { - $r = q("SELECT `id`,`name`,`network`,`writable`,`nurl` FROM `contact` WHERE `id` = %d + $r = q("SELECT `id`,`name`,`network`,`writable`,`nurl`, `forum`, `prv`, `addr`, `thumb`, `location` FROM `contact` WHERE `id` = %d AND `blocked` = 0 AND `pending` = 0 LIMIT 1", intval($cid) ); if(count($r)) { - $sql_table = "`item` INNER JOIN (SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $sql_options AND `contact-id` = ".intval($cid)." and deleted = 0 ORDER BY `item`.`received` DESC) AS `temp1` ON item.parent = `temp1`.parent "; - $sql_extra = ""; - //$sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $sql_options AND `contact-id` = " . intval($cid) . " and deleted = 0 ) "; - $o = '' . t('Contact: ') . $r[0]['name'] . '
' . $o; + $sql_extra = " AND ".$sql_table.".`contact-id` = ".intval($cid); + + $entries[0] = array( + 'id' => 'network', + 'name' => htmlentities($r[0]['name']), + 'itemurl' => (($r[0]['addr']) ? ($r[0]['addr']) : ($r[0]['nurl'])), + 'thumb' => proxy_url($r[0]['thumb'], false, PROXY_SIZE_THUMB), + 'account_type' => (($r[0]['forum']) || ($r[0]['prv']) ? t('Forum') : ''), + 'details' => $r[0]['location'], + ); + + $o = replace_macros(get_markup_template("viewcontact_template.tpl"),array( + 'contacts' => $entries, + 'id' => 'network', + )) . $o; + if($r[0]['network'] === NETWORK_OSTATUS && $r[0]['writable'] && (! get_pconfig(local_user(),'system','nowarn_insecure'))) { notice( t('Private messages to this person are at risk of public disclosure.') . EOL); } @@ -622,7 +611,7 @@ function network_content(&$a, $update = 0) { } else { notice( t('Invalid contact.') . EOL); - goaway($a->get_baseurl(true) . '/network'); + goaway('network'); // NOTREACHED } } @@ -632,23 +621,19 @@ function network_content(&$a, $update = 0) { $o .= get_events(); } - $sql_extra3 = ''; - if($datequery) { - $sql_extra3 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery)))); + $sql_extra3 .= protect_sprintf(sprintf(" AND $sql_table.created <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery)))); } if($datequery2) { - $sql_extra3 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2)))); + $sql_extra3 .= protect_sprintf(sprintf(" AND $sql_table.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2)))); } - $sql_extra2 = (($nouveau) ? '' : " AND `item`.`parent` = `item`.`id` "); + //$sql_extra2 = (($nouveau) ? '' : " AND `item`.`parent` = `item`.`id` "); + $sql_extra2 = (($nouveau) ? '' : $sql_extra2); $sql_extra3 = (($nouveau) ? '' : $sql_extra3); - //$sql_order = "`item`.`received`"; $sql_order = ""; $order_mode = "received"; - - if ($sql_table == "") - $sql_table = "`item`"; + $tag = false; if(x($_GET,'search')) { $search = escape_tags($_GET['search']); @@ -662,44 +647,30 @@ function network_content(&$a, $update = 0) { $tag = true; if($tag) { - //$sql_extra = sprintf(" AND `term`.`term` = '%s' AND `term`.`otype` = %d AND `term`.`type` = %d ", - // dbesc(protect_sprintf($search)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG)); - //$sql_table = "`term` LEFT JOIN `item` ON `item`.`id` = `term`.`oid` AND `item`.`uid` = `term`.`uid` "; - - //$sql_order = "`term`.`tid`"; - $sql_extra = ""; - $sql_table = sprintf("`item` INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ", + $sql_post_table = sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ", dbesc(protect_sprintf($search)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG), intval(local_user())); - - $sql_order = "`item`.`received`"; - $order_mode = "received"; + $sql_order = "`item`.`id`"; + $order_mode = "id"; } else { if (get_config('system','use_fulltext_engine')) $sql_extra = sprintf(" AND MATCH (`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode) ", dbesc(protect_sprintf($search))); else $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); - $sql_order = "`item`.`received`"; $order_mode = "received"; } } if(strlen($file)) { - $sql_extra .= file_tag_file_query('item',unxmlify($file)); + $sql_post_table = sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ", + dbesc(protect_sprintf($file)), intval(TERM_OBJ_POST), intval(TERM_FILE), intval(local_user())); + $sql_order = "`item`.`id`"; + $order_mode = "id"; } - if($conv) { - $myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname']; - $myurl = substr($myurl,strpos($myurl,'://')+3); - $myurl = str_replace('www.','',$myurl); - $diasp_url = str_replace('/profile/','/u/',$myurl); - - $sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where `author-link` IN ('https://%s', 'http://%s') OR `mention`)", - dbesc(protect_sprintf($myurl)), - dbesc(protect_sprintf($myurl)) - ); - } + if($conv) + $sql_extra3 .= " AND $sql_table.`mention`"; if($update) { @@ -708,31 +679,32 @@ function network_content(&$a, $update = 0) { } else { - if( (! get_config('alt_pager', 'global')) && (! get_pconfig(local_user(),'system','alt_pager')) ) { - $r = q("SELECT COUNT(*) AS `total` - FROM $sql_table 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_extra2 $sql_extra3 - $sql_extra $sql_nets ", - intval($_SESSION['uid']) - ); - - if(count($r)) { - $a->set_pager_total($r[0]['total']); - } + if(get_config('system', 'old_pager')) { + $r = q("SELECT COUNT(*) AS `total` + FROM $sql_table $sql_post_table INNER JOIN `contact` ON `contact`.`id` = $sql_table.`contact-id` + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + WHERE $sql_table.`uid` = %d AND $sql_table.`visible` = 1 AND $sql_table.`deleted` = 0 + $sql_extra2 $sql_extra3 + $sql_extra $sql_nets ", + intval($_SESSION['uid']) + ); + + if(count($r)) { + $a->set_pager_total($r[0]['total']); + } } - // check if we serve a mobile device and get the user settings + // check if we serve a mobile device and get the user settings // accordingly - if ($a->is_mobile) { - $itemspage_network = get_pconfig(local_user(),'system','itemspage_mobile_network'); - $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 20); - } else { - $itemspage_network = get_pconfig(local_user(),'system','itemspage_network'); - $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 40); + if ($a->is_mobile) { + $itemspage_network = get_pconfig(local_user(),'system','itemspage_mobile_network'); + $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 20); + } else { + $itemspage_network = get_pconfig(local_user(),'system','itemspage_network'); + $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 40); } - // now that we have the user settings, see if the theme forces + + // now that we have the user settings, see if the theme forces // a maximum item number which is lower then the user choice if(($a->force_max_items > 0) && ($a->force_max_items < $itemspage_network)) $itemspage_network = $a->force_max_items; @@ -741,28 +713,29 @@ function network_content(&$a, $update = 0) { $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage'])); } - $simple_update = (($update) ? " and `item`.`unseen` = 1 " : ''); - if($nouveau) { - // "New Item View" - show all items unthreaded in reverse created date order + $simple_update = (($update) ? " AND `item`.`unseen` = 1 " : ''); + + if ($sql_order == "") + $sql_order = "`item`.`received`"; + // "New Item View" - show all items unthreaded in reverse created date order $items = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`, `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` - FROM $sql_table LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` - WHERE `item`.`uid` = %d AND `item`.`visible` = 1 - AND `item`.`deleted` = 0 and `item`.`moderated` = 0 - $simple_update + FROM $sql_table $sql_post_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + WHERE `item`.`uid` = %d AND `item`.`visible` = 1 + AND `item`.`deleted` = 0 AND `item`.`moderated` = 0 + $simple_update $sql_extra $sql_nets - ORDER BY `item`.`received` DESC $pager_sql ", + ORDER BY $sql_order DESC $pager_sql ", intval($_SESSION['uid']) ); $update_unseen = ' WHERE uid = ' . intval($_SESSION['uid']) . " AND unseen = 1 $sql_extra $sql_nets"; - } - else { + } else { // Normal conversation view @@ -778,31 +751,36 @@ function network_content(&$a, $update = 0) { } if ($sql_order == "") - $sql_order = "`item`.$ordering"; + $sql_order = "$sql_table.$ordering"; if (($_GET["offset"] != "")) $sql_extra3 .= sprintf(" AND $sql_order <= '%s'", dbesc($_GET["offset"])); // Fetch a page full of parent items for this page - if($update) { + if (!get_config("system", "like_no_comment")) + $sql_extra4 = "(`item`.`deleted` = 0 + OR `item`.`verb` = '".ACTIVITY_LIKE."' OR `item`.`verb` = '".ACTIVITY_DISLIKE."' + OR `item`.`verb` = '".ACTIVITY_ATTEND."' OR `item`.`verb` = '".ACTIVITY_ATTENDNO."' + OR `item`.`verb` = '".ACTIVITY_ATTENDMAYBE."')"; + else + $sql_extra4 = "`item`.`deleted` = 0 AND `item`.`verb` = '".ACTIVITY_POST."'"; + $r = q("SELECT `item`.`parent` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid` - FROM $sql_table LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` - WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND - (`item`.`deleted` = 0 OR item.verb = '" . ACTIVITY_LIKE ."' OR item.verb = '" . ACTIVITY_DISLIKE . "') - and `item`.`moderated` = 0 and `item`.`unseen` = 1 + FROM $sql_table $sql_post_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - $sql_extra3 $sql_extra $sql_nets ", + WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND $sql_extra4 + AND `item`.`moderated` = 0 AND `item`.`unseen` = 1 + $sql_extra3 $sql_extra $sql_nets ORDER BY `item_id` DESC LIMIT 100", intval(local_user()) ); - } - else { - $r = q("SELECT `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid` - FROM $sql_table LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` - WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 - AND `item`.`moderated` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - AND `item`.`parent` = `item`.`id` - $sql_extra3 $sql_extra $sql_nets + } else { + $r = q("SELECT `thread`.`iid` AS `item_id`, `thread`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid` + FROM $sql_table $sql_post_table STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id` + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + WHERE `thread`.`uid` = %d AND `thread`.`visible` = 1 AND `thread`.`deleted` = 0 + AND `thread`.`moderated` = 0 + $sql_extra2 $sql_extra3 $sql_extra $sql_nets ORDER BY $sql_order DESC $pager_sql ", intval(local_user()) ); @@ -819,37 +797,36 @@ function network_content(&$a, $update = 0) { if(! in_array($rr['item_id'],$parents_arr)) $parents_arr[] = $rr['item_id']; - //$parents_str = implode(', ', $parents_arr); + $parents_str = implode(", ", $parents_arr); // splitted into separate queries to avoid the problem with very long threads // so always the last X comments are loaded // This problem can occur expecially with imported facebook posts $max_comments = get_config("system", "max_comments"); if ($max_comments == 0) - $max_comments = 1000; + $max_comments = 100; $items = array(); - foreach ($parents_arr AS $parents_str) { - + foreach ($parents_arr AS $parents) { +// $sql_extra ORDER BY `item`.`commented` DESC LIMIT %d", $thread_items = q("SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`, `contact`.`writable`, `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` - FROM $sql_table LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` + FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `item`.`moderated` = 0 - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - AND `item`.`parent` IN ( %s ) - $sql_extra ORDER BY `item`.`commented` DESC LIMIT %d", + AND `item`.`parent` = %d + ORDER BY `item`.`commented` DESC LIMIT %d", intval(local_user()), - dbesc($parents_str), + intval($parents), intval($max_comments + 1) ); $items = array_merge($items, $thread_items); } $items = conv_sort($items,$ordering); - } else { $items = array(); } @@ -867,17 +844,18 @@ function network_content(&$a, $update = 0) { // We aren't going to try and figure out at the item, group, and page // level which items you've seen and which you haven't. If you're looking - // at the top level network page just mark everything seen. + // at the top level network page just mark everything seen. -// The $update_unseen is a bit unreliable if you have stuff coming into your stream from a new contact - -// and other feeds that bring in stuff from the past. One can't find it all. +// The $update_unseen is a bit unreliable if you have stuff coming into your stream from a new contact - +// and other feeds that bring in stuff from the past. One can't find it all. // I'm reviving this block to mark everything seen on page 1 of the network as a temporary measure. // The correct solution is to implement a network notifications box just like the system notifications popup // with the ability in the popup to "mark all seen". // Several people are complaining because there are unseen messages they can't find and as time goes // on they just get buried deeper. It has happened to me a couple of times also. + if((! $group) && (! $cid) && (! $star)) { $r = q("UPDATE `item` SET `unseen` = 0 WHERE `unseen` = 1 AND `uid` = %d", @@ -897,10 +875,11 @@ function network_content(&$a, $update = 0) { $o .= conversation($a,$items,$mode,$update); if(!$update) { - if( get_config('alt_pager', 'global') || get_pconfig(local_user(),'system','alt_pager') ) { + if(get_pconfig(local_user(),'system','infinite_scroll')) { + $o .= scroll_loader(); + } elseif(!get_config('system', 'old_pager')) { $o .= alt_pager($a,count($items)); - } - else { + } else { $o .= paginate($a); } }