clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use router parameters in Admin modules 

- Remove 10 @TODO tags

# Conflicts:
#	src/Module/Admin/DBSync.php
#	src/Module/Admin/Themes/Details.php
#	src/Module/Admin/Themes/Embed.php
This commit is contained in:
Hypolite Petovan 2020-09-08 10:38:35 -04:00
parent 98eb53c20f
commit 2ce15cae1a
8 changed files with 427 additions and 501 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Module/Admin/Addons/Details.php
View File

@ -34,24 +34,20 @@ class Details extends BaseAdmin
{ {
parent::post($parameters); parent::post($parameters);
$a = DI::app(); $addon = Strings::sanitizeFilePathItem($parameters['addon']);
$redirect = 'admin/addons/' . $addon;
if ($a->argc > 2) {
// @TODO: Replace with parameter from router
$addon = $a->argv[2];
$addon = Strings::sanitizeFilePathItem($addon);
if (is_file('addon/' . $addon . '/' . $addon . '.php')) { if (is_file('addon/' . $addon . '/' . $addon . '.php')) {
include_once 'addon/' . $addon . '/' . $addon . '.php'; include_once 'addon/' . $addon . '/' . $addon . '.php';
if (function_exists($addon . '_addon_admin_post')) { if (function_exists($addon . '_addon_admin_post')) {
$func = $addon . '_addon_admin_post'; $func = $addon . '_addon_admin_post';
$func($a); $func(DI::app());
}
DI::baseUrl()->redirect('admin/addons/' . $addon);
} }
} }
DI::baseUrl()->redirect('admin/addons'); DI::baseUrl()->redirect($redirect);
} }
public static function content(array $parameters = []) public static function content(array $parameters = [])
@ -62,10 +58,7 @@ class Details extends BaseAdmin
$addons_admin = Addon::getAdminList(); $addons_admin = Addon::getAdminList();
if ($a->argc > 2) { $addon = Strings::sanitizeFilePathItem($parameters['addon']);
// @TODO: Replace with parameter from router
$addon = $a->argv[2];
$addon = Strings::sanitizeFilePathItem($addon);
if (!is_file("addon/$addon/$addon.php")) { if (!is_file("addon/$addon/$addon.php")) {
notice(DI::l10n()->t('Addon not found.')); notice(DI::l10n()->t('Addon not found.'));
Addon::uninstall($addon); Addon::uninstall($addon);
@ -73,7 +66,7 @@ class Details extends BaseAdmin
} }
if (($_GET['action'] ?? '') == 'toggle') { if (($_GET['action'] ?? '') == 'toggle') {
parent::checkFormSecurityTokenRedirectOnError('/admin/addons', 'admin_themes', 't'); self::checkFormSecurityTokenRedirectOnError('/admin/addons', 'admin_addons', 't');
// Toggle addon status // Toggle addon status
if (Addon::isEnabled($addon)) { if (Addon::isEnabled($addon)) {
@ -131,10 +124,7 @@ class Details extends BaseAdmin
'$screenshot' => '', '$screenshot' => '',
'$readme' => $readme, '$readme' => $readme,
'$form_security_token' => parent::getFormSecurityToken('admin_themes'), '$form_security_token' => self::getFormSecurityToken('admin_addons'),
]); ]);
} }
DI::baseUrl()->redirect('admin/addons');
}
} }

44
src/Module/Admin/DBSync.php
View File

