charlesportwoodii / CiiMS

protected/models/forms/ForgotForm.php

Indentation +90 added lines, -90 removed lines

@@ -2,94 +2,94 @@
 
 class ForgotForm extends CFormModel
 {
-	/**
-	 * @var string $email     The user's email address
-	 */
-	public $email;
-
-	/**
-	 * @var Users $_user     The user's model
-	 */
-	private $_user = NULL;
-
-	/**
-	 * Validation rules
-	 * @return array
-	 */
-	public function rules()
-	{
-		return array(
-			array('email', 'required'),
-			array('email', 'email'),
-			array('email', 'exists')
-		);
-	}
-
-	public function attributeLabels()
-	{
-		return array(
-			'email' => Yii::t('ciims.models.ForgotForm', 'Email Address')
-		);
-	}
-
-	/**
-	 * Determines if we have a user in our database with that email address
-	 * @param array $attributes
-	 * @param array $params
-	 * @return boolean
-	 */
-	public function exists($attributes, $params)
-	{
-		$this->_user = Users::model()->findByAttributes(array('email' => $this->email));
-
-		if ($this->_user == NULL)
-		{
-			$this->addError('email', Yii::t('ciims.models.ForgotForm', 'The email address you entered is either invalid, or does not belong to a user in our system.'));
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Initiates the password reset process on behalf of the user
-	 * Generates a unique hash and an expiration time that the hash is valid up until (defaults to 15 minutes)
-	 * This key will internally expire (but not be expunged) after that time
-	 */
-	public function initPasswordResetProcess()
-	{
-		if (!$this->validate())
-			return false;
-
-		$hash = Cii::generateSafeHash();
-		$expires = strtotime("+15 minutes");
-
-		$meta = UserMetadata::model()->findByAttributes(array('user_id'=>$this->_user->id, 'key'=>'passwordResetCode'));
-		if ($meta === NULL)
-			$meta = new UserMetadata;
-
-		$meta->user_id = $this->_user->id;
-		$meta->key = 'passwordResetCode';
-		$meta->value = $hash;
-		$meta->save();
-
-		$meta = UserMetadata::model()->findByAttributes(array('user_id'=>$this->_user->id, 'key'=>'passwordResetExpires'));
-		if ($meta === NULL)
-			$meta = new UserMetadata;
-
-		$meta->user_id = $this->_user->id;
-		$meta->key = 'passwordResetExpires';
-		$meta->value = $expires;
-		$meta->save();
-
-		$emailSettings = new EmailSettings;
-		$emailSettings->send($this->_user, Yii::t('ciims.email', 'Your Password Reset Information'), 'webroot.themes.' . Cii::getConfig('theme', 'default') .'.views.email.forgot', array('user' => $this->_user, 'hash' => $hash), true, true);
-
-		// Set success flash
-		Yii::app()->user->setFlash('success', Yii::t('ciims.controllers.Site', 'An email has been sent to {{email}} with further instructions on how to reset your password', array(
-			'{{email}}' => $this->email
-		)));
-
-		return true;
-	}
+    /**
+     * @var string $email     The user's email address
+     */
+    public $email;
+
+    /**
+     * @var Users $_user     The user's model
+     */
+    private $_user = NULL;
+
+    /**
+     * Validation rules
+     * @return array
+     */
+    public function rules()
+    {
+        return array(
+            array('email', 'required'),
+            array('email', 'email'),
+            array('email', 'exists')
+        );
+    }
+
+    public function attributeLabels()
+    {
+        return array(
+            'email' => Yii::t('ciims.models.ForgotForm', 'Email Address')
+        );
+    }
+
+    /**
+     * Determines if we have a user in our database with that email address
+     * @param array $attributes
+     * @param array $params
+     * @return boolean
+     */
+    public function exists($attributes, $params)
+    {
+        $this->_user = Users::model()->findByAttributes(array('email' => $this->email));
+
+        if ($this->_user == NULL)
+        {
+            $this->addError('email', Yii::t('ciims.models.ForgotForm', 'The email address you entered is either invalid, or does not belong to a user in our system.'));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Initiates the password reset process on behalf of the user
+     * Generates a unique hash and an expiration time that the hash is valid up until (defaults to 15 minutes)
+     * This key will internally expire (but not be expunged) after that time
+     */
+    public function initPasswordResetProcess()
+    {
+        if (!$this->validate())
+            return false;
+
+        $hash = Cii::generateSafeHash();
+        $expires = strtotime("+15 minutes");
+
+        $meta = UserMetadata::model()->findByAttributes(array('user_id'=>$this->_user->id, 'key'=>'passwordResetCode'));
+        if ($meta === NULL)
+            $meta = new UserMetadata;
+
+        $meta->user_id = $this->_user->id;
+        $meta->key = 'passwordResetCode';
+        $meta->value = $hash;
+        $meta->save();
+
+        $meta = UserMetadata::model()->findByAttributes(array('user_id'=>$this->_user->id, 'key'=>'passwordResetExpires'));
+        if ($meta === NULL)
+            $meta = new UserMetadata;
+
+        $meta->user_id = $this->_user->id;
+        $meta->key = 'passwordResetExpires';
+        $meta->value = $expires;
+        $meta->save();
+
+        $emailSettings = new EmailSettings;
+        $emailSettings->send($this->_user, Yii::t('ciims.email', 'Your Password Reset Information'), 'webroot.themes.' . Cii::getConfig('theme', 'default') .'.views.email.forgot', array('user' => $this->_user, 'hash' => $hash), true, true);
+
+        // Set success flash
+        Yii::app()->user->setFlash('success', Yii::t('ciims.controllers.Site', 'An email has been sent to {{email}} with further instructions on how to reset your password', array(
+            '{{email}}' => $this->email
+        )));
+
+        return true;
+    }
 }

Spacing +16 added lines, -16 removed lines

@@ -16,7 +16,7 @@ 
 	 * Validation rules
 	 * @return array
 	 */
-	public function rules()
+	public function rules ()
 	{
 		return array(
 			array('email', 'required'),
@@ -25,10 +25,10 @@ 
 		);
 	}
 
-	public function attributeLabels()
+	public function attributeLabels ()
 	{
 		return array(
-			'email' => Yii::t('ciims.models.ForgotForm', 'Email Address')
+			'email' => Yii::t ('ciims.models.ForgotForm', 'Email Address')
 		);
 	}
 
@@ -38,13 +38,13 @@ 
 	 * @param array $params
 	 * @return boolean
 	 */
-	public function exists($attributes, $params)
+	public function exists ($attributes, $params)
 	{
-		$this->_user = Users::model()->findByAttributes(array('email' => $this->email));
+		$this->_user = Users::model ()->findByAttributes (array('email' => $this->email));
 
 		if ($this->_user == NULL)
 		{
-			$this->addError('email', Yii::t('ciims.models.ForgotForm', 'The email address you entered is either invalid, or does not belong to a user in our system.'));
+			$this->addError ('email', Yii::t ('ciims.models.ForgotForm', 'The email address you entered is either invalid, or does not belong to a user in our system.'));
 			return false;
 		}
 
@@ -56,37 +56,37 @@ 
 	 * Generates a unique hash and an expiration time that the hash is valid up until (defaults to 15 minutes)
 	 * This key will internally expire (but not be expunged) after that time
 	 */
-	public function initPasswordResetProcess()
+	public function initPasswordResetProcess ()
 	{
-		if (!$this->validate())
+		if (!$this->validate ())
 			return false;
 
-		$hash = Cii::generateSafeHash();
-		$expires = strtotime("+15 minutes");
+		$hash = Cii::generateSafeHash ();
+		$expires = strtotime ("+15 minutes");
 
-		$meta = UserMetadata::model()->findByAttributes(array('user_id'=>$this->_user->id, 'key'=>'passwordResetCode'));
+		$meta = UserMetadata::model ()->findByAttributes (array('user_id'=>$this->_user->id, 'key'=>'passwordResetCode'));
 		if ($meta === NULL)
 			$meta = new UserMetadata;
 
 		$meta->user_id = $this->_user->id;
 		$meta->key = 'passwordResetCode';
 		$meta->value = $hash;
-		$meta->save();
+		$meta->save ();
 
-		$meta = UserMetadata::model()->findByAttributes(array('user_id'=>$this->_user->id, 'key'=>'passwordResetExpires'));
+		$meta = UserMetadata::model ()->findByAttributes (array('user_id'=>$this->_user->id, 'key'=>'passwordResetExpires'));
 		if ($meta === NULL)
 			$meta = new UserMetadata;
 
 		$meta->user_id = $this->_user->id;
 		$meta->key = 'passwordResetExpires';
 		$meta->value = $expires;
-		$meta->save();
+		$meta->save ();
 
 		$emailSettings = new EmailSettings;
-		$emailSettings->send($this->_user, Yii::t('ciims.email', 'Your Password Reset Information'), 'webroot.themes.' . Cii::getConfig('theme', 'default') .'.views.email.forgot', array('user' => $this->_user, 'hash' => $hash), true, true);
+		$emailSettings->send ($this->_user, Yii::t ('ciims.email', 'Your Password Reset Information'), 'webroot.themes.' . Cii::getConfig ('theme', 'default') . '.views.email.forgot', array('user' => $this->_user, 'hash' => $hash), true, true);
 
 		// Set success flash
-		Yii::app()->user->setFlash('success', Yii::t('ciims.controllers.Site', 'An email has been sent to {{email}} with further instructions on how to reset your password', array(
+		Yii::app ()->user->setFlash ('success', Yii::t ('ciims.controllers.Site', 'An email has been sent to {{email}} with further instructions on how to reset your password', array(
 			'{{email}}' => $this->email
 		)));
 

Braces +9 added lines, -6 removed lines

@@ -58,15 +58,17 @@ 
 	 */
 	public function initPasswordResetProcess()
 	{
-		if (!$this->validate())
-			return false;
+		if (!$this->validate()) {
+					return false;
+		}
 
 		$hash = Cii::generateSafeHash();
 		$expires = strtotime("+15 minutes");
 
 		$meta = UserMetadata::model()->findByAttributes(array('user_id'=>$this->_user->id, 'key'=>'passwordResetCode'));
-		if ($meta === NULL)
-			$meta = new UserMetadata;
+		if ($meta === NULL) {
+					$meta = new UserMetadata;
+		}
 
 		$meta->user_id = $this->_user->id;
 		$meta->key = 'passwordResetCode';
@@ -74,8 +76,9 @@ 
 		$meta->save();
 
 		$meta = UserMetadata::model()->findByAttributes(array('user_id'=>$this->_user->id, 'key'=>'passwordResetExpires'));
-		if ($meta === NULL)
-			$meta = new UserMetadata;
+		if ($meta === NULL) {
+					$meta = new UserMetadata;
+		}
 
 		$meta->user_id = $this->_user->id;
 		$meta->key = 'passwordResetExpires';

protected/models/forms/InvitationForm.php

Indentation +89 added lines, -89 removed lines

@@ -2,105 +2,105 @@
 
 class InvitationForm extends CFormModel
 {
-	/**
-	 * The email of the user to invite
-	 * @var string $email
-	 */
-	public $email;
+    /**
+     * The email of the user to invite
+     * @var string $email
+     */
+    public $email;
 
-	/**
-	 * Validation rules
-	 * @return array
-	 */
-	public function rules()
-	{
-		return array(
-			array('email', 'required'),
-			array('email', 'email'),
-			array('email', 'userExists')
-		);
-	}
+    /**
+     * Validation rules
+     * @return array
+     */
+    public function rules()
+    {
+        return array(
+            array('email', 'required'),
+            array('email', 'email'),
+            array('email', 'userExists')
+        );
+    }
 
-	/**
-	 * Validates that a user with that email address isn't already invited
-	 * @param array $attributes
-	 * @param array $params
-	 * @return boolean
-	 */
-	public function userExists($attributes, $params)
-	{
-		$user = Users::model()->findByAttributes(array('email' => $this->email));
+    /**
+     * Validates that a user with that email address isn't already invited
+     * @param array $attributes
+     * @param array $params
+     * @return boolean
+     */
+    public function userExists($attributes, $params)
+    {
+        $user = Users::model()->findByAttributes(array('email' => $this->email));
 
-		if ($user == NULL)
-			return true;
+        if ($user == NULL)
+            return true;
 
-		$this->addError('email', Yii::t('ciims.models.InvitationForm', 'A user with that email already exists.'));
-		return false;
-	}
+        $this->addError('email', Yii::t('ciims.models.InvitationForm', 'A user with that email already exists.'));
+        return false;
+    }
 
-	/**
-	 * Attribute labels
-	 * @return array
-	 */
-	public function attributeLabels()
-	{
-		return array(
-			'email' => Yii::t('ciims.models.InvitationForm', 'Email Address')
-		);
-	}
+    /**
+     * Attribute labels
+     * @return array
+     */
+    public function attributeLabels()
+    {
+        return array(
+            'email' => Yii::t('ciims.models.InvitationForm', 'Email Address')
+        );
+    }
 
-	/**
-	 * Sends an invite to a new user
-	 * @return boolean
-	 */
-	public function invite()
-	{
-		if (!$this->validate())
-			return false;
+    /**
+     * Sends an invite to a new user
+     * @return boolean
+     */
+    public function invite()
+    {
+        if (!$this->validate())
+            return false;
 
-		$user = new Users;
-		$user->attributes = array(
-			'email' 		=> $this->email,
-			'firstName'		=> null,
-			'lastName' 		=> null,
-			'displayName' 	=> null,
-			'password' 		=> null,
-			'user_role' 	=> 5,
-			'status' 		=> Users::PENDING_INVITATION
-		);
+        $user = new Users;
+        $user->attributes = array(
+            'email' 		=> $this->email,
+            'firstName'		=> null,
+            'lastName' 		=> null,
+            'displayName' 	=> null,
+            'password' 		=> null,
+            'user_role' 	=> 5,
+            'status' 		=> Users::PENDING_INVITATION
+        );
 
-		// Create a new user, but bypass validation
-		if ($user->save(false))
-		{
-			$meta = new UserMetadata;
-			$meta->attributes = array(
-				'user_id' => $user->id,
-				'key' => 'invitationKey',
-				'value' => Cii::generateSafeHash()
-			);
+        // Create a new user, but bypass validation
+        if ($user->save(false))
+        {
+            $meta = new UserMetadata;
+            $meta->attributes = array(
+                'user_id' => $user->id,
+                'key' => 'invitationKey',
+                'value' => Cii::generateSafeHash()
+            );
 
-			// If the key was savedm send the email out
-			if ($meta->save())
-			{
-				$emailSettings = new EmailSettings;
-        		$emailSettings->send(
-					$user,
-					Yii::t('ciims.models.InvitationForm', "You've Been Invited..."),
-					'webroot.themes.' . Cii::getConfig('theme', 'default') .'.views.email.invite',
-					array(
-						'user' => $user,
-						'hash' => $meta->value
-					),
-					true,
-					true
-				);
+            // If the key was savedm send the email out
+            if ($meta->save())
+            {
+                $emailSettings = new EmailSettings;
+                $emailSettings->send(
+                    $user,
+                    Yii::t('ciims.models.InvitationForm', "You've Been Invited..."),
+                    'webroot.themes.' . Cii::getConfig('theme', 'default') .'.views.email.invite',
+                    array(
+                        'user' => $user,
+                        'hash' => $meta->value
+                    ),
+                    true,
+                    true
+                );
 
-				return true;
-			}
+                return true;
+            }
 
-			$user->delete();
-		}
+            $user->delete();
+        }
 
-		return false;
-	}
+        return false;
+    }
 }
\ No newline at end of file

Spacing +15 added lines, -15 removed lines

@@ -12,7 +12,7 @@ 
 	 * Validation rules
 	 * @return array
 	 */
-	public function rules()
+	public function rules ()
 	{
 		return array(
 			array('email', 'required'),
@@ -27,14 +27,14 @@ 
 	 * @param array $params
 	 * @return boolean
 	 */
-	public function userExists($attributes, $params)
+	public function userExists ($attributes, $params)
 	{
-		$user = Users::model()->findByAttributes(array('email' => $this->email));
+		$user = Users::model ()->findByAttributes (array('email' => $this->email));
 
 		if ($user == NULL)
 			return true;
 
-		$this->addError('email', Yii::t('ciims.models.InvitationForm', 'A user with that email already exists.'));
+		$this->addError ('email', Yii::t ('ciims.models.InvitationForm', 'A user with that email already exists.'));
 		return false;
 	}
 
@@ -42,10 +42,10 @@ 
 	 * Attribute labels
 	 * @return array
 	 */
-	public function attributeLabels()
+	public function attributeLabels ()
 	{
 		return array(
-			'email' => Yii::t('ciims.models.InvitationForm', 'Email Address')
+			'email' => Yii::t ('ciims.models.InvitationForm', 'Email Address')
 		);
 	}
 
@@ -53,9 +53,9 @@ 
 	 * Sends an invite to a new user
 	 * @return boolean
 	 */
-	public function invite()
+	public function invite ()
 	{
-		if (!$this->validate())
+		if (!$this->validate ())
 			return false;
 
 		$user = new Users;
@@ -70,23 +70,23 @@ 
 		);
 
 		// Create a new user, but bypass validation
-		if ($user->save(false))
+		if ($user->save (false))
 		{
 			$meta = new UserMetadata;
 			$meta->attributes = array(
 				'user_id' => $user->id,
 				'key' => 'invitationKey',
-				'value' => Cii::generateSafeHash()
+				'value' => Cii::generateSafeHash ()
 			);
 
 			// If the key was savedm send the email out
-			if ($meta->save())
+			if ($meta->save ())
 			{
 				$emailSettings = new EmailSettings;
-        		$emailSettings->send(
+        		$emailSettings->send (
 					$user,
-					Yii::t('ciims.models.InvitationForm', "You've Been Invited..."),
-					'webroot.themes.' . Cii::getConfig('theme', 'default') .'.views.email.invite',
+					Yii::t ('ciims.models.InvitationForm', "You've Been Invited..."),
+					'webroot.themes.' . Cii::getConfig ('theme', 'default') . '.views.email.invite',
 					array(
 						'user' => $user,
 						'hash' => $meta->value
@@ -98,7 +98,7 @@ 
 				return true;
 			}
 
-			$user->delete();
+			$user->delete ();
 		}
 
 		return false;

Braces +6 added lines, -4 removed lines

@@ -31,8 +31,9 @@ 
 	{
 		$user = Users::model()->findByAttributes(array('email' => $this->email));
 
-		if ($user == NULL)
-			return true;
+		if ($user == NULL) {
+					return true;
+		}
 
 		$this->addError('email', Yii::t('ciims.models.InvitationForm', 'A user with that email already exists.'));
 		return false;
@@ -55,8 +56,9 @@ 
 	 */
 	public function invite()
 	{
-		if (!$this->validate())
-			return false;
+		if (!$this->validate()) {
+					return false;
+		}
 
 		$user = new Users;
 		$user->attributes = array(

protected/models/forms/InviteForm.php

Indentation +60 added lines, -60 removed lines

@@ -2,75 +2,75 @@
 

 class InviteForm extends CFormModel

 {

-	/**

-	 * @var $id int		The User's ID that we are working with

-	 */

-	public $id = NULL;

+    /**

+     * @var $id int		The User's ID that we are working with

+     */

+    public $id = NULL;

 

-	/**

-	 * @var $displayName string	The user's requested display name

-	 */

-	public $username = NULL;

+    /**

+     * @var $displayName string	The user's requested display name

+     */

+    public $username = NULL;

 

-	/**

-	 * @var $email string

-	 */

-	public $email = NULL;

+    /**

+     * @var $email string

+     */

+    public $email = NULL;

 

-	/**

-	 * @var $password string	The user's selected password

-	 */

-	public $password = NULL;

+    /**

+     * @var $password string	The user's selected password

+     */

+    public $password = NULL;

 

-	/**

-	 * Validation Rules

-	 * @return array

-	 */

-	public function rules()

-	{

-		return array(

-			array('id, username, password', 'required'),

-			array('username, password', 'length', 'max' => 255)

-		);

-	}

+    /**

+     * Validation Rules

+     * @return array

+     */

+    public function rules()

+    {

+        return array(

+            array('id, username, password', 'required'),

+            array('username, password', 'length', 'max' => 255)

+        );

+    }

 

-	/**

-	 * Attribute labels

-	 * @return array

-	 */

-	public function attributeLabels()

-	{

-		return array(

-			'id' 		=> Yii::t('ciims.models.InviteForm', 'ID'),

-			'username' 	=> Yii::t('ciims.models.InviteForm', 'Username'),

-			'password' 	=> Yii::t('ciims.models.InviteForm', 'Password'),

-		);

-	}

+    /**

+     * Attribute labels

+     * @return array

+     */

+    public function attributeLabels()

+    {

+        return array(

+            'id' 		=> Yii::t('ciims.models.InviteForm', 'ID'),

+            'username' 	=> Yii::t('ciims.models.InviteForm', 'Username'),

+            'password' 	=> Yii::t('ciims.models.InviteForm', 'Password'),

+        );

+    }

 

-	/**

-	 * Actually creates the users

-	 * @return bool            If the user was created

-	 */

-	public function acceptInvite()

-	{

-		if (!$this->validate())

-			return false;

+    /**

+     * Actually creates the users

+     * @return bool            If the user was created

+     */

+    public function acceptInvite()

+    {

+        if (!$this->validate())

+            return false;

 

-		$user = Users::model()->findByPk($this->id);

+        $user = Users::model()->findByPk($this->id);

 

-		// Bcrypt the initial password instead of just using the basic hashing mechanism

-		$hash = Users::model()->encryptHash($this->email, $this->password, Yii::app()->params['encryptionKey']);

-		$cost = Cii::getBcryptCost();

+        // Bcrypt the initial password instead of just using the basic hashing mechanism

+        $hash = Users::model()->encryptHash($this->email, $this->password, Yii::app()->params['encryptionKey']);

+        $cost = Cii::getBcryptCost();

 

-		$this->password = password_hash($hash, PASSWORD_BCRYPT, array('cost' => $cost));

+        $this->password = password_hash($hash, PASSWORD_BCRYPT, array('cost' => $cost));

 

-		$user->attributes = array(

-			'email'			=> $this->email,

-			'password'		=> $this->password,

-			'username'	    => $this->username,

-			'status'		=> Users::ACTIVE

-		);

+        $user->attributes = array(

+            'email'			=> $this->email,

+            'password'		=> $this->password,

+            'username'	    => $this->username,

+            'status'		=> Users::ACTIVE

+        );

 

-		return $user->save();

-	}

+        return $user->save();

+    }

 }
\ No newline at end of file

Spacing +12 added lines, -12 removed lines

@@ -26,7 +26,7 @@ 
 	 * Validation Rules

 	 * @return array

 	 */

-	public function rules()

+	public function rules ()

 	{

 		return array(

 			array('id, username, password', 'required'),

@@ -38,12 +38,12 @@ 
 	 * Attribute labels

 	 * @return array

 	 */

-	public function attributeLabels()

+	public function attributeLabels ()

 	{

 		return array(

-			'id' 		=> Yii::t('ciims.models.InviteForm', 'ID'),

-			'username' 	=> Yii::t('ciims.models.InviteForm', 'Username'),

-			'password' 	=> Yii::t('ciims.models.InviteForm', 'Password'),

+			'id' 		=> Yii::t ('ciims.models.InviteForm', 'ID'),

+			'username' 	=> Yii::t ('ciims.models.InviteForm', 'Username'),

+			'password' 	=> Yii::t ('ciims.models.InviteForm', 'Password'),

 		);

 	}

 

@@ -51,18 +51,18 @@ 
 	 * Actually creates the users

 	 * @return bool            If the user was created

 	 */

-	public function acceptInvite()

+	public function acceptInvite ()

 	{

-		if (!$this->validate())

+		if (!$this->validate ())

 			return false;

 

-		$user = Users::model()->findByPk($this->id);

+		$user = Users::model ()->findByPk ($this->id);

 

 		// Bcrypt the initial password instead of just using the basic hashing mechanism

-		$hash = Users::model()->encryptHash($this->email, $this->password, Yii::app()->params['encryptionKey']);

-		$cost = Cii::getBcryptCost();

+		$hash = Users::model ()->encryptHash ($this->email, $this->password, Yii::app ()->params['encryptionKey']);

+		$cost = Cii::getBcryptCost ();

 

-		$this->password = password_hash($hash, PASSWORD_BCRYPT, array('cost' => $cost));

+		$this->password = password_hash ($hash, PASSWORD_BCRYPT, array('cost' => $cost));

 

 		$user->attributes = array(

 			'email'			=> $this->email,

@@ -71,6 +71,6 @@ 
 			'status'		=> Users::ACTIVE

 		);

 

-		return $user->save();

+		return $user->save ();

 	}

 }
\ No newline at end of file

Braces +11 added lines, -10 removed lines

@@ -1,7 +1,7 @@ 
 <?php

 

-class InviteForm extends CFormModel

-{

+class InviteForm extends CFormModel
+{
 	/**

 	 * @var $id int		The User's ID that we are working with

 	 */

@@ -26,8 +26,8 @@ 
 	 * Validation Rules

 	 * @return array

 	 */

-	public function rules()

-	{

+	public function rules()
+	{
 		return array(

 			array('id, username, password', 'required'),

 			array('username, password', 'length', 'max' => 255)

@@ -38,8 +38,8 @@ 
 	 * Attribute labels

 	 * @return array

 	 */

-	public function attributeLabels()

-	{

+	public function attributeLabels()
+	{
 		return array(

 			'id' 		=> Yii::t('ciims.models.InviteForm', 'ID'),

 			'username' 	=> Yii::t('ciims.models.InviteForm', 'Username'),

@@ -51,10 +51,11 @@ 
 	 * Actually creates the users

 	 * @return bool            If the user was created

 	 */

-	public function acceptInvite()

-	{

-		if (!$this->validate())

-			return false;

+	public function acceptInvite()
+	{
+		if (!$this->validate()) {
+					return false;
+		}
 

 		$user = Users::model()->findByPk($this->id);

 

protected/models/forms/LoginForm.php

Indentation +145 added lines, -145 removed lines

@@ -8,169 +8,169 @@
 Yii::import('cii.components.CiiUserIdentity');
 class LoginForm extends CFormModel
 {
-	/**
-	 * The submitted username(email)
-	 * @var string
-	 */
-	public $username;
+    /**
+     * The submitted username(email)
+     * @var string
+     */
+    public $username;
 
-	/**
-	 * The submitted password
-	 * @var string
-	 */
-	public $password;
+    /**
+     * The submitted password
+     * @var string
+     */
+    public $password;
 
-	/**
-	 * Two factor authentication code
-	 * @var string
-	 */
-	public $twoFactorCode = false;
+    /**
+     * Two factor authentication code
+     * @var string
+     */
+    public $twoFactorCode = false;
 
-	/**
-	 * Whether or not we should remember the user.
-	 * This isn't uses as of CiiMS 1.1
-	 * @var boolean ?
-	 */
-	public $rememberMe = true;
+    /**
+     * Whether or not we should remember the user.
+     * This isn't uses as of CiiMS 1.1
+     * @var boolean ?
+     */
+    public $rememberMe = true;
 
-	/**
-	 * Whether or not we should perform a forced authentication. By default we aren't going to do this
-	 * @var boolean
-	 */
-	private $force = false;
+    /**
+     * Whether or not we should perform a forced authentication. By default we aren't going to do this
+     * @var boolean
+     */
+    private $force = false;
 
-	/**
-	 * The identity of the user
-	 * @var CiiUserIdentity
-	 */
-	private $_identity = NULL;
+    /**
+     * The identity of the user
+     * @var CiiUserIdentity
+     */
+    private $_identity = NULL;
 
-	/**
-	 * The Application Name for API requests
-	 * @var $app_name
-	 */
-	public $app_name = NULL;
+    /**
+     * The Application Name for API requests
+     * @var $app_name
+     */
+    public $app_name = NULL;
 
-	/**
-	 * Determines whether or not we should do a forced authentication and bypass the user's actual password
-	 * @see  application.modules.HybridAuth for more details
-	 * @param boolean $force
-	 */
-	public function __construct($force=false)
-	{
-		$this->force = $force;
-	}
+    /**
+     * Determines whether or not we should do a forced authentication and bypass the user's actual password
+     * @see  application.modules.HybridAuth for more details
+     * @param boolean $force
+     */
+    public function __construct($force=false)
+    {
+        $this->force = $force;
+    }
 
-	/**
-	 * Declares the validation rules.
-	 * The rules state that username and password are required,
-	 * and password needs to be authenticated.
-	 */
-	public function rules()
-	{
-		return array(
-			array('username, password', 'required'),
-			array('username', 'email'),
-			array('password', 'authenticate'),
-			array('twoFactorCode', 'hasTwoFactorCode')
-		);
-	}
+    /**
+     * Declares the validation rules.
+     * The rules state that username and password are required,
+     * and password needs to be authenticated.
+     */
+    public function rules()
+    {
+        return array(
+            array('username, password', 'required'),
+            array('username', 'email'),
+            array('password', 'authenticate'),
+            array('twoFactorCode', 'hasTwoFactorCode')
+        );
+    }
 
-	/**
-	 * Yii attribute labels
-	 * @return array
-	 */
-	public function attributeLabels()
-	{
-		return array(
-			'username' 		=> Yii::t('ciims.models.LoginForm', 'Username'),
-			'password' 		=> Yii::t('ciims.models.LoginForm', 'Password'),
-			'twoFactorCode' => Yii::t('ciims.models.LoginForm', 'Two Factor Authentication Code'),
-		);
-	}
+    /**
+     * Yii attribute labels
+     * @return array
+     */
+    public function attributeLabels()
+    {
+        return array(
+            'username' 		=> Yii::t('ciims.models.LoginForm', 'Username'),
+            'password' 		=> Yii::t('ciims.models.LoginForm', 'Password'),
+            'twoFactorCode' => Yii::t('ciims.models.LoginForm', 'Two Factor Authentication Code'),
+        );
+    }
 
-	/**
-	 * Returns an instance of CiiUserIdentity
-	 * @return CiiUserIdentity
-	 */
-	public function getIdentity()
-	{
-		if ($this->_identity === NULL)
-			$this->_identity = new CiiUserIdentity($this->username, $this->password, $this->twoFactorCode);
+    /**
+     * Returns an instance of CiiUserIdentity
+     * @return CiiUserIdentity
+     */
+    public function getIdentity()
+    {
+        if ($this->_identity === NULL)
+            $this->_identity = new CiiUserIdentity($this->username, $this->password, $this->twoFactorCode);
 		
-		return $this->_identity;
-	}
+        return $this->_identity;
+    }
 	
-	/**
-	 * Authenticates the password.
-	 * This is the 'authenticate' validator as declared in rules().
-	 */
-	public function authenticate($attribute, $params)
-	{
-		if (!$this->hasErrors())
-		{
-			$this->getIdentity()->app_name = $this->app_name;
-			if (!$this->getIdentity()->authenticate($this->force))
-			{
-				if ($this->getIdentity()->errorCode === 5)
-				{
-					$this->addError('twoFactorCode', Yii::t('ciims.models.LoginForm', 'Two factor code was not valid. Please try again.'));
-					$this->username = NULL;
-					$this->password = NULL;
-					$this->twoFactorCode = NULL;
-				}
-				else
-					$this->addError('password', Yii::t('ciims.models.LoginForm', 'Incorrect username or password.'));
-			}
-		}
-	}
+    /**
+     * Authenticates the password.
+     * This is the 'authenticate' validator as declared in rules().
+     */
+    public function authenticate($attribute, $params)
+    {
+        if (!$this->hasErrors())
+        {
+            $this->getIdentity()->app_name = $this->app_name;
+            if (!$this->getIdentity()->authenticate($this->force))
+            {
+                if ($this->getIdentity()->errorCode === 5)
+                {
+                    $this->addError('twoFactorCode', Yii::t('ciims.models.LoginForm', 'Two factor code was not valid. Please try again.'));
+                    $this->username = NULL;
+                    $this->password = NULL;
+                    $this->twoFactorCode = NULL;
+                }
+                else
+                    $this->addError('password', Yii::t('ciims.models.LoginForm', 'Incorrect username or password.'));
+            }
+        }
+    }
 
-	/**
-	 * Validator for two factor authentication codes
-	 */
-	public function hasTwoFactorCode($attribute, $params)
-	{
-		if ($this->twoFactorCode === false && $this->needsTwoFactorAuth())
-			$this->addError('twoFactorCode', Yii::t('ciims.models.LoginForm', 'Please enter your two factor authentication code to proceed'));
-	}
+    /**
+     * Validator for two factor authentication codes
+     */
+    public function hasTwoFactorCode($attribute, $params)
+    {
+        if ($this->twoFactorCode === false && $this->needsTwoFactorAuth())
+            $this->addError('twoFactorCode', Yii::t('ciims.models.LoginForm', 'Please enter your two factor authentication code to proceed'));
+    }
 
-	/**
-	 * Determines if two factor authentication code is required
-	 * @return boolean
-	 */
-	public function needsTwoFactorAuth()
-	{
-		$user = $this->getIdentity()->getUser();
+    /**
+     * Determines if two factor authentication code is required
+     * @return boolean
+     */
+    public function needsTwoFactorAuth()
+    {
+        $user = $this->getIdentity()->getUser();
 
-		// If the user is bad, we don't need a 2fa code
-		if ($user == NULL)
-			return false;
+        // If the user is bad, we don't need a 2fa code
+        if ($user == NULL)
+            return false;
 
-		// Only return true if the user needs a 2fa code and their password validation succeeded
-		if ($user->needsTwoFactorAuth() && $this->getIdentity()->validatePassword())
-			return true;
+        // Only return true if the user needs a 2fa code and their password validation succeeded
+        if ($user->needsTwoFactorAuth() && $this->getIdentity()->validatePassword())
+            return true;
 			
-		return false;
-	}
+        return false;
+    }
 	
-	/**
-	 * Logs in the user using the given username and password in the model.
-	 * @return boolean whether login is successful
-	 */
-	public function login()
-	{
-		if (!$this->validate())
-			return false;
+    /**
+     * Logs in the user using the given username and password in the model.
+     * @return boolean whether login is successful
+     */
+    public function login()
+    {
+        if (!$this->validate())
+            return false;
 			
-		if ($this->getIdentity()->errorCode === CiiUserIdentity::ERROR_NONE)
-		{
-			Yii::app()->user->login($this->getIdentity());
+        if ($this->getIdentity()->errorCode === CiiUserIdentity::ERROR_NONE)
+        {
+            Yii::app()->user->login($this->getIdentity());
 			
-			// Store the API key and session_identifier as a key-set in cache
-			Yii::app()->cache->set($this->getIdentity()->getState('apiKey'), session_id(), 1800);
-			return true;
-		}	
-		else
-			return false;
-	}
+            // Store the API key and session_identifier as a key-set in cache
+            Yii::app()->cache->set($this->getIdentity()->getState('apiKey'), session_id(), 1800);
+            return true;
+        }	
+        else
+            return false;
+    }
 }

Spacing +27 added lines, -27 removed lines

@@ -5,7 +5,7 @@ 
  * LoginForm is the data structure for keeping
  * user login form data. It is used by the 'login' action of 'SiteController'.
  */
-Yii::import('cii.components.CiiUserIdentity');
+Yii::import ('cii.components.CiiUserIdentity');
 class LoginForm extends CFormModel
 {
 	/**
@@ -56,7 +56,7 @@ 
 	 * @see  application.modules.HybridAuth for more details
 	 * @param boolean $force
 	 */
-	public function __construct($force=false)
+	public function __construct ($force = false)
 	{
 		$this->force = $force;
 	}
@@ -66,7 +66,7 @@ 
 	 * The rules state that username and password are required,
 	 * and password needs to be authenticated.
 	 */
-	public function rules()
+	public function rules ()
 	{
 		return array(
 			array('username, password', 'required'),
@@ -80,12 +80,12 @@ 
 	 * Yii attribute labels
 	 * @return array
 	 */
-	public function attributeLabels()
+	public function attributeLabels ()
 	{
 		return array(
-			'username' 		=> Yii::t('ciims.models.LoginForm', 'Username'),
-			'password' 		=> Yii::t('ciims.models.LoginForm', 'Password'),
-			'twoFactorCode' => Yii::t('ciims.models.LoginForm', 'Two Factor Authentication Code'),
+			'username' 		=> Yii::t ('ciims.models.LoginForm', 'Username'),
+			'password' 		=> Yii::t ('ciims.models.LoginForm', 'Password'),
+			'twoFactorCode' => Yii::t ('ciims.models.LoginForm', 'Two Factor Authentication Code'),
 		);
 	}
 
@@ -93,10 +93,10 @@ 
 	 * Returns an instance of CiiUserIdentity
 	 * @return CiiUserIdentity
 	 */
-	public function getIdentity()
+	public function getIdentity ()
 	{
 		if ($this->_identity === NULL)
-			$this->_identity = new CiiUserIdentity($this->username, $this->password, $this->twoFactorCode);
+			$this->_identity = new CiiUserIdentity ($this->username, $this->password, $this->twoFactorCode);
 		
 		return $this->_identity;
 	}
@@ -105,22 +105,22 @@ 
 	 * Authenticates the password.
 	 * This is the 'authenticate' validator as declared in rules().
 	 */
-	public function authenticate($attribute, $params)
+	public function authenticate ($attribute, $params)
 	{
-		if (!$this->hasErrors())
+		if (!$this->hasErrors ())
 		{
-			$this->getIdentity()->app_name = $this->app_name;
-			if (!$this->getIdentity()->authenticate($this->force))
+			$this->getIdentity ()->app_name = $this->app_name;
+			if (!$this->getIdentity ()->authenticate ($this->force))
 			{
-				if ($this->getIdentity()->errorCode === 5)
+				if ($this->getIdentity ()->errorCode === 5)
 				{
-					$this->addError('twoFactorCode', Yii::t('ciims.models.LoginForm', 'Two factor code was not valid. Please try again.'));
+					$this->addError ('twoFactorCode', Yii::t ('ciims.models.LoginForm', 'Two factor code was not valid. Please try again.'));
 					$this->username = NULL;
 					$this->password = NULL;
 					$this->twoFactorCode = NULL;
 				}
 				else
-					$this->addError('password', Yii::t('ciims.models.LoginForm', 'Incorrect username or password.'));
+					$this->addError ('password', Yii::t ('ciims.models.LoginForm', 'Incorrect username or password.'));
 			}
 		}
 	}
@@ -128,26 +128,26 @@ 
 	/**
 	 * Validator for two factor authentication codes
 	 */
-	public function hasTwoFactorCode($attribute, $params)
+	public function hasTwoFactorCode ($attribute, $params)
 	{
-		if ($this->twoFactorCode === false && $this->needsTwoFactorAuth())
-			$this->addError('twoFactorCode', Yii::t('ciims.models.LoginForm', 'Please enter your two factor authentication code to proceed'));
+		if ($this->twoFactorCode === false && $this->needsTwoFactorAuth ())
+			$this->addError ('twoFactorCode', Yii::t ('ciims.models.LoginForm', 'Please enter your two factor authentication code to proceed'));
 	}
 
 	/**
 	 * Determines if two factor authentication code is required
 	 * @return boolean
 	 */
-	public function needsTwoFactorAuth()
+	public function needsTwoFactorAuth ()
 	{
-		$user = $this->getIdentity()->getUser();
+		$user = $this->getIdentity ()->getUser ();
 
 		// If the user is bad, we don't need a 2fa code
 		if ($user == NULL)
 			return false;
 
 		// Only return true if the user needs a 2fa code and their password validation succeeded
-		if ($user->needsTwoFactorAuth() && $this->getIdentity()->validatePassword())
+		if ($user->needsTwoFactorAuth () && $this->getIdentity ()->validatePassword ())
 			return true;
 			
 		return false;
@@ -157,17 +157,17 @@ 
 	 * Logs in the user using the given username and password in the model.
 	 * @return boolean whether login is successful
 	 */
-	public function login()
+	public function login ()
 	{
-		if (!$this->validate())
+		if (!$this->validate ())
 			return false;
 			
-		if ($this->getIdentity()->errorCode === CiiUserIdentity::ERROR_NONE)
+		if ($this->getIdentity ()->errorCode === CiiUserIdentity::ERROR_NONE)
 		{
-			Yii::app()->user->login($this->getIdentity());
+			Yii::app ()->user->login ($this->getIdentity ());
 			
 			// Store the API key and session_identifier as a key-set in cache
-			Yii::app()->cache->set($this->getIdentity()->getState('apiKey'), session_id(), 1800);
+			Yii::app ()->cache->set ($this->getIdentity ()->getState ('apiKey'), session_id (), 1800);
 			return true;
 		}	
 		else

Braces +20 added lines, -15 removed lines

@@ -95,8 +95,9 @@ 
 	 */
 	public function getIdentity()
 	{
-		if ($this->_identity === NULL)
-			$this->_identity = new CiiUserIdentity($this->username, $this->password, $this->twoFactorCode);
+		if ($this->_identity === NULL) {
+					$this->_identity = new CiiUserIdentity($this->username, $this->password, $this->twoFactorCode);
+		}
 		
 		return $this->_identity;
 	}
@@ -118,9 +119,9 @@ 
 					$this->username = NULL;
 					$this->password = NULL;
 					$this->twoFactorCode = NULL;
+				} else {
+									$this->addError('password', Yii::t('ciims.models.LoginForm', 'Incorrect username or password.'));
 				}
-				else
-					$this->addError('password', Yii::t('ciims.models.LoginForm', 'Incorrect username or password.'));
 			}
 		}
 	}
@@ -130,8 +131,9 @@ 
 	 */
 	public function hasTwoFactorCode($attribute, $params)
 	{
-		if ($this->twoFactorCode === false && $this->needsTwoFactorAuth())
-			$this->addError('twoFactorCode', Yii::t('ciims.models.LoginForm', 'Please enter your two factor authentication code to proceed'));
+		if ($this->twoFactorCode === false && $this->needsTwoFactorAuth()) {
+					$this->addError('twoFactorCode', Yii::t('ciims.models.LoginForm', 'Please enter your two factor authentication code to proceed'));
+		}
 	}
 
 	/**
@@ -143,12 +145,14 @@ 
 		$user = $this->getIdentity()->getUser();
 
 		// If the user is bad, we don't need a 2fa code
-		if ($user == NULL)
-			return false;
+		if ($user == NULL) {
+					return false;
+		}
 
 		// Only return true if the user needs a 2fa code and their password validation succeeded
-		if ($user->needsTwoFactorAuth() && $this->getIdentity()->validatePassword())
-			return true;
+		if ($user->needsTwoFactorAuth() && $this->getIdentity()->validatePassword()) {
+					return true;
+		}
 			
 		return false;
 	}
@@ -159,8 +163,9 @@ 
 	 */
 	public function login()
 	{
-		if (!$this->validate())
-			return false;
+		if (!$this->validate()) {
+					return false;
+		}
 			
 		if ($this->getIdentity()->errorCode === CiiUserIdentity::ERROR_NONE)
 		{
@@ -169,8 +174,8 @@ 
 			// Store the API key and session_identifier as a key-set in cache
 			Yii::app()->cache->set($this->getIdentity()->getState('apiKey'), session_id(), 1800);
 			return true;
-		}	
-		else
-			return false;
+		} else {
+					return false;
+		}
 	}
 }

protected/models/forms/PasswordResetForm.php

Indentation +121 added lines, -121 removed lines

@@ -2,125 +2,125 @@
 
 class PasswordResetForm extends CFormModel
 {
-	/**
-	 * The user's new password
-	 * @var string $password
-	 */
-	public $password;
-
-	/**
-	 * The user's new password repeated
-	 * @var string $password_repeat
-	 */
-	public $password_repeat;
-
-	/**
-	 *
-	 * @var string $reset_key
-	 */
-	public $reset_key;
-
-	/**
-	 * The user model
-	 * @var Users $_user
-	 */
-	private $_user;
-
-	/**
-	 * The hash model
-	 * @var UserMetadata $_hash
-	 */
-	private $_hash;
-
-	/**
-	 * The expires model
-	 * @var UserMetadata $_expires
-	 */
-	private $_expires;
-
-	/**
-	 * Validation rules
-	 * @return array
-	 */
-	public function rules()
-	{
-		return array(
-			array('password, password_repeat, reset_key', 'required'),
-			array('password', 'compare'),
-			array('password', 'length', 'min'=>8),
-			array('reset_key', 'validateResetKey')
-		);
-	}
-
-	/**
-	 * Attribute labels
-	 * @return array
-	 */
-	public function attributeLabels()
-	{
-		return array(
-			'password' 			=> Yii::t('ciims.models.PasswordResetForm', 'Your New Password'),
-			'password_repeat' 	=> Yii::t('ciims.models.PasswordResetForm', 'Your New Password (again)'),
-			'reset_key' 		=> Yii::t('ciims.models.PasswordResetForm', 'Your Password Reset Token'),
-		);
-	}
-
-	/**
-	 * Validates that the reset key is valid and that it belongs to a user
-	 * @param array $attributes
-	 * @param array $params
-	 * @return boolean
-	 */
-	public function validateResetKey($attributes=array(), $params=array())
-	{
-		// Validate that we have a hash for this user
-		$this->_hash = UserMetadata::model()->findByAttributes(array('key'=>'passwordResetCode', 'value'=>$this->reset_key));
-		if ($this->_hash == NULL)
-		{
-			$this->addError('reset_key', Yii::t('ciims.models.PasswordResetForm', 'The activation key you provided is invalid'));
-			return false;
-		}
-
-		// Validate that the expiration time has not passed
-		$this->_expires = UserMetadata::model()->findByAttributes(array('user_id'=>$this->_hash->user_id, 'key'=>'passwordResetExpires'));
-		if ($this->_expires == NULL || time() > $this->_expires->value)
-		{
-			$this->addError('reset_key', Yii::t('ciims.models.PasswordResetForm', 'The activation key you provided is invalid'));
-			return false;
-		}
-
-		// Retrieve the user
-		$this->_user = Users::model()->findByPk($this->_hash->user_id);
-		if ($this->_user == NULL)
-		{
-			$this->addError('reset_key', Yii::t('ciims.models.PasswordResetForm', 'The activation key you provided is invalid'));
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Resets the user's password
-	 * @return boolean
-	 */
-	public function save()
-	{
-		if (!$this->validate())
-			return false;
-
-		// Update the user's password
-		$this->_user->password = $this->password;
-
-		if ($this->_user->save())
-		{
-			// Delete the hash and expires to prevent reuse attemps
-			$this->_hash->delete();
-			$this->_expires->delete();
-
-			return true;
-		}
-
-		return false;
-	}
+    /**
+     * The user's new password
+     * @var string $password
+     */
+    public $password;
+
+    /**
+     * The user's new password repeated
+     * @var string $password_repeat
+     */
+    public $password_repeat;
+
+    /**
+     *
+     * @var string $reset_key
+     */
+    public $reset_key;
+
+    /**
+     * The user model
+     * @var Users $_user
+     */
+    private $_user;
+
+    /**
+     * The hash model
+     * @var UserMetadata $_hash
+     */
+    private $_hash;
+
+    /**
+     * The expires model
+     * @var UserMetadata $_expires
+     */
+    private $_expires;
+
+    /**
+     * Validation rules
+     * @return array
+     */
+    public function rules()
+    {
+        return array(
+            array('password, password_repeat, reset_key', 'required'),
+            array('password', 'compare'),
+            array('password', 'length', 'min'=>8),
+            array('reset_key', 'validateResetKey')
+        );
+    }
+
+    /**
+     * Attribute labels
+     * @return array
+     */
+    public function attributeLabels()
+    {
+        return array(
+            'password' 			=> Yii::t('ciims.models.PasswordResetForm', 'Your New Password'),
+            'password_repeat' 	=> Yii::t('ciims.models.PasswordResetForm', 'Your New Password (again)'),
+            'reset_key' 		=> Yii::t('ciims.models.PasswordResetForm', 'Your Password Reset Token'),
+        );
+    }
+
+    /**
+     * Validates that the reset key is valid and that it belongs to a user
+     * @param array $attributes
+     * @param array $params
+     * @return boolean
+     */
+    public function validateResetKey($attributes=array(), $params=array())
+    {
+        // Validate that we have a hash for this user
+        $this->_hash = UserMetadata::model()->findByAttributes(array('key'=>'passwordResetCode', 'value'=>$this->reset_key));
+        if ($this->_hash == NULL)
+        {
+            $this->addError('reset_key', Yii::t('ciims.models.PasswordResetForm', 'The activation key you provided is invalid'));
+            return false;
+        }
+
+        // Validate that the expiration time has not passed
+        $this->_expires = UserMetadata::model()->findByAttributes(array('user_id'=>$this->_hash->user_id, 'key'=>'passwordResetExpires'));
+        if ($this->_expires == NULL || time() > $this->_expires->value)
+        {
+            $this->addError('reset_key', Yii::t('ciims.models.PasswordResetForm', 'The activation key you provided is invalid'));
+            return false;
+        }
+
+        // Retrieve the user
+        $this->_user = Users::model()->findByPk($this->_hash->user_id);
+        if ($this->_user == NULL)
+        {
+            $this->addError('reset_key', Yii::t('ciims.models.PasswordResetForm', 'The activation key you provided is invalid'));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Resets the user's password
+     * @return boolean
+     */
+    public function save()
+    {
+        if (!$this->validate())
+            return false;
+
+        // Update the user's password
+        $this->_user->password = $this->password;
+
+        if ($this->_user->save())
+        {
+            // Delete the hash and expires to prevent reuse attemps
+            $this->_hash->delete();
+            $this->_expires->delete();
+
+            return true;
+        }
+
+        return false;
+    }
 }

Spacing +18 added lines, -18 removed lines

@@ -42,7 +42,7 @@ 
 	 * Validation rules
 	 * @return array
 	 */
-	public function rules()
+	public function rules ()
 	{
 		return array(
 			array('password, password_repeat, reset_key', 'required'),
@@ -56,12 +56,12 @@ 
 	 * Attribute labels
 	 * @return array
 	 */
-	public function attributeLabels()
+	public function attributeLabels ()
 	{
 		return array(
-			'password' 			=> Yii::t('ciims.models.PasswordResetForm', 'Your New Password'),
-			'password_repeat' 	=> Yii::t('ciims.models.PasswordResetForm', 'Your New Password (again)'),
-			'reset_key' 		=> Yii::t('ciims.models.PasswordResetForm', 'Your Password Reset Token'),
+			'password' 			=> Yii::t ('ciims.models.PasswordResetForm', 'Your New Password'),
+			'password_repeat' 	=> Yii::t ('ciims.models.PasswordResetForm', 'Your New Password (again)'),
+			'reset_key' 		=> Yii::t ('ciims.models.PasswordResetForm', 'Your Password Reset Token'),
 		);
 	}
 
@@ -71,29 +71,29 @@ 
 	 * @param array $params
 	 * @return boolean
 	 */
-	public function validateResetKey($attributes=array(), $params=array())
+	public function validateResetKey ($attributes = array(), $params = array())
 	{
 		// Validate that we have a hash for this user
-		$this->_hash = UserMetadata::model()->findByAttributes(array('key'=>'passwordResetCode', 'value'=>$this->reset_key));
+		$this->_hash = UserMetadata::model ()->findByAttributes (array('key'=>'passwordResetCode', 'value'=>$this->reset_key));
 		if ($this->_hash == NULL)
 		{
-			$this->addError('reset_key', Yii::t('ciims.models.PasswordResetForm', 'The activation key you provided is invalid'));
+			$this->addError ('reset_key', Yii::t ('ciims.models.PasswordResetForm', 'The activation key you provided is invalid'));
 			return false;
 		}
 
 		// Validate that the expiration time has not passed
-		$this->_expires = UserMetadata::model()->findByAttributes(array('user_id'=>$this->_hash->user_id, 'key'=>'passwordResetExpires'));
-		if ($this->_expires == NULL || time() > $this->_expires->value)
+		$this->_expires = UserMetadata::model ()->findByAttributes (array('user_id'=>$this->_hash->user_id, 'key'=>'passwordResetExpires'));
+		if ($this->_expires == NULL || time () > $this->_expires->value)
 		{
-			$this->addError('reset_key', Yii::t('ciims.models.PasswordResetForm', 'The activation key you provided is invalid'));
+			$this->addError ('reset_key', Yii::t ('ciims.models.PasswordResetForm', 'The activation key you provided is invalid'));
 			return false;
 		}
 
 		// Retrieve the user
-		$this->_user = Users::model()->findByPk($this->_hash->user_id);
+		$this->_user = Users::model ()->findByPk ($this->_hash->user_id);
 		if ($this->_user == NULL)
 		{
-			$this->addError('reset_key', Yii::t('ciims.models.PasswordResetForm', 'The activation key you provided is invalid'));
+			$this->addError ('reset_key', Yii::t ('ciims.models.PasswordResetForm', 'The activation key you provided is invalid'));
 			return false;
 		}
 
@@ -104,19 +104,19 @@ 
 	 * Resets the user's password
 	 * @return boolean
 	 */
-	public function save()
+	public function save ()
 	{
-		if (!$this->validate())
+		if (!$this->validate ())
 			return false;
 
 		// Update the user's password
 		$this->_user->password = $this->password;
 
-		if ($this->_user->save())
+		if ($this->_user->save ())
 		{
 			// Delete the hash and expires to prevent reuse attemps
-			$this->_hash->delete();
-			$this->_expires->delete();
+			$this->_hash->delete ();
+			$this->_expires->delete ();
 
 			return true;
 		}

Braces +3 added lines, -2 removed lines

@@ -107,8 +107,9 @@
 	 */
 	public function save($sendEmail = true)
 	{
-		if (!$this->validate())
-			return false;
+		if (!$this->validate()) {
+					return false;
+		}
 
 		$this->_user = new Users;
 

protected/models/forms/ProfileForm.php

Braces +27 added lines, -18 removed lines

@@ -54,11 +54,13 @@ 
 
 	private function canOverridePasswordCheck()
 	{
-		if ($this->overridePasswordCheck)
-			return true;
+		if ($this->overridePasswordCheck) {
+					return true;
+		}
 
-		if (isset(Yii::app()->user) && $this->getId() == Yii::app()->user->id)
-			return true;
+		if (isset(Yii::app()->user) && $this->getId() == Yii::app()->user->id) {
+					return true;
+		}
 
 		return false;
 	}
@@ -83,8 +85,9 @@ 
 			'key'     => 'newEmailAddress'
 		));
 
-		if ($metadata == NULL)
-			return NULL;
+		if ($metadata == NULL) {
+					return NULL;
+		}
 
 		return $metadata->value;
 	}
@@ -126,8 +129,9 @@ 
 			'key'     => 'newEmailAddressChangeKey'
 		));
 
-		if ($metadata == NULL)
-			return NULL;
+		if ($metadata == NULL) {
+					return NULL;
+		}
 
 		return $metadata->value;
 	}
@@ -156,8 +160,9 @@ 
 		$metadata->value = Cii::generateSafeHash();
 
 		// Save the record
-		if ($metadata->save())
-			return $metadata->value;
+		if ($metadata->save()) {
+					return $metadata->value;
+		}
 	
 		throw new CHttpException(500, Yii::t('ciims.ProfileForm', 'Unable to save change key'));
 	}
@@ -199,8 +204,9 @@ 
 	 */
 	public function validateUserRole($attributes, $params)
 	{
-		if ($this->canOverridePasswordCheck())
-			return true;
+		if ($this->canOverridePasswordCheck()) {
+					return true;
+		}
 
 		$this->addError('user_role', Yii::t('ciims.models.ProfileForm', 'You do not have permission to modify this attribute'));
 		return false;
@@ -245,8 +251,9 @@ 
 		// Load the user
 		$this->_user = Users::model()->findByPk($id);
 
-		if ($this->_user == NULL)
-			throw new CHttpException(400, Yii::t('ciims.models.ProfileForm', 'The request user\'s profile could not be loaded'));
+		if ($this->_user == NULL) {
+					throw new CHttpException(400, Yii::t('ciims.models.ProfileForm', 'The request user\'s profile could not be loaded'));
+		}
 
 		// Reload the attribute labels
 		$this->attributes = array(
@@ -264,8 +271,9 @@ 
 	 */
 	public function save()
 	{
-		if (!$this->validate(NULL, false))
-			return false;
+		if (!$this->validate(NULL, false)) {
+					return false;
+		}
 
 		// Change the email address, if necessary
 		$this->changeEmail();
@@ -276,8 +284,9 @@ 
 			'user_role'     => $this->user_role
 		);
 
-		if ($this->_user->save())
-			return true;
+		if ($this->_user->save()) {
+					return true;
+		}
 
 		return false;
 	}

Doc Comments +1 added lines, -1 removed lines

@@ -138,7 +138,7 @@
 
 	/**
 	 * Generates a new change key
-	 * @return boolean
+	 * @return string
 	 */
 	public function setNewEmailChangeKey()
 	{

Indentation +314 added lines, -314 removed lines

@@ -2,321 +2,321 @@
 
 class ProfileForm extends CFormModel
 {
-	/**
-	 * The user's email address
-	 * @var string $email
-	 */
-	public $email;
-
-	/**
-	 * The user's NEW password
-	 * @var string $password
-	 */
-	public $password;
-
-	/**
-	 * The repeated password if a NEW password is applied
-	 * @var string $password_repeat
-	 */
-	public $password_repeat;
-
-	/**
-	 * The user's current password
-	 * This field is required to make any changes to the account
-	 * @var string $currentPassword
-	 */
-	public $currentPassword;
-
-	/**
-	 * The user's display name
-	 * @var string $username
-	 */
-	public $username;
-
-	/**
-	 * The user role
-	 * @var int $role
-	 */
-	public $user_role;
-
-	/**
-	 * The user model
-	 * @var Users $_user
-	 */
-	private $_user = NULL;
-
-	/**
-	 * This form will likely be reused in admin portals, for re-use purposes authentication is not required to change privileged information
-	 * @var boolean $overridePasswordCheck
-	 */
-	private $overridePasswordCheck = false;
-
-
-	private function canOverridePasswordCheck()
-	{
-		var_dump($this->overridePasswordCheck);
-		var_dump(Yii::app()->user->id);
-		var_dump($this->getId());
-		die();
-		if ($this->overridePasswordCheck)
-			return true;
-
-		if (isset(Yii::app()->user) && $this->getId() == Yii::app()->user->id)
-			return true;
-
-		return false;
-	}
-
-	/**
-	 * Overload of the __getter method to retrieve the user's ID
-	 * @var int $id
-	 */
-	public function getId()
-	{
-		return $this->_user->id;
-	}
-
-	/**
-	 * Retrieves the new email address if it is set
-	 * @return mixed
-	 */
-	public function getNewEmail()
-	{
-		$metadata = UserMetadata::model()->findByAttributes(array(
-			'user_id' => $this->_user->id,
-			'key'     => 'newEmailAddress'
-		));
-
-		if ($metadata == NULL)
-			return NULL;
-
-		return $metadata->value;
-	}
-
-	/**
-	 * Sets the new email address
-	 * @return boolean
-	 */
-	public function setNewEmail()
-	{
-		$metadata = UserMetadata::model()->findByAttributes(array(
-			'user_id' => $this->_user->id,
-			'key'     => 'newEmailAddress'
-		));
-
-		if ($metadata == NULL)
-		{
-			$metadata = new UserMetadata;
-			$metadata->attributes = array(
-				'user_id' => $this->_user->id,
-				'key'     => 'newEmailAddress'
-			);
-		}
-
-		$metadata->value = $this->email;
-
-		// Save the record
-		return $metadata->save();
-	}
-
-	/**
-	 * Retrieves the new email address if it is set
-	 * @return mixed
-	 */
-	public function getNewEmailChangeKey()
-	{
-		$metadata = UserMetadata::model()->findByAttributes(array(
-			'user_id' => $this->_user->id,
-			'key'     => 'newEmailAddressChangeKey'
-		));
-
-		if ($metadata == NULL)
-			return NULL;
-
-		return $metadata->value;
-	}
-
-	/**
-	 * Generates a new change key
-	 * @return boolean
-	 */
-	public function setNewEmailChangeKey()
-	{
-		$metadata = UserMetadata::model()->findByAttributes(array(
-			'user_id' => $this->_user->id,
-			'key'     => 'newEmailAddressChangeKey'
-		));
-
-		if ($metadata == NULL)
-		{
-			$metadata = new UserMetadata;
-			$metadata->attributes = array(
-				'user_id' => $this->_user->id,
-				'key'     => 'newEmailAddressChangeKey'
-			);
-		}
-
-		// Generate a new key
-		$metadata->value = Cii::generateSafeHash();
-
-		// Save the record
-		if ($metadata->save())
-			return $metadata->value;
+    /**
+     * The user's email address
+     * @var string $email
+     */
+    public $email;
+
+    /**
+     * The user's NEW password
+     * @var string $password
+     */
+    public $password;
+
+    /**
+     * The repeated password if a NEW password is applied
+     * @var string $password_repeat
+     */
+    public $password_repeat;
+
+    /**
+     * The user's current password
+     * This field is required to make any changes to the account
+     * @var string $currentPassword
+     */
+    public $currentPassword;
+
+    /**
+     * The user's display name
+     * @var string $username
+     */
+    public $username;
+
+    /**
+     * The user role
+     * @var int $role
+     */
+    public $user_role;
+
+    /**
+     * The user model
+     * @var Users $_user
+     */
+    private $_user = NULL;
+
+    /**
+     * This form will likely be reused in admin portals, for re-use purposes authentication is not required to change privileged information
+     * @var boolean $overridePasswordCheck
+     */
+    private $overridePasswordCheck = false;
+
+
+    private function canOverridePasswordCheck()
+    {
+        var_dump($this->overridePasswordCheck);
+        var_dump(Yii::app()->user->id);
+        var_dump($this->getId());
+        die();
+        if ($this->overridePasswordCheck)
+            return true;
+
+        if (isset(Yii::app()->user) && $this->getId() == Yii::app()->user->id)
+            return true;
+
+        return false;
+    }
+
+    /**
+     * Overload of the __getter method to retrieve the user's ID
+     * @var int $id
+     */
+    public function getId()
+    {
+        return $this->_user->id;
+    }
+
+    /**
+     * Retrieves the new email address if it is set
+     * @return mixed
+     */
+    public function getNewEmail()
+    {
+        $metadata = UserMetadata::model()->findByAttributes(array(
+            'user_id' => $this->_user->id,
+            'key'     => 'newEmailAddress'
+        ));
+
+        if ($metadata == NULL)
+            return NULL;
+
+        return $metadata->value;
+    }
+
+    /**
+     * Sets the new email address
+     * @return boolean
+     */
+    public function setNewEmail()
+    {
+        $metadata = UserMetadata::model()->findByAttributes(array(
+            'user_id' => $this->_user->id,
+            'key'     => 'newEmailAddress'
+        ));
+
+        if ($metadata == NULL)
+        {
+            $metadata = new UserMetadata;
+            $metadata->attributes = array(
+                'user_id' => $this->_user->id,
+                'key'     => 'newEmailAddress'
+            );
+        }
+
+        $metadata->value = $this->email;
+
+        // Save the record
+        return $metadata->save();
+    }
+
+    /**
+     * Retrieves the new email address if it is set
+     * @return mixed
+     */
+    public function getNewEmailChangeKey()
+    {
+        $metadata = UserMetadata::model()->findByAttributes(array(
+            'user_id' => $this->_user->id,
+            'key'     => 'newEmailAddressChangeKey'
+        ));
+
+        if ($metadata == NULL)
+            return NULL;
+
+        return $metadata->value;
+    }
+
+    /**
+     * Generates a new change key
+     * @return boolean
+     */
+    public function setNewEmailChangeKey()
+    {
+        $metadata = UserMetadata::model()->findByAttributes(array(
+            'user_id' => $this->_user->id,
+            'key'     => 'newEmailAddressChangeKey'
+        ));
+
+        if ($metadata == NULL)
+        {
+            $metadata = new UserMetadata;
+            $metadata->attributes = array(
+                'user_id' => $this->_user->id,
+                'key'     => 'newEmailAddressChangeKey'
+            );
+        }
+
+        // Generate a new key
+        $metadata->value = Cii::generateSafeHash();
+
+        // Save the record
+        if ($metadata->save())
+            return $metadata->value;
 	
-		throw new CHttpException(500, Yii::t('ciims.ProfileForm', 'Unable to save change key'));
-	}
-
-	/**
-	 * Validation rules
-	 * @return array
-	 */
-	public function rules()
-	{
-		return array(
-			array('email, username', 'required'),
-			array('username', 'length', 'max' => 255),
-			array('currentPassword', 'validateUserPassword'),
-			array('password', 'compare'),
-			array('password', 'length', 'min' => 8),
-			array('user_role', 'numerical'),
-			array('user_role', 'validateUserRole')
-		);
-	}
-
-	/**
-	 * Retrieves the attributes labels from the Users model and returns them to reduce code redundancy
-	 * @return array
-	 */
-	public function attributeLabels()
-	{
-		return CMap::mergeArray(Users::model()->attributeLabels(), array(
-			'currentPassword' => Yii::t('ciims.models.ProfileForm', 'Your current password'),
-			'password_repeat' => Yii::t('ciims.models.ProfileForm', 'Your New Password (again)')
-		));
-	}
-
-	/**
-	 * Validates the role
-	 * @param array $attributes
-	 * @param array $params
-	 * return array
-	 */
-	public function validateUserRole($attributes, $params)
-	{
-		if ($this->canOverridePasswordCheck())
-			return true;
-
-		$this->addError('user_role', Yii::t('ciims.models.ProfileForm', 'You do not have permission to modify this attribute'));
-		return false;
-	}
-
-	/**
-	 * Ensures that the password entered matches the one provided during registration
-	 * @param array $attributes
-	 * @param array $params
-	 * return array
-	 */
-	public function validateUserPassword($attributes, $params)
-	{
-		// Apply the override if it was set
-		if ($this->canOverridePasswordCheck())
-		{
-			$this->password_repeat = $this->password;
-			return true;
-		}
-
-		$result = password_verify($this->password, $this->_user->password);
+        throw new CHttpException(500, Yii::t('ciims.ProfileForm', 'Unable to save change key'));
+    }
+
+    /**
+     * Validation rules
+     * @return array
+     */
+    public function rules()
+    {
+        return array(
+            array('email, username', 'required'),
+            array('username', 'length', 'max' => 255),
+            array('currentPassword', 'validateUserPassword'),
+            array('password', 'compare'),
+            array('password', 'length', 'min' => 8),
+            array('user_role', 'numerical'),
+            array('user_role', 'validateUserRole')
+        );
+    }
+
+    /**
+     * Retrieves the attributes labels from the Users model and returns them to reduce code redundancy
+     * @return array
+     */
+    public function attributeLabels()
+    {
+        return CMap::mergeArray(Users::model()->attributeLabels(), array(
+            'currentPassword' => Yii::t('ciims.models.ProfileForm', 'Your current password'),
+            'password_repeat' => Yii::t('ciims.models.ProfileForm', 'Your New Password (again)')
+        ));
+    }
+
+    /**
+     * Validates the role
+     * @param array $attributes
+     * @param array $params
+     * return array
+     */
+    public function validateUserRole($attributes, $params)
+    {
+        if ($this->canOverridePasswordCheck())
+            return true;
+
+        $this->addError('user_role', Yii::t('ciims.models.ProfileForm', 'You do not have permission to modify this attribute'));
+        return false;
+    }
+
+    /**
+     * Ensures that the password entered matches the one provided during registration
+     * @param array $attributes
+     * @param array $params
+     * return array
+     */
+    public function validateUserPassword($attributes, $params)
+    {
+        // Apply the override if it was set
+        if ($this->canOverridePasswordCheck())
+        {
+            $this->password_repeat = $this->password;
+            return true;
+        }
+
+        $result = password_verify($this->password, $this->_user->password);
 		
-		if ($result == false)
-		{
-			$this->addError('currentPassword', Yii::t('ciims.models.ProfileForm', 'The password you entered is invalid.'));
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Internally loads the user's information before attempting to validate it
-	 * @param int  $id         The user's ID
-	 * @param bool $override   This form may be reused
-	 * @return ProfileForm
-	 */
-	public function load($id, $override = false)
-	{
-		$this->overridePasswordCheck = $override;
-
-		// Load the user
-		$this->_user = Users::model()->findByPk($id);
-
-		if ($this->_user == NULL)
-			throw new CHttpException(400, Yii::t('ciims.models.ProfileForm', 'The request user\'s profile could not be loaded'));
-
-		// Reload the attribute labels
-		$this->attributes = array(
-			'email'         => $this->_user->email,
-			'username'      => $this->_user->username,
-			'user_role'     => $this->_user->role->id
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Updates the user's profile information
-	 * @return boolean
-	 */
-	public function save()
-	{
-		if (!$this->validate(NULL, false))
-			return false;
-
-		// Change the email address, if necessary
-		$this->changeEmail();
-
-		$this->_user->attributes = array(
-			'password'      => $this->password,
-			'username'      => $this->username,
-			'user_role'     => $this->user_role
-		);
-
-		if ($this->_user->save())
-			return true;
-
-		return false;
-	}
-
-	/**
-	 * Changes the user's email address if necessary
-	 * @return boolean
-	 */
-	private function changeEmail()
-	{
-		if ($this->email != $this->_user->email)
-		{
-			$this->setNewemail();
-			$this->setNewEmailChangeKey();
-			$this->sendVerificationEmail();
-		}
-
-		return true;
-	}
-
-	/**
-	 * Sends the verification email to the user. This is broken to it's own method to allow for the resending email to be resent
-	 * @return boolean
-	 */
-	public function sendVerificationEmail()
-	{
-		$emailSettings = new EmailSettings;
+        if ($result == false)
+        {
+            $this->addError('currentPassword', Yii::t('ciims.models.ProfileForm', 'The password you entered is invalid.'));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Internally loads the user's information before attempting to validate it
+     * @param int  $id         The user's ID
+     * @param bool $override   This form may be reused
+     * @return ProfileForm
+     */
+    public function load($id, $override = false)
+    {
+        $this->overridePasswordCheck = $override;
+
+        // Load the user
+        $this->_user = Users::model()->findByPk($id);
+
+        if ($this->_user == NULL)
+            throw new CHttpException(400, Yii::t('ciims.models.ProfileForm', 'The request user\'s profile could not be loaded'));
+
+        // Reload the attribute labels
+        $this->attributes = array(
+            'email'         => $this->_user->email,
+            'username'      => $this->_user->username,
+            'user_role'     => $this->_user->role->id
+        );
+
+        return $this;
+    }
+
+    /**
+     * Updates the user's profile information
+     * @return boolean
+     */
+    public function save()
+    {
+        if (!$this->validate(NULL, false))
+            return false;
+
+        // Change the email address, if necessary
+        $this->changeEmail();
+
+        $this->_user->attributes = array(
+            'password'      => $this->password,
+            'username'      => $this->username,
+            'user_role'     => $this->user_role
+        );
+
+        if ($this->_user->save())
+            return true;
+
+        return false;
+    }
+
+    /**
+     * Changes the user's email address if necessary
+     * @return boolean
+     */
+    private function changeEmail()
+    {
+        if ($this->email != $this->_user->email)
+        {
+            $this->setNewemail();
+            $this->setNewEmailChangeKey();
+            $this->sendVerificationEmail();
+        }
+
+        return true;
+    }
+
+    /**
+     * Sends the verification email to the user. This is broken to it's own method to allow for the resending email to be resent
+     * @return boolean
+     */
+    public function sendVerificationEmail()
+    {
+        $emailSettings = new EmailSettings;
         return $emailSettings->send(
-			$this->_user,
-			Yii::t('ciims.models.Users', 'CiiMS Email Change Notification'),
-			'base.themes.' . Cii::getConfig('theme', 'default') .'.views.email.email-change',
-			array(
-				'key' => $this->setNewEmailChangeKey(),
-				'user' => $this->_user
-			)
-		);
-	}
+            $this->_user,
+            Yii::t('ciims.models.Users', 'CiiMS Email Change Notification'),
+            'base.themes.' . Cii::getConfig('theme', 'default') .'.views.email.email-change',
+            array(
+                'key' => $this->setNewEmailChangeKey(),
+                'user' => $this->_user
+            )
+        );
+    }
 }

Spacing +46 added lines, -46 removed lines

@@ -52,16 +52,16 @@ 
 	private $overridePasswordCheck = false;
 
 
-	private function canOverridePasswordCheck()
+	private function canOverridePasswordCheck ()
 	{
-		var_dump($this->overridePasswordCheck);
-		var_dump(Yii::app()->user->id);
-		var_dump($this->getId());
+		var_dump ($this->overridePasswordCheck);
+		var_dump (Yii::app ()->user->id);
+		var_dump ($this->getId ());
 		die();
 		if ($this->overridePasswordCheck)
 			return true;
 
-		if (isset(Yii::app()->user) && $this->getId() == Yii::app()->user->id)
+		if (isset(Yii::app ()->user) && $this->getId () == Yii::app ()->user->id)
 			return true;
 
 		return false;
@@ -71,7 +71,7 @@ 
 	 * Overload of the __getter method to retrieve the user's ID
 	 * @var int $id
 	 */
-	public function getId()
+	public function getId ()
 	{
 		return $this->_user->id;
 	}
@@ -80,9 +80,9 @@ 
 	 * Retrieves the new email address if it is set
 	 * @return mixed
 	 */
-	public function getNewEmail()
+	public function getNewEmail ()
 	{
-		$metadata = UserMetadata::model()->findByAttributes(array(
+		$metadata = UserMetadata::model ()->findByAttributes (array(
 			'user_id' => $this->_user->id,
 			'key'     => 'newEmailAddress'
 		));
@@ -97,9 +97,9 @@ 
 	 * Sets the new email address
 	 * @return boolean
 	 */
-	public function setNewEmail()
+	public function setNewEmail ()
 	{
-		$metadata = UserMetadata::model()->findByAttributes(array(
+		$metadata = UserMetadata::model ()->findByAttributes (array(
 			'user_id' => $this->_user->id,
 			'key'     => 'newEmailAddress'
 		));
@@ -116,16 +116,16 @@ 
 		$metadata->value = $this->email;
 
 		// Save the record
-		return $metadata->save();
+		return $metadata->save ();
 	}
 
 	/**
 	 * Retrieves the new email address if it is set
 	 * @return mixed
 	 */
-	public function getNewEmailChangeKey()
+	public function getNewEmailChangeKey ()
 	{
-		$metadata = UserMetadata::model()->findByAttributes(array(
+		$metadata = UserMetadata::model ()->findByAttributes (array(
 			'user_id' => $this->_user->id,
 			'key'     => 'newEmailAddressChangeKey'
 		));
@@ -140,9 +140,9 @@ 
 	 * Generates a new change key
 	 * @return boolean
 	 */
-	public function setNewEmailChangeKey()
+	public function setNewEmailChangeKey ()
 	{
-		$metadata = UserMetadata::model()->findByAttributes(array(
+		$metadata = UserMetadata::model ()->findByAttributes (array(
 			'user_id' => $this->_user->id,
 			'key'     => 'newEmailAddressChangeKey'
 		));
@@ -157,20 +157,20 @@ 
 		}
 
 		// Generate a new key
-		$metadata->value = Cii::generateSafeHash();
+		$metadata->value = Cii::generateSafeHash ();
 
 		// Save the record
-		if ($metadata->save())
+		if ($metadata->save ())
 			return $metadata->value;
 	
-		throw new CHttpException(500, Yii::t('ciims.ProfileForm', 'Unable to save change key'));
+		throw new CHttpException (500, Yii::t ('ciims.ProfileForm', 'Unable to save change key'));
 	}
 
 	/**
 	 * Validation rules
 	 * @return array
 	 */
-	public function rules()
+	public function rules ()
 	{
 		return array(
 			array('email, username', 'required'),
@@ -187,11 +187,11 @@ 
 	 * Retrieves the attributes labels from the Users model and returns them to reduce code redundancy
 	 * @return array
 	 */
-	public function attributeLabels()
+	public function attributeLabels ()
 	{
-		return CMap::mergeArray(Users::model()->attributeLabels(), array(
-			'currentPassword' => Yii::t('ciims.models.ProfileForm', 'Your current password'),
-			'password_repeat' => Yii::t('ciims.models.ProfileForm', 'Your New Password (again)')
+		return CMap::mergeArray (Users::model ()->attributeLabels (), array(
+			'currentPassword' => Yii::t ('ciims.models.ProfileForm', 'Your current password'),
+			'password_repeat' => Yii::t ('ciims.models.ProfileForm', 'Your New Password (again)')
 		));
 	}
 
@@ -201,12 +201,12 @@ 
 	 * @param array $params
 	 * return array
 	 */
-	public function validateUserRole($attributes, $params)
+	public function validateUserRole ($attributes, $params)
 	{
-		if ($this->canOverridePasswordCheck())
+		if ($this->canOverridePasswordCheck ())
 			return true;
 
-		$this->addError('user_role', Yii::t('ciims.models.ProfileForm', 'You do not have permission to modify this attribute'));
+		$this->addError ('user_role', Yii::t ('ciims.models.ProfileForm', 'You do not have permission to modify this attribute'));
 		return false;
 	}
 
@@ -216,20 +216,20 @@ 
 	 * @param array $params
 	 * return array
 	 */
-	public function validateUserPassword($attributes, $params)
+	public function validateUserPassword ($attributes, $params)
 	{
 		// Apply the override if it was set
-		if ($this->canOverridePasswordCheck())
+		if ($this->canOverridePasswordCheck ())
 		{
 			$this->password_repeat = $this->password;
 			return true;
 		}
 
-		$result = password_verify($this->password, $this->_user->password);
+		$result = password_verify ($this->password, $this->_user->password);
 		
 		if ($result == false)
 		{
-			$this->addError('currentPassword', Yii::t('ciims.models.ProfileForm', 'The password you entered is invalid.'));
+			$this->addError ('currentPassword', Yii::t ('ciims.models.ProfileForm', 'The password you entered is invalid.'));
 			return false;
 		}
 
@@ -242,15 +242,15 @@ 
 	 * @param bool $override   This form may be reused
 	 * @return ProfileForm
 	 */
-	public function load($id, $override = false)
+	public function load ($id, $override = false)
 	{
 		$this->overridePasswordCheck = $override;
 
 		// Load the user
-		$this->_user = Users::model()->findByPk($id);
+		$this->_user = Users::model ()->findByPk ($id);
 
 		if ($this->_user == NULL)
-			throw new CHttpException(400, Yii::t('ciims.models.ProfileForm', 'The request user\'s profile could not be loaded'));
+			throw new CHttpException (400, Yii::t ('ciims.models.ProfileForm', 'The request user\'s profile could not be loaded'));
 
 		// Reload the attribute labels
 		$this->attributes = array(
@@ -266,13 +266,13 @@ 
 	 * Updates the user's profile information
 	 * @return boolean
 	 */
-	public function save()
+	public function save ()
 	{
-		if (!$this->validate(NULL, false))
+		if (!$this->validate (NULL, false))
 			return false;
 
 		// Change the email address, if necessary
-		$this->changeEmail();
+		$this->changeEmail ();
 
 		$this->_user->attributes = array(
 			'password'      => $this->password,
@@ -280,7 +280,7 @@ 
 			'user_role'     => $this->user_role
 		);
 
-		if ($this->_user->save())
+		if ($this->_user->save ())
 			return true;
 
 		return false;
@@ -290,13 +290,13 @@ 
 	 * Changes the user's email address if necessary
 	 * @return boolean
 	 */
-	private function changeEmail()
+	private function changeEmail ()
 	{
 		if ($this->email != $this->_user->email)
 		{
-			$this->setNewemail();
-			$this->setNewEmailChangeKey();
-			$this->sendVerificationEmail();
+			$this->setNewemail ();
+			$this->setNewEmailChangeKey ();
+			$this->sendVerificationEmail ();
 		}
 
 		return true;
@@ -306,15 +306,15 @@ 
 	 * Sends the verification email to the user. This is broken to it's own method to allow for the resending email to be resent
 	 * @return boolean
 	 */
-	public function sendVerificationEmail()
+	public function sendVerificationEmail ()
 	{
 		$emailSettings = new EmailSettings;
-        return $emailSettings->send(
+        return $emailSettings->send (
 			$this->_user,
-			Yii::t('ciims.models.Users', 'CiiMS Email Change Notification'),
-			'base.themes.' . Cii::getConfig('theme', 'default') .'.views.email.email-change',
+			Yii::t ('ciims.models.Users', 'CiiMS Email Change Notification'),
+			'base.themes.' . Cii::getConfig ('theme', 'default') . '.views.email.email-change',
 			array(
-				'key' => $this->setNewEmailChangeKey(),
+				'key' => $this->setNewEmailChangeKey (),
 				'user' => $this->_user
 			)
 		);

protected/models/forms/RegisterForm.php

Indentation +140 added lines, -140 removed lines

@@ -2,148 +2,148 @@
 
 class RegisterForm extends CFormModel
 {
-	/**
-	 * The submitted email address
-	 * @var string|email
-	 */
-	public $email;
-
-	/**
-	 * The submitted password
-	 * @var string
-	 */
-	public $password;
-
-	/**
-	 * The password verification
-	 * @var string
-	 */
-	public $password_repeat;
-
-	/**
-	 * The user name as we will show it on the site
-	 * @var string
-	 */
-	public $username;
-
-	/**
-	 * The user model
-	 * @param Users $_user
-	 */
-	protected $_user;
-
-	/**
-	 * Declares the validation rules.
-	 * The rules state that username and password are required,
-	 * and password needs to be authenticated.
-	 */
-	public function rules()
-	{
-		return array(
-			array('email, password, password_repeat, username', 'required'),
-			array('password', 'compare'),
-			array('password', 'length', 'min'=>8),
-			array('email', 'email'),
-			array('email', 'isEmailUnique'),
-			array('email', 'isUsernameUnique')
-		);
-	}
-
-	/**
-	 * Determines if an email is already taken or not
-	 * @param array $attributes
-	 * @param array $params
-	 * @return boolean
-	 */
-	public function isEmailUnique($attributes, $params)
-	{
-		$this->_user = Users::model()->findByAttributes(array('email' => $this->email));
-
-		if ($this->_user != NULL)
-		{
-			$this->addError('email', Yii::t('ciims.models.RegisterForm', 'That email address is already in use'));
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Determines if an username is already taken or not
-	 * @param array $attributes
-	 * @param array $params
-	 * @return boolean
-	 */
-	public function isUsernameUnique($attributes, $params)
-	{
-		$this->_user = Users::model()->findByAttributes(array('username' => $this->username));
-
-		if ($this->_user != NULL)
-		{
-			$this->addError('username', Yii::t('ciims.models.RegisterForm', 'That username address is already in use'));
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Model attribute labels
-	 * @return array
-	 */
-	public function attributeLabels()
-	{
-		return array(
-			'email'           => Yii::t('ciims.models.RegisterForm', 'Your Email Address'),
-			'password'        => Yii::t('ciims.models.RegisterForm', 'Your Password'),
-			'password_repeat' => Yii::t('ciims.models.RegisterForm', 'Your Password (again)'),
-			'username'        => Yii::t('ciims.models.RegisterForm', 'Your Username on the Site')
-		);
-	}
-
-	/**
-	 * Creates a new user, and sends the appropriate messaging out
-	 * @return boolean
-	 */
-	public function save($sendEmail = true)
-	{
-		if (!$this->validate())
-			return false;
-
-		$this->_user = new Users;
-
-		// Set the model attributes
-		$this->_user->attributes = array(
-			'email'       => $this->email,
-			'password'    => $this->password,
-			'username'    => $this->username,
-			'user_role'   => 1,
-			'status'      => $sendEmail ? Users::PENDING_INVITATION : Users::ACTIVE
-		);
-
-		// If we saved the user model, return true
-		if($this->_user->save())
-		{
-			// This class my be extended by other modules, in which case we don't need to send an activation form if we don't want need it to.
-			if ($sendEmail)
-			{
-				$meta = new UserMetadata;
-				$meta->attributes = array(
-					'user_id' => $this->_user->id,
-					'key'     => 'activationKey',
-					'value'   => Cii::generateSafeHash()
-				);
+    /**
+     * The submitted email address
+     * @var string|email
+     */
+    public $email;
+
+    /**
+     * The submitted password
+     * @var string
+     */
+    public $password;
+
+    /**
+     * The password verification
+     * @var string
+     */
+    public $password_repeat;
+
+    /**
+     * The user name as we will show it on the site
+     * @var string
+     */
+    public $username;
+
+    /**
+     * The user model
+     * @param Users $_user
+     */
+    protected $_user;
+
+    /**
+     * Declares the validation rules.
+     * The rules state that username and password are required,
+     * and password needs to be authenticated.
+     */
+    public function rules()
+    {
+        return array(
+            array('email, password, password_repeat, username', 'required'),
+            array('password', 'compare'),
+            array('password', 'length', 'min'=>8),
+            array('email', 'email'),
+            array('email', 'isEmailUnique'),
+            array('email', 'isUsernameUnique')
+        );
+    }
+
+    /**
+     * Determines if an email is already taken or not
+     * @param array $attributes
+     * @param array $params
+     * @return boolean
+     */
+    public function isEmailUnique($attributes, $params)
+    {
+        $this->_user = Users::model()->findByAttributes(array('email' => $this->email));
+
+        if ($this->_user != NULL)
+        {
+            $this->addError('email', Yii::t('ciims.models.RegisterForm', 'That email address is already in use'));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Determines if an username is already taken or not
+     * @param array $attributes
+     * @param array $params
+     * @return boolean
+     */
+    public function isUsernameUnique($attributes, $params)
+    {
+        $this->_user = Users::model()->findByAttributes(array('username' => $this->username));
+
+        if ($this->_user != NULL)
+        {
+            $this->addError('username', Yii::t('ciims.models.RegisterForm', 'That username address is already in use'));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Model attribute labels
+     * @return array
+     */
+    public function attributeLabels()
+    {
+        return array(
+            'email'           => Yii::t('ciims.models.RegisterForm', 'Your Email Address'),
+            'password'        => Yii::t('ciims.models.RegisterForm', 'Your Password'),
+            'password_repeat' => Yii::t('ciims.models.RegisterForm', 'Your Password (again)'),
+            'username'        => Yii::t('ciims.models.RegisterForm', 'Your Username on the Site')
+        );
+    }
+
+    /**
+     * Creates a new user, and sends the appropriate messaging out
+     * @return boolean
+     */
+    public function save($sendEmail = true)
+    {
+        if (!$this->validate())
+            return false;
+
+        $this->_user = new Users;
+
+        // Set the model attributes
+        $this->_user->attributes = array(
+            'email'       => $this->email,
+            'password'    => $this->password,
+            'username'    => $this->username,
+            'user_role'   => 1,
+            'status'      => $sendEmail ? Users::PENDING_INVITATION : Users::ACTIVE
+        );
+
+        // If we saved the user model, return true
+        if($this->_user->save())
+        {
+            // This class my be extended by other modules, in which case we don't need to send an activation form if we don't want need it to.
+            if ($sendEmail)
+            {
+                $meta = new UserMetadata;
+                $meta->attributes = array(
+                    'user_id' => $this->_user->id,
+                    'key'     => 'activationKey',
+                    'value'   => Cii::generateSafeHash()
+                );
 				
-				$meta->save();
+                $meta->save();
 
-				// Send the registration email
-				$emailSettings = new EmailSettings;
-        		$emailSettings->send($this->_user, Yii::t('ciims.email','Activate Your Account'), 'base.themes.' . Cii::getConfig('theme', 'default') .'.views.email.register', array('user' => $this->_user, 'hash' => $meta->value), true, true);
-			}
+                // Send the registration email
+                $emailSettings = new EmailSettings;
+                $emailSettings->send($this->_user, Yii::t('ciims.email','Activate Your Account'), 'base.themes.' . Cii::getConfig('theme', 'default') .'.views.email.register', array('user' => $this->_user, 'hash' => $meta->value), true, true);
+            }
 
-			return true;
-		}
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 }

Spacing +18 added lines, -18 removed lines

@@ -37,7 +37,7 @@ 
 	 * The rules state that username and password are required,
 	 * and password needs to be authenticated.
 	 */
-	public function rules()
+	public function rules ()
 	{
 		return array(
 			array('email, password, password_repeat, username', 'required'),
@@ -55,13 +55,13 @@ 
 	 * @param array $params
 	 * @return boolean
 	 */
-	public function isEmailUnique($attributes, $params)
+	public function isEmailUnique ($attributes, $params)
 	{
-		$this->_user = Users::model()->findByAttributes(array('email' => $this->email));
+		$this->_user = Users::model ()->findByAttributes (array('email' => $this->email));
 
 		if ($this->_user != NULL)
 		{
-			$this->addError('email', Yii::t('ciims.models.RegisterForm', 'That email address is already in use'));
+			$this->addError ('email', Yii::t ('ciims.models.RegisterForm', 'That email address is already in use'));
 			return false;
 		}
 
@@ -74,13 +74,13 @@ 
 	 * @param array $params
 	 * @return boolean
 	 */
-	public function isUsernameUnique($attributes, $params)
+	public function isUsernameUnique ($attributes, $params)
 	{
-		$this->_user = Users::model()->findByAttributes(array('username' => $this->username));
+		$this->_user = Users::model ()->findByAttributes (array('username' => $this->username));
 
 		if ($this->_user != NULL)
 		{
-			$this->addError('username', Yii::t('ciims.models.RegisterForm', 'That username address is already in use'));
+			$this->addError ('username', Yii::t ('ciims.models.RegisterForm', 'That username address is already in use'));
 			return false;
 		}
 
@@ -91,13 +91,13 @@ 
 	 * Model attribute labels
 	 * @return array
 	 */
-	public function attributeLabels()
+	public function attributeLabels ()
 	{
 		return array(
-			'email'           => Yii::t('ciims.models.RegisterForm', 'Your Email Address'),
-			'password'        => Yii::t('ciims.models.RegisterForm', 'Your Password'),
-			'password_repeat' => Yii::t('ciims.models.RegisterForm', 'Your Password (again)'),
-			'username'        => Yii::t('ciims.models.RegisterForm', 'Your Username on the Site')
+			'email'           => Yii::t ('ciims.models.RegisterForm', 'Your Email Address'),
+			'password'        => Yii::t ('ciims.models.RegisterForm', 'Your Password'),
+			'password_repeat' => Yii::t ('ciims.models.RegisterForm', 'Your Password (again)'),
+			'username'        => Yii::t ('ciims.models.RegisterForm', 'Your Username on the Site')
 		);
 	}
 
@@ -105,9 +105,9 @@ 
 	 * Creates a new user, and sends the appropriate messaging out
 	 * @return boolean
 	 */
-	public function save($sendEmail = true)
+	public function save ($sendEmail = true)
 	{
-		if (!$this->validate())
+		if (!$this->validate ())
 			return false;
 
 		$this->_user = new Users;
@@ -122,7 +122,7 @@ 
 		);
 
 		// If we saved the user model, return true
-		if($this->_user->save())
+		if ($this->_user->save ())
 		{
 			// This class my be extended by other modules, in which case we don't need to send an activation form if we don't want need it to.
 			if ($sendEmail)
@@ -131,14 +131,14 @@ 
 				$meta->attributes = array(
 					'user_id' => $this->_user->id,
 					'key'     => 'activationKey',
-					'value'   => Cii::generateSafeHash()
+					'value'   => Cii::generateSafeHash ()
 				);
 				
-				$meta->save();
+				$meta->save ();
 
 				// Send the registration email
 				$emailSettings = new EmailSettings;
-        		$emailSettings->send($this->_user, Yii::t('ciims.email','Activate Your Account'), 'base.themes.' . Cii::getConfig('theme', 'default') .'.views.email.register', array('user' => $this->_user, 'hash' => $meta->value), true, true);
+        		$emailSettings->send ($this->_user, Yii::t ('ciims.email', 'Activate Your Account'), 'base.themes.' . Cii::getConfig ('theme', 'default') . '.views.email.register', array('user' => $this->_user, 'hash' => $meta->value), true, true);
 			}
 
 			return true;

Braces +3 added lines, -2 removed lines

@@ -107,8 +107,9 @@
 	 */
 	public function save($sendEmail = true)
 	{
-		if (!$this->validate())
-			return false;
+		if (!$this->validate()) {
+					return false;
+		}
 
 		$this->_user = new Users;
 

protected/models/settings/AnalyticsSettings.php

Indentation +48 added lines, -48 removed lines

@@ -4,62 +4,62 @@
 // Note that you'll need to remove any "undefined" variables in here via stringReplace

 class AnalyticsSettings extends CiiSettingsModel

 {

-	protected $analyticsjs_Google__Analytics_enabled = false;

-	protected $analyticsjs_Google__Analytics_domain = NULL;

-	protected $analyticsjs_Google__Analytics_trackingId = NULL;

-	protected $analyticsjs_Google__Analytics_universalClient = false;

-	protected $analyticsjs_Google__Analytics_doubleClick = false;

-	protected $analyticsjs_Google__Analytics_enhancedLinkAttribution = false;

+    protected $analyticsjs_Google__Analytics_enabled = false;

+    protected $analyticsjs_Google__Analytics_domain = NULL;

+    protected $analyticsjs_Google__Analytics_trackingId = NULL;

+    protected $analyticsjs_Google__Analytics_universalClient = false;

+    protected $analyticsjs_Google__Analytics_doubleClick = false;

+    protected $analyticsjs_Google__Analytics_enhancedLinkAttribution = false;

 

-	protected $analyticsjs_Pingdom_enabled = false;

-	protected $analyticsjs_Pingdom_id = NULL;

+    protected $analyticsjs_Pingdom_enabled = false;

+    protected $analyticsjs_Pingdom_id = NULL;

 

-	protected $analyticsjs_Piwik_enabled = false;

-	protected $analyticsjs_Piwik_url = NULL;

-	protected $analyticsjs_Piwik_siteId = NULL;

+    protected $analyticsjs_Piwik_enabled = false;

+    protected $analyticsjs_Piwik_url = NULL;

+    protected $analyticsjs_Piwik_siteId = NULL;

 

-	public $form = 'application.modules.dashboard.views.analytics.form';

+    public $form = 'application.modules.dashboard.views.analytics.form';

 

-	public function groups()

-	{

-		return array(

-			'Google Analytics' => array('analyticsjs_Google__Analytics_enabled','analyticsjs_Google__Analytics_domain', 'analyticsjs_Google__Analytics_trackingId', 'analyticsjs_Google__Analytics_universalClient', 'analyticsjs_Google__Analytics_doubleClick', 'analyticsjs_Google__Analytics_enhancedLinkAttribution'),

-			'Pingdom' => array('analyticsjs_Pingdom_enabled', 'analyticsjs_Pingdom_id'),

-			'Piwik' => array('analyticsjs_Piwik_enabled', 'analyticsjs_Piwik_url', 'analyticsjs_Piwik_siteId'),

-		);

-	}

+    public function groups()

+    {

+        return array(

+            'Google Analytics' => array('analyticsjs_Google__Analytics_enabled','analyticsjs_Google__Analytics_domain', 'analyticsjs_Google__Analytics_trackingId', 'analyticsjs_Google__Analytics_universalClient', 'analyticsjs_Google__Analytics_doubleClick', 'analyticsjs_Google__Analytics_enhancedLinkAttribution'),

+            'Pingdom' => array('analyticsjs_Pingdom_enabled', 'analyticsjs_Pingdom_id'),

+            'Piwik' => array('analyticsjs_Piwik_enabled', 'analyticsjs_Piwik_url', 'analyticsjs_Piwik_siteId'),

+        );

+    }

 

-	public function rules()

-	{

-		return array(

-			array('analyticsjs_Google__Analytics_enabled, analyticsjs_Google__Analytics_universalClient, analyticsjs_Google__Analytics_doubleClick, analyticsjs_Google__Analytics_enhancedLinkAttribution, analyticsjs_Pingdom_enabled, analyticsjs_Piwik_enabled', 'boolean')

-		);

-	}

+    public function rules()

+    {

+        return array(

+            array('analyticsjs_Google__Analytics_enabled, analyticsjs_Google__Analytics_universalClient, analyticsjs_Google__Analytics_doubleClick, analyticsjs_Google__Analytics_enhancedLinkAttribution, analyticsjs_Pingdom_enabled, analyticsjs_Piwik_enabled', 'boolean')

+        );

+    }

 

-	public function attributeLabels()

-	{

-		return array(

-			'analyticsjs_Google__Analytics_enabled' => Yii::t('ciims.models.analytics', 'Enabled'),

-			'analyticsjs_Google__Analytics_domain' => Yii::t('ciims.models.analytics', 'Domain'),

-			'analyticsjs_Google__Analytics_trackingId' => Yii::t('ciims.models.analytics', 'UA Tracking ID'),

-			'analyticsjs_Google__Analytics_universalClient' => Yii::t('ciims.models.analytics', 'Use Universal Client?'),

-			'analyticsjs_Google__Analytics_doubleClick' => Yii::t('ciims.models.analytics', 'DoubleClick'),

-			'analyticsjs_Google__Analytics_enhancedLinkAttribution' => Yii::t('ciims.models.analytics', 'Enhanced Link Attribution'),

+    public function attributeLabels()

+    {

+        return array(

+            'analyticsjs_Google__Analytics_enabled' => Yii::t('ciims.models.analytics', 'Enabled'),

+            'analyticsjs_Google__Analytics_domain' => Yii::t('ciims.models.analytics', 'Domain'),

+            'analyticsjs_Google__Analytics_trackingId' => Yii::t('ciims.models.analytics', 'UA Tracking ID'),

+            'analyticsjs_Google__Analytics_universalClient' => Yii::t('ciims.models.analytics', 'Use Universal Client?'),

+            'analyticsjs_Google__Analytics_doubleClick' => Yii::t('ciims.models.analytics', 'DoubleClick'),

+            'analyticsjs_Google__Analytics_enhancedLinkAttribution' => Yii::t('ciims.models.analytics', 'Enhanced Link Attribution'),

 

-			'analyticsjs_Pingdom_enabled' => Yii::t('ciims.models.analytics', 'Enabled'),

-			'analyticsjs_Pingdom_id' => Yii::t('ciims.models.analytics', 'id'),

+            'analyticsjs_Pingdom_enabled' => Yii::t('ciims.models.analytics', 'Enabled'),

+            'analyticsjs_Pingdom_id' => Yii::t('ciims.models.analytics', 'id'),

 

-			'analyticsjs_Piwik_enabled' => Yii::t('ciims.models.analytics', 'Enabled'),

-			'analyticsjs_Piwik_url' => Yii::t('ciims.models.analytics', 'Piwik Host URL'),

-			'analyticsjs_Piwik_siteId' => Yii::t('ciims.models.analytics', 'Site ID'),

-		);

-	}

+            'analyticsjs_Piwik_enabled' => Yii::t('ciims.models.analytics', 'Enabled'),

+            'analyticsjs_Piwik_url' => Yii::t('ciims.models.analytics', 'Piwik Host URL'),

+            'analyticsjs_Piwik_siteId' => Yii::t('ciims.models.analytics', 'Site ID'),

+        );

+    }

 

-	public function afterSave()

-	{

-		Yii::app()->cache->set('analyticsjs_providers', false);

-		Yii::app()->analytics->getProviders();

+    public function afterSave()

+    {

+        Yii::app()->cache->set('analyticsjs_providers', false);

+        Yii::app()->analytics->getProviders();

 

-		return parent::afterSave();

-	}

+        return parent::afterSave();

+    }

 }

Spacing +19 added lines, -19 removed lines

@@ -20,46 +20,46 @@
 

 	public $form = 'application.modules.dashboard.views.analytics.form';

 

-	public function groups()

+	public function groups ()

 	{

 		return array(

-			'Google Analytics' => array('analyticsjs_Google__Analytics_enabled','analyticsjs_Google__Analytics_domain', 'analyticsjs_Google__Analytics_trackingId', 'analyticsjs_Google__Analytics_universalClient', 'analyticsjs_Google__Analytics_doubleClick', 'analyticsjs_Google__Analytics_enhancedLinkAttribution'),

+			'Google Analytics' => array('analyticsjs_Google__Analytics_enabled', 'analyticsjs_Google__Analytics_domain', 'analyticsjs_Google__Analytics_trackingId', 'analyticsjs_Google__Analytics_universalClient', 'analyticsjs_Google__Analytics_doubleClick', 'analyticsjs_Google__Analytics_enhancedLinkAttribution'),

 			'Pingdom' => array('analyticsjs_Pingdom_enabled', 'analyticsjs_Pingdom_id'),

 			'Piwik' => array('analyticsjs_Piwik_enabled', 'analyticsjs_Piwik_url', 'analyticsjs_Piwik_siteId'),

 		);

 	}

 

-	public function rules()

+	public function rules ()

 	{

 		return array(

 			array('analyticsjs_Google__Analytics_enabled, analyticsjs_Google__Analytics_universalClient, analyticsjs_Google__Analytics_doubleClick, analyticsjs_Google__Analytics_enhancedLinkAttribution, analyticsjs_Pingdom_enabled, analyticsjs_Piwik_enabled', 'boolean')

 		);

 	}

 

-	public function attributeLabels()

+	public function attributeLabels ()

 	{

 		return array(

-			'analyticsjs_Google__Analytics_enabled' => Yii::t('ciims.models.analytics', 'Enabled'),

-			'analyticsjs_Google__Analytics_domain' => Yii::t('ciims.models.analytics', 'Domain'),

-			'analyticsjs_Google__Analytics_trackingId' => Yii::t('ciims.models.analytics', 'UA Tracking ID'),

-			'analyticsjs_Google__Analytics_universalClient' => Yii::t('ciims.models.analytics', 'Use Universal Client?'),

-			'analyticsjs_Google__Analytics_doubleClick' => Yii::t('ciims.models.analytics', 'DoubleClick'),

-			'analyticsjs_Google__Analytics_enhancedLinkAttribution' => Yii::t('ciims.models.analytics', 'Enhanced Link Attribution'),

+			'analyticsjs_Google__Analytics_enabled' => Yii::t ('ciims.models.analytics', 'Enabled'),

+			'analyticsjs_Google__Analytics_domain' => Yii::t ('ciims.models.analytics', 'Domain'),

+			'analyticsjs_Google__Analytics_trackingId' => Yii::t ('ciims.models.analytics', 'UA Tracking ID'),

+			'analyticsjs_Google__Analytics_universalClient' => Yii::t ('ciims.models.analytics', 'Use Universal Client?'),

+			'analyticsjs_Google__Analytics_doubleClick' => Yii::t ('ciims.models.analytics', 'DoubleClick'),

+			'analyticsjs_Google__Analytics_enhancedLinkAttribution' => Yii::t ('ciims.models.analytics', 'Enhanced Link Attribution'),

 

-			'analyticsjs_Pingdom_enabled' => Yii::t('ciims.models.analytics', 'Enabled'),

-			'analyticsjs_Pingdom_id' => Yii::t('ciims.models.analytics', 'id'),

+			'analyticsjs_Pingdom_enabled' => Yii::t ('ciims.models.analytics', 'Enabled'),

+			'analyticsjs_Pingdom_id' => Yii::t ('ciims.models.analytics', 'id'),

 

-			'analyticsjs_Piwik_enabled' => Yii::t('ciims.models.analytics', 'Enabled'),

-			'analyticsjs_Piwik_url' => Yii::t('ciims.models.analytics', 'Piwik Host URL'),

-			'analyticsjs_Piwik_siteId' => Yii::t('ciims.models.analytics', 'Site ID'),

+			'analyticsjs_Piwik_enabled' => Yii::t ('ciims.models.analytics', 'Enabled'),

+			'analyticsjs_Piwik_url' => Yii::t ('ciims.models.analytics', 'Piwik Host URL'),

+			'analyticsjs_Piwik_siteId' => Yii::t ('ciims.models.analytics', 'Site ID'),

 		);

 	}

 

-	public function afterSave()

+	public function afterSave ()

 	{

-		Yii::app()->cache->set('analyticsjs_providers', false);

-		Yii::app()->analytics->getProviders();

+		Yii::app ()->cache->set ('analyticsjs_providers', false);

+		Yii::app ()->analytics->getProviders ();

 

-		return parent::afterSave();

+		return parent::afterSave ();

 	}

 }

Braces +10 added lines, -10 removed lines

@@ -2,8 +2,8 @@ 
 

 // See application.modules.dashboard.assets.AnalyticsSettingsBuilder.js for instructions on how to automatically generate this file

 // Note that you'll need to remove any "undefined" variables in here via stringReplace

-class AnalyticsSettings extends CiiSettingsModel

-{

+class AnalyticsSettings extends CiiSettingsModel
+{
 	protected $analyticsjs_Google__Analytics_enabled = false;

 	protected $analyticsjs_Google__Analytics_domain = NULL;

 	protected $analyticsjs_Google__Analytics_trackingId = NULL;

@@ -20,8 +20,8 @@ 
 

 	public $form = 'application.modules.dashboard.views.analytics.form';

 

-	public function groups()

-	{

+	public function groups()
+	{
 		return array(

 			'Google Analytics' => array('analyticsjs_Google__Analytics_enabled','analyticsjs_Google__Analytics_domain', 'analyticsjs_Google__Analytics_trackingId', 'analyticsjs_Google__Analytics_universalClient', 'analyticsjs_Google__Analytics_doubleClick', 'analyticsjs_Google__Analytics_enhancedLinkAttribution'),

 			'Pingdom' => array('analyticsjs_Pingdom_enabled', 'analyticsjs_Pingdom_id'),

@@ -29,15 +29,15 @@ 
 		);

 	}

 

-	public function rules()

-	{

+	public function rules()
+	{
 		return array(

 			array('analyticsjs_Google__Analytics_enabled, analyticsjs_Google__Analytics_universalClient, analyticsjs_Google__Analytics_doubleClick, analyticsjs_Google__Analytics_enhancedLinkAttribution, analyticsjs_Pingdom_enabled, analyticsjs_Piwik_enabled', 'boolean')

 		);

 	}

 

-	public function attributeLabels()

-	{

+	public function attributeLabels()
+	{
 		return array(

 			'analyticsjs_Google__Analytics_enabled' => Yii::t('ciims.models.analytics', 'Enabled'),

 			'analyticsjs_Google__Analytics_domain' => Yii::t('ciims.models.analytics', 'Domain'),

@@ -55,8 +55,8 @@ 
 		);

 	}

 

-	public function afterSave()

-	{

+	public function afterSave()
+	{
 		Yii::app()->cache->set('analyticsjs_providers', false);

 		Yii::app()->analytics->getProviders();

 

protected/models/settings/EmailSettings.php

Spacing +35 added lines, -35 removed lines

@@ -18,7 +18,7 @@ 
 

     protected $useSSL = 0;

 

-    public function rules()

+    public function rules ()

     {

         return array(

             array('notifyEmail', 'email'),

@@ -29,17 +29,17 @@ 
         );

     }

 

-    public function attributeLabels()

+    public function attributeLabels ()

     {

         return array(

-            'SMTPHost'      => Yii::t('ciims.models.email', 'SMTP Hostname'),

-            'SMTPPort'      => Yii::t('ciims.models.email', 'SMTP Port Number'),

-            'SMTPUser'      => Yii::t('ciims.models.email', 'SMTP Username'),

-            'SMTPPass'      => Yii::t('ciims.models.email', 'SMTP Password'),

-            'useTLS'        => Yii::t('ciims.models.email', 'Use TLS Connection'),

-            'useSSL'        => Yii::t('ciims.models.email', 'Use SSL Connection'),

-            'notifyName'    => Yii::t('ciims.models.email', 'System From Name'),

-            'notifyEmail'   => Yii::t('ciims.models.email', 'System Email Address')

+            'SMTPHost'      => Yii::t ('ciims.models.email', 'SMTP Hostname'),

+            'SMTPPort'      => Yii::t ('ciims.models.email', 'SMTP Port Number'),

+            'SMTPUser'      => Yii::t ('ciims.models.email', 'SMTP Username'),

+            'SMTPPass'      => Yii::t ('ciims.models.email', 'SMTP Password'),

+            'useTLS'        => Yii::t ('ciims.models.email', 'Use TLS Connection'),

+            'useSSL'        => Yii::t ('ciims.models.email', 'Use SSL Connection'),

+            'notifyName'    => Yii::t ('ciims.models.email', 'System From Name'),

+            'notifyEmail'   => Yii::t ('ciims.models.email', 'System Email Address')

         );

     }

 

@@ -58,13 +58,13 @@ 
      * @param  boolean $processOutput Whether the output should be processed. The default is TRUE since this output will be passed to MsgHTML

      * @return boolean                Whether or not the email sent sucessfully

      */

-    public function send($user, $subject = "", $viewFile, $content = array(), $return = true, $processOutput = true, $debug=false)

+    public function send ($user, $subject = "", $viewFile, $content = array(), $return = true, $processOutput = true, $debug = false)

     {

-        $mail = new PHPMailer($debug);

-        $mail->IsSMTP();

+        $mail = new PHPMailer ($debug);

+        $mail->IsSMTP ();

         $mail->SMTPAuth = false;

 

-        $notifyUser = $this->getNotifyUser(isset($content['origin_from']) ? $content['origin_from'] : array());

+        $notifyUser = $this->getNotifyUser (isset($content['origin_from']) ? $content['origin_from'] : array());

 

         if (empty($this->SMTPHost))

             $mail->Host = $this->SMTPHost;

@@ -85,27 +85,27 @@ 
 

         if (empty($this->SMTPPass))

         {

-            $mail->Password   = Cii::decrypt($this->SMTPPass);

+            $mail->Password = Cii::decrypt ($this->SMTPPass);

             $mail->SMTPAuth = true;

         } 

 

-        $mail->SetFrom($notifyUser->email, $notifyUser->username);

+        $mail->SetFrom ($notifyUser->email, $notifyUser->username);

         $mail->Subject = $subject;

-        $mail->MsgHTML($this->renderFile(Yii::getPathOfAlias($viewFile).'.php', $content, $return, $processOutput));

-        $mail->AddAddress($user->email, $user->username);

+        $mail->MsgHTML ($this->renderFile (Yii::getPathOfAlias ($viewFile) . '.php', $content, $return, $processOutput));

+        $mail->AddAddress ($user->email, $user->username);

 

         try

         {

-            return $mail->Send();

+            return $mail->Send ();

         }

         catch (phpmailerException $e)

         {

-            Yii::log($e->getMessage(), 'info', 'ciims.models.EmailSettings');

+            Yii::log ($e->getMessage (), 'info', 'ciims.models.EmailSettings');

             return false;

         }

         catch (Exception $e)

         {

-            Yii::log($e->getMessage(), 'info', 'ciims.models.EmailSettings');

+            Yii::log ($e->getMessage (), 'info', 'ciims.models.EmailSettings');

             return false;

         }

     }

@@ -114,7 +114,7 @@ 
      * Generates a user object

      * @param array $userData

      */

-    private function getNotifyUser($userData=array())

+    private function getNotifyUser ($userData = array())

     {

         $user = new stdClass;

         if (!empty($userData))

@@ -125,7 +125,7 @@ 
         else

         {

             if ($this->notifyName === NULL || $this->notifyEmail === NULL)

-                $user = Users::model()->findByPk(1);

+                $user = Users::model ()->findByPk (1);

             else

             {

                 $user->email    = $this->notifyEmail;

@@ -145,12 +145,12 @@ 
      * @return string the rendering result. Null if the rendering result is not required.

      * @throws CException if the view file does not exist

      */

-    private function renderFile($viewFile,$data=null,$return=false)

+    private function renderFile ($viewFile, $data = null, $return = false)

     {

-        if(($renderer=Yii::app()->getViewRenderer())!==null && $renderer->fileExtension==='.'.CFileHelper::getExtension($viewFile))

-            $content=$renderer->renderFile($this,$viewFile,$data,$return);

+        if (($renderer = Yii::app ()->getViewRenderer ()) !== null && $renderer->fileExtension === '.' . CFileHelper::getExtension ($viewFile))

+            $content = $renderer->renderFile ($this, $viewFile, $data, $return);

         else

-            $content=$this->renderInternal($viewFile,$data,$return);

+            $content = $this->renderInternal ($viewFile, $data, $return);

         

         return $content;

     }

@@ -164,19 +164,19 @@ 
      * @param boolean $_return_ whether the rendering result should be returned as a string

      * @return string the rendering result. Null if the rendering result is not required.

      */

-    private function renderInternal($_viewFile_,$_data_=null,$_return_=false)

+    private function renderInternal ($_viewFile_, $_data_ = null, $_return_ = false)

     {

         // we use special variable names here to avoid conflict when extracting data

-        if(is_array($_data_))

-            extract($_data_,EXTR_PREFIX_SAME,'data');

+        if (is_array ($_data_))

+            extract ($_data_, EXTR_PREFIX_SAME, 'data');

         else

-            $data=$_data_;

-        if($_return_)

+            $data = $_data_;

+        if ($_return_)

         {

-            ob_start();

-            ob_implicit_flush(false);

+            ob_start ();

+            ob_implicit_flush (false);

             require($_viewFile_);

-            return ob_get_clean();

+            return ob_get_clean ();

         }

         else

             require($_viewFile_);

Braces +44 added lines, -42 removed lines

@@ -1,7 +1,7 @@ 
 <?php

 

-class EmailSettings extends CiiSettingsModel

-{

+class EmailSettings extends CiiSettingsModel
+{
     protected $SMTPHost = NULL;

 

     protected $SMTPPort = NULL;

@@ -18,8 +18,8 @@ 
 

     protected $useSSL = 0;

 

-    public function rules()

-    {

+    public function rules()
+    {
         return array(

             array('notifyEmail', 'email'),

             array('useTLS, useSSL', 'boolean'),

@@ -29,8 +29,8 @@ 
         );

     }

 

-    public function attributeLabels()

-    {

+    public function attributeLabels()
+    {
         return array(

             'SMTPHost'      => Yii::t('ciims.models.email', 'SMTP Hostname'),

             'SMTPPort'      => Yii::t('ciims.models.email', 'SMTP Port Number'),

@@ -58,19 +58,21 @@ 
      * @param  boolean $processOutput Whether the output should be processed. The default is TRUE since this output will be passed to MsgHTML

      * @return boolean                Whether or not the email sent sucessfully

      */

-    public function send($user, $subject = "", $viewFile, $content = array(), $return = true, $processOutput = true, $debug=false)

-    {

+    public function send($user, $subject = "", $viewFile, $content = array(), $return = true, $processOutput = true, $debug=false)
+    {
         $mail = new PHPMailer($debug);

         $mail->IsSMTP();

         $mail->SMTPAuth = false;

 

         $notifyUser = $this->getNotifyUser(isset($content['origin_from']) ? $content['origin_from'] : array());

 

-        if (empty($this->SMTPHost))

-            $mail->Host = $this->SMTPHost;

+        if (empty($this->SMTPHost)) {
+                    $mail->Host = $this->SMTPHost;
+        }
 

-        if (empty($this->SMTPPort))

-            $mail->Port = $this->SMTPPort;

+        if (empty($this->SMTPPort)) {
+                    $mail->Port = $this->SMTPPort;
+        }
 

         if (empty($this->SMTPUser))

         {

@@ -78,10 +80,11 @@ 
             $mail->SMTPAuth = true;

         }

 

-        if ($this->useTLS == 1)

-            $mail->SMTPSecure = 'tls';

-        else if ($this->useSSL == 1)

-            $mail->SMTPSecure = 'ssl';

+        if ($this->useTLS == 1) {
+                    $mail->SMTPSecure = 'tls';
+        } else if ($this->useSSL == 1) {
+                    $mail->SMTPSecure = 'ssl';
+        }
 

         if (empty($this->SMTPPass))

         {

@@ -97,13 +100,11 @@ 
         try

         {

             return $mail->Send();

-        }

-        catch (phpmailerException $e)

+        } catch (phpmailerException $e)

         {

             Yii::log($e->getMessage(), 'info', 'ciims.models.EmailSettings');

             return false;

-        }

-        catch (Exception $e)

+        } catch (Exception $e)

         {

             Yii::log($e->getMessage(), 'info', 'ciims.models.EmailSettings');

             return false;

@@ -114,19 +115,18 @@ 
      * Generates a user object

      * @param array $userData

      */

-    private function getNotifyUser($userData=array())

-    {

+    private function getNotifyUser($userData=array())
+    {
         $user = new stdClass;

         if (!empty($userData))

         {

             $user->email    = $userData['email'];

             $user->username = $userData['name'];

-        }

-        else

+        } else

         {

-            if ($this->notifyName === NULL || $this->notifyEmail === NULL)

-                $user = Users::model()->findByPk(1);

-            else

+            if ($this->notifyName === NULL || $this->notifyEmail === NULL) {
+                            $user = Users::model()->findByPk(1);
+            } else

             {

                 $user->email    = $this->notifyEmail;

                 $user->username = $this->notifyName;

@@ -145,12 +145,13 @@ 
      * @return string the rendering result. Null if the rendering result is not required.

      * @throws CException if the view file does not exist

      */

-    private function renderFile($viewFile,$data=null,$return=false)

-    {

-        if(($renderer=Yii::app()->getViewRenderer())!==null && $renderer->fileExtension==='.'.CFileHelper::getExtension($viewFile))

-            $content=$renderer->renderFile($this,$viewFile,$data,$return);

-        else

-            $content=$this->renderInternal($viewFile,$data,$return);

+    private function renderFile($viewFile,$data=null,$return=false)
+    {
+        if(($renderer=Yii::app()->getViewRenderer())!==null && $renderer->fileExtension==='.'.CFileHelper::getExtension($viewFile)) {
+                    $content=$renderer->renderFile($this,$viewFile,$data,$return);
+        } else {
+                    $content=$this->renderInternal($viewFile,$data,$return);
+        }
         

         return $content;

     }

@@ -164,21 +165,22 @@ 
      * @param boolean $_return_ whether the rendering result should be returned as a string

      * @return string the rendering result. Null if the rendering result is not required.

      */

-    private function renderInternal($_viewFile_,$_data_=null,$_return_=false)

-    {

+    private function renderInternal($_viewFile_,$_data_=null,$_return_=false)
+    {
         // we use special variable names here to avoid conflict when extracting data

-        if(is_array($_data_))

-            extract($_data_,EXTR_PREFIX_SAME,'data');

-        else

-            $data=$_data_;

+        if(is_array($_data_)) {
+                    extract($_data_,EXTR_PREFIX_SAME,'data');
+        } else {
+                    $data=$_data_;
+        }
         if($_return_)

         {

             ob_start();

             ob_implicit_flush(false);

             require($_viewFile_);

             return ob_get_clean();

-        }

-        else

-            require($_viewFile_);

+        } else {
+                    require($_viewFile_);
+        }
     }

 }