charlesportwoodii / CiiMS

protected/messages/en_us/models/email.php

Indentation +24 added lines, -24 removed lines

@@ -1,28 +1,28 @@
 <?php
 /**
- * Message translations.
- *
- * This file is automatically generated by 'yiic message' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE, this file must be saved in UTF-8 encoding.
- */
+     * Message translations.
+     *
+     * This file is automatically generated by 'yiic message' command.
+     * It contains the localizable messages extracted from source code.
+     * You may modify this file by translating the extracted messages.
+     *
+     * Each array element represents the translation (value) of a message (key).
+     * If the value is empty, the message is considered as not translated.
+     * Messages that no longer need translation will have their translations
+     * enclosed between a pair of '@@' marks.
+     *
+     * Message string can be used with plural forms format. Check i18n section
+     * of the guide for details.
+     *
+     * NOTE, this file must be saved in UTF-8 encoding.
+     */
 return array (
-  'SMTP Hostname' => '',
-  'SMTP Password' => '',
-  'SMTP Port Number' => '',
-  'SMTP Username' => '',
-  'System Email Address' => '',
-  'System From Name' => '',
-  'Use SSL Connection' => '',
-  'Use TLS Connection' => '',
+    'SMTP Hostname' => '',
+    'SMTP Password' => '',
+    'SMTP Port Number' => '',
+    'SMTP Username' => '',
+    'System Email Address' => '',
+    'System From Name' => '',
+    'Use SSL Connection' => '',
+    'Use TLS Connection' => '',
 );

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/messages/en_us/models/general.php

Indentation +42 added lines, -42 removed lines

@@ -1,46 +1,46 @@
 <?php
 /**
- * Message translations.
- *
- * This file is automatically generated by 'yiic ciimessage' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE, this file must be saved in UTF-8 encoding.
- */
+     * Message translations.
+     *
+     * This file is automatically generated by 'yiic ciimessage' command.
+     * It contains the localizable messages extracted from source code.
+     * You may modify this file by translating the extracted messages.
+     *
+     * Each array element represents the translation (value) of a message (key).
+     * If the value is empty, the message is considered as not translated.
+     * Messages that no longer need translation will have their translations
+     * enclosed between a pair of '@@' marks.
+     *
+     * Message string can be used with plural forms format. Check i18n section
+     * of the guide for details.
+     *
+     * NOTE, this file must be saved in UTF-8 encoding.
+     */
 return array (
-  'Category Post Count' => '',
-  'Content Post Cost' => '',
-  'Date Format' => '',
-  'Default Language' => '',
-  'Discourse' => '',
-  'Discourse URL' => '',
-  'Display Settings' => '',
-  'Disqus' => '',
-  'Disqus Shortcode' => '',
-  'Force SSL for Secure Areas' => '',
-  'Offline Mode' => '',
-  'Openstack API Key' => '',
-  'Openstack Container Name' => '',
-  'Openstack Identity URL' => '',
-  'Openstack Region' => '',
-  'Openstack Username' => '',
-  'Password Strength Settings' => '',
-  'Search Post Count' => '',
-  'Site Name' => '',
-  'Site Settings' => '',
-  'Time Format' => '',
-  'Upload Settings' => '',
-  'Use Discourse Comments' => '',
-  'Use Disqus Comments' => '',
-  'Use Openstack for Uploads?' => '',
-  'Use Rackspace CDN?' => '',
+    'Category Post Count' => '',
+    'Content Post Cost' => '',
+    'Date Format' => '',
+    'Default Language' => '',
+    'Discourse' => '',
+    'Discourse URL' => '',
+    'Display Settings' => '',
+    'Disqus' => '',
+    'Disqus Shortcode' => '',
+    'Force SSL for Secure Areas' => '',
+    'Offline Mode' => '',
+    'Openstack API Key' => '',
+    'Openstack Container Name' => '',
+    'Openstack Identity URL' => '',
+    'Openstack Region' => '',
+    'Openstack Username' => '',
+    'Password Strength Settings' => '',
+    'Search Post Count' => '',
+    'Site Name' => '',
+    'Site Settings' => '',
+    'Time Format' => '',
+    'Upload Settings' => '',
+    'Use Discourse Comments' => '',
+    'Use Disqus Comments' => '',
+    'Use Openstack for Uploads?' => '',
+    'Use Rackspace CDN?' => '',
 );

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/messages/en_us/models/social.php

Indentation +33 added lines, -33 removed lines

@@ -1,37 +1,37 @@
 <?php
 /**
- * Message translations.
- *
- * This file is automatically generated by 'yiic message' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE, this file must be saved in UTF-8 encoding.
- */
+     * Message translations.
+     *
+     * This file is automatically generated by 'yiic message' command.
+     * It contains the localizable messages extracted from source code.
+     * You may modify this file by translating the extracted messages.
+     *
+     * Each array element represents the translation (value) of a message (key).
+     * If the value is empty, the message is considered as not translated.
+     * Messages that no longer need translation will have their translations
+     * enclosed between a pair of '@@' marks.
+     *
+     * Message string can be used with plural forms format. Check i18n section
+     * of the guide for details.
+     *
+     * NOTE, this file must be saved in UTF-8 encoding.
+     */
 return array (
-  'Access Token' => '',
-  'Access Token Secret' => '',
-  'AddThis' => '',
-  'AddThis Publisher ID' => '',
-  'App ID' => '',
-  'App Secret' => '',
-  'Client ID' => '',
-  'Client Secret' => '',
-  'Consumer Key' => '',
-  'Consumer Secret' => '',
-  'Facebook' => '',
-  'Google+' => '',
-  'LinkedIn' => '',
-  'Public Server API Key' => '',
-  'Scope' => '',
-  'Social Auth' => '',
-  'Twitter' => '',
+    'Access Token' => '',
+    'Access Token Secret' => '',
+    'AddThis' => '',
+    'AddThis Publisher ID' => '',
+    'App ID' => '',
+    'App Secret' => '',
+    'Client ID' => '',
+    'Client Secret' => '',
+    'Consumer Key' => '',
+    'Consumer Secret' => '',
+    'Facebook' => '',
+    'Google+' => '',
+    'LinkedIn' => '',
+    'Public Server API Key' => '',
+    'Scope' => '',
+    'Social Auth' => '',
+    'Twitter' => '',
 );

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/messages/en_us/models/theme.php

Indentation +18 added lines, -18 removed lines

@@ -1,22 +1,22 @@
 <?php
 /**
- * Message translations.
- *
- * This file is automatically generated by 'yiic ciimessage' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE, this file must be saved in UTF-8 encoding.
- */
+     * Message translations.
+     *
+     * This file is automatically generated by 'yiic ciimessage' command.
+     * It contains the localizable messages extracted from source code.
+     * You may modify this file by translating the extracted messages.
+     *
+     * Each array element represents the translation (value) of a message (key).
+     * If the value is empty, the message is considered as not translated.
+     * Messages that no longer need translation will have their translations
+     * enclosed between a pair of '@@' marks.
+     *
+     * Message string can be used with plural forms format. Check i18n section
+     * of the guide for details.
+     *
+     * NOTE, this file must be saved in UTF-8 encoding.
+     */
 return array (
-  'All Posts' => '',
-  'Theme' => '',
+    'All Posts' => '',
+    'Theme' => '',
 );

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/messages/en_us/module/Dashboard/main.php

Indentation +19 added lines, -19 removed lines

