CS translation update THX Aditoo

[friendica.git] / mod / admin.php

diff --git a/mod/admin.php b/mod/admin.php
index 5d688314987320eca8985f35652de2b97aad6ec5..b2f84d07293249be52d48269d521690fc2f01ba8 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -21,6 +21,7 @@ use Friendica\Model\Item;
 use Friendica\Model\User;
 use Friendica\Module\Login;
 use Friendica\Module\Tos;
+use Friendica\Util\Arrays;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
 
@@ -745,10 +746,18 @@ function admin_page_federation(App $a)
 function admin_page_queue(App $a)
 {
        // get content from the queue table
-       $r = q("SELECT `c`.`name`, `c`.`nurl`, `q`.`id`, `q`.`network`, `q`.`created`, `q`.`last`
-                       FROM `queue` AS `q`, `contact` AS `c`
-                       WHERE `c`.`id` = `q`.`cid`
-                       ORDER BY `q`.`cid`, `q`.`created`;");
+       $entries = DBA::p("SELECT `contact`.`name`, `contact`.`nurl`,
+                `queue`.`id`, `queue`.`network`, `queue`.`created`, `queue`.`last`
+                FROM `queue` INNER JOIN `contact` ON `contact`.`id` = `queue`.`cid`
+                ORDER BY `queue`.`cid`, `queue`.`created`");
+
+       $r = [];
+       while ($entry = DBA::fetch($entries)) {
+               $entry['created'] = DateTimeFormat::local($entry['created']);
+               $entry['last'] = DateTimeFormat::local($entry['last']);
+               $r[] = $entry;
+       }
+       DBA::close($entries);
 
        $t = get_markup_template('admin/queue.tpl');
        return replace_macros($t, [
@@ -780,13 +789,16 @@ function admin_page_queue(App $a)
 function admin_page_workerqueue(App $a)
 {
        // get jobs from the workerqueue table
-       $statement = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority'], ['done' => 0], ['order'=> ['priority']]);
-       $r = DBA::toArray($statement);
+       $entries = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority'], ['done' => 0], ['order'=> ['priority']]);
 
-       for($i = 0; $i < count($r); $i++) {
+       $r = [];
+       while ($entry = DBA::fetch($entries)) {
                // fix GH-5469. ref: src/Core/Worker.php:217
-               $r[$i]['parameter'] = implode(json_decode($r[$i]['parameter'], true), ': ');
+               $entry['parameter'] = Arrays::recursiveImplode(json_decode($entry['parameter'], true), ': ');
+               $entry['created'] = DateTimeFormat::local($entry['created']);
+               $r[] = $entry;
        }
+       DBA::close($entries);
 
        $t = get_markup_template('admin/workerqueue.tpl');
        return replace_macros($t, [
@@ -1807,17 +1819,17 @@ function admin_page_users(App $a)
        $adminlist = explode(",", str_replace(" ", "", Config::get('config', 'admin_email')));
        $_setup_users = function ($e) use ($adminlist) {
                $page_types = [
-                       PAGE_NORMAL    => L10n::t('Normal Account Page'),
-                       PAGE_SOAPBOX   => L10n::t('Soapbox Page'),
-                       PAGE_COMMUNITY => L10n::t('Public Forum'),
-                       PAGE_FREELOVE  => L10n::t('Automatic Friend Page'),
-                       PAGE_PRVGROUP  => L10n::t('Private Forum')
+                       Contact::PAGE_NORMAL    => L10n::t('Normal Account Page'),
+                       Contact::PAGE_SOAPBOX   => L10n::t('Soapbox Page'),
+                       Contact::PAGE_COMMUNITY => L10n::t('Public Forum'),
+                       Contact::PAGE_FREELOVE  => L10n::t('Automatic Friend Page'),
+                       Contact::PAGE_PRVGROUP  => L10n::t('Private Forum')
                ];
                $account_types = [
-                       ACCOUNT_TYPE_PERSON       => L10n::t('Personal Page'),
-                       ACCOUNT_TYPE_ORGANISATION => L10n::t('Organisation Page'),
-                       ACCOUNT_TYPE_NEWS         => L10n::t('News Page'),
-                       ACCOUNT_TYPE_COMMUNITY    => L10n::t('Community Forum')
+                       Contact::ACCOUNT_TYPE_PERSON       => L10n::t('Personal Page'),
+                       Contact::ACCOUNT_TYPE_ORGANISATION => L10n::t('Organisation Page'),
+                       Contact::ACCOUNT_TYPE_NEWS         => L10n::t('News Page'),
+                       Contact::ACCOUNT_TYPE_COMMUNITY    => L10n::t('Community Forum')
                ];
 
                $e['page_flags_raw'] = $e['page-flags'];
@@ -1881,6 +1893,7 @@ function admin_page_users(App $a)
                '$deny' => L10n::t('Deny'),
                '$delete' => L10n::t('Delete'),
                '$block' => L10n::t('Block'),
+               '$blocked' => L10n::t('User blocked'),
                '$unblock' => L10n::t('Unblock'),
                '$siteadmin' => L10n::t('Site admin'),
                '$accountexpired' => L10n::t('Account expired'),