charlesportwoodii / CiiMS

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

Indentation +310 added lines, -310 removed lines

@@ -2,317 +2,317 @@
 
 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()
-	{
-		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()
+    {
+        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
+            )
+        );
+    }
 }

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

Spacing +43 added lines, -43 removed lines

@@ -52,12 +52,12 @@ 
 	private $overridePasswordCheck = false;
 
 
-	private function canOverridePasswordCheck()
+	private function canOverridePasswordCheck ()
 	{
 		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;
@@ -67,7 +67,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;
 	}
@@ -76,9 +76,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'
 		));
@@ -93,9 +93,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'
 		));
@@ -112,16 +112,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'
 		));
@@ -136,9 +136,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'
 		));
@@ -153,20 +153,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'),
@@ -183,11 +183,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)')
 		));
 	}
 
@@ -197,12 +197,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;
 	}
 
@@ -212,20 +212,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;
 		}
 
@@ -238,15 +238,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(
@@ -262,13 +262,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,
@@ -276,7 +276,7 @@ 
 			'user_role'     => $this->user_role
 		);
 
-		if ($this->_user->save())
+		if ($this->_user->save ())
 			return true;
 
 		return false;
@@ -286,13 +286,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;
@@ -302,15 +302,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;
+    }
 }

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;
 

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;

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

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_);
+        }
     }

 }

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_);

protected/models/settings/GeneralSettings.php

Indentation +80 added lines, -80 removed lines

