Renamed System::redirect() to $a->redirect()

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index c630beb25f42c6a9e16b59fe4953a46da624645e..06d5dbd2f9456a07723d5f6d194481da3787a849 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -38,7 +38,7 @@ function network_init(App $a)
        $search = (x($_GET, 'search') ? escape_tags($_GET['search']) : '');
 
        if (($search != '') && !empty($_GET['submit'])) {
-               goaway('search?search=' . urlencode($search));
+               $a->redirect('search?search=' . urlencode($search));
        }
 
        if (x($_GET, 'save')) {
@@ -140,7 +140,7 @@ function network_init(App $a)
 
                        $redir_url = ($net_queries ? $net_baseurl . '?' . $net_queries : $net_baseurl);
 
-                       goaway(System::baseUrl() . $redir_url);
+                       $a->redirect($redir_url);
                }
        }
 
@@ -302,7 +302,7 @@ function networkPager($a, $update)
                $itemspage_network = $a->force_max_items;
        }
 
-       $a->set_pager_itemspage($itemspage_network);
+       $a->setPagerItemsPage($itemspage_network);
 
        return sprintf(" LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']));
 }
@@ -618,7 +618,7 @@ function networkThreadedView(App $a, $update, $parent)
                                killme();
                        }
                        notice(L10n::t('No such group') . EOL);
-                       goaway('network/0');
+                       $a->redirect('network/0');
                        // NOTREACHED
                }
 
@@ -672,7 +672,7 @@ function networkThreadedView(App $a, $update, $parent)
                        }
                } else {
                        notice(L10n::t('Invalid contact.') . EOL);
-                       goaway('network');
+                       $a->redirect('network');
                        // NOTREACHED
                }
        }
@@ -721,7 +721,7 @@ function networkThreadedView(App $a, $update, $parent)
                        if ($last_received != '') {
                                $last_date = $last_received;
                                $sql_range .= sprintf(" AND $sql_table.`received` < '%s'", DBA::escape($last_received));
-                               $a->set_pager_page(1);
+                               $a->setPagerPage(1);
                                $pager_sql = sprintf(" LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']));
                        }
                        break;
@@ -729,7 +729,7 @@ function networkThreadedView(App $a, $update, $parent)
                        if ($last_commented != '') {
                                $last_date = $last_commented;
                                $sql_range .= sprintf(" AND $sql_table.`commented` < '%s'", DBA::escape($last_commented));
-                               $a->set_pager_page(1);
+                               $a->setPagerPage(1);
                                $pager_sql = sprintf(" LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']));
                        }
                        break;
@@ -737,14 +737,14 @@ function networkThreadedView(App $a, $update, $parent)
                        if ($last_created != '') {
                                $last_date = $last_created;
                                $sql_range .= sprintf(" AND $sql_table.`created` < '%s'", DBA::escape($last_created));
-                               $a->set_pager_page(1);
+                               $a->setPagerPage(1);
                                $pager_sql = sprintf(" LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']));
                        }
                        break;
                case 'id':
                        if (($last_id > 0) && ($sql_table == '`thread`')) {
                                $sql_range .= sprintf(" AND $sql_table.`iid` < '%s'", DBA::escape($last_id));
-                               $a->set_pager_page(1);
+                               $a->setPagerPage(1);
                                $pager_sql = sprintf(" LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']));
                        }
                        break;
@@ -810,7 +810,7 @@ function networkThreadedView(App $a, $update, $parent)
        }
 
        // Only show it when unfiltered (no groups, no networks, ...)
-       if (in_array($nets, ['', Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]) && (strlen($sql_extra . $sql_extra2 . $sql_extra3) == 0)) {
+       if (in_array($nets, ['', Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]) && (strlen($sql_extra . $sql_extra2 . $sql_extra3) == 0)) {
                if (DBA::isResult($r)) {
                        $top_limit = current($r)['order_date'];
                        $bottom_limit = end($r)['order_date'];