Merge https://github.com/friendica/friendica into pull

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index 497e8a115f9a6747768a216295dc88f84fb6aa13..e9f3913ff43a7ef3f8267bfb946566fe17d5dbcd 100755 (executable)
--- a/mod/network.php
+++ b/mod/network.php
@@ -44,19 +44,24 @@ function network_init(&$a) {
        }
        
        $a->page['aside'] .= group_side('network','network',true,$group_id);
-       $a->page['aside'] .= networks_widget($a->get_baseurl() . '/network',(($_GET['nets']) ? $_GET['nets'] : ''));
+       $a->page['aside'] .= networks_widget($a->get_baseurl() . '/network',(x($_GET, 'nets') ? $_GET['nets'] : ''));
        $a->page['aside'] .= saved_searches($search);
+       $a->page['aside'] .= fileas_widget($a->get_baseurl() . '/network',(x($_GET, 'file') ? $_GET['file'] : ''));
 
 }
 
 function saved_searches($search) {
 
-       $srchurl = '/network' 
-               . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '') 
-               . ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '')
-               . ((x($_GET,'bmark')) ? '?bmark=' . $_GET['bmark'] : '')
-               . ((x($_GET,'conv')) ? '?conv=' . $_GET['conv'] : '')
-               . ((x($_GET,'nets')) ? '?nets=' . $_GET['nets'] : '');
+       $srchurl = '/network?f=' 
+               . ((x($_GET,'cid'))   ? '&cid='   . $_GET['cid']   : '') 
+               . ((x($_GET,'star'))  ? '&star='  . $_GET['star']  : '')
+               . ((x($_GET,'bmark')) ? '&bmark=' . $_GET['bmark'] : '')
+               . ((x($_GET,'conv'))  ? '&conv='  . $_GET['conv']  : '')
+               . ((x($_GET,'nets'))  ? '&nets='  . $_GET['nets']  : '')
+               . ((x($_GET,'cmin'))  ? '&cmin='  . $_GET['cmin']  : '')
+               . ((x($_GET,'cmax'))  ? '&cmax='  . $_GET['cmax']  : '')
+               . ((x($_GET,'file'))  ? '&file='  . $_GET['file']  : '');
+       ;
        
        $o = '';
 
@@ -128,15 +133,15 @@ function network_content(&$a, $update = 0) {
                $starred_active = 'active';
        }
        
-       if($_GET['bmark']) {
+       if(x($_GET,'bmark')) {
                $bookmarked_active = 'active';
        }
 
-       if($_GET['conv']) {
+       if(x($_GET,'conv')) {
                $conv_active = 'active';
        }
 
-       if($_GET['spam']) {
+       if(x($_GET,'spam')) {
                $spam_active = 'active';
        }
 
@@ -162,33 +167,33 @@ function network_content(&$a, $update = 0) {
        $tabs = array(
                array(
                        'label' => t('Commented Order'),
-                       'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : ''), 
+                       'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?f=&cid=' . $_GET['cid'] : ''), 
                        'sel'=>$all_active,
                ),
                array(
                        'label' => t('Posted Order'),
-                       'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '?order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), 
+                       'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), 
                        'sel'=>$postord_active,
                ),
 
                array(
                        'label' => t('Personal'),
-                       'url' => $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&conv=1',
+                       'url' => $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&conv=1',
                        'sel' => $conv_active,
                ),
                array(
                        'label' => t('New'),
-                       'url' => $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '/new' . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : ''),
+                       'url' => $a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . '/new' . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : ''),
                        'sel' => $new_active,
                ),
                array(
                        'label' => t('Starred'),
-                       'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&star=1',
+                       'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&star=1',
                        'sel'=>$starred_active,
                ),
                array(
-                       'label' => t('Bookmarks'),
-                       'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?cid=' . $_GET['cid'] : '') . '&bmark=1',
+                       'label' => t('Shared Links'),
+                       'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&bmark=1',
                        'sel'=>$bookmarked_active,
                ),      
 //             array(
