Remove deprecated App::query_string - replace with DI::args()->getQueryString()

diff --git a/include/api.php b/include/api.php
index 2681b7b4ca9d39007498a45783e1fada5b3f3372..e4a47cf42a0217b5fcf3d33d20c2ef6c37e5a62f 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -291,22 +291,22 @@ function api_call(App $a)
        global $API, $called_api;
 
        $type = "json";
-       if (strpos($a->query_string, ".xml") > 0) {
+       if (strpos(DI::args()->getQueryString(), ".xml") > 0) {
                $type = "xml";
        }
-       if (strpos($a->query_string, ".json") > 0) {
+       if (strpos(DI::args()->getQueryString(), ".json") > 0) {
                $type = "json";
        }
-       if (strpos($a->query_string, ".rss") > 0) {
+       if (strpos(DI::args()->getQueryString(), ".rss") > 0) {
                $type = "rss";
        }
-       if (strpos($a->query_string, ".atom") > 0) {
+       if (strpos(DI::args()->getQueryString(), ".atom") > 0) {
                $type = "atom";
        }
 
        try {
                foreach ($API as $p => $info) {
-                       if (strpos($a->query_string, $p) === 0) {
+                       if (strpos(DI::args()->getQueryString(), $p) === 0) {
                                if (!api_check_method($info['method'])) {
                                        throw new MethodNotAllowedException();
                                }
@@ -365,7 +365,7 @@ function api_call(App $a)
                        }
                }
 
-               Logger::warning(API_LOG_PREFIX . 'not implemented', ['module' => 'api', 'action' => 'call', 'query' => $a->query_string]);
+               Logger::warning(API_LOG_PREFIX . 'not implemented', ['module' => 'api', 'action' => 'call', 'query' => DI::args()->getQueryString()]);
                throw new NotImplementedException();
        } catch (HTTPException $e) {
                header("HTTP/1.1 {$e->getCode()} {$e->httpdesc}");
@@ -389,7 +389,7 @@ function api_error($type, $e)
 
        $error = ["error" => $error,
                        "code" => $e->getCode() . " " . $e->httpdesc,
-                       "request" => $a->query_string];
+                       "request" => DI::args()->getQueryString()];
 
        $return = api_format_data('status', $type, ['status' => $error]);
 
@@ -434,7 +434,7 @@ function api_rss_extra(App $a, $arr, $user_info)
        $arr['$user'] = $user_info;
        $arr['$rss'] = [
                'alternate'    => $user_info['url'],
-               'self'         => System::baseUrl() . "/" . $a->query_string,
+               'self'         => System::baseUrl() . "/" . DI::args()->getQueryString(),
                'base'         => System::baseUrl(),
                'updated'      => api_date(null),
                'atom_updated' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),

diff --git a/include/conversation.php b/include/conversation.php
index 9e22c958b59a0584d52117cc9ac06cc0435b6812..7025cf4cabaab76e131f7af109c1c2726a6114ac 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -559,7 +559,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
        $page_dropping = ((local_user() && local_user() == $profile_owner) ? true : false);
 
        if (!$update) {
-               $_SESSION['return_path'] = $a->query_string;
+               $_SESSION['return_path'] = DI::args()->getQueryString();
        }
 
        $cb = ['items' => $items, 'mode' => $mode, 'update' => $update, 'preview' => $preview];
@@ -780,7 +780,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
 
        $o = Renderer::replaceMacros($page_template, [
                '$baseurl' => System::baseUrl($ssl_state),
-               '$return_path' => $a->query_string,
+               '$return_path' => DI::args()->getQueryString(),
                '$live_update' => $live_update_div,
                '$remove' => L10n::t('remove'),
                '$mode' => $mode,
@@ -1193,7 +1193,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
                $private_post = 0;
        }
 
-       $query_str = $a->query_string;
+       $query_str = DI::args()->getQueryString();
        if (strpos($query_str, 'public=1') !== false) {
                $query_str = str_replace(['?public=1', '&public=1'], ['', ''], $query_str);
        }

diff --git a/include/items.php b/include/items.php
index e72b97c1d24a1c6dc05d6b2c0973e8b02b78358f..8dd6793d2cf097af817175314672b5b1589f27de 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -368,7 +368,7 @@ function drop_item($id, $return = '')
                if (!empty($_REQUEST['confirm'])) {
                        // <form> can't take arguments in its "action" parameter
                        // so add any arguments as hidden inputs
-                       $query = explode_querystring($a->query_string);
+                       $query = explode_querystring(DI::args()->getQueryString());
                        $inputs = [];
 
                        foreach ($query['args'] as $arg) {

diff --git a/mod/api.php b/mod/api.php
index 8ef9f5ec4731eb196641b9961d0c778045e97d3d..b6a2c0b59fa04124b838dceffb589d91cf2da35f 100644 (file)
--- a/mod/api.php
+++ b/mod/api.php
@@ -94,7 +94,7 @@ function api_content(App $a)
                if (!local_user()) {
                        /// @TODO We need login form to redirect to this page
                        notice(L10n::t('Please login to continue.') . EOL);
-                       return Login::form($a->query_string, false, $request->get_parameters());
+                       return Login::form(DI::args()->getQueryString(), false, $request->get_parameters());
                }
                //FKOAuth1::loginUser(4);
 

diff --git a/mod/common.php b/mod/common.php
index 4f033de14e8a5e8a7d5a1dedd7cb5c5594f4cf5b..c66da0385092912ff12461f9074673949cc31ab6 100644 (file)
--- a/mod/common.php
+++ b/mod/common.php
@@ -9,6 +9,7 @@ use Friendica\Content\Pager;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model;
 use Friendica\Module;
 use Friendica\Util\Proxy as ProxyUtils;
@@ -91,7 +92,7 @@ function common_content(App $a)
                return $o;
        }
 
-       $pager = new Pager($a->query_string);
+       $pager = new Pager(DI::args()->getQueryString());
 
        if ($cid) {
                $common_friends = Model\GContact::commonFriends($uid, $cid, $pager->getStart(), $pager->getItemsPerPage());

diff --git a/mod/community.php b/mod/community.php
index f8336a623019b42b59482c12f77f79d78ce65d3d..461dd2f9e0ace478586390f9577203552e6f7240 100644 (file)
--- a/mod/community.php
+++ b/mod/community.php
@@ -149,7 +149,7 @@ function community_content(App $a, $update = 0)
                $itemspage_network = $a->force_max_items;
        }
 
-       $pager = new Pager($a->query_string, $itemspage_network);
+       $pager = new Pager(DI::args()->getQueryString(), $itemspage_network);
 
        $r = community_getitems($pager->getStart(), $pager->getItemsPerPage(), $content, $accounttype);
 

diff --git a/mod/display.php b/mod/display.php
index 0d082f5982c11a42518dd92341adbf7f2cb8a021..fa2127aaec247ddfea37ac678528a40104fc3971 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -320,7 +320,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
                $o .= "<script> var netargs = '?f=&item_id=" . $item_id . "'; </script>";
        }
 
-       $o .= conversation($a, [$item], new Pager($a->query_string), 'display', $update_uid, false, 'commented', $item_uid);
+       $o .= conversation($a, [$item], new Pager(DI::args()->getQueryString()), 'display', $update_uid, false, 'commented', $item_uid);
 
        // Preparing the meta header
        $description = trim(HTML::toPlaintext(BBCode::convert($item["body"], false), 0, true));

diff --git a/mod/item.php b/mod/item.php
index 55e4896e755b1fea7a381460d33634dba62d5c5b..d6f34e58a8cc039dbb1806e35e16842e80920394 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -667,7 +667,7 @@ function item_post(App $a) {
                $datarray["item_id"] = -1;
                $datarray["author-network"] = Protocol::DFRN;
 
-               $o = conversation($a, [array_merge($contact_record, $datarray)], new Pager($a->query_string), 'search', false, true);
+               $o = conversation($a, [array_merge($contact_record, $datarray)], new Pager(DI::args()->getQueryString()), 'search', false, true);
                Logger::log('preview: ' . $o);
                echo json_encode(['preview' => $o]);
                exit();

diff --git a/mod/message.php b/mod/message.php
index 6944dfa6792f6d7590b4006c946944264c3fdcb6..46ed9b0c12555fff3816229aba6525ed23cfc8d9 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -134,7 +134,7 @@ function message_content(App $a)
                if (!empty($_REQUEST['confirm'])) {
                        // <form> can't take arguments in its "action" parameter
                        // so add any arguments as hidden inputs
-                       $query = explode_querystring($a->query_string);
+                       $query = explode_querystring(DI::args()->getQueryString());
                        $inputs = [];
                        foreach ($query['args'] as $arg) {
                                if (strpos($arg, 'confirm=') === false) {
@@ -265,7 +265,7 @@ function message_content(App $a)
        }
 
 
-       $_SESSION['return_path'] = $a->query_string;
+       $_SESSION['return_path'] = DI::args()->getQueryString();
 
        if ($a->argc == 1) {
 
@@ -282,7 +282,7 @@ function message_content(App $a)
                        $total = $r[0]['total'];
                }
 
-               $pager = new Pager($a->query_string);
+               $pager = new Pager(DI::args()->getQueryString());
 
                $r = get_messages(local_user(), $pager->getStart(), $pager->getItemsPerPage());
 

diff --git a/mod/network.php b/mod/network.php
index aa4d1a40e0c8bebf510f9e2cac9a96f126679d39..adc315a548138281d100787317291fc6cfb66e55 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -63,7 +63,7 @@ function network_init(App $a)
 
        // convert query string to array. remove friendica args
        $query_array = [];
-       parse_str(parse_url($a->query_string, PHP_URL_QUERY), $query_array);
+       parse_str(parse_url(DI::args()->getQueryString(), PHP_URL_QUERY), $query_array);
 
        // fetch last used network view and redirect if needed
        if (!$is_a_date_query) {
@@ -140,7 +140,7 @@ function network_init(App $a)
        $a->page['aside'] .= ForumManager::widget(local_user(), $cid);
        $a->page['aside'] .= Widget::postedByYear('network', local_user(), false);
        $a->page['aside'] .= Widget::networks('network', $_GET['nets'] ?? '');
-       $a->page['aside'] .= Widget\SavedSearches::getHTML($a->query_string);
+       $a->page['aside'] .= Widget\SavedSearches::getHTML(DI::args()->getQueryString());
        $a->page['aside'] .= Widget::fileAs('network', $_GET['file'] ?? '');
 }
 
@@ -309,7 +309,7 @@ function network_content(App $a, $update = 0, $parent = 0)
        }
 
        /// @TODO Is this really necessary? $a is already available to hooks
-       $arr = ['query' => $a->query_string];
+       $arr = ['query' => DI::args()->getQueryString()];
        Hook::callAll('network_content_init', $arr);
 
        $flat_mode = false;
@@ -389,7 +389,7 @@ function networkFlatView(App $a, $update = 0)
                }
        }
 
-       $pager = new Pager($a->query_string);
+       $pager = new Pager(DI::args()->getQueryString());
 
        networkPager($a, $pager, $update);
 
@@ -681,7 +681,7 @@ function networkThreadedView(App $a, $update, $parent)
                $sql_range = '';
        }
 
-       $pager = new Pager($a->query_string);
+       $pager = new Pager(DI::args()->getQueryString());
 
        $pager_sql = networkPager($a, $pager, $update);
 
@@ -869,7 +869,7 @@ function networkThreadedView(App $a, $update, $parent)
                $date_offset = $_GET['offset'];
        }
 
-       $query_string = $a->query_string;
+       $query_string = DI::args()->getQueryString();
        if ($date_offset && !preg_match('/[?&].offset=/', $query_string)) {
                $query_string .= '&offset=' . urlencode($date_offset);
        }

diff --git a/mod/notes.php b/mod/notes.php
index 1f67e486d6a6d06ab98bddb4116dd70874575611..4a19ab5ca840bdbbe90f9702b2fe830ac704f4bc 100644 (file)
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -8,6 +8,7 @@ use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Core\L10n;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
 
@@ -53,7 +54,7 @@ function notes_content(App $a, $update = false)
        $condition = ['uid' => local_user(), 'post-type' => Item::PT_PERSONAL_NOTE, 'gravity' => GRAVITY_PARENT,
                'contact-id'=> $a->contact['id']];
 
-       $pager = new Pager($a->query_string, 40);
+       $pager = new Pager(DI::args()->getQueryString(), 40);
 
        $params = ['order' => ['created' => true],
                'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];

diff --git a/mod/notifications.php b/mod/notifications.php
index 7e1d2cff9e9f1fdbbad4a58f60c00896e254063b..4db4a8a83edc3c6a16fc0eb8d656e5454d532db6 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -116,7 +116,7 @@ function notifications_content(App $a)
        }
 
        // Set the pager
-       $pager = new Pager($a->query_string, $perpage);
+       $pager = new Pager(DI::args()->getQueryString(), $perpage);
 
        // Add additional informations (needed for json output)
        $notifs['items_page'] = $pager->getItemsPerPage();

diff --git a/mod/photos.php b/mod/photos.php
index fd1d6200f37681eb19c0936a9b67f6ba83c1e625..6398211c9bff142f0664ff4eb370078fd95c2baf 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -984,7 +984,7 @@ function photos_content(App $a)
                        // ACL permissions box
                        '$group_perms' => L10n::t('Show to Groups'),
                        '$contact_perms' => L10n::t('Show to Contacts'),
-                       '$return_path' => $a->query_string,
+                       '$return_path' => DI::args()->getQueryString(),
                ]);
 
                return $o;
@@ -1008,7 +1008,7 @@ function photos_content(App $a)
                        $total = count($r);
                }
 
-               $pager = new Pager($a->query_string, 20);
+               $pager = new Pager(DI::args()->getQueryString(), 20);
 
                /// @TODO I have seen this many times, maybe generalize it script-wide and encapsulate it?
                $order_field = $_GET['order'] ?? '';
@@ -1030,7 +1030,7 @@ function photos_content(App $a)
                );
 
                if ($cmd === 'drop') {
-                       $drop_url = $a->query_string;
+                       $drop_url = DI::args()->getQueryString();
 
                        return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
                                '$method' => 'post',
@@ -1137,7 +1137,7 @@ function photos_content(App $a)
                }
 
                if ($cmd === 'drop') {
-                       $drop_url = $a->query_string;
+                       $drop_url = DI::args()->getQueryString();
 
                        return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
                                '$method' => 'post',
@@ -1284,7 +1284,7 @@ function photos_content(App $a)
                        $condition = ["`parent` = ? AND `parent` != `id`",  $link_item['parent']];
                        $total = DBA::count('item', $condition);
 
-                       $pager = new Pager($a->query_string);
+                       $pager = new Pager(DI::args()->getQueryString());
 
                        $params = ['order' => ['id'], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
                        $result = Item::selectForUser($link_item['uid'], Item::ITEM_FIELDLIST, $condition, $params);
@@ -1348,7 +1348,7 @@ function photos_content(App $a)
                                // ACL permissions box
                                '$group_perms' => L10n::t('Show to Groups'),
                                '$contact_perms' => L10n::t('Show to Contacts'),
-                               '$return_path' => $a->query_string,
+                               '$return_path' => DI::args()->getQueryString(),
                        ]);
                }
 