@@ -1,23 +1,23 @@
 <?php
 /**
- * Message translations.
- *
- * This file is automatically generated by 'yiic message' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE, this file must be saved in UTF-8 encoding.
- */
+     * Message translations.
+     *
+     * This file is automatically generated by 'yiic message' command.
+     * It contains the localizable messages extracted from source code.
+     * You may modify this file by translating the extracted messages.
+     *
+     * Each array element represents the translation (value) of a message (key).
+     * If the value is empty, the message is considered as not translated.
+     * Messages that no longer need translation will have their translations
+     * enclosed between a pair of '@@' marks.
+     *
+     * Message string can be used with plural forms format. Check i18n section
+     * of the guide for details.
+     *
+     * NOTE, this file must be saved in UTF-8 encoding.
+     */
 return array (
-  'Change Theme Settings' => '',
-  'There are no settings for this section.' => '',
-  'Unable to save uploaded image.' => '',
+    'Change Theme Settings' => '',
+    'There are no settings for this section.' => '',
+    'Unable to save uploaded image.' => '',
 );

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/messages/en_us/yii.php

Indentation +26 added lines, -26 removed lines

@@ -1,30 +1,30 @@
 <?php
 /**
- * Message translations.
- *
- * This file is automatically generated by 'yiic message' command.
- * It contains the localizable messages extracted from source code.
- * You may modify this file by translating the extracted messages.
- *
- * Each array element represents the translation (value) of a message (key).
- * If the value is empty, the message is considered as not translated.
- * Messages that no longer need translation will have their translations
- * enclosed between a pair of '@@' marks.
- *
- * Message string can be used with plural forms format. Check i18n section
- * of the guide for details.
- *
- * NOTE, this file must be saved in UTF-8 encoding.
- */
+     * Message translations.
+     *
+     * This file is automatically generated by 'yiic message' command.
+     * It contains the localizable messages extracted from source code.
+     * You may modify this file by translating the extracted messages.
+     *
+     * Each array element represents the translation (value) of a message (key).
+     * If the value is empty, the message is considered as not translated.
+     * Messages that no longer need translation will have their translations
+     * enclosed between a pair of '@@' marks.
+     *
+     * Message string can be used with plural forms format. Check i18n section
+     * of the guide for details.
+     *
+     * NOTE, this file must be saved in UTF-8 encoding.
+     */
 return array (
-  '&lt; Previous' => '',
-  '&lt;&lt; First' => '',
-  'CApcCache requires PHP apc extension to be loaded.' => '',
-  'CMemCache server configuration must be an array.' => '',
-  'CMemCache server configuration must have "host" value.' => '',
-  'Go to page: ' => '',
-  'Last &gt;&gt;' => '',
-  'Next &gt;' => '',
-  'The "forceCopy" and "linkAssets" cannot be both true.' => '',
-  'The asset "{asset}" to be published does not exist.' => '',
+    '&lt; Previous' => '',
+    '&lt;&lt; First' => '',
+    'CApcCache requires PHP apc extension to be loaded.' => '',
+    'CMemCache server configuration must be an array.' => '',
+    'CMemCache server configuration must have "host" value.' => '',
+    'Go to page: ' => '',
+    'Last &gt;&gt;' => '',
+    'Next &gt;' => '',
+    'The "forceCopy" and "linkAssets" cannot be both true.' => '',
+    'The asset "{asset}" to be published does not exist.' => '',
 );

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

Indentation +282 added lines, -282 removed lines

