charlesportwoodii / CiiMS

protected/models/Events.php

Indentation +107 added lines, -107 removed lines

@@ -12,121 +12,121 @@
  */
 class Events extends CiiModel
 {
-	/**
-	 * Adds the CTimestampBehavior to this class
-	 * @return array
-	 */
-	public function behaviors()
-	{
-		return array(
-			'CTimestampBehavior' => array(
-				'class' 			=> 'zii.behaviors.CTimestampBehavior',
-				'createAttribute' 	=> 'created',
-				'updateAttribute' 	=> 'created',
-				'timestampExpression' => time(),
-				'setUpdateOnCreate' => false
-			)
-		);
-	}
+    /**
+     * Adds the CTimestampBehavior to this class
+     * @return array
+     */
+    public function behaviors()
+    {
+        return array(
+            'CTimestampBehavior' => array(
+                'class' 			=> 'zii.behaviors.CTimestampBehavior',
+                'createAttribute' 	=> 'created',
+                'updateAttribute' 	=> 'created',
+                'timestampExpression' => time(),
+                'setUpdateOnCreate' => false
+            )
+        );
+    }
 
-	/**
-	 * Query Scoping
-	 */
-	public function scopes()
-	{
-		return array(
-			'groupByUrl' => array(
-				'group'   => 't.uri',
-				'select'  => 't.uri, COUNT(*) as id',
-				'order'   => 't.id ASC',
-				'condition' => 't.event = "_trackPageView" AND t.created >= ' . strtotime("24 hours ago")
-			),
-		);
-	}
+    /**
+     * Query Scoping
+     */
+    public function scopes()
+    {
+        return array(
+            'groupByUrl' => array(
+                'group'   => 't.uri',
+                'select'  => 't.uri, COUNT(*) as id',
+                'order'   => 't.id ASC',
+                'condition' => 't.event = "_trackPageView" AND t.created >= ' . strtotime("24 hours ago")
+            ),
+        );
+    }
 
-	/**
-	 * @return string the associated database table name
-	 */
-	public function tableName()
-	{
-		return 'events';
-	}
+    /**
+     * @return string the associated database table name
+     */
+    public function tableName()
+    {
+        return 'events';
+    }
 
-	/**
-	 * @return array validation rules for model attributes.
-	 */
-	public function rules()
-	{
-		// NOTE: you should only define rules for those attributes that
-		// will receive user inputs.
-		return array(
-			array('event, uri', 'required'),
-			array('id', 'numerical', 'integerOnly'=>true),
-			array('event, uri, ', 'length', 'max'=>255),
-			array('event_data, created', 'safe'),
-			array('id, content_id, page_title, event, event_data, uri,  created', 'safe', 'on'=>'search'),
-		);
-	}
+    /**
+     * @return array validation rules for model attributes.
+     */
+    public function rules()
+    {
+        // NOTE: you should only define rules for those attributes that
+        // will receive user inputs.
+        return array(
+            array('event, uri', 'required'),
+            array('id', 'numerical', 'integerOnly'=>true),
+            array('event, uri, ', 'length', 'max'=>255),
+            array('event_data, created', 'safe'),
+            array('id, content_id, page_title, event, event_data, uri,  created', 'safe', 'on'=>'search'),
+        );
+    }
 
-	/**
-	 * @return array customized attribute labels (name=>label)
-	 */
-	public function attributeLabels()
-	{
-		return array(
-			'id' => 'ID',
-			'event' => 'Event',
-			'event_data' => 'Event Data',
-			'uri' => 'URI',
-			'content_id' => 'Content ID',
-			'created' => 'Created',
-		);
-	}
+    /**
+     * @return array customized attribute labels (name=>label)
+     */
+    public function attributeLabels()
+    {
+        return array(
+            'id' => 'ID',
+            'event' => 'Event',
+            'event_data' => 'Event Data',
+            'uri' => 'URI',
+            'content_id' => 'Content ID',
+            'created' => 'Created',
+        );
+    }
 
-	public function beforeValidate()
-	{
-		$this->event_data = CJSON::encode($this->event_data);
-		return parent::beforeValidate();
-	}
+    public function beforeValidate()
+    {
+        $this->event_data = CJSON::encode($this->event_data);
+        return parent::beforeValidate();
+    }
 
-	/**
-	 * Retrieves a list of models based on the current search/filter conditions.
-	 *
-	 * Typical usecase:
-	 * - Initialize the model fields with values from filter form.
-	 * - Execute this method to get CActiveDataProvider instance which will filter
-	 * models according to data in model fields.
-	 * - Pass data provider to CGridView, CListView or any similar widget.
-	 *
-	 * @return CActiveDataProvider the data provider that can return the models
-	 * based on the search/filter conditions.
-	 */
-	public function search()
-	{
-		// @todo Please modify the following code to remove attributes that should not be searched.
+    /**
+     * Retrieves a list of models based on the current search/filter conditions.
+     *
+     * Typical usecase:
+     * - Initialize the model fields with values from filter form.
+     * - Execute this method to get CActiveDataProvider instance which will filter
+     * models according to data in model fields.
+     * - Pass data provider to CGridView, CListView or any similar widget.
+     *
+     * @return CActiveDataProvider the data provider that can return the models
+     * based on the search/filter conditions.
+     */
+    public function search()
+    {
+        // @todo Please modify the following code to remove attributes that should not be searched.
 
-		$criteria=new CDbCriteria;
+        $criteria=new CDbCriteria;
 
-		$criteria->compare('id',$this->id);
-		$criteria->compare('event',$this->event,true);
-		$criteria->compare('event_data',$this->event_data,true);
-		$criteria->compare('uri',$this->uri,true);
-		$criteria->compare('content_id',$this->content_id,true);
-		$criteria->compare('created',$this->created,true);
+        $criteria->compare('id',$this->id);
+        $criteria->compare('event',$this->event,true);
+        $criteria->compare('event_data',$this->event_data,true);
+        $criteria->compare('uri',$this->uri,true);
+        $criteria->compare('content_id',$this->content_id,true);
+        $criteria->compare('created',$this->created,true);
 
-		return new CActiveDataProvider($this, array(
-			'criteria'=>$criteria,
-		));
-	}
+        return new CActiveDataProvider($this, array(
+            'criteria'=>$criteria,
+        ));
+    }
 
-	/**
-	 * Returns the static model of the specified AR class.
-	 * Please note that you should have this exact method in all your CActiveRecord descendants!
-	 * @param string $className active record class name.
-	 * @return Events the static model class
-	 */
-	public static function model($className=__CLASS__)
-	{
-		return parent::model($className);
-	}
+    /**
+     * Returns the static model of the specified AR class.
+     * Please note that you should have this exact method in all your CActiveRecord descendants!
+     * @param string $className active record class name.
+     * @return Events the static model class
+     */
+    public static function model($className=__CLASS__)
+    {
+        return parent::model($className);
+    }
 }

Spacing +21 added lines, -21 removed lines

@@ -16,14 +16,14 @@ 
 	 * Adds the CTimestampBehavior to this class
 	 * @return array
 	 */