@ -36,64 +36,62 @@ class DBSync extends BaseAdmin
$a = DI::app(); $a = DI::app();
$o = ''; $action = $parameters['action'] ?? '';
$update = $parameters['update'] ?? 0;
if ($a->argc > 3 && $a->argv[2] === 'mark') { switch ($action) {
// @TODO: Replace with parameter from router case 'mark':
$update = intval($a->argv[3]);
if ($update) { if ($update) {
DI::config()->set('database', 'update_' . $update, 'success'); DI::config()->set('database', 'update_' . $update, 'success');
$curr = DI::config()->get('system', 'build'); $curr = DI::config()->get('system', 'build');
if (intval($curr) == $update) { if (intval($curr) == $update) {
DI::config()->set('system', 'build', intval($curr) + 1); DI::config()->set('system', 'build', intval($curr) + 1);
} }
info(DI::l10n()->t('Update has been marked successful') . EOL);
} info(DI::l10n()->t('Update has been marked successful'));
DI::baseUrl()->redirect('admin/dbsync');
} }
if ($a->argc > 2) { break;
if ($a->argv[2] === 'check') { case 'check':
// @TODO Seems like a similar logic like Update::check() // @TODO Seems like a similar logic like Update::check()
$retval = DBStructure::update($a->getBasePath(), false, true); $retval = DBStructure::update($a->getBasePath(), false, true);
if ($retval === '') { if ($retval === '') {
$o .= DI::l10n()->t("Database structure update %s was successfully applied.", DB_UPDATE_VERSION) . "<br />"; $o = DI::l10n()->t("Database structure update %s was successfully applied.", DB_UPDATE_VERSION) . "<br />";
DI::config()->set('database', 'last_successful_update', DB_UPDATE_VERSION); DI::config()->set('database', 'last_successful_update', DB_UPDATE_VERSION);
DI::config()->set('database', 'last_successful_update_time', time()); DI::config()->set('database', 'last_successful_update_time', time());
} else { } else {
$o .= DI::l10n()->t("Executing of database structure update %s failed with error: %s", DB_UPDATE_VERSION, $retval) . "<br />"; $o = DI::l10n()->t("Executing of database structure update %s failed with error: %s", DB_UPDATE_VERSION, $retval) . "<br />";
} }
if ($a->argv[2] === 'check') {
return $o; return $o;
} case 'update':
} elseif (intval($a->argv[2])) {
require_once 'update.php'; require_once 'update.php';
// @TODO: Replace with parameter from router // @TODO: Replace with parameter from router
$update = intval($a->argv[2]); if ($update) {
$func = 'update_' . $update; $func = 'update_' . $update;
if (function_exists($func)) { if (function_exists($func)) {
$retval = $func(); $retval = $func();
if ($retval === Update::FAILED) { if ($retval === Update::FAILED) {
$o .= DI::l10n()->t("Executing %s failed with error: %s", $func, $retval); $o = DI::l10n()->t("Executing %s failed with error: %s", $func, $retval);
} elseif ($retval === Update::SUCCESS) { } elseif ($retval === Update::SUCCESS) {
$o .= DI::l10n()->t('Update %s was successfully applied.', $func); $o = DI::l10n()->t('Update %s was successfully applied.', $func);
DI::config()->set('database', $func, 'success'); DI::config()->set('database', $func, 'success');
} else { } else {
$o .= DI::l10n()->t('Update %s did not return a status. Unknown if it succeeded.', $func); $o = DI::l10n()->t('Update %s did not return a status. Unknown if it succeeded.', $func);
} }
} else { } else {
$o .= DI::l10n()->t('There was no additional update function %s that needed to be called.', $func) . "<br />"; $o = DI::l10n()->t('There was no additional update function %s that needed to be called.', $func) . "<br />";
DI::config()->set('database', $func, 'success'); DI::config()->set('database', $func, 'success');
} }
return $o; return $o;
} }
}
break;
default:
$failed = []; $failed = [];
$configStmt = DBA::select('config', ['k', 'v'], ['cat' => 'database']); $configStmt = DBA::select('config', ['k', 'v'], ['cat' => 'database']);
while ($config = DBA::fetch($configStmt)) { while ($config = DBA::fetch($configStmt)) {
@ -123,4 +121,8 @@ class DBSync extends BaseAdmin
return $o; return $o;
} }
DI::baseUrl()->redirect('admin/dbsync');
return '';
}
} }

7
src/Module/Admin/Queue.php
View File