@@ -222,6 +227,9 @@ function network_content(&$a, $update = 0) {
        $conv = ((x($_GET,'conv')) ? intval($_GET['conv']) : 0);
        $spam = ((x($_GET,'spam')) ? intval($_GET['spam']) : 0);
        $nets = ((x($_GET,'nets')) ? $_GET['nets'] : '');
+       $cmin = ((x($_GET,'cmin')) ? intval($_GET['cmin']) : 0);
+       $cmax = ((x($_GET,'cmax')) ? intval($_GET['cmax']) : 99);
+       $file = ((x($_GET,'file')) ? $_GET['file'] : '');
 
        if(($a->argc > 2) && $a->argv[2] === 'new')
                $nouveau = true;
@@ -235,13 +243,13 @@ function network_content(&$a, $update = 0) {
                }
        }
 
-       if(x($_GET,'search'))
+       if(x($_GET,'search') || x($_GET,'file'))
                $nouveau = true;
        if($cid)
                $def_acl = array('allow_cid' => '<' . intval($cid) . '>');
 
        if(! $update) {
-               if(group) {
+               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.',
                                                                        'Warning: This group contains %s members from an insecure network.',
@@ -252,14 +260,12 @@ function network_content(&$a, $update = 0) {
 
                nav_set_selected('network');
 
-               $_SESSION['return_url'] = $a->query_string;
-
                $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
 
                $x = array(
                        'is_owner' => true,
                        'allow_location' => $a->user['allow_location'],
-                       'default_location' => $a->user['default_location'],
+                       'default_location' => $a->user['default-location'],
                        'nickname' => $a->user['nickname'],
                        'lockstate' => ((($group) || (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'),
                        'acl' => populate_acl((($group || $cid) ? $def_acl : $a->user), $celeb),
@@ -283,11 +289,7 @@ function network_content(&$a, $update = 0) {
 
        $sql_nets = (($nets) ? sprintf(" and `contact`.`network` = '%s' ", dbesc($nets)) : '');
 
-       // We'll need the following line if starred/bookmarks are allowed in comments in the future
-       //      $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $sql_options ) ";
-
-       // Otherwise, this is a bit faster:
-       $sql_extra = $sql_options;
+       $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` $sql_options ) ";
 
        if($group) {
                $r = q("SELECT `name`, `id` FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -358,6 +360,9 @@ function network_content(&$a, $update = 0) {
                        . ((x($_GET,'conv'))   ? '&conv='   . $_GET['conv']   : '') 
                        . ((x($_GET,'spam'))   ? '&spam='   . $_GET['spam']   : '') 
                        . ((x($_GET,'nets'))   ? '&nets='   . $_GET['nets']   : '') 
+                       . ((x($_GET,'cmin'))   ? '&cmin='   . $_GET['cmin']   : '') 
+                       . ((x($_GET,'cmax'))   ? '&cmax='   . $_GET['cmax']   : '') 
+                       . ((x($_GET,'file'))   ? '&file='   . $_GET['file']   : '') 
 
                        . "'; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
        }
@@ -371,6 +376,9 @@ function network_content(&$a, $update = 0) {
                        dbesc('\\]' . preg_quote($search) . '\\[')
                );
        }
+       if(strlen($file)) {
+               $sql_extra .= file_tag_file_query('item',$file);
+       }
 
        if($conv) {
                $myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname'];
@@ -403,7 +411,8 @@ function network_content(&$a, $update = 0) {
 
                if(count($r)) {
                        $a->set_pager_total($r[0]['total']);
-                       $a->set_pager_itemspage(40);
+                       $itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
+                        $a->set_pager_itemspage(((intval($itemspage_network)) ? $itemspage_network : 40));
                }
                $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
        }
@@ -470,7 +479,7 @@ function network_content(&$a, $update = 0) {
 
                if(count($r)) {
                        foreach($r as $rr)
-                               if(! array_key_exists($rr['item_id'],$parents_arr))
+                               if(! in_array($rr['item_id'],$parents_arr))
                                        $parents_arr[] = $rr['item_id'];
                        $parents_str = implode(', ', $parents_arr);
 
@@ -490,7 +499,9 @@ function network_content(&$a, $update = 0) {
 
                        $items = conv_sort($items,$ordering);
 
-               }       
+               } else {
+                       $items = array();
+               }
        }