Merge pull request #8142 from nupplaphil/task/di_config

[friendica.git] / src / Module / Admin / DBSync.php

diff --git a/src/Module/Admin/DBSync.php b/src/Module/Admin/DBSync.php
index 0d68a564813019c4b92078e88d8d0c8853fd06db..c342db93b426bde2641533e39d9716e85407f189 100644 (file)
--- a/src/Module/Admin/DBSync.php
+++ b/src/Module/Admin/DBSync.php
@@ -2,12 +2,11 @@
 
 namespace Friendica\Module\Admin;
 
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\Update;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
+use Friendica\DI;
 use Friendica\Module\BaseAdminModule;
 
 class DBSync extends BaseAdminModule
@@ -16,7 +15,7 @@ class DBSync extends BaseAdminModule
        {
                parent::content($parameters);
 
-               $a = self::getApp();
+               $a = DI::app();
 
                $o = '';
 
@@ -24,14 +23,14 @@ class DBSync extends BaseAdminModule
                        // @TODO: Replace with parameter from router
                        $update = intval($a->argv[3]);
                        if ($update) {
-                               Config::set('database', 'update_' . $update, 'success');
-                               $curr = Config::get('system', 'build');
+                               DI::config()->set('database', 'update_' . $update, 'success');
+                               $curr = DI::config()->get('system', 'build');
                                if (intval($curr) == $update) {
-                                       Config::set('system', 'build', intval($curr) + 1);
+                                       DI::config()->set('system', 'build', intval($curr) + 1);
                                }
-                               info(L10n::t('Update has been marked successful') . EOL);
+                               info(DI::l10n()->t('Update has been marked successful') . EOL);
                        }
-                       $a->internalRedirect('admin/dbsync');
+                       DI::baseUrl()->redirect('admin/dbsync');
                }
 
                if ($a->argc > 2) {
@@ -39,11 +38,11 @@ class DBSync extends BaseAdminModule
                                // @TODO Seems like a similar logic like Update::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());
+                                       $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_time', time());
                                } else {
-                                       $o .= 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;
@@ -60,16 +59,16 @@ class DBSync extends BaseAdminModule
                                        $retval = $func();
 
                                        if ($retval === Update::FAILED) {
-                                               $o .= 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) {
-                                               $o .= L10n::t('Update %s was successfully applied.', $func);
-                                               Config::set('database', $func, 'success');
+                                               $o .= DI::l10n()->t('Update %s was successfully applied.', $func);
+                                               DI::config()->set('database', $func, 'success');
                                        } else {
-                                               $o .= 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 {
-                                       $o .= L10n::t('There was no additional update function %s that needed to be called.', $func) . "<br />";
-                                       Config::set('database', $func, 'success');
+                                       $o .= DI::l10n()->t('There was no additional update function %s that needed to be called.', $func) . "<br />";
+                                       DI::config()->set('database', $func, 'success');
                                }
 
                                return $o;
@@ -87,17 +86,17 @@ class DBSync extends BaseAdminModule
 
                if (!count($failed)) {
                        $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('admin/dbsync/structure_check.tpl'), [
-                               '$base' => $a->getBaseURL(true),
-                               '$banner' => L10n::t('No failed updates.'),
-                               '$check' => L10n::t('Check database structure'),
+                               '$base' => DI::baseUrl()->get(true),
+                               '$banner' => DI::l10n()->t('No failed updates.'),
+                               '$check' => DI::l10n()->t('Check database structure'),
                        ]);
                } else {
                        $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('admin/dbsync/failed_updates.tpl'), [
-                               '$base' => $a->getBaseURL(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'),
+                               '$base' => DI::baseUrl()->get(true),
+                               '$banner' => DI::l10n()->t('Failed Updates'),
+                               '$desc' => DI::l10n()->t('This does not include updates prior to 1139, which did not return a status.'),
+                               '$mark' => DI::l10n()->t("Mark success \x28if update was manually applied\x29"),
+                               '$apply' => DI::l10n()->t('Attempt to execute this update step automatically'),
                                '$failed' => $failed
                        ]);
                }