dukt / social

providers/login/BaseProvider.php

Braces +2 added lines, -4 removed lines

@@ -95,8 +95,7 @@ 
 		if ($providerConfig && isset($providerConfig['scope']))
 		{
 			return $providerConfig['scope'];
-		}
-		else
+		} else
 		{
 			return $this->getDefaultScope();
 		}
@@ -114,8 +113,7 @@ 
 		if ($providerConfig && isset($providerConfig['authorizationOptions']))
 		{
 			return $providerConfig['authorizationOptions'];
-		}
-		else
+		} else
 		{
 			return $this->getDefaultAuthorizationOptions();
 		}

models/Social_LoginAccountModel.php

Braces +1 added lines, -2 removed lines

@@ -26,8 +26,7 @@
 		if (craft()->config->get('useEmailAsUsername'))
 		{
 			return $this->email;
-		}
-		else
+		} else
 		{
 			return $this->username;
 		}

elementtypes/Social_LoginAccountElementType.php

Braces +3 added lines, -6 removed lines

@@ -126,8 +126,7 @@ 
 			$attributes = array(
 				'email' => Craft::t('Email'),
 			);
-		}
-		else
+		} else
 		{
 			$attributes = array(
 				'username' => Craft::t('Username'),
@@ -165,8 +164,7 @@ 
 			$attributes = array(
 				'email' => array('label' => Craft::t('Email')),
 			);
-		}
-		else
+		} else
 		{
 			$attributes = array(
 				'username' => array('label' => Craft::t('Username')),
@@ -242,8 +240,7 @@ 
 						'</div>';
 
 					return $html;
-				}
-				else
+				} else
 				{
 					return '';
 				}

base/SocialTrait.php

Braces +2 added lines, -4 removed lines

@@ -37,8 +37,7 @@ 
             $url = UrlHelper::getUrl('social/install');
             craft()->request->redirect($url);
             return false;
-        }
-        else
+        } else
         {
             return true;
         }
@@ -96,8 +95,7 @@ 
                 {
                     $dependencies[] = $dependency;
                 }
-            }
-            else
+            } else
             {
                 $dependencies[] = $dependency;
             }

services/Social_LoginAccountsService.php

Braces +10 added lines, -20 removed lines

@@ -114,8 +114,7 @@ 
             {
                 throw new Exception(Craft::t('No social user exists with the ID “{id}”', ['id' => $account->id]));
             }
-        }
-        else
+        } else
         {
             $accountRecord = new Social_LoginAccountRecord;
         }
@@ -153,8 +152,7 @@ 
 
                     return true;
                 }
-            }
-            catch (\Exception $e)
+            } catch (\Exception $e)
             {
                 if ($transaction !== null)
                 {
@@ -165,8 +163,7 @@ 
             }
 
             return true;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -284,16 +281,14 @@ 
             if (!$user)
             {
                 $user = $this->_registerUser($attributes, $providerHandle);
-            }
-            else
+            } else
             {
                 if (craft()->config->get('allowEmailMatch', 'social') !== true)
                 {
                     throw new Exception("An account already exists with this email: ".$attributes['email']);
                 }
             }
-        }
-        else
+        } else
         {
             throw new Exception("Email address not provided.");
         }
@@ -371,14 +366,12 @@ 
                             try
                             {
                                 $newUser->{$attribute} = craft()->templates->renderString($template, $variables);
-                            }
-                            catch(\Exception $e)
+                            } catch(\Exception $e)
                             {
                                 SocialPlugin::log('Could not map:'.print_r([$attribute, $template, $variables, $e->getMessage()], true), LogLevel::Warning);
                             }
                         }
-                    }
-                    else
+                    } else
                     {
                         $fieldHandle = $key;
 
@@ -388,8 +381,7 @@ 
                             try
                             {
                                 $userContent[$fieldHandle] = craft()->templates->renderString($template, $variables);
-                            }
-                            catch(\Exception $e)
+                            } catch(\Exception $e)
                             {
                                 SocialPlugin::log('Could not map:'.print_r([$template, $variables, $e->getMessage()], true), LogLevel::Warning);
                             }
@@ -433,13 +425,11 @@ 
                     {
                         $photoUrl = craft()->templates->renderString($userMapping['photoUrl'], $variables);
                         $photoUrl = html_entity_decode($photoUrl);
-                    }
-                    catch(\Exception $e)
+                    } catch(\Exception $e)
                     {
                         SocialPlugin::log('Could not map:'.print_r(['photoUrl', $userMapping['photoUrl'], $variables, $e->getMessage()], true), LogLevel::Warning);
                     }
