// urls
if ($a->argc > 1) {
switch ($a->argv[1]) {
- case 'dbsync':
- $o = admin_page_dbsync($a);
- break;
case 'deleteitem':
$o = admin_page_deleteitem($a);
break;
return; // NOTREACHED
}
-/**
- * @brief Generates admin panel subpage for DB syncronization
- *
- * This page checks if the database of friendica is in sync with the specs.
- * Should this not be the case, it attemps to sync the structure and notifies
- * the admin if the automatic process was failing.
- *
- * The returned string holds the HTML code of the page.
- *
- * @param App $a
- * @return string
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
- */
-function admin_page_dbsync(App $a)
-{
- $o = '';
-
- if ($a->argc > 3 && intval($a->argv[3]) && $a->argv[2] === 'mark') {
- Config::set('database', 'update_' . intval($a->argv[3]), 'success');
- $curr = Config::get('system', 'build');
- if (intval($curr) == intval($a->argv[3])) {
- Config::set('system', 'build', intval($curr) + 1);
- }
- info(L10n::t('Update has been marked successful') . EOL);
- $a->internalRedirect('admin/dbsync');
- }
-
- if (($a->argc > 2) && (intval($a->argv[2]) || ($a->argv[2] === 'check'))) {
- $retval = DBStructure::update($a->getBasePath(), false, true);
- if ($retval === '') {
- $o .= L10n::t("Database structure update %s was successfully applied.", DB_UPDATE_VERSION) . "<br />";
- Config::set('database', 'last_successful_update', DB_UPDATE_VERSION);
- Config::set('database', 'last_successful_update_time', time());
- } else {
- $o .= L10n::t("Executing of database structure update %s failed with error: %s", DB_UPDATE_VERSION, $retval) . "<br />";
- }
- if ($a->argv[2] === 'check') {
- return $o;
- }
- }
-
- if ($a->argc > 2 && intval($a->argv[2])) {
- require_once 'update.php';
-
- $func = 'update_' . intval($a->argv[2]);
-
- if (function_exists($func)) {
- $retval = $func();
-
- if ($retval === Update::FAILED) {
- $o .= L10n::t("Executing %s failed with error: %s", $func, $retval);
- } elseif ($retval === Update::SUCCESS) {
- $o .= L10n::t('Update %s was successfully applied.', $func);
- Config::set('database', $func, 'success');
- } else {
- $o .= L10n::t('Update %s did not return a status. Unknown if it succeeded.', $func);
- }
- } else {
- $o .= L10n::t('There was no additional update function %s that needed to be called.', $func) . "<br />";
- Config::set('database', $func, 'success');
- }
-
- return $o;
- }
-
- $failed = [];
- $r = q("SELECT `k`, `v` FROM `config` WHERE `cat` = 'database' ");
-
- if (DBA::isResult($r)) {
- foreach ($r as $rr) {
- $upd = intval(substr($rr['k'], 7));
- if ($upd < 1139 || $rr['v'] === 'success') {
- continue;
- }
- $failed[] = $upd;
- }
- }
-
- if (!count($failed)) {
- $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('structure_check.tpl'), [
- '$base' => System::baseUrl(true),
- '$banner' => L10n::t('No failed updates.'),
- '$check' => L10n::t('Check database structure'),
- ]);
- } else {
- $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('failed_updates.tpl'), [
- '$base' => System::baseUrl(true),
- '$banner' => L10n::t('Failed Updates'),
- '$desc' => L10n::t('This does not include updates prior to 1139, which did not return a status.'),
- '$mark' => L10n::t("Mark success \x28if update was manually applied\x29"),
- '$apply' => L10n::t('Attempt to execute this update step automatically'),
- '$failed' => $failed
- ]);
- }
-
- return $o;
-}
-
function admin_page_server_vital()
{
// Fetch the host-meta to check if this really is a vital server
$collector->addRoute(['GET', 'POST'], '/blocklist/contact' , Module\Admin\Blocklist\Contact::class);
$collector->addRoute(['GET', 'POST'], '/blocklist/server' , Module\Admin\Blocklist\Server::class);
+ $collector->addRoute(['GET'] , '/dbsync[/check]' , Module\Admin\DBSync::class);
+ $collector->addRoute(['GET'] , '/dbsync/{update:\d+}' , Module\Admin\DBSync::class);
+ $collector->addRoute(['GET'] , '/dbsync/mark/{update:\d+}', Module\Admin\DBSync::class);
+
$collector->addRoute(['GET', 'POST'], '/features' , Module\Admin\Features::class);
$collector->addRoute(['GET'] , '/federation' , Module\Admin\Federation::class);
--- /dev/null
+<?php\r
+\r
+namespace Friendica\Module\Admin;\r
+\r
+use Friendica\Core\Config;\r
+use Friendica\Core\L10n;\r
+use Friendica\Core\Renderer;\r
+use Friendica\Core\System;\r
+use Friendica\Core\Update;\r
+use Friendica\Database\DBA;\r
+use Friendica\Database\DBStructure;\r
+use Friendica\Module\BaseAdminModule;\r
+use Friendica\Util\Strings;\r
+\r
+class DBSync extends BaseAdminModule\r
+{\r
+ public static function content()\r
+ {\r
+ parent::content();\r
+\r
+ $a = self::getApp();\r
+\r
+ $o = '';\r
+\r
+ if ($a->argc > 3 && $a->argv[2] === 'mark') {\r
+ // @TODO: Replace with parameter from router\r
+ $update = intval($a->argv[3]);\r
+ if ($update) {\r
+ Config::set('database', 'update_' . $update, 'success');\r
+ $curr = Config::get('system', 'build');\r
+ if (intval($curr) == $update) {\r
+ Config::set('system', 'build', intval($curr) + 1);\r
+ }\r
+ info(L10n::t('Update has been marked successful') . EOL);\r
+ }\r
+ $a->internalRedirect('admin/dbsync');\r
+ }\r
+\r
+ if ($a->argc > 2) {\r
+ if ($a->argv[2] === 'check') {\r
+ $retval = DBStructure::update($a->getBasePath(), false, true);\r
+ if ($retval === '') {\r
+ $o .= L10n::t("Database structure update %s was successfully applied.", DB_UPDATE_VERSION) . "<br />";\r
+ Config::set('database', 'last_successful_update', DB_UPDATE_VERSION);\r
+ Config::set('database', 'last_successful_update_time', time());\r
+ } else {\r
+ $o .= L10n::t("Executing of database structure update %s failed with error: %s", DB_UPDATE_VERSION, $retval) . "<br />";\r
+ }\r
+ if ($a->argv[2] === 'check') {\r
+ return $o;\r
+ }\r
+ } elseif (intval($a->argv[2])) {\r
+ require_once 'update.php';\r
+\r
+ // @TODO: Replace with parameter from router\r
+ $update = intval($a->argv[2]);\r
+\r
+ $func = 'update_' . $update;\r
+\r
+ if (function_exists($func)) {\r
+ $retval = $func();\r
+\r
+ if ($retval === Update::FAILED) {\r
+ $o .= L10n::t("Executing %s failed with error: %s", $func, $retval);\r
+ } elseif ($retval === Update::SUCCESS) {\r
+ $o .= L10n::t('Update %s was successfully applied.', $func);\r
+ Config::set('database', $func, 'success');\r
+ } else {\r
+ $o .= L10n::t('Update %s did not return a status. Unknown if it succeeded.', $func);\r
+ }\r
+ } else {\r
+ $o .= L10n::t('There was no additional update function %s that needed to be called.', $func) . "<br />";\r
+ Config::set('database', $func, 'success');\r
+ }\r
+\r
+ return $o;\r
+ }\r
+ }\r
+\r
+ $failed = [];\r
+ $configStmt = DBA::select('config', ['k', 'v'], ['cat' => 'database']);\r
+ while ($config = DBA::fetch($configStmt)) {\r
+ $upd = intval(substr($config['k'], 7));\r
+ if ($upd >= 1139 && $config['v'] != 'success') {\r
+ $failed[] = $upd;\r
+ }\r
+ }\r
+\r
+ if (!count($failed)) {\r
+ $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('admin/dbsync/structure_check.tpl'), [\r
+ '$base' => System::baseUrl(true),\r
+ '$banner' => L10n::t('No failed updates.'),\r
+ '$check' => L10n::t('Check database structure'),\r
+ ]);\r
+ } else {\r
+ $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('admin/dbsync/failed_updates.tpl'), [\r
+ '$base' => System::baseUrl(true),\r
+ '$banner' => L10n::t('Failed Updates'),\r
+ '$desc' => L10n::t('This does not include updates prior to 1139, which did not return a status.'),\r
+ '$mark' => L10n::t("Mark success \x28if update was manually applied\x29"),\r
+ '$apply' => L10n::t('Attempt to execute this update step automatically'),\r
+ '$failed' => $failed\r
+ ]);\r
+ }\r
+\r
+ return $o;\r
+ }\r
+}
\ No newline at end of file
'tos' => ['admin/tos' , L10n::t('Terms of Service') , 'tos'],\r
]],\r
'database' => [L10n::t('Database'), [\r
+ 'dbsync' => ['admin/dbsync' , L10n::t('DB updates') , 'dbsync'],\r
'deferred' => ['admin/queue/deferred', L10n::t('Inspect Deferred Workers'), 'deferred'],\r
'workerqueue' => ['admin/queue' , L10n::t('Inspect worker Queue') , 'workerqueue'],\r
]],\r
--- /dev/null
+
+<div id="adminpage">
+ <h2>{{$banner}}</h2>
+
+ <div id="failed_updates_desc">{{$desc nofilter}}</div>
+
+ {{if $failed}}
+ {{foreach $failed as $f}}
+ <h4>{{$f}}</h4>
+
+ <ul>
+ <li><a href="{{$base}}/admin/dbsync/mark/{{$f}}">{{$mark}}</a></li>
+ <li><a href="{{$base}}/admin/dbsync/{{$f}}">{{$apply}}</a></li>
+ </ul>
+
+ <hr />
+ {{/foreach}}
+ {{/if}}
+</div>
--- /dev/null
+
+<div id="adminpage">
+ <h2>{{$banner}}</h2>
+
+ <p><a href="{{$base}}/admin/dbsync/check">{{$check}}</a></p>
+
+ <hr />
+</div>
+++ /dev/null
-
-<div id="adminpage">
- <h2>{{$banner}}</h2>
-
- <div id="failed_updates_desc">{{$desc nofilter}}</div>
-
- {{if $failed}}
- {{foreach $failed as $f}}
- <h4>{{$f}}</h4>
-
- <ul>
- <li><a href="{{$base}}/admin/dbsync/mark/{{$f}}">{{$mark}}</a></li>
- <li><a href="{{$base}}/admin/dbsync/{{$f}}">{{$apply}}</a></li>
- </ul>
-
- <hr />
- {{/foreach}}
- {{/if}}
-</div>
+++ /dev/null
-
-<div id="adminpage">
- <h2>{{$banner}}</h2>
-
- <p><a href="{{$base}}/admin/dbsync/check">{{$check}}</a></p>
-
- <hr />
-</div>
projects / friendica.git / commitdiff