charlesportwoodii / CiiMS

protected/commands/CiiMigrateCommand.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // Import System/Cli/Commands/MigrateCommand
-Yii::import('system.cli.commands.MigrateCommand');
+Yii::import ('system.cli.commands.MigrateCommand');
 /**
  * This class is an injection container for CDbMigration which permits us to
  * directly access CDbMigrations from our web application without having
@@ -21,10 +21,10 @@ 
      * This is our overloaded getDbConnection, allowing us to tell yii what our db connection is
      * without it having to go through
      */
-    public function getDbConnection()
+    public function getDbConnection ()
     {
-        $connection = new CDbConnection("mysql:host={$this->dsn['host']};dbname={$this->dsn['dbname']}", $this->dsn['username'], $this->dsn['password']);
-        $connection->setActive(true);
+        $connection = new CDbConnection ("mysql:host={$this->dsn['host']};dbname={$this->dsn['dbname']}", $this->dsn['username'], $this->dsn['password']);
+        $connection->setActive (true);
         return $connection;
     }
 }
\ No newline at end of file

protected/messages/en_us/yii.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
  *
  * NOTE, this file must be saved in UTF-8 encoding.
  */
-return array (
+return array(
   '< Previous' => '',
   '<< First' => '',
   'CApcCache requires PHP apc extension to be loaded.' => '',

protected/migrations/m141001_145619_init.php

Spacing +58 added lines, -58 removed lines

@@ -9,16 +9,16 @@ 
 	 */
 	private $_moment = 0;
 
-	public function safeUp()
+	public function safeUp ()
 	{
-		$this->_moment = time();
+		$this->_moment = time ();
 
 		// Try to get the table names, if we get something back, do not run this migration
 		try
 		{
-			$test = Yii::app()->db->schema->getTables();
-			if (count($test) <= 1)
-				throw new Exception('CiiMS doesn\'t exist. Applying base migration');
+			$test = Yii::app ()->db->schema->getTables ();
+			if (count ($test) <= 1)
+				throw new Exception ('CiiMS doesn\'t exist. Applying base migration');
 			return true;
 		}
 		catch (Exception $e)
@@ -28,16 +28,16 @@ 
 		}
 
 		// Otherwise, run the install migration
-		$this->createUserTables();
+		$this->createUserTables ();
 
-		$this->createCategories();
+		$this->createCategories ();
 
-		$this->createContent();
+		$this->createContent ();
 
-		$this->createConfiguration();
+		$this->createConfiguration ();
 	}
 
-	public function safeDown()
+	public function safeDown ()
 	{
 		echo "m141001_145619_init does not support migration down.\n";
 		return false;
@@ -46,9 +46,9 @@ 
 	/**
 	 * Creates the tables, indexes, and relations for users
 	 */
-	private function createUserTables()
+	private function createUserTables ()
 	{
-		$this->createTable('users', array(
+		$this->createTable ('users', array(
 			'id' 		=> 'pk',
 			'email' 	=> 'string NOT NULL',
 			'password' 	=> 'string NOT NULL',
@@ -59,14 +59,14 @@ 
 			'updated' 	=> 'integer'
 		));
 
-		$this->createTable('user_roles', array(
+		$this->createTable ('user_roles', array(
 			'id' 		=> 'pk',
 			'name' 		=> 'string NOT NULL',
 			'created' 	=> 'integer',
 			'updated' 	=> 'integer'
 		));
 
-		$this->createTable('user_metadata', array(
+		$this->createTable ('user_metadata', array(
 			'user_id' 	  => 'integer',
 			'key'		  => 'string NOT NULL',
 			'value' 	  => 'text NOT NULL',
@@ -76,66 +76,66 @@ 
 		));
 
 		// Create the necessary indexes on the columns
-		$this->createIndex('user_email', 'users', 'email', true);
-		$this->createIndex('user_username', 'users', 'username', true);
-		$this->createIndex('user_metadata', 'user_metadata', 'user_id, key', false);
+		$this->createIndex ('user_email', 'users', 'email', true);
+		$this->createIndex ('user_username', 'users', 'username', true);
+		$this->createIndex ('user_metadata', 'user_metadata', 'user_id, key', false);
 
-		$this->addPrimaryKey('user_metadata_composite', 'user_metadata', 'user_id,key');
+		$this->addPrimaryKey ('user_metadata_composite', 'user_metadata', 'user_id,key');
 
 		// Setup the foreign key constraints
-		$this->addForeignKey('user_roles_relation_fk', 'user_metadata', 'user_id', 'users', 'id', 'CASCADE', 'NO ACTION');
+		$this->addForeignKey ('user_roles_relation_fk', 'user_metadata', 'user_id', 'users', 'id', 'CASCADE', 'NO ACTION');
 
 		// Insert data into the tables
-		$this->insert('user_roles', array(
+		$this->insert ('user_roles', array(
 			'id'      => 1,
 			'name' 	  => 'User',
 			'created' => $this->_moment,
 			'updated' => $this->_moment
 		));
 
-		$this->insert('user_roles', array(
+		$this->insert ('user_roles', array(
 			'id'      => 2,
 			'name'    => 'Pending',
 			'created' => $this->_moment,
 			'updated' => $this->_moment
 		));
 
-		$this->insert('user_roles', array(
+		$this->insert ('user_roles', array(
 			'id'      => 3,
 			'name'    => 'Suspended',
 			'created' => $this->_moment,
 			'updated' => $this->_moment
 		));
 
-		$this->insert('user_roles', array(
+		$this->insert ('user_roles', array(
 			'id'      => 5,
 			'name'    => 'Collaborator',
 			'created' => $this->_moment,
 			'updated' => $this->_moment
 		));
 
-		$this->insert('user_roles', array(
+		$this->insert ('user_roles', array(
 			'id'      => 6,
 			'name'    => 'Author',
 			'created' => $this->_moment,
 			'updated' => $this->_moment
 		));
 
-		$this->insert('user_roles', array(
+		$this->insert ('user_roles', array(
 			'id'      => 7,
 			'name'    => 'User',
 			'created' => $this->_moment,
 			'updated' => $this->_moment
 		));
 
-		$this->insert('user_roles', array(
+		$this->insert ('user_roles', array(
 			'id'      => 8,
 			'name'    => 'Publisher',
 			'created' => $this->_moment,
 			'updated' => $this->_moment
 		));
 
-		$this->insert('user_roles', array(
+		$this->insert ('user_roles', array(
 			'id'      => 9,
 			'name'    => 'Administrator',
 			'created' => $this->_moment,
@@ -146,10 +146,10 @@ 
 	/**
 	 * Create the categories and relations
 	 */
-	private function createCategories()
+	private function createCategories ()
 	{
 		// Categories
-		$this->createTable('categories', array(
+		$this->createTable ('categories', array(
 			'id' 		=> 'pk',
 			'parent_id' => 'integer DEFAULT 1',
 			'name' 		=> 'string NOT NULL',
@@ -158,7 +158,7 @@ 
 			'updated' 	=> 'integer'
 		));
 
-		$this->createTable('categories_metadata', array(
+		$this->createTable ('categories_metadata', array(
 			'category_id' => 'integer',
 			'key'		  => 'string NOT NULL',
 			'value' 	  => 'text NOT NULL',
@@ -167,7 +167,7 @@ 
 		));
 
 		// Insert the first record into the categories table
-		$this->insert('categories', array(
+		$this->insert ('categories', array(
 			'id'      => 1,
 			'name'    => 'Uncategorized',
 			'slug'    => 'uncategorized',
@@ -175,17 +175,17 @@ 
 			'updated' => $this->_moment
 		));
 
-		$this->addPrimaryKey('categories_metadata_composite', 'categories_metadata', 'category_id,key');
-		$this->addForeignKey('categories_parents_fk', 'categories', 'parent_id', 'categories', 'id', 'CASCADE', 'NO ACTION');
-		$this->addForeignKey('categories_metadata_fk', 'categories_metadata', 'category_id', 'categories', 'id', 'CASCADE', 'NO ACTION');
+		$this->addPrimaryKey ('categories_metadata_composite', 'categories_metadata', 'category_id,key');
+		$this->addForeignKey ('categories_parents_fk', 'categories', 'parent_id', 'categories', 'id', 'CASCADE', 'NO ACTION');
+		$this->addForeignKey ('categories_metadata_fk', 'categories_metadata', 'category_id', 'categories', 'id', 'CASCADE', 'NO ACTION');
 	}
 
 	/**
 	 * Creates the content, comemnts, and necessary relations
 	 */
-	private function createContent()
+	private function createContent ()
 	{
-		$this->createTable('content', array(
+		$this->createTable ('content', array(
 			'id'		  => 'integer NOT NULL',
 			'vid' 		  => 'integer NOT NULL DEFAULT 1',
 			'title'		  => 'string  NOT NULL',
@@ -204,14 +204,14 @@ 
 			'updated' 	  => 'integer'
 		));
 
-		$this->createTable('content_types', array(
+		$this->createTable ('content_types', array(
 			'id'          => 'pk',
 			'name'		  => 'string NOT NULL',
 			'created'     => 'integer',
 			'updated' 	  => 'integer'
 		));
 
-		$this->createTable('content_metadata', array(
+		$this->createTable ('content_metadata', array(
 			'content_id'  => 'integer',
 			'key'		  => 'string NOT NULL',
 			'value' 	  => 'text NOT NULL',
@@ -219,7 +219,7 @@ 
 			'updated' 	  => 'integer'
 		));
 
-		$this->createTable('comments', array(
+		$this->createTable ('comments', array(
 			'id'		  => 'pk',
 			'content_id'  => 'integer',
 			'author_id'   => 'integer',
@@ -228,53 +228,53 @@ 
 			'updated' 	  => 'integer'
 		));
 
-		$this->insert('content_types', array(
+		$this->insert ('content_types', array(
 			'id'          => 1,
 			'name'        => 'Static Page',
 			'created'     => $this->_moment,
 			'updated'     => $this->_moment
 		));
 
-		$this->insert('content_types', array(
+		$this->insert ('content_types', array(
 			'id'          => 2,
 			'name'    	  => 'Blog Post',
 			'created'     => $this->_moment,
 			'updated'     => $this->_moment
 		));
 
-		$this->addPrimaryKey('content_composite', 'content', 'id, vid');
+		$this->addPrimaryKey ('content_composite', 'content', 'id, vid');
 
-		$this->execute('ALTER TABLE `content` CHANGE id id INT( 11 ) NOT NULL AUTO_INCREMENT');
+		$this->execute ('ALTER TABLE `content` CHANGE id id INT( 11 ) NOT NULL AUTO_INCREMENT');
 
-		$this->addPrimaryKey('content_metadata_composite', 'content_metadata', 'content_id,key');
+		$this->addPrimaryKey ('content_metadata_composite', 'content_metadata', 'content_id,key');
 
-		$this->createIndex('content_author', 'content', 'author_id', false);
-		$this->createIndex('content_category', 'content', 'category_id', false);
-		$this->createIndex('content_type', 'content', 'type_id', false);
-		$this->createIndex('comment_content', 'comments', 'content_id', false);
-		$this->createIndex('comment_author', 'comments', 'author_id', false);
+		$this->createIndex ('content_author', 'content', 'author_id', false);
+		$this->createIndex ('content_category', 'content', 'category_id', false);
+		$this->createIndex ('content_type', 'content', 'type_id', false);
+		$this->createIndex ('comment_content', 'comments', 'content_id', false);
+		$this->createIndex ('comment_author', 'comments', 'author_id', false);
 
-		$this->addForeignKey('content_category_fk', 'content', 'category_id', 'categories', 'id', 'CASCADE', 'NO ACTION');
-		$this->addForeignKey('content_author_fk', 'content', 'author_id', 'users', 'id', 'CASCADE', 'NO ACTION');
-		$this->addForeignKey('content_type_fk', 'content', 'type_id', 'content_types', 'id', 'CASCADE', 'NO ACTION');
+		$this->addForeignKey ('content_category_fk', 'content', 'category_id', 'categories', 'id', 'CASCADE', 'NO ACTION');
+		$this->addForeignKey ('content_author_fk', 'content', 'author_id', 'users', 'id', 'CASCADE', 'NO ACTION');
+		$this->addForeignKey ('content_type_fk', 'content', 'type_id', 'content_types', 'id', 'CASCADE', 'NO ACTION');
 
-		$this->addForeignKey('comments_content_id_fk', 'comments', 'content_id', 'content', 'id', 'CASCADE', 'NO ACTION');
-		$this->addForeignKey('comments_author_fk', 'comments', 'author_id', 'users', 'id', 'CASCADE', 'NO ACTION');
+		$this->addForeignKey ('comments_content_id_fk', 'comments', 'content_id', 'content', 'id', 'CASCADE', 'NO ACTION');
+		$this->addForeignKey ('comments_author_fk', 'comments', 'author_id', 'users', 'id', 'CASCADE', 'NO ACTION');
 	}
 
 	/**
 	 * Creates the configuration and events tables
 	 */
-	private function createConfiguration()
+	private function createConfiguration ()
 	{
-		$this->createTable('configuration', array(
+		$this->createTable ('configuration', array(
 			'key'		  => 'string',
 			'value' 	  => 'text NOT NULL',
 			'created' 	  => 'integer',
 			'updated' 	  => 'integer'
 		));
 
-		$this->createTable('events', array(
+		$this->createTable ('events', array(
 			'id'		  => 'pk',
 			'event'       => 'string NOT NULL',
 			'event_data'  => 'text DEFAULT NULL',
@@ -283,6 +283,6 @@ 
 			'created' 	  => 'integer'
 		));
 
-		$this->addPrimaryKey('configuration_pk', 'configuration', 'key');
+		$this->addPrimaryKey ('configuration_pk', 'configuration', 'key');
 	}
 }
\ No newline at end of file

protected/models/CategoriesMetadata.php

Spacing +19 added lines, -19 removed lines

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

 	 * @return CategoriesMetadata 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 'categories_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.

@@ -54,7 +54,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.

@@ -66,14 +66,14 @@ 
 	/**

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

 	 */

-	public function attributeLabels()

+	public function attributeLabels ()

 	{

 		return array(

-			'category_id' => Yii::t('ciims.models.CategoriesMetadata', 'Category ID'),

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

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

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

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

+			'category_id' => Yii::t ('ciims.models.CategoriesMetadata', 'Category ID'),

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

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

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

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

 		);

 	}

 

@@ -81,17 +81,17 @@ 
 	 * 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('category_id',$this->category_id);

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

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

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

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

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

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

+		$criteria->compare ('value', $this->value, 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,

 		));

 	}

protected/models/Comments.php

Spacing +34 added lines, -34 removed lines

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

 	 * @return Comments 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 'comments';

 	}

@@ -52,7 +52,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.

@@ -67,7 +67,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.

@@ -80,15 +80,15 @@ 
 	/**

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

 	 */

-	public function attributeLabels()

+	public function attributeLabels ()

 	{

 		return array(

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

-			'content_id' => Yii::t('ciims.models.Comments', 'Content'),

-			'author_id'  => Yii::t('ciims.models.Comments', 'User'),

-			'comment' 	 => Yii::t('ciims.models.Comments', 'Comment'),

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

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

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

+			'content_id' => Yii::t ('ciims.models.Comments', 'Content'),

+			'author_id'  => Yii::t ('ciims.models.Comments', 'User'),

+			'comment' 	 => Yii::t ('ciims.models.Comments', 'Comment'),

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

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

 		);

 	}

 

@@ -96,18 +96,18 @@ 
 	 * 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('content_id',$this->content_id);

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

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

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

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

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

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

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

+		$criteria->compare ('comment', $this->comment, 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,

 		));

 	}

@@ -116,18 +116,18 @@ 
 	 * Returns the API attributes for the model

 	 * @return array

 	 */

-	public function getApiAttributes($params = array(), $relations = false)

+	public function getApiAttributes ($params = array(), $relations = false)

 	{

-		$data = parent::getApiAttributes($params, $relations);

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

-		$attributes = $user->getApiAttributes();

+		$data = parent::getApiAttributes ($params, $relations);

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

+		$attributes = $user->getApiAttributes ();

 		$data['user'] = array(

 			'firstName' => $attributes['firstName'],

 			'lastName' => $attributes['lastName'],

 			'username' => $attributes['username'],

 		);

 

-		$content = Content::model()->findByPk($data['content_id']);

+		$content = Content::model ()->findByPk ($data['content_id']);

 		$data['content'] = array(

 			'id' => $data['content_id'],

 			'title' => $content->title,

@@ -135,7 +135,7 @@ 
 		);

 

 		// If this user cannot comment without approval

-		if ($user->getReputation() < 100)

+		if ($user->getReputation () < 100)

 			$data['banned_comment'] = true;

 

 		return $data;

@@ -145,13 +145,13 @@ 
 	 * Set the created and updated records

 	 * @see CiiModel::beforeSave();

 	 */

-	public function beforeSave()

+	public function beforeSave ()

 	{

 		if ($this->isNewRecord)

 			$this->_isNewRecord = true;

 

-		if (Content::model()->findByPk($this->content_id)->commentable)

-			return parent::beforeSave();

+		if (Content::model ()->findByPk ($this->content_id)->commentable)

+			return parent::beforeSave ();

 		else

 			return false;

 	}

@@ -160,14 +160,14 @@ 
 	 * After a new comment is posted, set the reputation += 10

 	 * @see parent::afterSave();

 	 */

-	public function afterSave()

+	public function afterSave ()

 	{

 		if ($this->_isNewRecord)

 		{

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

-			$user->setReputation(10);

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

+			$user->setReputation (10);

 		}

 

-		return parent::afterSave();

+		return parent::afterSave ();

 	}

 }

protected/models/ContentMetadata.php

Spacing +19 added lines, -19 removed lines

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

 	 * @return ContentMetadata 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 'content_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,14 +65,14 @@ 
 	/**

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

 	 */

-	public function attributeLabels()

+	public function attributeLabels ()

 	{

 		return array(

-			'content_id' => Yii::t('ciims.models.ContentMetadata', 'Content ID'),

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

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

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

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

+			'content_id' => Yii::t ('ciims.models.ContentMetadata', 'Content ID'),

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

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

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

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

 		);

 	}

 

@@ -80,17 +80,17 @@ 
 	 * 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('content_id',$this->content_id);

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

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

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

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

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

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

+		$criteria->compare ('value', $this->value, 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,

 		));

 	}

protected/models/ContentTypes.php

Spacing +17 added lines, -17 removed lines

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

 	 * @return ContentMetadata 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 'content_types';

 	}

@@ -23,7 +23,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.

@@ -37,7 +37,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.

@@ -49,13 +49,13 @@ 
 	/**

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

 	 */

-	public function attributeLabels()

+	public function attributeLabels ()

 	{

 		return array(

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

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

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

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

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

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

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

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

 		);

 	}

 

@@ -63,16 +63,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,

 		));

 	}

protected/models/UserMetadata.php

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,

 		));

 	}

protected/models/UserRoles.php

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,

 		));

 	}