Merge branch 'master' of git://github.com/friendica/friendica

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index 8da1561a0a4bd95f44a0b70608a6b4472dfcb47e..7e7a958419910561a52307f604c128451dfb4ae8 100755 (executable)
--- a/mod/network.php
+++ b/mod/network.php
@@ -44,7 +44,7 @@ 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);
 
 }
@@ -52,13 +52,15 @@ function network_init(&$a) {
 function saved_searches($search) {
 
        $srchurl = '/network?f=' 
-               . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') 
-               . ((x($_GET,'star')) ? '&star=' . $_GET['star'] : '')
+               . ((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,'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 = '';
 
@@ -130,15 +132,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';
        }
 
@@ -226,6 +228,7 @@ function network_content(&$a, $update = 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;
@@ -239,13 +242,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.',
@@ -358,6 +361,7 @@ function network_content(&$a, $update = 0) {
                        . ((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 +375,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 +410,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 +478,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 +498,9 @@ function network_content(&$a, $update = 0) {
 
                        $items = conv_sort($items,$ordering);
 
-               }       
+               } else {
+                       $items = array();
+               }
        }