Fix incorrect Temporal reference after Item function move rebase

[friendica.git] / mod / admin.php

diff --git a/mod/admin.php b/mod/admin.php
index a420a77d0f88b01862b1fae1e704ada9e1889a9e..5d6a8fbafdd29f2b95b7426b5fb911880c8d6532 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -17,9 +17,10 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Database\DBStructure;
 use Friendica\Model\Contact;
-use Friendica\Model\User;
 use Friendica\Model\Item;
+use Friendica\Model\User;
 use Friendica\Module\Login;
+use Friendica\Util\DateTimeFormat;
 
 require_once 'include/enotify.php';
 require_once 'include/text.php';
@@ -171,17 +172,31 @@ function admin_content(App $a)
        // array(url, name, extra css classes)
        // not part of $aside to make the template more adjustable
        $aside_sub = [
-               'site'         => ["admin/site/"        , L10n::t("Site")                 , "site"],
-               'users'        => ["admin/users/"       , L10n::t("Users")                , "users"],
-               'addons'       => ["admin/addons/"      , L10n::t("Addons")               , "addons"],
-               'themes'       => ["admin/themes/"      , L10n::t("Themes")               , "themes"],
-               'features'     => ["admin/features/"    , L10n::t("Additional features")  , "features"],
-               'dbsync'       => ["admin/dbsync/"      , L10n::t('DB updates')           , "dbsync"],
-               'queue'        => ["admin/queue/"       , L10n::t('Inspect Queue')        , "queue"],
-               'contactblock' => ["admin/contactblock/", L10n::t('Contact Blocklist')    , "contactblock"],
-               'blocklist'    => ["admin/blocklist/"   , L10n::t('Server Blocklist')     , "blocklist"],
-               'federation'   => ["admin/federation/"  , L10n::t('Federation Statistics'), "federation"],
-               'deleteitem'   => ["admin/deleteitem/"  , L10n::t('Delete Item')          , 'deleteitem'],
+               'information' => [ L10n::t('Information'), [
+                       "overview" => ["admin/", L10n::t("Overview"), "overview" ],
+                       'federation'   => ["admin/federation/"  , L10n::t('Federation Statistics'), "federation"] ]],
+               'configuration' => [ L10n::t('Configuration'), [
+                       'site'         => ["admin/site/"        , L10n::t("Site")                 , "site"],
+                       'users'        => ["admin/users/"       , L10n::t("Users")                , "users"],
+                       'addons'       => ["admin/addons/"      , L10n::t("Addons")               , "addons"],
+                       'themes'       => ["admin/themes/"      , L10n::t("Themes")               , "themes"],
+                       'features'     => ["admin/features/"    , L10n::t("Additional features")  , "features"] ]],
+               'database' => [ L10n::t('Database'), [
+                       'dbsync'       => ["admin/dbsync/"      , L10n::t('DB updates')           , "dbsync"],
+                       'queue'        => ["admin/queue/"       , L10n::t('Inspect Queue')        , "queue"], ]],
+               'tools' => [ L10n::t('Tools'), [
+                       'contactblock' => ["admin/contactblock/", L10n::t('Contact Blocklist')    , "contactblock"],
+                       'blocklist'    => ["admin/blocklist/"   , L10n::t('Server Blocklist')     , "blocklist"],
+                       'deleteitem'   => ["admin/deleteitem/"  , L10n::t('Delete Item')          , 'deleteitem'], ]],
+               "logs" => [ L10n::t("Logs"), [
+                       "logsconfig" => ["admin/logs/", L10n::t("Logs"), "logs"],
+                       "logsview" => ["admin/viewlogs/", L10n::t("View Logs"), 'viewlogs']
+               ]],
+               "diagnostics" => [ L10n::t("Diagnostics"), [
+                       "phpinfo" => ['phpinfo/', L10n::t('PHP Info'), 'phpinfo'],
+                       "probe" => ['probe/', L10n::t('probe address'), 'probe'],
+                       "webfinger" =>['webfinger/', L10n::t('check webfinger'), 'webfinger']
+               ]]
        ];
 
        /* get addons admin page */
@@ -195,19 +210,12 @@ function admin_content(App $a)
                $a->addons_admin[] = $addon;
        }
 
-       $aside_tools['logs'] = ["admin/logs/", L10n::t("Logs"), "logs"];
-       $aside_tools['viewlogs'] = ["admin/viewlogs/", L10n::t("View Logs"), 'viewlogs'];
-       $aside_tools['diagnostics_probe'] = ['probe/', L10n::t('probe address'), 'probe'];
-       $aside_tools['diagnostics_webfinger'] = ['webfinger/', L10n::t('check webfinger'), 'webfinger'];
-
        $t = get_markup_template('admin/aside.tpl');
        $a->page['aside'] .= replace_macros($t, [
                '$admin' => $aside_tools,
                '$subpages' => $aside_sub,
                '$admtxt' => L10n::t('Admin'),
                '$plugadmtxt' => L10n::t('Addon Features'),
-               '$logtxt' => L10n::t('Logs'),
-               '$diagnosticstxt' => L10n::t('diagnostics'),
                '$h_pending' => L10n::t('User registrations waiting for confirmation'),
                '$admurl' => "admin/"
        ]);
@@ -732,7 +740,7 @@ function admin_page_summary(App $a)
        if (!$last_worker_call) {
                $showwarning = true;
                $warningtext[] = L10n::t('The worker was never executed. Please check your database structure!');
-       } elseif ((strtotime(datetime_convert()) - strtotime($last_worker_call)) > 60 * 60) {
+       } elseif ((strtotime(DateTimeFormat::utcNow()) - strtotime($last_worker_call)) > 60 * 60) {
                $showwarning = true;
                $warningtext[] = L10n::t('The last worker execution was on %s UTC. This is older than one hour. Please check your crontab settings.', $last_worker_call);
        }