@ -42,13 +42,10 @@ class Queue extends BaseAdmin
{ {
parent::content($parameters); parent::content($parameters);
$a = DI::app(); $status = $parameters['status'] ?? '';
// @TODO: Replace with parameter from router
$deferred = $a->argc > 2 && $a->argv[2] == 'deferred';
// get jobs from the workerqueue table // get jobs from the workerqueue table
if ($deferred) { if ($status == 'deferred') {
$condition = ["NOT `done` AND `retrial` > ?", 0]; $condition = ["NOT `done` AND `retrial` > ?", 0];
$sub_title = DI::l10n()->t('Inspect Deferred Worker Queue'); $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."); $info = DI::l10n()->t("This page lists the deferred worker jobs. This are jobs that couldn't be executed at the first time.");

44
src/Module/Admin/Themes/Details.php
View File

@ -30,44 +30,11 @@ use Friendica\Util\Strings;
class Details extends BaseAdmin class Details extends BaseAdmin
{ {
public static function post(array $parameters = [])
{
parent::post($parameters);
$a = DI::app();
if ($a->argc > 2) {
// @TODO: Replace with parameter from router
$theme = $a->argv[2];
$theme = Strings::sanitizeFilePathItem($theme);
if (is_file("view/theme/$theme/config.php")) {
require_once "view/theme/$theme/config.php";
if (function_exists('theme_admin_post')) {
theme_admin_post($a);
}
}
info(DI::l10n()->t('Theme settings updated.'));
if (DI::mode()->isAjax()) {
return;
}
DI::baseUrl()->redirect('admin/themes/' . $theme);
}
}
public static function content(array $parameters = []) public static function content(array $parameters = [])
{ {
parent::content($parameters); parent::content($parameters);
$a = DI::app(); $theme = Strings::sanitizeFilePathItem($parameters['theme']);
if ($a->argc > 2) {
// @TODO: Replace with parameter from router
$theme = $a->argv[2];
$theme = Strings::sanitizeFilePathItem($theme);
if (!is_dir("view/theme/$theme")) { if (!is_dir("view/theme/$theme")) {
notice(DI::l10n()->t("Item not found.")); notice(DI::l10n()->t("Item not found."));
return ''; return '';
@ -83,7 +50,7 @@ class Details extends BaseAdmin
} }
if (!empty($_GET['action']) && $_GET['action'] == 'toggle') { if (!empty($_GET['action']) && $_GET['action'] == 'toggle') {
parent::checkFormSecurityTokenRedirectOnError('/admin/themes', 'admin_themes', 't'); self::checkFormSecurityTokenRedirectOnError('/admin/themes', 'admin_themes', 't');
if ($isEnabled) { if ($isEnabled) {
Theme::uninstall($theme); Theme::uninstall($theme);
@ -91,7 +58,7 @@ class Details extends BaseAdmin
} elseif (Theme::install($theme)) { } elseif (Theme::install($theme)) {
info(DI::l10n()->t('Theme %s successfully enabled.', $theme)); info(DI::l10n()->t('Theme %s successfully enabled.', $theme));
} else { } else {
info(DI::l10n()->t('Theme %s failed to install.', $theme)); notice(DI::l10n()->t('Theme %s failed to install.', $theme));
} }
DI::baseUrl()->redirect('admin/themes/' . $theme); DI::baseUrl()->redirect('admin/themes/' . $theme);
@ -136,10 +103,7 @@ class Details extends BaseAdmin
'$screenshot' => $screenshot, '$screenshot' => $screenshot,
'$readme' => $readme, '$readme' => $readme,
'$form_security_token' => parent::getFormSecurityToken("admin_themes"), '$form_security_token' => self::getFormSecurityToken("admin_themes"),
]); ]);
} }
DI::baseUrl()->redirect('admin/themes');
}
} }

40
src/Module/Admin/Themes/Embed.php
View File

@ -30,15 +30,9 @@ class Embed extends BaseAdmin
{ {
public static function init(array $parameters = []) public static function init(array $parameters = [])
{ {
$a = DI::app(); $theme = Strings::sanitizeFilePathItem($parameters['theme']);
if ($a->argc > 2) {
// @TODO: Replace with parameter from router
$theme = $a->argv[2];
$theme = Strings::sanitizeFilePathItem($theme);
if (is_file("view/theme/$theme/config.php")) { if (is_file("view/theme/$theme/config.php")) {
$a->setCurrentTheme($theme); DI::app()->setCurrentTheme($theme);
}
} }
} }
@ -46,42 +40,27 @@ class Embed extends BaseAdmin
{ {
parent::post($parameters); parent::post($parameters);
$a = DI::app(); $theme = Strings::sanitizeFilePathItem($parameters['theme']);
if ($a->argc > 2) {
// @TODO: Replace with parameter from router
$theme = $a->argv[2];
$theme = Strings::sanitizeFilePathItem($theme);
if (is_file("view/theme/$theme/config.php")) { if (is_file("view/theme/$theme/config.php")) {
self::checkFormSecurityTokenRedirectOnError('/admin/themes/' . $theme . '/embed?mode=minimal', 'admin_theme_settings');
require_once "view/theme/$theme/config.php"; require_once "view/theme/$theme/config.php";
if (function_exists('theme_admin_post')) { if (function_exists('theme_admin_post')) {
theme_admin_post($a); self::checkFormSecurityTokenRedirectOnError('/admin/themes/' . $theme . '/embed?mode=minimal', 'admin_theme_settings');
theme_admin_post(DI::app());
} }
} }
info(DI::l10n()->t('Theme settings updated.'));
if (DI::mode()->isAjax()) { if (DI::mode()->isAjax()) {
return; return;
} }
DI::baseUrl()->redirect('admin/themes/' . $theme . '/embed?mode=minimal'); DI::baseUrl()->redirect('admin/themes/' . $theme . '/embed?mode=minimal');
} }
}
public static function content(array $parameters = []) public static function content(array $parameters = [])
{ {
parent::content($parameters); parent::content($parameters);
$a = DI::app(); $theme = Strings::sanitizeFilePathItem($parameters['theme']);
if ($a->argc > 2) {
// @TODO: Replace with parameter from router
$theme = $a->argv[2];
$theme = Strings::sanitizeFilePathItem($theme);
if (!is_dir("view/theme/$theme")) { if (!is_dir("view/theme/$theme")) {
notice(DI::l10n()->t('Unknown theme.')); notice(DI::l10n()->t('Unknown theme.'));
return ''; return '';
@ -92,7 +71,7 @@ class Embed extends BaseAdmin
require_once "view/theme/$theme/config.php"; require_once "view/theme/$theme/config.php";
if (function_exists('theme_admin')) { if (function_exists('theme_admin')) {
$admin_form = theme_admin($a); $admin_form = theme_admin(DI::app());
} }
} }
@ -103,10 +82,7 @@ class Embed extends BaseAdmin
return Renderer::replaceMacros($t, [ return Renderer::replaceMacros($t, [
'$action' => '/admin/themes/' . $theme . '/embed?mode=minimal', '$action' => '/admin/themes/' . $theme . '/embed?mode=minimal',
'$form' => $admin_form, '$form' => $admin_form,
'$form_security_token' => parent::getFormSecurityToken("admin_theme_settings"), '$form_security_token' => self::getFormSecurityToken("admin_theme_settings"),
]); ]);
} }
return '';
}
} }

31
src/Module/Admin/Users.php
View File

@ -101,23 +101,22 @@ class Users extends BaseAdmin
{ {
parent::content($parameters); parent::content($parameters);
$a = DI::app(); $action = $parameters['action'] ?? '';
$uid = $parameters['uid'] ?? 0;
if ($a->argc > 3) { if ($uid) {
// @TODO: Replace with parameter from router
$action = $a->argv[2];
$uid = $a->argv[3];
$user = User::getById($uid, ['username', 'blocked']); $user = User::getById($uid, ['username', 'blocked']);
if (!DBA::isResult($user)) { if (!DBA::isResult($user)) {
notice('User not found' . EOL); notice('User not found' . EOL);
DI::baseUrl()->redirect('admin/users'); DI::baseUrl()->redirect('admin/users');
return ''; // NOTREACHED return ''; // NOTREACHED
} }
}
switch ($action) { switch ($action) {
case 'delete': case 'delete':
if (local_user() != $uid) { if (local_user() != $uid) {
parent::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't'); self::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't');
// delete user // delete user
User::remove($uid); User::remove($uid);
@ -127,30 +126,26 @@ class Users extends BaseAdmin
} }
break; break;
case 'block': case 'block':
parent::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't'); self::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't');
User::block($uid); User::block($uid);
notice(DI::l10n()->t('User "%s" blocked', $user['username'])); notice(DI::l10n()->t('User "%s" blocked', $user['username']));
break; break;
case 'unblock': case 'unblock':
parent::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't'); self::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't');
User::block($uid, false); User::block($uid, false);
notice(DI::l10n()->t('User "%s" unblocked', $user['username'])); notice(DI::l10n()->t('User "%s" unblocked', $user['username']));
break; break;
case 'allow': case 'allow':
parent::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't'); self::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't');
User::allow(Register::getPendingForUser($uid)['hash'] ?? ''); User::allow(Register::getPendingForUser($uid)['hash'] ?? '');
notice(DI::l10n()->t('Account approved.')); notice(DI::l10n()->t('Account approved.'));
break; break;
case 'deny': case 'deny':
parent::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't'); self::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't');
User::deny(Register::getPendingForUser($uid)['hash'] ?? ''); User::deny(Register::getPendingForUser($uid)['hash'] ?? '');
notice(DI::l10n()->t('Registration revoked')); notice(DI::l10n()->t('Registration revoked'));
break; break;
} default:
DI::baseUrl()->redirect('admin/users');
}
/* get pending */ /* get pending */
$pending = Register::getPending(); $pending = Register::getPending();
@ -267,7 +262,7 @@ class Users extends BaseAdmin
'$confirm_delete_multi' => DI::l10n()->t('Selected users will be deleted!\n\nEverything these users had posted on this site will be permanently deleted!\n\nAre you sure?'), '$confirm_delete_multi' => DI::l10n()->t('Selected users will be deleted!\n\nEverything these users had posted on this site will be permanently deleted!\n\nAre you sure?'),
'$confirm_delete' => DI::l10n()->t('The user {0} will be deleted!\n\nEverything this user has posted on this site will be permanently deleted!\n\nAre you sure?'), '$confirm_delete' => DI::l10n()->t('The user {0} will be deleted!\n\nEverything this user has posted on this site will be permanently deleted!\n\nAre you sure?'),
'$form_security_token' => parent::getFormSecurityToken('admin_users'), '$form_security_token' => self::getFormSecurityToken('admin_users'),
// values // // values //
'$baseurl' => DI::baseUrl()->get(true), '$baseurl' => DI::baseUrl()->get(true),
@ -284,4 +279,8 @@ class Users extends BaseAdmin
return $o; return $o;
} }
DI::baseUrl()->redirect('admin/users');
return '';
}
} }

