Merge init() and content()

diff --git a/src/Module/Security/OpenID.php b/src/Module/Security/OpenID.php
index f33c5e54d1290c8328a0f5f0a32e78dbdc8455b3..b11afa1b989730d348139b42d490c00baad5f68b 100644 (file)
--- a/src/Module/Security/OpenID.php
+++ b/src/Module/Security/OpenID.php
@@ -18,20 +18,18 @@ use Psr\Log\LoggerInterface;
  */
 class OpenID extends BaseModule
 {
-       public static function init(array $parameters = [])
+       public static function content(array $parameters = [])
        {
                /** @var Configuration $config */
                $config = self::getClass(Configuration::class);
+
                /** @var BaseURL $baseUrl */
                $baseUrl = self::getClass(BaseURL::class);
 
                if ($config->get('system', 'no_openid')) {
                        $baseUrl->redirect();
                }
-       }
 
-       public static function content(array $parameters = [])
-       {
                /** @var LoggerInterface $logger */
                $logger = self::getClass(LoggerInterface::class);
 
@@ -42,9 +40,6 @@ class OpenID extends BaseModule
 
                if (!empty($_GET['openid_mode']) && !empty($session->get('openid'))) {
 
-                       /** @var BaseURL $baseUrl */
-                       $baseUrl = self::getClass(BaseURL::class);
-
                        $openid = new LightOpenID($baseUrl->getHostname());
 
                        /** @var L10n $l10n */
@@ -93,8 +88,6 @@ class OpenID extends BaseModule
                                $open_id_obj->identity = $authId;
                                $session->set('openid_server', $open_id_obj->discover($open_id_obj->identity));
 
-                               $config = self::getClass(Configuration::class);
-
                                if (intval($config->get('config', 'register_policy')) === \Friendica\Module\Register::CLOSED) {
                                        notice($l10n->t('Account not found. Please login to your existing account to add the OpenID to it.'));
                                } else {