dukt / social

providers/login/Google.php

Indentation +45 added lines, -45 removed lines

@@ -12,56 +12,56 @@
 
 class Google extends BaseProvider
 {
-	/**
-	 * Get the provider name.
-	 *
-	 * @return string
-	 */
-	public function getName()
-	{
-		return 'Google';
-	}
+    /**
+     * Get the provider name.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return 'Google';
+    }
 
-	/**
-	 * Get the provider handle.
-	 *
-	 * @return string
-	 */
-	public function getOauthProviderHandle()
-	{
-		return 'google';
-	}
+    /**
+     * Get the provider handle.
+     *
+     * @return string
+     */
+    public function getOauthProviderHandle()
+    {
+        return 'google';
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public function getDefaultScope()
-	{
-		return [
-			'https://www.googleapis.com/auth/userinfo.profile',
-			'https://www.googleapis.com/auth/userinfo.email'
-		];
-	}
+    /**
+     * @inheritDoc
+     */
+    public function getDefaultScope()
+    {
+        return [
+            'https://www.googleapis.com/auth/userinfo.profile',
+            'https://www.googleapis.com/auth/userinfo.email'
+        ];
+    }
 
-	public function getProfile(Oauth_TokenModel $token)
-	{
-		$remoteProfile = $this->getRemoteProfile($token);
+    public function getProfile(Oauth_TokenModel $token)
+    {
+        $remoteProfile = $this->getRemoteProfile($token);
 
-		$photoUrl = $remoteProfile->getAvatar();
+        $photoUrl = $remoteProfile->getAvatar();
 
-		if(strpos($photoUrl, '?') !== false)
-		{
-			$photoUrl = substr($photoUrl, 0, strpos($photoUrl, "?"));
-		}
+        if(strpos($photoUrl, '?') !== false)
+        {
+            $photoUrl = substr($photoUrl, 0, strpos($photoUrl, "?"));
+        }
 
-		return [
-			'id' => $remoteProfile->getId(),
-			'email' => $remoteProfile->getEmail(),
-			'firstName' => $remoteProfile->getFirstName(),
-			'lastName' => $remoteProfile->getLastName(),
-			'photoUrl' => $photoUrl,
+        return [
+            'id' => $remoteProfile->getId(),
+            'email' => $remoteProfile->getEmail(),
+            'firstName' => $remoteProfile->getFirstName(),
+            'lastName' => $remoteProfile->getLastName(),
+            'photoUrl' => $photoUrl,
 
-			'name' => $remoteProfile->getName(),
-		];
-	}
+            'name' => $remoteProfile->getName(),
+        ];
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 
 		$photoUrl = $remoteProfile->getAvatar();
 
-		if(strpos($photoUrl, '?') !== false)
+		if (strpos($photoUrl, '?') !== false)
 		{
 			$photoUrl = substr($photoUrl, 0, strpos($photoUrl, "?"));
 		}

providers/login/Twitter.php

Indentation +38 added lines, -38 removed lines

@@ -12,42 +12,42 @@
 
 class Twitter extends BaseProvider
 {
-	/**
-	 * Get the provider name.
-	 *
-	 * @return string
-	 */
-	public function getName()
-	{
-		return 'Twitter';
-	}
-
-	/**
-	 * Get the provider handle.
-	 *
-	 * @return string
-	 */
-	public function getOauthProviderHandle()
-	{
-		return 'twitter';
-	}
-
-	public function getProfile(Oauth_TokenModel $token)
-	{
-		$remoteProfile = $this->getRemoteProfile($token);
-
-		$photoUrl = $remoteProfile->imageUrl;
-		$photoUrl = str_replace("_normal.", ".", $photoUrl);
-
-		return [
-			'id' => $remoteProfile->uid,
-			'email' => $remoteProfile->email,
-			'photoUrl' => $photoUrl,
-
-			'nickname' => $remoteProfile->nickname,
-			'name' => $remoteProfile->name,
-			'location' => $remoteProfile->location,
-			'description' => $remoteProfile->description,
-		];
-	}
+    /**
+     * Get the provider name.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return 'Twitter';
+    }
+
+    /**
+     * Get the provider handle.
+     *
+     * @return string
+     */
+    public function getOauthProviderHandle()
+    {
+        return 'twitter';
+    }
+
+    public function getProfile(Oauth_TokenModel $token)
+    {
+        $remoteProfile = $this->getRemoteProfile($token);
+
+        $photoUrl = $remoteProfile->imageUrl;
+        $photoUrl = str_replace("_normal.", ".", $photoUrl);
+
+        return [
+            'id' => $remoteProfile->uid,
+            'email' => $remoteProfile->email,
+            'photoUrl' => $photoUrl,
+
+            'nickname' => $remoteProfile->nickname,
+            'name' => $remoteProfile->name,
+            'location' => $remoteProfile->location,
+            'description' => $remoteProfile->description,
+        ];
+    }
 }

providers/login/BaseProvider.php

Indentation +136 added lines, -136 removed lines

@@ -13,142 +13,142 @@
 
 abstract class BaseProvider implements ISocial_Provider
 {
-	/**
-	 * Get the provider handle.
-	 *
-	 * @return string
-	 */
-	public function getHandle()
-	{
-		$class = $this->getClass();
-
-		$handle = strtolower($class);
-
-		return $handle;
-	}
-
-	/**
-	 * Get the class name, stripping all the namespaces.
-	 *
-	 * For example, "Dukt\Social\LoginProviders\Dribbble" becomes "Dribbble"
-	 *
-	 * @return string
-	 */
-	public function getClass()
-	{
-		$nsClass = get_class($this);
-
-		$class = substr($nsClass, strrpos($nsClass, "\\") + 1);
-
-		return $class;
-	}
-
-	/**
-	 * Get the icon URL.
-	 *
-	 * @return mixed
-	 */
-	public function getIconUrl()
-	{
-		return $this->getOauthProvider()->getIconUrl();
-	}
-
-	/**
-	 * Get the OAuth provider.
-	 *
-	 * @return mixed
-	 */
-	public function getOauthProvider()
-	{
+    /**
+     * Get the provider handle.
+     *
+     * @return string
+     */
+    public function getHandle()
+    {
+        $class = $this->getClass();
+
+        $handle = strtolower($class);
+
+        return $handle;
+    }
+
+    /**
+     * Get the class name, stripping all the namespaces.
+     *
+     * For example, "Dukt\Social\LoginProviders\Dribbble" becomes "Dribbble"
+     *
+     * @return string
+     */
+    public function getClass()
+    {
+        $nsClass = get_class($this);
+
+        $class = substr($nsClass, strrpos($nsClass, "\\") + 1);
+
+        return $class;
+    }
+
+    /**
+     * Get the icon URL.
+     *
+     * @return mixed
+     */
+    public function getIconUrl()
+    {
+        return $this->getOauthProvider()->getIconUrl();
+    }
+
+    /**
+     * Get the OAuth provider.
+     *
+     * @return mixed
+     */
+    public function getOauthProvider()
+    {
         Craft::app()->social->checkPluginRequirements();
 
-		return Craft::app()->oauth->getProvider($this->getHandle(), false);
-	}
-
-	/**
-	 * Get the default scope.
-	 *
-	 * @return mixed
-	 */
-	public function getDefaultScope()
-	{
-	}
-
-	/**
-	 * Get the defaul authorization options.
-	 *
-	 * @return mixed
-	 */
-	public function getDefaultAuthorizationOptions()
-	{
-	}
-
-	/**
-	 * Returns the `scope` from login provider class by default, or the `scope` overridden by the config
-	 *
-	 * @return mixed
-	 */
-	public function getScope()
-	{
-		$providerConfig = Craft::app()->config->get($this->getHandle(), 'social');
-
-		if ($providerConfig && isset($providerConfig['scope']))
-		{
-			return $providerConfig['scope'];
-		}
-		else
-		{
-			return $this->getDefaultScope();
-		}
-	}
-
-	/**
-	 * Returns the `authorizationOptions` from login provider class by default, or `authorizationOptions` overridden by the config
-	 *
-	 * @return mixed
-	 */
-	public function getAuthorizationOptions()
-	{
-		$providerConfig = Craft::app()->config->get($this->getHandle(), 'social');
-
-		if ($providerConfig && isset($providerConfig['authorizationOptions']))
-		{
-			return $providerConfig['authorizationOptions'];
-		}
-		else
-		{
-			return $this->getDefaultAuthorizationOptions();
-		}
-	}
-
-	/**
-	 * Returns the `enabled` setting from login provider class by default, or `enabled` overridden by the config.
-	 *
-	 * @return bool
-	 */
-	public function getIsEnabled()
-	{
-		// get plugin settings
-		$pluginSettings = \Craft\Craft::app()->plugins->getPlugin('social')->getSettings();
-		$loginProviders = $pluginSettings->loginProviders;
-
-		if (isset($loginProviders[$this->getHandle()]['enabled']) && $loginProviders[$this->getHandle()]['enabled'])
-		{
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns the remote profile
-	 *
-	 * @param $token
-	 *
-	 * @return mixed
-	 */
-	public function getRemoteProfile(Oauth_TokenModel $token)
-	{
-		return $this->getOauthProvider()->getRemoteResourceOwner($token);
-	}
+        return Craft::app()->oauth->getProvider($this->getHandle(), false);
+    }
+
+    /**
+     * Get the default scope.
+     *
+     * @return mixed
+     */
+    public function getDefaultScope()
+    {
+    }
+
+    /**
+     * Get the defaul authorization options.
+     *
+     * @return mixed
+     */
+    public function getDefaultAuthorizationOptions()
+    {
+    }
+
+    /**
+     * Returns the `scope` from login provider class by default, or the `scope` overridden by the config
+     *
+     * @return mixed
+     */
+    public function getScope()
+    {
+        $providerConfig = Craft::app()->config->get($this->getHandle(), 'social');
+
+        if ($providerConfig && isset($providerConfig['scope']))
+        {
+            return $providerConfig['scope'];
+        }
+        else
+        {
+            return $this->getDefaultScope();
+        }
+    }
+
+    /**
+     * Returns the `authorizationOptions` from login provider class by default, or `authorizationOptions` overridden by the config
+     *
+     * @return mixed
+     */
+    public function getAuthorizationOptions()
+    {
+        $providerConfig = Craft::app()->config->get($this->getHandle(), 'social');
+
+        if ($providerConfig && isset($providerConfig['authorizationOptions']))
+        {
+            return $providerConfig['authorizationOptions'];
+        }
+        else
+        {
+            return $this->getDefaultAuthorizationOptions();
+        }
+    }
+
+    /**
+     * Returns the `enabled` setting from login provider class by default, or `enabled` overridden by the config.
+     *
+     * @return bool
+     */
+    public function getIsEnabled()
+    {
+        // get plugin settings
+        $pluginSettings = \Craft\Craft::app()->plugins->getPlugin('social')->getSettings();
+        $loginProviders = $pluginSettings->loginProviders;
+
+        if (isset($loginProviders[$this->getHandle()]['enabled']) && $loginProviders[$this->getHandle()]['enabled'])
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns the remote profile
+     *
+     * @param $token
+     *
+     * @return mixed
+     */
+    public function getRemoteProfile(Oauth_TokenModel $token)
+    {
+        return $this->getOauthProvider()->getRemoteResourceOwner($token);
+    }
 }

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();
 		}

providers/login/Facebook.php

Indentation +70 added lines, -70 removed lines

@@ -13,39 +13,39 @@ 
 
 class Facebook extends BaseProvider
 {
-	/**
-	 * Get the provider name.
-	 *
-	 * @return string
-	 */
-	public function getName()
-	{
-		return 'Facebook';
-	}
-
-	/**
-	 * Get the provider handle.
-	 *
-	 * @return string
-	 */
-	public function getOauthProviderHandle()
-	{
-		return 'facebook';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getDefaultScope()
-	{
-		return [
-			'email',
-		];
-	}
-
-	public function getRemoteProfile(Oauth_TokenModel $token)
-	{
-		$oauthProvider = $this->getOauthProvider();
+    /**
+     * Get the provider name.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return 'Facebook';
+    }
+
+    /**
+     * Get the provider handle.
+     *
+     * @return string
+     */
+    public function getOauthProviderHandle()
+    {
+        return 'facebook';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getDefaultScope()
+    {
+        return [
+            'email',
+        ];
+    }
+
+    public function getRemoteProfile(Oauth_TokenModel $token)
+    {
+        $oauthProvider = $this->getOauthProvider();
         $providerConfig = \Craft\craft()->config->get($this->getHandle(), 'social');
 
         $apiVersion = 'v2.12';
@@ -54,41 +54,41 @@ 
             $apiVersion = $providerConfig['apiVersion'];
         }
 
-		$client = new Client('https://graph.facebook.com/'.$apiVersion);
-		$client->addSubscriber($oauthProvider->getSubscriber($token));
-
-		$fields = implode(',', [
-			'id', 'name', 'first_name', 'last_name',
-			'email', 'hometown', 'picture.type(large){url,is_silhouette}',
-			'cover{source}', 'gender', 'locale', 'link',
-		]);
-
-		$request = $client->get('/me?fields='.$fields);
-
-		$response = $request->send();
-		$json = $response->json();
-
-		return $json;
-	}
-
-	public function getProfile(Oauth_TokenModel $token)
-	{
-		$remoteProfile = $this->getRemoteProfile($token);
-
-		return [
-			'id' => (isset($remoteProfile['id']) ? $remoteProfile['id'] : null ),
-			'email' => (isset($remoteProfile['email']) ? $remoteProfile['email'] : null ),
-			'firstName' => (isset($remoteProfile['first_name']) ? $remoteProfile['first_name'] : null ),
-			'lastName' => (isset($remoteProfile['last_name']) ? $remoteProfile['last_name'] : null ),
-			'photoUrl' => (isset($remoteProfile['picture']['data']['url']) ? $remoteProfile['picture']['data']['url'] : null ),
-
-			'name' => (isset($remoteProfile['name']) ? $remoteProfile['name'] : null ),
-			'hometown' => (isset($remoteProfile['hometown']) ? $remoteProfile['hometown'] : null ),
-			'isDefaultPicture' => (isset($remoteProfile['picture']['data']['is_silhouette']) ? $remoteProfile['picture']['data']['is_silhouette'] : null ),
-			'coverPhotoUrl' => (isset($remoteProfile['cover']['source']) ? $remoteProfile['cover']['source'] : null ),
-			'gender' => (isset($remoteProfile['gender']) ? $remoteProfile['gender'] : null ),
-			'locale' => (isset($remoteProfile['locale']) ? $remoteProfile['locale'] : null ),
-			'link' => (isset($remoteProfile['link']) ? $remoteProfile['link'] : null ),
-		];
-	}
+        $client = new Client('https://graph.facebook.com/'.$apiVersion);
+        $client->addSubscriber($oauthProvider->getSubscriber($token));
+
+        $fields = implode(',', [
+            'id', 'name', 'first_name', 'last_name',
+            'email', 'hometown', 'picture.type(large){url,is_silhouette}',
+            'cover{source}', 'gender', 'locale', 'link',
+        ]);
+
+        $request = $client->get('/me?fields='.$fields);
+
+        $response = $request->send();
+        $json = $response->json();
+
+        return $json;
+    }
+
+    public function getProfile(Oauth_TokenModel $token)
+    {
+        $remoteProfile = $this->getRemoteProfile($token);
+
+        return [
+            'id' => (isset($remoteProfile['id']) ? $remoteProfile['id'] : null ),
+            'email' => (isset($remoteProfile['email']) ? $remoteProfile['email'] : null ),
+            'firstName' => (isset($remoteProfile['first_name']) ? $remoteProfile['first_name'] : null ),
+            'lastName' => (isset($remoteProfile['last_name']) ? $remoteProfile['last_name'] : null ),
+            'photoUrl' => (isset($remoteProfile['picture']['data']['url']) ? $remoteProfile['picture']['data']['url'] : null ),
+
+            'name' => (isset($remoteProfile['name']) ? $remoteProfile['name'] : null ),
+            'hometown' => (isset($remoteProfile['hometown']) ? $remoteProfile['hometown'] : null ),
+            'isDefaultPicture' => (isset($remoteProfile['picture']['data']['is_silhouette']) ? $remoteProfile['picture']['data']['is_silhouette'] : null ),
+            'coverPhotoUrl' => (isset($remoteProfile['cover']['source']) ? $remoteProfile['cover']['source'] : null ),
+            'gender' => (isset($remoteProfile['gender']) ? $remoteProfile['gender'] : null ),
+            'locale' => (isset($remoteProfile['locale']) ? $remoteProfile['locale'] : null ),
+            'link' => (isset($remoteProfile['link']) ? $remoteProfile['link'] : null ),
+        ];
+    }
 }

Spacing +14 added lines, -14 removed lines

@@ -50,7 +50,7 @@ 
 
         $apiVersion = 'v2.12';
 
-        if(!empty($providerConfig['apiVersion'])) {
+        if (!empty($providerConfig['apiVersion'])) {
             $apiVersion = $providerConfig['apiVersion'];
         }
 
@@ -76,19 +76,19 @@ 
 		$remoteProfile = $this->getRemoteProfile($token);
 
 		return [
-			'id' => (isset($remoteProfile['id']) ? $remoteProfile['id'] : null ),
-			'email' => (isset($remoteProfile['email']) ? $remoteProfile['email'] : null ),
-			'firstName' => (isset($remoteProfile['first_name']) ? $remoteProfile['first_name'] : null ),
-			'lastName' => (isset($remoteProfile['last_name']) ? $remoteProfile['last_name'] : null ),
-			'photoUrl' => (isset($remoteProfile['picture']['data']['url']) ? $remoteProfile['picture']['data']['url'] : null ),
-
-			'name' => (isset($remoteProfile['name']) ? $remoteProfile['name'] : null ),
-			'hometown' => (isset($remoteProfile['hometown']) ? $remoteProfile['hometown'] : null ),
-			'isDefaultPicture' => (isset($remoteProfile['picture']['data']['is_silhouette']) ? $remoteProfile['picture']['data']['is_silhouette'] : null ),
-			'coverPhotoUrl' => (isset($remoteProfile['cover']['source']) ? $remoteProfile['cover']['source'] : null ),
-			'gender' => (isset($remoteProfile['gender']) ? $remoteProfile['gender'] : null ),
-			'locale' => (isset($remoteProfile['locale']) ? $remoteProfile['locale'] : null ),
-			'link' => (isset($remoteProfile['link']) ? $remoteProfile['link'] : null ),
+			'id' => (isset($remoteProfile['id']) ? $remoteProfile['id'] : null),
+			'email' => (isset($remoteProfile['email']) ? $remoteProfile['email'] : null),
+			'firstName' => (isset($remoteProfile['first_name']) ? $remoteProfile['first_name'] : null),
+			'lastName' => (isset($remoteProfile['last_name']) ? $remoteProfile['last_name'] : null),
+			'photoUrl' => (isset($remoteProfile['picture']['data']['url']) ? $remoteProfile['picture']['data']['url'] : null),
+
+			'name' => (isset($remoteProfile['name']) ? $remoteProfile['name'] : null),
+			'hometown' => (isset($remoteProfile['hometown']) ? $remoteProfile['hometown'] : null),
+			'isDefaultPicture' => (isset($remoteProfile['picture']['data']['is_silhouette']) ? $remoteProfile['picture']['data']['is_silhouette'] : null),
+			'coverPhotoUrl' => (isset($remoteProfile['cover']['source']) ? $remoteProfile['cover']['source'] : null),
+			'gender' => (isset($remoteProfile['gender']) ? $remoteProfile['gender'] : null),
+			'locale' => (isset($remoteProfile['locale']) ? $remoteProfile['locale'] : null),
+			'link' => (isset($remoteProfile['link']) ? $remoteProfile['link'] : null),
 		];
 	}
 }

config.php

Indentation +28 added lines, -28 removed lines

@@ -2,41 +2,41 @@
 
 return [
 
-	/**
-	 * Allow Email Match
-	 */
-	'allowEmailMatch' => false,
+    /**
+     * Allow Email Match
+     */
+    'allowEmailMatch' => false,
 
 
-	/**
-	 * Lock social registration to specific domains
-	 */
-	'lockDomains' => [],
+    /**
+     * Lock social registration to specific domains
+     */
+    'lockDomains' => [],
 
 
-	/**
-	 * Twitter Configuration
-	 */
+    /**
+     * Twitter Configuration
+     */
 
-	//'twitter' => [
-	//    'userMapping' => [
-	//        'location' => '{{ location }}',
-	//        'profileUrl' => '{{ nickname }}',
-	//    ],
-	//],
+    //'twitter' => [
+    //    'userMapping' => [
+    //        'location' => '{{ location }}',
+    //        'profileUrl' => '{{ nickname }}',
+    //    ],
+    //],
 
 
-	/**
-	 * Facebook Configuration
-	 */
+    /**
+     * Facebook Configuration
+     */
 
-	//'facebook' => [
-	//    'userMapping' => [
-	//        'firstName' => '{{ firstName }}',
-	//        'lastName' => '{{ lastName }}',
-	//        'gender' => '{{ gender }}',
-	//        'profileUrl' => '{{ link }}',
-	//    ],
+    //'facebook' => [
+    //    'userMapping' => [
+    //        'firstName' => '{{ firstName }}',
+    //        'lastName' => '{{ lastName }}',
+    //        'gender' => '{{ gender }}',
+    //        'profileUrl' => '{{ link }}',
+    //    ],
     //    'apiVersion' => 'v2.12',
-	//],
+    //],
 ];

models/Social_ProviderModel.php

Indentation +110 added lines, -110 removed lines

@@ -9,116 +9,116 @@
 
 class Social_ProviderModel extends BaseModel
 {
-	// Public Methods
-	// =========================================================================
-
-	/**
-	 * Define Attributes
-	 */
-	public function defineAttributes()
-	{
-		return array(
-			'oauthProviderHandle' => AttributeType::Number,
-			'customScope' => AttributeType::Mixed,
-		);
-	}
-
-	/**
-	 * Get authorization options for the provider.
-	 *
-	 * @return mixed
-	 */
-	public function getAuthorizationOptions()
-	{
-		$providerConfig = craft()->config->get($this->oauthProviderHandle, 'social');
-
-		if ($providerConfig && isset($providerConfig['authorizationOptions'])) {
-			return $providerConfig['authorizationOptions'];
-		}
-	}
-
-	/**
-	 * Get scope for the provider.
-	 *
-	 * @return array
-	 */
-	public function getScope()
-	{
-		$scope = [];
-		$defaultScope = $this->getDefaultScope();
-
-		if (is_array($defaultScope))
-		{
-			$scope = array_merge($scope, $defaultScope);
-		}
-
-		if (is_array($this->customScope))
-		{
-			$scope = array_merge($scope, $this->customScope);
-		}
-
-		return $scope;
-	}
-
-	/**
-	 * Return the default scope for the provider.
-	 *
-	 * @return mixed
-	 */
-	public function getDefaultScope()
-	{
-		return $this->getOauthProvider()->getDefaultScope();
-	}
-
-	/**
-	 * Get the provider's name.
-	 *
-	 * @return mixed
-	 */
-	public function getName()
-	{
-		return $this->getOauthProvider()->getName();
-	}
-
-	/**
-	 * Get the provider's handle.
-	 *
-	 * @return mixed
-	 */
-	public function getHandle()
-	{
-		return $this->getOauthProvider()->getHandle();
-	}
-
-	/**
-	 * Get the provider itself.
-	 *
-	 * @return mixed
-	 */
-	public function getOauthProvider()
-	{
+    // Public Methods
+    // =========================================================================
+
+    /**
+     * Define Attributes
+     */
+    public function defineAttributes()
+    {
+        return array(
+            'oauthProviderHandle' => AttributeType::Number,
+            'customScope' => AttributeType::Mixed,
+        );
+    }
+
+    /**
+     * Get authorization options for the provider.
+     *
+     * @return mixed
+     */
+    public function getAuthorizationOptions()
+    {
+        $providerConfig = craft()->config->get($this->oauthProviderHandle, 'social');
+
+        if ($providerConfig && isset($providerConfig['authorizationOptions'])) {
+            return $providerConfig['authorizationOptions'];
+        }
+    }
+
+    /**
+     * Get scope for the provider.
+     *
+     * @return array
+     */
+    public function getScope()
+    {
+        $scope = [];
+        $defaultScope = $this->getDefaultScope();
+
+        if (is_array($defaultScope))
+        {
+            $scope = array_merge($scope, $defaultScope);
+        }
+
+        if (is_array($this->customScope))
+        {
+            $scope = array_merge($scope, $this->customScope);
+        }
+
+        return $scope;
+    }
+
+    /**
+     * Return the default scope for the provider.
+     *
+     * @return mixed
+     */
+    public function getDefaultScope()
+    {
+        return $this->getOauthProvider()->getDefaultScope();
+    }
+
+    /**
+     * Get the provider's name.
+     *
+     * @return mixed
+     */
+    public function getName()
+    {
+        return $this->getOauthProvider()->getName();
+    }
+
+    /**
+     * Get the provider's handle.
+     *
+     * @return mixed
+     */
+    public function getHandle()
+    {
+        return $this->getOauthProvider()->getHandle();
+    }
+
+    /**
+     * Get the provider itself.
+     *
+     * @return mixed
+     */
+    public function getOauthProvider()
+    {
         Craft::app()->social->checkPluginRequirements();
 
-		return craft()->oauth->getProvider($this->oauthProviderHandle, false);
-	}
-
-	/**
-	 * Get the URL to the icon.
-	 *
-	 * @return mixed
-	 */
-	public function getIconUrl()
-	{
-		return $this->getOauthProvider()->getIconUrl();
-	}
-
-	/**
-	 * Get the documentation URL for provider scopes.
-	 *
-	 * @return mixed
-	 */
-	public function getScopeDocsUrl()
-	{
-		return $this->getOauthProvider()->getScopeDocsUrl();
-	}
+        return craft()->oauth->getProvider($this->oauthProviderHandle, false);
+    }
+
+    /**
+     * Get the URL to the icon.
+     *
+     * @return mixed
+     */
+    public function getIconUrl()
+    {
+        return $this->getOauthProvider()->getIconUrl();
+    }
+
+    /**
+     * Get the documentation URL for provider scopes.
+     *
+     * @return mixed
+     */
+    public function getScopeDocsUrl()
+    {
+        return $this->getOauthProvider()->getScopeDocsUrl();
+    }
 }

models/Social_LoginAccountModel.php

Indentation +121 added lines, -121 removed lines

@@ -9,126 +9,126 @@
 
 class Social_LoginAccountModel extends BaseElementModel
 {
-	protected $elementType = 'Social_LoginAccount';
-
-	private $_user;
-
-	// Public Methods
-	// =========================================================================
-
-	/**
-	 * Use the login account's email as its string representation.
-	 *
-	 * @return string
-	 */
-	public function __toString()
-	{
-		if (craft()->config->get('useEmailAsUsername'))
-		{
-			return $this->email;
-		}
-		else
-		{
-			return $this->username;
-		}
-	}
-
-	/**
-	 * Returns whether the current user can edit the element.
-	 *
-	 * @return bool
-	 */
-	public function isEditable()
-	{
-		return true;
-	}
-
-	/**
-	 * Returns the element's CP edit URL.
-	 *
-	 * @return string|false
-	 */
-	public function getCpEditUrl()
-	{
-		return UrlHelper::getCpUrl('social/loginaccounts/'.$this->userId);
-	}
-
-	/**
-	 * Returns the URL to the element's thumbnail, if there is one.
-	 *
-	 * @param int|null $size
-	 *
-	 * @return string|null
-	 */
-	public function getThumbUrl($size = 100)
-	{
-		$url = $this->getUser()->getPhotoUrl($size);
-
-		if (!$url)
-		{
-			$url = UrlHelper::getResourceUrl('defaultuserphoto');
-		}
-
-		return $url;
-	}
-
-	/**
-	 * Define Attributes
-	 */
-	public function defineAttributes()
-	{
-		return array_merge(parent::defineAttributes(), array(
-			'id' => AttributeType::Number,
-			'userId' => AttributeType::Number,
-			'providerHandle' => array(AttributeType::String, 'required' => true),
-			'socialUid' => array(AttributeType::String, 'required' => true),
-
-			'username' => AttributeType::String,
-			'email' => AttributeType::String,
-			'firstName' => AttributeType::String,
-			'lastName' => AttributeType::String,
-			'lastLoginDate' => AttributeType::DateTime,
-		));
-	}
-
-	/**
-	 * Get the OAuth provider for the social account.
-	 */
-	public function getOauthProvider()
-	{
-		if ($this->providerHandle)
-		{
+    protected $elementType = 'Social_LoginAccount';
+
+    private $_user;
+
+    // Public Methods
+    // =========================================================================
+
+    /**
+     * Use the login account's email as its string representation.
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        if (craft()->config->get('useEmailAsUsername'))
+        {
+            return $this->email;
+        }
+        else
+        {
+            return $this->username;
+        }
+    }
+
+    /**
+     * Returns whether the current user can edit the element.
+     *
+     * @return bool
+     */
+    public function isEditable()
+    {
+        return true;
+    }
+
+    /**
+     * Returns the element's CP edit URL.
+     *
+     * @return string|false
+     */
+    public function getCpEditUrl()
+    {
+        return UrlHelper::getCpUrl('social/loginaccounts/'.$this->userId);
+    }
+
+    /**
+     * Returns the URL to the element's thumbnail, if there is one.
+     *
+     * @param int|null $size
+     *
+     * @return string|null
+     */
+    public function getThumbUrl($size = 100)
+    {
+        $url = $this->getUser()->getPhotoUrl($size);
+
+        if (!$url)
+        {
+            $url = UrlHelper::getResourceUrl('defaultuserphoto');
+        }
+
+        return $url;
+    }
+
+    /**
+     * Define Attributes
+     */
+    public function defineAttributes()
+    {
+        return array_merge(parent::defineAttributes(), array(
+            'id' => AttributeType::Number,
+            'userId' => AttributeType::Number,
+            'providerHandle' => array(AttributeType::String, 'required' => true),
+            'socialUid' => array(AttributeType::String, 'required' => true),
+
+            'username' => AttributeType::String,
+            'email' => AttributeType::String,
+            'firstName' => AttributeType::String,
+            'lastName' => AttributeType::String,
+            'lastLoginDate' => AttributeType::DateTime,
+        ));
+    }
+
+    /**
+     * Get the OAuth provider for the social account.
+     */
+    public function getOauthProvider()
+    {
+        if ($this->providerHandle)
+        {
             Craft::app()->social->checkPluginRequirements();
-			return craft()->oauth->getProvider($this->providerHandle);
-		}
-	}
-
-	/**
-	 * Get the associated Craft user for this social account.
-	 */
-	public function getUser()
-	{
-		if (!isset($this->_user))
-		{
-			if ($this->userId)
-			{
-				$this->_user = craft()->users->getUserById($this->userId);
-			}
-		}
-
-		return $this->_user;
-	}
-
-	/**
-	 * Gets the user's full name.
-	 *
-	 * @return string|null
-	 */
-	public function getFullName()
-	{
-		$firstName = trim($this->firstName);
-		$lastName = trim($this->lastName);
-
-		return $firstName.($firstName && $lastName ? ' ' : '').$lastName;
-	}
+            return craft()->oauth->getProvider($this->providerHandle);
+        }
+    }
+
+    /**
+     * Get the associated Craft user for this social account.
+     */
+    public function getUser()
+    {
+        if (!isset($this->_user))
+        {
+            if ($this->userId)
+            {
+                $this->_user = craft()->users->getUserById($this->userId);
+            }
+        }
+
+        return $this->_user;
+    }
+
+    /**
+     * Gets the user's full name.
+     *
+     * @return string|null
+     */
+    public function getFullName()
+    {
+        $firstName = trim($this->firstName);
+        $lastName = trim($this->lastName);
+
+        return $firstName.($firstName && $lastName ? ' ' : '').$lastName;
+    }
 }

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

Indentation +339 added lines, -339 removed lines

@@ -3,290 +3,290 @@ 
 
 class Social_LoginAccountElementType extends BaseElementType
 {
-	/**
-	 * Returns the element type name.
-	 *
-	 * @return string
-	 */
-	public function getName()
-	{
-		return Craft::t('Login Accounts');
-	}
-
-	/**
-	 * Returns the element index HTML.
-	 *
-	 * @param ElementCriteriaModel $criteria
-	 * @param array                $disabledElementIds
-	 * @param array                $viewState
-	 * @param string|null          $sourceKey
-	 * @param string|null          $context
-	 * @param bool                 $includeContainer
-	 * @param bool                 $showCheckboxes
-	 *
-	 * @return string
-	 */
-	public function getIndexHtml($criteria, $disabledElementIds, $viewState, $sourceKey, $context, $includeContainer, $showCheckboxes)
-	{
-		craft()->templates->includeJsResource('social/js/social.js');
-
-		return parent::getIndexHtml($criteria, $disabledElementIds, $viewState, $sourceKey, $context, $includeContainer, $showCheckboxes);
-	}
-
-	/**
-	 * Returns this element type's sources.
-	 *
-	 * @param string|null $context
-	 *
-	 * @return array|false
-	 */
-	public function getSources($context = null)
-	{
-		$sources = array(
-			'*' => array(
-				'label' => Craft::t('All login providers'),
-				'hasThumbs' => false
-			)
-		);
-
-		$loginProviders = craft()->social_loginProviders->getLoginProviders();
-
-		if ($loginProviders)
-		{
-			$sources[] = array('heading' => Craft::t('Login Providers'));
-
-			foreach ($loginProviders as $loginProvider)
-			{
-				$providerHandle = $loginProvider->getHandle();
-				$key = 'group:'.$providerHandle;
-
-				$sources[$key] = array(
-					'label'     => Craft::t($loginProvider->getName()),
-					'criteria'  => array('providerHandle' => $providerHandle),
-					'hasThumbs' => false
-				);
-			}
-		}
-
-		// Allow plugins to modify the sources
-		craft()->plugins->call('modifyLoginAccountSources', array(&$sources, $context));
-
-		return $sources;
-	}
-
-	/**
-	 * Returns the available element actions for a given source (if one is provided).
-	 *
-	 * @param string|null $source
-	 *
-	 * @return array|null
-	 */
-	public function getAvailableActions($source = null)
-	{
-		$actions = array();
-
-		$deleteAction = craft()->elements->getAction('Delete');
-		$deleteAction->setParams(array(
-			'confirmationMessage' => Craft::t('Are you sure you want to delete the selected login accounts?'),
-			'successMessage'      => Craft::t('Login accounts deleted.'),
-		));
-		$actions[] = $deleteAction;
-
-		// Allow plugins to add additional actions
-		$allPluginActions = craft()->plugins->call('addLoginAccountActions', array($source), true);
-
-		foreach ($allPluginActions as $pluginActions)
-		{
-			$actions = array_merge($actions, $pluginActions);
-		}
-
-		return $actions;
-	}
-
-	/**
-	 * Defines which element model attributes should be searchable.
-	 *
-	 * @return array
-	 */
-	public function defineSearchableAttributes()
-	{
-		return array('username', 'email', 'firstName', 'lastName', 'fullName', 'providerHandle', 'socialUid', 'userId');
-	}
-
-	/**
-	 * Defines the attributes that elements can be sorted by.
-	 *
-	 * @return array
-	 */
-	public function defineSortableAttributes()
-	{
-		if (craft()->config->get('useEmailAsUsername'))
-		{
-			// Start with Email and don't even give Username as an option
-			$attributes = array(
-				'email' => Craft::t('Email'),
-			);
-		}
-		else
-		{
-			$attributes = array(
-				'username' => Craft::t('Username'),
-				'email'    => Craft::t('Email'),
-			);
-		}
-
-		$attributes['firstName']     = Craft::t('First Name');
-		$attributes['lastName']      = Craft::t('Last Name');
-
-		$attributes['providerHandle'] = Craft::t('Login Provider');
-		$attributes['socialUid']     = Craft::t('Social User ID');
-
-		$attributes['userId']        = Craft::t('User ID');
-		$attributes['lastLoginDate'] = Craft::t('Last Login');
-		$attributes['dateCreated']   = Craft::t('Date Created');
-		$attributes['dateUpdated']   = Craft::t('Date Updated');
-
-		// Allow plugins to modify the attributes
-		craft()->plugins->call('modifyLoginAccountSortableAttributes', array(&$attributes));
-
-		return $attributes;
-	}
-
-	/**
-	 * Defines all of the available columns that can be shown in table views.
-	 *
-	 * @return array
-	 */
-	public function defineAvailableTableAttributes()
-	{
-		if (craft()->config->get('useEmailAsUsername'))
-		{
-			// Start with Email and don't even give Username as an option
-			$attributes = array(
-				'email' => array('label' => Craft::t('Email')),
-			);
-		}
-		else
-		{
-			$attributes = array(
-				'username' => array('label' => Craft::t('Username')),
-				'email'    => array('label' => Craft::t('Email')),
-			);
-		}
-
-		$attributes['fullName'] = array('label' => Craft::t('Full Name'));
-		$attributes['firstName'] = array('label' => Craft::t('First Name'));
-		$attributes['lastName'] = array('label' => Craft::t('Last Name'));
-
-		$attributes['providerHandle'] = array('label' => Craft::t('Login Provider'));
-		$attributes['socialUid']     = array('label' => Craft::t('Social User ID'));
-
-		$attributes['userId']        = array('label' => Craft::t('User ID'));
-		$attributes['lastLoginDate'] = array('label' => Craft::t('Last Login'));
-		$attributes['dateCreated']   = array('label' => Craft::t('Date Created'));
-		$attributes['dateUpdated']   = array('label' => Craft::t('Date Updated'));
-
-		// Allow plugins to modify the attributes
-		$pluginAttributes = craft()->plugins->call('defineAdditionalLoginAccountTableAttributes', array(), true);
-
-		foreach ($pluginAttributes as $thisPluginAttributes)
-		{
-			$attributes = array_merge($attributes, $thisPluginAttributes);
-		}
-
-		return $attributes;
-	}
-
-	/**
-	 * Returns the list of table attribute keys that should be shown by default.
-	 *
-	 * @param string|null $source
-	 *
-	 * @return array
-	 */
-	public function getDefaultTableAttributes($source = null)
-	{
-		return array('username', 'fullName', 'providerHandle', 'socialUid', 'lastLoginDate');
-	}
-
-	/**
-	 * Returns the HTML that should be shown for a given element’s attribute in Table View.
-	 *
-	 * @param BaseElementModel $element
-	 * @param string           $attribute
-	 *
-	 * @return string
-	 */
-	public function getTableAttributeHtml(BaseElementModel $element, $attribute)
-	{
-		// First give plugins a chance to set this
-		$pluginAttributeHtml = craft()->plugins->callFirst('getLoginAccountTableAttributeHtml', array($element, $attribute), true);
-
-		if ($pluginAttributeHtml !== null)
-		{
-			return $pluginAttributeHtml;
-		}
-
-		switch ($attribute)
-		{
-			case 'providerHandle':
-			{
-				// TODO:consider eager loading the provider
-				$provider = craft()->oauth->getProvider($element->providerHandle);
-
-				if ($provider)
-				{
-					$html = '<div class="provider">' .
-						'<div class="thumb"><img src="'.$provider->getIconUrl().'" width="32" height="32" /></div>' .
-						'<div class="label">'.$provider->getName().'</div>' .
-						'</div>';
-
-					return $html;
-				}
-				else
-				{
-					return '';
-				}
-			}
-
-			default:
-			{
-				return parent::getTableAttributeHtml($element, $attribute);
-			}
-		}
-	}
-
-	/**
-	 * Defines any custom element criteria attributes for this element type.
-	 *
-	 * @return array
-	 */
-	public function defineCriteriaAttributes()
-	{
-		return array(
-			'userId' => AttributeType::Number,
-			'providerHandle' => AttributeType::String,
-			'socialUid' => AttributeType::String,
-
-			'username' => AttributeType::String,
-			'email' => AttributeType::String,
-			'firstName' => AttributeType::String,
-			'lastName' => AttributeType::String,
-			'lastLoginDate' => AttributeType::DateTime,
-		);
-	}
-
-	/**
-	 * Modifies an element query targeting elements of this type.
-	 *
-	 * @param DbCommand            $query
-	 * @param ElementCriteriaModel $criteria
-	 *
-	 * @return null|false
-	 */
-	public function modifyElementsQuery(DbCommand $query, ElementCriteriaModel $criteria)
-	{
-		$query->addSelect('
+    /**
+     * Returns the element type name.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return Craft::t('Login Accounts');
+    }
+
+    /**
+     * Returns the element index HTML.
+     *
+     * @param ElementCriteriaModel $criteria
+     * @param array                $disabledElementIds
+     * @param array                $viewState
+     * @param string|null          $sourceKey
+     * @param string|null          $context
+     * @param bool                 $includeContainer
+     * @param bool                 $showCheckboxes
+     *
+     * @return string
+     */
+    public function getIndexHtml($criteria, $disabledElementIds, $viewState, $sourceKey, $context, $includeContainer, $showCheckboxes)
+    {
+        craft()->templates->includeJsResource('social/js/social.js');
+
+        return parent::getIndexHtml($criteria, $disabledElementIds, $viewState, $sourceKey, $context, $includeContainer, $showCheckboxes);
+    }
+
+    /**
+     * Returns this element type's sources.
+     *
+     * @param string|null $context
+     *
+     * @return array|false
+     */
+    public function getSources($context = null)
+    {
+        $sources = array(
+            '*' => array(
+                'label' => Craft::t('All login providers'),
+                'hasThumbs' => false
+            )
+        );
+
+        $loginProviders = craft()->social_loginProviders->getLoginProviders();
+
+        if ($loginProviders)
+        {
+            $sources[] = array('heading' => Craft::t('Login Providers'));
+
+            foreach ($loginProviders as $loginProvider)
+            {
+                $providerHandle = $loginProvider->getHandle();
+                $key = 'group:'.$providerHandle;
+
+                $sources[$key] = array(
+                    'label'     => Craft::t($loginProvider->getName()),
+                    'criteria'  => array('providerHandle' => $providerHandle),
+                    'hasThumbs' => false
+                );
+            }
+        }
+
+        // Allow plugins to modify the sources
+        craft()->plugins->call('modifyLoginAccountSources', array(&$sources, $context));
+
+        return $sources;
+    }
+
+    /**
+     * Returns the available element actions for a given source (if one is provided).
+     *
+     * @param string|null $source
+     *
+     * @return array|null
+     */
+    public function getAvailableActions($source = null)
+    {
+        $actions = array();
+
+        $deleteAction = craft()->elements->getAction('Delete');
+        $deleteAction->setParams(array(
+            'confirmationMessage' => Craft::t('Are you sure you want to delete the selected login accounts?'),
+            'successMessage'      => Craft::t('Login accounts deleted.'),
+        ));
+        $actions[] = $deleteAction;
+
+        // Allow plugins to add additional actions
+        $allPluginActions = craft()->plugins->call('addLoginAccountActions', array($source), true);
+
+        foreach ($allPluginActions as $pluginActions)
+        {
+            $actions = array_merge($actions, $pluginActions);
+        }
+
+        return $actions;
+    }
+
+    /**
+     * Defines which element model attributes should be searchable.
+     *
+     * @return array
+     */
+    public function defineSearchableAttributes()
+    {
+        return array('username', 'email', 'firstName', 'lastName', 'fullName', 'providerHandle', 'socialUid', 'userId');
+    }
+
+    /**
+     * Defines the attributes that elements can be sorted by.
+     *
+     * @return array
+     */
+    public function defineSortableAttributes()
+    {
+        if (craft()->config->get('useEmailAsUsername'))
+        {
+            // Start with Email and don't even give Username as an option
+            $attributes = array(
+                'email' => Craft::t('Email'),
+            );
+        }
+        else
+        {
+            $attributes = array(
+                'username' => Craft::t('Username'),
+                'email'    => Craft::t('Email'),
+            );
+        }
+
+        $attributes['firstName']     = Craft::t('First Name');
+        $attributes['lastName']      = Craft::t('Last Name');
+
+        $attributes['providerHandle'] = Craft::t('Login Provider');
+        $attributes['socialUid']     = Craft::t('Social User ID');
+
+        $attributes['userId']        = Craft::t('User ID');
+        $attributes['lastLoginDate'] = Craft::t('Last Login');
+        $attributes['dateCreated']   = Craft::t('Date Created');
+        $attributes['dateUpdated']   = Craft::t('Date Updated');
+
+        // Allow plugins to modify the attributes
+        craft()->plugins->call('modifyLoginAccountSortableAttributes', array(&$attributes));
+
+        return $attributes;
+    }
+
+    /**
+     * Defines all of the available columns that can be shown in table views.
+     *
+     * @return array
+     */
+    public function defineAvailableTableAttributes()
+    {
+        if (craft()->config->get('useEmailAsUsername'))
+        {
+            // Start with Email and don't even give Username as an option
+            $attributes = array(
+                'email' => array('label' => Craft::t('Email')),
+            );
+        }
+        else
+        {
+            $attributes = array(
+                'username' => array('label' => Craft::t('Username')),
+                'email'    => array('label' => Craft::t('Email')),
+            );
+        }
+
+        $attributes['fullName'] = array('label' => Craft::t('Full Name'));
+        $attributes['firstName'] = array('label' => Craft::t('First Name'));
+        $attributes['lastName'] = array('label' => Craft::t('Last Name'));
+
+        $attributes['providerHandle'] = array('label' => Craft::t('Login Provider'));
+        $attributes['socialUid']     = array('label' => Craft::t('Social User ID'));
+
+        $attributes['userId']        = array('label' => Craft::t('User ID'));
+        $attributes['lastLoginDate'] = array('label' => Craft::t('Last Login'));
+        $attributes['dateCreated']   = array('label' => Craft::t('Date Created'));
+        $attributes['dateUpdated']   = array('label' => Craft::t('Date Updated'));
+
+        // Allow plugins to modify the attributes
+        $pluginAttributes = craft()->plugins->call('defineAdditionalLoginAccountTableAttributes', array(), true);
+
+        foreach ($pluginAttributes as $thisPluginAttributes)
+        {
+            $attributes = array_merge($attributes, $thisPluginAttributes);
+        }
+
+        return $attributes;
+    }
+
+    /**
+     * Returns the list of table attribute keys that should be shown by default.
+     *
+     * @param string|null $source
+     *
+     * @return array
+     */
+    public function getDefaultTableAttributes($source = null)
+    {
+        return array('username', 'fullName', 'providerHandle', 'socialUid', 'lastLoginDate');
+    }
+
+    /**
+     * Returns the HTML that should be shown for a given element’s attribute in Table View.
+     *
+     * @param BaseElementModel $element
+     * @param string           $attribute
+     *
+     * @return string
+     */
+    public function getTableAttributeHtml(BaseElementModel $element, $attribute)
+    {
+        // First give plugins a chance to set this
+        $pluginAttributeHtml = craft()->plugins->callFirst('getLoginAccountTableAttributeHtml', array($element, $attribute), true);
+
+        if ($pluginAttributeHtml !== null)
+        {
+            return $pluginAttributeHtml;
+        }
+
+        switch ($attribute)
+        {
+            case 'providerHandle':
+            {
+                // TODO:consider eager loading the provider
+                $provider = craft()->oauth->getProvider($element->providerHandle);
+
+                if ($provider)
+                {
+                    $html = '<div class="provider">' .
+                        '<div class="thumb"><img src="'.$provider->getIconUrl().'" width="32" height="32" /></div>' .
+                        '<div class="label">'.$provider->getName().'</div>' .
+                        '</div>';
+
+                    return $html;
+                }
+                else
+                {
+                    return '';
+                }
+            }
+
+            default:
+            {
+                return parent::getTableAttributeHtml($element, $attribute);
+            }
+        }
+    }
+
+    /**
+     * Defines any custom element criteria attributes for this element type.
+     *
+     * @return array
+     */
+    public function defineCriteriaAttributes()
+    {
+        return array(
+            'userId' => AttributeType::Number,
+            'providerHandle' => AttributeType::String,
+            'socialUid' => AttributeType::String,
+
+            'username' => AttributeType::String,
+            'email' => AttributeType::String,
+            'firstName' => AttributeType::String,
+            'lastName' => AttributeType::String,
+            'lastLoginDate' => AttributeType::DateTime,
+        );
+    }
+
+    /**
+     * Modifies an element query targeting elements of this type.
+     *
+     * @param DbCommand            $query
+     * @param ElementCriteriaModel $criteria
+     *
+     * @return null|false
+     */
+    public function modifyElementsQuery(DbCommand $query, ElementCriteriaModel $criteria)
+    {
+        $query->addSelect('
 			login_accounts.id,
 			login_accounts.userId,
 			login_accounts.providerHandle,
@@ -299,59 +299,59 @@ 
 			users.lastLoginDate,
 		');
 
-		$query->join('social_login_accounts login_accounts', 'login_accounts.id = elements.id');
-		$query->leftJoin('users users', 'login_accounts.userId = users.id');
-
-		if ($criteria->userId)
-		{
-			$query->andWhere(DbHelper::parseParam('login_accounts.userId', $criteria->userId, $query->params));
-		}
-
-		if ($criteria->providerHandle)
-		{
-			$query->andWhere(DbHelper::parseParam('login_accounts.providerHandle', $criteria->providerHandle, $query->params));
-		}
-
-		if ($criteria->socialUid)
-		{
-			$query->andWhere(DbHelper::parseParam('login_accounts.socialUid', $criteria->socialUid, $query->params));
-		}
-
-		if ($criteria->username)
-		{
-			$query->andWhere(DbHelper::parseParam('users.username', $criteria->username, $query->params));
-		}
-
-		if ($criteria->firstName)
-		{
-			$query->andWhere(DbHelper::parseParam('users.firstName', $criteria->firstName, $query->params));
-		}
-
-		if ($criteria->lastName)
-		{
-			$query->andWhere(DbHelper::parseParam('users.lastName', $criteria->lastName, $query->params));
-		}
-
-		if ($criteria->email)
-		{
-			$query->andWhere(DbHelper::parseParam('users.email', $criteria->email, $query->params));
-		}
-
-		if ($criteria->lastLoginDate)
-		{
-			$query->andWhere(DbHelper::parseDateParam('users.lastLoginDate', $criteria->lastLoginDate, $query->params));
-		}
-	}
-
-	/**
-	 * Populates an element model based on a query result.
-	 *
-	 * @param array $row
-	 *
-	 * @return Social_LoginAccountModel
-	 */
-	public function populateElementModel($row)
-	{
-		return Social_LoginAccountModel::populateModel($row);
-	}
+        $query->join('social_login_accounts login_accounts', 'login_accounts.id = elements.id');
+        $query->leftJoin('users users', 'login_accounts.userId = users.id');
+
+        if ($criteria->userId)
+        {
+            $query->andWhere(DbHelper::parseParam('login_accounts.userId', $criteria->userId, $query->params));
+        }
+
+        if ($criteria->providerHandle)
+        {
+            $query->andWhere(DbHelper::parseParam('login_accounts.providerHandle', $criteria->providerHandle, $query->params));
+        }
+
+        if ($criteria->socialUid)
+        {
+            $query->andWhere(DbHelper::parseParam('login_accounts.socialUid', $criteria->socialUid, $query->params));
+        }
+
+        if ($criteria->username)
+        {
+            $query->andWhere(DbHelper::parseParam('users.username', $criteria->username, $query->params));
+        }
+
+        if ($criteria->firstName)
+        {
+            $query->andWhere(DbHelper::parseParam('users.firstName', $criteria->firstName, $query->params));
+        }
+
+        if ($criteria->lastName)
+        {
+            $query->andWhere(DbHelper::parseParam('users.lastName', $criteria->lastName, $query->params));
+        }
+
+        if ($criteria->email)
+        {
+            $query->andWhere(DbHelper::parseParam('users.email', $criteria->email, $query->params));
+        }
+
+        if ($criteria->lastLoginDate)
+        {
+            $query->andWhere(DbHelper::parseDateParam('users.lastLoginDate', $criteria->lastLoginDate, $query->params));
+        }
+    }
+
+    /**
+     * Populates an element model based on a query result.
+     *
+     * @param array $row
+     *
+     * @return Social_LoginAccountModel
+     */
+    public function populateElementModel($row)
+    {
+        return Social_LoginAccountModel::populateModel($row);
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -236,9 +236,9 @@
 
 				if ($provider)
 				{
-					$html = '<div class="provider">' .
-						'<div class="thumb"><img src="'.$provider->getIconUrl().'" width="32" height="32" /></div>' .
-						'<div class="label">'.$provider->getName().'</div>' .
+					$html = '<div class="provider">'.
+						'<div class="thumb"><img src="'.$provider->getIconUrl().'" width="32" height="32" /></div>'.
+						'<div class="label">'.$provider->getName().'</div>'.
 						'</div>';
 
 					return $html;

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

Spacing +8 added lines, -8 removed lines

@@ -19,7 +19,7 @@ 
      */
     public function checkPluginRequirements()
     {
-        if($this->areDependenciesMissing())
+        if ($this->areDependenciesMissing())
         {
             throw new Exception("Social is not configured properly. Check Social settings for more informations.");
         }
@@ -66,7 +66,7 @@ 
     {
         $missingDependencies = $this->getMissingDependencies();
 
-        if(count($missingDependencies) > 0)
+        if (count($missingDependencies) > 0)
         {
             return true;
         }
@@ -86,13 +86,13 @@ 
         $plugin = craft()->plugins->getPlugin('social');
         $plugins = $plugin->getRequiredPlugins();
 
-        foreach($plugins as $key => $plugin)
+        foreach ($plugins as $key => $plugin)
         {
             $dependency = $this->getPluginDependency($plugin);
 
-            if($missingOnly)
+            if ($missingOnly)
             {
-                if($dependency['isMissing'])
+                if ($dependency['isMissing'])
                 {
                     $dependencies[] = $dependency;
                 }
@@ -118,16 +118,16 @@ 
 
         $plugin = craft()->plugins->getPlugin($dependency['handle'], false);
 
-        if($plugin)
+        if ($plugin)
         {
             $currentVersion = $plugin->version;
 
 
             // requires update ?
 
-            if(version_compare($currentVersion, $dependency['version']) >= 0)
+            if (version_compare($currentVersion, $dependency['version']) >= 0)
             {
-                if($plugin->isInstalled && $plugin->isEnabled)
+                if ($plugin->isInstalled && $plugin->isEnabled)
                 {
                     $isMissing = false;
                 }

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;
             }