6
static/routes.config.php
View File

@ -73,9 +73,7 @@ return [
'/blocklist/contact' => [Module\Admin\Blocklist\Contact::class, [R::GET, R::POST]], '/blocklist/contact' => [Module\Admin\Blocklist\Contact::class, [R::GET, R::POST]],
'/blocklist/server' => [Module\Admin\Blocklist\Server::class, [R::GET, R::POST]], '/blocklist/server' => [Module\Admin\Blocklist\Server::class, [R::GET, R::POST]],
'/dbsync[/check]' => [Module\Admin\DBSync::class, [R::GET]], '/dbsync[/{action}[/{update:\d+}]]' => [Module\Admin\DBSync::class, [R::GET]],
'/dbsync/{update:\d+}' => [Module\Admin\DBSync::class, [R::GET]],
'/dbsync/mark/{update:\d+}' => [Module\Admin\DBSync::class, [R::GET]],
'/features' => [Module\Admin\Features::class, [R::GET, R::POST]], '/features' => [Module\Admin\Features::class, [R::GET, R::POST]],
'/federation' => [Module\Admin\Federation::class, [R::GET]], '/federation' => [Module\Admin\Federation::class, [R::GET]],
@ -88,7 +86,7 @@ return [
'/phpinfo' => [Module\Admin\PhpInfo::class, [R::GET]], '/phpinfo' => [Module\Admin\PhpInfo::class, [R::GET]],
'/queue[/deferred]' => [Module\Admin\Queue::class, [R::GET]], '/queue[/{status}]' => [Module\Admin\Queue::class, [R::GET]],
'/site' => [Module\Admin\Site::class, [R::GET, R::POST]], '/site' => [Module\Admin\Site::class, [R::GET, R::POST]],

2
view/templates/admin/dbsync/failed_updates.tpl
View File

@ -10,7 +10,7 @@
<ul> <ul>
<li><a href="{{$baseurl}}/admin/dbsync/mark/{{$f}}">{{$mark}}</a></li> <li><a href="{{$baseurl}}/admin/dbsync/mark/{{$f}}">{{$mark}}</a></li>
<li><a href="{{$baseurl}}/admin/dbsync/{{$f}}">{{$apply}}</a></li> <li><a href="{{$baseurl}}/admin/dbsync/update/{{$f}}">{{$apply}}</a></li>
</ul> </ul>
<hr /> <hr />