Refactor deprecated App::isAjax() to DI::mode()->isAjax()

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

diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php
index c899729f8e7a7b684d5978d3cbd757e965914dd5..42b35edff30e76cc28f4828972cd99ad82ef9fb4 100644 (file)
--- a/src/Module/Admin/Site.php
+++ b/src/Module/Admin/Site.php
@@ -10,11 +10,11 @@ use Friendica\Core\StorageManager;
 use Friendica\Core\Theme;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Module\BaseAdminModule;
 use Friendica\Module\Register;
 use Friendica\Protocol\PortableContact;
 use Friendica\Util\BasePath;
-use Friendica\Util\BaseURL;
 use Friendica\Util\Strings;
 use Friendica\Worker\Delivery;
 
@@ -22,13 +22,13 @@ require_once __DIR__ . '/../../../boot.php';
 
 class Site extends BaseAdminModule
 {
-       public static function post()
+       public static function post(array $parameters = [])
        {
-               parent::post();
+               parent::post($parameters);
 
                self::checkFormSecurityTokenRedirectOnError('/admin/site', 'admin_site');
 
-               $a = self::getApp();
+               $a = DI::app();
 
                if (!empty($_POST['republish_directory'])) {
                        Worker::add(PRIORITY_LOW, 'Directory');
@@ -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
 
@@ -201,7 +201,7 @@ class Site extends BaseAdminModule
                /**
                 * @var $storagebackend \Friendica\Model\Storage\IStorage
                 */
-               $storagebackend    = Strings::escapeTags(trim(defaults($_POST, 'storagebackend', '')));
+               $storagebackend    = Strings::escapeTags(trim($_POST['storagebackend'] ?? ''));
 
                // save storage backend form
                if (!is_null($storagebackend) && $storagebackend != "") {
@@ -217,7 +217,7 @@ class Site extends BaseAdminModule
                                                        $value = !empty($_POST[$fieldname]);
                                                        break;
                                                default:
-                                                       $value = defaults($_POST, $fieldname, '');
+                                                       $value = $_POST[$fieldname] ?? '';
                                        }
                                        $storage_opts_data[$name] = $value;
                                }
@@ -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.'));
@@ -246,7 +246,7 @@ class Site extends BaseAdminModule
                        $diaspora_enabled = false;
                }
                if ($ssl_policy != intval(Config::get('system', 'ssl_policy'))) {
-                       if ($ssl_policy == BaseURL::SSL_POLICY_FULL) {
+                       if ($ssl_policy == App\BaseURL::SSL_POLICY_FULL) {
                                DBA::e("UPDATE `contact` SET
                                `url`     = REPLACE(`url`    , 'http:' , 'https:'),
                                `photo`   = REPLACE(`photo`  , 'http:' , 'https:'),
@@ -264,7 +264,7 @@ class Site extends BaseAdminModule
                                `thumb`   = REPLACE(`thumb`  , 'http:' , 'https:')
                                WHERE 1 "
                                );
-                       } elseif ($ssl_policy == BaseURL::SSL_POLICY_SELFSIGN) {
+                       } elseif ($ssl_policy == App\BaseURL::SSL_POLICY_SELFSIGN) {
                                DBA::e("UPDATE `contact` SET
                                `url`     = REPLACE(`url`    , 'https:' , 'http:'),
                                `photo`   = REPLACE(`photo`  , 'https:' , 'http:'),
@@ -410,14 +410,14 @@ 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()
+       public static function content(array $parameters = [])
        {
-               parent::content();
+               parent::content($parameters);
 
-               $a = self::getApp();
+               $a = DI::app();
 
                /* Installed langs */
                $lang_choices = L10n::getAvailableLanguages();
@@ -512,9 +512,9 @@ class Site extends BaseAdminModule
                ];
 
                $ssl_choices = [
-                       BaseURL::SSL_POLICY_NONE => L10n::t('No SSL policy, links will track page SSL state'),
-                       BaseURL::SSL_POLICY_FULL => L10n::t('Force all links to use SSL'),
-                       BaseURL::SSL_POLICY_SELFSIGN => L10n::t('Self-signed certificate, use SSL for local links only (discouraged)')
+                       App\BaseURL::SSL_POLICY_NONE => L10n::t('No SSL policy, links will track page SSL state'),
+                       App\BaseURL::SSL_POLICY_FULL => L10n::t('Force all links to use SSL'),
+                       App\BaseURL::SSL_POLICY_SELFSIGN => L10n::t('Self-signed certificate, use SSL for local links only (discouraged)')
                ];
 
                $check_git_version_choices = [