Use router parameters in Admin modules

[friendica.git] / src / Module / Admin / Queue.php

diff --git a/src/Module/Admin/Queue.php b/src/Module/Admin/Queue.php
index 0dfc553a91202252976659b81da4c9e1da6cdc85..7f5329dbfe87aad6bf960f22325102ce2a9c2646 100644 (file)
--- a/src/Module/Admin/Queue.php
+++ b/src/Module/Admin/Queue.php
@@ -1,12 +1,30 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Module\Admin;
 
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Module\BaseAdminModule;
+use Friendica\Module\BaseAdmin;
 use Friendica\Util\Arrays;
 use Friendica\Util\DateTimeFormat;
 
@@ -18,26 +36,23 @@ use Friendica\Util\DateTimeFormat;
  *
  * @return string
  */
-class Queue extends BaseAdminModule
+class Queue extends BaseAdmin
 {
        public static function content(array $parameters = [])
        {
                parent::content($parameters);
 
-               $a = DI::app();
-
-               // @TODO: Replace with parameter from router
-               $deferred = $a->argc > 2 && $a->argv[2] == 'deferred';
+               $status = $parameters['status'] ?? '';
 
                // get jobs from the workerqueue table
-               if ($deferred) {
+               if ($status == 'deferred') {
                        $condition = ["NOT `done` AND `retrial` > ?", 0];
-                       $sub_title = L10n::t('Inspect Deferred Worker Queue');
-                       $info = L10n::t("This page lists the deferred worker jobs. This are jobs that couldn't be executed at the first time.");
+                       $sub_title = DI::l10n()->t('Inspect Deferred Worker Queue');
+                       $info = DI::l10n()->t("This page lists the deferred worker jobs. This are jobs that couldn't be executed at the first time.");
                } else {
                        $condition = ["NOT `done` AND `retrial` = ?", 0];
-                       $sub_title = L10n::t('Inspect Worker Queue');
-                       $info = L10n::t('This page lists the currently queued worker jobs. These jobs are handled by the worker cronjob you\'ve set up during install.');
+                       $sub_title = DI::l10n()->t('Inspect Worker Queue');
+                       $info = DI::l10n()->t('This page lists the currently queued worker jobs. These jobs are handled by the worker cronjob you\'ve set up during install.');
                }
 
                // @TODO Move to Model\WorkerQueue::getEntries()
@@ -54,13 +69,13 @@ class Queue extends BaseAdminModule
 
                $t = Renderer::getMarkupTemplate('admin/queue.tpl');
                return Renderer::replaceMacros($t, [
-                       '$title' => L10n::t('Administration'),
+                       '$title' => DI::l10n()->t('Administration'),
                        '$page' => $sub_title,
                        '$count' => count($r),
-                       '$id_header' => L10n::t('ID'),
-                       '$param_header' => L10n::t('Job Parameters'),
-                       '$created_header' => L10n::t('Created'),
-                       '$prio_header' => L10n::t('Priority'),
+                       '$id_header' => DI::l10n()->t('ID'),
+                       '$param_header' => DI::l10n()->t('Job Parameters'),
+                       '$created_header' => DI::l10n()->t('Created'),
+                       '$prio_header' => DI::l10n()->t('Priority'),
                        '$info' => $info,
                        '$entries' => $r,
                ]);