X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FAdmin%2FQueue.php;h=7f5329dbfe87aad6bf960f22325102ce2a9c2646;hb=2ce15cae1a41451b631b814c418b3b3b976d79d1;hp=d538f396ebe90542174223df1a94287366674bcb;hpb=3c76826793feeb933dab7a07dab7cc7eb2efc451;p=friendica.git

diff --git a/src/Module/Admin/Queue.php b/src/Module/Admin/Queue.php
index d538f396eb..7f5329dbfe 100644
--- a/src/Module/Admin/Queue.php
+++ b/src/Module/Admin/Queue.php
@@ -1,43 +1,58 @@
 <?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;
 
 /**
- * @brief Admin Inspect Queue Page
+ * Admin Inspect Queue Page
  *
  * Generates a page for the admin to have a look into the current queue of
  * worker jobs. Shown are the parameters for the job and its priority.
  *
  * @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,
 		]);