@@ -2,84 +2,84 @@
 

 class GeneralSettings extends CiiSettingsModel

 {

-	protected $name = NULL;

-

-	protected $dateFormat = 'F jS, Y';

-

-	protected $timeFormat = 'H:i';

-

-	protected $defaultLanguage = 'en_US';

-

-	protected $forceSecureSSL = false;

-

-	protected $bcrypt_cost = 13;

-

-	protected $searchPaginationSize = 10;

-

-	protected $categoryPaginationSize = 10;

-

-	protected $contentPaginationSize = 10;

-

-	protected $useDisqusComments = 0;

-

-	protected $disqus_shortname = NULL;

-

-	//protected $useDiscourseComments = 0;

-

-	//protected $discourseUrl = '';

-

-	public function groups()

-	{

-		return array(

-			Yii::t('ciims.models.general', 'Site Settings') => array('name', 'forceSecureSSL', 'bcrypt_cost', 'categoryPaginationSize','contentPaginationSize','searchPaginationSize'),

-			Yii::t('ciims.models.general', 'Disqus') => array('useDisqusComments', 'disqus_shortname'),

-			//Yii::t('ciims.models.general', 'Discourse') => array('useDiscourseComments', 'discourseUrl'),

-			Yii::t('ciims.models.general', 'Display Settings') => array('dateFormat', 'timeFormat', 'defaultLanguage'),

-		);

-	}

-

-	/**

-	 * Validation rules

-	 * @return array

-	 */

-	public function rules()

-	{

-		return array(

-			array('name, dateFormat, timeFormat, defaultLanguage', 'required'),

-			array('name', 'length', 'max' => 255),

-			array('dateFormat, timeFormat, defaultLanguage', 'length', 'max' => 25),

-			array('useDisqusComments, forceSecureSSL', 'boolean'),

-			array('disqus_shortname', 'length', 'max' => 255),

-			array('bcrypt_cost', 'numerical', 'integerOnly'=>true, 'min' => 13),

-			array('searchPaginationSize, categoryPaginationSize, contentPaginationSize', 'numerical', 'integerOnly' => true, 'min' => 10),

-			//array('url', 'url')

-		);

-	}

-

-	/**

-	 * Attribute labels

-	 * @return array

-	 */

-	public function attributeLabels()

-	{

-		return array(

-			'name' => Yii::t('ciims.models.general', 'Site Name'),

-			'dateFormat' => Yii::t('ciims.models.general', 'Date Format'),

-			'timeFormat' => Yii::t('ciims.models.general', 'Time Format'),

-			'defaultLanguage' => Yii::t('ciims.models.general', 'Default Language'),

-			'forceSecureSSL' => Yii::t('ciims.models.general', 'Force SSL for Secure Areas'),

-			'bcrypt_cost' => Yii::t('ciims.models.general', 'Password Strength Settings'),

-			'searchPaginationSize' => Yii::t('ciims.models.general', 'Search Post Count'),

-			'categoryPaginationSize' => Yii::t('ciims.models.general', 'Category Post Count'),

-			'contentPaginationSize' => Yii::t('ciims.models.general', 'Content Post Cost'),

-

-			// Discourse

-			'useDisqusComments'    => Yii::t('ciims.models.general', 'Use Disqus Comments'),

-			'disqus_shortname'     => Yii::t('ciims.models.general', 'Disqus Shortcode'),

-

-			// Discourse

-			//'useDiscourseComments' => Yii::t('ciims.models.general', 'Use Discourse Comments'),

-			//'discourseUrl' => Yii::t('ciims.models.general', 'Discourse URL'),

-		);

-	}

+    protected $name = NULL;

+

+    protected $dateFormat = 'F jS, Y';

+

+    protected $timeFormat = 'H:i';

+

+    protected $defaultLanguage = 'en_US';

+

+    protected $forceSecureSSL = false;

+

+    protected $bcrypt_cost = 13;

+

+    protected $searchPaginationSize = 10;

+

+    protected $categoryPaginationSize = 10;

+

+    protected $contentPaginationSize = 10;

+

+    protected $useDisqusComments = 0;

+

+    protected $disqus_shortname = NULL;

+

+    //protected $useDiscourseComments = 0;

+

+    //protected $discourseUrl = '';

+

+    public function groups()

+    {

+        return array(

+            Yii::t('ciims.models.general', 'Site Settings') => array('name', 'forceSecureSSL', 'bcrypt_cost', 'categoryPaginationSize','contentPaginationSize','searchPaginationSize'),

+            Yii::t('ciims.models.general', 'Disqus') => array('useDisqusComments', 'disqus_shortname'),

+            //Yii::t('ciims.models.general', 'Discourse') => array('useDiscourseComments', 'discourseUrl'),

+            Yii::t('ciims.models.general', 'Display Settings') => array('dateFormat', 'timeFormat', 'defaultLanguage'),

+        );

+    }

+

+    /**

+     * Validation rules

+     * @return array

+     */

+    public function rules()

+    {

+        return array(

+            array('name, dateFormat, timeFormat, defaultLanguage', 'required'),

+            array('name', 'length', 'max' => 255),

+            array('dateFormat, timeFormat, defaultLanguage', 'length', 'max' => 25),

+            array('useDisqusComments, forceSecureSSL', 'boolean'),

+            array('disqus_shortname', 'length', 'max' => 255),

+            array('bcrypt_cost', 'numerical', 'integerOnly'=>true, 'min' => 13),

+            array('searchPaginationSize, categoryPaginationSize, contentPaginationSize', 'numerical', 'integerOnly' => true, 'min' => 10),

+            //array('url', 'url')

+        );

+    }

+

+    /**

+     * Attribute labels

+     * @return array

+     */

+    public function attributeLabels()

+    {

+        return array(

+            'name' => Yii::t('ciims.models.general', 'Site Name'),

+            'dateFormat' => Yii::t('ciims.models.general', 'Date Format'),

+            'timeFormat' => Yii::t('ciims.models.general', 'Time Format'),

+            'defaultLanguage' => Yii::t('ciims.models.general', 'Default Language'),

+            'forceSecureSSL' => Yii::t('ciims.models.general', 'Force SSL for Secure Areas'),

+            'bcrypt_cost' => Yii::t('ciims.models.general', 'Password Strength Settings'),

+            'searchPaginationSize' => Yii::t('ciims.models.general', 'Search Post Count'),

+            'categoryPaginationSize' => Yii::t('ciims.models.general', 'Category Post Count'),

+            'contentPaginationSize' => Yii::t('ciims.models.general', 'Content Post Cost'),

+

+            // Discourse

+            'useDisqusComments'    => Yii::t('ciims.models.general', 'Use Disqus Comments'),

+            'disqus_shortname'     => Yii::t('ciims.models.general', 'Disqus Shortcode'),

+

+            // Discourse

+            //'useDiscourseComments' => Yii::t('ciims.models.general', 'Use Discourse Comments'),

+            //'discourseUrl' => Yii::t('ciims.models.general', 'Discourse URL'),

+        );

+    }

 }

Spacing +17 added lines, -17 removed lines

@@ -28,13 +28,13 @@ 
 

 	//protected $discourseUrl = '';

 

-	public function groups()

+	public function groups ()

 	{

 		return array(

-			Yii::t('ciims.models.general', 'Site Settings') => array('name', 'forceSecureSSL', 'bcrypt_cost', 'categoryPaginationSize','contentPaginationSize','searchPaginationSize'),

-			Yii::t('ciims.models.general', 'Disqus') => array('useDisqusComments', 'disqus_shortname'),

+			Yii::t ('ciims.models.general', 'Site Settings') => array('name', 'forceSecureSSL', 'bcrypt_cost', 'categoryPaginationSize', 'contentPaginationSize', 'searchPaginationSize'),

+			Yii::t ('ciims.models.general', 'Disqus') => array('useDisqusComments', 'disqus_shortname'),

 			//Yii::t('ciims.models.general', 'Discourse') => array('useDiscourseComments', 'discourseUrl'),

-			Yii::t('ciims.models.general', 'Display Settings') => array('dateFormat', 'timeFormat', 'defaultLanguage'),

+			Yii::t ('ciims.models.general', 'Display Settings') => array('dateFormat', 'timeFormat', 'defaultLanguage'),

 		);

 	}

 

@@ -42,7 +42,7 @@ 
 	 * Validation rules

 	 * @return array

 	 */

