.htconfig.php. See the Config help page for help with the transition.', $a->getBaseURL() . '/help/Config');
- }
- if (file_exists('config/local.ini.php')) {
- $showwarning = true;
- $warningtext[] = L10n::t('Friendica\'s configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from config/local.ini.php. See the Config help page for help with the transition.', $a->getBaseURL() . '/help/Config');
- }
-
- // Check server vitality
- if (!admin_page_server_vital()) {
- $showwarning = true;
- $well_known = $a->getBaseURL() . '/.well-known/host-meta';
- $warningtext[] = L10n::t('%s is not reachable on your system. This is a severe configuration issue that prevents server to server communication. See the installation page for help.',
- $well_known, $well_known, $a->getBaseURL() . '/help/Install');
- }
-
- $r = q("SELECT `page-flags`, COUNT(`uid`) AS `count` FROM `user` GROUP BY `page-flags`");
- $accounts = [
- [L10n::t('Normal Account'), 0],
- [L10n::t('Automatic Follower Account'), 0],
- [L10n::t('Public Forum Account'), 0],
- [L10n::t('Automatic Friend Account'), 0],
- [L10n::t('Blog Account'), 0],
- [L10n::t('Private Forum Account'), 0]
- ];
-
- $users = 0;
- foreach ($r as $u) {
- $accounts[$u['page-flags']][1] = $u['count'];
- $users += $u['count'];
- }
-
- Logger::log('accounts: ' . print_r($accounts, true), Logger::DATA);
-
- $pending = Register::getPendingCount();
-
- $deferred = DBA::count('workerqueue', ["`executed` <= ? AND NOT `done` AND `next_try` > ?",
- DBA::NULL_DATETIME, DateTimeFormat::utcNow()]);
-
- $workerqueue = DBA::count('workerqueue', ["`executed` <= ? AND NOT `done` AND `next_try` < ?",
- DBA::NULL_DATETIME, DateTimeFormat::utcNow()]);
-
- // We can do better, but this is a quick queue status
-
- $queues = ['label' => L10n::t('Message queues'), 'deferred' => $deferred, 'workerq' => $workerqueue];
-
-
- $r = q("SHOW variables LIKE 'max_allowed_packet'");
- $max_allowed_packet = (($r) ? $r[0]['Value'] : 0);
-
- $server_settings = ['label' => L10n::t('Server Settings'),
- 'php' => ['upload_max_filesize' => ini_get('upload_max_filesize'),
- 'post_max_size' => ini_get('post_max_size'),
- 'memory_limit' => ini_get('memory_limit')],
- 'mysql' => ['max_allowed_packet' => $max_allowed_packet]];
-
- $t = Renderer::getMarkupTemplate('admin/summary.tpl');
- return Renderer::replaceMacros($t, [
- '$title' => L10n::t('Administration'),
- '$page' => L10n::t('Summary'),
- '$queues' => $queues,
- '$users' => [L10n::t('Registered users'), $users],
- '$accounts' => $accounts,
- '$pending' => [L10n::t('Pending registrations'), $pending],
- '$version' => [L10n::t('Version'), FRIENDICA_VERSION],
- '$baseurl' => System::baseUrl(),
- '$platform' => FRIENDICA_PLATFORM,
- '$codename' => FRIENDICA_CODENAME,
- '$build' => Config::get('system', 'build'),
- '$addons' => [L10n::t('Active addons'), Addon::getEnabledList()],
- '$serversettings' => $server_settings,
- '$showwarning' => $showwarning,
- '$warningtext' => $warningtext
- ]);
-}
-
/**
* @brief Process send data from Admin Site Page
*
diff --git a/src/App/Router.php b/src/App/Router.php
index cdd40ac9d..85134bf44 100644
--- a/src/App/Router.php
+++ b/src/App/Router.php
@@ -117,6 +117,10 @@ class Router
$this->routeCollector->addRoute(['GET'], '/tos', Module\Tos::class);
$this->routeCollector->addRoute(['GET'], '/webfinger', Module\WebFinger::class);
$this->routeCollector->addRoute(['GET'], '/xrd', Module\Xrd::class);
+
+ $this->routeCollector->addGroup('/admin', function (RouteCollector $collector) {
+ $collector->addRoute(['GET'] , '[/]' , Module\Admin\Summary::class);
+ });
}
public function __construct(RouteCollector $routeCollector = null)
diff --git a/src/Module/Admin/Summary.php b/src/Module/Admin/Summary.php
new file mode 100644
index 000000000..49ad59cdf
--- /dev/null
+++ b/src/Module/Admin/Summary.php
@@ -0,0 +1,149 @@
+ 'myisam', 'table_schema' => DBA::databaseName()])) {
+ $warningtext[] = L10n::t('Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See here for a guide that may be helpful converting the table engines. You may also use the command php bin/console.php dbstructure toinnodb of your Friendica installation for an automatic conversion..htconfig.php. See the Config help page for help with the transition.', $a->getBaseURL() . '/help/Config');
+ }
+
+ if (file_exists('config/local.ini.php')) {
+ $warningtext[] = L10n::t('Friendica\'s configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from config/local.ini.php. See the Config help page for help with the transition.', $a->getBaseURL() . '/help/Config');
+ }
+
+ // Check server vitality
+ if (!self::checkSelfHostMeta()) {
+ $well_known = $a->getBaseURL() . '/.well-known/host-meta';
+ $warningtext[] = L10n::t('%s is not reachable on your system. This is a severe configuration issue that prevents server to server communication. See the installation page for help.',
+ $well_known, $well_known, $a->getBaseURL() . '/help/Install');
+ }
+
+ $accounts = [
+ [L10n::t('Normal Account'), 0],
+ [L10n::t('Automatic Follower Account'), 0],
+ [L10n::t('Public Forum Account'), 0],
+ [L10n::t('Automatic Friend Account'), 0],
+ [L10n::t('Blog Account'), 0],
+ [L10n::t('Private Forum Account'), 0]
+ ];
+
+ $users = 0;
+ $pageFlagsCountStmt = DBA::p('SELECT `page-flags`, COUNT(`uid`) AS `count` FROM `user` GROUP BY `page-flags`');
+ while ($pageFlagsCount = DBA::fetch($pageFlagsCountStmt)) {
+ $accounts[$pageFlagsCount['page-flags']][1] = $pageFlagsCount['count'];
+ $users += $pageFlagsCount['count'];
+ }
+ DBA::close($pageFlagsCountStmt);
+
+ Logger::log('accounts: ' . print_r($accounts, true), Logger::DATA);
+
+ $pending = Register::getPendingCount();
+
+ $queue = DBA::count('queue', []);
+
+ $deferred = DBA::count('workerqueue', ['`executed` <= ? AND NOT `done` AND `next_try` > ?',
+ DBA::NULL_DATETIME, DateTimeFormat::utcNow()]);
+
+ $workerqueue = DBA::count('workerqueue', ['`executed` <= ? AND NOT `done` AND `next_try` < ?',
+ DBA::NULL_DATETIME, DateTimeFormat::utcNow()]);
+
+ // We can do better, but this is a quick queue status
+ $queues = ['label' => L10n::t('Message queues'), 'queue' => $queue, 'deferred' => $deferred, 'workerq' => $workerqueue];
+
+ $variables = DBA::toArray(DBA::p('SHOW variables LIKE "max_allowed_packet"'));
+ $max_allowed_packet = $variables ? $variables[0]['Value'] : 0;
+
+ $server_settings = [
+ 'label' => L10n::t('Server Settings'),
+ 'php' => [
+ 'upload_max_filesize' => ini_get('upload_max_filesize'),
+ 'post_max_size' => ini_get('post_max_size'),
+ 'memory_limit' => ini_get('memory_limit')
+ ],
+ 'mysql' => [
+ 'max_allowed_packet' => $max_allowed_packet
+ ]
+ ];
+
+ $t = Renderer::getMarkupTemplate('admin/summary.tpl');
+ return Renderer::replaceMacros($t, [
+ '$title' => L10n::t('Administration'),
+ '$page' => L10n::t('Summary'),
+ '$queues' => $queues,
+ '$users' => [L10n::t('Registered users'), $users],
+ '$accounts' => $accounts,
+ '$pending' => [L10n::t('Pending registrations'), $pending],
+ '$version' => [L10n::t('Version'), FRIENDICA_VERSION],
+ '$baseurl' => System::baseUrl(),
+ '$platform' => FRIENDICA_PLATFORM,
+ '$codename' => FRIENDICA_CODENAME,
+ '$build' => Config::get('system', 'build'),
+ '$addons' => [L10n::t('Active addons'), Addon::getEnabledList()],
+ '$serversettings' => $server_settings,
+ '$warningtext' => $warningtext
+ ]);
+ }
+
+ private static function checkSelfHostMeta()
+ {
+ // Fetch the host-meta to check if this really is a vital server
+ return Network::curl(System::baseUrl() . '/.well-known/host-meta')->isSuccess();
+ }
+
+}
\ No newline at end of file
diff --git a/src/Module/BaseAdminModule.php b/src/Module/BaseAdminModule.php
new file mode 100644
index 000000000..4664c90fc
--- /dev/null
+++ b/src/Module/BaseAdminModule.php
@@ -0,0 +1,74 @@
+page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('admin/settings_head.tpl'), []);
+
+ /*
+ * Side bar links
+ */
+
+ // array(url, name, extra css classes)
+ // not part of $aside to make the template more adjustable
+ $aside_sub = [
+ 'information' => [L10n::t('Information'), [
+ 'overview' => ['admin' , L10n::t('Overview') , 'overview'],
+ ]],
+ ];
+
+ $addons_admin = [];
+ $addonsAdminStmt = DBA::select('addon', ['name'], ['plugin_admin' => 1], ['order' => ['name']]);
+ foreach (DBA::toArray($addonsAdminStmt) as $addon) {
+ $addons_admin[] = ['admin/addons/' . $addon['name'], $addon['name'], 'addon'];
+ }
+
+ $t = Renderer::getMarkupTemplate('admin/aside.tpl');
+ $a->page['aside'] .= Renderer::replaceMacros($t, [
+ '$admin' => ['addons_admin' => $addons_admin],
+ '$subpages' => $aside_sub,
+ '$admtxt' => L10n::t('Admin'),
+ '$plugadmtxt' => L10n::t('Addon Features'),
+ '$h_pending' => L10n::t('User registrations waiting for confirmation'),
+ '$admurl' => 'admin/'
+ ]);
+
+ return '';
+ }
+}
diff --git a/view/templates/admin/summary.tpl b/view/templates/admin/summary.tpl
index 09419929d..7b655a8ec 100644
--- a/view/templates/admin/summary.tpl
+++ b/view/templates/admin/summary.tpl
@@ -1,7 +1,7 @@
{{$wt nofilter}}