-	public function behaviors()
+	public function behaviors ()
 	{
 		return array(
 			'CTimestampBehavior' => array(
 				'class' 			=> 'zii.behaviors.CTimestampBehavior',
 				'createAttribute' 	=> 'created',
 				'updateAttribute' 	=> 'created',
-				'timestampExpression' => time(),
+				'timestampExpression' => time (),
 				'setUpdateOnCreate' => false
 			)
 		);
@@ -32,14 +32,14 @@ 
 	/**
 	 * Query Scoping
 	 */
-	public function scopes()
+	public function scopes ()
 	{
 		return array(
 			'groupByUrl' => array(
 				'group'   => 't.uri',
 				'select'  => 't.uri, COUNT(*) as id',
 				'order'   => 't.id ASC',
-				'condition' => 't.event = "_trackPageView" AND t.created >= ' . strtotime("24 hours ago")
+				'condition' => 't.event = "_trackPageView" AND t.created >= '.strtotime ("24 hours ago")
 			),
 		);
 	}
@@ -47,7 +47,7 @@ 
 	/**
 	 * @return string the associated database table name
 	 */
-	public function tableName()
+	public function tableName ()
 	{
 		return 'events';
 	}
@@ -55,7 +55,7 @@ 
 	/**
 	 * @return array validation rules for model attributes.
 	 */
-	public function rules()
+	public function rules ()
 	{
 		// NOTE: you should only define rules for those attributes that
 		// will receive user inputs.
@@ -71,7 +71,7 @@ 
 	/**
 	 * @return array customized attribute labels (name=>label)
 	 */
-	public function attributeLabels()
+	public function attributeLabels ()
 	{
 		return array(
 			'id' => 'ID',
@@ -83,10 +83,10 @@ 
 		);
 	}
 
-	public function beforeValidate()
+	public function beforeValidate ()
 	{
-		$this->event_data = CJSON::encode($this->event_data);
-		return parent::beforeValidate();
+		$this->event_data = CJSON::encode ($this->event_data);
+		return parent::beforeValidate ();
 	}
 
 	/**
@@ -101,20 +101,20 @@ 
 	 * @return CActiveDataProvider the data provider that can return the models
 	 * based on the search/filter conditions.
 	 */
-	public function search()
+	public function search ()
 	{
 		// @todo Please modify the following code to remove attributes that should not be searched.
 
-		$criteria=new CDbCriteria;
+		$criteria = new CDbCriteria;
 
-		$criteria->compare('id',$this->id);
-		$criteria->compare('event',$this->event,true);
-		$criteria->compare('event_data',$this->event_data,true);
-		$criteria->compare('uri',$this->uri,true);
-		$criteria->compare('content_id',$this->content_id,true);
-		$criteria->compare('created',$this->created,true);
+		$criteria->compare ('id', $this->id);
+		$criteria->compare ('event', $this->event, true);
+		$criteria->compare ('event_data', $this->event_data, true);
+		$criteria->compare ('uri', $this->uri, true);
+		$criteria->compare ('content_id', $this->content_id, true);
+		$criteria->compare ('created', $this->created, true);
 
-		return new CActiveDataProvider($this, array(
+		return new CActiveDataProvider ($this, array(
 			'criteria'=>$criteria,
 		));
 	}
@@ -125,8 +125,8 @@ 
 	 * @param string $className active record class name.
 	 * @return Events the static model class
 	 */
-	public static function model($className=__CLASS__)
+	public static function model ($className = __CLASS__)
 	{
-		return parent::model($className);
+		return parent::model ($className);
 	}
 }

protected/models/UserMetadata.php

Indentation +75 added lines, -75 removed lines

@@ -16,86 +16,86 @@
  */

 class UserMetadata extends CiiModel

 {

-	/**

-	 * Returns the static model of the specified AR class.

-	 * @param string $className active record class name.

-	 * @return UserMetadata the static model class

-	 */

-	public static function model($className=__CLASS__)

-	{

-		return parent::model($className);

-	}

+    /**

+     * Returns the static model of the specified AR class.

+     * @param string $className active record class name.

+     * @return UserMetadata the static model class

+     */

+    public static function model($className=__CLASS__)

+    {

+        return parent::model($className);

+    }

 

-	/**

-	 * @return string the associated database table name

-	 */

-	public function tableName()

-	{

-		return 'user_metadata';

-	}

+    /**

+     * @return string the associated database table name

+     */

+    public function tableName()

+    {

+        return 'user_metadata';

+    }

 

-	/**

-	 * @return array validation rules for model attributes.

-	 */

-	public function rules()

-	{

-		// NOTE: you should only define rules for those attributes that

-		// will receive user inputs.

-		return array(

-			array('user_id, key, value', 'required'),

-			array('user_id, entity_type', 'numerical', 'integerOnly'=>true),

-			array('key', 'length', 'max'=>50),

-			// The following rule is used by search().

-			array('id, user_id, key, value, entity_type, created, updated', 'safe', 'on'=>'search'),

-		);

-	}

+    /**

+     * @return array validation rules for model attributes.

+     */

+    public function rules()

+    {

+        // NOTE: you should only define rules for those attributes that

+        // will receive user inputs.

+        return array(

+            array('user_id, key, value', 'required'),

+            array('user_id, entity_type', 'numerical', 'integerOnly'=>true),

+            array('key', 'length', 'max'=>50),

+            // The following rule is used by search().

+            array('id, user_id, key, value, entity_type, created, updated', 'safe', 'on'=>'search'),

+        );

+    }

 

-	/**

-	 * @return array relational rules.

-	 */

-	public function relations()

-	{

-		// NOTE: you may need to adjust the relation name and the related

-		// class name for the relations automatically generated below.

-		return array(

-			'user' => array(self::BELONGS_TO, 'Users', 'user_id'),

-		);

-	}

+    /**

+     * @return array relational rules.

+     */

+    public function relations()

+    {

+        // NOTE: you may need to adjust the relation name and the related

+        // class name for the relations automatically generated below.

+        return array(

+            'user' => array(self::BELONGS_TO, 'Users', 'user_id'),

+        );

+    }

 

-	/**

-	 * @return array customized attribute labels (name=>label)

-	 */

-	public function attributeLabels()

-	{

-		return array(

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

-			'user_id' 	  => Yii::t('ciims.models.UserMetadata', 'User'),

-			'key' 		  => Yii::t('ciims.models.UserMetadata', 'Key'),

-			'value' 	  => Yii::t('ciims.models.UserMetadata', 'Value'),

-			'entity_type' => Yii::t('ciims.models.UserMetadata', 'Entity Type'),

-			'created' 	  => Yii::t('ciims.models.UserMetadata', 'Created'),

-			'updated'     => Yii::t('ciims.models.UserMetadata', 'Updated'),

-		);

-	}

+    /**

+     * @return array customized attribute labels (name=>label)

+     */

+    public function attributeLabels()

+    {

+        return array(

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

+            'user_id' 	  => Yii::t('ciims.models.UserMetadata', 'User'),

+            'key' 		  => Yii::t('ciims.models.UserMetadata', 'Key'),

+            'value' 	  => Yii::t('ciims.models.UserMetadata', 'Value'),

+            'entity_type' => Yii::t('ciims.models.UserMetadata', 'Entity Type'),

+            'created' 	  => Yii::t('ciims.models.UserMetadata', 'Created'),

+            'updated'     => Yii::t('ciims.models.UserMetadata', 'Updated'),

+        );

+    }

 

-	/**

-	 * Retrieves a list of models based on the current search/filter conditions.

-	 * @return CActiveDataProvider the data provider that can return the models based on the search/filter conditions.

-	 */

-	public function search()

-	{

-		$criteria=new CDbCriteria;

+    /**

+     * Retrieves a list of models based on the current search/filter conditions.

+     * @return CActiveDataProvider the data provider that can return the models based on the search/filter conditions.

+     */

+    public function search()

+    {

+        $criteria=new CDbCriteria;

 

-		$criteria->compare('id',$this->id);

-		$criteria->compare('user_id',$this->user_id);

-		$criteria->compare('key',$this->key,true);

-		$criteria->compare('value',$this->value,true);

-		$criteria->compare('entity_type',$this->entity_type,true);

-		$criteria->compare('created',$this->created,true);

-		$criteria->compare('updated',$this->updated,true);

+        $criteria->compare('id',$this->id);

+        $criteria->compare('user_id',$this->user_id);

+        $criteria->compare('key',$this->key,true);

+        $criteria->compare('value',$this->value,true);

+        $criteria->compare('entity_type',$this->entity_type,true);

+        $criteria->compare('created',$this->created,true);

+        $criteria->compare('updated',$this->updated,true);

 

-		return new CActiveDataProvider($this, array(

-			'criteria'=>$criteria,

-		));

-	}

+        return new CActiveDataProvider($this, array(

+            'criteria'=>$criteria,

+        ));

+    }

 }

Spacing +23 added lines, -23 removed lines

@@ -21,15 +21,15 @@ 
 	 * @param string $className active record class name.

 	 * @return UserMetadata the static model class

 	 */

-	public static function model($className=__CLASS__)

+	public static function model ($className = __CLASS__)

 	{

-		return parent::model($className);

+		return parent::model ($className);

 	}

 

 	/**

 	 * @return string the associated database table name

 	 */

-	public function tableName()

+	public function tableName ()

 	{

 		return 'user_metadata';

 	}

@@ -37,7 +37,7 @@ 
 	/**

 	 * @return array validation rules for model attributes.

 	 */

-	public function rules()

+	public function rules ()

 	{

 		// NOTE: you should only define rules for those attributes that

 		// will receive user inputs.

@@ -53,7 +53,7 @@ 
 	/**

 	 * @return array relational rules.

 	 */

-	public function relations()

+	public function relations ()

 	{

 		// NOTE: you may need to adjust the relation name and the related

 		// class name for the relations automatically generated below.

@@ -65,16 +65,16 @@ 
 	/**

 	 * @return array customized attribute labels (name=>label)

 	 */

-	public function attributeLabels()

+	public function attributeLabels ()

 	{

 		return array(

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

-			'user_id' 	  => Yii::t('ciims.models.UserMetadata', 'User'),

-			'key' 		  => Yii::t('ciims.models.UserMetadata', 'Key'),

-			'value' 	  => Yii::t('ciims.models.UserMetadata', 'Value'),

-			'entity_type' => Yii::t('ciims.models.UserMetadata', 'Entity Type'),

-			'created' 	  => Yii::t('ciims.models.UserMetadata', 'Created'),

-			'updated'     => Yii::t('ciims.models.UserMetadata', 'Updated'),

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

+			'user_id' 	  => Yii::t ('ciims.models.UserMetadata', 'User'),

+			'key' 		  => Yii::t ('ciims.models.UserMetadata', 'Key'),

+			'value' 	  => Yii::t ('ciims.models.UserMetadata', 'Value'),

+			'entity_type' => Yii::t ('ciims.models.UserMetadata', 'Entity Type'),

+			'created' 	  => Yii::t ('ciims.models.UserMetadata', 'Created'),

+			'updated'     => Yii::t ('ciims.models.UserMetadata', 'Updated'),

 		);

 	}

 

@@ -82,19 +82,19 @@ 
 	 * Retrieves a list of models based on the current search/filter conditions.

 	 * @return CActiveDataProvider the data provider that can return the models based on the search/filter conditions.

 	 */

-	public function search()

+	public function search ()

 	{

-		$criteria=new CDbCriteria;

+		$criteria = new CDbCriteria;

 

-		$criteria->compare('id',$this->id);

-		$criteria->compare('user_id',$this->user_id);

-		$criteria->compare('key',$this->key,true);

-		$criteria->compare('value',$this->value,true);

-		$criteria->compare('entity_type',$this->entity_type,true);

-		$criteria->compare('created',$this->created,true);

-		$criteria->compare('updated',$this->updated,true);

+		$criteria->compare ('id', $this->id);

+		$criteria->compare ('user_id', $this->user_id);

+		$criteria->compare ('key', $this->key, true);

+		$criteria->compare ('value', $this->value, true);

+		$criteria->compare ('entity_type', $this->entity_type, true);

+		$criteria->compare ('created', $this->created, true);

+		$criteria->compare ('updated', $this->updated, true);

 

-		return new CActiveDataProvider($this, array(

+		return new CActiveDataProvider ($this, array(

 			'criteria'=>$criteria,

 		));

 	}

Braces +14 added lines, -14 removed lines

@@ -14,31 +14,31 @@ 
  * The followings are the available model relations:

  * @property Users $user

  */

-class UserMetadata extends CiiModel

-{

+class UserMetadata extends CiiModel
+{
 	/**

 	 * Returns the static model of the specified AR class.

 	 * @param string $className active record class name.

 	 * @return UserMetadata the static model class

 	 */

-	public static function model($className=__CLASS__)

-	{

+	public static function model($className=__CLASS__)
+	{
 		return parent::model($className);

 	}

 

 	/**

 	 * @return string the associated database table name

 	 */

-	public function tableName()

-	{

+	public function tableName()
+	{
 		return 'user_metadata';

 	}

 

 	/**

 	 * @return array validation rules for model attributes.

 	 */

-	public function rules()

-	{

+	public function rules()
+	{
 		// NOTE: you should only define rules for those attributes that

 		// will receive user inputs.

 		return array(

@@ -53,8 +53,8 @@ 
 	/**

 	 * @return array relational rules.

 	 */

-	public function relations()

-	{

+	public function relations()
+	{
 		// NOTE: you may need to adjust the relation name and the related

 		// class name for the relations automatically generated below.

 		return array(

@@ -65,8 +65,8 @@ 
 	/**

 	 * @return array customized attribute labels (name=>label)

 	 */

-	public function attributeLabels()

-	{

+	public function attributeLabels()
+	{
 		return array(

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

 			'user_id' 	  => Yii::t('ciims.models.UserMetadata', 'User'),

@@ -82,8 +82,8 @@ 
 	 * Retrieves a list of models based on the current search/filter conditions.

 	 * @return CActiveDataProvider the data provider that can return the models based on the search/filter conditions.

 	 */

-	public function search()

-	{

+	public function search()
+	{
 		$criteria=new CDbCriteria;

 

 		$criteria->compare('id',$this->id);

protected/models/UserRoles.php

Indentation +180 added lines, -180 removed lines

@@ -15,184 +15,184 @@
 class UserRoles extends CiiModel

 {

 

-	/**

-	 * Returns a key => value array of userRole => bitwise permissions

-	 *

-	 * Permissions apply per role, with the exception of publisher and admin, whose permissions apply to everything

-	 * Note that these permissions only apply to content, and management of CiiMS' settings

-	 *

-	 * --------------------------------------------------------------------------------

-	 * | role/id | manage | publish other | publish | delete | update | create | read |

-	 * --------------------------------------------------------------------------------

-	 * |  user/1 |   0    |        0      |    0    |    0   |    0   |    0   |  1   |

-	 * --------------------------------------------------------------------------------

-	 * | clb/5   |   0    |        0      |    0    |    0   |    1   |    1   |  1   |

-	 * --------------------------------------------------------------------------------

-	 * | auth/7  |   0    |        0      |    1    |    1   |    1   |    1   |  1   |

-	 * --------------------------------------------------------------------------------

-	 * | pub/8   |   0    |        1      |    1    |    1   |    1   |    1   |  1   |

-	 * --------------------------------------------------------------------------------

-	 * | admin/9 |   1    |        1      |    1    |    1   |    1   |    1   |  1   |

-	 * --------------------------------------------------------------------------------

-	 * @return array

-	 */

-	public function getPermissions()

-	{

-		return array(

-			'1' => 1,		// User

-			'2' => 0,		// Pending

-			'3' => 0,		// Suspended

-			'5' => 7,		// Collaborator

-			'7' => 16,		// Author

-			'8' => 32,		// Publisher

-			'9' => 64		// Admin

-		);

-	}

-

-	public function isA($roleName, $role=false)

-	{

-		if ($role === false)

-			$role = Yii::app()->user->role;

-

-		$roleName = strtolower($roleName);

-

-		switch ($roleName)

-		{

-			case 'user':

-				return $role <= 1;

-			case 'collaborator':

-				return $role == 5;

-			case 'author':

-				return $role == 7;

-			case 'publisher':

-				return $role == 8;

-			case 'admin':

-				return $role == 9;

-		}

-

-		return false;

-	}

-

-	/**

-	 * Returns the bitwise permissions associated to each activity

-	 * @return array

-	 */

-	public function getActivities()

-	{

-		return array(

-			'read' 			=> 1,

-			'comment' 		=> 1,

-			'create' 		=> 3,

-			'update' 		=> 4,

-			'modify' 		=> 7,

-			'delete' 		=> 8,

-			'publish' 		=> 16,

-			'publishOther' 	=> 32,

-			'manage' 		=> 64

-		);

-	}

-

-	/**

-	 * Determines if a user with a given role has permission to perform a given activity

-	 * @param string $permission   The permissions we want to lookup

-	 * @param int 	 $role 			The user role. If not provided, will be applied to the current user

-	 * @return boolean

-	 */

-	public function hasPermission($permission, $role=NULL)

-	{

-		if ($role === NULL)

-		{

-			if (isset($this->id))

-				$role = $this->id;

-			else if (Yii::app()->user->isGuest)

-				$role = 1;

-			else

-				$role = Yii::app()->user->role;

-		}

-

-		$permissions = $this->getPermissions();

-		$activities = $this->getActivities();

-

-		// If the permission doesn't exist for that role, return false;

-		if (!isset($permissions[$role]))

-			return false;

-

-		return $activities[$permission] <= $permissions[$role];

-	}

-

-	/**

-	 * Returns the static model of the specified AR class.

-	 * @param string $className active record class name.

-	 * @return UserRoles the static model class

-	 */

-	public static function model($className=__CLASS__)

-	{

-		return parent::model($className);

-	}

-

-	/**

-	 * @return string the associated database table name

-	 */

-	public function tableName()

-	{

-		return 'user_roles';

-	}

-

-	/**

-	 * @return array validation rules for model attributes.

-	 */

-	public function rules()

-	{

-		// NOTE: you should only define rules for those attributes that

-		// will receive user inputs.

-		return array(

-			array('name', 'required'),

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

-			// The following rule is used by search().

-			array('id, name, created, updated', 'safe', 'on'=>'search'),

-		);

-	}

-

-	/**

-	 * @return array relational rules.

-	 */

-	public function relations()

-	{

-		// NOTE: you may need to adjust the relation name and the related

-		// class name for the relations automatically generated below.

-		return array(

-			'users' => array(self::HAS_MANY, 'Users', 'user_role'),

-		);

-	}

-

-	/**

-	 * @return array customized attribute labels (name=>label)

-	 */

-	public function attributeLabels()

-	{

-		return array(

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

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

-			'created' => Yii::t('ciims.models.UserRoles', 'Created'),

-			'updated' => Yii::t('ciims.models.UserRoles', 'Updated'),

-		);

-	}

-

-	/**

-	 * Retrieves a list of models based on the current search/filter conditions.

-	 * @return CActiveDataProvider the data provider that can return the models based on the search/filter conditions.

-	 */

-	public function search()

-	{

-		$criteria=new CDbCriteria;

-

-		$criteria->compare('id',$this->id);

-		$criteria->compare('name',$this->name,true);

-		$criteria->compare('created',$this->created,true);

-		$criteria->compare('updated',$this->updated,true);

-

-		return new CActiveDataProvider($this, array(

-			'criteria'=>$criteria,

-		));

-	}

+    /**

+     * Returns a key => value array of userRole => bitwise permissions

+     *

+     * Permissions apply per role, with the exception of publisher and admin, whose permissions apply to everything

+     * Note that these permissions only apply to content, and management of CiiMS' settings

+     *

+     * --------------------------------------------------------------------------------

+     * | role/id | manage | publish other | publish | delete | update | create | read |

+     * --------------------------------------------------------------------------------

+     * |  user/1 |   0    |        0      |    0    |    0   |    0   |    0   |  1   |

+     * --------------------------------------------------------------------------------

+     * | clb/5   |   0    |        0      |    0    |    0   |    1   |    1   |  1   |

+     * --------------------------------------------------------------------------------

+     * | auth/7  |   0    |        0      |    1    |    1   |    1   |    1   |  1   |

+     * --------------------------------------------------------------------------------

+     * | pub/8   |   0    |        1      |    1    |    1   |    1   |    1   |  1   |

+     * --------------------------------------------------------------------------------

+     * | admin/9 |   1    |        1      |    1    |    1   |    1   |    1   |  1   |

+     * --------------------------------------------------------------------------------

+     * @return array

+     */

+    public function getPermissions()

+    {

+        return array(

+            '1' => 1,		// User

+            '2' => 0,		// Pending

+            '3' => 0,		// Suspended

+            '5' => 7,		// Collaborator

+            '7' => 16,		// Author

+            '8' => 32,		// Publisher

+            '9' => 64		// Admin

+        );

+    }

+

+    public function isA($roleName, $role=false)

+    {

+        if ($role === false)

+            $role = Yii::app()->user->role;

+

+        $roleName = strtolower($roleName);

+

+        switch ($roleName)

+        {

+            case 'user':

+                return $role <= 1;

+            case 'collaborator':

+                return $role == 5;

+            case 'author':

+                return $role == 7;

+            case 'publisher':

+                return $role == 8;

+            case 'admin':

+                return $role == 9;

+        }

+

+        return false;

+    }

+

+    /**

+     * Returns the bitwise permissions associated to each activity

+     * @return array

+     */

+    public function getActivities()

+    {

+        return array(

+            'read' 			=> 1,

+            'comment' 		=> 1,

+            'create' 		=> 3,

+            'update' 		=> 4,

+            'modify' 		=> 7,

+            'delete' 		=> 8,

+            'publish' 		=> 16,

+            'publishOther' 	=> 32,

+            'manage' 		=> 64

+        );

+    }

+

+    /**

+     * Determines if a user with a given role has permission to perform a given activity

+     * @param string $permission   The permissions we want to lookup

+     * @param int 	 $role 			The user role. If not provided, will be applied to the current user

+     * @return boolean

+     */

+    public function hasPermission($permission, $role=NULL)

+    {

+        if ($role === NULL)

+        {

+            if (isset($this->id))

+                $role = $this->id;

+            else if (Yii::app()->user->isGuest)

+                $role = 1;

+            else

+                $role = Yii::app()->user->role;

+        }

+

+        $permissions = $this->getPermissions();

+        $activities = $this->getActivities();

+

+        // If the permission doesn't exist for that role, return false;

+        if (!isset($permissions[$role]))

+            return false;

+

+        return $activities[$permission] <= $permissions[$role];

+    }

+

+    /**

+     * Returns the static model of the specified AR class.

+     * @param string $className active record class name.

+     * @return UserRoles the static model class

+     */

+    public static function model($className=__CLASS__)

+    {

+        return parent::model($className);

+    }

+

+    /**

+     * @return string the associated database table name

+     */

+    public function tableName()

+    {

+        return 'user_roles';

+    }

+

+    /**

+     * @return array validation rules for model attributes.

+     */

+    public function rules()

+    {

+        // NOTE: you should only define rules for those attributes that

+        // will receive user inputs.

+        return array(

+            array('name', 'required'),

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

+            // The following rule is used by search().

+            array('id, name, created, updated', 'safe', 'on'=>'search'),

+        );

+    }

+

+    /**

+     * @return array relational rules.

+     */

+    public function relations()

+    {

+        // NOTE: you may need to adjust the relation name and the related

+        // class name for the relations automatically generated below.

+        return array(

+            'users' => array(self::HAS_MANY, 'Users', 'user_role'),

+        );

+    }

+

+    /**

+     * @return array customized attribute labels (name=>label)

+     */

+    public function attributeLabels()

+    {

+        return array(

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

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

+            'created' => Yii::t('ciims.models.UserRoles', 'Created'),

+            'updated' => Yii::t('ciims.models.UserRoles', 'Updated'),

+        );

+    }

+

+    /**

+     * Retrieves a list of models based on the current search/filter conditions.

+     * @return CActiveDataProvider the data provider that can return the models based on the search/filter conditions.

+     */

+    public function search()

+    {

+        $criteria=new CDbCriteria;

+

+        $criteria->compare('id',$this->id);

+        $criteria->compare('name',$this->name,true);

+        $criteria->compare('created',$this->created,true);

+        $criteria->compare('updated',$this->updated,true);

+

+        return new CActiveDataProvider($this, array(

+            'criteria'=>$criteria,

+        ));

+    }

 }

Spacing +33 added lines, -33 removed lines

@@ -36,25 +36,25 @@ 
 	 * --------------------------------------------------------------------------------

 	 * @return array

 	 */

-	public function getPermissions()

+	public function getPermissions ()

 	{

 		return array(

-			'1' => 1,		// User

-			'2' => 0,		// Pending

-			'3' => 0,		// Suspended

-			'5' => 7,		// Collaborator

-			'7' => 16,		// Author

-			'8' => 32,		// Publisher

+			'1' => 1, // User

+			'2' => 0, // Pending

+			'3' => 0, // Suspended

+			'5' => 7, // Collaborator

+			'7' => 16, // Author

+			'8' => 32, // Publisher

 			'9' => 64		// Admin

 		);

 	}

 

-	public function isA($roleName, $role=false)

+	public function isA ($roleName, $role = false)

 	{

 		if ($role === false)

-			$role = Yii::app()->user->role;

+			$role = Yii::app ()->user->role;

 

-		$roleName = strtolower($roleName);

+		$roleName = strtolower ($roleName);

 

 		switch ($roleName)

 		{

@@ -77,7 +77,7 @@ 
 	 * Returns the bitwise permissions associated to each activity

 	 * @return array

 	 */

-	public function getActivities()

+	public function getActivities ()

 	{

 		return array(

 			'read' 			=> 1,

@@ -98,20 +98,20 @@ 
 	 * @param int 	 $role 			The user role. If not provided, will be applied to the current user

 	 * @return boolean

 	 */

-	public function hasPermission($permission, $role=NULL)

+	public function hasPermission ($permission, $role = NULL)

 	{

 		if ($role === NULL)

 		{

 			if (isset($this->id))

 				$role = $this->id;

-			else if (Yii::app()->user->isGuest)

+			else if (Yii::app ()->user->isGuest)

 				$role = 1;

 			else

-				$role = Yii::app()->user->role;

+				$role = Yii::app ()->user->role;

 		}

 

-		$permissions = $this->getPermissions();

-		$activities = $this->getActivities();

+		$permissions = $this->getPermissions ();

+		$activities = $this->getActivities ();

 

 		// If the permission doesn't exist for that role, return false;

 		if (!isset($permissions[$role]))

@@ -125,15 +125,15 @@ 
 	 * @param string $className active record class name.

 	 * @return UserRoles the static model class

 	 */

-	public static function model($className=__CLASS__)

+	public static function model ($className = __CLASS__)

 	{

-		return parent::model($className);

+		return parent::model ($className);

 	}

 

 	/**

 	 * @return string the associated database table name

 	 */

-	public function tableName()

+	public function tableName ()

 	{

 		return 'user_roles';

 	}

@@ -141,7 +141,7 @@ 
 	/**

 	 * @return array validation rules for model attributes.

 	 */

-	public function rules()

+	public function rules ()

 	{

 		// NOTE: you should only define rules for those attributes that

 		// will receive user inputs.

@@ -156,7 +156,7 @@ 
 	/**

 	 * @return array relational rules.

 	 */

-	public function relations()

+	public function relations ()

 	{

 		// NOTE: you may need to adjust the relation name and the related

 		// class name for the relations automatically generated below.

@@ -168,13 +168,13 @@ 
 	/**

 	 * @return array customized attribute labels (name=>label)

 	 */

-	public function attributeLabels()

+	public function attributeLabels ()

 	{

 		return array(

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

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

-			'created' => Yii::t('ciims.models.UserRoles', 'Created'),

-			'updated' => Yii::t('ciims.models.UserRoles', 'Updated'),

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

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

+			'created' => Yii::t ('ciims.models.UserRoles', 'Created'),

+			'updated' => Yii::t ('ciims.models.UserRoles', 'Updated'),

 		);

 	}

 

@@ -182,16 +182,16 @@ 
 	 * Retrieves a list of models based on the current search/filter conditions.

 	 * @return CActiveDataProvider the data provider that can return the models based on the search/filter conditions.

 	 */

-	public function search()

+	public function search ()

 	{

-		$criteria=new CDbCriteria;

+		$criteria = new CDbCriteria;

 

-		$criteria->compare('id',$this->id);

-		$criteria->compare('name',$this->name,true);

-		$criteria->compare('created',$this->created,true);

-		$criteria->compare('updated',$this->updated,true);

+		$criteria->compare ('id', $this->id);

+		$criteria->compare ('name', $this->name, true);

+		$criteria->compare ('created', $this->created, true);

+		$criteria->compare ('updated', $this->updated, true);

 

-		return new CActiveDataProvider($this, array(

+		return new CActiveDataProvider ($this, array(

 			'criteria'=>$criteria,

 		));

 	}

Braces +35 added lines, -32 removed lines

@@ -12,8 +12,8 @@ 
  * The followings are the available model relations:

  * @property Users[] $users

  */

-class UserRoles extends CiiModel

-{

+class UserRoles extends CiiModel
+{
 

 	/**

 	 * Returns a key => value array of userRole => bitwise permissions

@@ -36,8 +36,8 @@ 
 	 * --------------------------------------------------------------------------------

 	 * @return array

 	 */

-	public function getPermissions()

-	{

+	public function getPermissions()
+	{
 		return array(

 			'1' => 1,		// User

 			'2' => 0,		// Pending

@@ -49,10 +49,11 @@ 
 		);

 	}

 

-	public function isA($roleName, $role=false)

-	{

-		if ($role === false)

-			$role = Yii::app()->user->role;

+	public function isA($roleName, $role=false)
+	{
+		if ($role === false) {
+					$role = Yii::app()->user->role;
+		}
 

 		$roleName = strtolower($roleName);

 

@@ -77,8 +78,8 @@ 
 	 * Returns the bitwise permissions associated to each activity

 	 * @return array

 	 */

-	public function getActivities()

-	{

+	public function getActivities()
+	{
 		return array(

 			'read' 			=> 1,

 			'comment' 		=> 1,

@@ -98,24 +99,26 @@ 
 	 * @param int 	 $role 			The user role. If not provided, will be applied to the current user

 	 * @return boolean

 	 */

-	public function hasPermission($permission, $role=NULL)

-	{

+	public function hasPermission($permission, $role=NULL)
+	{
 		if ($role === NULL)

 		{

-			if (isset($this->id))

-				$role = $this->id;

-			else if (Yii::app()->user->isGuest)

-				$role = 1;

-			else

-				$role = Yii::app()->user->role;

+			if (isset($this->id)) {
+							$role = $this->id;
+			} else if (Yii::app()->user->isGuest) {
+							$role = 1;
+			} else {
+							$role = Yii::app()->user->role;
+			}
 		}

 

 		$permissions = $this->getPermissions();

 		$activities = $this->getActivities();

 

 		// If the permission doesn't exist for that role, return false;

-		if (!isset($permissions[$role]))

-			return false;

+		if (!isset($permissions[$role])) {
+					return false;
+		}
 

 		return $activities[$permission] <= $permissions[$role];

 	}

@@ -125,24 +128,24 @@ 
 	 * @param string $className active record class name.

 	 * @return UserRoles the static model class

 	 */

-	public static function model($className=__CLASS__)

-	{

+	public static function model($className=__CLASS__)
+	{
 		return parent::model($className);

 	}

 

 	/**

 	 * @return string the associated database table name

 	 */

-	public function tableName()

-	{

+	public function tableName()
+	{
 		return 'user_roles';

 	}

 

 	/**

 	 * @return array validation rules for model attributes.

 	 */

-	public function rules()

-	{

+	public function rules()
+	{
 		// NOTE: you should only define rules for those attributes that

 		// will receive user inputs.

 		return array(

@@ -156,8 +159,8 @@ 
 	/**

 	 * @return array relational rules.

 	 */

-	public function relations()

-	{

+	public function relations()
+	{
 		// NOTE: you may need to adjust the relation name and the related

 		// class name for the relations automatically generated below.

 		return array(

@@ -168,8 +171,8 @@ 
 	/**

 	 * @return array customized attribute labels (name=>label)

 	 */

-	public function attributeLabels()

-	{

+	public function attributeLabels()
+	{
 		return array(

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

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

@@ -182,8 +185,8 @@ 
 	 * Retrieves a list of models based on the current search/filter conditions.

 	 * @return CActiveDataProvider the data provider that can return the models based on the search/filter conditions.

 	 */

-	public function search()

-	{

+	public function search()
+	{
 		$criteria=new CDbCriteria;

 

 		$criteria->compare('id',$this->id);

protected/models/Users.php

Indentation +289 added lines, -289 removed lines

@@ -25,303 +25,303 @@
  */
 class Users extends CiiModel
 {
-	const INACTIVE = 0;
-	const ACTIVE = 1;
-	const BANNED = 2;
-	const PENDING_INVITATION = 3;
-
-	public $pageSize = 15;
-
-	/**
-	 * Returns the static model of the specified AR class.
-	 * @param string $className active record class name.
-	 * @return Users the static model class
-	 */
-	public static function model($className=__CLASS__)
-	{
-		return parent::model($className);
-	}
-
-	/**
-	 * @return string the associated database table name
-	 */
-	public function tableName()
-	{
-		return 'users';
-	}
-
-	/**
-	 * @return array validation rules for model attributes.
-	 */
-	public function rules()
-	{
-		// NOTE: you should only define rules for those attributes that
-		// will receive user inputs.
-		return array(
-			array('email, password, username, user_role, status', 'required'),
-			array('email', 'email'),
-			array('user_role, status', 'numerical', 'integerOnly'=>true),
-			array('email, username', 'length', 'max'=>255),
-			array('password', 'length', 'max'=>64),
-			// The following rule is used by search().
-			array('id, email, password, username, about, user_role, status, created, updated', 'safe', 'on'=>'search'),
-		);
-	}
-
-	/**
-	 * @return array relational rules.
-	 */
-	public function relations()
-	{
-		// NOTE: you may need to adjust the relation name and the related
-		// class name for the relations automatically generated below.
-		return array(
-			'comments' 	=> array(self::HAS_MANY, 'Comments', 'user_id'),
-			'content' 	=> array(self::HAS_MANY, 'Content', 'author_id'),
-			'metadata' 	=> array(self::HAS_MANY, 'UserMetadata', 'user_id', 'condition' => '`metadata`.`entity_type` = 0'),
-			'role' 		=> array(self::BELONGS_TO, 'UserRoles', 'user_role'),
-		);
-	}
-
-	/**
-	 * @return array customized attribute labels (name=>label)
-	 */
-	public function attributeLabels()
-	{
-		return array(
-			'id' 		  => Yii::t('ciims.models.Users', 'ID'),
-			'email' 	  => Yii::t('ciims.models.Users', 'Email'),
-			'password' 	  => Yii::t('ciims.models.Users', 'Password'),
-			'username'    => Yii::t('ciims.models.Users', 'User Name'),
-			'user_role'   => Yii::t('ciims.models.Users', 'User Role'),
-			'status'	  => Yii::t('ciims.models.Users', 'Active'),
-			'created' 	  => Yii::t('ciims.models.Users', 'Created'),
-			'updated' 	  => Yii::t('ciims.models.Users', 'Updated'),
-		);
-	}
-
-	/**
-	 * Gets the first and last name instead of the username
-	 */
-	public function getName()
-	{
-		return $this->username;
-	}
-
-	/**
-	 * Retrieves the username
-	 */
-	public function getUsername()
-	{
-		return $this->username;
-	}
-
-	/**
-	 * Retrieves the username
-	 * @todo This is technical debt. At some point this should be completely depricated
-	 */
-	public function getDisplayName()
-	{
-		Yii::log('Users::displayName has been deprecated. Use Users::username moving forward', 'warning', 'models.users');
-		return $this->getUsername();
-	}
-
-	/**
-	 * Retrieves the reputation for a given user
-	 * @param boolean $model 	Whether an instance of UserMetadata should be returned or not
-	 * @return mixed
-	 */
-	public function getReputation($model=false)
-	{
-		$reputation = UserMetadata::model()->getPrototype('UserMetadata', array('user_id' => $this->id, 'key' => 'reputation'), array('value' => 150));
-
-		if ($model === true)
-			return $reputation;
-
-		return $reputation->value;
-	}
-
-	/**
-	 * Updates a user's reputation
-	 * @return boolean
-	 */
-	public function setReputation($rep = 10)
-	{
-		$reputation = $this->getReputation(true);
-		$reputation->value += $rep;
-		return $reputation->save();
-	}
-
-	/**
-	 * Retrieves all comments that the user has flagged
-	 * @param boolean $model 	Whether an instance of UserMetadata should be returned or not
-	 * @return mixed
-	 */
-	public function getFlaggedComments($model=false)
-	{
-		$flags = UserMetadata::model()->getPrototype('UserMetadata', array('user_id' => $this->id, 'key' => 'flaggedComments'), array('value' => CJSON::encode(array())));
+    const INACTIVE = 0;
+    const ACTIVE = 1;
+    const BANNED = 2;
+    const PENDING_INVITATION = 3;
+
+    public $pageSize = 15;
+
+    /**
+     * Returns the static model of the specified AR class.
+     * @param string $className active record class name.
+     * @return Users the static model class
+     */
+    public static function model($className=__CLASS__)
+    {
+        return parent::model($className);
+    }
+
+    /**
+     * @return string the associated database table name
+     */
+    public function tableName()
+    {
+        return 'users';
+    }
+
+    /**
+     * @return array validation rules for model attributes.
+     */
+    public function rules()
+    {
+        // NOTE: you should only define rules for those attributes that
+        // will receive user inputs.
+        return array(
+            array('email, password, username, user_role, status', 'required'),
+            array('email', 'email'),
+            array('user_role, status', 'numerical', 'integerOnly'=>true),
+            array('email, username', 'length', 'max'=>255),
+            array('password', 'length', 'max'=>64),
+            // The following rule is used by search().
+            array('id, email, password, username, about, user_role, status, created, updated', 'safe', 'on'=>'search'),
+        );
+    }
+
+    /**
+     * @return array relational rules.
+     */
+    public function relations()
+    {
+        // NOTE: you may need to adjust the relation name and the related
+        // class name for the relations automatically generated below.
+        return array(
+            'comments' 	=> array(self::HAS_MANY, 'Comments', 'user_id'),
+            'content' 	=> array(self::HAS_MANY, 'Content', 'author_id'),
+            'metadata' 	=> array(self::HAS_MANY, 'UserMetadata', 'user_id', 'condition' => '`metadata`.`entity_type` = 0'),
+            'role' 		=> array(self::BELONGS_TO, 'UserRoles', 'user_role'),
+        );
+    }
+
+    /**
+     * @return array customized attribute labels (name=>label)
+     */
+    public function attributeLabels()
+    {
+        return array(
+            'id' 		  => Yii::t('ciims.models.Users', 'ID'),
+            'email' 	  => Yii::t('ciims.models.Users', 'Email'),
+            'password' 	  => Yii::t('ciims.models.Users', 'Password'),
+            'username'    => Yii::t('ciims.models.Users', 'User Name'),
+            'user_role'   => Yii::t('ciims.models.Users', 'User Role'),
+            'status'	  => Yii::t('ciims.models.Users', 'Active'),
+            'created' 	  => Yii::t('ciims.models.Users', 'Created'),
+            'updated' 	  => Yii::t('ciims.models.Users', 'Updated'),
+        );
+    }
+
+    /**
+     * Gets the first and last name instead of the username
+     */
+    public function getName()
+    {
+        return $this->username;
+    }
+
+    /**
+     * Retrieves the username
+     */
+    public function getUsername()
+    {
+        return $this->username;
+    }
+
+    /**
+     * Retrieves the username
+     * @todo This is technical debt. At some point this should be completely depricated
+     */
+    public function getDisplayName()
+    {
+        Yii::log('Users::displayName has been deprecated. Use Users::username moving forward', 'warning', 'models.users');
+        return $this->getUsername();
+    }
+
+    /**
+     * Retrieves the reputation for a given user
+     * @param boolean $model 	Whether an instance of UserMetadata should be returned or not
+     * @return mixed
+     */
+    public function getReputation($model=false)
+    {
+        $reputation = UserMetadata::model()->getPrototype('UserMetadata', array('user_id' => $this->id, 'key' => 'reputation'), array('value' => 150));
+
+        if ($model === true)
+            return $reputation;
+
+        return $reputation->value;
+    }
+
+    /**
+     * Updates a user's reputation
+     * @return boolean
+     */
+    public function setReputation($rep = 10)
+    {
+        $reputation = $this->getReputation(true);
+        $reputation->value += $rep;
+        return $reputation->save();
+    }
+
+    /**
+     * Retrieves all comments that the user has flagged
+     * @param boolean $model 	Whether an instance of UserMetadata should be returned or not
+     * @return mixed
+     */
+    public function getFlaggedComments($model=false)
+    {
+        $flags = UserMetadata::model()->getPrototype('UserMetadata', array('user_id' => $this->id, 'key' => 'flaggedComments'), array('value' => CJSON::encode(array())));
 		
-		if ($model === true)
-			return $flags;
-
-		return CJSON::decode($flags->value);
-	}
-
-	/**
-	 * Flags a comment with a given ID
-	 * @return boolean
-	 */
-	public function flagComment($id)
-	{
-		$flaggedComments = $this->getFlaggedComments(true);
-		$flags = CJSON::decode($flaggedComments->value);
-
-		// If the comment has already been flagged, just return true
-		if (in_array($id, $flags))
-			return true;
-
-		$flags[] = $id;
-		$flaggedComments->value = CJSON::encode($flags);
-
-		return $flaggedComments->save();
-	}
-
-	/**
-	 * Retrieves a list of models based on the current search/filter conditions.
-	 * @return CActiveDataProvider the data provider that can return the models based on the search/filter conditions.
-	 */
-	public function search()
-	{
-		$criteria=new CDbCriteria;
-
-		$criteria->compare('id',$this->id);
-		$criteria->compare('email',$this->email,true);
-		$criteria->compare('password',$this->password,true);
-		$criteria->compare('username',$this->username,true);
-		$criteria->compare('user_role',$this->user_role);
-		$criteria->compare('status',$this->status);
-		$criteria->compare('created',$this->created,true);
-		$criteria->compare('updated',$this->updated,true);
-		$criteria->order = "user_role DESC, created DESC";
-
-		return new CActiveDataProvider($this, array(
-			'criteria' => $criteria,
-			'pagination' => array(
-				'pageSize' => $this->pageSize
-			)
-		));
-	}
-
-	/**
-	 * Sets some default values for the user record.
-	 * @see CActiveRecord::beforeValidate()
-	 **/
-	public function beforeValidate()
-	{
-		// If the password is nulled, or unchanged
-		if ($this->password == NULL || $this->password == Cii::get($this->_oldAttributes, 'password', false))
-		{
-			if (!$this->isNewRecord)
-				$this->password = $this->_oldAttributes['password'];
-		}
-		else
-		{
-			$this->password = password_hash($this->password, PASSWORD_BCRYPT, array('cost' => Cii::getBcryptCost()));
-
-			if (!$this->isNewRecord)
-			{
-				$emailSettings = new EmailSettings;
-        		$emailSettings->send(
-					$this,
-					Yii::t('ciims.models.Users', 'CiiMS Password Change Notification'),
-					'base.themes.' . Cii::getConfig('theme', 'default') .'.views.email.passwordchange',
-					array('user' => $this)
-				);
-			}
-		}
-
-		return parent::beforeValidate();
-	}
-
-	/**
-	 * Lets us know if the user likes a given content post or not
-	 * @param  int $id The id of the content we want to know about
-	 * @return bool    Whether or not the user likes the post
-	 */
-	public function likesPost($id = NULL)
-	{
-		if ($id === NULL)
-			return false;
-
-		$likes = UserMetadata::model()->findByAttributes(array('user_id' => $this->id, 'key' => 'likes'));
-
-		if ($likes === NULL)
-			return false;
-
-		$likesArray = json_decode($likes->value, true);
-		if (in_array($id, array_values($likesArray)))
-			return true;
-
-		return false;
-	}
-
-	/**
-	 * Helper method to get the usermetadata object rather than calling getPrototype everywhere
-	 * @param string $key
-	 * @param mixed $value
-	 * @return UserMetadata prototype object
-	 */
-	public function getMetadataObject($key, $value=NULL)
-	{
-		return UserMetadata::model()->getPrototype('UserMetadata', array(
-				'user_id' => $this->id,
-				'key' => $key
-			),array(
-				'user_id' => $this->id,
-				'key' => $key,
-				'value' => $value,
-		));
-	}
-
-	/**
-	 * Helper method to set the usermetadata object rather than calling getPrototype everywhere
-	 * @param string $key
-	 * @param mixed $value
-	 * @return UserMetadata prototype object
-	 */
-	public function setMetadataObject($key, $value)
-	{
-		$metadata = $this->getMetadataObject();
-
-		$metadata->value = $value;
-
-		return $metadata->save();
-	}
-
-	/**
+        if ($model === true)
+            return $flags;
+
+        return CJSON::decode($flags->value);
+    }
+
+    /**
+     * Flags a comment with a given ID
+     * @return boolean
+     */
+    public function flagComment($id)
+    {
+        $flaggedComments = $this->getFlaggedComments(true);
+        $flags = CJSON::decode($flaggedComments->value);
+
+        // If the comment has already been flagged, just return true
+        if (in_array($id, $flags))
+            return true;
+
+        $flags[] = $id;
+        $flaggedComments->value = CJSON::encode($flags);
+
+        return $flaggedComments->save();
+    }
+
+    /**
+     * Retrieves a list of models based on the current search/filter conditions.
+     * @return CActiveDataProvider the data provider that can return the models based on the search/filter conditions.
+     */
+    public function search()
+    {
+        $criteria=new CDbCriteria;
+
+        $criteria->compare('id',$this->id);
+        $criteria->compare('email',$this->email,true);
+        $criteria->compare('password',$this->password,true);
+        $criteria->compare('username',$this->username,true);
+        $criteria->compare('user_role',$this->user_role);
+        $criteria->compare('status',$this->status);
+        $criteria->compare('created',$this->created,true);
+        $criteria->compare('updated',$this->updated,true);
+        $criteria->order = "user_role DESC, created DESC";
+
+        return new CActiveDataProvider($this, array(
+            'criteria' => $criteria,
+            'pagination' => array(
+                'pageSize' => $this->pageSize
+            )
+        ));
+    }
+
+    /**
+     * Sets some default values for the user record.
+     * @see CActiveRecord::beforeValidate()
+     **/
+    public function beforeValidate()
+    {
+        // If the password is nulled, or unchanged
+        if ($this->password == NULL || $this->password == Cii::get($this->_oldAttributes, 'password', false))
+        {
+            if (!$this->isNewRecord)
+                $this->password = $this->_oldAttributes['password'];
+        }
+        else
+        {
+            $this->password = password_hash($this->password, PASSWORD_BCRYPT, array('cost' => Cii::getBcryptCost()));
+
+            if (!$this->isNewRecord)
+            {
+                $emailSettings = new EmailSettings;
+                $emailSettings->send(
+                    $this,
+                    Yii::t('ciims.models.Users', 'CiiMS Password Change Notification'),
+                    'base.themes.' . Cii::getConfig('theme', 'default') .'.views.email.passwordchange',
+                    array('user' => $this)
+                );
+            }
+        }
+
+        return parent::beforeValidate();
+    }
+
+    /**
+     * Lets us know if the user likes a given content post or not
+     * @param  int $id The id of the content we want to know about
+     * @return bool    Whether or not the user likes the post
+     */
+    public function likesPost($id = NULL)
+    {
+        if ($id === NULL)
+            return false;
+
+        $likes = UserMetadata::model()->findByAttributes(array('user_id' => $this->id, 'key' => 'likes'));
+
+        if ($likes === NULL)
+            return false;
+
+        $likesArray = json_decode($likes->value, true);
+        if (in_array($id, array_values($likesArray)))
+            return true;
+
+        return false;
+    }
+
+    /**
+     * Helper method to get the usermetadata object rather than calling getPrototype everywhere
+     * @param string $key
+     * @param mixed $value
+     * @return UserMetadata prototype object
+     */
+    public function getMetadataObject($key, $value=NULL)
+    {
+        return UserMetadata::model()->getPrototype('UserMetadata', array(
+                'user_id' => $this->id,
+                'key' => $key
+            ),array(
+                'user_id' => $this->id,
+                'key' => $key,
+                'value' => $value,
+        ));
+    }
+
+    /**
+     * Helper method to set the usermetadata object rather than calling getPrototype everywhere
+     * @param string $key
+     * @param mixed $value
+     * @return UserMetadata prototype object
+     */
+    public function setMetadataObject($key, $value)
+    {
+        $metadata = $this->getMetadataObject();
+
+        $metadata->value = $value;
+
+        return $metadata->save();
+    }
+
+    /**
      * Determines if two factor authentication code is required
      * @return boolean
      */
     public function needsTwoFactorAuth()
     {
-    	$metadata = $this->getMetadataObject('OTPSeed', false);
+        $metadata = $this->getMetadataObject('OTPSeed', false);
 
-    	if ($metadata->value !== false)
-    		return true;
+        if ($metadata->value !== false)
+            return true;
 
-    	return false;
+        return false;
     }
 
-	/**
-	 * Returns the gravatar image url for a particular user
-	 * The beauty of this is that you can call User::model()->findByPk()->gravatarImage() and not have to do anything else
-	 * Implemention details borrowed from Hypatia Cii User Extensions with permission
-	 * @param  integer $size		The size of the image we want to display
-	 * @param  string $default	The default image to be displayed if none is found
-	 * @return string gravatar api image
-	 */
-	public function gravatarImage($size=20, $default=NULL)
-	{
-		return "https://www.gravatar.com/avatar/" . md5(strtolower(trim($this->email))).'?s='.$size;
-	}
+    /**
+     * Returns the gravatar image url for a particular user
+     * The beauty of this is that you can call User::model()->findByPk()->gravatarImage() and not have to do anything else
+     * Implemention details borrowed from Hypatia Cii User Extensions with permission
+     * @param  integer $size		The size of the image we want to display
+     * @param  string $default	The default image to be displayed if none is found
+     * @return string gravatar api image
+     */
+    public function gravatarImage($size=20, $default=NULL)
+    {
+        return "https://www.gravatar.com/avatar/" . md5(strtolower(trim($this->email))).'?s='.$size;
+    }
 }

Braces +25 added lines, -18 removed lines

@@ -135,8 +135,9 @@ 
 	{
 		$reputation = UserMetadata::model()->getPrototype('UserMetadata', array('user_id' => $this->id, 'key' => 'reputation'), array('value' => 150));
 
-		if ($model === true)
-			return $reputation;
+		if ($model === true) {
+					return $reputation;
+		}
 
 		return $reputation->value;
 	}
@@ -161,8 +162,9 @@ 
 	{
 		$flags = UserMetadata::model()->getPrototype('UserMetadata', array('user_id' => $this->id, 'key' => 'flaggedComments'), array('value' => CJSON::encode(array())));
 		
-		if ($model === true)
-			return $flags;
+		if ($model === true) {
+					return $flags;
+		}
 
 		return CJSON::decode($flags->value);
 	}
@@ -177,8 +179,9 @@ 
 		$flags = CJSON::decode($flaggedComments->value);
 
 		// If the comment has already been flagged, just return true
-		if (in_array($id, $flags))
-			return true;
+		if (in_array($id, $flags)) {
+					return true;
+		}
 
 		$flags[] = $id;
 		$flaggedComments->value = CJSON::encode($flags);
@@ -221,10 +224,10 @@ 
 		// If the password is nulled, or unchanged
 		if ($this->password == NULL || $this->password == Cii::get($this->_oldAttributes, 'password', false))
 		{
-			if (!$this->isNewRecord)
-				$this->password = $this->_oldAttributes['password'];
-		}
-		else
+			if (!$this->isNewRecord) {
+							$this->password = $this->_oldAttributes['password'];
+			}
+		} else
 		{
 			$this->password = password_hash($this->password, PASSWORD_BCRYPT, array('cost' => Cii::getBcryptCost()));
 
@@ -250,17 +253,20 @@ 
 	 */
 	public function likesPost($id = NULL)
 	{
-		if ($id === NULL)
-			return false;
+		if ($id === NULL) {
+					return false;
+		}
 
 		$likes = UserMetadata::model()->findByAttributes(array('user_id' => $this->id, 'key' => 'likes'));
 
-		if ($likes === NULL)
-			return false;
+		if ($likes === NULL) {
+					return false;
+		}
 
 		$likesArray = json_decode($likes->value, true);
-		if (in_array($id, array_values($likesArray)))
-			return true;
+		if (in_array($id, array_values($likesArray))) {
+					return true;
+		}
 
 		return false;
 	}
@@ -306,8 +312,9 @@ 
     {
     	$metadata = $this->getMetadataObject('OTPSeed', false);
 
-    	if ($metadata->value !== false)
-    		return true;
+    	if ($metadata->value !== false) {
+    	    		return true;
+    	}
 
     	return false;
     }

Spacing +66 added lines, -66 removed lines

@@ -37,15 +37,15 @@ 
 	 * @param string $className active record class name.
 	 * @return Users the static model class
 	 */
-	public static function model($className=__CLASS__)
+	public static function model ($className = __CLASS__)
 	{
-		return parent::model($className);
+		return parent::model ($className);
 	}
 
 	/**
 	 * @return string the associated database table name
 	 */
-	public function tableName()
+	public function tableName ()
 	{
 		return 'users';
 	}
@@ -53,7 +53,7 @@ 
 	/**
 	 * @return array validation rules for model attributes.
 	 */
-	public function rules()
+	public function rules ()
 	{
 		// NOTE: you should only define rules for those attributes that
 		// will receive user inputs.
@@ -71,7 +71,7 @@ 
 	/**
 	 * @return array relational rules.
 	 */
-	public function relations()
+	public function relations ()
 	{
 		// NOTE: you may need to adjust the relation name and the related
 		// class name for the relations automatically generated below.
@@ -86,24 +86,24 @@ 
 	/**
 	 * @return array customized attribute labels (name=>label)
 	 */
-	public function attributeLabels()
+	public function attributeLabels ()
 	{
 		return array(
-			'id' 		  => Yii::t('ciims.models.Users', 'ID'),
-			'email' 	  => Yii::t('ciims.models.Users', 'Email'),
-			'password' 	  => Yii::t('ciims.models.Users', 'Password'),
-			'username'    => Yii::t('ciims.models.Users', 'User Name'),
-			'user_role'   => Yii::t('ciims.models.Users', 'User Role'),
-			'status'	  => Yii::t('ciims.models.Users', 'Active'),
-			'created' 	  => Yii::t('ciims.models.Users', 'Created'),
-			'updated' 	  => Yii::t('ciims.models.Users', 'Updated'),
+			'id' 		  => Yii::t ('ciims.models.Users', 'ID'),
+			'email' 	  => Yii::t ('ciims.models.Users', 'Email'),
+			'password' 	  => Yii::t ('ciims.models.Users', 'Password'),
+			'username'    => Yii::t ('ciims.models.Users', 'User Name'),
+			'user_role'   => Yii::t ('ciims.models.Users', 'User Role'),
+			'status'	  => Yii::t ('ciims.models.Users', 'Active'),
+			'created' 	  => Yii::t ('ciims.models.Users', 'Created'),
+			'updated' 	  => Yii::t ('ciims.models.Users', 'Updated'),
 		);
 	}
 
 	/**
 	 * Gets the first and last name instead of the username
 	 */
-	public function getName()
+	public function getName ()
 	{
 		return $this->username;
 	}
@@ -111,7 +111,7 @@ 
 	/**
 	 * Retrieves the username
 	 */
-	public function getUsername()
+	public function getUsername ()
 	{
 		return $this->username;
 	}
@@ -120,10 +120,10 @@ 
 	 * Retrieves the username
 	 * @todo This is technical debt. At some point this should be completely depricated
 	 */
-	public function getDisplayName()
+	public function getDisplayName ()
 	{
-		Yii::log('Users::displayName has been deprecated. Use Users::username moving forward', 'warning', 'models.users');
-		return $this->getUsername();
+		Yii::log ('Users::displayName has been deprecated. Use Users::username moving forward', 'warning', 'models.users');
+		return $this->getUsername ();
 	}
 
 	/**
@@ -131,9 +131,9 @@ 
 	 * @param boolean $model 	Whether an instance of UserMetadata should be returned or not
 	 * @return mixed
 	 */
-	public function getReputation($model=false)
+	public function getReputation ($model = false)
 	{
-		$reputation = UserMetadata::model()->getPrototype('UserMetadata', array('user_id' => $this->id, 'key' => 'reputation'), array('value' => 150));
+		$reputation = UserMetadata::model ()->getPrototype ('UserMetadata', array('user_id' => $this->id, 'key' => 'reputation'), array('value' => 150));
 
 		if ($model === true)
 			return $reputation;
@@ -145,11 +145,11 @@ 
 	 * Updates a user's reputation
 	 * @return boolean
 	 */
-	public function setReputation($rep = 10)
+	public function setReputation ($rep = 10)
 	{
-		$reputation = $this->getReputation(true);
+		$reputation = $this->getReputation (true);
 		$reputation->value += $rep;
-		return $reputation->save();
+		return $reputation->save ();
 	}
 
 	/**
@@ -157,54 +157,54 @@ 
 	 * @param boolean $model 	Whether an instance of UserMetadata should be returned or not
 	 * @return mixed
 	 */
-	public function getFlaggedComments($model=false)
+	public function getFlaggedComments ($model = false)
 	{
-		$flags = UserMetadata::model()->getPrototype('UserMetadata', array('user_id' => $this->id, 'key' => 'flaggedComments'), array('value' => CJSON::encode(array())));
+		$flags = UserMetadata::model ()->getPrototype ('UserMetadata', array('user_id' => $this->id, 'key' => 'flaggedComments'), array('value' => CJSON::encode (array())));
 		
 		if ($model === true)
 			return $flags;
 
-		return CJSON::decode($flags->value);
+		return CJSON::decode ($flags->value);
 	}
 
 	/**
 	 * Flags a comment with a given ID
 	 * @return boolean
 	 */
-	public function flagComment($id)
+	public function flagComment ($id)
 	{
-		$flaggedComments = $this->getFlaggedComments(true);
-		$flags = CJSON::decode($flaggedComments->value);
+		$flaggedComments = $this->getFlaggedComments (true);
+		$flags = CJSON::decode ($flaggedComments->value);
 
 		// If the comment has already been flagged, just return true
-		if (in_array($id, $flags))
+		if (in_array ($id, $flags))
 			return true;
 
 		$flags[] = $id;
-		$flaggedComments->value = CJSON::encode($flags);
+		$flaggedComments->value = CJSON::encode ($flags);
 
-		return $flaggedComments->save();
+		return $flaggedComments->save ();
 	}
 
 	/**
 	 * Retrieves a list of models based on the current search/filter conditions.
 	 * @return CActiveDataProvider the data provider that can return the models based on the search/filter conditions.
 	 */
-	public function search()
+	public function search ()
 	{
-		$criteria=new CDbCriteria;
-
-		$criteria->compare('id',$this->id);
-		$criteria->compare('email',$this->email,true);
-		$criteria->compare('password',$this->password,true);
-		$criteria->compare('username',$this->username,true);
-		$criteria->compare('user_role',$this->user_role);
-		$criteria->compare('status',$this->status);
-		$criteria->compare('created',$this->created,true);
-		$criteria->compare('updated',$this->updated,true);
+		$criteria = new CDbCriteria;
+
+		$criteria->compare ('id', $this->id);
+		$criteria->compare ('email', $this->email, true);
+		$criteria->compare ('password', $this->password, true);
+		$criteria->compare ('username', $this->username, true);
+		$criteria->compare ('user_role', $this->user_role);
+		$criteria->compare ('status', $this->status);
+		$criteria->compare ('created', $this->created, true);
+		$criteria->compare ('updated', $this->updated, true);
 		$criteria->order = "user_role DESC, created DESC";
 
-		return new CActiveDataProvider($this, array(
+		return new CActiveDataProvider ($this, array(
 			'criteria' => $criteria,
 			'pagination' => array(
 				'pageSize' => $this->pageSize
@@ -216,31 +216,31 @@ 
 	 * Sets some default values for the user record.
 	 * @see CActiveRecord::beforeValidate()
 	 **/
-	public function beforeValidate()
+	public function beforeValidate ()
 	{
 		// If the password is nulled, or unchanged
-		if ($this->password == NULL || $this->password == Cii::get($this->_oldAttributes, 'password', false))
+		if ($this->password == NULL || $this->password == Cii::get ($this->_oldAttributes, 'password', false))
 		{
 			if (!$this->isNewRecord)
 				$this->password = $this->_oldAttributes['password'];
 		}
 		else
 		{
-			$this->password = password_hash($this->password, PASSWORD_BCRYPT, array('cost' => Cii::getBcryptCost()));
+			$this->password = password_hash ($this->password, PASSWORD_BCRYPT, array('cost' => Cii::getBcryptCost ()));
 
 			if (!$this->isNewRecord)
 			{
 				$emailSettings = new EmailSettings;
-        		$emailSettings->send(
+        		$emailSettings->send (
 					$this,
-					Yii::t('ciims.models.Users', 'CiiMS Password Change Notification'),
-					'base.themes.' . Cii::getConfig('theme', 'default') .'.views.email.passwordchange',
+					Yii::t ('ciims.models.Users', 'CiiMS Password Change Notification'),
+					'base.themes.'.Cii::getConfig ('theme', 'default').'.views.email.passwordchange',
 					array('user' => $this)
 				);
 			}
 		}
 
-		return parent::beforeValidate();
+		return parent::beforeValidate ();
 	}
 
 	/**
@@ -248,18 +248,18 @@ 
 	 * @param  int $id The id of the content we want to know about
 	 * @return bool    Whether or not the user likes the post
 	 */
-	public function likesPost($id = NULL)
+	public function likesPost ($id = NULL)
 	{
 		if ($id === NULL)
 			return false;
 
-		$likes = UserMetadata::model()->findByAttributes(array('user_id' => $this->id, 'key' => 'likes'));
+		$likes = UserMetadata::model ()->findByAttributes (array('user_id' => $this->id, 'key' => 'likes'));
 
 		if ($likes === NULL)
 			return false;
 
-		$likesArray = json_decode($likes->value, true);
-		if (in_array($id, array_values($likesArray)))
+		$likesArray = json_decode ($likes->value, true);
+		if (in_array ($id, array_values ($likesArray)))
 			return true;
 
 		return false;
@@ -271,12 +271,12 @@ 
 	 * @param mixed $value
 	 * @return UserMetadata prototype object
 	 */
-	public function getMetadataObject($key, $value=NULL)
+	public function getMetadataObject ($key, $value = NULL)
 	{
-		return UserMetadata::model()->getPrototype('UserMetadata', array(
+		return UserMetadata::model ()->getPrototype ('UserMetadata', array(
 				'user_id' => $this->id,
 				'key' => $key
-			),array(
+			), array(
 				'user_id' => $this->id,
 				'key' => $key,
 				'value' => $value,
@@ -289,22 +289,22 @@ 
 	 * @param mixed $value
 	 * @return UserMetadata prototype object
 	 */
-	public function setMetadataObject($key, $value)
+	public function setMetadataObject ($key, $value)
 	{
-		$metadata = $this->getMetadataObject();
+		$metadata = $this->getMetadataObject ();
 
 		$metadata->value = $value;
 
-		return $metadata->save();
+		return $metadata->save ();
 	}
 
 	/**
      * Determines if two factor authentication code is required
      * @return boolean
      */
-    public function needsTwoFactorAuth()
+    public function needsTwoFactorAuth ()
     {
-    	$metadata = $this->getMetadataObject('OTPSeed', false);
+    	$metadata = $this->getMetadataObject ('OTPSeed', false);
 
     	if ($metadata->value !== false)
     		return true;
@@ -320,8 +320,8 @@ 
 	 * @param  string $default	The default image to be displayed if none is found
 	 * @return string gravatar api image
 	 */
-	public function gravatarImage($size=20, $default=NULL)
+	public function gravatarImage ($size = 20, $default = NULL)
 	{
-		return "https://www.gravatar.com/avatar/" . md5(strtolower(trim($this->email))).'?s='.$size;
+		return "https://www.gravatar.com/avatar/".md5 (strtolower (trim ($this->email))).'?s='.$size;
 	}
 }

protected/models/forms/ActivationForm.php

Indentation +111 added lines, -111 removed lines

@@ -2,117 +2,117 @@
 
 class ActivationForm extends CFormModel
 {
-	/**
-	 * The password provided by the user
-	 * @var string $password
-	 */
-	public $password;
-
-	/**
-	 * The activation key originally sent to the user's email
-	 * @var string $activationKey
-	 */
-	public $activationKey;
-
-	/**
-	 * The user model
-	 * @var Users $_user
-	 */
-	private $_user;
-
-	/**
-	 * The activation key metadata model. This is loaded to ensure it gets cleaned up properly
-	 * @var UserMetadata $_meta
-	 */
-	private $_meta;
-
-	/**
-	 * Validation rules
-	 * @return array
-	 */
-	public function rules()
-	{
-		return array(
-			array('password, activationKey', 'required'),
-			array('password', 'length', 'min'=>8),
-			array('activationKey', 'validateKey'),
-			array('password', 'validateUserPassword'),
-		);
-	}
-
-	/**
-	 * Attribute labels
-	 * @return array
-	 */
-	public function attributeLabels()
-	{
-		return array(
-			'password'      => Yii::t('ciims.models.ActivationForm', 'Your Password'),
-			'activationKey' => Yii::t('ciims.models.ActivationForm', 'Your Activation Key')
-		);
-	}
-
-	/**
-	 * Validates that the activation key belongs to a user and is valid
-	 * @param array $attributes
-	 * @param array $params
-	 * return array
-	 */
-	public function validateKey($attributes=array(), $params=array())
-	{
-		$this->_meta = UserMetadata::model()->findByAttributes(array('key'=>'activationKey', 'value'=>$this->activationKey));
-
-		if ($this->_meta == NULL)
-		{
-			$this->addError('activationKey', Yii::t('ciims.models.ActivationForm', 'The activation key you provided is invalid.'));
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Ensures that the password entered matches the one provided during registration
-	 * @param array $attributes
-	 * @param array $params
-	 * return array
-	 */
-	public function validateUserPassword($attributes, $params)
-	{
-		if ($this->_user == NULL)
-		{
-			$this->addError('activationKey', Yii::t('ciims.models.ActivationForm', 'The activation key you provided is invalid.'));
-			return false;
-		}
-
-		$result = password_verify($this->password, $this->_user->password);
-
-		if ($result == false)
-		{
-			$this->addError('password', Yii::t('ciims.models.ActivationForm', 'The password you entered does not match the password you registered with.'));
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Makes the user an active user in the database, and deletes their activation token
-	 * @return boolean
-	 */
-	public function save()
-	{
-		$userId = $this->_meta->user_id;
-		$this->_user = Users::model()->findByPk($userId);
-
-		if (!$this->validate())
-			return false;
-
-		$this->_user->status = Users::ACTIVE;
+    /**
+     * The password provided by the user
+     * @var string $password
+     */
+    public $password;
+
+    /**
+     * The activation key originally sent to the user's email
+     * @var string $activationKey
+     */
+    public $activationKey;
+
+    /**
+     * The user model
+     * @var Users $_user
+     */
+    private $_user;
+
+    /**
+     * The activation key metadata model. This is loaded to ensure it gets cleaned up properly
+     * @var UserMetadata $_meta
+     */
+    private $_meta;
+
+    /**
+     * Validation rules
+     * @return array
+     */
+    public function rules()
+    {
+        return array(
+            array('password, activationKey', 'required'),
+            array('password', 'length', 'min'=>8),
+            array('activationKey', 'validateKey'),
+            array('password', 'validateUserPassword'),
+        );
+    }
+
+    /**
+     * Attribute labels
+     * @return array
+     */
+    public function attributeLabels()
+    {
+        return array(
+            'password'      => Yii::t('ciims.models.ActivationForm', 'Your Password'),
+            'activationKey' => Yii::t('ciims.models.ActivationForm', 'Your Activation Key')
+        );
+    }
+
+    /**
+     * Validates that the activation key belongs to a user and is valid
+     * @param array $attributes
+     * @param array $params
+     * return array
+     */
+    public function validateKey($attributes=array(), $params=array())
+    {
+        $this->_meta = UserMetadata::model()->findByAttributes(array('key'=>'activationKey', 'value'=>$this->activationKey));
+
+        if ($this->_meta == NULL)
+        {
+            $this->addError('activationKey', Yii::t('ciims.models.ActivationForm', 'The activation key you provided is invalid.'));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Ensures that the password entered matches the one provided during registration
+     * @param array $attributes
+     * @param array $params
+     * return array
+     */
+    public function validateUserPassword($attributes, $params)
+    {
+        if ($this->_user == NULL)
+        {
+            $this->addError('activationKey', Yii::t('ciims.models.ActivationForm', 'The activation key you provided is invalid.'));
+            return false;
+        }
+
+        $result = password_verify($this->password, $this->_user->password);
+
+        if ($result == false)
+        {
+            $this->addError('password', Yii::t('ciims.models.ActivationForm', 'The password you entered does not match the password you registered with.'));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Makes the user an active user in the database, and deletes their activation token
+     * @return boolean
+     */
+    public function save()
+    {
+        $userId = $this->_meta->user_id;
+        $this->_user = Users::model()->findByPk($userId);
+
+        if (!$this->validate())
+            return false;
+
+        $this->_user->status = Users::ACTIVE;
 		
-		if ($this->_user->save())
-			return $this->_meta->delete();
+        if ($this->_user->save())
+            return $this->_meta->delete();
 
-		return false;
-	}
+        return false;
+    }
 }

Spacing +16 added lines, -16 removed lines

@@ -30,7 +30,7 @@ 
 	 * Validation rules
 	 * @return array
 	 */
-	public function rules()
+	public function rules ()
 	{
 		return array(
 			array('password, activationKey', 'required'),
@@ -44,11 +44,11 @@ 
 	 * Attribute labels
 	 * @return array
 	 */
-	public function attributeLabels()
+	public function attributeLabels ()
 	{
 		return array(
-			'password'      => Yii::t('ciims.models.ActivationForm', 'Your Password'),
-			'activationKey' => Yii::t('ciims.models.ActivationForm', 'Your Activation Key')
+			'password'      => Yii::t ('ciims.models.ActivationForm', 'Your Password'),
+			'activationKey' => Yii::t ('ciims.models.ActivationForm', 'Your Activation Key')
 		);
 	}
 
@@ -58,13 +58,13 @@ 
 	 * @param array $params
 	 * return array
 	 */
-	public function validateKey($attributes=array(), $params=array())
+	public function validateKey ($attributes = array(), $params = array())
 	{
-		$this->_meta = UserMetadata::model()->findByAttributes(array('key'=>'activationKey', 'value'=>$this->activationKey));
+		$this->_meta = UserMetadata::model ()->findByAttributes (array('key'=>'activationKey', 'value'=>$this->activationKey));
 
 		if ($this->_meta == NULL)
 		{
-			$this->addError('activationKey', Yii::t('ciims.models.ActivationForm', 'The activation key you provided is invalid.'));
+			$this->addError ('activationKey', Yii::t ('ciims.models.ActivationForm', 'The activation key you provided is invalid.'));
 			return false;
 		}
 
@@ -77,19 +77,19 @@ 
 	 * @param array $params
 	 * return array
 	 */
-	public function validateUserPassword($attributes, $params)
+	public function validateUserPassword ($attributes, $params)
 	{
 		if ($this->_user == NULL)
 		{
-			$this->addError('activationKey', Yii::t('ciims.models.ActivationForm', 'The activation key you provided is invalid.'));
+			$this->addError ('activationKey', Yii::t ('ciims.models.ActivationForm', 'The activation key you provided is invalid.'));
 			return false;
 		}
 
-		$result = password_verify($this->password, $this->_user->password);
+		$result = password_verify ($this->password, $this->_user->password);
 
 		if ($result == false)
 		{
-			$this->addError('password', Yii::t('ciims.models.ActivationForm', 'The password you entered does not match the password you registered with.'));
+			$this->addError ('password', Yii::t ('ciims.models.ActivationForm', 'The password you entered does not match the password you registered with.'));
 			return false;
 		}
 
@@ -100,18 +100,18 @@ 
 	 * Makes the user an active user in the database, and deletes their activation token
 	 * @return boolean
 	 */
-	public function save()
+	public function save ()
 	{
 		$userId = $this->_meta->user_id;
-		$this->_user = Users::model()->findByPk($userId);
+		$this->_user = Users::model ()->findByPk ($userId);
 
-		if (!$this->validate())
+		if (!$this->validate ())
 			return false;
 
 		$this->_user->status = Users::ACTIVE;
 		
-		if ($this->_user->save())
-			return $this->_meta->delete();
+		if ($this->_user->save ())
+			return $this->_meta->delete ();
 
 		return false;
 	}

Braces +6 added lines, -4 removed lines

@@ -105,13 +105,15 @@
 		$userId = $this->_meta->user_id;
 		$this->_user = Users::model()->findByPk($userId);
 
-		if (!$this->validate())
-			return false;
+		if (!$this->validate()) {
+					return false;
+		}
 
 		$this->_user->status = Users::ACTIVE;
 		
-		if ($this->_user->save())
-			return $this->_meta->delete();
+		if ($this->_user->save()) {
+					return $this->_meta->delete();
+		}
 
 		return false;
 	}

protected/models/forms/EmailChangeForm.php

Indentation +150 added lines, -150 removed lines

@@ -2,154 +2,154 @@
 
 class EmailChangeForm extends CFormModel
 {
-	/**
-	 * The user's existing password
-	 * @var string $password
-	 */
-	public $password;
-
-	/**
-	 * The veification key
-	 * @var string $verificationKey
-	 */
-	public $verificationKey;
-
-	/**
-	 * The user model
-	 * @var Users $_user
-	 */
-	private $_user;
-
-	/**
-	 * The new email address change key
-	 * @var UserMetadata $_newEmailAddressChangeKey
-	 */
-	private $_newEmailAddressChangeKey;
-
-	/**
-	 * The new email address record on file
-	 * @var UserMetadata $_newEmailAddress
-	 */
-	private $_newEmailAddress;
-
-	/**
-	 * Validation rules
-	 * @return array
-	 */
-	public function rules()
-	{
-		return array(
-			array('password, verificationKey', 'required'),
-			array('password', 'length', 'min' => 8),
-			array('password', 'validateUserPassword'),
-			array('verificationKey', 'validateVerificationKey')
-		);
-	}
-
-	/**
-	 * Attribute labels
-	 * @return array
-	 */
-	public function attributeLabels()
-	{
-		return array(
-			'password'         => Yii::t('ciims.models.EmailChangeForm', 'Your Password'),
-			'verificationKey'  => Yii::t('ciims.models.EmailChangeForm', 'The Verification Key')
-		);
-	}
-
-	/**
- 	 * Sets the user model
-	 * @param Users $user
-	 */
-	public function setUser($user)
-	{
-		$this->_user = $user;
-	}
-
-	/**
-	 * Validates the tokens supplied and that the request hasn't expired
-	 * @param array $attributes
-	 * @param array $params
-	 * return array
-	 */
-	public function validateVerificationKey($attributes = array(), $params = array())
-	{
-		$this->_newEmailAddressChangeKey =  UserMetadata::model()->findByAttributes(array(
-												'user_id' => $this->_user->id,
-												'key' => 'newEmailAddressChangeKey',
-												'value' => $this->verificationKey
-										    ));
-
-		if ($this->_newEmailAddressChangeKey == NULL)
-		{
-			$this->addError('verificationKey', Yii::t('ciims.models.EmailChangeForm', 'The activation key you provided is invalid'));
-			return false;
-		}
-
-		$this->_newEmailAddress = UserMetadata::model()->findByAttributes(array(
-									  'user_id' => $this->_user->id,
-									  'key' => 'newEmailAddress'
-								  ));
-
-		if ($this->_newEmailAddress == NULL)
-		{
-			$this->addError('verificationKey', Yii::t('ciims.models.EmailChangeForm', 'The activation key you provided is invalid'));
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Ensures that the password entered matches the one provided during registration
-	 * @param array $attributes
-	 * @param array $params
-	 * return array
-	 */
-	public function validateUserPassword($attributes, $params)
-	{
-		$result = password_verify($this->password, $this->_user->password);
-
-		if ($result == false)
-		{
-			$this->addError('password', Yii::t('ciims.models.ActivationForm', 'The password you entered does not match the password you registered with.'));
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Updates the user's email address and rehashes their password since the password is bound to the email
-	 * @return boolean
-	 */
-	public function save()
-	{
-		if (!$this->validate())
-			return false;
-
-		// This is super buggy for some reason
-		$this->_user->email = $this->_newEmailAddress->value;
-
-		// Save the model
-		if ($this->_user->save())
-		{
-			// Delete the metadata
-			$this->_newEmailAddressChangeKey->delete();
-			$this->_newEmailAddress->delete();
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Retrieves the user's email address from the model
-	 * @return string
-	 */
-	public function getEmail()
-	{
-		return $this->_user->email;
-	}
+    /**
+     * The user's existing password
+     * @var string $password
+     */
+    public $password;
+
+    /**
+     * The veification key
+     * @var string $verificationKey
+     */
+    public $verificationKey;
+
+    /**
+     * The user model
+     * @var Users $_user
+     */
+    private $_user;
+
+    /**
+     * The new email address change key
+     * @var UserMetadata $_newEmailAddressChangeKey
+     */
+    private $_newEmailAddressChangeKey;
+
+    /**
+     * The new email address record on file
+     * @var UserMetadata $_newEmailAddress
+     */
+    private $_newEmailAddress;
+
+    /**
+     * Validation rules
+     * @return array
+     */
+    public function rules()
+    {
+        return array(
+            array('password, verificationKey', 'required'),
+            array('password', 'length', 'min' => 8),
+            array('password', 'validateUserPassword'),
+            array('verificationKey', 'validateVerificationKey')
+        );
+    }
+
+    /**
+     * Attribute labels
+     * @return array
+     */
+    public function attributeLabels()
+    {
+        return array(
+            'password'         => Yii::t('ciims.models.EmailChangeForm', 'Your Password'),
+            'verificationKey'  => Yii::t('ciims.models.EmailChangeForm', 'The Verification Key')
+        );
+    }
+
+    /**
+     * Sets the user model
+     * @param Users $user
+     */
+    public function setUser($user)
+    {
+        $this->_user = $user;
+    }
+
+    /**
+     * Validates the tokens supplied and that the request hasn't expired
+     * @param array $attributes
+     * @param array $params
+     * return array
+     */
+    public function validateVerificationKey($attributes = array(), $params = array())
+    {
+        $this->_newEmailAddressChangeKey =  UserMetadata::model()->findByAttributes(array(
+                                                'user_id' => $this->_user->id,
+                                                'key' => 'newEmailAddressChangeKey',
+                                                'value' => $this->verificationKey
+                                            ));
+
+        if ($this->_newEmailAddressChangeKey == NULL)
+        {
+            $this->addError('verificationKey', Yii::t('ciims.models.EmailChangeForm', 'The activation key you provided is invalid'));
+            return false;
+        }
+
+        $this->_newEmailAddress = UserMetadata::model()->findByAttributes(array(
+                                        'user_id' => $this->_user->id,
+                                        'key' => 'newEmailAddress'
+                                    ));
+
+        if ($this->_newEmailAddress == NULL)
+        {
+            $this->addError('verificationKey', Yii::t('ciims.models.EmailChangeForm', 'The activation key you provided is invalid'));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Ensures that the password entered matches the one provided during registration
+     * @param array $attributes
+     * @param array $params
+     * return array
+     */
+    public function validateUserPassword($attributes, $params)
+    {
+        $result = password_verify($this->password, $this->_user->password);
+
+        if ($result == false)
+        {
+            $this->addError('password', Yii::t('ciims.models.ActivationForm', 'The password you entered does not match the password you registered with.'));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Updates the user's email address and rehashes their password since the password is bound to the email
+     * @return boolean
+     */
+    public function save()
+    {
+        if (!$this->validate())
+            return false;
+
+        // This is super buggy for some reason
+        $this->_user->email = $this->_newEmailAddress->value;
+
+        // Save the model
+        if ($this->_user->save())
+        {
+            // Delete the metadata
+            $this->_newEmailAddressChangeKey->delete();
+            $this->_newEmailAddress->delete();
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Retrieves the user's email address from the model
+     * @return string
+     */
+    public function getEmail()
+    {
+        return $this->_user->email;
+    }
 }

Spacing +19 added lines, -19 removed lines

@@ -36,7 +36,7 @@ 
 	 * Validation rules
 	 * @return array
 	 */
-	public function rules()
+	public function rules ()
 	{
 		return array(
 			array('password, verificationKey', 'required'),
@@ -50,11 +50,11 @@ 
 	 * Attribute labels
 	 * @return array
 	 */
-	public function attributeLabels()
+	public function attributeLabels ()
 	{
 		return array(
-			'password'         => Yii::t('ciims.models.EmailChangeForm', 'Your Password'),
-			'verificationKey'  => Yii::t('ciims.models.EmailChangeForm', 'The Verification Key')
+			'password'         => Yii::t ('ciims.models.EmailChangeForm', 'Your Password'),
+			'verificationKey'  => Yii::t ('ciims.models.EmailChangeForm', 'The Verification Key')
 		);
 	}
 
@@ -62,7 +62,7 @@ 
  	 * Sets the user model
 	 * @param Users $user
 	 */
-	public function setUser($user)
+	public function setUser ($user)
 	{
 		$this->_user = $user;
 	}
@@ -73,9 +73,9 @@ 
 	 * @param array $params
 	 * return array
 	 */
-	public function validateVerificationKey($attributes = array(), $params = array())
+	public function validateVerificationKey ($attributes = array(), $params = array())
 	{
-		$this->_newEmailAddressChangeKey =  UserMetadata::model()->findByAttributes(array(
+		$this->_newEmailAddressChangeKey = UserMetadata::model ()->findByAttributes (array(
 												'user_id' => $this->_user->id,
 												'key' => 'newEmailAddressChangeKey',
 												'value' => $this->verificationKey
@@ -83,18 +83,18 @@ 
 
 		if ($this->_newEmailAddressChangeKey == NULL)
 		{
-			$this->addError('verificationKey', Yii::t('ciims.models.EmailChangeForm', 'The activation key you provided is invalid'));
+			$this->addError ('verificationKey', Yii::t ('ciims.models.EmailChangeForm', 'The activation key you provided is invalid'));
 			return false;
 		}
 
-		$this->_newEmailAddress = UserMetadata::model()->findByAttributes(array(
+		$this->_newEmailAddress = UserMetadata::model ()->findByAttributes (array(
 									  'user_id' => $this->_user->id,
 									  'key' => 'newEmailAddress'
 								  ));
 
 		if ($this->_newEmailAddress == NULL)
 		{
-			$this->addError('verificationKey', Yii::t('ciims.models.EmailChangeForm', 'The activation key you provided is invalid'));
+			$this->addError ('verificationKey', Yii::t ('ciims.models.EmailChangeForm', 'The activation key you provided is invalid'));
 			return false;
 		}
 
@@ -107,13 +107,13 @@ 
 	 * @param array $params
 	 * return array
 	 */
-	public function validateUserPassword($attributes, $params)
+	public function validateUserPassword ($attributes, $params)
 	{
-		$result = password_verify($this->password, $this->_user->password);
+		$result = password_verify ($this->password, $this->_user->password);
 
 		if ($result == false)
 		{
-			$this->addError('password', Yii::t('ciims.models.ActivationForm', 'The password you entered does not match the password you registered with.'));
+			$this->addError ('password', Yii::t ('ciims.models.ActivationForm', 'The password you entered does not match the password you registered with.'));
 			return false;
 		}
 
@@ -124,20 +124,20 @@ 
 	 * Updates the user's email address and rehashes their password since the password is bound to the email
 	 * @return boolean
 	 */
-	public function save()
+	public function save ()
 	{
-		if (!$this->validate())
+		if (!$this->validate ())
 			return false;
 
 		// This is super buggy for some reason
 		$this->_user->email = $this->_newEmailAddress->value;
 
 		// Save the model
-		if ($this->_user->save())
+		if ($this->_user->save ())
 		{
 			// Delete the metadata
-			$this->_newEmailAddressChangeKey->delete();
-			$this->_newEmailAddress->delete();
+			$this->_newEmailAddressChangeKey->delete ();
+			$this->_newEmailAddress->delete ();
 			return true;
 		}
 
@@ -148,7 +148,7 @@ 
 	 * Retrieves the user's email address from the model
 	 * @return string
 	 */
-	public function getEmail()
+	public function getEmail ()
 	{
 		return $this->_user->email;
 	}

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/ForgotForm.php

Indentation +90 added lines, -90 removed lines

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

Braces +9 added lines, -6 removed lines

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

Spacing +16 added lines, -16 removed lines

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

protected/models/forms/InvitationForm.php

Indentation +89 added lines, -89 removed lines

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

Braces +6 added lines, -4 removed lines

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

Spacing +15 added lines, -15 removed lines

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

protected/models/forms/InviteForm.php

Indentation +60 added lines, -60 removed lines

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

 class InviteForm extends CFormModel

 {

-	/**

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

-	 */

-	public $id = NULL;

+    /**

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

+     */

+    public $id = NULL;

 

-	/**

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

-	 */

-	public $username = NULL;

+    /**

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

+     */

+    public $username = NULL;

 

-	/**

-	 * @var $email string

-	 */

-	public $email = NULL;

+    /**

+     * @var $email string

+     */

+    public $email = NULL;

 

-	/**

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

-	 */

-	public $password = NULL;

+    /**

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

+     */

+    public $password = NULL;

 

-	/**

-	 * Validation Rules

-	 * @return array

-	 */

-	public function rules()

-	{

-		return array(

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

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

-		);

-	}

+    /**

+     * Validation Rules

+     * @return array

+     */

+    public function rules()

+    {

+        return array(

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

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

+        );

+    }

 

-	/**

-	 * Attribute labels

-	 * @return array

-	 */

-	public function attributeLabels()

-	{

-		return array(

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

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

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

-		);

-	}

+    /**

+     * Attribute labels

+     * @return array

+     */

+    public function attributeLabels()

+    {

+        return array(

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

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

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

+        );

+    }

 

-	/**

-	 * Actually creates the users

-	 * @return bool            If the user was created

-	 */

-	public function acceptInvite()

-	{

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

-			return false;

+    /**

+     * Actually creates the users

+     * @return bool            If the user was created

+     */

+    public function acceptInvite()

+    {

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

+            return false;

 

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

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

 

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

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

-		$cost = Cii::getBcryptCost();

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

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

+        $cost = Cii::getBcryptCost();

 

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

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

 

-		$user->attributes = array(

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

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

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

-			'status'		=> Users::ACTIVE

-		);

+        $user->attributes = array(

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

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

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

+            'status'		=> Users::ACTIVE

+        );

 

-		return $user->save();

-	}

+        return $user->save();

+    }

 }
\ No newline at end of file

Spacing +12 added lines, -12 removed lines

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

 	 * @return array

 	 */

-	public function rules()

+	public function rules ()

 	{

 		return array(

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

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

 	 * @return array

 	 */

-	public function attributeLabels()

+	public function attributeLabels ()

 	{

 		return array(

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

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

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

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

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

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

 		);

 	}

 

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

 	 * @return bool            If the user was created

 	 */

-	public function acceptInvite()

+	public function acceptInvite ()

 	{

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

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

 			return false;

 

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

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

 

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

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

-		$cost = Cii::getBcryptCost();

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

+		$cost = Cii::getBcryptCost ();

 

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

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

 

 		$user->attributes = array(

 			'email'			=> $this->email,

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

 		);

 

-		return $user->save();

+		return $user->save ();

 	}

 }
\ No newline at end of file

Braces +11 added lines, -10 removed lines

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

 

-class InviteForm extends CFormModel

-{

+class InviteForm extends CFormModel
+{
 	/**

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

 	 */

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

 	 * @return array

 	 */

-	public function rules()

-	{

+	public function rules()
+	{
 		return array(

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

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

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

 	 * @return array

 	 */

-	public function attributeLabels()

-	{

+	public function attributeLabels()
+	{
 		return array(

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

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

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

 	 * @return bool            If the user was created

 	 */

-	public function acceptInvite()

-	{

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

-			return false;

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

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