@@ -1371,7 +1371,7 @@ function photos_content(App $a)
                                        '$likethis' => L10n::t("I like this \x28toggle\x29"),
                                        '$nolike' => L10n::t("I don't like this \x28toggle\x29"),
                                        '$wait' => L10n::t('Please wait'),
-                                       '$return_path' => $a->query_string,
+                                       '$return_path' => DI::args()->getQueryString(),
                                ]);
                        }
 
@@ -1549,7 +1549,7 @@ function photos_content(App $a)
                $total = count($r);
        }
 
-       $pager = new Pager($a->query_string, 20);
+       $pager = new Pager(DI::args()->getQueryString(), 20);
 
        $r = q("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`,
                ANY_VALUE(`type`) AS `type`, ANY_VALUE(`album`) AS `album`, max(`scale`) AS `scale`,

diff --git a/mod/regmod.php b/mod/regmod.php
index e08edfbcc90ff56e9cd20cc3f878ce12fce7eca4..7aecbc3bdb79ac4282d7f5c721f7d58e93bbb90d 100644 (file)
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -80,7 +80,7 @@ function regmod_content(App $a)
 {
        if (!local_user()) {
                info(L10n::t('Please login.') . EOL);
-               return Login::form($a->query_string, intval(Config::get('config', 'register_policy')) === \Friendica\Module\Register::CLOSED ? 0 : 1);
+               return Login::form(DI::args()->getQueryString(), intval(Config::get('config', 'register_policy')) === \Friendica\Module\Register::CLOSED ? 0 : 1);
        }
 
        if (!is_site_admin() || !empty($_SESSION['submanage'])) {

diff --git a/mod/settings.php b/mod/settings.php
index 7dad1f04c15cc3faaa2aa7609a0bb8c2a5dedf03..5f28ca6d29ecebbab2a01905e381c01837f33db3 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1152,7 +1152,7 @@ function settings_content(App $a)
                $private_post = 0;
        }
 
-       $query_str = $a->query_string;
+       $query_str = DI::args()->getQueryString();
        if (strpos($query_str, 'public=1') !== false) {
                $query_str = str_replace(['?public=1', '&public=1'], ['', ''], $query_str);
        }

diff --git a/mod/suggest.php b/mod/suggest.php
index 86c7f7afdf4c759a4f4bc81ff1aed1f5aeae683c..daf5de00fcba1b25e7faccd1a137b6220f220670 100644 (file)
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -58,7 +58,7 @@ function suggest_content(App $a)
        if (!empty($_GET['ignore'])) {
                // <form> can't take arguments in its "action" parameter
                // so add any arguments as hidden inputs
-               $query = explode_querystring($a->query_string);
+               $query = explode_querystring(DI::args()->getQueryString());
                $inputs = [];
                foreach ($query['args'] as $arg) {
                        if (strpos($arg, 'confirm=') === false) {

diff --git a/mod/videos.php b/mod/videos.php
index c6f342aa70c332bf7ce1762017577e34d159d8a2..6d136d7de5026e6fed45eb6df9a4510e3fcf9285 100644 (file)
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -212,7 +212,7 @@ function videos_content(App $a)
                $total = count($r);
        }
 
-       $pager = new Pager($a->query_string, 20);
+       $pager = new Pager(DI::args()->getQueryString(), 20);
 
        $r = q("SELECT hash, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`created`) AS `created`,
                ANY_VALUE(`filename`) AS `filename`, ANY_VALUE(`filetype`) as `filetype`

diff --git a/src/App.php b/src/App.php
index 74638a862d48fd19e9bc6edd1a992c640903fc4e..c028f9d9d8c80e161dd4d1c9077c2ec302f3cc28 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -40,8 +40,6 @@ use Psr\Log\LoggerInterface;
  */
 class App
 {
-       /** @deprecated 2019.09 - use App\Arguments->getQueryString() */
-       public $query_string;
        /**
         * @var Page The current page environment
         */
@@ -175,7 +173,6 @@ class App
                $this->cmd          = $args->getCommand();
                $this->argv         = $args->getArgv();
                $this->argc         = $args->getArgc();
-               $this->query_string = $args->getQueryString();
                $this->module       = $module->getName();
                $this->page         = $page;
 

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 84481b9fa5c858b9d194f3657b46cd55b5502a99..c84f979a98a0429510331d89edcb694756f3b718 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -1757,7 +1757,7 @@ class Contact
                                $cid, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()];
                }
 
-               $pager = new Pager($a->query_string);
+               $pager = new Pager(DI::args()->getQueryString());
 
                $params = ['order' => ['received' => true],
                        'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index c050e07f0875bfc2d1c00983ee38ec2c1b90ca2b..69ec447951b0571537dc9eae7c3adcaad074b70f 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -144,7 +144,7 @@ class Profile
                $user = DBA::selectFirst('user', ['uid'], ['nickname' => $nickname, 'account_removed' => false]);
 
                if (!DBA::isResult($user) && empty($profiledata)) {
-                       Logger::log('profile error: ' . $a->query_string, Logger::DEBUG);
+                       Logger::log('profile error: ' . DI::args()->getQueryString(), Logger::DEBUG);
                        return;
                }
 
@@ -165,7 +165,7 @@ class Profile
                $pdata = self::getByNickname($nickname, $user['uid'], $profile);
 
                if (empty($pdata) && empty($profiledata)) {
-                       Logger::log('profile error: ' . $a->query_string, Logger::DEBUG);
+                       Logger::log('profile error: ' . DI::args()->getQueryString(), Logger::DEBUG);
                        return;
                }
 
@@ -1077,7 +1077,7 @@ class Profile
 
                // Remove the "addr" parameter from the destination. It is later added as separate parameter again.
                $addr_request = 'addr=' . urlencode($addr);
-               $query = rtrim(str_replace($addr_request, '', $a->query_string), '?&');
+               $query = rtrim(str_replace($addr_request, '', DI::args()->getQueryString()), '?&');
 
                // The other instance needs to know where to redirect.
                $dest = urlencode(DI::baseUrl()->get() . '/' . $query);
@@ -1164,7 +1164,7 @@ class Profile
 
                $arr = [
                        'visitor' => $visitor,
-                       'url' => $a->query_string
+                       'url' => DI::args()->getQueryString()
                ];
                /**
                 * @hooks magic_auth_success

diff --git a/src/Module/Admin/Blocklist/Contact.php b/src/Module/Admin/Blocklist/Contact.php
index b2e9c508279f4ce92ca19e6d562ddbccac5f4a3b..7bcdef46879592c7727558602854588f1e6b7605 100644 (file)
--- a/src/Module/Admin/Blocklist/Contact.php
+++ b/src/Module/Admin/Blocklist/Contact.php
@@ -46,13 +46,11 @@ class Contact extends BaseAdminModule
        {
                parent::content($parameters);
 
-               $a = DI::app();
-
                $condition = ['uid' => 0, 'blocked' => true];
 
                $total = DBA::count('contact', $condition);
 
-               $pager = new Pager($a->query_string, 30);
+               $pager = new Pager(DI::args()->getQueryString(), 30);
 
                $contacts = Model\Contact::selectToArray([], $condition, ['limit' => [$pager->getStart(), $pager->getItemsPerPage()]]);
 

diff --git a/src/Module/Admin/Users.php b/src/Module/Admin/Users.php
index 286bc04452fb940cd366f0933f1d582bd34187a0..b71f3f7513cb24927d1fef4972a0e5e3d0e69d2e 100644 (file)
--- a/src/Module/Admin/Users.php
+++ b/src/Module/Admin/Users.php
@@ -179,7 +179,7 @@ class Users extends BaseAdminModule
                /* get pending */
                $pending = Register::getPending();
 
-               $pager = new Pager($a->query_string, 100);
+               $pager = new Pager(DI::args()->getQueryString(), 100);
 
                // @TODO Move below block to Model\User::getUsers($start, $count, $order = 'contact.name', $order_direction = '+')
                $valid_orders = [

diff --git a/src/Module/AllFriends.php b/src/Module/AllFriends.php
index 14095f450774cc314c621212a9e16006c304cfd1..47d8c3e2644dc2cc4e88fed74d0a361330f041e8 100644 (file)
--- a/src/Module/AllFriends.php
+++ b/src/Module/AllFriends.php
@@ -49,7 +49,7 @@ class AllFriends extends BaseModule
 
                $total = Model\GContact::countAllFriends(local_user(), $cid);
 
-               $pager = new Pager($app->query_string);
+               $pager = new Pager(DI::args()->getQueryString());
 
                $friends = Model\GContact::allFriends(local_user(), $cid, $pager->getStart(), $pager->getItemsPerPage());
                if (empty($friends)) {

diff --git a/src/Module/BaseAdminModule.php b/src/Module/BaseAdminModule.php
index 3a5cde24c8fd8a4a9ba8b950940a1e86d242990f..f985b4a4956c8fd6555c6e87355ec1d974581a4c 100644 (file)
--- a/src/Module/BaseAdminModule.php
+++ b/src/Module/BaseAdminModule.php
@@ -55,7 +55,7 @@ abstract class BaseAdminModule extends BaseModule
 
                if (!is_site_admin()) {
                        notice(L10n::t('Please login to continue.'));
-                       Session::set('return_path', $a->query_string);
+                       Session::set('return_path', DI::args()->getQueryString());
                        DI::baseUrl()->redirect('login');
                }
 

diff --git a/src/Module/Bookmarklet.php b/src/Module/Bookmarklet.php
index c7f4cdae4a4e0e91e64e27fac1082cfcdc8660bc..f5627e4354eb7c0f8172f06a5b167dd4b7214c11 100644 (file)
--- a/src/Module/Bookmarklet.php
+++ b/src/Module/Bookmarklet.php
@@ -25,7 +25,7 @@ class Bookmarklet extends BaseModule
 
                if (!local_user()) {
                        $output = '<h2>' . L10n::t('Login') . '</h2>';
-                       $output .= Login::form($app->query_string, intval($config->get('config', 'register_policy')) === Register::CLOSED ? false : true);
+                       $output .= Login::form(DI::args()->getQueryString(), intval($config->get('config', 'register_policy')) === Register::CLOSED ? false : true);
                        return $output;
                }
 

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index f7c6680ed4592ccccb2356e378e0aa695175471b..c45a27c88aa606680fb6adc3c4e96316f5219640 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -425,7 +425,7 @@ class Contact extends BaseModule
                                if (!empty($_REQUEST['confirm'])) {
                                        // <form> can't take arguments in its 'action' parameter
                                        // so add any arguments as hidden inputs
-                                       $query = explode_querystring($a->query_string);
+                                       $query = explode_querystring(DI::args()->getQueryString());
                                        $inputs = [];
                                        foreach ($query['args'] as $arg) {
                                                if (strpos($arg, 'confirm=') === false) {
@@ -467,7 +467,7 @@ class Contact extends BaseModule
                        }
                }
 
-               $_SESSION['return_path'] = $a->query_string;
+               $_SESSION['return_path'] = DI::args()->getQueryString();
 
                if (!empty($a->data['contact']) && is_array($a->data['contact'])) {
                        $contact = $a->data['contact'];
@@ -776,7 +776,7 @@ class Contact extends BaseModule
                if (DBA::isResult($r)) {
                        $total = $r[0]['total'];
                }
-               $pager = new Pager($a->query_string);
+               $pager = new Pager(DI::args()->getQueryString());
 
                $contacts = [];
 

diff --git a/src/Module/Directory.php b/src/Module/Directory.php
index 4ad9438fb922d8ca47125cd43598cf336f2f1b1e..fc4c1be4f8ca5b2019e769d719067938a4d72520 100644 (file)
--- a/src/Module/Directory.php
+++ b/src/Module/Directory.php
@@ -52,7 +52,7 @@ class Directory extends BaseModule
                        $gDirPath = Profile::zrl($dirURL, true);
                }
 
-               $pager = new Pager($app->query_string, 60);
+               $pager = new Pager(DI::args()->getQueryString(), 60);
 
                $profiles = Profile::searchProfiles($pager->getStart(), $pager->getItemsPerPage(), $search);
 

diff --git a/src/Module/Home.php b/src/Module/Home.php
index fbdc252a66667a21f6b63249c6a8581be98df9f2..3d04849cf46d1c0f1158ef95b61d18847ae9168d 100644 (file)
--- a/src/Module/Home.php
+++ b/src/Module/Home.php
@@ -46,7 +46,7 @@ class Home extends BaseModule
                        }
                }
 
-               $login = Login::form($app->query_string, $config->get('config', 'register_policy') === Register::CLOSED ? 0 : 1);
+               $login = Login::form(DI::args()->getQueryString(), $config->get('config', 'register_policy') === Register::CLOSED ? 0 : 1);
 
                $content = '';
                Hook::callAll('home_content', $content);

diff --git a/src/Module/Objects.php b/src/Module/Objects.php
index 4113a545d595d10e3dad1729d8569928fff1c12d..e2f21af1a5187374bf7919cc92b9d42ca1b1a403 100644 (file)
--- a/src/Module/Objects.php
+++ b/src/Module/Objects.php
@@ -25,7 +25,7 @@ class Objects extends BaseModule
                }
 
                if (!ActivityPub::isRequest()) {
-                       DI::baseUrl()->redirect(str_replace('objects/', 'display/', $a->query_string));
+                       DI::baseUrl()->redirect(str_replace('objects/', 'display/', DI::args()->getQueryString()));
                }
 
                /// @todo Add Authentication to enable fetching of non public content

diff --git a/src/Module/Profile.php b/src/Module/Profile.php
index 991aa9126b12306bfe4a6f880a34ada0655294e1..8232282dfd56e5fe725c5cc2fbe7644cffbb7d1b 100644 (file)
--- a/src/Module/Profile.php
+++ b/src/Module/Profile.php
@@ -258,7 +258,7 @@ class Profile extends BaseModule
                                return '';
                        }
 
-                       $pager = new Pager($a->query_string);
+                       $pager = new Pager(DI::args()->getQueryString());
                } else {
                        $sql_post_table = "";
 
@@ -302,7 +302,7 @@ class Profile extends BaseModule
                                $itemspage_network = $a->force_max_items;
                        }
 
-                       $pager = new Pager($a->query_string, $itemspage_network);
+                       $pager = new Pager(DI::args()->getQueryString(), $itemspage_network);
 
                        $pager_sql = sprintf(" LIMIT %d, %d ", $pager->getStart(), $pager->getItemsPerPage());
 

diff --git a/src/Module/Profile/Contacts.php b/src/Module/Profile/Contacts.php
index 9d26f1bbefdc3d929418c2b6eabcdce08cca4192..f848945bcbda5238deafb13e935bfa3b346d462a 100644 (file)
--- a/src/Module/Profile/Contacts.php
+++ b/src/Module/Profile/Contacts.php
@@ -69,7 +69,7 @@ class Contacts extends BaseModule
 
                $total = DBA::count('contact', $condition);
 
-               $pager = new Pager($a->query_string);
+               $pager = new Pager(DI::args()->getQueryString());
 
                $params = ['order' => ['name' => false], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
 

diff --git a/src/Module/Security/Login.php b/src/Module/Security/Login.php
index cddd014d00434da67d74f64f4d81cc9456a14f9f..053e17b1b4536333b448f1699335d35640ea2452 100644 (file)
--- a/src/Module/Security/Login.php
+++ b/src/Module/Security/Login.php
@@ -95,7 +95,7 @@ class Login extends BaseModule
                }
 
                if (is_null($return_path)) {
-                       $return_path = $a->query_string;
+                       $return_path = DI::args()->getQueryString();
                }
 
                if (local_user()) {

diff --git a/src/Object/Post.php b/src/Object/Post.php
index 38ef12274803edcc3289e0d143b33ba3e3334324..032c7ea4d0137e5840dc811ced6cc4ca017ab800 100644 (file)
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -890,7 +890,7 @@ class Post
 
                        $template = Renderer::getMarkupTemplate($this->getCommentBoxTemplate());
                        $comment_box = Renderer::replaceMacros($template, [
-                               '$return_path' => $a->query_string,
+                               '$return_path' => DI::args()->getQueryString(),
                                '$threaded'    => $this->isThreaded(),
                                '$jsreload'    => '',
                                '$wall'        => ($conv->getMode() === 'profile'),