-                }
-                else
+                } else
                 {
                     if (!empty($attributes['photoUrl']))
                     {

controllers/Social_LoginProvidersController.php

Braces +4 added lines, -8 removed lines

@@ -63,13 +63,11 @@ 
 				}
 
 				$this->renderTemplate('social/loginproviders/_edit', $variables);
-			}
-			else
+			} else
 			{
 				throw new HttpException(404);
 			}
-		}
-		else
+		} else
 		{
 			throw new HttpException(404);
 		}
@@ -88,8 +86,7 @@ 
 		if (craft()->social_loginProviders->enableLoginProvider($loginProvider))
 		{
 			craft()->userSession->setNotice(Craft::t('Login provider enabled.'));
-		}
-		else
+		} else
 		{
 			craft()->userSession->setError(Craft::t('Couldn’t enable login provider.'));
 		}
@@ -110,8 +107,7 @@ 
 		if (craft()->social_loginProviders->disableLoginProvider($loginProvider))
 		{
 			craft()->userSession->setNotice(Craft::t('Login provider disabled.'));
-		}
-		else
+		} else
 		{
 			craft()->userSession->setError(Craft::t('Couldn’t disable login provider.'));
 		}

controllers/Social_InstallController.php

Braces +1 added lines, -2 removed lines

@@ -26,8 +26,7 @@
             $this->renderTemplate('social/_special/install/dependencies', [
                 'pluginDependencies' => $missingDependencies
             ]);
-        }
-        else
+        } else
         {
             $this->redirect('social/settings');
         }

controllers/SocialController.php

Braces +12 added lines, -24 removed lines

@@ -91,14 +91,12 @@ 
 				if($response['success'])
 				{
 					$this->_connectUserFromToken($response['token']);
-				}
-				else
+				} else
 				{
 					throw new \Exception($response['errorMsg']);
 				}
 			}
-		}
-		catch(\Guzzle\Http\Exception\BadResponseException $e)
+		} catch(\Guzzle\Http\Exception\BadResponseException $e)
 		{
 			$response = $e->getResponse();
 
@@ -110,8 +108,7 @@ 
 			if($json)
 			{
 				$errorMsg = $json['error']['message'];
-			}
-			else
+			} else
 			{
 				$errorMsg = "Couldn’t login.";
 			}
@@ -119,8 +116,7 @@ 
 			craft()->userSession->setFlash('error', $errorMsg);
 			$this->_cleanSession();
 			$this->redirect($this->referer);
-		}
-		catch (\Exception $e)
+		} catch (\Exception $e)
 		{
 			$errorMsg = $e->getMessage();
 			craft()->userSession->setFlash('error', $errorMsg);
@@ -213,8 +209,7 @@ 
 		if ($craftUser)
 		{
 			$this->_linkAccountFromToken($token, $craftUser);
-		}
-		else
+		} else
 		{
 			$this->_registerOrLoginFromToken($token);
 		}
@@ -254,13 +249,11 @@ 
 				craft()->userSession->setNotice(Craft::t('Social account linked.'));
 
 				$this->redirect($this->redirect);
-			}
-			else
+			} else
 			{
 				throw new Exception("This UID is already associated with another user. Disconnect from your current session and retry.");
 			}
-		}
-		else
+		} else
 		{
 			// save social user
 			$account = new Social_LoginAccountModel;
@@ -303,13 +296,11 @@ 
 
 				// login
 				$this->_login($token);
-			}
-			else
+			} else
 			{
 				throw new Exception("Social account exists but Craft user doesn't");
 			}
-		}
-		else
+		} else
 		{
 			// register user
 			$craftUser = craft()->social_loginAccounts->registerUser($attributes, $socialLoginProvider->getHandle());
@@ -325,8 +316,7 @@ 
 
 				// login
 				$this->_login($token, true);
-			}
-			else
+			} else
 			{
 				throw new Exception("Craft user couldn’t be created.");
 			}
@@ -352,15 +342,13 @@ 
 			if ($registrationMode)
 			{
 				craft()->userSession->setNotice(Craft::t('Account created.'));
-			}
-			else
+			} else
 			{
 				craft()->userSession->setNotice(Craft::t('Logged in.'));
 			}
 
 			$this->redirect($this->redirect);
-		}
-		else
+		} else
 		{
 			$errorCode = craft()->social_userSession->getLoginErrorCode();
 			$errorMessage = craft()->social_userSession->getLoginErrorMessage($errorCode);

controllers/Social_LoginAccountsController.php

Braces +2 added lines, -4 removed lines

@@ -57,13 +57,11 @@
 				$variables['loginAccounts'] = $loginAccounts;
 
 				$this->renderTemplate('social/loginaccounts/_edit', $variables);
-			}
-			else
+			} else
 			{
 				throw new HttpException(404);
 			}
-		}
-		else
+		} else
 		{
 			throw new HttpException(404);
 		}