Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-20 15:10:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactor deprecated App::internalRedirect() to DI::baseUrl()->redirect()

Browse source
This commit is contained in:
nupplaPhil 2019-12-16 00:28:31 +01:00
parent cc9b7bb14f
commit 8e6973b774
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
77 changed files with 263 additions and 259 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Module/Admin/Addons/Details.php
View file

@ -29,11 +29,11 @@ class Details extends BaseAdminModule
$func($a);
}
$a->internalRedirect('admin/addons/' . $addon);
DI::baseUrl()->redirect('admin/addons/' . $addon);
}
}
$a->internalRedirect('admin/addons');
DI::baseUrl()->redirect('admin/addons');
}
public static function content(array $parameters = [])
@ -51,7 +51,7 @@ class Details extends BaseAdminModule
if (!is_file("addon/$addon/$addon.php")) {
notice(L10n::t('Addon not found.'));
Addon::uninstall($addon);
$a->internalRedirect('admin/addons');
DI::baseUrl()->redirect('admin/addons');
}
if (($_GET['action'] ?? '') == 'toggle') {
@ -68,7 +68,7 @@ class Details extends BaseAdminModule
Addon::saveEnabledList();
$a->internalRedirect('admin/addons/' . $addon);
DI::baseUrl()->redirect('admin/addons/' . $addon);
}
// display addon details
@ -119,6 +119,6 @@ class Details extends BaseAdminModule
]);
}
$a->internalRedirect('admin/addons');
DI::baseUrl()->redirect('admin/addons');
}
}

2
src/Module/Admin/Addons/Index.php
View file

@ -41,7 +41,7 @@ class Index extends BaseAdminModule
}
$a->internalRedirect('admin/addons');
DI::baseUrl()->redirect('admin/addons');
}
$addons = Addon::getAvailableList();

2
src/Module/Admin/Blocklist/Contact.php
View file

@ -39,7 +39,7 @@ class Contact extends BaseAdminModule
notice(L10n::tt('%s contact unblocked', '%s contacts unblocked', count($contacts)));
}
DI::app()->internalRedirect('admin/blocklist/contact');
DI::baseUrl()->redirect('admin/blocklist/contact');
}
public static function content(array $parameters = [])

2
src/Module/Admin/Blocklist/Server.php
View file

@ -48,7 +48,7 @@ class Server extends BaseAdminModule
info(L10n::t('Site blocklist updated.') . EOL);
}
DI::app()->internalRedirect('admin/blocklist/server');
DI::baseUrl()->redirect('admin/blocklist/server');
}
public static function content(array $parameters = [])

2
src/Module/Admin/DBSync.php
View file

@ -32,7 +32,7 @@ class DBSync extends BaseAdminModule
}
info(L10n::t('Update has been marked successful') . EOL);
}
$a->internalRedirect('admin/dbsync');
DI::baseUrl()->redirect('admin/dbsync');
}
if ($a->argc > 2) {

2
src/Module/Admin/Features.php
View file

@ -40,7 +40,7 @@ class Features extends BaseAdminModule
}
}
DI::app()->internalRedirect('admin/features');
DI::baseUrl()->redirect('admin/features');
}
public static function content(array $parameters = [])

2
src/Module/Admin/Item/Delete.php
View file

@ -34,7 +34,7 @@ class Delete extends BaseAdminModule
}
info(L10n::t('Item marked for deletion.') . EOL);
DI::app()->internalRedirect('admin/item/delete');
DI::baseUrl()->redirect('admin/item/delete');
}
public static function content(array $parameters = [])

2
src/Module/Admin/Logs/Settings.php
View file

@ -35,7 +35,7 @@ class Settings extends BaseAdminModule
}
info(L10n::t("Log settings updated."));
DI::app()->internalRedirect('admin/logs');
DI::baseUrl()->redirect('admin/logs');
}
public static function content(array $parameters = [])

10
src/Module/Admin/Site.php
View file