@@ -3,286 +3,286 @@
 class m141001_145619_init extends CDbMigration
 {
 
-	/**
-	 * For data insertions, this is the current time.
-	 * @var integer
-	 */
-	private $_moment = 0;
-
-	public function safeUp()
-	{
-		$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');
-			return true;
-		}
-		catch (Exception $e)
-		{
-			// Yii will throw an exception if Yii::app()->db->schema is undefined (which is should be if we're doing this for the first time)
-			// This SHOULD throw an error if we're running this for the first time - it's the only way to check if we have a valid db or not.
-		}
-
-		// Otherwise, run the install migration
-		$this->createUserTables();
-
-		$this->createCategories();
-
-		$this->createContent();
-
-		$this->createConfiguration();
-	}
-
-	public function safeDown()
-	{
-		echo "m141001_145619_init does not support migration down.\n";
-		return false;
-	}
-
-	/**
-	 * Creates the tables, indexes, and relations for users
-	 */
-	private function createUserTables()
-	{
-		$this->createTable('users', array(
-			'id' 		=> 'pk',
-			'email' 	=> 'string NOT NULL',
-			'password' 	=> 'string NOT NULL',
-			'username'  => 'string NOT NULL',
-			'user_role' => 'integer DEFAULT 1',
-			'status' 	=> 'integer DEFAULT 1',
-			'created' 	=> 'integer',
-			'updated' 	=> 'integer'
-		));
-
-		$this->createTable('user_roles', array(
-			'id' 		=> 'pk',
-			'name' 		=> 'string NOT NULL',
-			'created' 	=> 'integer',
-			'updated' 	=> 'integer'
-		));
-
-		$this->createTable('user_metadata', array(
-			'user_id' 	  => 'integer',
-			'key'		  => 'string NOT NULL',
-			'value' 	  => 'text NOT NULL',
-			'entity_type' => 'integer',
-			'created' 	  => 'integer',
-			'updated' 	  => 'integer'
-		));
-
-		// 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->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');
-
-		// Insert data into the tables
-		$this->insert('user_roles', array(
-			'id'      => 1,
-			'name' 	  => 'User',
-			'created' => $this->_moment,
-			'updated' => $this->_moment
-		));
-
-		$this->insert('user_roles', array(
-			'id'      => 2,
-			'name'    => 'Pending',
-			'created' => $this->_moment,
-			'updated' => $this->_moment
-		));
-
-		$this->insert('user_roles', array(
-			'id'      => 3,
-			'name'    => 'Suspended',
-			'created' => $this->_moment,
-			'updated' => $this->_moment
-		));
-
-		$this->insert('user_roles', array(
-			'id'      => 5,
-			'name'    => 'Collaborator',
-			'created' => $this->_moment,
-			'updated' => $this->_moment
-		));
-
-		$this->insert('user_roles', array(
-			'id'      => 6,
-			'name'    => 'Author',
-			'created' => $this->_moment,
-			'updated' => $this->_moment
-		));
-
-		$this->insert('user_roles', array(
-			'id'      => 7,
-			'name'    => 'User',
-			'created' => $this->_moment,
-			'updated' => $this->_moment
-		));
-
-		$this->insert('user_roles', array(
-			'id'      => 8,
-			'name'    => 'Publisher',
-			'created' => $this->_moment,
-			'updated' => $this->_moment
-		));
-
-		$this->insert('user_roles', array(
-			'id'      => 9,
-			'name'    => 'Administrator',
-			'created' => $this->_moment,
-			'updated' => $this->_moment
-		));
-	}
-
-	/**
-	 * Create the categories and relations
-	 */
-	private function createCategories()
-	{
-		// Categories
-		$this->createTable('categories', array(
-			'id' 		=> 'pk',
-			'parent_id' => 'integer DEFAULT 1',
-			'name' 		=> 'string NOT NULL',
-			'slug' 	    => 'string NOT NULL',
-			'created' 	=> 'integer',
-			'updated' 	=> 'integer'
-		));
-
-		$this->createTable('categories_metadata', array(
-			'category_id' => 'integer',
-			'key'		  => 'string NOT NULL',
-			'value' 	  => 'text NOT NULL',
-			'created' 	  => 'integer',
-			'updated' 	  => 'integer'
-		));
-
-		// Insert the first record into the categories table
-		$this->insert('categories', array(
-			'id'      => 1,
-			'name'    => 'Uncategorized',
-			'slug'    => 'uncategorized',
-			'created' => $this->_moment,
-			'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');
-	}
-
-	/**
-	 * Creates the content, comemnts, and necessary relations
-	 */
-	private function createContent()
-	{
-		$this->createTable('content', array(
-			'id'		  => 'integer NOT NULL',
-			'vid' 		  => 'integer NOT NULL DEFAULT 1',
-			'title'		  => 'string  NOT NULL',
-			'content'     => 'text NOT NULL',
-			'excerpt'     => 'text NOT NULL',
-			'slug'        => 'string NOT NULL',
-			'category_id' => 'integer DEFAULT 1',
-			'author_id'   => 'integer DEFAULT 1',
-			'type_id'     => 'integer DEFAULT 2',
-			'commentable' => 'integer DEFAULT 1',
-			'password' 	  => 'string DEFAULT NULL',
-			'status'      => 'integer DEFAULT 0',
-			'like_count'  => 'integer DEFAULT 0',
-			'published'	  => 'integer',
-			'created'     => 'integer',
-			'updated' 	  => 'integer'
-		));
-
-		$this->createTable('content_types', array(
-			'id'          => 'pk',
-			'name'		  => 'string NOT NULL',
-			'created'     => 'integer',
-			'updated' 	  => 'integer'
-		));
-
-		$this->createTable('content_metadata', array(
-			'content_id'  => 'integer',
-			'key'		  => 'string NOT NULL',
-			'value' 	  => 'text NOT NULL',
-			'created' 	  => 'integer',
-			'updated' 	  => 'integer'
-		));
-
-		$this->createTable('comments', array(
-			'id'		  => 'pk',
-			'content_id'  => 'integer',
-			'author_id'   => 'integer',
-			'comment'     => 'integer',
-			'created'     => 'integer',
-			'updated' 	  => 'integer'
-		));
-
-		$this->insert('content_types', array(
-			'id'          => 1,
-			'name'        => 'Static Page',
-			'created'     => $this->_moment,
-			'updated'     => $this->_moment
-		));
-
-		$this->insert('content_types', array(
-			'id'          => 2,
-			'name'    	  => 'Blog Post',
-			'created'     => $this->_moment,
-			'updated'     => $this->_moment
-		));
-
-		$this->addPrimaryKey('content_composite', 'content', 'id, vid');
-
-		$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->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('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()
-	{
-		$this->createTable('configuration', array(
-			'key'		  => 'string',
-			'value' 	  => 'text NOT NULL',
-			'created' 	  => 'integer',
-			'updated' 	  => 'integer'
-		));
-
-		$this->createTable('events', array(
-			'id'		  => 'pk',
-			'event'       => 'string NOT NULL',
-			'event_data'  => 'text DEFAULT NULL',
-			'uri'         => 'string DEFAULT NULL',
-			'content_id'  => 'integer DEFAULT NULL',
-			'created' 	  => 'integer'
-		));
-
-		$this->addPrimaryKey('configuration_pk', 'configuration', 'key');
-	}
+    /**
+     * For data insertions, this is the current time.
+     * @var integer
+     */
+    private $_moment = 0;
+
+    public function safeUp()
+    {
+        $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');
+            return true;
+        }
+        catch (Exception $e)
+        {
+            // Yii will throw an exception if Yii::app()->db->schema is undefined (which is should be if we're doing this for the first time)
+            // This SHOULD throw an error if we're running this for the first time - it's the only way to check if we have a valid db or not.
+        }
+
+        // Otherwise, run the install migration
+        $this->createUserTables();
+
+        $this->createCategories();
+
+        $this->createContent();
+
+        $this->createConfiguration();
+    }
+
+    public function safeDown()
+    {
+        echo "m141001_145619_init does not support migration down.\n";
+        return false;
+    }
+
+    /**
+     * Creates the tables, indexes, and relations for users
+     */
+    private function createUserTables()
+    {
+        $this->createTable('users', array(
+            'id' 		=> 'pk',
+            'email' 	=> 'string NOT NULL',
+            'password' 	=> 'string NOT NULL',
+            'username'  => 'string NOT NULL',
+            'user_role' => 'integer DEFAULT 1',
+            'status' 	=> 'integer DEFAULT 1',
+            'created' 	=> 'integer',
+            'updated' 	=> 'integer'
+        ));
+
+        $this->createTable('user_roles', array(
+            'id' 		=> 'pk',
+            'name' 		=> 'string NOT NULL',
+            'created' 	=> 'integer',
+            'updated' 	=> 'integer'
+        ));
+
+        $this->createTable('user_metadata', array(
+            'user_id' 	  => 'integer',
+            'key'		  => 'string NOT NULL',
+            'value' 	  => 'text NOT NULL',
+            'entity_type' => 'integer',
+            'created' 	  => 'integer',
+            'updated' 	  => 'integer'
+        ));
+
+        // 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->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');
+
+        // Insert data into the tables
+        $this->insert('user_roles', array(
+            'id'      => 1,
+            'name' 	  => 'User',
+            'created' => $this->_moment,
+            'updated' => $this->_moment
+        ));
+
+        $this->insert('user_roles', array(
+            'id'      => 2,
+            'name'    => 'Pending',
+            'created' => $this->_moment,
+            'updated' => $this->_moment
+        ));
+
+        $this->insert('user_roles', array(
+            'id'      => 3,
+            'name'    => 'Suspended',
+            'created' => $this->_moment,
+            'updated' => $this->_moment
+        ));
+
+        $this->insert('user_roles', array(
+            'id'      => 5,
+            'name'    => 'Collaborator',
+            'created' => $this->_moment,
+            'updated' => $this->_moment
+        ));
+
+        $this->insert('user_roles', array(
+            'id'      => 6,
+            'name'    => 'Author',
+            'created' => $this->_moment,
+            'updated' => $this->_moment
+        ));
+
+        $this->insert('user_roles', array(
+            'id'      => 7,
+            'name'    => 'User',
+            'created' => $this->_moment,
+            'updated' => $this->_moment
+        ));
+
+        $this->insert('user_roles', array(
+            'id'      => 8,
+            'name'    => 'Publisher',
+            'created' => $this->_moment,
+            'updated' => $this->_moment
+        ));
+
+        $this->insert('user_roles', array(
+            'id'      => 9,
+            'name'    => 'Administrator',
+            'created' => $this->_moment,
+            'updated' => $this->_moment
+        ));
+    }
+
+    /**
+     * Create the categories and relations
+     */
+    private function createCategories()
+    {
+        // Categories
+        $this->createTable('categories', array(
+            'id' 		=> 'pk',
+            'parent_id' => 'integer DEFAULT 1',
+            'name' 		=> 'string NOT NULL',
+            'slug' 	    => 'string NOT NULL',
+            'created' 	=> 'integer',
+            'updated' 	=> 'integer'
+        ));
+
+        $this->createTable('categories_metadata', array(
+            'category_id' => 'integer',
+            'key'		  => 'string NOT NULL',
+            'value' 	  => 'text NOT NULL',
+            'created' 	  => 'integer',
+            'updated' 	  => 'integer'
+        ));
+
+        // Insert the first record into the categories table
+        $this->insert('categories', array(
+            'id'      => 1,
+            'name'    => 'Uncategorized',
+            'slug'    => 'uncategorized',
+            'created' => $this->_moment,
+            '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');
+    }
+
+    /**
+     * Creates the content, comemnts, and necessary relations
+     */
+    private function createContent()
+    {
+        $this->createTable('content', array(
+            'id'		  => 'integer NOT NULL',
+            'vid' 		  => 'integer NOT NULL DEFAULT 1',
+            'title'		  => 'string  NOT NULL',
+            'content'     => 'text NOT NULL',
+            'excerpt'     => 'text NOT NULL',
+            'slug'        => 'string NOT NULL',
+            'category_id' => 'integer DEFAULT 1',
+            'author_id'   => 'integer DEFAULT 1',
+            'type_id'     => 'integer DEFAULT 2',
+            'commentable' => 'integer DEFAULT 1',
+            'password' 	  => 'string DEFAULT NULL',
+            'status'      => 'integer DEFAULT 0',
+            'like_count'  => 'integer DEFAULT 0',
+            'published'	  => 'integer',
+            'created'     => 'integer',
+            'updated' 	  => 'integer'
+        ));
+
+        $this->createTable('content_types', array(
+            'id'          => 'pk',
+            'name'		  => 'string NOT NULL',
+            'created'     => 'integer',
+            'updated' 	  => 'integer'
+        ));
+
+        $this->createTable('content_metadata', array(
+            'content_id'  => 'integer',
+            'key'		  => 'string NOT NULL',
+            'value' 	  => 'text NOT NULL',
+            'created' 	  => 'integer',
+            'updated' 	  => 'integer'
+        ));
+
+        $this->createTable('comments', array(
+            'id'		  => 'pk',
+            'content_id'  => 'integer',
+            'author_id'   => 'integer',
+            'comment'     => 'integer',
+            'created'     => 'integer',
+            'updated' 	  => 'integer'
+        ));
+
+        $this->insert('content_types', array(
+            'id'          => 1,
+            'name'        => 'Static Page',
+            'created'     => $this->_moment,
+            'updated'     => $this->_moment
+        ));
+
+        $this->insert('content_types', array(
+            'id'          => 2,
+            'name'    	  => 'Blog Post',
+            'created'     => $this->_moment,
+            'updated'     => $this->_moment
+        ));
+
+        $this->addPrimaryKey('content_composite', 'content', 'id, vid');
+
+        $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->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('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()
+    {
+        $this->createTable('configuration', array(
+            'key'		  => 'string',
+            'value' 	  => 'text NOT NULL',
+            'created' 	  => 'integer',
+            'updated' 	  => 'integer'
+        ));
+
+        $this->createTable('events', array(
+            'id'		  => 'pk',
+            'event'       => 'string NOT NULL',
+            'event_data'  => 'text DEFAULT NULL',
+            'uri'         => 'string DEFAULT NULL',
+            'content_id'  => 'integer DEFAULT NULL',
+            'created' 	  => 'integer'
+        ));
+
+        $this->addPrimaryKey('configuration_pk', 'configuration', 'key');
+    }
 }
\ No newline at end of file

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

Braces +4 added lines, -4 removed lines

@@ -17,11 +17,11 @@
 		try
 		{
 			$test = Yii::app()->db->schema->getTables();
-			if (count($test) <= 1)
-				throw new Exception('CiiMS doesn\'t exist. Applying base migration');
+			if (count($test) <= 1) {
+							throw new Exception('CiiMS doesn\'t exist. Applying base migration');
+			}
 			return true;
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			// Yii will throw an exception if Yii::app()->db->schema is undefined (which is should be if we're doing this for the first time)
 			// This SHOULD throw an error if we're running this for the first time - it's the only way to check if we have a valid db or not.

protected/models/Categories.php

Indentation +315 added lines, -315 removed lines

@@ -19,319 +19,319 @@
  */

 class Categories extends CiiModel

 {

-	public $pageSize = 15;

-

-	public $description = NULL;

-

-	public $keywords = array();

-

-	/**

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

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

-	 * @return Categories 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 'categories';

-	}

-

-	/**

-	 * @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('parent_id, name', 'required'),

-			array('parent_id', 'numerical', 'integerOnly'=>true),

-			array('name, slug', 'length', 'max'=>150),

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

-			// Please remove those attributes that should not be searched.

-			array('id, parent_id, name, slug', '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(

-			'parent' => array(self::BELONGS_TO, 'Categories', 'parent_id'),

-			'metadata' => array(self::HAS_MANY, 'CategoriesMetadata', 'category_id'),

-			'content' => array(self::HAS_MANY, 'Content', 'category_id'),

-		);

-	}

-

-	/**

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

-	 */

-	public function attributeLabels()

-	{

-		return array(

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

-			'parent_id' => Yii::t('ciims.models.Categories', 'Parent'),

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

-			'slug'      => Yii::t('ciims.models.Categories', 'Slug'),

-			'description' => Yii::t('ciims.models.Categories', 'Description'),

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

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

-		);

-	}

-

-	public function getDescription()

-	{

-		$this->description = CategoriesMetadata::model()->findByAttributes(array('category_id' => $this->id, 'key' => 'description'));

-		if ($this->description == null || $this->description == false)

-			return NULL;

-

-		$this->description = $this->description->value;

-		return $this->description;

-	}

-

-	/**

-	 * 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('parent_id',$this->parent_id);

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

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

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

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

-		$criteria->order = "id DESC";

-

-		return new CActiveDataProvider($this, array(

-			'criteria' => $criteria,

-			'pagination' => array(

-				'pageSize' => $this->pageSize

-			)

-		));

-	}

-

-	/**

-	 * Gets keyword tags for this entry

-	 * @return array

-	 */

-	public function getKeywords()

-	{

-		$tags = CategoriesMetadata::model()->findByAttributes(array('category_id' => $this->id, 'key' => 'keywords'));

-		return $tags === NULL ? array() : CJSON::decode($tags->value);

-	}

-

-	/**

-	 * Adds a tag to the model

-	 * @param string $tag	The tag to add

-	 * @return bool			If the insert was successful or not

-	 */

-	public function addKeyword($tag)

-	{

-		$tags = $this->keywords;

-		if (in_array($tag, $tags)  || $tag == "")

-			return false;

-

-		$tags[] = $tag;

-		$tags = CJSON::encode($tags);

-		$metaTag = CategoriesMetadata::model()->findByAttributes(array('category_id' => $this->id, 'key' => 'keywords'));

-		if ($metaTag == false || $metaTag == NULL)

-		{

-			$metaTag = new CategoriestMetadata;

-			$metaTag->content_id = $this->id;

-			$metaTag->key = 'keywords';

-		}

-

-		$metaTag->value = $tags;

-		return $metaTag->save();

-	}

-

-	/**

-	 * Removes a tag from the model

-	 * @param string $tag	The tag to remove

-	 * @return bool			If the removal was successful

-	 */

-	public function removeKeyword($tag)

-	{

-		$tags = $this->keywords;

-		if (!in_array($tag, $tags) || $tag == "")

-			return false;

-

-		$key = array_search($tag, $tags);

-		unset($tags[$key]);

-		$tags = CJSON::encode($tags);

-

-		$metaTag = CategoryMetadata::model()->findByAttributes(array('category_id' => $this->id, 'key' => 'keywords'));

-		$metaTag->value = $tags;

-		return $metaTag->save();

-	}

-

-	/**

-	 * Verifies the slug before validating the model

-	 */

-	public function beforeValidate()

-	{

-		$this->slug = $this->verifySlug($this->slug, $this->name);

-

-		return parent::beforeValidate();

-	}

-

-	/**

-	 * Flushes URL data from the cache before the model is updated

-	 */

-	public function afterSave()

-	{

-		$meta = CategoriesMetadata::model()->findByAttributes(array('category_id' => $this->id, 'key' => 'description'));

-		if ($meta == NULL)

-			$meta = new CategoriesMetadata;

-

-		$meta->category_id = $this->id;

-		$meta->key = 'description';

-		$meta->value  = $this->description;

-

-		$meta->save();

-

-		Yii::app()->cache->delete('CiiMS::Content::list');

-		Yii::app()->cache->delete('CiiMS::Routes');

-		Yii::app()->cache->delete('categories-pid');

-

-		return parent::afterSave();

-	}

-

-	/**

-	 * Automatically corrects parent tree issues that arise when a parent category node

-	 * is deleted.

-	 * @return boolean

-	 */

-	public function beforeDelete()

-	{

-		// Prevents the main "uncategorized category from being deleted"

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

-		{

-			Yii::app()->user->setFlash('error', Yii::t('ciims.models.Categories', 'This category cannot be deleted'));

-			return false;

-		}

-

-		Yii::app()->cache->delete('CiiMS::Content::list');

-		Yii::app()->cache->delete('CiiMS::Routes');

-		Yii::app()->cache->delete('categories-pid');

-

-		$parent = $this->parent_id;

-		$id = $this->id;

-

-		// Reassign all posts to the parent category

-		Yii::app()->db

-				->createCommand('UPDATE content SET category_id = :parent_id WHERE category_id = :id')

-				->bindParam(':parent_id', $parent)

-				->bindParam(':id', $id)

-				->execute();

-

-		// Reassign all child categories to the parent category

-		$data = $this->findAllByAttributes(array('parent_id' => $id));

-

-		foreach ($data as $row)

-		{

-			$id = $row->id;

-			Yii::app()->db

-					->createCommand('UPDATE categories SET parent_id = :parent_id WHERE id = :id')

-					->bindParam(':parent_id', $parent)

-					->bindParam(':id', $id)

-					->execute();

-		}

-

-		return parent::beforeDelete();

-	}

-

-	/**

-	 * Retrieves the parent categories for a given category_id

-	 * @param  int $id

-	 * @return array

-	 */

-	public function getParentCategories($id)

-	{

-		// Retrieve the data from cache if necessary

-		$response = Yii::app()->cache->get('categories-pid');

-		if ($response == NULL)

-		{

-			$response = Yii::app()->db->createCommand('SELECT id, parent_id, name, slug FROM categories')->queryAll();

-			Yii::app()->cache->set('categories-pid', $response);

-		}

-

-		return $this->_getParentCategories($response, $id);

-	}

-

-	/**

-	 * Recursive callback for retrieving parent categories

-	 * @param  int  $id      The category we're seeking

-	 * @param  array  $stack A stack to hold the entire tree

-	 * @return array

-	 */

-	private function _getParentCategories($all_categories, $id, array $stack = array())

-	{

-		if ($id == 1)

-			return array_reverse($stack);

-

-		foreach ($all_categories as $k=>$v)

-		{

-			if ($v['id'] == $id)

-			{

-				$stack[$v['name']] = array(str_replace(Yii::app()->baseUrl, NULL, Yii::app()->createUrl($v['slug'])));

-				return $this->_getParentCategories($all_categories, $v['parent_id'], $stack);

-			}

-		}

-	}

-

-	/**

-	 * checkSlug - Recursive method to verify that the slug can be used

-	 * This method is purposfuly declared here to so that Content::findByPk is used instead of CiiModel::findByPk

-	 * @param string $slug - the slug to be checked

-	 * @param int $id - the numeric id to be appended to the slug if a conflict exists

-	 * @return string $slug - the final slug to be used

-	 */

-	public function checkSlug($slug, $id=NULL)

-	{

-		$content = false;

-

-		// Find the number of items that have the same slug as this one

-		$count = $this->countByAttributes(array('slug'=>$slug . $id));

-

-		if ($count == 0)

-		{

-			$content = true;

-			$count = Content::model()->countByAttributes(array('slug'=>$slug . $id));

-		}

-

-		// If we found an item that matched, it's possible that it is the current item (or a previous version of it)

-		// in which case we don't need to alter the slug

-		if ($count >= 1)

-		{

-			if ($content)

-				return $this->checkSlug($slug, ($id === NULL ? 1 : ($id+1)));

-

-			// Pull the data that matches

-			$data = $this->findByPk($this->id === NULL ? -1 : $this->id);

-

-			// Check the pulled data id to the current item

-			if ($data !== NULL && $data->id == $this->id)

-				return $slug;

-		}

-

-		if ($count == 0 && !in_array($slug, $this->forbiddenRoutes))

-			return $slug . $id;

-		else

-			return $this->checkSlug($slug, ($id === NULL ? 1 : ($id+1)));

-	}

+    public $pageSize = 15;

+

+    public $description = NULL;

+

+    public $keywords = array();

+

+    /**

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

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

+     * @return Categories 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 'categories';

+    }

+

+    /**

+     * @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('parent_id, name', 'required'),

+            array('parent_id', 'numerical', 'integerOnly'=>true),

+            array('name, slug', 'length', 'max'=>150),

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

+            // Please remove those attributes that should not be searched.

+            array('id, parent_id, name, slug', '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(

+            'parent' => array(self::BELONGS_TO, 'Categories', 'parent_id'),

+            'metadata' => array(self::HAS_MANY, 'CategoriesMetadata', 'category_id'),

+            'content' => array(self::HAS_MANY, 'Content', 'category_id'),

+        );

+    }

+

+    /**

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

+     */

+    public function attributeLabels()

+    {

+        return array(

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

+            'parent_id' => Yii::t('ciims.models.Categories', 'Parent'),

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

+            'slug'      => Yii::t('ciims.models.Categories', 'Slug'),

+            'description' => Yii::t('ciims.models.Categories', 'Description'),

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

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

+        );

+    }

+

+    public function getDescription()

+    {

+        $this->description = CategoriesMetadata::model()->findByAttributes(array('category_id' => $this->id, 'key' => 'description'));

+        if ($this->description == null || $this->description == false)

+            return NULL;

+

+        $this->description = $this->description->value;

+        return $this->description;

+    }

+

+    /**

+     * 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('parent_id',$this->parent_id);

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

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

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

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

+        $criteria->order = "id DESC";

+

+        return new CActiveDataProvider($this, array(

+            'criteria' => $criteria,

+            'pagination' => array(

+                'pageSize' => $this->pageSize

+            )

+        ));

+    }

+

+    /**

+     * Gets keyword tags for this entry

+     * @return array

+     */

+    public function getKeywords()

+    {

+        $tags = CategoriesMetadata::model()->findByAttributes(array('category_id' => $this->id, 'key' => 'keywords'));

+        return $tags === NULL ? array() : CJSON::decode($tags->value);

+    }

+

+    /**

+     * Adds a tag to the model

+     * @param string $tag	The tag to add

+     * @return bool			If the insert was successful or not

+     */

+    public function addKeyword($tag)

+    {

+        $tags = $this->keywords;

+        if (in_array($tag, $tags)  || $tag == "")

+            return false;

+

+        $tags[] = $tag;

+        $tags = CJSON::encode($tags);

+        $metaTag = CategoriesMetadata::model()->findByAttributes(array('category_id' => $this->id, 'key' => 'keywords'));

+        if ($metaTag == false || $metaTag == NULL)

+        {

+            $metaTag = new CategoriestMetadata;

+            $metaTag->content_id = $this->id;

+            $metaTag->key = 'keywords';

+        }

+

+        $metaTag->value = $tags;

+        return $metaTag->save();

+    }

+

+    /**

+     * Removes a tag from the model

+     * @param string $tag	The tag to remove

+     * @return bool			If the removal was successful

+     */

+    public function removeKeyword($tag)

+    {

+        $tags = $this->keywords;

+        if (!in_array($tag, $tags) || $tag == "")

+            return false;

+

+        $key = array_search($tag, $tags);

+        unset($tags[$key]);

+        $tags = CJSON::encode($tags);

+

+        $metaTag = CategoryMetadata::model()->findByAttributes(array('category_id' => $this->id, 'key' => 'keywords'));

+        $metaTag->value = $tags;

+        return $metaTag->save();

+    }

+

+    /**

+     * Verifies the slug before validating the model

+     */

+    public function beforeValidate()

+    {

+        $this->slug = $this->verifySlug($this->slug, $this->name);

+

+        return parent::beforeValidate();

+    }

+

+    /**

+     * Flushes URL data from the cache before the model is updated

+     */

+    public function afterSave()

+    {

+        $meta = CategoriesMetadata::model()->findByAttributes(array('category_id' => $this->id, 'key' => 'description'));

+        if ($meta == NULL)

+            $meta = new CategoriesMetadata;

+

+        $meta->category_id = $this->id;

+        $meta->key = 'description';

+        $meta->value  = $this->description;

+

+        $meta->save();

+

+        Yii::app()->cache->delete('CiiMS::Content::list');

+        Yii::app()->cache->delete('CiiMS::Routes');

+        Yii::app()->cache->delete('categories-pid');

+

+        return parent::afterSave();

+    }

+

+    /**

+     * Automatically corrects parent tree issues that arise when a parent category node

+     * is deleted.

+     * @return boolean

+     */

+    public function beforeDelete()

+    {

+        // Prevents the main "uncategorized category from being deleted"

+        if ($this->id == 1)

+        {

+            Yii::app()->user->setFlash('error', Yii::t('ciims.models.Categories', 'This category cannot be deleted'));

+            return false;

+        }

+

+        Yii::app()->cache->delete('CiiMS::Content::list');

+        Yii::app()->cache->delete('CiiMS::Routes');

+        Yii::app()->cache->delete('categories-pid');

+

+        $parent = $this->parent_id;

+        $id = $this->id;

+

+        // Reassign all posts to the parent category

+        Yii::app()->db

+                ->createCommand('UPDATE content SET category_id = :parent_id WHERE category_id = :id')

+                ->bindParam(':parent_id', $parent)

+                ->bindParam(':id', $id)

+                ->execute();

+

+        // Reassign all child categories to the parent category

+        $data = $this->findAllByAttributes(array('parent_id' => $id));

+

+        foreach ($data as $row)

+        {

+            $id = $row->id;

+            Yii::app()->db

+                    ->createCommand('UPDATE categories SET parent_id = :parent_id WHERE id = :id')

+                    ->bindParam(':parent_id', $parent)

+                    ->bindParam(':id', $id)

+                    ->execute();

+        }

+

+        return parent::beforeDelete();

+    }

+

+    /**

+     * Retrieves the parent categories for a given category_id

+     * @param  int $id

+     * @return array

+     */

+    public function getParentCategories($id)

+    {

+        // Retrieve the data from cache if necessary

+        $response = Yii::app()->cache->get('categories-pid');

+        if ($response == NULL)

+        {

+            $response = Yii::app()->db->createCommand('SELECT id, parent_id, name, slug FROM categories')->queryAll();

+            Yii::app()->cache->set('categories-pid', $response);

+        }

+

+        return $this->_getParentCategories($response, $id);

+    }

+

+    /**

+     * Recursive callback for retrieving parent categories

+     * @param  int  $id      The category we're seeking

+     * @param  array  $stack A stack to hold the entire tree

+     * @return array

+     */

+    private function _getParentCategories($all_categories, $id, array $stack = array())

+    {

+        if ($id == 1)

+            return array_reverse($stack);

+

+        foreach ($all_categories as $k=>$v)

+        {

+            if ($v['id'] == $id)

+            {

+                $stack[$v['name']] = array(str_replace(Yii::app()->baseUrl, NULL, Yii::app()->createUrl($v['slug'])));

+                return $this->_getParentCategories($all_categories, $v['parent_id'], $stack);

+            }

+        }

+    }

+

+    /**

+     * checkSlug - Recursive method to verify that the slug can be used

+     * This method is purposfuly declared here to so that Content::findByPk is used instead of CiiModel::findByPk

+     * @param string $slug - the slug to be checked

+     * @param int $id - the numeric id to be appended to the slug if a conflict exists

+     * @return string $slug - the final slug to be used

+     */

+    public function checkSlug($slug, $id=NULL)

+    {

+        $content = false;

+

+        // Find the number of items that have the same slug as this one

+        $count = $this->countByAttributes(array('slug'=>$slug . $id));

+

+        if ($count == 0)

+        {

+            $content = true;

+            $count = Content::model()->countByAttributes(array('slug'=>$slug . $id));

+        }

+

+        // If we found an item that matched, it's possible that it is the current item (or a previous version of it)

+        // in which case we don't need to alter the slug

+        if ($count >= 1)

+        {

+            if ($content)

+                return $this->checkSlug($slug, ($id === NULL ? 1 : ($id+1)));

+

+            // Pull the data that matches

+            $data = $this->findByPk($this->id === NULL ? -1 : $this->id);

+

+            // Check the pulled data id to the current item

+            if ($data !== NULL && $data->id == $this->id)

+                return $slug;

+        }

+

+        if ($count == 0 && !in_array($slug, $this->forbiddenRoutes))

+            return $slug . $id;

+        else

+            return $this->checkSlug($slug, ($id === NULL ? 1 : ($id+1)));

+    }

 }

Spacing +83 added lines, -83 removed lines

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

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

 	}

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

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

@@ -77,22 +77,22 @@ 
 	/**

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

 	 */

-	public function attributeLabels()

+	public function attributeLabels ()

 	{

 		return array(

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

-			'parent_id' => Yii::t('ciims.models.Categories', 'Parent'),

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

-			'slug'      => Yii::t('ciims.models.Categories', 'Slug'),

-			'description' => Yii::t('ciims.models.Categories', 'Description'),

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

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

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

+			'parent_id' => Yii::t ('ciims.models.Categories', 'Parent'),

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

+			'slug'      => Yii::t ('ciims.models.Categories', 'Slug'),

+			'description' => Yii::t ('ciims.models.Categories', 'Description'),

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

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

 		);

 	}

 

-	public function getDescription()

+	public function getDescription ()

 	{

-		$this->description = CategoriesMetadata::model()->findByAttributes(array('category_id' => $this->id, 'key' => 'description'));

+		$this->description = CategoriesMetadata::model ()->findByAttributes (array('category_id' => $this->id, 'key' => 'description'));

 		if ($this->description == null || $this->description == false)

 			return NULL;

 

@@ -104,19 +104,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->compare('id',$this->id);

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

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

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

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

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

+		$criteria = new CDbCriteria;

+

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

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

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

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

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

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

 		$criteria->order = "id DESC";

 

-		return new CActiveDataProvider($this, array(

+		return new CActiveDataProvider ($this, array(

 			'criteria' => $criteria,

 			'pagination' => array(

 				'pageSize' => $this->pageSize

@@ -128,10 +128,10 @@ 
 	 * Gets keyword tags for this entry

 	 * @return array

 	 */

-	public function getKeywords()

+	public function getKeywords ()

 	{

-		$tags = CategoriesMetadata::model()->findByAttributes(array('category_id' => $this->id, 'key' => 'keywords'));

-		return $tags === NULL ? array() : CJSON::decode($tags->value);

+		$tags = CategoriesMetadata::model ()->findByAttributes (array('category_id' => $this->id, 'key' => 'keywords'));

+		return $tags === NULL ? array() : CJSON::decode ($tags->value);

 	}

 

 	/**

@@ -139,15 +139,15 @@ 
 	 * @param string $tag	The tag to add

 	 * @return bool			If the insert was successful or not

 	 */

-	public function addKeyword($tag)

+	public function addKeyword ($tag)

 	{

 		$tags = $this->keywords;

-		if (in_array($tag, $tags)  || $tag == "")

+		if (in_array ($tag, $tags) || $tag == "")

 			return false;

 

 		$tags[] = $tag;

-		$tags = CJSON::encode($tags);

-		$metaTag = CategoriesMetadata::model()->findByAttributes(array('category_id' => $this->id, 'key' => 'keywords'));

+		$tags = CJSON::encode ($tags);

+		$metaTag = CategoriesMetadata::model ()->findByAttributes (array('category_id' => $this->id, 'key' => 'keywords'));

 		if ($metaTag == false || $metaTag == NULL)

 		{

 			$metaTag = new CategoriestMetadata;

@@ -156,7 +156,7 @@ 
 		}

 

 		$metaTag->value = $tags;

-		return $metaTag->save();

+		return $metaTag->save ();

 	}

 

 	/**

@@ -164,51 +164,51 @@ 
 	 * @param string $tag	The tag to remove

 	 * @return bool			If the removal was successful

 	 */

-	public function removeKeyword($tag)

+	public function removeKeyword ($tag)

 	{

 		$tags = $this->keywords;

-		if (!in_array($tag, $tags) || $tag == "")

+		if (!in_array ($tag, $tags) || $tag == "")

 			return false;

 

-		$key = array_search($tag, $tags);

+		$key = array_search ($tag, $tags);

 		unset($tags[$key]);

-		$tags = CJSON::encode($tags);

+		$tags = CJSON::encode ($tags);

 

-		$metaTag = CategoryMetadata::model()->findByAttributes(array('category_id' => $this->id, 'key' => 'keywords'));

+		$metaTag = CategoryMetadata::model ()->findByAttributes (array('category_id' => $this->id, 'key' => 'keywords'));

 		$metaTag->value = $tags;

-		return $metaTag->save();

+		return $metaTag->save ();

 	}

 

 	/**

 	 * Verifies the slug before validating the model

 	 */

-	public function beforeValidate()

+	public function beforeValidate ()

 	{

-		$this->slug = $this->verifySlug($this->slug, $this->name);

+		$this->slug = $this->verifySlug ($this->slug, $this->name);

 

-		return parent::beforeValidate();

+		return parent::beforeValidate ();

 	}

 

 	/**

 	 * Flushes URL data from the cache before the model is updated

 	 */

-	public function afterSave()

+	public function afterSave ()

 	{

-		$meta = CategoriesMetadata::model()->findByAttributes(array('category_id' => $this->id, 'key' => 'description'));

+		$meta = CategoriesMetadata::model ()->findByAttributes (array('category_id' => $this->id, 'key' => 'description'));

 		if ($meta == NULL)

 			$meta = new CategoriesMetadata;

 

 		$meta->category_id = $this->id;

 		$meta->key = 'description';

-		$meta->value  = $this->description;

+		$meta->value = $this->description;

 

-		$meta->save();

+		$meta->save ();

 

-		Yii::app()->cache->delete('CiiMS::Content::list');

-		Yii::app()->cache->delete('CiiMS::Routes');

-		Yii::app()->cache->delete('categories-pid');

+		Yii::app ()->cache->delete ('CiiMS::Content::list');

+		Yii::app ()->cache->delete ('CiiMS::Routes');

+		Yii::app ()->cache->delete ('categories-pid');

 

-		return parent::afterSave();

+		return parent::afterSave ();

 	}

 

 	/**

@@ -216,43 +216,43 @@ 
 	 * is deleted.

 	 * @return boolean

 	 */

-	public function beforeDelete()

+	public function beforeDelete ()

 	{

 		// Prevents the main "uncategorized category from being deleted"

 		if ($this->id == 1)

 		{

-			Yii::app()->user->setFlash('error', Yii::t('ciims.models.Categories', 'This category cannot be deleted'));

+			Yii::app ()->user->setFlash ('error', Yii::t ('ciims.models.Categories', 'This category cannot be deleted'));

 			return false;

 		}

 

-		Yii::app()->cache->delete('CiiMS::Content::list');

-		Yii::app()->cache->delete('CiiMS::Routes');

-		Yii::app()->cache->delete('categories-pid');

+		Yii::app ()->cache->delete ('CiiMS::Content::list');

+		Yii::app ()->cache->delete ('CiiMS::Routes');

+		Yii::app ()->cache->delete ('categories-pid');

 

 		$parent = $this->parent_id;

 		$id = $this->id;

 

 		// Reassign all posts to the parent category

-		Yii::app()->db

-				->createCommand('UPDATE content SET category_id = :parent_id WHERE category_id = :id')

-				->bindParam(':parent_id', $parent)

-				->bindParam(':id', $id)

-				->execute();

+		Yii::app ()->db

+				->createCommand ('UPDATE content SET category_id = :parent_id WHERE category_id = :id')

+				->bindParam (':parent_id', $parent)

+				->bindParam (':id', $id)

+				->execute ();

 

 		// Reassign all child categories to the parent category

-		$data = $this->findAllByAttributes(array('parent_id' => $id));

+		$data = $this->findAllByAttributes (array('parent_id' => $id));

 

 		foreach ($data as $row)

 		{

 			$id = $row->id;

-			Yii::app()->db

-					->createCommand('UPDATE categories SET parent_id = :parent_id WHERE id = :id')

-					->bindParam(':parent_id', $parent)

-					->bindParam(':id', $id)

-					->execute();

+			Yii::app ()->db

+					->createCommand ('UPDATE categories SET parent_id = :parent_id WHERE id = :id')

+					->bindParam (':parent_id', $parent)

+					->bindParam (':id', $id)

+					->execute ();

 		}

 

-		return parent::beforeDelete();

+		return parent::beforeDelete ();

 	}

 

 	/**

@@ -260,17 +260,17 @@ 
 	 * @param  int $id

 	 * @return array

 	 */

-	public function getParentCategories($id)

+	public function getParentCategories ($id)

 	{

 		// Retrieve the data from cache if necessary

-		$response = Yii::app()->cache->get('categories-pid');

+		$response = Yii::app ()->cache->get ('categories-pid');

 		if ($response == NULL)

 		{

-			$response = Yii::app()->db->createCommand('SELECT id, parent_id, name, slug FROM categories')->queryAll();

-			Yii::app()->cache->set('categories-pid', $response);

+			$response = Yii::app ()->db->createCommand ('SELECT id, parent_id, name, slug FROM categories')->queryAll ();

+			Yii::app ()->cache->set ('categories-pid', $response);

 		}

 

-		return $this->_getParentCategories($response, $id);

+		return $this->_getParentCategories ($response, $id);

 	}

 

 	/**

@@ -279,17 +279,17 @@ 
 	 * @param  array  $stack A stack to hold the entire tree

 	 * @return array

 	 */

-	private function _getParentCategories($all_categories, $id, array $stack = array())

+	private function _getParentCategories ($all_categories, $id, array $stack = array())

 	{

 		if ($id == 1)

-			return array_reverse($stack);

+			return array_reverse ($stack);

 

 		foreach ($all_categories as $k=>$v)

 		{

 			if ($v['id'] == $id)

 			{

-				$stack[$v['name']] = array(str_replace(Yii::app()->baseUrl, NULL, Yii::app()->createUrl($v['slug'])));

-				return $this->_getParentCategories($all_categories, $v['parent_id'], $stack);

+				$stack[$v['name']] = array(str_replace (Yii::app ()->baseUrl, NULL, Yii::app ()->createUrl ($v['slug'])));

+				return $this->_getParentCategories ($all_categories, $v['parent_id'], $stack);

 			}

 		}

 	}

@@ -301,17 +301,17 @@ 
 	 * @param int $id - the numeric id to be appended to the slug if a conflict exists

 	 * @return string $slug - the final slug to be used

 	 */

-	public function checkSlug($slug, $id=NULL)

+	public function checkSlug ($slug, $id = NULL)

 	{

 		$content = false;

 

 		// Find the number of items that have the same slug as this one

-		$count = $this->countByAttributes(array('slug'=>$slug . $id));

+		$count = $this->countByAttributes (array('slug'=>$slug . $id));

 

 		if ($count == 0)

 		{

 			$content = true;

-			$count = Content::model()->countByAttributes(array('slug'=>$slug . $id));

+			$count = Content::model ()->countByAttributes (array('slug'=>$slug . $id));

 		}

 

 		// If we found an item that matched, it's possible that it is the current item (or a previous version of it)

@@ -319,19 +319,19 @@ 
 		if ($count >= 1)

 		{

 			if ($content)

-				return $this->checkSlug($slug, ($id === NULL ? 1 : ($id+1)));

+				return $this->checkSlug ($slug, ($id === NULL ? 1 : ($id + 1)));

 

 			// Pull the data that matches

-			$data = $this->findByPk($this->id === NULL ? -1 : $this->id);

+			$data = $this->findByPk ($this->id === NULL ? -1 : $this->id);

 

 			// Check the pulled data id to the current item

 			if ($data !== NULL && $data->id == $this->id)

 				return $slug;

 		}

 

-		if ($count == 0 && !in_array($slug, $this->forbiddenRoutes))

+		if ($count == 0 && !in_array ($slug, $this->forbiddenRoutes))

 			return $slug . $id;

 		else

-			return $this->checkSlug($slug, ($id === NULL ? 1 : ($id+1)));

+			return $this->checkSlug ($slug, ($id === NULL ? 1 : ($id + 1)));

 	}

 }

Braces +60 added lines, -52 removed lines

@@ -17,8 +17,8 @@ 
  * @property CategoriesMetadata[] $categoriesMetadatas

  * @property Content[] $contents

  */

-class Categories extends CiiModel

-{

+class Categories extends CiiModel
+{
 	public $pageSize = 15;

 

 	public $description = NULL;

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

 	 * @return Categories 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 'categories';

 	}

 

 	/**

 	 * @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(

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

@@ -77,8 +77,8 @@ 
 	/**

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

 	 */

-	public function attributeLabels()

-	{

+	public function attributeLabels()
+	{
 		return array(

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

 			'parent_id' => Yii::t('ciims.models.Categories', 'Parent'),

@@ -90,11 +90,12 @@ 
 		);

 	}

 

-	public function getDescription()

-	{

+	public function getDescription()
+	{
 		$this->description = CategoriesMetadata::model()->findByAttributes(array('category_id' => $this->id, 'key' => 'description'));

-		if ($this->description == null || $this->description == false)

-			return NULL;

+		if ($this->description == null || $this->description == false) {
+					return NULL;
+		}
 

 		$this->description = $this->description->value;

 		return $this->description;

@@ -104,8 +105,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);

@@ -128,8 +129,8 @@ 
 	 * Gets keyword tags for this entry

 	 * @return array

 	 */

-	public function getKeywords()

-	{

+	public function getKeywords()
+	{
 		$tags = CategoriesMetadata::model()->findByAttributes(array('category_id' => $this->id, 'key' => 'keywords'));

 		return $tags === NULL ? array() : CJSON::decode($tags->value);

 	}

@@ -139,11 +140,12 @@ 
 	 * @param string $tag	The tag to add

 	 * @return bool			If the insert was successful or not

 	 */

-	public function addKeyword($tag)

-	{

+	public function addKeyword($tag)
+	{
 		$tags = $this->keywords;

-		if (in_array($tag, $tags)  || $tag == "")

-			return false;

+		if (in_array($tag, $tags)  || $tag == "") {
+					return false;
+		}
 

 		$tags[] = $tag;

 		$tags = CJSON::encode($tags);

@@ -164,11 +166,12 @@ 
 	 * @param string $tag	The tag to remove

 	 * @return bool			If the removal was successful

 	 */

-	public function removeKeyword($tag)

-	{

+	public function removeKeyword($tag)
+	{
 		$tags = $this->keywords;

-		if (!in_array($tag, $tags) || $tag == "")

-			return false;

+		if (!in_array($tag, $tags) || $tag == "") {
+					return false;
+		}
 

 		$key = array_search($tag, $tags);

 		unset($tags[$key]);

@@ -182,8 +185,8 @@ 
 	/**

 	 * Verifies the slug before validating the model

 	 */

-	public function beforeValidate()

-	{

+	public function beforeValidate()
+	{
 		$this->slug = $this->verifySlug($this->slug, $this->name);

 

 		return parent::beforeValidate();

@@ -192,11 +195,12 @@ 
 	/**

 	 * Flushes URL data from the cache before the model is updated

 	 */

-	public function afterSave()

-	{

+	public function afterSave()
+	{
 		$meta = CategoriesMetadata::model()->findByAttributes(array('category_id' => $this->id, 'key' => 'description'));

-		if ($meta == NULL)

-			$meta = new CategoriesMetadata;

+		if ($meta == NULL) {
+					$meta = new CategoriesMetadata;
+		}
 

 		$meta->category_id = $this->id;

 		$meta->key = 'description';

@@ -216,8 +220,8 @@ 
 	 * is deleted.

 	 * @return boolean

 	 */

-	public function beforeDelete()

-	{

+	public function beforeDelete()
+	{
 		// Prevents the main "uncategorized category from being deleted"

 		if ($this->id == 1)

 		{

@@ -260,8 +264,8 @@ 
 	 * @param  int $id

 	 * @return array

 	 */

-	public function getParentCategories($id)

-	{

+	public function getParentCategories($id)
+	{
 		// Retrieve the data from cache if necessary

 		$response = Yii::app()->cache->get('categories-pid');

 		if ($response == NULL)

@@ -279,10 +283,11 @@ 
 	 * @param  array  $stack A stack to hold the entire tree

 	 * @return array

 	 */

-	private function _getParentCategories($all_categories, $id, array $stack = array())

-	{

-		if ($id == 1)

-			return array_reverse($stack);

+	private function _getParentCategories($all_categories, $id, array $stack = array())
+	{
+		if ($id == 1) {
+					return array_reverse($stack);
+		}
 

 		foreach ($all_categories as $k=>$v)

 		{

@@ -301,8 +306,8 @@ 
 	 * @param int $id - the numeric id to be appended to the slug if a conflict exists

 	 * @return string $slug - the final slug to be used

 	 */

-	public function checkSlug($slug, $id=NULL)

-	{

+	public function checkSlug($slug, $id=NULL)
+	{
 		$content = false;

 

 		// Find the number of items that have the same slug as this one

@@ -318,20 +323,23 @@ 
 		// in which case we don't need to alter the slug

 		if ($count >= 1)

 		{

-			if ($content)

-				return $this->checkSlug($slug, ($id === NULL ? 1 : ($id+1)));

+			if ($content) {
+							return $this->checkSlug($slug, ($id === NULL ? 1 : ($id+1)));
+			}
 

 			// Pull the data that matches

 			$data = $this->findByPk($this->id === NULL ? -1 : $this->id);

 

 			// Check the pulled data id to the current item

-			if ($data !== NULL && $data->id == $this->id)

-				return $slug;

+			if ($data !== NULL && $data->id == $this->id) {
+							return $slug;
+			}
 		}

 

-		if ($count == 0 && !in_array($slug, $this->forbiddenRoutes))

-			return $slug . $id;

-		else

-			return $this->checkSlug($slug, ($id === NULL ? 1 : ($id+1)));

+		if ($count == 0 && !in_array($slug, $this->forbiddenRoutes)) {
+					return $slug . $id;
+		} else {
+					return $this->checkSlug($slug, ($id === NULL ? 1 : ($id+1)));
+		}
 	}

 }

protected/models/CategoriesMetadata.php

Indentation +72 added lines, -72 removed lines

@@ -16,83 +16,83 @@
  */

 class CategoriesMetadata extends CiiModel

 {

-	/**

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

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

-	 * @return CategoriesMetadata 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 CategoriesMetadata 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 'categories_metadata';

-	}

+    /**

+     * @return string the associated database table name

+     */

+    public function tableName()

+    {

+        return 'categories_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('category_id, key, value', 'required'),

-			array('category_id', 'numerical', 'integerOnly'=>true),

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

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

-			// Please remove those attributes that should not be searched.

-			array('id, category_id, key, value, 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('category_id, key, value', 'required'),

+            array('category_id', 'numerical', 'integerOnly'=>true),

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

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

+            // Please remove those attributes that should not be searched.

+            array('id, category_id, key, value, 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(

-			'category' => array(self::BELONGS_TO, 'Categories', 'category_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(

+            'category' => array(self::BELONGS_TO, 'Categories', 'category_id'),

+        );

+    }

 

-	/**

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

-	 */

-	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'),

-		);

-	}

+    /**

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

+     */

+    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'),

+        );

+    }

 

-	/**

-	 * 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('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(

-			'criteria'=>$criteria,

-		));

-	}

+        return new CActiveDataProvider($this, array(

+            'criteria'=>$criteria,

+        ));

+    }

 }

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,

 		));

 	}

Braces +14 added lines, -14 removed lines

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

  * @property Categories $category

  */

-class CategoriesMetadata extends CiiModel

-{

+class CategoriesMetadata extends CiiModel
+{
 	/**

 	 * Returns the static model of the specified AR class.

 	 * @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 string the associated database table name

 	 */

-	public function tableName()

-	{

+	public function tableName()
+	{
 		return 'categories_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(

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

@@ -66,8 +66,8 @@ 
 	/**

 	 * @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'),

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