@@ -90,7 +90,7 @@ |
||
90 | 90 | { |
91 | 91 | $this->joinElementTable('enupalsocializer_tokens'); |
92 | 92 | |
93 | - if (is_null($this->query)){ |
|
93 | + if (is_null($this->query)) { |
|
94 | 94 | return false; |
95 | 95 | } |
96 | 96 |
@@ -103,7 +103,7 @@ |
||
103 | 103 | { |
104 | 104 | $this->joinElementTable('enupalsocializer_providers'); |
105 | 105 | |
106 | - if (is_null($this->query)){ |
|
106 | + if (is_null($this->query)) { |
|
107 | 107 | return false; |
108 | 108 | } |
109 | 109 |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | */ |
78 | 78 | public static function displayName(): string |
79 | 79 | { |
80 | - return Craft::t('enupal-socializer','Socializer'); |
|
80 | + return Craft::t('enupal-socializer', 'Socializer'); |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | /** |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | $record = TokenRecord::findOne($this->id); |
173 | 173 | |
174 | 174 | if (!$record) { |
175 | - throw new \Exception('Invalid Token ID: ' . $this->id); |
|
175 | + throw new \Exception('Invalid Token ID: '.$this->id); |
|
176 | 176 | } |
177 | 177 | } else { |
178 | 178 | $record->id = $this->id; |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | $redirect = $this->getRedirectUrl(); |
32 | 32 | |
33 | 33 | if (is_null($provider)) { |
34 | - throw new \Exception(Craft::t('enupal-socializer','Provider not found or disabled')); |
|
34 | + throw new \Exception(Craft::t('enupal-socializer', 'Provider not found or disabled')); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | $redirectUrl = $redirect ?? Craft::$app->getRequest()->referrer; |
@@ -40,8 +40,8 @@ discard block |
||
40 | 40 | $adapter = $provider->getAdapter(); |
41 | 41 | |
42 | 42 | try { |
43 | - if ($adapter->authenticate()){ |
|
44 | - if (!Socializer::$app->providers->loginOrRegisterUser($provider)){ |
|
43 | + if ($adapter->authenticate()) { |
|
44 | + if (!Socializer::$app->providers->loginOrRegisterUser($provider)) { |
|
45 | 45 | Craft::$app->getSession()->setError(Craft::t('enupal-socializer', "Unable to authenticate user")); |
46 | 46 | } |
47 | 47 | } |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | { |
63 | 63 | $redirect = Craft::$app->getRequest()->getParam('redirect'); |
64 | 64 | |
65 | - if ($redirect){ |
|
65 | + if ($redirect) { |
|
66 | 66 | $redirect = UrlHelper::siteUrl($redirect); |
67 | 67 | } |
68 | 68 | |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | $redirectUrl = Craft::$app->getSession()->get(self::SESSION_REDIRECT_URL); |
81 | 81 | $user = Craft::$app->getUser()->getIdentity(); |
82 | 82 | |
83 | - if ($user){ |
|
83 | + if ($user) { |
|
84 | 84 | $variables['user'] = $user; |
85 | 85 | $redirectUrl = Craft::$app->getView()->renderString($redirectUrl, $variables); |
86 | 86 | } |
@@ -103,11 +103,11 @@ discard block |
||
103 | 103 | $providerHandle = Craft::$app->getSession()->get(self::SESSION_PROVIDER_HANDLE); |
104 | 104 | $provider = Socializer::$app->providers->getProviderByHandle($providerHandle); |
105 | 105 | |
106 | - if (is_null($provider)){ |
|
107 | - throw new \Exception(Craft::t('enupal-socializer','Provider not found or disabled')); |
|
106 | + if (is_null($provider)) { |
|
107 | + throw new \Exception(Craft::t('enupal-socializer', 'Provider not found or disabled')); |
|
108 | 108 | } |
109 | 109 | |
110 | - if (!Socializer::$app->providers->loginOrRegisterUser($provider)){ |
|
110 | + if (!Socializer::$app->providers->loginOrRegisterUser($provider)) { |
|
111 | 111 | Craft::$app->getSession()->setError(Craft::t('enupal-socializer', "Unable to authenticate user")); |
112 | 112 | } |
113 | 113 |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | { |
26 | 26 | $this->requirePostRequest(); |
27 | 27 | $settings = Craft::$app->getRequest()->getBodyParam('settings'); |
28 | - $message = Craft::t('enupal-socializer','Settings saved.'); |
|
28 | + $message = Craft::t('enupal-socializer', 'Settings saved.'); |
|
29 | 29 | |
30 | 30 | $plugin = Socializer::$app->settings->getPlugin(); |
31 | 31 | $settingsModel = $plugin->getSettings(); |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | |
35 | 35 | if (!Socializer::$app->settings->saveSettings($settingsModel)) { |
36 | 36 | |
37 | - Craft::$app->getSession()->setError(Craft::t('enupal-socializer','Couldn’t save settings.')); |
|
37 | + Craft::$app->getSession()->setError(Craft::t('enupal-socializer', 'Couldn’t save settings.')); |
|
38 | 38 | |
39 | 39 | // Send the settings back to the template |
40 | 40 | Craft::$app->getUrlManager()->setRouteParams([ |
@@ -98,11 +98,11 @@ |
||
98 | 98 | return array_merge($parent, [ |
99 | 99 | 'subnav' => [ |
100 | 100 | 'providers' => [ |
101 | - "label" => Craft::t('enupal-socializer',"Providers"), |
|
101 | + "label" => Craft::t('enupal-socializer', "Providers"), |
|
102 | 102 | "url" => 'enupal-socializer/providers' |
103 | 103 | ], |
104 | 104 | 'settings' => [ |
105 | - "label" => Craft::t('enupal-socializer',"Settings"), |
|
105 | + "label" => Craft::t('enupal-socializer', "Settings"), |
|
106 | 106 | "url" => 'enupal-socializer/settings' |
107 | 107 | ] |
108 | 108 | ] |
@@ -28,15 +28,15 @@ |
||
28 | 28 | { |
29 | 29 | if ($object->type != Apple::class) { |
30 | 30 | if ($object->enabled && !$object->clientId) { |
31 | - $this->addError($object, $attribute, Craft::t('enupal-socializer','Client ID cannot be blank')); |
|
31 | + $this->addError($object, $attribute, Craft::t('enupal-socializer', 'Client ID cannot be blank')); |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | if ($object->enabled && !$object->clientSecret) { |
35 | - $this->addError($object, 'clientSecret', Craft::t('enupal-socializer','Client Secret cannot be blank')); |
|
35 | + $this->addError($object, 'clientSecret', Craft::t('enupal-socializer', 'Client Secret cannot be blank')); |
|
36 | 36 | } |
37 | - }else if ($object->type === Apple::class && $object->enabled) { |
|
37 | + } else if ($object->type === Apple::class && $object->enabled) { |
|
38 | 38 | if (!Socializer::$app->settings->validateAppleSettings()) { |
39 | - $this->addError($object, 'enabled', Craft::t('enupal-socializer','Unable to process the Apple settings from the config file')); |
|
39 | + $this->addError($object, 'enabled', Craft::t('enupal-socializer', 'Unable to process the Apple settings from the config file')); |
|
40 | 40 | } |
41 | 41 | } |
42 | 42 |
@@ -15,5 +15,5 @@ |
||
15 | 15 | // Disable CSRF validation for the entire controller |
16 | 16 | public $enableCsrfValidation = false; |
17 | 17 | |
18 | - protected array|int|bool $allowAnonymous = true; |
|
18 | + protected array | int | bool $allowAnonymous = true; |
|
19 | 19 | } |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | $adapter = $provider->getAdapter(); |
45 | 45 | $token = Socializer::$app->tokens->getToken($provider->id, $user->id); |
46 | 46 | |
47 | - if (is_null($token)){ |
|
47 | + if (is_null($token)) { |
|
48 | 48 | $token = new Token(); |
49 | 49 | $token->providerId = $provider->id; |
50 | 50 | $token->userId = $user->id; |
@@ -68,10 +68,10 @@ discard block |
||
68 | 68 | { |
69 | 69 | $user = Craft::$app->getUser()->getIdentity(); |
70 | 70 | |
71 | - if ($user){ |
|
71 | + if ($user) { |
|
72 | 72 | /** @var Token $token */ |
73 | 73 | $token = $this->getToken($providerId, $user->id); |
74 | - if ($token){ |
|
74 | + if ($token) { |
|
75 | 75 | return $token->accessToken; |
76 | 76 | } |
77 | 77 | } |