@ -48,7 +48,7 @@ class Site extends BaseAdminModule
$parsed = @parse_url($new_url);
if (!is_array($parsed) || empty($parsed['host']) || empty($parsed['scheme'])) {
notice(L10n::t("Can not parse base url. Must have at least <scheme>://<domain>"));
$a->internalRedirect('admin/site');
DI::baseUrl()->redirect('admin/site');
}
/* steps:
@ -77,7 +77,7 @@ class Site extends BaseAdminModule
$r = DBA::e(sprintf("UPDATE %s SET %s;", $table_name, $upds));
if (!DBA::isResult($r)) {
notice("Failed updating '$table_name': " . DBA::errorMessage());
$a->internalRedirect('admin/site');
DI::baseUrl()->redirect('admin/site');
}
}
@ -105,7 +105,7 @@ class Site extends BaseAdminModule
info("Relocation started. Could take a while to complete.");
$a->internalRedirect('admin/site');
DI::baseUrl()->redirect('admin/site');
}
// end relocate
@ -229,7 +229,7 @@ class Site extends BaseAdminModule
foreach ($storage_form_errors as $name => $err) {
notice('Storage backend, ' . $storage_opts[$name][1] . ': ' . $err);
}
$a->internalRedirect('admin/site' . $active_panel);
DI::baseUrl()->redirect('admin/site' . $active_panel);
}
} else {
info(L10n::t('Invalid storage backend setting value.'));
@ -410,7 +410,7 @@ class Site extends BaseAdminModule
info(L10n::t('Site settings updated.') . EOL);
$a->internalRedirect('admin/site' . $active_panel);
DI::baseUrl()->redirect('admin/site' . $active_panel);
}
public static function content(array $parameters = [])

6
src/Module/Admin/Themes/Details.php
View file

@ -36,7 +36,7 @@ class Details extends BaseAdminModule
return;
}
$a->internalRedirect('admin/themes/' . $theme);
DI::baseUrl()->redirect('admin/themes/' . $theme);
}
}
@ -76,7 +76,7 @@ class Details extends BaseAdminModule
info(L10n::t('Theme %s failed to install.', $theme));
}
$a->internalRedirect('admin/themes/' . $theme);
DI::baseUrl()->redirect('admin/themes/' . $theme);
}
$readme = null;
@ -122,6 +122,6 @@ class Details extends BaseAdminModule
]);
}
$a->internalRedirect('admin/themes');
DI::baseUrl()->redirect('admin/themes');
}
}

2
src/Module/Admin/Themes/Embed.php
View file

@ -50,7 +50,7 @@ class Embed extends BaseAdminModule
return;
}
$a->internalRedirect('admin/themes/' . $theme . '/embed?mode=minimal');
DI::baseUrl()->redirect('admin/themes/' . $theme . '/embed?mode=minimal');
}
}

2
src/Module/Admin/Themes/Index.php
View file

@ -59,7 +59,7 @@ class Index extends BaseAdminModule
}
$a->internalRedirect('admin/themes');
DI::baseUrl()->redirect('admin/themes');
}
$themes = [];

2
src/Module/Admin/Tos.php
View file

@ -30,7 +30,7 @@ class Tos extends BaseAdminModule
info(L10n::t('The Terms of Service settings have been updated.'));
DI::app()->internalRedirect('admin/tos');
DI::baseUrl()->redirect('admin/tos');
}
public static function content(array $parameters = [])

6
src/Module/Admin/Users.php
View file

@ -129,7 +129,7 @@ class Users extends BaseAdminModule
}
}
$a->internalRedirect('admin/users');
DI::baseUrl()->redirect('admin/users');
}
public static function content(array $parameters = [])
@ -145,7 +145,7 @@ class Users extends BaseAdminModule
$user = User::getById($uid, ['username', 'blocked']);
if (!DBA::isResult($user)) {
notice('User not found' . EOL);
$a->internalRedirect('admin/users');
DI::baseUrl()->redirect('admin/users');
return ''; // NOTREACHED
}
@ -175,7 +175,7 @@ class Users extends BaseAdminModule
break;
}
$a->internalRedirect('admin/users');
DI::baseUrl()->redirect('admin/users');
}
/* get pending */