-	public function rules()

+	public function rules ()

 	{

 		return array(

 			array('name, dateFormat, timeFormat, defaultLanguage', 'required'),

@@ -60,22 +60,22 @@ 
 	 * Attribute labels

 	 * @return array

 	 */

-	public function attributeLabels()

+	public function attributeLabels ()

 	{

 		return array(

-			'name' => Yii::t('ciims.models.general', 'Site Name'),

-			'dateFormat' => Yii::t('ciims.models.general', 'Date Format'),

-			'timeFormat' => Yii::t('ciims.models.general', 'Time Format'),

-			'defaultLanguage' => Yii::t('ciims.models.general', 'Default Language'),

-			'forceSecureSSL' => Yii::t('ciims.models.general', 'Force SSL for Secure Areas'),

-			'bcrypt_cost' => Yii::t('ciims.models.general', 'Password Strength Settings'),

-			'searchPaginationSize' => Yii::t('ciims.models.general', 'Search Post Count'),

-			'categoryPaginationSize' => Yii::t('ciims.models.general', 'Category Post Count'),

-			'contentPaginationSize' => Yii::t('ciims.models.general', 'Content Post Cost'),

+			'name' => Yii::t ('ciims.models.general', 'Site Name'),

+			'dateFormat' => Yii::t ('ciims.models.general', 'Date Format'),

+			'timeFormat' => Yii::t ('ciims.models.general', 'Time Format'),

+			'defaultLanguage' => Yii::t ('ciims.models.general', 'Default Language'),

+			'forceSecureSSL' => Yii::t ('ciims.models.general', 'Force SSL for Secure Areas'),

+			'bcrypt_cost' => Yii::t ('ciims.models.general', 'Password Strength Settings'),

+			'searchPaginationSize' => Yii::t ('ciims.models.general', 'Search Post Count'),

+			'categoryPaginationSize' => Yii::t ('ciims.models.general', 'Category Post Count'),

+			'contentPaginationSize' => Yii::t ('ciims.models.general', 'Content Post Cost'),

 

 			// Discourse

-			'useDisqusComments'    => Yii::t('ciims.models.general', 'Use Disqus Comments'),

-			'disqus_shortname'     => Yii::t('ciims.models.general', 'Disqus Shortcode'),

+			'useDisqusComments'    => Yii::t ('ciims.models.general', 'Use Disqus Comments'),

+			'disqus_shortname'     => Yii::t ('ciims.models.general', 'Disqus Shortcode'),

 

 			// Discourse

 			//'useDiscourseComments' => Yii::t('ciims.models.general', 'Use Discourse Comments'),

Braces +8 added lines, -8 removed lines

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

 

-class GeneralSettings extends CiiSettingsModel

-{

+class GeneralSettings extends CiiSettingsModel
+{
 	protected $name = NULL;

 

 	protected $dateFormat = 'F jS, Y';

@@ -28,8 +28,8 @@ 
 

 	//protected $discourseUrl = '';

 

-	public function groups()

-	{

+	public function groups()
+	{
 		return array(

 			Yii::t('ciims.models.general', 'Site Settings') => array('name', 'forceSecureSSL', 'bcrypt_cost', 'categoryPaginationSize','contentPaginationSize','searchPaginationSize'),

 			Yii::t('ciims.models.general', 'Disqus') => array('useDisqusComments', 'disqus_shortname'),

@@ -42,8 +42,8 @@ 
 	 * Validation rules

 	 * @return array

 	 */

-	public function rules()

-	{

+	public function rules()
+	{
 		return array(

 			array('name, dateFormat, timeFormat, defaultLanguage', 'required'),

 			array('name', 'length', 'max' => 255),

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

 	 * @return array

 	 */

-	public function attributeLabels()

-	{

+	public function attributeLabels()
+	{
 		return array(

 			'name' => Yii::t('ciims.models.general', 'Site Name'),

 			'dateFormat' => Yii::t('ciims.models.general', 'Date Format'),

protected/models/settings/SocialSettings.php

Indentation +68 added lines, -68 removed lines

@@ -2,85 +2,85 @@
 
 class SocialSettings extends CiiSettingsModel
 {
-	protected $ha_twitter_enabled = false;
-	protected $ha_twitter_key = NULL;
-	protected $ha_twitter_secret = NULL;
-	protected $ha_twitter_accessToken = NULL;
-	protected $ha_twitter_accessTokenSecret = NULL;
+    protected $ha_twitter_enabled = false;
+    protected $ha_twitter_key = NULL;
+    protected $ha_twitter_secret = NULL;
+    protected $ha_twitter_accessToken = NULL;
+    protected $ha_twitter_accessTokenSecret = NULL;
 
-	protected $ha_facebook_enabled = false;
-	protected $ha_facebook_id = NULL;
-	protected $ha_facebook_secret = NULL;
-	protected $ha_facebook_scope =  NULL;
+    protected $ha_facebook_enabled = false;
+    protected $ha_facebook_id = NULL;
+    protected $ha_facebook_secret = NULL;
+    protected $ha_facebook_scope =  NULL;
 
-	protected $ha_google_enabled = false;
-	protected $ha_google_id = NULL;
-	protected $ha_google_secret = NULL;
-	protected $ha_google_scope = NULL;
-	protected $google_plus_public_server_key = NULL;
+    protected $ha_google_enabled = false;
+    protected $ha_google_id = NULL;
+    protected $ha_google_secret = NULL;
+    protected $ha_google_scope = NULL;
+    protected $google_plus_public_server_key = NULL;
 
-	protected $ha_linkedin_enabled = false;
-	protected $ha_linkedin_key = NULL;
-	protected $ha_linkedin_secret = NULL;
+    protected $ha_linkedin_enabled = false;
+    protected $ha_linkedin_key = NULL;
+    protected $ha_linkedin_secret = NULL;
 
-	protected $addThisPublisherID = null;
+    protected $addThisPublisherID = null;
 
-	public function groups()
-	{
-		return array(
-			Yii::t('ciims.models.social', 'Twitter')  => array('ha_twitter_enabled', 'ha_twitter_key', 'ha_twitter_secret', 'ha_twitter_accessToken', 'ha_twitter_accessTokenSecret'),
-			Yii::t('ciims.models.social', 'Facebook') => array('ha_facebook_enabled', 'ha_facebook_id', 'ha_facebook_secret', 'ha_facebook_scope'),
-			Yii::t('ciims.models.social', 'Google+')  => array('ha_google_enabled', 'ha_google_id', 'ha_google_secret', 'ha_google_scope', 'google_plus_public_server_key'),
-			Yii::t('ciims.models.social', 'LinkedIn') => array('ha_linkedin_enabled', 'ha_linkedin_key', 'ha_linkedin_secret'),
-			Yii::t('ciims.models.social', 'AddThis') => array('addThisPublisherID')
-		);
-	}
+    public function groups()
+    {
+        return array(
+            Yii::t('ciims.models.social', 'Twitter')  => array('ha_twitter_enabled', 'ha_twitter_key', 'ha_twitter_secret', 'ha_twitter_accessToken', 'ha_twitter_accessTokenSecret'),
+            Yii::t('ciims.models.social', 'Facebook') => array('ha_facebook_enabled', 'ha_facebook_id', 'ha_facebook_secret', 'ha_facebook_scope'),
+            Yii::t('ciims.models.social', 'Google+')  => array('ha_google_enabled', 'ha_google_id', 'ha_google_secret', 'ha_google_scope', 'google_plus_public_server_key'),
+            Yii::t('ciims.models.social', 'LinkedIn') => array('ha_linkedin_enabled', 'ha_linkedin_key', 'ha_linkedin_secret'),
+            Yii::t('ciims.models.social', 'AddThis') => array('addThisPublisherID')
+        );
+    }
 
-	public function rules()
-	{
-		return array(
-			array('ha_twitter_key, ha_twitter_secret, ha_twitter_accessToken, ha_twitter_accessToken, ha_twitter_accessTokenSecret', 'length', 'max' => 255),
-			array('ha_facebook_id, ha_facebook_secret', 'length', 'max' => 255),
-			array('ha_google_id, ha_google_secret, google_plus_public_server_key', 'length', 'max' => 255),
-			array('ha_linkedin_key, ha_linkedin_secret', 'length', 'max' => 255),
-			array('ha_twitter_enabled, ha_facebook_enabled, ha_google_enabled, ha_linkedin_enabled', 'boolean'),
-			array('addThisPublisherID', 'length', 'max' => 255)
-		);
-	}
+    public function rules()
+    {
+        return array(
+            array('ha_twitter_key, ha_twitter_secret, ha_twitter_accessToken, ha_twitter_accessToken, ha_twitter_accessTokenSecret', 'length', 'max' => 255),
+            array('ha_facebook_id, ha_facebook_secret', 'length', 'max' => 255),
+            array('ha_google_id, ha_google_secret, google_plus_public_server_key', 'length', 'max' => 255),
+            array('ha_linkedin_key, ha_linkedin_secret', 'length', 'max' => 255),
+            array('ha_twitter_enabled, ha_facebook_enabled, ha_google_enabled, ha_linkedin_enabled', 'boolean'),
+            array('addThisPublisherID', 'length', 'max' => 255)
+        );
+    }
 
-	public function attributeLabels()
-	{
-		return array(
-			'ha_twitter_enabled' => Yii::t('ciims.models.social', 'Social Auth'),
-			'ha_twitter_key' => Yii::t('ciims.models.social', 'Consumer Key'),
-			'ha_twitter_secret' => Yii::t('ciims.models.social', 'Consumer Secret'),
-			'ha_twitter_accessToken' => Yii::t('ciims.models.social', 'Access Token'),
-			'ha_twitter_accessTokenSecret' => Yii::t('ciims.models.social', 'Access Token Secret'),
+    public function attributeLabels()
+    {
+        return array(
+            'ha_twitter_enabled' => Yii::t('ciims.models.social', 'Social Auth'),
+            'ha_twitter_key' => Yii::t('ciims.models.social', 'Consumer Key'),
+            'ha_twitter_secret' => Yii::t('ciims.models.social', 'Consumer Secret'),
+            'ha_twitter_accessToken' => Yii::t('ciims.models.social', 'Access Token'),
+            'ha_twitter_accessTokenSecret' => Yii::t('ciims.models.social', 'Access Token Secret'),
 
-			'ha_facebook_enabled' => Yii::t('ciims.models.social', 'Social Auth'),
-			'ha_facebook_id' => Yii::t('ciims.models.social', 'App ID'),
-			'ha_facebook_secret' => Yii::t('ciims.models.social', 'App Secret'),
-			'ha_facebook_scope' => Yii::t('ciims.models.social', 'Scope'),
+            'ha_facebook_enabled' => Yii::t('ciims.models.social', 'Social Auth'),
+            'ha_facebook_id' => Yii::t('ciims.models.social', 'App ID'),
+            'ha_facebook_secret' => Yii::t('ciims.models.social', 'App Secret'),
+            'ha_facebook_scope' => Yii::t('ciims.models.social', 'Scope'),
 
-			'ha_google_enabled' => Yii::t('ciims.models.social', 'Social Auth'),
-			'ha_google_id' => Yii::t('ciims.models.social', 'Client ID'),
-			'ha_google_secret' => Yii::t('ciims.models.social', 'Client Secret'),
-			'ha_google_scope' => Yii::t('ciims.models.social', 'Scope'),
-			'google_plus_public_server_key' => Yii::t('ciims.models.social', 'Public Server API Key'),
+            'ha_google_enabled' => Yii::t('ciims.models.social', 'Social Auth'),
+            'ha_google_id' => Yii::t('ciims.models.social', 'Client ID'),
+            'ha_google_secret' => Yii::t('ciims.models.social', 'Client Secret'),
+            'ha_google_scope' => Yii::t('ciims.models.social', 'Scope'),
+            'google_plus_public_server_key' => Yii::t('ciims.models.social', 'Public Server API Key'),
 
-			'ha_linkedin_enabled' => Yii::t('ciims.models.social', 'Social Auth'),
-			'ha_linkedin_key' => Yii::t('ciims.models.social', 'Consumer Key'),
-			'ha_linkedin_secret' => Yii::t('ciims.models.social', 'Consumer Secret'),
+            'ha_linkedin_enabled' => Yii::t('ciims.models.social', 'Social Auth'),
+            'ha_linkedin_key' => Yii::t('ciims.models.social', 'Consumer Key'),
+            'ha_linkedin_secret' => Yii::t('ciims.models.social', 'Consumer Secret'),
 
-			'addThisPublisherID' => Yii::t('ciims.models.social', 'AddThis Publisher ID')
-		);
-	}
+            'addThisPublisherID' => Yii::t('ciims.models.social', 'AddThis Publisher ID')
+        );
+    }
 
-	public function afterSave()
-	{
-		Yii::app()->cache->set('hybridauth_providers', false);
-		Cii::getHybridAuthProviders();
+    public function afterSave()
+    {
+        Yii::app()->cache->set('hybridauth_providers', false);
+        Cii::getHybridAuthProviders();
 
-		return parent::afterSave();
-	}
+        return parent::afterSave();
+    }
 }

Spacing +31 added lines, -31 removed lines

@@ -11,7 +11,7 @@ 
 	protected $ha_facebook_enabled = false;
 	protected $ha_facebook_id = NULL;
 	protected $ha_facebook_secret = NULL;
-	protected $ha_facebook_scope =  NULL;
+	protected $ha_facebook_scope = NULL;
 
 	protected $ha_google_enabled = false;
 	protected $ha_google_id = NULL;
@@ -25,18 +25,18 @@ 
 
 	protected $addThisPublisherID = null;
 
-	public function groups()
+	public function groups ()
 	{
 		return array(
-			Yii::t('ciims.models.social', 'Twitter')  => array('ha_twitter_enabled', 'ha_twitter_key', 'ha_twitter_secret', 'ha_twitter_accessToken', 'ha_twitter_accessTokenSecret'),
-			Yii::t('ciims.models.social', 'Facebook') => array('ha_facebook_enabled', 'ha_facebook_id', 'ha_facebook_secret', 'ha_facebook_scope'),
-			Yii::t('ciims.models.social', 'Google+')  => array('ha_google_enabled', 'ha_google_id', 'ha_google_secret', 'ha_google_scope', 'google_plus_public_server_key'),
-			Yii::t('ciims.models.social', 'LinkedIn') => array('ha_linkedin_enabled', 'ha_linkedin_key', 'ha_linkedin_secret'),
-			Yii::t('ciims.models.social', 'AddThis') => array('addThisPublisherID')
+			Yii::t ('ciims.models.social', 'Twitter')  => array('ha_twitter_enabled', 'ha_twitter_key', 'ha_twitter_secret', 'ha_twitter_accessToken', 'ha_twitter_accessTokenSecret'),
+			Yii::t ('ciims.models.social', 'Facebook') => array('ha_facebook_enabled', 'ha_facebook_id', 'ha_facebook_secret', 'ha_facebook_scope'),
+			Yii::t ('ciims.models.social', 'Google+')  => array('ha_google_enabled', 'ha_google_id', 'ha_google_secret', 'ha_google_scope', 'google_plus_public_server_key'),
+			Yii::t ('ciims.models.social', 'LinkedIn') => array('ha_linkedin_enabled', 'ha_linkedin_key', 'ha_linkedin_secret'),
+			Yii::t ('ciims.models.social', 'AddThis') => array('addThisPublisherID')
 		);
 	}
 
-	public function rules()
+	public function rules ()
 	{
 		return array(
 			array('ha_twitter_key, ha_twitter_secret, ha_twitter_accessToken, ha_twitter_accessToken, ha_twitter_accessTokenSecret', 'length', 'max' => 255),
@@ -48,39 +48,39 @@ 
 		);
 	}
 
-	public function attributeLabels()
+	public function attributeLabels ()
 	{
 		return array(
-			'ha_twitter_enabled' => Yii::t('ciims.models.social', 'Social Auth'),
-			'ha_twitter_key' => Yii::t('ciims.models.social', 'Consumer Key'),
-			'ha_twitter_secret' => Yii::t('ciims.models.social', 'Consumer Secret'),
-			'ha_twitter_accessToken' => Yii::t('ciims.models.social', 'Access Token'),
-			'ha_twitter_accessTokenSecret' => Yii::t('ciims.models.social', 'Access Token Secret'),
+			'ha_twitter_enabled' => Yii::t ('ciims.models.social', 'Social Auth'),
+			'ha_twitter_key' => Yii::t ('ciims.models.social', 'Consumer Key'),
+			'ha_twitter_secret' => Yii::t ('ciims.models.social', 'Consumer Secret'),
+			'ha_twitter_accessToken' => Yii::t ('ciims.models.social', 'Access Token'),
+			'ha_twitter_accessTokenSecret' => Yii::t ('ciims.models.social', 'Access Token Secret'),
 
-			'ha_facebook_enabled' => Yii::t('ciims.models.social', 'Social Auth'),
-			'ha_facebook_id' => Yii::t('ciims.models.social', 'App ID'),
-			'ha_facebook_secret' => Yii::t('ciims.models.social', 'App Secret'),
-			'ha_facebook_scope' => Yii::t('ciims.models.social', 'Scope'),
+			'ha_facebook_enabled' => Yii::t ('ciims.models.social', 'Social Auth'),
+			'ha_facebook_id' => Yii::t ('ciims.models.social', 'App ID'),
+			'ha_facebook_secret' => Yii::t ('ciims.models.social', 'App Secret'),
+			'ha_facebook_scope' => Yii::t ('ciims.models.social', 'Scope'),
 
-			'ha_google_enabled' => Yii::t('ciims.models.social', 'Social Auth'),
-			'ha_google_id' => Yii::t('ciims.models.social', 'Client ID'),
-			'ha_google_secret' => Yii::t('ciims.models.social', 'Client Secret'),
-			'ha_google_scope' => Yii::t('ciims.models.social', 'Scope'),
-			'google_plus_public_server_key' => Yii::t('ciims.models.social', 'Public Server API Key'),
+			'ha_google_enabled' => Yii::t ('ciims.models.social', 'Social Auth'),
+			'ha_google_id' => Yii::t ('ciims.models.social', 'Client ID'),
+			'ha_google_secret' => Yii::t ('ciims.models.social', 'Client Secret'),
+			'ha_google_scope' => Yii::t ('ciims.models.social', 'Scope'),
+			'google_plus_public_server_key' => Yii::t ('ciims.models.social', 'Public Server API Key'),
 
-			'ha_linkedin_enabled' => Yii::t('ciims.models.social', 'Social Auth'),
-			'ha_linkedin_key' => Yii::t('ciims.models.social', 'Consumer Key'),
-			'ha_linkedin_secret' => Yii::t('ciims.models.social', 'Consumer Secret'),
+			'ha_linkedin_enabled' => Yii::t ('ciims.models.social', 'Social Auth'),
+			'ha_linkedin_key' => Yii::t ('ciims.models.social', 'Consumer Key'),
+			'ha_linkedin_secret' => Yii::t ('ciims.models.social', 'Consumer Secret'),
 
-			'addThisPublisherID' => Yii::t('ciims.models.social', 'AddThis Publisher ID')
+			'addThisPublisherID' => Yii::t ('ciims.models.social', 'AddThis Publisher ID')
 		);
 	}
 
-	public function afterSave()
+	public function afterSave ()
 	{
-		Yii::app()->cache->set('hybridauth_providers', false);
-		Cii::getHybridAuthProviders();
+		Yii::app ()->cache->set ('hybridauth_providers', false);
+		Cii::getHybridAuthProviders ();
 
-		return parent::afterSave();
+		return parent::afterSave ();
 	}
 }

protected/models/settings/ThemeSettings.php

Indentation +77 added lines, -77 removed lines

@@ -2,92 +2,92 @@
 

 class ThemeSettings extends CiiSettingsModel

 {

-	/**

-	 * The active theme

-	 * @var string

-	 */

-	public $theme = 'default';

+    /**

+     * The active theme

+     * @var string

+     */

+    public $theme = 'default';

 

-	/**

-	 * Validation rules for the theme

-	 * @return array

-	 */

-	public function rules()

-	{

-		return array(

-			array('theme', 'required'),

-			array('theme', 'length', 'max' => 255)

-		);

-	}

+    /**

+     * Validation rules for the theme

+     * @return array

+     */

+    public function rules()

+    {

+        return array(

+            array('theme', 'required'),

+            array('theme', 'length', 'max' => 255)

+        );

+    }

 

-	/**

-	 * Attribute labels for themes

-	 * @return array

-	 */

-	public function attributeLabels()

-	{

-		return array(

-			'theme' => Yii::t('ciims.models.theme', 'Theme'),

-		);

-	}

+    /**

+     * Attribute labels for themes

+     * @return array

+     */

+    public function attributeLabels()

+    {

+        return array(

+            'theme' => Yii::t('ciims.models.theme', 'Theme'),

+        );

+    }

 

-	/**

-	 * Returns the active theme name

-	 * @return string

-	 */

-	public function getTheme()

-	{

-		return $this->theme;

-	}

+    /**

+     * Returns the active theme name

+     * @return string

+     */

+    public function getTheme()

+    {

+        return $this->theme;

+    }

 

-	/**

-	 * Retrieves all of the themes from webroot.themes and returns them in an array group by type, each containing

-	 * the contents of theme.json.

-	 *

-	 * The themes are then cached for easy retrieval later. (I really hate unecessary DiskIO if something isn't changing...)

-	 *

-	 * @return array

-	 */

-	public function getThemes()

-	{

-		$themes = Yii::app()->cache->get('settings_themes');

+    /**

+     * Retrieves all of the themes from webroot.themes and returns them in an array group by type, each containing

+     * the contents of theme.json.

+     *

+     * The themes are then cached for easy retrieval later. (I really hate unecessary DiskIO if something isn't changing...)

+     *

+     * @return array

+     */

+    public function getThemes()

+    {

+        $themes = Yii::app()->cache->get('settings_themes');

 

-		if ($themes == false)

-		{

-			$themes = array();

-			$currentTheme = Cii::getConfig('theme');

-			$themePath = Yii::getPathOfAlias('base.themes') . DS;

-			$directories = glob($themePath . "*", GLOB_ONLYDIR);

+        if ($themes == false)

+        {

+            $themes = array();

+            $currentTheme = Cii::getConfig('theme');

+            $themePath = Yii::getPathOfAlias('base.themes') . DS;

+            $directories = glob($themePath . "*", GLOB_ONLYDIR);

 

-			// Pushes the current theme onto the top of the list

-			foreach ($directories as $k=>$dir)

-			{

-				if ($dir == Yii::getPathOfAlias('base.themes').DS.$currentTheme)

-				{

-					unset($directories[$k]);

-					break;

-				}

-			}

+            // Pushes the current theme onto the top of the list

+            foreach ($directories as $k=>$dir)

+            {

+                if ($dir == Yii::getPathOfAlias('base.themes').DS.$currentTheme)

+                {

+                    unset($directories[$k]);

+                    break;

+                }

+            }

 

-			array_unshift($directories, $themePath.$currentTheme);

+            array_unshift($directories, $themePath.$currentTheme);

 

-			foreach($directories as $dir)

-			{

-				$json = CJSON::decode(file_get_contents($dir . DIRECTORY_SEPARATOR . 'composer.json'));

-				$name = $json['name'];

-				$key = str_replace('ciims-themes/', '', $name);

+            foreach($directories as $dir)

+            {

+                $json = CJSON::decode(file_get_contents($dir . DIRECTORY_SEPARATOR . 'composer.json'));

+                $name = $json['name'];

+                $key = str_replace('ciims-themes/', '', $name);

 

-				$themes[$key] = array(

-					'path' 		=> $dir,

-					'name' 		=> $name,

-					'hidden' 	=> isset($json['hidden']) ? $json['hidden'] : false

-				);

-			}

+                $themes[$key] = array(

+                    'path' 		=> $dir,

+                    'name' 		=> $name,

+                    'hidden' 	=> isset($json['hidden']) ? $json['hidden'] : false

+                );

+            }

 

-			Yii::app()->cache->set('settings_themes', $themes);

-			return $themes;

-		}

+            Yii::app()->cache->set('settings_themes', $themes);

+            return $themes;

+        }

 

-		return $themes;

-	}

+        return $themes;

+    }

 }
\ No newline at end of file

Braces +10 added lines, -10 removed lines

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

 

-class ThemeSettings extends CiiSettingsModel

-{

+class ThemeSettings extends CiiSettingsModel
+{
 	/**

 	 * The active theme

 	 * @var string

@@ -12,8 +12,8 @@ 
 	 * Validation rules for the theme

 	 * @return array

 	 */

-	public function rules()

-	{

+	public function rules()
+	{
 		return array(

 			array('theme', 'required'),

 			array('theme', 'length', 'max' => 255)

@@ -24,8 +24,8 @@ 
 	 * Attribute labels for themes

 	 * @return array

 	 */

-	public function attributeLabels()

-	{

+	public function attributeLabels()
+	{
 		return array(

 			'theme' => Yii::t('ciims.models.theme', 'Theme'),

 		);

@@ -35,8 +35,8 @@ 
 	 * Returns the active theme name

 	 * @return string

 	 */

-	public function getTheme()

-	{

+	public function getTheme()
+	{
 		return $this->theme;

 	}

 

@@ -48,8 +48,8 @@ 
 	 *

 	 * @return array

 	 */

-	public function getThemes()

-	{

+	public function getThemes()
+	{
 		$themes = Yii::app()->cache->get('settings_themes');

 

 		if ($themes == false)

Spacing +15 added lines, -15 removed lines

@@ -12,7 +12,7 @@ 
 	 * Validation rules for the theme

 	 * @return array

 	 */

-	public function rules()

+	public function rules ()

 	{

 		return array(

 			array('theme', 'required'),

@@ -24,10 +24,10 @@ 
 	 * Attribute labels for themes

 	 * @return array

 	 */

-	public function attributeLabels()

+	public function attributeLabels ()

 	{

 		return array(

-			'theme' => Yii::t('ciims.models.theme', 'Theme'),

+			'theme' => Yii::t ('ciims.models.theme', 'Theme'),

 		);

 	}

 

@@ -35,7 +35,7 @@ 
 	 * Returns the active theme name

 	 * @return string

 	 */

-	public function getTheme()

+	public function getTheme ()

 	{

 		return $this->theme;

 	}

@@ -48,34 +48,34 @@ 
 	 *

 	 * @return array

 	 */

-	public function getThemes()

+	public function getThemes ()

 	{

-		$themes = Yii::app()->cache->get('settings_themes');

+		$themes = Yii::app ()->cache->get ('settings_themes');

 

 		if ($themes == false)

 		{

 			$themes = array();

-			$currentTheme = Cii::getConfig('theme');

-			$themePath = Yii::getPathOfAlias('base.themes') . DS;

-			$directories = glob($themePath . "*", GLOB_ONLYDIR);

+			$currentTheme = Cii::getConfig ('theme');

+			$themePath = Yii::getPathOfAlias ('base.themes').DS;

+			$directories = glob ($themePath."*", GLOB_ONLYDIR);

 

 			// Pushes the current theme onto the top of the list

 			foreach ($directories as $k=>$dir)

 			{

-				if ($dir == Yii::getPathOfAlias('base.themes').DS.$currentTheme)

+				if ($dir == Yii::getPathOfAlias ('base.themes').DS.$currentTheme)

 				{

 					unset($directories[$k]);

 					break;

 				}

 			}

 

-			array_unshift($directories, $themePath.$currentTheme);

+			array_unshift ($directories, $themePath.$currentTheme);

 

-			foreach($directories as $dir)

+			foreach ($directories as $dir)

 			{

-				$json = CJSON::decode(file_get_contents($dir . DIRECTORY_SEPARATOR . 'composer.json'));

+				$json = CJSON::decode (file_get_contents ($dir.DIRECTORY_SEPARATOR.'composer.json'));

 				$name = $json['name'];

-				$key = str_replace('ciims-themes/', '', $name);

+				$key = str_replace ('ciims-themes/', '', $name);

 

 				$themes[$key] = array(

 					'path' 		=> $dir,

@@ -84,7 +84,7 @@ 
 				);

 			}

 

-			Yii::app()->cache->set('settings_themes', $themes);

+			Yii::app ()->cache->set ('settings_themes', $themes);

 			return $themes;

 		}

 

protected/views/site/error.php

Spacing +1 added lines, -1 removed lines

@@ -1,2 +1,2 @@
-<h1><?php echo Yii::t('ciims.controllers.Site', 'Error {{code}}', array('{{code}}' => $error['code'])); ?></h1>
+<h1><?php echo Yii::t ('ciims.controllers.Site', 'Error {{code}}', array('{{code}}' => $error['code'])); ?></h1>
 <p><?php echo $error['message']; ?></p>