charlesportwoodii / CiiMS

protected/controllers/SiteController.php

Braces +37 added lines, -29 removed lines

@@ -28,8 +28,9 @@ 
 	 */
 	public function beforeAction($action)
 	{
-		if (!Yii::app()->getRequest()->isSecureConnection && Cii::getConfig('forceSecureSSL', false))
-			$this->redirect('https://' . Yii::app()->getRequest()->serverName . Yii::app()->getRequest()->requestUri);
+		if (!Yii::app()->getRequest()->isSecureConnection && Cii::getConfig('forceSecureSSL', false)) {
+					$this->redirect('https://' . Yii::app()->getRequest()->serverName . Yii::app()->getRequest()->requestUri);
+		}
 
 		return parent::beforeAction($action);
 	}
@@ -43,9 +44,9 @@ 
 
 		if($error=Yii::app()->errorHandler->error)
 		{
-			if(Yii::app()->request->isAjaxRequest)
-				echo $error['message'];
-			else
+			if(Yii::app()->request->isAjaxRequest) {
+							echo $error['message'];
+			} else
 			{
 				$this->setPageTitle(Yii::t('ciims.controllers.Site', '{{app_name}} | {{label}} {{code}}', array(
 					'{{app_name}}' => Cii::getConfig('name', Yii::app()->name),
@@ -57,8 +58,7 @@ 
 					'error' => $error
 				));
 			}
-		}
-		else
+		} else
 		{
 			$message = Yii::app()->user->getFlash('error_code');
 			Yii::app()->user->setFlash('error_code', $message);
@@ -123,8 +123,7 @@ 
 				$criteria->params = array(
 					':author_id' => str_replace('user_id:', '', Cii::get($_GET, 'q', 0))
 				);
-			}
-			else
+			} else
 			{
 				$param = Cii::get($_GET, 'q', 0);
 				$criteria->addCondition("vid=(SELECT MAX(vid) FROM content AS v WHERE v.id=t.id) AND ((t.content LIKE :param) OR (t.title LIKE :param2))");
@@ -171,8 +170,9 @@ 
 		if (Cii::get($_POST, 'LoginForm', false))
 		{
 			$model->attributes = Cii::get($_POST, 'LoginForm', array());
-			if ($model->login())
-				$this->redirect($this->_getNext() ?: Yii::app()->user->returnUrl);
+			if ($model->login()) {
+							$this->redirect($this->_getNext() ?: Yii::app()->user->returnUrl);
+			}
 		}
 
 		$this->render('login', array(
@@ -185,16 +185,18 @@ 
 	 */
 	public function actionLogout()
 	{
-		if (Yii::app()->request->getParam('next', false))
-			$redirect = $this->createUrl('site/login', array('next' => $this->_getNext()));
-		else
-			$redirect = Yii::app()->user->returnUrl;
+		if (Yii::app()->request->getParam('next', false)) {
+					$redirect = $this->createUrl('site/login', array('next' => $this->_getNext()));
+		} else {
+					$redirect = Yii::app()->user->returnUrl;
+		}
 
 		// Purge the active sessions API Key
 		$apiKey = UserMetadata::model()->findByAttributes(array('user_id' => Yii::app()->user->id, 'key' => 'api_key'));
 
-		if ($apiKey != NULL)
-			$apiKey->delete();
+		if ($apiKey != NULL) {
+					$apiKey->delete();
+		}
 
 
 		Yii::app()->user->logout();
@@ -247,8 +249,9 @@ 
 		$model = new PasswordResetForm;
 		$model->reset_key = $id;
 
-		if (!$model->validateResetKey())
-			throw new CHttpException(403, Yii::t('ciims.controllers.Site', 'The password reset key provided is invalid'));
+		if (!$model->validateResetKey()) {
+					throw new CHttpException(403, Yii::t('ciims.controllers.Site', 'The password reset key provided is invalid'));
+		}
 
 		if (Cii::get($_POST, 'PasswordResetForm', false))
 		{
@@ -283,8 +286,9 @@ 
 		$model->setUser(Users::model()->findByPk(Yii::app()->user->id));
 		$model->verificationKey = $key;
 
-		if (!$model->validateVerificationKey())
-			throw new CHttpException(403, Yii::t('ciims.controllers.Site', 'The verification key provided is invalid.'));
+		if (!$model->validateVerificationKey()) {
+					throw new CHttpException(403, Yii::t('ciims.controllers.Site', 'The verification key provided is invalid.'));
+		}
 
 		if (Cii::get($_POST, 'EmailChangeForm', false))
 		{
@@ -300,8 +304,9 @@ 
 					'password' => $model->password,
 				);
 
-				if ($loginForm->login())
-					return $this->redirect(Yii::app()->homeUrl);
+				if ($loginForm->login()) {
+									return $this->redirect(Yii::app()->homeUrl);
+				}
 
 				throw new CHttpException(400, Yii::t('ciims.controllers.Site', 'Unable to re-authenticated user.'));
 			}
@@ -328,8 +333,9 @@ 
 		$model = new ActivationForm;
 		$model->activationKey = $id;
 
-		if (!$model->validateKey())
-			throw new CHttpException(403, Yii::t('ciims.models.ActivationForm', 'The activation key you provided is invalid.'));
+		if (!$model->validateKey()) {
+					throw new CHttpException(403, Yii::t('ciims.models.ActivationForm', 'The activation key you provided is invalid.'));
+		}
 
 		if (Cii::get($_POST, 'ActivationForm', false))
 		{
@@ -392,13 +398,15 @@ 
 			'{{label}}'    => Yii::t('ciims.controllers.Site', 'Accept Invitation')
 		)));
 
-		if ($id === NULL)
-			throw new CHttpException(400, Yii::t('ciims.controllers.Site', 'There was an error fulfilling your request.'));
+		if ($id === NULL) {
+					throw new CHttpException(400, Yii::t('ciims.controllers.Site', 'There was an error fulfilling your request.'));
+		}
 
 		// Make sure we have a user first
 		$meta = UserMetadata::model()->findByAttributes(array('key' => 'invitationKey', 'value' => $id));
-		if ($meta === NULL)
-			throw new CHttpException(400, Yii::t('ciims.controllers.Site', 'There was an error fulfilling your request.'));
+		if ($meta === NULL) {
+					throw new CHttpException(400, Yii::t('ciims.controllers.Site', 'There was an error fulfilling your request.'));
+		}
 
 		$model = new InviteForm;
 		$model->email = Users::model()->findByPk($meta->user_id)->email;

Indentation +425 added lines, -425 removed lines

@@ -2,430 +2,430 @@
 
 class SiteController extends CiiController
 {
-	public function filters()
-	{
-		return CMap::mergeArray(parent::filters(), array('accessControl'));
-	}
-
-	/**
-	 * Setup access controls to prevent guests from changing their emaila ddress
-	 */
-	public function accessRules()
-	{
-		return array(
-		   array('deny',  // The user mut be authenticated to approve an email address change
-				'users'=>array('*'),
-				'expression'=>'Yii::app()->user->isGuest==true',
-				'actions' => array('emailchange')
-			)
-		);
-	}
-
-	/**
-	 * beforeAction method, performs operations before an action is presented
-	 * @param $action, the action being called
-	 * @see http://www.yiiframework.com/doc/api/1.1/CController#beforeAction-detail
-	 */
-	public function beforeAction($action)
-	{
-		if (!Yii::app()->getRequest()->isSecureConnection && Cii::getConfig('forceSecureSSL', false))
-			$this->redirect('https://' . Yii::app()->getRequest()->serverName . Yii::app()->getRequest()->requestUri);
-
-		return parent::beforeAction($action);
-	}
-
-	/**
-	 * This is the action to handle external exceptions.
-	 */
-	public function actionError($code=NULL)
-	{
-		$this->layout = '//layouts/main';
-
-		if($error=Yii::app()->errorHandler->error)
-		{
-			if(Yii::app()->request->isAjaxRequest)
-				echo $error['message'];
-			else
-			{
-				$this->setPageTitle(Yii::t('ciims.controllers.Site', '{{app_name}} | {{label}} {{code}}', array(
-					'{{app_name}}' => Cii::getConfig('name', Yii::app()->name),
-					'{{label}}'    => Yii::t('ciims.controllers.Site', 'Error'),
-					'{{code}}'     => $error['code']
-				)));
-
-				$this->render('error', array(
-					'error' => $error
-				));
-			}
-		}
-		else
-		{
-			$message = Yii::app()->user->getFlash('error_code');
-			Yii::app()->user->setFlash('error_code', $message);
-			throw new CHttpException($code, $message);
-		}
-	}
-
-	/**
-	 * Provides basic sitemap functionality via XML
-	 */
-	public function actionSitemap()
-	{
-		ob_end_clean();
-		Yii::app()->log->routes[0]->enabled = false;
-		header('Content-type: text/xml; charset=utf-8');
-		$url = Yii::app()->getBaseUrl(true);
-		$this->setLayout(null);
-		$content 	= Yii::app()->db
-								->createCommand('SELECT slug, password, type_id, updated FROM content AS t WHERE vid=(SELECT MAX(vid) FROM content WHERE id=t.id) AND status = 1 AND published <= UTC_TIMESTAMP();')
-								->queryAll();
-
-		$categories = Yii::app()->db
-								->createCommand('SELECT slug, updated FROM categories;')
-								->queryAll();
-
-		$this->renderPartial('sitemap', array(
-			'content' 	 => $content,
-			'categories' => $categories,
-			'url' 		 => $url
-		));
-
-		Yii::app()->end();
-	}
-
-	/**
-	 * Provides basic searching functionality
-	 * @param int $id   The search pagination id
-	 */
-	public function actionSearch($id=1)
-	{
-		$this->setPageTitle(Yii::t('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
-			'{{app_name}}' => Cii::getConfig('name', Yii::app()->name),
-			'{{label}}'    => Yii::t('ciims.controllers.Site', 'Search')
-		)));
-
-		$this->layout = '//layouts/default';
-		$data = array();
-		$pages = array();
-		$itemCount = 0;
-		$pageSize = Cii::getConfig('searchPaginationSize', 10);
-
-		if (Cii::get($_GET, 'q', false))
-		{
-			$criteria = new CDbCriteria;
-			$criteria->addCondition('status = 1')
-					 ->addCondition('published <= UTC_TIMESTAMP()');
-
-			if (strpos($_GET['q'], 'user_id') !== false)
-			{
-				$criteria->addCondition('author_id = :author_id')
-						 ->addCondition("vid=(SELECT MAX(vid) FROM content AS v WHERE v.id=t.id)");
-				$criteria->params = array(
-					':author_id' => str_replace('user_id:', '', Cii::get($_GET, 'q', 0))
-				);
-			}
-			else
-			{
-				$param = Cii::get($_GET, 'q', 0);
-				$criteria->addCondition("vid=(SELECT MAX(vid) FROM content AS v WHERE v.id=t.id) AND ((t.content LIKE :param) OR (t.title LIKE :param2))");
-				$criteria->params = array(
-					':param' 	=> '%' . $param . '%',
-					':param2'	=> '%' . $param . '%'
-				);
-			}
-
-			$criteria->addCondition('password = ""');
-			$criteria->limit = $pageSize;
-			$criteria->order = 'id DESC';
-			$itemCount = Content::model()->count($criteria);
-			$pages = new CPagination($itemCount);
-			$pages->pageSize=$pageSize;
-
-			$criteria->offset = $criteria->limit*($pages->getCurrentPage());
-			$data = Content::model()->findAll($criteria);
-			$pages->applyLimit($criteria);
-		}
-
-		$this->render('search', array(
-			'url' 		=> 'search',
-			'id' 		=> $id,
-			'data' 		=> $data,
-			'itemCount' => $itemCount,
-			'pages' 	=> $pages
-		));
-	}
-
-	/**
-	 * Provides functionality to log a user into the system
-	 */
-	public function actionLogin()
-	{
-		$this->setPageTitle(Yii::t('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
-			'{{app_name}}' => Cii::getConfig('name', Yii::app()->name),
-			'{{label}}'    => Yii::t('ciims.controllers.Site', 'Login to your account')
-		)));
-
-		$this->layout = '//layouts/main';
-		$model = new LoginForm;
-
-		if (Cii::get($_POST, 'LoginForm', false))
-		{
-			$model->attributes = Cii::get($_POST, 'LoginForm', array());
-			if ($model->login())
-				$this->redirect($this->_getNext() ?: Yii::app()->user->returnUrl);
-		}
-
-		$this->render('login', array(
-			'model' => $model
-		));
-	}
-
-	/**
-	 * Provides functionality to log a user out
-	 */
-	public function actionLogout()
-	{
-		if (Yii::app()->request->getParam('next', false))
-			$redirect = $this->createUrl('site/login', array('next' => $this->_getNext()));
-		else
-			$redirect = Yii::app()->user->returnUrl;
-
-		// Purge the active sessions API Key
-		$apiKey = UserMetadata::model()->findByAttributes(array('user_id' => Yii::app()->user->id, 'key' => 'api_key'));
-
-		if ($apiKey != NULL)
-			$apiKey->delete();
-
-
-		Yii::app()->user->logout();
-		$this->redirect($redirect);
-	}
-
-	/**
-	 * Handles resetting a users password should they forgot it
-	 */
-	public function actionForgot()
-	{
-		$this->layout = '//layouts/main';
-
-		$this->setPageTitle(Yii::t('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
-			'{{app_name}}' => Cii::getConfig('name', Yii::app()->name),
-			'{{label}}'    => Yii::t('ciims.controllers.Site', 'Forgot Your Password?')
-		)));
-
-		$model = new ForgotForm;
-
-		if (Cii::get($_POST, 'ForgotForm', false))
-		{
-			$model->attributes = $_POST['ForgotForm'];
-
-			if ($model->initPasswordResetProcess())
-			{
-				Yii::app()->user->setFlash('success', Yii::t('ciims.controllers.Site', 'A password reset link has been sent to your email address'));
-				$this->redirect($this->createUrl('site/login'));
-			}
-		}
-
-		$this->render('forgot', array(
-			'model' => $model
-		));
-	}
-
-	/**
-	 * Alows a user to reset their password if they initiated a forgot password request
-	 * @param string $id
-	 */
-	public function actionResetPassword($id=NULL)
-	{
-		$this->layout = '//layouts/main';
-
-		$this->setPageTitle(Yii::t('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
-			'{{app_name}}' => Cii::getConfig('name', Yii::app()->name),
-			'{{label}}'    => Yii::t('ciims.controllers.Site', 'Reset Your password')
-		)));
-
-		$model = new PasswordResetForm;
-		$model->reset_key = $id;
-
-		if (!$model->validateResetKey())
-			throw new CHttpException(403, Yii::t('ciims.controllers.Site', 'The password reset key provided is invalid'));
-
-		if (Cii::get($_POST, 'PasswordResetForm', false))
-		{
-			$model->attributes = $_POST['PasswordResetForm'];
-
-			if ($model->save())
-			{
-				Yii::app()->user->setFlash('success', Yii::t('ciims.controllers.Site', 'Your password has been reset, and you may now login with your new password'));
-				$this->redirect($this->createUrl('site/login'));
-			}
-		}
-
-		$this->render('resetpassword', array(
-			'model' => $model
-		));
-	}
-
-	/**
-	 * Allows the user to securely change their email address
-	 * @param  string $key the user's secure key
-	 */
-	public function actionEmailChange($key=null)
-	{
-		$this->layout = '//layouts/main';
-
-		$this->setPageTitle(Yii::t('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
-		   '{{app_name}}' => Cii::getConfig('name', Yii::app()->name),
-		   '{{label}}'    => Yii::t('ciims.controllers.Site', 'Change Your Email Address')
-	   )));
-
-		$model = new EmailChangeForm;
-		$model->setUser(Users::model()->findByPk(Yii::app()->user->id));
-		$model->verificationKey = $key;
-
-		if (!$model->validateVerificationKey())
-			throw new CHttpException(403, Yii::t('ciims.controllers.Site', 'The verification key provided is invalid.'));
-
-		if (Cii::get($_POST, 'EmailChangeForm', false))
-		{
-			$model->attributes = $_POST['EmailChangeForm'];
-
-			if ($model->save())
-			{
-				Yii::app()->user->setFlash('success', Yii::t('ciims.controllers.Site', 'Your new email address has been verified.'));
-
-				$loginForm = new LoginForm;
-				$loginForm->attributes = array(
-					'username' => Users::model()->findByPk(Yii::app()->user->id)->email,
-					'password' => $model->password,
-				);
-
-				if ($loginForm->login())
-					return $this->redirect(Yii::app()->homeUrl);
-
-				throw new CHttpException(400, Yii::t('ciims.controllers.Site', 'Unable to re-authenticated user.'));
-			}
-		}
-
-		$this->render('emailchange', array(
-			'model' => $model
-		));
-	}
-
-	/**
-	 * Activates a new user's account
-	 * @param mixed $id 			The activation key
-	 */
-	public function actionActivation($id=NULL)
-	{
-		$this->layout = '//layouts/main';
-
-		$this->setPageTitle(Yii::t('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
-		   '{{app_name}}' => Cii::getConfig('name', Yii::app()->name),
-		   '{{label}}'    => Yii::t('ciims.controllers.Site', 'Activate Your Account')
-	   )));
-
-		$model = new ActivationForm;
-		$model->activationKey = $id;
-
-		if (!$model->validateKey())
-			throw new CHttpException(403, Yii::t('ciims.models.ActivationForm', 'The activation key you provided is invalid.'));
-
-		if (Cii::get($_POST, 'ActivationForm', false))
-		{
-			$model->attributes = $_POST['ActivationForm'];
-
-			if ($model->save())
-			{
-				Yii::app()->user->setFlash('success', Yii::t('ciims.controllers.Site', 'Your account has successfully been activated. You may now login'));
-				$this->redirect($this->createUrl('site/login'));
-			}
-		}
-
-		$this->render('activation', array(
-			'model' => $model
-		));
-	}
-
-	/**
-	 * Handles the registration of new users on the site
-	 */
-	public function actionRegister()
-	{
-		$this->layout = '//layouts/main';
-
-		$this->setPageTitle(Yii::t('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
-			'{{app_name}}' => Cii::getConfig('name', Yii::app()->name),
-			'{{label}}'    => Yii::t('ciims.controllers.Site', 'Sign Up')
-		)));
-
-		$model = new RegisterForm;
-
-		if (Cii::get($_POST, 'RegisterForm', false))
-		{
-			$model->attributes = $_POST['RegisterForm'];
-
-			// Save the user's information
-			if ($model->save())
-			{
-				// Set a flash message
-				Yii::app()->user->setFlash('success', Yii::t('ciims.controllers.Site', 'You have successfully registered an account. Before you can login, please check your email for activation instructions'));
-				$this->redirect($this->createUrl('site/login'));
-			}
-		}
-
-		$this->render('register', array(
-			'model'=>$model
-		));
-	}
-
-	/**
-	 * Enables users who have recieved an invitation to setup a new account
-	 * @param string $id	The activation id the of the user that we want to activate
-	 */
-	public function actionAcceptInvite($id=NULL)
-	{
-		$this->layout = '//layouts/main';
-
-		$this->setPageTitle(Yii::t('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
-			'{{app_name}}' => Cii::getConfig('name', Yii::app()->name),
-			'{{label}}'    => Yii::t('ciims.controllers.Site', 'Accept Invitation')
-		)));
-
-		if ($id === NULL)
-			throw new CHttpException(400, Yii::t('ciims.controllers.Site', 'There was an error fulfilling your request.'));
-
-		// Make sure we have a user first
-		$meta = UserMetadata::model()->findByAttributes(array('key' => 'invitationKey', 'value' => $id));
-		if ($meta === NULL)
-			throw new CHttpException(400, Yii::t('ciims.controllers.Site', 'There was an error fulfilling your request.'));
-
-		$model = new InviteForm;
-		$model->email = Users::model()->findByPk($meta->user_id)->email;
-
-		if (Cii::get($_POST, 'InviteForm', NULL) !== NULL)
-		{
-			$model->attributes = Cii::get($_POST, 'InviteForm', NULL);
-			$model->id = $meta->user_id;
-
-			if ($model->acceptInvite())
-			{
-				$meta->delete();
-				return $this->render('invitesuccess');
-			}
-		}
-
-		$this->render('acceptinvite', array(
-			'model' => $model
-		));
-	}
+    public function filters()
+    {
+        return CMap::mergeArray(parent::filters(), array('accessControl'));
+    }
+
+    /**
+     * Setup access controls to prevent guests from changing their emaila ddress
+     */
+    public function accessRules()
+    {
+        return array(
+            array('deny',  // The user mut be authenticated to approve an email address change
+                'users'=>array('*'),
+                'expression'=>'Yii::app()->user->isGuest==true',
+                'actions' => array('emailchange')
+            )
+        );
+    }
+
+    /**
+     * beforeAction method, performs operations before an action is presented
+     * @param $action, the action being called
+     * @see http://www.yiiframework.com/doc/api/1.1/CController#beforeAction-detail
+     */
+    public function beforeAction($action)
+    {
+        if (!Yii::app()->getRequest()->isSecureConnection && Cii::getConfig('forceSecureSSL', false))
+            $this->redirect('https://' . Yii::app()->getRequest()->serverName . Yii::app()->getRequest()->requestUri);
+
+        return parent::beforeAction($action);
+    }
+
+    /**
+     * This is the action to handle external exceptions.
+     */
+    public function actionError($code=NULL)
+    {
+        $this->layout = '//layouts/main';
+
+        if($error=Yii::app()->errorHandler->error)
+        {
+            if(Yii::app()->request->isAjaxRequest)
+                echo $error['message'];
+            else
+            {
+                $this->setPageTitle(Yii::t('ciims.controllers.Site', '{{app_name}} | {{label}} {{code}}', array(
+                    '{{app_name}}' => Cii::getConfig('name', Yii::app()->name),
+                    '{{label}}'    => Yii::t('ciims.controllers.Site', 'Error'),
+                    '{{code}}'     => $error['code']
+                )));
+
+                $this->render('error', array(
+                    'error' => $error
+                ));
+            }
+        }
+        else
+        {
+            $message = Yii::app()->user->getFlash('error_code');
+            Yii::app()->user->setFlash('error_code', $message);
+            throw new CHttpException($code, $message);
+        }
+    }
+
+    /**
+     * Provides basic sitemap functionality via XML
+     */
+    public function actionSitemap()
+    {
+        ob_end_clean();
+        Yii::app()->log->routes[0]->enabled = false;
+        header('Content-type: text/xml; charset=utf-8');
+        $url = Yii::app()->getBaseUrl(true);
+        $this->setLayout(null);
+        $content 	= Yii::app()->db
+                                ->createCommand('SELECT slug, password, type_id, updated FROM content AS t WHERE vid=(SELECT MAX(vid) FROM content WHERE id=t.id) AND status = 1 AND published <= UTC_TIMESTAMP();')
+                                ->queryAll();
+
+        $categories = Yii::app()->db
+                                ->createCommand('SELECT slug, updated FROM categories;')
+                                ->queryAll();
+
+        $this->renderPartial('sitemap', array(
+            'content' 	 => $content,
+            'categories' => $categories,
+            'url' 		 => $url
+        ));
+
+        Yii::app()->end();
+    }
+
+    /**
+     * Provides basic searching functionality
+     * @param int $id   The search pagination id
+     */
+    public function actionSearch($id=1)
+    {
+        $this->setPageTitle(Yii::t('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
+            '{{app_name}}' => Cii::getConfig('name', Yii::app()->name),
+            '{{label}}'    => Yii::t('ciims.controllers.Site', 'Search')
+        )));
+
+        $this->layout = '//layouts/default';
+        $data = array();
+        $pages = array();
+        $itemCount = 0;
+        $pageSize = Cii::getConfig('searchPaginationSize', 10);
+
+        if (Cii::get($_GET, 'q', false))
+        {
+            $criteria = new CDbCriteria;
+            $criteria->addCondition('status = 1')
+                        ->addCondition('published <= UTC_TIMESTAMP()');
+
+            if (strpos($_GET['q'], 'user_id') !== false)
+            {
+                $criteria->addCondition('author_id = :author_id')
+                            ->addCondition("vid=(SELECT MAX(vid) FROM content AS v WHERE v.id=t.id)");
+                $criteria->params = array(
+                    ':author_id' => str_replace('user_id:', '', Cii::get($_GET, 'q', 0))
+                );
+            }
+            else
+            {
+                $param = Cii::get($_GET, 'q', 0);
+                $criteria->addCondition("vid=(SELECT MAX(vid) FROM content AS v WHERE v.id=t.id) AND ((t.content LIKE :param) OR (t.title LIKE :param2))");
+                $criteria->params = array(
+                    ':param' 	=> '%' . $param . '%',
+                    ':param2'	=> '%' . $param . '%'
+                );
+            }
+
+            $criteria->addCondition('password = ""');
+            $criteria->limit = $pageSize;
+            $criteria->order = 'id DESC';
+            $itemCount = Content::model()->count($criteria);
+            $pages = new CPagination($itemCount);
+            $pages->pageSize=$pageSize;
+
+            $criteria->offset = $criteria->limit*($pages->getCurrentPage());
+            $data = Content::model()->findAll($criteria);
+            $pages->applyLimit($criteria);
+        }
+
+        $this->render('search', array(
+            'url' 		=> 'search',
+            'id' 		=> $id,
+            'data' 		=> $data,
+            'itemCount' => $itemCount,
+            'pages' 	=> $pages
+        ));
+    }
+
+    /**
+     * Provides functionality to log a user into the system
+     */
+    public function actionLogin()
+    {
+        $this->setPageTitle(Yii::t('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
+            '{{app_name}}' => Cii::getConfig('name', Yii::app()->name),
+            '{{label}}'    => Yii::t('ciims.controllers.Site', 'Login to your account')
+        )));
+
+        $this->layout = '//layouts/main';
+        $model = new LoginForm;
+
+        if (Cii::get($_POST, 'LoginForm', false))
+        {
+            $model->attributes = Cii::get($_POST, 'LoginForm', array());
+            if ($model->login())
+                $this->redirect($this->_getNext() ?: Yii::app()->user->returnUrl);
+        }
+
+        $this->render('login', array(
+            'model' => $model
+        ));
+    }
+
+    /**
+     * Provides functionality to log a user out
+     */
+    public function actionLogout()
+    {
+        if (Yii::app()->request->getParam('next', false))
+            $redirect = $this->createUrl('site/login', array('next' => $this->_getNext()));
+        else
+            $redirect = Yii::app()->user->returnUrl;
+
+        // Purge the active sessions API Key
+        $apiKey = UserMetadata::model()->findByAttributes(array('user_id' => Yii::app()->user->id, 'key' => 'api_key'));
+
+        if ($apiKey != NULL)
+            $apiKey->delete();
+
+
+        Yii::app()->user->logout();
+        $this->redirect($redirect);
+    }
+
+    /**
+     * Handles resetting a users password should they forgot it
+     */
+    public function actionForgot()
+    {
+        $this->layout = '//layouts/main';
+
+        $this->setPageTitle(Yii::t('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
+            '{{app_name}}' => Cii::getConfig('name', Yii::app()->name),
+            '{{label}}'    => Yii::t('ciims.controllers.Site', 'Forgot Your Password?')
+        )));
+
+        $model = new ForgotForm;
+
+        if (Cii::get($_POST, 'ForgotForm', false))
+        {
+            $model->attributes = $_POST['ForgotForm'];
+
+            if ($model->initPasswordResetProcess())
+            {
+                Yii::app()->user->setFlash('success', Yii::t('ciims.controllers.Site', 'A password reset link has been sent to your email address'));
+                $this->redirect($this->createUrl('site/login'));
+            }
+        }
+
+        $this->render('forgot', array(
+            'model' => $model
+        ));
+    }
+
+    /**
+     * Alows a user to reset their password if they initiated a forgot password request
+     * @param string $id
+     */
+    public function actionResetPassword($id=NULL)
+    {
+        $this->layout = '//layouts/main';
+
+        $this->setPageTitle(Yii::t('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
+            '{{app_name}}' => Cii::getConfig('name', Yii::app()->name),
+            '{{label}}'    => Yii::t('ciims.controllers.Site', 'Reset Your password')
+        )));
+
+        $model = new PasswordResetForm;
+        $model->reset_key = $id;
+
+        if (!$model->validateResetKey())
+            throw new CHttpException(403, Yii::t('ciims.controllers.Site', 'The password reset key provided is invalid'));
+
+        if (Cii::get($_POST, 'PasswordResetForm', false))
+        {
+            $model->attributes = $_POST['PasswordResetForm'];
+
+            if ($model->save())
+            {
+                Yii::app()->user->setFlash('success', Yii::t('ciims.controllers.Site', 'Your password has been reset, and you may now login with your new password'));
+                $this->redirect($this->createUrl('site/login'));
+            }
+        }
+
+        $this->render('resetpassword', array(
+            'model' => $model
+        ));
+    }
+
+    /**
+     * Allows the user to securely change their email address
+     * @param  string $key the user's secure key
+     */
+    public function actionEmailChange($key=null)
+    {
+        $this->layout = '//layouts/main';
+
+        $this->setPageTitle(Yii::t('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
+            '{{app_name}}' => Cii::getConfig('name', Yii::app()->name),
+            '{{label}}'    => Yii::t('ciims.controllers.Site', 'Change Your Email Address')
+        )));
+
+        $model = new EmailChangeForm;
+        $model->setUser(Users::model()->findByPk(Yii::app()->user->id));
+        $model->verificationKey = $key;
+
+        if (!$model->validateVerificationKey())
+            throw new CHttpException(403, Yii::t('ciims.controllers.Site', 'The verification key provided is invalid.'));
+
+        if (Cii::get($_POST, 'EmailChangeForm', false))
+        {
+            $model->attributes = $_POST['EmailChangeForm'];
+
+            if ($model->save())
+            {
+                Yii::app()->user->setFlash('success', Yii::t('ciims.controllers.Site', 'Your new email address has been verified.'));
+
+                $loginForm = new LoginForm;
+                $loginForm->attributes = array(
+                    'username' => Users::model()->findByPk(Yii::app()->user->id)->email,
+                    'password' => $model->password,
+                );
+
+                if ($loginForm->login())
+                    return $this->redirect(Yii::app()->homeUrl);
+
+                throw new CHttpException(400, Yii::t('ciims.controllers.Site', 'Unable to re-authenticated user.'));
+            }
+        }
+
+        $this->render('emailchange', array(
+            'model' => $model
+        ));
+    }
+
+    /**
+     * Activates a new user's account
+     * @param mixed $id 			The activation key
+     */
+    public function actionActivation($id=NULL)
+    {
+        $this->layout = '//layouts/main';
+
+        $this->setPageTitle(Yii::t('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
+            '{{app_name}}' => Cii::getConfig('name', Yii::app()->name),
+            '{{label}}'    => Yii::t('ciims.controllers.Site', 'Activate Your Account')
+        )));
+
+        $model = new ActivationForm;
+        $model->activationKey = $id;
+
+        if (!$model->validateKey())
+            throw new CHttpException(403, Yii::t('ciims.models.ActivationForm', 'The activation key you provided is invalid.'));
+
+        if (Cii::get($_POST, 'ActivationForm', false))
+        {
+            $model->attributes = $_POST['ActivationForm'];
+
+            if ($model->save())
+            {
+                Yii::app()->user->setFlash('success', Yii::t('ciims.controllers.Site', 'Your account has successfully been activated. You may now login'));
+                $this->redirect($this->createUrl('site/login'));
+            }
+        }
+
+        $this->render('activation', array(
+            'model' => $model
+        ));
+    }
+
+    /**
+     * Handles the registration of new users on the site
+     */
+    public function actionRegister()
+    {
+        $this->layout = '//layouts/main';
+
+        $this->setPageTitle(Yii::t('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
+            '{{app_name}}' => Cii::getConfig('name', Yii::app()->name),
+            '{{label}}'    => Yii::t('ciims.controllers.Site', 'Sign Up')
+        )));
+
+        $model = new RegisterForm;
+
+        if (Cii::get($_POST, 'RegisterForm', false))
+        {
+            $model->attributes = $_POST['RegisterForm'];
+
+            // Save the user's information
+            if ($model->save())
+            {
+                // Set a flash message
+                Yii::app()->user->setFlash('success', Yii::t('ciims.controllers.Site', 'You have successfully registered an account. Before you can login, please check your email for activation instructions'));
+                $this->redirect($this->createUrl('site/login'));
+            }
+        }
+
+        $this->render('register', array(
+            'model'=>$model
+        ));
+    }
+
+    /**
+     * Enables users who have recieved an invitation to setup a new account
+     * @param string $id	The activation id the of the user that we want to activate
+     */
+    public function actionAcceptInvite($id=NULL)
+    {
+        $this->layout = '//layouts/main';
+
+        $this->setPageTitle(Yii::t('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
+            '{{app_name}}' => Cii::getConfig('name', Yii::app()->name),
+            '{{label}}'    => Yii::t('ciims.controllers.Site', 'Accept Invitation')
+        )));
+
+        if ($id === NULL)
+            throw new CHttpException(400, Yii::t('ciims.controllers.Site', 'There was an error fulfilling your request.'));
+
+        // Make sure we have a user first
+        $meta = UserMetadata::model()->findByAttributes(array('key' => 'invitationKey', 'value' => $id));
+        if ($meta === NULL)
+            throw new CHttpException(400, Yii::t('ciims.controllers.Site', 'There was an error fulfilling your request.'));
+
+        $model = new InviteForm;
+        $model->email = Users::model()->findByPk($meta->user_id)->email;
+
+        if (Cii::get($_POST, 'InviteForm', NULL) !== NULL)
+        {
+            $model->attributes = Cii::get($_POST, 'InviteForm', NULL);
+            $model->id = $meta->user_id;
+
+            if ($model->acceptInvite())
+            {
+                $meta->delete();
+                return $this->render('invitesuccess');
+            }
+        }
+
+        $this->render('acceptinvite', array(
+            'model' => $model
+        ));
+    }
 	
-	/**
-	 * Returns a sanitized $_GET['next'] URL if it is set.
-	 * @return mixed
-	 */
-	private function _getNext()
-	{
-		return str_replace('ftp://', '', str_replace('http://', '', str_replace('https://', '', Yii::app()->request->getParam('next', false))));
-	}
+    /**
+     * Returns a sanitized $_GET['next'] URL if it is set.
+     * @return mixed
+     */
+    private function _getNext()
+    {
+        return str_replace('ftp://', '', str_replace('http://', '', str_replace('https://', '', Yii::app()->request->getParam('next', false))));
+    }
 }

Spacing +146 added lines, -146 removed lines

@@ -2,18 +2,18 @@ 
 
 class SiteController extends CiiController
 {
-	public function filters()
+	public function filters ()
 	{
-		return CMap::mergeArray(parent::filters(), array('accessControl'));
+		return CMap::mergeArray (parent::filters (), array('accessControl'));
 	}
 
 	/**
 	 * Setup access controls to prevent guests from changing their emaila ddress
 	 */
-	public function accessRules()
+	public function accessRules ()
 	{
 		return array(
-		   array('deny',  // The user mut be authenticated to approve an email address change
+		   array('deny', // The user mut be authenticated to approve an email address change
 				'users'=>array('*'),
 				'expression'=>'Yii::app()->user->isGuest==true',
 				'actions' => array('emailchange')
@@ -26,127 +26,127 @@ 
 	 * @param $action, the action being called
 	 * @see http://www.yiiframework.com/doc/api/1.1/CController#beforeAction-detail
 	 */
-	public function beforeAction($action)
+	public function beforeAction ($action)
 	{
-		if (!Yii::app()->getRequest()->isSecureConnection && Cii::getConfig('forceSecureSSL', false))
-			$this->redirect('https://' . Yii::app()->getRequest()->serverName . Yii::app()->getRequest()->requestUri);
+		if (!Yii::app ()->getRequest ()->isSecureConnection && Cii::getConfig ('forceSecureSSL', false))
+			$this->redirect ('https://'.Yii::app ()->getRequest ()->serverName.Yii::app ()->getRequest ()->requestUri);
 
-		return parent::beforeAction($action);
+		return parent::beforeAction ($action);
 	}
 
 	/**
 	 * This is the action to handle external exceptions.
 	 */
-	public function actionError($code=NULL)
+	public function actionError ($code = NULL)
 	{
 		$this->layout = '//layouts/main';
 
-		if($error=Yii::app()->errorHandler->error)
+		if ($error = Yii::app ()->errorHandler->error)
 		{
-			if(Yii::app()->request->isAjaxRequest)
+			if (Yii::app ()->request->isAjaxRequest)
 				echo $error['message'];
 			else
 			{
-				$this->setPageTitle(Yii::t('ciims.controllers.Site', '{{app_name}} | {{label}} {{code}}', array(
-					'{{app_name}}' => Cii::getConfig('name', Yii::app()->name),
-					'{{label}}'    => Yii::t('ciims.controllers.Site', 'Error'),
+				$this->setPageTitle (Yii::t ('ciims.controllers.Site', '{{app_name}} | {{label}} {{code}}', array(
+					'{{app_name}}' => Cii::getConfig ('name', Yii::app ()->name),
+					'{{label}}'    => Yii::t ('ciims.controllers.Site', 'Error'),
 					'{{code}}'     => $error['code']
 				)));
 
-				$this->render('error', array(
+				$this->render ('error', array(
 					'error' => $error
 				));
 			}
 		}
 		else
 		{
-			$message = Yii::app()->user->getFlash('error_code');
-			Yii::app()->user->setFlash('error_code', $message);
-			throw new CHttpException($code, $message);
+			$message = Yii::app ()->user->getFlash ('error_code');
+			Yii::app ()->user->setFlash ('error_code', $message);
+			throw new CHttpException ($code, $message);
 		}
 	}
 
 	/**
 	 * Provides basic sitemap functionality via XML
 	 */
-	public function actionSitemap()
+	public function actionSitemap ()
 	{
-		ob_end_clean();
-		Yii::app()->log->routes[0]->enabled = false;
-		header('Content-type: text/xml; charset=utf-8');
-		$url = Yii::app()->getBaseUrl(true);
-		$this->setLayout(null);
-		$content 	= Yii::app()->db
-								->createCommand('SELECT slug, password, type_id, updated FROM content AS t WHERE vid=(SELECT MAX(vid) FROM content WHERE id=t.id) AND status = 1 AND published <= UTC_TIMESTAMP();')
-								->queryAll();
-
-		$categories = Yii::app()->db
-								->createCommand('SELECT slug, updated FROM categories;')
-								->queryAll();
-
-		$this->renderPartial('sitemap', array(
+		ob_end_clean ();
+		Yii::app ()->log->routes[0]->enabled = false;
+		header ('Content-type: text/xml; charset=utf-8');
+		$url = Yii::app ()->getBaseUrl (true);
+		$this->setLayout (null);
+		$content = Yii::app ()->db
+								->createCommand ('SELECT slug, password, type_id, updated FROM content AS t WHERE vid=(SELECT MAX(vid) FROM content WHERE id=t.id) AND status = 1 AND published <= UTC_TIMESTAMP();')
+								->queryAll ();
+
+		$categories = Yii::app ()->db
+								->createCommand ('SELECT slug, updated FROM categories;')
+								->queryAll ();
+
+		$this->renderPartial ('sitemap', array(
 			'content' 	 => $content,
 			'categories' => $categories,
 			'url' 		 => $url
 		));
 
-		Yii::app()->end();
+		Yii::app ()->end ();
 	}
 
 	/**
 	 * Provides basic searching functionality
 	 * @param int $id   The search pagination id
 	 */
-	public function actionSearch($id=1)
+	public function actionSearch ($id = 1)
 	{
-		$this->setPageTitle(Yii::t('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
-			'{{app_name}}' => Cii::getConfig('name', Yii::app()->name),
-			'{{label}}'    => Yii::t('ciims.controllers.Site', 'Search')
+		$this->setPageTitle (Yii::t ('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
+			'{{app_name}}' => Cii::getConfig ('name', Yii::app ()->name),
+			'{{label}}'    => Yii::t ('ciims.controllers.Site', 'Search')
 		)));
 
 		$this->layout = '//layouts/default';
 		$data = array();
 		$pages = array();
 		$itemCount = 0;
-		$pageSize = Cii::getConfig('searchPaginationSize', 10);
+		$pageSize = Cii::getConfig ('searchPaginationSize', 10);
 
-		if (Cii::get($_GET, 'q', false))
+		if (Cii::get ($_GET, 'q', false))
 		{
 			$criteria = new CDbCriteria;
-			$criteria->addCondition('status = 1')
-					 ->addCondition('published <= UTC_TIMESTAMP()');
+			$criteria->addCondition ('status = 1')
+					 ->addCondition ('published <= UTC_TIMESTAMP()');
 
-			if (strpos($_GET['q'], 'user_id') !== false)
+			if (strpos ($_GET['q'], 'user_id') !== false)
 			{
-				$criteria->addCondition('author_id = :author_id')
-						 ->addCondition("vid=(SELECT MAX(vid) FROM content AS v WHERE v.id=t.id)");
+				$criteria->addCondition ('author_id = :author_id')
+						 ->addCondition ("vid=(SELECT MAX(vid) FROM content AS v WHERE v.id=t.id)");
 				$criteria->params = array(
-					':author_id' => str_replace('user_id:', '', Cii::get($_GET, 'q', 0))
+					':author_id' => str_replace ('user_id:', '', Cii::get ($_GET, 'q', 0))
 				);
 			}
 			else
 			{
-				$param = Cii::get($_GET, 'q', 0);
-				$criteria->addCondition("vid=(SELECT MAX(vid) FROM content AS v WHERE v.id=t.id) AND ((t.content LIKE :param) OR (t.title LIKE :param2))");
+				$param = Cii::get ($_GET, 'q', 0);
+				$criteria->addCondition ("vid=(SELECT MAX(vid) FROM content AS v WHERE v.id=t.id) AND ((t.content LIKE :param) OR (t.title LIKE :param2))");
 				$criteria->params = array(
-					':param' 	=> '%' . $param . '%',
-					':param2'	=> '%' . $param . '%'
+					':param' 	=> '%'.$param.'%',
+					':param2'	=> '%'.$param.'%'
 				);
 			}
 
-			$criteria->addCondition('password = ""');
+			$criteria->addCondition ('password = ""');
 			$criteria->limit = $pageSize;
 			$criteria->order = 'id DESC';
-			$itemCount = Content::model()->count($criteria);
-			$pages = new CPagination($itemCount);
-			$pages->pageSize=$pageSize;
+			$itemCount = Content::model ()->count ($criteria);
+			$pages = new CPagination ($itemCount);
+			$pages->pageSize = $pageSize;
 
-			$criteria->offset = $criteria->limit*($pages->getCurrentPage());
-			$data = Content::model()->findAll($criteria);
-			$pages->applyLimit($criteria);
+			$criteria->offset = $criteria->limit * ($pages->getCurrentPage ());
+			$data = Content::model ()->findAll ($criteria);
+			$pages->applyLimit ($criteria);
 		}
 
-		$this->render('search', array(
+		$this->render ('search', array(
 			'url' 		=> 'search',
 			'id' 		=> $id,
 			'data' 		=> $data,
@@ -158,24 +158,24 @@ 
 	/**
 	 * Provides functionality to log a user into the system
 	 */
-	public function actionLogin()
+	public function actionLogin ()
 	{
-		$this->setPageTitle(Yii::t('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
-			'{{app_name}}' => Cii::getConfig('name', Yii::app()->name),
-			'{{label}}'    => Yii::t('ciims.controllers.Site', 'Login to your account')
+		$this->setPageTitle (Yii::t ('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
+			'{{app_name}}' => Cii::getConfig ('name', Yii::app ()->name),
+			'{{label}}'    => Yii::t ('ciims.controllers.Site', 'Login to your account')
 		)));
 
 		$this->layout = '//layouts/main';
 		$model = new LoginForm;
 
-		if (Cii::get($_POST, 'LoginForm', false))
+		if (Cii::get ($_POST, 'LoginForm', false))
 		{
-			$model->attributes = Cii::get($_POST, 'LoginForm', array());
-			if ($model->login())
-				$this->redirect($this->_getNext() ?: Yii::app()->user->returnUrl);
+			$model->attributes = Cii::get ($_POST, 'LoginForm', array());
+			if ($model->login ())
+				$this->redirect ($this->_getNext () ? : Yii::app ()->user->returnUrl);
 		}
 
-		$this->render('login', array(
+		$this->render ('login', array(
 			'model' => $model
 		));
 	}
@@ -183,50 +183,50 @@ 
 	/**
 	 * Provides functionality to log a user out
 	 */
-	public function actionLogout()
+	public function actionLogout ()
 	{
-		if (Yii::app()->request->getParam('next', false))
-			$redirect = $this->createUrl('site/login', array('next' => $this->_getNext()));
+		if (Yii::app ()->request->getParam ('next', false))
+			$redirect = $this->createUrl ('site/login', array('next' => $this->_getNext ()));
 		else
-			$redirect = Yii::app()->user->returnUrl;
+			$redirect = Yii::app ()->user->returnUrl;
 
 		// Purge the active sessions API Key
-		$apiKey = UserMetadata::model()->findByAttributes(array('user_id' => Yii::app()->user->id, 'key' => 'api_key'));
+		$apiKey = UserMetadata::model ()->findByAttributes (array('user_id' => Yii::app ()->user->id, 'key' => 'api_key'));
 
 		if ($apiKey != NULL)
-			$apiKey->delete();
+			$apiKey->delete ();
 
 
-		Yii::app()->user->logout();
-		$this->redirect($redirect);
+		Yii::app ()->user->logout ();
+		$this->redirect ($redirect);
 	}
 
 	/**
 	 * Handles resetting a users password should they forgot it
 	 */
-	public function actionForgot()
+	public function actionForgot ()
 	{
 		$this->layout = '//layouts/main';
 
-		$this->setPageTitle(Yii::t('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
-			'{{app_name}}' => Cii::getConfig('name', Yii::app()->name),
-			'{{label}}'    => Yii::t('ciims.controllers.Site', 'Forgot Your Password?')
+		$this->setPageTitle (Yii::t ('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
+			'{{app_name}}' => Cii::getConfig ('name', Yii::app ()->name),
+			'{{label}}'    => Yii::t ('ciims.controllers.Site', 'Forgot Your Password?')
 		)));
 
 		$model = new ForgotForm;
 
-		if (Cii::get($_POST, 'ForgotForm', false))
+		if (Cii::get ($_POST, 'ForgotForm', false))
 		{
 			$model->attributes = $_POST['ForgotForm'];
 
-			if ($model->initPasswordResetProcess())
+			if ($model->initPasswordResetProcess ())
 			{
-				Yii::app()->user->setFlash('success', Yii::t('ciims.controllers.Site', 'A password reset link has been sent to your email address'));
-				$this->redirect($this->createUrl('site/login'));
+				Yii::app ()->user->setFlash ('success', Yii::t ('ciims.controllers.Site', 'A password reset link has been sent to your email address'));
+				$this->redirect ($this->createUrl ('site/login'));
 			}
 		}
 
-		$this->render('forgot', array(
+		$this->render ('forgot', array(
 			'model' => $model
 		));
 	}
@@ -235,33 +235,33 @@ 
 	 * Alows a user to reset their password if they initiated a forgot password request
 	 * @param string $id
 	 */
-	public function actionResetPassword($id=NULL)
+	public function actionResetPassword ($id = NULL)
 	{
 		$this->layout = '//layouts/main';
 
-		$this->setPageTitle(Yii::t('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
-			'{{app_name}}' => Cii::getConfig('name', Yii::app()->name),
-			'{{label}}'    => Yii::t('ciims.controllers.Site', 'Reset Your password')
+		$this->setPageTitle (Yii::t ('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
+			'{{app_name}}' => Cii::getConfig ('name', Yii::app ()->name),
+			'{{label}}'    => Yii::t ('ciims.controllers.Site', 'Reset Your password')
 		)));
 
 		$model = new PasswordResetForm;
 		$model->reset_key = $id;
 
-		if (!$model->validateResetKey())
-			throw new CHttpException(403, Yii::t('ciims.controllers.Site', 'The password reset key provided is invalid'));
+		if (!$model->validateResetKey ())
+			throw new CHttpException (403, Yii::t ('ciims.controllers.Site', 'The password reset key provided is invalid'));
 
-		if (Cii::get($_POST, 'PasswordResetForm', false))
+		if (Cii::get ($_POST, 'PasswordResetForm', false))
 		{
 			$model->attributes = $_POST['PasswordResetForm'];
 
-			if ($model->save())
+			if ($model->save ())
 			{
-				Yii::app()->user->setFlash('success', Yii::t('ciims.controllers.Site', 'Your password has been reset, and you may now login with your new password'));
-				$this->redirect($this->createUrl('site/login'));
+				Yii::app ()->user->setFlash ('success', Yii::t ('ciims.controllers.Site', 'Your password has been reset, and you may now login with your new password'));
+				$this->redirect ($this->createUrl ('site/login'));
 			}
 		}
 
-		$this->render('resetpassword', array(
+		$this->render ('resetpassword', array(
 			'model' => $model
 		));
 	}
@@ -270,44 +270,44 @@ 
 	 * Allows the user to securely change their email address
 	 * @param  string $key the user's secure key
 	 */
-	public function actionEmailChange($key=null)
+	public function actionEmailChange ($key = null)
 	{
 		$this->layout = '//layouts/main';
 
-		$this->setPageTitle(Yii::t('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
-		   '{{app_name}}' => Cii::getConfig('name', Yii::app()->name),
-		   '{{label}}'    => Yii::t('ciims.controllers.Site', 'Change Your Email Address')
+		$this->setPageTitle (Yii::t ('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
+		   '{{app_name}}' => Cii::getConfig ('name', Yii::app ()->name),
+		   '{{label}}'    => Yii::t ('ciims.controllers.Site', 'Change Your Email Address')
 	   )));
 
 		$model = new EmailChangeForm;
-		$model->setUser(Users::model()->findByPk(Yii::app()->user->id));
+		$model->setUser (Users::model ()->findByPk (Yii::app ()->user->id));
 		$model->verificationKey = $key;
 
-		if (!$model->validateVerificationKey())
-			throw new CHttpException(403, Yii::t('ciims.controllers.Site', 'The verification key provided is invalid.'));
+		if (!$model->validateVerificationKey ())
+			throw new CHttpException (403, Yii::t ('ciims.controllers.Site', 'The verification key provided is invalid.'));
 
-		if (Cii::get($_POST, 'EmailChangeForm', false))
+		if (Cii::get ($_POST, 'EmailChangeForm', false))
 		{
 			$model->attributes = $_POST['EmailChangeForm'];
 
-			if ($model->save())
+			if ($model->save ())
 			{
-				Yii::app()->user->setFlash('success', Yii::t('ciims.controllers.Site', 'Your new email address has been verified.'));
+				Yii::app ()->user->setFlash ('success', Yii::t ('ciims.controllers.Site', 'Your new email address has been verified.'));
 
 				$loginForm = new LoginForm;
 				$loginForm->attributes = array(
-					'username' => Users::model()->findByPk(Yii::app()->user->id)->email,
+					'username' => Users::model ()->findByPk (Yii::app ()->user->id)->email,
 					'password' => $model->password,
 				);
 
-				if ($loginForm->login())
-					return $this->redirect(Yii::app()->homeUrl);
+				if ($loginForm->login ())
+					return $this->redirect (Yii::app ()->homeUrl);
 
-				throw new CHttpException(400, Yii::t('ciims.controllers.Site', 'Unable to re-authenticated user.'));
+				throw new CHttpException (400, Yii::t ('ciims.controllers.Site', 'Unable to re-authenticated user.'));
 			}
 		}
 
-		$this->render('emailchange', array(
+		$this->render ('emailchange', array(
 			'model' => $model
 		));
 	}
@@ -316,33 +316,33 @@ 
 	 * Activates a new user's account
 	 * @param mixed $id 			The activation key
 	 */
-	public function actionActivation($id=NULL)
+	public function actionActivation ($id = NULL)
 	{
 		$this->layout = '//layouts/main';
 
-		$this->setPageTitle(Yii::t('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
-		   '{{app_name}}' => Cii::getConfig('name', Yii::app()->name),
-		   '{{label}}'    => Yii::t('ciims.controllers.Site', 'Activate Your Account')
+		$this->setPageTitle (Yii::t ('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
+		   '{{app_name}}' => Cii::getConfig ('name', Yii::app ()->name),
+		   '{{label}}'    => Yii::t ('ciims.controllers.Site', 'Activate Your Account')
 	   )));
 
 		$model = new ActivationForm;
 		$model->activationKey = $id;
 
-		if (!$model->validateKey())
-			throw new CHttpException(403, Yii::t('ciims.models.ActivationForm', 'The activation key you provided is invalid.'));
+		if (!$model->validateKey ())
+			throw new CHttpException (403, Yii::t ('ciims.models.ActivationForm', 'The activation key you provided is invalid.'));
 
-		if (Cii::get($_POST, 'ActivationForm', false))
+		if (Cii::get ($_POST, 'ActivationForm', false))
 		{
 			$model->attributes = $_POST['ActivationForm'];
 
-			if ($model->save())
+			if ($model->save ())
 			{
-				Yii::app()->user->setFlash('success', Yii::t('ciims.controllers.Site', 'Your account has successfully been activated. You may now login'));
-				$this->redirect($this->createUrl('site/login'));
+				Yii::app ()->user->setFlash ('success', Yii::t ('ciims.controllers.Site', 'Your account has successfully been activated. You may now login'));
+				$this->redirect ($this->createUrl ('site/login'));
 			}
 		}
 
-		$this->render('activation', array(
+		$this->render ('activation', array(
 			'model' => $model
 		));
 	}
@@ -350,31 +350,31 @@ 
 	/**
 	 * Handles the registration of new users on the site
 	 */
-	public function actionRegister()
+	public function actionRegister ()
 	{
 		$this->layout = '//layouts/main';
 
-		$this->setPageTitle(Yii::t('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
-			'{{app_name}}' => Cii::getConfig('name', Yii::app()->name),
-			'{{label}}'    => Yii::t('ciims.controllers.Site', 'Sign Up')
+		$this->setPageTitle (Yii::t ('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
+			'{{app_name}}' => Cii::getConfig ('name', Yii::app ()->name),
+			'{{label}}'    => Yii::t ('ciims.controllers.Site', 'Sign Up')
 		)));
 
 		$model = new RegisterForm;
 
-		if (Cii::get($_POST, 'RegisterForm', false))
+		if (Cii::get ($_POST, 'RegisterForm', false))
 		{
 			$model->attributes = $_POST['RegisterForm'];
 
 			// Save the user's information
-			if ($model->save())
+			if ($model->save ())
 			{
 				// Set a flash message
-				Yii::app()->user->setFlash('success', Yii::t('ciims.controllers.Site', 'You have successfully registered an account. Before you can login, please check your email for activation instructions'));
-				$this->redirect($this->createUrl('site/login'));
+				Yii::app ()->user->setFlash ('success', Yii::t ('ciims.controllers.Site', 'You have successfully registered an account. Before you can login, please check your email for activation instructions'));
+				$this->redirect ($this->createUrl ('site/login'));
 			}
 		}
 
-		$this->render('register', array(
+		$this->render ('register', array(
 			'model'=>$model
 		));
 	}
@@ -383,39 +383,39 @@ 
 	 * Enables users who have recieved an invitation to setup a new account
 	 * @param string $id	The activation id the of the user that we want to activate
 	 */
-	public function actionAcceptInvite($id=NULL)
+	public function actionAcceptInvite ($id = NULL)
 	{
 		$this->layout = '//layouts/main';
 
-		$this->setPageTitle(Yii::t('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
-			'{{app_name}}' => Cii::getConfig('name', Yii::app()->name),
-			'{{label}}'    => Yii::t('ciims.controllers.Site', 'Accept Invitation')
+		$this->setPageTitle (Yii::t ('ciims.controllers.Site', '{{app_name}} | {{label}}', array(
+			'{{app_name}}' => Cii::getConfig ('name', Yii::app ()->name),
+			'{{label}}'    => Yii::t ('ciims.controllers.Site', 'Accept Invitation')
 		)));
 
 		if ($id === NULL)
-			throw new CHttpException(400, Yii::t('ciims.controllers.Site', 'There was an error fulfilling your request.'));
+			throw new CHttpException (400, Yii::t ('ciims.controllers.Site', 'There was an error fulfilling your request.'));
 
 		// Make sure we have a user first
-		$meta = UserMetadata::model()->findByAttributes(array('key' => 'invitationKey', 'value' => $id));
+		$meta = UserMetadata::model ()->findByAttributes (array('key' => 'invitationKey', 'value' => $id));
 		if ($meta === NULL)
-			throw new CHttpException(400, Yii::t('ciims.controllers.Site', 'There was an error fulfilling your request.'));
+			throw new CHttpException (400, Yii::t ('ciims.controllers.Site', 'There was an error fulfilling your request.'));
 
 		$model = new InviteForm;
-		$model->email = Users::model()->findByPk($meta->user_id)->email;
+		$model->email = Users::model ()->findByPk ($meta->user_id)->email;
 
-		if (Cii::get($_POST, 'InviteForm', NULL) !== NULL)
+		if (Cii::get ($_POST, 'InviteForm', NULL) !== NULL)
 		{
-			$model->attributes = Cii::get($_POST, 'InviteForm', NULL);
+			$model->attributes = Cii::get ($_POST, 'InviteForm', NULL);
 			$model->id = $meta->user_id;
 
-			if ($model->acceptInvite())
+			if ($model->acceptInvite ())
 			{
-				$meta->delete();
-				return $this->render('invitesuccess');
+				$meta->delete ();
+				return $this->render ('invitesuccess');
 			}
 		}
 
-		$this->render('acceptinvite', array(
+		$this->render ('acceptinvite', array(
 			'model' => $model
 		));
 	}
@@ -424,8 +424,8 @@ 
 	 * Returns a sanitized $_GET['next'] URL if it is set.
 	 * @return mixed
 	 */
-	private function _getNext()
+	private function _getNext ()
 	{
-		return str_replace('ftp://', '', str_replace('http://', '', str_replace('https://', '', Yii::app()->request->getParam('next', false))));
+		return str_replace ('ftp://', '', str_replace ('http://', '', str_replace ('https://', '', Yii::app ()->request->getParam ('next', false))));
 	}
 }

protected/messages/en_us/yii.php

Spacing +1 added lines, -1 removed lines

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

Indentation +10 added lines, -10 removed lines

@@ -17,14 +17,14 @@
  * NOTE, this file must be saved in UTF-8 encoding.
  */
 return array (
-  '< Previous' => '',
-  '<< 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 >>' => '',
-  'Next >' => '',
-  'The "forceCopy" and "linkAssets" cannot be both true.' => '',
-  'The asset "{asset}" to be published does not exist.' => '',
+    '< Previous' => '',
+    '<< 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 >>' => '',
+    'Next >' => '',
+    'The "forceCopy" and "linkAssets" cannot be both true.' => '',
+    'The asset "{asset}" to be published does not exist.' => '',
 );

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

+    }

 }

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

 }

Spacing +84 added lines, -84 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))

-			return $slug . $id;

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

 	}

 }

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

protected/models/Comments.php

Indentation +151 added lines, -151 removed lines

@@ -19,155 +19,155 @@
  */

 class Comments extends CiiModel

 {

-	/**

-	 * API Attribute for retrieving the counts

-	 * @var int

-	 */

-	public $count = 0;

-

-	/**

-	 * AfterSave IsNewRecord

-	 * @var boolean

-	 */

-	private $_isNewRecord = false;

-

-	/**

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

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

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

-	}

-

-	/**

-	 * @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('content_id, author_id, comment', 'required'),

-			array('content_id, author_id', 'numerical', 'integerOnly'=>true),

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

-			array('id, content_id, author_id, comment, 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(

-			'content' => array(self::BELONGS_TO, 'Content', 'content_id'),

-			'author' => array(self::BELONGS_TO, 'Users', 'author_id'),

-		);

-	}

-

-	/**

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

-	 */

-	public function attributeLabels()

-	{

-		return array(

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

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

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

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

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

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

-		);

-	}

-

-	/**

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

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

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

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

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

-

-		return new CActiveDataProvider($this, array(

-			'criteria'=>$criteria,

-		));

-	}

-

-	/**

-	 * Returns the API attributes for the model

-	 * @return array

-	 */

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

-	{

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

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

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

-		$data['user'] = array(

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

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

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

-		);

-

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

-		$data['content'] = array(

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

-			'title' => $content->title,

-			'slug' => $content->slug

-		);

-

-		// If this user cannot comment without approval

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

-			$data['banned_comment'] = true;

-

-		return $data;

-	}

-

-	/**

-	 * Set the created and updated records

-	 * @see CiiModel::beforeSave();

-	 */

-	public function beforeSave()

-	{

-		if ($this->isNewRecord)

-			$this->_isNewRecord = true;

-

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

-			return parent::beforeSave();

-		else

-			return false;

-	}

-

-	/**

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

-	 * @see parent::afterSave();

-	 */

-	public function afterSave()

-	{

-		if ($this->_isNewRecord)

-		{

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

-			$user->setReputation(10);

-		}

-

-		return parent::afterSave();

-	}

+    /**

+     * API Attribute for retrieving the counts

+     * @var int

+     */

+    public $count = 0;

+

+    /**

+     * AfterSave IsNewRecord

+     * @var boolean

+     */

+    private $_isNewRecord = false;

+

+    /**

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

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

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

+    }

+

+    /**

+     * @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('content_id, author_id, comment', 'required'),

+            array('content_id, author_id', 'numerical', 'integerOnly'=>true),

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

+            array('id, content_id, author_id, comment, 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(

+            'content' => array(self::BELONGS_TO, 'Content', 'content_id'),

+            'author' => array(self::BELONGS_TO, 'Users', 'author_id'),

+        );

+    }

+

+    /**

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

+     */

+    public function attributeLabels()

+    {

+        return array(

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

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

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

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

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

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

+        );

+    }

+

+    /**

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

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

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

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

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

+

+        return new CActiveDataProvider($this, array(

+            'criteria'=>$criteria,

+        ));

+    }

+

+    /**

+     * Returns the API attributes for the model

+     * @return array

+     */

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

+    {

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

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

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

+        $data['user'] = array(

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

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

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

+        );

+

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

+        $data['content'] = array(

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

+            'title' => $content->title,

+            'slug' => $content->slug

+        );

+

+        // If this user cannot comment without approval

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

+            $data['banned_comment'] = true;

+

+        return $data;

+    }

+

+    /**

+     * Set the created and updated records

+     * @see CiiModel::beforeSave();

+     */

+    public function beforeSave()

+    {

+        if ($this->isNewRecord)

+            $this->_isNewRecord = true;

+

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

+            return parent::beforeSave();

+        else

+            return false;

+    }

+

+    /**

+     * After a new comment is posted, set the reputation += 10

+     * @see parent::afterSave();

+     */

+    public function afterSave()

+    {

+        if ($this->_isNewRecord)

+        {

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

+            $user->setReputation(10);

+        }

+

+        return parent::afterSave();

+    }

 }

Spacing +34 added lines, -34 removed lines

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

 	 * @return Comments the static model class

 	 */

-	public static function model($className=__CLASS__)

+	public static function model ($className = __CLASS__)

 	{

-		return parent::model($className);

+		return parent::model ($className);

 	}

 

 	/**

 	 * @return string the associated database table name

 	 */

-	public function tableName()

+	public function tableName ()

 	{

 		return 'comments';

 	}

@@ -52,7 +52,7 @@ 
 	/**

 	 * @return array validation rules for model attributes.

 	 */

-	public function rules()

+	public function rules ()

 	{

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

 		// will receive user inputs.

@@ -67,7 +67,7 @@ 
 	/**

 	 * @return array relational rules.

 	 */

-	public function relations()

+	public function relations ()

 	{

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

 		// class name for the relations automatically generated below.

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

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

 	 */

-	public function attributeLabels()

+	public function attributeLabels ()

 	{

 		return array(

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

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

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

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

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

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

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

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

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

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

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

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

 		);

 	}

 

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

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

 	 */

-	public function search()

+	public function search ()

 	{

-		$criteria=new CDbCriteria;

+		$criteria = new CDbCriteria;

 

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

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

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

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

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

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

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

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

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

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

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

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

 

-		return new CActiveDataProvider($this, array(

+		return new CActiveDataProvider ($this, array(

 			'criteria'=>$criteria,

 		));

 	}

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

 	 * @return array

 	 */

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

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

 	{

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

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

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

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

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

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

 		$data['user'] = array(

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

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

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

 		);

 

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

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

 		$data['content'] = array(

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

 			'title' => $content->title,

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

 

 		// If this user cannot comment without approval

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

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

 			$data['banned_comment'] = true;

 

 		return $data;

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

 	 * @see CiiModel::beforeSave();

 	 */

-	public function beforeSave()

+	public function beforeSave ()

 	{

 		if ($this->isNewRecord)

 			$this->_isNewRecord = true;

 

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

-			return parent::beforeSave();

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

+			return parent::beforeSave ();

 		else

 			return false;

 	}

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

 	 * @see parent::afterSave();

 	 */

-	public function afterSave()

+	public function afterSave ()

 	{

 		if ($this->_isNewRecord)

 		{

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

-			$user->setReputation(10);

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

+			$user->setReputation (10);

 		}

 

-		return parent::afterSave();

+		return parent::afterSave ();

 	}

 }

Braces +32 added lines, -29 removed lines

@@ -17,8 +17,8 @@ 
  * @property Content $content

  * @property Users $user

  */

-class Comments extends CiiModel

-{

+class Comments extends CiiModel
+{
 	/**

 	 * API Attribute for retrieving the counts

 	 * @var int

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

 	 * @return Comments the static model class

 	 */

-	public static function model($className=__CLASS__)

-	{

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

 	}

 

 	/**

 	 * @return string the associated database table name

 	 */

-	public function tableName()

-	{

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

 	}

 

 	/**

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

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

@@ -80,8 +80,8 @@ 
 	/**

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

 	 */

-	public function attributeLabels()

-	{

+	public function attributeLabels()
+	{
 		return array(

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

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

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

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

 	 * @return array

 	 */

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

-	{

+	public function getApiAttributes($params = array(), $relations = false)
+	{
 		$data = parent::getApiAttributes($params, $relations);

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

 		$attributes = $user->getApiAttributes();

@@ -135,8 +135,9 @@ 
 		);

 

 		// If this user cannot comment without approval

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

-			$data['banned_comment'] = true;

+		if ($user->getReputation() < 100) {
+					$data['banned_comment'] = true;
+		}
 

 		return $data;

 	}

@@ -145,23 +146,25 @@ 
 	 * Set the created and updated records

 	 * @see CiiModel::beforeSave();

 	 */

-	public function beforeSave()

-	{

-		if ($this->isNewRecord)

-			$this->_isNewRecord = true;

-

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

-			return parent::beforeSave();

-		else

-			return false;

+	public function beforeSave()
+	{
+		if ($this->isNewRecord) {
+					$this->_isNewRecord = true;
+		}
+

+		if (Content::model()->findByPk($this->content_id)->commentable) {
+					return parent::beforeSave();
+		} else {
+					return false;
+		}
 	}

 

 	/**

 	 * After a new comment is posted, set the reputation += 10

 	 * @see parent::afterSave();

 	 */

-	public function afterSave()

-	{

+	public function afterSave()
+	{
 		if ($this->_isNewRecord)

 		{

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

protected/models/Configuration.php

Indentation +105 added lines, -105 removed lines

@@ -11,122 +11,122 @@
  */

 class Configuration extends CiiModel

 {

-	/**

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

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

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

-	}

+    /**

+     * @return string the associated database table name

+     */

+    public function tableName()

+    {

+        return 'configuration';

+    }

 

-	/**

-	 * @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('key, value', 'required'),

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

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

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

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

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

+            array('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();

-	}

+    /**

+     * @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();

+    }

 

-	/**

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

-	 */

-	public function attributeLabels()

-	{

-		return array(

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

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

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

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

-		);

-	}

+    /**

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

+     */

+    public function attributeLabels()

+    {

+        return array(

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

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

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

+            'updated' => Yii::t('ciims.models.Configuration', '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('t.key',$this->key,true);

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

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

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

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

+        $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->order = "created DESC";

 

-		return new CActiveDataProvider($this, array(

-			'criteria'=>$criteria,

-		));

-	}

+        return new CActiveDataProvider($this, array(

+            'criteria'=>$criteria,

+        ));

+    }

 

-	/**

-	 * Generates a unique id

-	 * @return string

-	 */

-	public function generateUniqueId()

-	{

-		$rnd_id = crypt(uniqid(mt_rand(),1));

-		$rnd_id = strip_tags(stripslashes($rnd_id));

-		$rnd_id = str_replace(".","",$rnd_id);

-		$rnd_id = strrev(str_replace("/","",$rnd_id));

-		$rnd_id = str_replace("$", '', substr($rnd_id,0,20));

+    /**

+     * Generates a unique id

+     * @return string

+     */

+    public function generateUniqueId()

+    {

+        $rnd_id = crypt(uniqid(mt_rand(),1));

+        $rnd_id = strip_tags(stripslashes($rnd_id));

+        $rnd_id = str_replace(".","",$rnd_id);

+        $rnd_id = strrev(str_replace("/","",$rnd_id));

+        $rnd_id = str_replace("$", '', substr($rnd_id,0,20));

 

-		return $rnd_id;

-	}

+        return $rnd_id;

+    }

 

-	/**

-	 * This will do a full recursive deletion of a card from bothe the filesystem and from

-	 * @param  string $name The folder name in runtiome

-	 * @return boolean      If the recursive delete was successful or not

-	 */

-	public function fullDelete($name, $type='card')

-	{

-		if ($type == 'card')

-			$path = Yii::getPathOfAlias('application.runtime.cards.' . $name);

-		else

-			$path = $name;

+    /**

+     * This will do a full recursive deletion of a card from bothe the filesystem and from

+     * @param  string $name The folder name in runtiome

+     * @return boolean      If the recursive delete was successful or not

+     */

+    public function fullDelete($name, $type='card')

+    {

+        if ($type == 'card')

+            $path = Yii::getPathOfAlias('application.runtime.cards.' . $name);

+        else

+            $path = $name;

 

-		try

-		{

-			// Delete the directory path

-			CiiFileDeleter::removeDirectory($path);

+        try

+        {

+            // Delete the directory path

+            CiiFileDeleter::removeDirectory($path);

 

-			// Delete the cache

-			Yii::app()->cache->delete('dashboard_cards_available');

-			Yii::app()->cache->delete('cards_in_category');

+            // Delete the cache

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

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

 

-			// Delete the record

-			return $this->delete();

-		}

-		catch (Exception $e) {

-			return false;

-		}

-	}

+            // Delete the record

+            return $this->delete();

+        }

+        catch (Exception $e) {

+            return false;

+        }

+    }

 }

Braces +24 added lines, -24 removed lines

@@ -9,31 +9,31 @@ 
  * @property string $created

  * @property string $updated

  */

-class Configuration extends CiiModel

-{

+class Configuration extends CiiModel
+{
 	/**

 	 * Returns the static model of the specified AR class.

 	 * @param string $className active record class name.

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

 	}

 

 	/**

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

@@ -47,8 +47,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();

@@ -57,8 +57,8 @@ 
 	/**

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

 	 */

-	public function attributeLabels()

-	{

+	public function attributeLabels()
+	{
 		return array(

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

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

@@ -71,8 +71,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('t.key',$this->key,true);

@@ -90,8 +90,8 @@ 
 	 * Generates a unique id

 	 * @return string

 	 */

-	public function generateUniqueId()

-	{

+	public function generateUniqueId()
+	{
 		$rnd_id = crypt(uniqid(mt_rand(),1));

 		$rnd_id = strip_tags(stripslashes($rnd_id));

 		$rnd_id = str_replace(".","",$rnd_id);

@@ -106,12 +106,13 @@ 
 	 * @param  string $name The folder name in runtiome

 	 * @return boolean      If the recursive delete was successful or not

 	 */

-	public function fullDelete($name, $type='card')

-	{

-		if ($type == 'card')

-			$path = Yii::getPathOfAlias('application.runtime.cards.' . $name);

-		else

-			$path = $name;

+	public function fullDelete($name, $type='card')
+	{
+		if ($type == 'card') {
+					$path = Yii::getPathOfAlias('application.runtime.cards.' . $name);
+		} else {
+					$path = $name;
+		}
 

 		try

 		{

@@ -124,8 +125,7 @@ 
 

 			// Delete the record

 			return $this->delete();

-		}

-		catch (Exception $e) {

+		} catch (Exception $e) {

 			return false;

 		}

 	}

Spacing +29 added lines, -29 removed lines

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

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

 	}

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

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

@@ -57,13 +57,13 @@ 
 	/**

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

 	 */

-	public function attributeLabels()

+	public function attributeLabels ()

 	{

 		return array(

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

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

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

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

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

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

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

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

 		);

 	}

 

@@ -71,17 +71,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('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 ('t.key', $this->key, true);

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

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

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

 		$criteria->order = "created DESC";

 

-		return new CActiveDataProvider($this, array(

+		return new CActiveDataProvider ($this, array(

 			'criteria'=>$criteria,

 		));

 	}

@@ -90,13 +90,13 @@ 
 	 * Generates a unique id

 	 * @return string

 	 */

-	public function generateUniqueId()

+	public function generateUniqueId ()

 	{

-		$rnd_id = crypt(uniqid(mt_rand(),1));

-		$rnd_id = strip_tags(stripslashes($rnd_id));

-		$rnd_id = str_replace(".","",$rnd_id);

-		$rnd_id = strrev(str_replace("/","",$rnd_id));

-		$rnd_id = str_replace("$", '', substr($rnd_id,0,20));

+		$rnd_id = crypt (uniqid (mt_rand (), 1));

+		$rnd_id = strip_tags (stripslashes ($rnd_id));

+		$rnd_id = str_replace (".", "", $rnd_id);

+		$rnd_id = strrev (str_replace ("/", "", $rnd_id));

+		$rnd_id = str_replace ("$", '', substr ($rnd_id, 0, 20));

 

 		return $rnd_id;

 	}

@@ -106,24 +106,24 @@ 
 	 * @param  string $name The folder name in runtiome

 	 * @return boolean      If the recursive delete was successful or not

 	 */

-	public function fullDelete($name, $type='card')

+	public function fullDelete ($name, $type = 'card')

 	{

 		if ($type == 'card')

-			$path = Yii::getPathOfAlias('application.runtime.cards.' . $name);

+			$path = Yii::getPathOfAlias ('application.runtime.cards.'.$name);

 		else

 			$path = $name;

 

 		try

 		{

 			// Delete the directory path

-			CiiFileDeleter::removeDirectory($path);

+			CiiFileDeleter::removeDirectory ($path);

 

 			// Delete the cache

-			Yii::app()->cache->delete('dashboard_cards_available');

-			Yii::app()->cache->delete('cards_in_category');

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

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

 

 			// Delete the record

-			return $this->delete();

+			return $this->delete ();

 		}

 		catch (Exception $e) {

 			return false;

protected/models/Content.php

Indentation +615 added lines, -615 removed lines

@@ -31,621 +31,621 @@
  */

 class Content extends CiiModel

 {

-	public $pageSize = 9;

-

-	public $viewFile = 'blog';

-

-	public $layoutFile = 'blog';

-

-	public $autosavedata = false;

-

-	/**

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

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

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

-	}

-

-	/**

-	 * @return string[] primary key of the table

-	 **/

-	public function primaryKey()

-	{

-		return array('id');

-	}

-

-	/**

-	 * @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('vid, author_id, title, content, status, commentable, category_id', 'required'),

-			array('vid, author_id, status, commentable, category_id, type_id, like_count', 'numerical', 'integerOnly'=>true),

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

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

-			array('id, vid, author_id, title, content, excerpt, status, commentable, category_id, type_id, password, like_count, slug, published, created, updated', 'safe', 'on'=>'search'),

-		);

-	}

-

-	/**

-	 * @return array relational rules.

-	 */

-	public function relations()

-	{

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

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

-		return array(

-			'comments' 	=> array(self::HAS_MANY, 'Comments', 'content_id'),

-			'author' 	=> array(self::BELONGS_TO, 'Users', 'author_id'),

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

-			'metadata' 	=> array(self::HAS_MANY, 'ContentMetadata', 'content_id'),

-		);

-	}

-

-	/**

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

-	 */

-	public function attributeLabels()

-	{

-		return array(

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

-			'vid' 			=> Yii::t('ciims.models.Content', 'Version'),

-			'author_id' 	=> Yii::t('ciims.models.Content', 'Author'),

-			'title' 		=> Yii::t('ciims.models.Content', 'Title'),

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

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

-			'status' 		=> Yii::t('ciims.models.Content', 'Status'),

-			'commentable' 	=> Yii::t('ciims.models.Content', 'Commentable'),

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

-			'type_id' 		=> Yii::t('ciims.models.Content', 'Type'),

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

-			'like_count' 	=> Yii::t('ciims.models.Content', 'Likes'),

-			'tags' 			=> Yii::t('ciims.models.Content', 'Tags'),

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

-			'published' 	=> Yii::t('ciims.models.Content', 'Published'),

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

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

-		);

-	}

-

-	/**

-	 * Returns a safe output to the theme

-	 * This includes setting nofollow tags on links, forcing them to open in new windows, and safely encoding the text

-	 * @return string

-	 */

-	public function getSafeOutput()

-	{

-		$md = new CMarkdownParser;

-		$dom = new DOMDocument();

-		$dom->loadHtml('<?xml encoding="UTF-8">'.$md->safeTransform($this->content));

-		$x = new DOMXPath($dom);

-

-		foreach ($x->query('//a') as $node)

-		{

-			$element = $node->getAttribute('href');

-			if (isset($element[0]) && $element[0] !== "/")

-			{

-				$node->setAttribute('rel', 'nofollow');

-				$node->setAttribute('target', '_blank');

-			}

-		}

-

-		return $md->safeTransform($dom->saveHtml());

-	}

-

-	public function getExtract()

-	{

-		Yii::log(Yii::t('ciims.models.Content', 'Use of property "extract" is deprecated in favor of "excerpt"'), 'system.db.ar.CActiveRecord', 'info');

-		return $this->excerpt;

-	}

-

-	/**

-	 * Correctly retrieves the number of likes for a particular post.

-	 *

-	 * This was added to address an issue with the like count changing if an article was updated

-	 * @return int    The number of likes for this post

-	 */

-

-	public function getLikeCount()

-	{

-		$meta = ContentMetadata::model()->findByAttributes(array('content_id' => $this->id, 'key' => 'likes'));

-		if ($meta === NULL)

-			return 0;

-

-		return $meta->value;

-	}

-

-	/**

-	 * Gets keyword tags for this entry

-	 * @return array

-	 */

-	public function getTags()

-	{

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

-		return $tags === NULL ? array() : json_decode($tags->value, true);

-	}

-

-	/**

-	 * Adds a tag to the model

-	 * @param string $tag	The tag to add

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

-	 */

-	public function addTag($tag)

-	{

-		$tags = $this->tags;

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

-			return false;

-

-		$tags[] = $tag;

-		$tags = json_encode($tags);

-		$meta = $this->getPrototype('ContentMetadata', array('content_id' => $this->id, 'key' => 'keywords'));

-

-		$meta->value = $tags;

-		return $meta->save();

-	}

-

-	/**

-	 * Removes a tag from the model

-	 * @param string $tag	The tag to remove

-	 * @return bool			If the removal was successful

-	 */

-	public function removeTag($tag)

-	{

-		$tags = $this->tags;

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

-			return false;

-

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

-		unset($tags[$key]);

-		$tags = json_encode($tags);

-

-		$meta = $this->getPrototype('ContentMetadata', array('content_id' => $this->id, 'key' => 'keywords'));

-		$meta->value = $tags;

-		return $meta->save();

-	}

-

-	/**

-	 * Provides a base criteria for status, uniqueness, and published states

-	 * @return CDBCriteria

-	 */

-	public function getBaseCriteria()

-	{

-		$criteria = new CDbCriteria();

-		return $criteria->addCondition("vid=(SELECT MAX(vid) FROM content WHERE id=t.id)")

-					    ->addCondition('status = 1')

-					    ->addCondition('UNIX_TIMESTAMP() >= published');

-	}	

-

-	/**

-	 * Returns the appropriate status' depending up the user's role

-	 * @return string[]

-	 */

-	public function getStatuses()

-	{

-

-		if (Yii::app()->user->role == 5 || Yii::app()->user->role == 7)

-			return array(0 => Yii::t('ciims.models.Content', 'Draft'));

-

-		return array(

-			1 => Yii::t('ciims.models.Content', 'Published'),

-			2 => Yii::t('ciims.models.Content', 'Ready for Review'),

-			0 => Yii::t('ciims.models.Content', 'Draft')

-		);

-	}

-

-	/**

-	 * Determines if an article is published or not

-	 * @return boolean

-	 */

-	public function isPublished()

-	{

-		return ($this->status == 1 && ($this->published <= time())) ? true : false;

-	}

-

-	/**

-	 * Determines if a given articled is scheduled or not

-	 * @return boolean

-	 */

-	public function isScheduled()

-	{

-		return ($this->status == 1 && ($this->published > time())) ? true : false;

-	}

-

-	/**

-	 * Gets a flattened list of keyword tags for jQuery.tag.js

-	 * @return string

-	 */

-	public function getTagsFlat()

-	{

-		return implode(',', $this->tags);

-	}

-

-	/**

-	 * Retrieves the layout used from Metadata

-	 * We cache this to speed up the viewfile

-	 */

-	public function getLayout()

-	{

-		$model  = ContentMetadata::model()->findByAttributes(array('content_id' => $this->id, 'key' => 'layout'));

-		return $model === NULL ? 'blog' : $model->value;

-	}

-

-	/**

-	 * Sets the layout

-	 * @param string $data  the layout file

-	 * @return boolean

-	 */

-	public function setLayout($data)

-	{

-		$meta = $this->getPrototype('ContentMetadata', array('content_id' => $this->id, 'key' => 'layout'));

-		$meta->value = $data;

-		return $meta->save();

-	}

-

-	/**

-	 * Sets the view

-	 * @param string $data  The view file

-	 * @return boolean

-	 */

-	public function setView($data)

-	{

-		$meta = $this->getPrototype('ContentMetadata', array('content_id' => $this->id, 'key' => 'view'));

-		$meta->value = $data;

-		return $meta->save();

-	}

-

-	/**

-	 * Retrieves the viewfile used from Metadata

-	 * We cache this to speed up the viewfile

-	 */

-	public function getView()

-	{

-		$model  = ContentMetadata::model()->findByAttributes(array('content_id' => $this->id, 'key' => 'view'));

-		return $model === NULL ? 'blog' : $model->value;

-	}

-

-	/**

-	 * Updates the like_count after finding new data

-	 */

-	protected function afterFind()

-	{

-		parent::afterFind();

-		$this->like_count = $this->getLikeCount();

-	}

-

-	/**

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

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

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

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

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

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

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

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

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

-

-		// Handle publishing with a true/false value simply to do this calculation. Otherwise default to compare

-		if (is_bool($this->published))

-		{

-			if ($this->published)

-				$criteria->addCondition('published <= UNIX_TIMESTAMP()');

-			else

-				$criteria->addCondition('published > UNIX_TIMESTAMP()');

-		}

-		else

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

-		$criteria->addCondition("vid=(SELECT MAX(vid) FROM content WHERE id=t.id)");

-

-		// TODO: Figure out how to restore CActiveDataProvidor by getCommentCount

-		return new CActiveDataProvider($this, array(

-			'criteria' => $criteria,

-			'sort' => array(

-				'defaultOrder' => 'published DESC'

-			),

-			'pagination' => array(

-				'pageSize' => $this->pageSize

-			)

-		));

-	}

-

-	/**

-	 * Finds all active records with the specified primary keys.

-	 * Overloaded to support composite primary keys. For our content, we want to find the latest version of that primary key, defined as MAX(vid) WHERE id = pk

-	 * See {@link find()} for detailed explanation about $condition and $params.

-	 * @param mixed $pk primary key value(s). Use array for multiple primary keys. For composite key, each key value must be an array (column name=>column value).

-	 * @param mixed $condition query condition or criteria.

-	 * @param array $params parameters to be bound to an SQL statement.

-	 * @return array the records found. An empty array is returned if none is found.

-	 */

-	public function findByPk($pk, $condition='', $params=array())

-	{

-		// If we do not supply a condition or parameters, use our overwritten method

-		if ($condition == '' && empty($params) && $pk != null)

-		{

-			if (!is_numeric($pk))

-				throw new CHttpException(400, Yii::t('ciims.models.Content', 'The content ID provided was invalid.'));

+    public $pageSize = 9;

+

+    public $viewFile = 'blog';

+

+    public $layoutFile = 'blog';

+

+    public $autosavedata = false;

+

+    /**

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

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

+     * @return Content 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 'content';

+    }

+

+    /**

+     * @return string[] primary key of the table

+     **/

+    public function primaryKey()

+    {

+        return array('id');

+    }

+

+    /**

+     * @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('vid, author_id, title, content, status, commentable, category_id', 'required'),

+            array('vid, author_id, status, commentable, category_id, type_id, like_count', 'numerical', 'integerOnly'=>true),

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

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

+            array('id, vid, author_id, title, content, excerpt, status, commentable, category_id, type_id, password, like_count, slug, published, created, updated', 'safe', 'on'=>'search'),

+        );

+    }

+

+    /**

+     * @return array relational rules.

+     */

+    public function relations()

+    {

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

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

+        return array(

+            'comments' 	=> array(self::HAS_MANY, 'Comments', 'content_id'),

+            'author' 	=> array(self::BELONGS_TO, 'Users', 'author_id'),

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

+            'metadata' 	=> array(self::HAS_MANY, 'ContentMetadata', 'content_id'),

+        );

+    }

+

+    /**

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

+     */

+    public function attributeLabels()

+    {

+        return array(

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

+            'vid' 			=> Yii::t('ciims.models.Content', 'Version'),

+            'author_id' 	=> Yii::t('ciims.models.Content', 'Author'),

+            'title' 		=> Yii::t('ciims.models.Content', 'Title'),

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

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

+            'status' 		=> Yii::t('ciims.models.Content', 'Status'),

+            'commentable' 	=> Yii::t('ciims.models.Content', 'Commentable'),

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

+            'type_id' 		=> Yii::t('ciims.models.Content', 'Type'),

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

+            'like_count' 	=> Yii::t('ciims.models.Content', 'Likes'),

+            'tags' 			=> Yii::t('ciims.models.Content', 'Tags'),

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

+            'published' 	=> Yii::t('ciims.models.Content', 'Published'),

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

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

+        );

+    }

+

+    /**

+     * Returns a safe output to the theme

+     * This includes setting nofollow tags on links, forcing them to open in new windows, and safely encoding the text

+     * @return string

+     */

+    public function getSafeOutput()

+    {

+        $md = new CMarkdownParser;

+        $dom = new DOMDocument();

+        $dom->loadHtml('<?xml encoding="UTF-8">'.$md->safeTransform($this->content));

+        $x = new DOMXPath($dom);

+

+        foreach ($x->query('//a') as $node)

+        {

+            $element = $node->getAttribute('href');

+            if (isset($element[0]) && $element[0] !== "/")

+            {

+                $node->setAttribute('rel', 'nofollow');

+                $node->setAttribute('target', '_blank');

+            }

+        }

+

+        return $md->safeTransform($dom->saveHtml());

+    }

+

+    public function getExtract()

+    {

+        Yii::log(Yii::t('ciims.models.Content', 'Use of property "extract" is deprecated in favor of "excerpt"'), 'system.db.ar.CActiveRecord', 'info');

+        return $this->excerpt;

+    }

+

+    /**

+     * Correctly retrieves the number of likes for a particular post.

+     *

+     * This was added to address an issue with the like count changing if an article was updated

+     * @return int    The number of likes for this post

+     */

+

+    public function getLikeCount()

+    {

+        $meta = ContentMetadata::model()->findByAttributes(array('content_id' => $this->id, 'key' => 'likes'));

+        if ($meta === NULL)

+            return 0;

+

+        return $meta->value;

+    }

+

+    /**

+     * Gets keyword tags for this entry

+     * @return array

+     */

+    public function getTags()

+    {

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

+        return $tags === NULL ? array() : json_decode($tags->value, true);

+    }

+

+    /**

+     * Adds a tag to the model

+     * @param string $tag	The tag to add

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

+     */

+    public function addTag($tag)

+    {

+        $tags = $this->tags;

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

+            return false;

+

+        $tags[] = $tag;

+        $tags = json_encode($tags);

+        $meta = $this->getPrototype('ContentMetadata', array('content_id' => $this->id, 'key' => 'keywords'));

+

+        $meta->value = $tags;

+        return $meta->save();

+    }

+

+    /**

+     * Removes a tag from the model

+     * @param string $tag	The tag to remove

+     * @return bool			If the removal was successful

+     */

+    public function removeTag($tag)

+    {

+        $tags = $this->tags;

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

+            return false;

+

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

+        unset($tags[$key]);

+        $tags = json_encode($tags);

+

+        $meta = $this->getPrototype('ContentMetadata', array('content_id' => $this->id, 'key' => 'keywords'));

+        $meta->value = $tags;

+        return $meta->save();

+    }

+

+    /**

+     * Provides a base criteria for status, uniqueness, and published states

+     * @return CDBCriteria

+     */

+    public function getBaseCriteria()

+    {

+        $criteria = new CDbCriteria();

+        return $criteria->addCondition("vid=(SELECT MAX(vid) FROM content WHERE id=t.id)")

+                        ->addCondition('status = 1')

+                        ->addCondition('UNIX_TIMESTAMP() >= published');

+    }	

+

+    /**

+     * Returns the appropriate status' depending up the user's role

+     * @return string[]

+     */

+    public function getStatuses()

+    {

+

+        if (Yii::app()->user->role == 5 || Yii::app()->user->role == 7)

+            return array(0 => Yii::t('ciims.models.Content', 'Draft'));

+

+        return array(

+            1 => Yii::t('ciims.models.Content', 'Published'),

+            2 => Yii::t('ciims.models.Content', 'Ready for Review'),

+            0 => Yii::t('ciims.models.Content', 'Draft')

+        );

+    }

+

+    /**

+     * Determines if an article is published or not

+     * @return boolean

+     */

+    public function isPublished()

+    {

+        return ($this->status == 1 && ($this->published <= time())) ? true : false;

+    }

+

+    /**

+     * Determines if a given articled is scheduled or not

+     * @return boolean

+     */

+    public function isScheduled()

+    {

+        return ($this->status == 1 && ($this->published > time())) ? true : false;

+    }

+

+    /**

+     * Gets a flattened list of keyword tags for jQuery.tag.js

+     * @return string

+     */

+    public function getTagsFlat()

+    {

+        return implode(',', $this->tags);

+    }

+

+    /**

+     * Retrieves the layout used from Metadata

+     * We cache this to speed up the viewfile

+     */

+    public function getLayout()

+    {

+        $model  = ContentMetadata::model()->findByAttributes(array('content_id' => $this->id, 'key' => 'layout'));

+        return $model === NULL ? 'blog' : $model->value;

+    }

+

+    /**

+     * Sets the layout

+     * @param string $data  the layout file

+     * @return boolean

+     */

+    public function setLayout($data)

+    {

+        $meta = $this->getPrototype('ContentMetadata', array('content_id' => $this->id, 'key' => 'layout'));

+        $meta->value = $data;

+        return $meta->save();

+    }

+

+    /**

+     * Sets the view

+     * @param string $data  The view file

+     * @return boolean

+     */

+    public function setView($data)

+    {

+        $meta = $this->getPrototype('ContentMetadata', array('content_id' => $this->id, 'key' => 'view'));

+        $meta->value = $data;

+        return $meta->save();

+    }

+

+    /**

+     * Retrieves the viewfile used from Metadata

+     * We cache this to speed up the viewfile

+     */

+    public function getView()

+    {

+        $model  = ContentMetadata::model()->findByAttributes(array('content_id' => $this->id, 'key' => 'view'));

+        return $model === NULL ? 'blog' : $model->value;

+    }

+

+    /**

+     * Updates the like_count after finding new data

+     */

+    protected function afterFind()

+    {

+        parent::afterFind();

+        $this->like_count = $this->getLikeCount();

+    }

+

+    /**

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

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

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

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

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

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

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

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

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

+

+        // Handle publishing with a true/false value simply to do this calculation. Otherwise default to compare

+        if (is_bool($this->published))

+        {

+            if ($this->published)

+                $criteria->addCondition('published <= UNIX_TIMESTAMP()');

+            else

+                $criteria->addCondition('published > UNIX_TIMESTAMP()');

+        }

+        else

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

+        $criteria->addCondition("vid=(SELECT MAX(vid) FROM content WHERE id=t.id)");

+

+        // TODO: Figure out how to restore CActiveDataProvidor by getCommentCount

+        return new CActiveDataProvider($this, array(

+            'criteria' => $criteria,

+            'sort' => array(

+                'defaultOrder' => 'published DESC'

+            ),

+            'pagination' => array(

+                'pageSize' => $this->pageSize

+            )

+        ));

+    }

+

+    /**

+     * Finds all active records with the specified primary keys.

+     * Overloaded to support composite primary keys. For our content, we want to find the latest version of that primary key, defined as MAX(vid) WHERE id = pk

+     * See {@link find()} for detailed explanation about $condition and $params.

+     * @param mixed $pk primary key value(s). Use array for multiple primary keys. For composite key, each key value must be an array (column name=>column value).

+     * @param mixed $condition query condition or criteria.

+     * @param array $params parameters to be bound to an SQL statement.

+     * @return array the records found. An empty array is returned if none is found.

+     */

+    public function findByPk($pk, $condition='', $params=array())

+    {

+        // If we do not supply a condition or parameters, use our overwritten method

+        if ($condition == '' && empty($params) && $pk != null)

+        {

+            if (!is_numeric($pk))

+                throw new CHttpException(400, Yii::t('ciims.models.Content', 'The content ID provided was invalid.'));

 				

-			$criteria = new CDbCriteria;

-			$criteria->addCondition("t.id=:pk");

-			$criteria->addCondition("vid=(SELECT MAX(vid) FROM content WHERE id=:pk)");

-			$criteria->params = array(

-				':pk' => $pk

-			);

-			return $this->query($criteria);

-		}

-

-		return parent::findByPk($pk, $condition, $params);

-	}

-

-	/**

-	 * Lists all revisions in the database for a givenid

-	 * @param  int $id [description]

-	 * @return array

-	 */

-	public function findRevisions($id)

-	{

-		if (!is_numeric($id))

-			throw new CHttpException(400, Yii::t('ciims.models.Content', 'The content ID provided was invalid.'));

+            $criteria = new CDbCriteria;

+            $criteria->addCondition("t.id=:pk");

+            $criteria->addCondition("vid=(SELECT MAX(vid) FROM content WHERE id=:pk)");

+            $criteria->params = array(

+                ':pk' => $pk

+            );

+            return $this->query($criteria);

+        }

+

+        return parent::findByPk($pk, $condition, $params);

+    }

+

+    /**

+     * Lists all revisions in the database for a givenid

+     * @param  int $id [description]

+     * @return array

+     */

+    public function findRevisions($id)

+    {

+        if (!is_numeric($id))

+            throw new CHttpException(400, Yii::t('ciims.models.Content', 'The content ID provided was invalid.'));

 				

-		$criteria = new CDbCriteria;

-		$criteria->addCondition("id=:id");

-		$criteria->params = array(

-			':id' => $id

-		);

-		$criteria->order = 'vid DESC';

-

-		return $this->query($criteria, true);

-	}

-

-	/**

-	 * BeforeValidate

-	 * @see CActiveRecord::beforeValidate

-	 */

-	public function beforeValidate()

-	{

-		// Allow publication times to be set automatically

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

-			$this->published = time();

-

-		if (strlen($this->excerpt) == 0)

-			$this->excerpt = $this->myTruncate($this->content, 250, '.', '');

-

-		return parent::beforeValidate();

-	}

-

-	/**

-	 * Saves a prototype copy of the model so that we can get an id back to work with

-	 * @return boolean 	$model->save(false) without any validation rules

-	 */

-	public function savePrototype($author_id)

-	{

-		$this->title = '';

-		$this->content = '';

-		$this->excerpt = '';

-		$this->commentable = 1;

-		$this->status = 0;

-		$this->category_id = 1;

-		$this->type_id = 2;

-		$this->password = null;

-		$this->created = time();

-		$this->updated = time();

-		$this->published = time();

-		$this->vid = 1;

-		$this->slug = "";

-		$this->author_id = $author_id;

-

-		// TODO: Why doesn't Yii return the PK id field? But it does return VID? AutoIncriment bug?

-		if ($this->save(false))

-		{

-			$data = Content::model()->findByAttributes(array('created' => $this->created));

-			$this->id = $data->id;

-			return true;

-		}

-

-		return false;

-	}

-

-	/**

-	 * BeforeSave

-	 * Clears caches for rebuilding, creates the end slug that we are going to use

-	 * @see CActiveRecord::beforeSave();

-	 */

-	public function beforeSave()

-	{

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

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

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

-

-		Yii::app()->cache->set('content-' . $this->id . '-layout', $this->layoutFile);

-		Yii::app()->cache->set('content-' . $this->id . '-view', $this->viewFile);

-

-		return parent::beforeSave();

-	}

-

-	/**

-	 * AfterSave

-	 * Updates the layout and view if necessary

-	 * @see CActiveRecord::afterSave()

-	 */

-	public function afterSave()

-	{

-		// Delete the AutoSave document on update

-		if ($this->isPublished())

-		{

-			$autosaveModel = ContentMetadata::model()->findByAttributes(array('content_id' => $this->id, 'key' => 'autosave'));

-			if ($autosaveModel != NULL)

-				$autosaveModel->delete();

-		}

-

-		return parent::afterSave();

-	}

-

-	/**

-	 * BeforeDelete

-	 * Clears caches for rebuilding

-	 * @see CActiveRecord::beforeDelete

-	 */

-	public function beforeDelete()

-	{

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

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

-		Yii::app()->cache->delete('content-' . $this->id . '-layout');

-		Yii::app()->cache->delete('content-' . $this->id . '-view');

-

-		return parent::beforeDelete();

-	}

-

-

-	/**

-	 * Retrieves the available view files under the current theme

-	 * @return array    A list of files by name

-	 */

-	public function getViewFiles($theme=null)

-	{

-		return $this->getFiles($theme, 'views.content');

-	}

-

-	/**

-	 * Retrieves the available layouts under the current theme

-	 * @return array    A list of files by name

-	 */

-	public function getLayoutFiles($theme=null)

-	{

-		return $this->getFiles($theme, 'views.layouts');

-	}

-

-	/**

-	 * Retrieves view files for a particular path

-	 * @param  string $theme  The theme to reference

-	 * @param  string $type   The view type to lookup

-	 * @return array $files   An array of files

-	 */

-	private function getFiles($theme=null, $type='views')

-	{

-		if ($theme === null)

-			$theme = Cii::getConfig('theme', 'default');

-

-		$folder = $type;

-

-		if ($type == 'view')

-			$folder = 'content';

-

-		$returnFiles = array();

-

-		if (!file_exists(YiiBase::getPathOfAlias('base.themes.' . $theme)))

-			$theme = 'default';

-

-		$files = Yii::app()->cache->get($theme.'-available-' . $type);

-

-		if ($files === false)

-		{

-			$fileHelper = new CFileHelper;

-			$files = $fileHelper->findFiles(Yii::getPathOfAlias('base.themes.' . $theme .'.' . $folder), array('fileTypes'=>array('php'), 'level'=>0));

-			Yii::app()->cache->set($theme.'-available-' . $type, $files);

-		}

-

-		foreach ($files as $file)

-		{

-			$f = str_replace('content', '', str_replace('/', '', str_replace('.php', '', substr( $file, strrpos( $file, '/' ) + 1 ))));

-

-			if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')

-				$f = trim(substr($f, strrpos($f, '\\') + 1));

-

-			if (!in_array($f, array('all', 'password', '_post')))

-				$returnFiles[$f] = $f;

-		}

-

-		return $returnFiles;

-	}

-

-	/**

-	 * Fancy truncate function to help clean up our strings for the excerpt

-	 * @param string $string    The string we want to apply the text to

-	 * @param int    $limit     How many characters we want to break into

-	 * @param string $break     Characters we want to break on if possible

-	 * @param string $pad       The padding we want to apply

-	 * @return string           Truncated string

-	 */

-	private function myTruncate($string, $limit, $break=".", $pad="...")

-	{

-		// return with no change if string is shorter than $limit

-		if(strlen($string) <= $limit)

-			return $string;

-

-		// is $break present between $limit and the end of the string?

-		if(false !== ($breakpoint = strpos($string, $break, $limit)))

-		{

-			if($breakpoint < strlen($string) - 1)

-			{

-				$string = substr($string, 0, $breakpoint) . $pad;

-			}

-		}

-

-		return $string;

-	}

-

-	/**

-	 * 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)

-	{

-		$category = false;

-

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

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

-

-		// Make sure we don't have a collision with a Category

-		if ($count == 0)

-		{

-			$category = true;

-			$count = Categories::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)

-		{

-			// Ensures we don't have a collision on category

-			if ($category)

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

-

-			// Pull the data that matches

-			$data = $this->findByPk($this->id);

-

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

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

-				return $slug;

-		}

-

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

-			return $slug . $id;

-		else

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

-	}

+        $criteria = new CDbCriteria;

+        $criteria->addCondition("id=:id");

+        $criteria->params = array(

+            ':id' => $id

+        );

+        $criteria->order = 'vid DESC';

+

+        return $this->query($criteria, true);

+    }

+

+    /**

+     * BeforeValidate

+     * @see CActiveRecord::beforeValidate

+     */

+    public function beforeValidate()

+    {

+        // Allow publication times to be set automatically

+        if (empty($this->published))

+            $this->published = time();

+

+        if (strlen($this->excerpt) == 0)

+            $this->excerpt = $this->myTruncate($this->content, 250, '.', '');

+

+        return parent::beforeValidate();

+    }

+

+    /**

+     * Saves a prototype copy of the model so that we can get an id back to work with

+     * @return boolean 	$model->save(false) without any validation rules

+     */

+    public function savePrototype($author_id)

+    {

+        $this->title = '';

+        $this->content = '';

+        $this->excerpt = '';

+        $this->commentable = 1;

+        $this->status = 0;

+        $this->category_id = 1;

+        $this->type_id = 2;

+        $this->password = null;

+        $this->created = time();

+        $this->updated = time();

+        $this->published = time();

+        $this->vid = 1;

+        $this->slug = "";

+        $this->author_id = $author_id;

+

+        // TODO: Why doesn't Yii return the PK id field? But it does return VID? AutoIncriment bug?

+        if ($this->save(false))

+        {

+            $data = Content::model()->findByAttributes(array('created' => $this->created));

+            $this->id = $data->id;

+            return true;

+        }

+

+        return false;

+    }

+

+    /**

+     * BeforeSave

+     * Clears caches for rebuilding, creates the end slug that we are going to use

+     * @see CActiveRecord::beforeSave();

+     */

+    public function beforeSave()

+    {

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

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

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

+

+        Yii::app()->cache->set('content-' . $this->id . '-layout', $this->layoutFile);

+        Yii::app()->cache->set('content-' . $this->id . '-view', $this->viewFile);

+

+        return parent::beforeSave();

+    }

+

+    /**

+     * AfterSave

+     * Updates the layout and view if necessary

+     * @see CActiveRecord::afterSave()

+     */

+    public function afterSave()

+    {

+        // Delete the AutoSave document on update

+        if ($this->isPublished())

+        {

+            $autosaveModel = ContentMetadata::model()->findByAttributes(array('content_id' => $this->id, 'key' => 'autosave'));

+            if ($autosaveModel != NULL)

+                $autosaveModel->delete();

+        }

+

+        return parent::afterSave();

+    }

+

+    /**

+     * BeforeDelete

+     * Clears caches for rebuilding

+     * @see CActiveRecord::beforeDelete

+     */

+    public function beforeDelete()

+    {

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

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

+        Yii::app()->cache->delete('content-' . $this->id . '-layout');

+        Yii::app()->cache->delete('content-' . $this->id . '-view');

+

+        return parent::beforeDelete();

+    }

+

+

+    /**

+     * Retrieves the available view files under the current theme

+     * @return array    A list of files by name

+     */

+    public function getViewFiles($theme=null)

+    {

+        return $this->getFiles($theme, 'views.content');

+    }

+

+    /**

+     * Retrieves the available layouts under the current theme

+     * @return array    A list of files by name

+     */

+    public function getLayoutFiles($theme=null)

+    {

+        return $this->getFiles($theme, 'views.layouts');

+    }

+

+    /**

+     * Retrieves view files for a particular path

+     * @param  string $theme  The theme to reference

+     * @param  string $type   The view type to lookup

+     * @return array $files   An array of files

+     */

+    private function getFiles($theme=null, $type='views')

+    {

+        if ($theme === null)

+            $theme = Cii::getConfig('theme', 'default');

+

+        $folder = $type;

+

+        if ($type == 'view')

+            $folder = 'content';

+

+        $returnFiles = array();

+

+        if (!file_exists(YiiBase::getPathOfAlias('base.themes.' . $theme)))

+            $theme = 'default';

+

+        $files = Yii::app()->cache->get($theme.'-available-' . $type);

+

+        if ($files === false)

+        {

+            $fileHelper = new CFileHelper;

+            $files = $fileHelper->findFiles(Yii::getPathOfAlias('base.themes.' . $theme .'.' . $folder), array('fileTypes'=>array('php'), 'level'=>0));

+            Yii::app()->cache->set($theme.'-available-' . $type, $files);

+        }

+

+        foreach ($files as $file)

+        {

+            $f = str_replace('content', '', str_replace('/', '', str_replace('.php', '', substr( $file, strrpos( $file, '/' ) + 1 ))));

+

+            if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')

+                $f = trim(substr($f, strrpos($f, '\\') + 1));

+

+            if (!in_array($f, array('all', 'password', '_post')))

+                $returnFiles[$f] = $f;

+        }

+

+        return $returnFiles;

+    }

+

+    /**

+     * Fancy truncate function to help clean up our strings for the excerpt

+     * @param string $string    The string we want to apply the text to

+     * @param int    $limit     How many characters we want to break into

+     * @param string $break     Characters we want to break on if possible

+     * @param string $pad       The padding we want to apply

+     * @return string           Truncated string

+     */

+    private function myTruncate($string, $limit, $break=".", $pad="...")

+    {

+        // return with no change if string is shorter than $limit

+        if(strlen($string) <= $limit)

+            return $string;

+

+        // is $break present between $limit and the end of the string?

+        if(false !== ($breakpoint = strpos($string, $break, $limit)))

+        {

+            if($breakpoint < strlen($string) - 1)

+            {

+                $string = substr($string, 0, $breakpoint) . $pad;

+            }

+        }

+

+        return $string;

+    }

+

+    /**

+     * 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)

+    {

+        $category = false;

+

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

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

+

+        // Make sure we don't have a collision with a Category

+        if ($count == 0)

+        {

+            $category = true;

+            $count = Categories::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)

+        {

+            // Ensures we don't have a collision on category

+            if ($category)

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

+

+            // Pull the data that matches

+            $data = $this->findByPk($this->id);

+

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

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

+                return $slug;

+        }

+

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

+            return $slug . $id;

+        else

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

+    }

 }

Braces +136 added lines, -117 removed lines

@@ -29,8 +29,8 @@ 
  * @property Categories $category

  * @property ContentMetadata[] $contentMetadatas

  */

-class Content extends CiiModel

-{

+class Content extends CiiModel
+{
 	public $pageSize = 9;

 

 	public $viewFile = 'blog';

@@ -44,32 +44,32 @@ 
 	 * @param string $className active record class name.

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

 	}

 

 	/**

 	 * @return string[] primary key of the table

 	 **/

-	public function primaryKey()

-	{

+	public function primaryKey()
+	{
 		return array('id');

 	}

 

 	/**

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

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

@@ -99,8 +99,8 @@ 
 	/**

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

 	 */

-	public function attributeLabels()

-	{

+	public function attributeLabels()
+	{
 		return array(

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

 			'vid' 			=> Yii::t('ciims.models.Content', 'Version'),

@@ -127,8 +127,8 @@ 
 	 * This includes setting nofollow tags on links, forcing them to open in new windows, and safely encoding the text

 	 * @return string

 	 */

-	public function getSafeOutput()

-	{

+	public function getSafeOutput()
+	{
 		$md = new CMarkdownParser;

 		$dom = new DOMDocument();

 		$dom->loadHtml('<?xml encoding="UTF-8">'.$md->safeTransform($this->content));

@@ -147,8 +147,8 @@ 
 		return $md->safeTransform($dom->saveHtml());

 	}

 

-	public function getExtract()

-	{

+	public function getExtract()
+	{
 		Yii::log(Yii::t('ciims.models.Content', 'Use of property "extract" is deprecated in favor of "excerpt"'), 'system.db.ar.CActiveRecord', 'info');

 		return $this->excerpt;

 	}

@@ -160,11 +160,12 @@ 
 	 * @return int    The number of likes for this post

 	 */

 

-	public function getLikeCount()

-	{

+	public function getLikeCount()
+	{
 		$meta = ContentMetadata::model()->findByAttributes(array('content_id' => $this->id, 'key' => 'likes'));

-		if ($meta === NULL)

-			return 0;

+		if ($meta === NULL) {
+					return 0;
+		}
 

 		return $meta->value;

 	}

@@ -173,8 +174,8 @@ 
 	 * Gets keyword tags for this entry

 	 * @return array

 	 */

-	public function getTags()

-	{

+	public function getTags()
+	{
 		$tags = ContentMetadata::model()->findByAttributes(array('content_id' => $this->id, 'key' => 'keywords'));

 		return $tags === NULL ? array() : json_decode($tags->value, true);

 	}

@@ -184,11 +185,12 @@ 
 	 * @param string $tag	The tag to add

 	 * @return bool			If the insert was successful or not

 	 */

-	public function addTag($tag)

-	{

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

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

-			return false;

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

 		$tags[] = $tag;

 		$tags = json_encode($tags);

@@ -203,11 +205,12 @@ 
 	 * @param string $tag	The tag to remove

 	 * @return bool			If the removal was successful

 	 */

-	public function removeTag($tag)

-	{

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

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

-			return false;

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

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

 		unset($tags[$key]);

@@ -222,8 +225,8 @@ 
 	 * Provides a base criteria for status, uniqueness, and published states

 	 * @return CDBCriteria

 	 */

-	public function getBaseCriteria()

-	{

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

 		return $criteria->addCondition("vid=(SELECT MAX(vid) FROM content WHERE id=t.id)")

 					    ->addCondition('status = 1')

@@ -234,11 +237,12 @@ 
 	 * Returns the appropriate status' depending up the user's role

 	 * @return string[]

 	 */

-	public function getStatuses()

-	{

+	public function getStatuses()
+	{
 

-		if (Yii::app()->user->role == 5 || Yii::app()->user->role == 7)

-			return array(0 => Yii::t('ciims.models.Content', 'Draft'));

+		if (Yii::app()->user->role == 5 || Yii::app()->user->role == 7) {
+					return array(0 => Yii::t('ciims.models.Content', 'Draft'));
+		}
 

 		return array(

 			1 => Yii::t('ciims.models.Content', 'Published'),

@@ -251,8 +255,8 @@ 
 	 * Determines if an article is published or not

 	 * @return boolean

 	 */

-	public function isPublished()

-	{

+	public function isPublished()
+	{
 		return ($this->status == 1 && ($this->published <= time())) ? true : false;

 	}

 

@@ -260,8 +264,8 @@ 
 	 * Determines if a given articled is scheduled or not

 	 * @return boolean

 	 */

-	public function isScheduled()

-	{

+	public function isScheduled()
+	{
 		return ($this->status == 1 && ($this->published > time())) ? true : false;

 	}

 

@@ -269,8 +273,8 @@ 
 	 * Gets a flattened list of keyword tags for jQuery.tag.js

 	 * @return string

 	 */

-	public function getTagsFlat()

-	{

+	public function getTagsFlat()
+	{
 		return implode(',', $this->tags);

 	}

 

@@ -278,8 +282,8 @@ 
 	 * Retrieves the layout used from Metadata

 	 * We cache this to speed up the viewfile

 	 */

-	public function getLayout()

-	{

+	public function getLayout()
+	{
 		$model  = ContentMetadata::model()->findByAttributes(array('content_id' => $this->id, 'key' => 'layout'));

 		return $model === NULL ? 'blog' : $model->value;

 	}

@@ -289,8 +293,8 @@ 
 	 * @param string $data  the layout file

 	 * @return boolean

 	 */

-	public function setLayout($data)

-	{

+	public function setLayout($data)
+	{
 		$meta = $this->getPrototype('ContentMetadata', array('content_id' => $this->id, 'key' => 'layout'));

 		$meta->value = $data;

 		return $meta->save();

@@ -301,8 +305,8 @@ 
 	 * @param string $data  The view file

 	 * @return boolean

 	 */

-	public function setView($data)

-	{

+	public function setView($data)
+	{
 		$meta = $this->getPrototype('ContentMetadata', array('content_id' => $this->id, 'key' => 'view'));

 		$meta->value = $data;

 		return $meta->save();

@@ -312,8 +316,8 @@ 
 	 * Retrieves the viewfile used from Metadata

 	 * We cache this to speed up the viewfile

 	 */

-	public function getView()

-	{

+	public function getView()
+	{
 		$model  = ContentMetadata::model()->findByAttributes(array('content_id' => $this->id, 'key' => 'view'));

 		return $model === NULL ? 'blog' : $model->value;

 	}

@@ -321,8 +325,8 @@ 
 	/**

 	 * Updates the like_count after finding new data

 	 */

-	protected function afterFind()

-	{

+	protected function afterFind()
+	{
 		parent::afterFind();

 		$this->like_count = $this->getLikeCount();

 	}

@@ -331,8 +335,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);

@@ -349,13 +353,14 @@ 
 		// Handle publishing with a true/false value simply to do this calculation. Otherwise default to compare

 		if (is_bool($this->published))

 		{

-			if ($this->published)

-				$criteria->addCondition('published <= UNIX_TIMESTAMP()');

-			else

-				$criteria->addCondition('published > UNIX_TIMESTAMP()');

-		}

-		else

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

+			if ($this->published) {
+							$criteria->addCondition('published <= UNIX_TIMESTAMP()');
+			} else {
+							$criteria->addCondition('published > UNIX_TIMESTAMP()');
+			}
+		} else {
+					$criteria->compare('published', $this->published,true);
+		}
 		$criteria->addCondition("vid=(SELECT MAX(vid) FROM content WHERE id=t.id)");

 

 		// TODO: Figure out how to restore CActiveDataProvidor by getCommentCount

@@ -379,13 +384,14 @@ 
 	 * @param array $params parameters to be bound to an SQL statement.

 	 * @return array the records found. An empty array is returned if none is found.

 	 */

-	public function findByPk($pk, $condition='', $params=array())

-	{

+	public function findByPk($pk, $condition='', $params=array())
+	{
 		// If we do not supply a condition or parameters, use our overwritten method

 		if ($condition == '' && empty($params) && $pk != null)

 		{

-			if (!is_numeric($pk))

-				throw new CHttpException(400, Yii::t('ciims.models.Content', 'The content ID provided was invalid.'));

+			if (!is_numeric($pk)) {
+							throw new CHttpException(400, Yii::t('ciims.models.Content', 'The content ID provided was invalid.'));
+			}
 				

 			$criteria = new CDbCriteria;

 			$criteria->addCondition("t.id=:pk");

@@ -404,10 +410,11 @@ 
 	 * @param  int $id [description]

 	 * @return array

 	 */

-	public function findRevisions($id)

-	{

-		if (!is_numeric($id))

-			throw new CHttpException(400, Yii::t('ciims.models.Content', 'The content ID provided was invalid.'));

+	public function findRevisions($id)
+	{
+		if (!is_numeric($id)) {
+					throw new CHttpException(400, Yii::t('ciims.models.Content', 'The content ID provided was invalid.'));
+		}
 				

 		$criteria = new CDbCriteria;

 		$criteria->addCondition("id=:id");

@@ -423,14 +430,16 @@ 
 	 * BeforeValidate

 	 * @see CActiveRecord::beforeValidate

 	 */

-	public function beforeValidate()

-	{

+	public function beforeValidate()
+	{
 		// Allow publication times to be set automatically

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

-			$this->published = time();

+		if (empty($this->published)) {
+					$this->published = time();
+		}
 

-		if (strlen($this->excerpt) == 0)

-			$this->excerpt = $this->myTruncate($this->content, 250, '.', '');

+		if (strlen($this->excerpt) == 0) {
+					$this->excerpt = $this->myTruncate($this->content, 250, '.', '');
+		}
 

 		return parent::beforeValidate();

 	}

@@ -439,8 +448,8 @@ 
 	 * Saves a prototype copy of the model so that we can get an id back to work with

 	 * @return boolean 	$model->save(false) without any validation rules

 	 */

-	public function savePrototype($author_id)

-	{

+	public function savePrototype($author_id)
+	{
 		$this->title = '';

 		$this->content = '';

 		$this->excerpt = '';

@@ -472,8 +481,8 @@ 
 	 * Clears caches for rebuilding, creates the end slug that we are going to use

 	 * @see CActiveRecord::beforeSave();

 	 */

-	public function beforeSave()

-	{

+	public function beforeSave()
+	{
 		$this->slug = $this->verifySlug($this->slug, $this->title);

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

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

@@ -489,14 +498,15 @@ 
 	 * Updates the layout and view if necessary

 	 * @see CActiveRecord::afterSave()

 	 */

-	public function afterSave()

-	{

+	public function afterSave()
+	{
 		// Delete the AutoSave document on update

 		if ($this->isPublished())

 		{

 			$autosaveModel = ContentMetadata::model()->findByAttributes(array('content_id' => $this->id, 'key' => 'autosave'));

-			if ($autosaveModel != NULL)

-				$autosaveModel->delete();

+			if ($autosaveModel != NULL) {
+							$autosaveModel->delete();
+			}
 		}

 

 		return parent::afterSave();

@@ -507,8 +517,8 @@ 
 	 * Clears caches for rebuilding

 	 * @see CActiveRecord::beforeDelete

 	 */

-	public function beforeDelete()

-	{

+	public function beforeDelete()
+	{
 		Yii::app()->cache->delete('CiiMS::Content::list');

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

 		Yii::app()->cache->delete('content-' . $this->id . '-layout');

@@ -522,8 +532,8 @@ 
 	 * Retrieves the available view files under the current theme

 	 * @return array    A list of files by name

 	 */

-	public function getViewFiles($theme=null)

-	{

+	public function getViewFiles($theme=null)
+	{
 		return $this->getFiles($theme, 'views.content');

 	}

 

@@ -531,8 +541,8 @@ 
 	 * Retrieves the available layouts under the current theme

 	 * @return array    A list of files by name

 	 */

-	public function getLayoutFiles($theme=null)

-	{

+	public function getLayoutFiles($theme=null)
+	{
 		return $this->getFiles($theme, 'views.layouts');

 	}

 

@@ -542,20 +552,23 @@ 
 	 * @param  string $type   The view type to lookup

 	 * @return array $files   An array of files

 	 */

-	private function getFiles($theme=null, $type='views')

-	{

-		if ($theme === null)

-			$theme = Cii::getConfig('theme', 'default');

+	private function getFiles($theme=null, $type='views')
+	{
+		if ($theme === null) {
+					$theme = Cii::getConfig('theme', 'default');
+		}
 

 		$folder = $type;

 

-		if ($type == 'view')

-			$folder = 'content';

+		if ($type == 'view') {
+					$folder = 'content';
+		}
 

 		$returnFiles = array();

 

-		if (!file_exists(YiiBase::getPathOfAlias('base.themes.' . $theme)))

-			$theme = 'default';

+		if (!file_exists(YiiBase::getPathOfAlias('base.themes.' . $theme))) {
+					$theme = 'default';
+		}
 

 		$files = Yii::app()->cache->get($theme.'-available-' . $type);

 

@@ -570,11 +583,13 @@ 
 		{

 			$f = str_replace('content', '', str_replace('/', '', str_replace('.php', '', substr( $file, strrpos( $file, '/' ) + 1 ))));

 

-			if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')

-				$f = trim(substr($f, strrpos($f, '\\') + 1));

+			if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+							$f = trim(substr($f, strrpos($f, '\\') + 1));
+			}
 

-			if (!in_array($f, array('all', 'password', '_post')))

-				$returnFiles[$f] = $f;

+			if (!in_array($f, array('all', 'password', '_post'))) {
+							$returnFiles[$f] = $f;
+			}
 		}

 

 		return $returnFiles;

@@ -588,11 +603,12 @@ 
 	 * @param string $pad       The padding we want to apply

 	 * @return string           Truncated string

 	 */

-	private function myTruncate($string, $limit, $break=".", $pad="...")

-	{

+	private function myTruncate($string, $limit, $break=".", $pad="...")
+	{
 		// return with no change if string is shorter than $limit

-		if(strlen($string) <= $limit)

-			return $string;

+		if(strlen($string) <= $limit) {
+					return $string;
+		}
 

 		// is $break present between $limit and the end of the string?

 		if(false !== ($breakpoint = strpos($string, $break, $limit)))

@@ -613,8 +629,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)
+	{
 		$category = false;

 

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

@@ -632,20 +648,23 @@ 
 		if ($count)

 		{

 			// Ensures we don't have a collision on category

-			if ($category)

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

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

 			// Pull the data that matches

 			$data = $this->findByPk($this->id);

 

 			// Check the pulled data id to the current item

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

-				return $slug;

+			if ($data !== NULL && $data->id == $this->id && $data->slug == $this->slug) {
+							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)));
+		}
 	}

 }

Spacing +167 added lines, -167 removed lines

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

 	 * @return Content the static model class

 	 */

-	public static function model($className=__CLASS__)

+	public static function model ($className = __CLASS__)

 	{

-		return parent::model($className);

+		return parent::model ($className);

 	}

 

 	/**

 	 * @return string the associated database table name

 	 */

-	public function tableName()

+	public function tableName ()

 	{

 		return 'content';

 	}

@@ -60,7 +60,7 @@ 
 	/**

 	 * @return string[] primary key of the table

 	 **/

-	public function primaryKey()

+	public function primaryKey ()

 	{

 		return array('id');

 	}

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

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

@@ -99,26 +99,26 @@ 
 	/**

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

 	 */

-	public function attributeLabels()

+	public function attributeLabels ()

 	{

 		return array(

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

-			'vid' 			=> Yii::t('ciims.models.Content', 'Version'),

-			'author_id' 	=> Yii::t('ciims.models.Content', 'Author'),

-			'title' 		=> Yii::t('ciims.models.Content', 'Title'),

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

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

-			'status' 		=> Yii::t('ciims.models.Content', 'Status'),

-			'commentable' 	=> Yii::t('ciims.models.Content', 'Commentable'),

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

-			'type_id' 		=> Yii::t('ciims.models.Content', 'Type'),

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

-			'like_count' 	=> Yii::t('ciims.models.Content', 'Likes'),

-			'tags' 			=> Yii::t('ciims.models.Content', 'Tags'),

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

-			'published' 	=> Yii::t('ciims.models.Content', 'Published'),

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

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

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

+			'vid' 			=> Yii::t ('ciims.models.Content', 'Version'),

+			'author_id' 	=> Yii::t ('ciims.models.Content', 'Author'),

+			'title' 		=> Yii::t ('ciims.models.Content', 'Title'),

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

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

+			'status' 		=> Yii::t ('ciims.models.Content', 'Status'),

+			'commentable' 	=> Yii::t ('ciims.models.Content', 'Commentable'),

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

+			'type_id' 		=> Yii::t ('ciims.models.Content', 'Type'),

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

+			'like_count' 	=> Yii::t ('ciims.models.Content', 'Likes'),

+			'tags' 			=> Yii::t ('ciims.models.Content', 'Tags'),

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

+			'published' 	=> Yii::t ('ciims.models.Content', 'Published'),

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

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

 		);

 	}

 

@@ -127,29 +127,29 @@ 
 	 * This includes setting nofollow tags on links, forcing them to open in new windows, and safely encoding the text

 	 * @return string

 	 */

-	public function getSafeOutput()

+	public function getSafeOutput ()

 	{

 		$md = new CMarkdownParser;

-		$dom = new DOMDocument();

-		$dom->loadHtml('<?xml encoding="UTF-8">'.$md->safeTransform($this->content));

-		$x = new DOMXPath($dom);

+		$dom = new DOMDocument ();

+		$dom->loadHtml ('<?xml encoding="UTF-8">'.$md->safeTransform ($this->content));

+		$x = new DOMXPath ($dom);

 

-		foreach ($x->query('//a') as $node)

+		foreach ($x->query ('//a') as $node)

 		{

-			$element = $node->getAttribute('href');

+			$element = $node->getAttribute ('href');

 			if (isset($element[0]) && $element[0] !== "/")

 			{

-				$node->setAttribute('rel', 'nofollow');

-				$node->setAttribute('target', '_blank');

+				$node->setAttribute ('rel', 'nofollow');

+				$node->setAttribute ('target', '_blank');

 			}

 		}

 

-		return $md->safeTransform($dom->saveHtml());

+		return $md->safeTransform ($dom->saveHtml ());

 	}

 

-	public function getExtract()

+	public function getExtract ()

 	{

-		Yii::log(Yii::t('ciims.models.Content', 'Use of property "extract" is deprecated in favor of "excerpt"'), 'system.db.ar.CActiveRecord', 'info');

+		Yii::log (Yii::t ('ciims.models.Content', 'Use of property "extract" is deprecated in favor of "excerpt"'), 'system.db.ar.CActiveRecord', 'info');

 		return $this->excerpt;

 	}

 

@@ -160,9 +160,9 @@ 
 	 * @return int    The number of likes for this post

 	 */

 

-	public function getLikeCount()

+	public function getLikeCount ()

 	{

-		$meta = ContentMetadata::model()->findByAttributes(array('content_id' => $this->id, 'key' => 'likes'));

+		$meta = ContentMetadata::model ()->findByAttributes (array('content_id' => $this->id, 'key' => 'likes'));

 		if ($meta === NULL)

 			return 0;

 

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

 	 * @return array

 	 */

-	public function getTags()

+	public function getTags ()

 	{

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

-		return $tags === NULL ? array() : json_decode($tags->value, true);

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

+		return $tags === NULL ? array() : json_decode ($tags->value, true);

 	}

 

 	/**

@@ -184,18 +184,18 @@ 
 	 * @param string $tag	The tag to add

 	 * @return bool			If the insert was successful or not

 	 */

-	public function addTag($tag)

+	public function addTag ($tag)

 	{

 		$tags = $this->tags;

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

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

 			return false;

 

 		$tags[] = $tag;

-		$tags = json_encode($tags);

-		$meta = $this->getPrototype('ContentMetadata', array('content_id' => $this->id, 'key' => 'keywords'));

+		$tags = json_encode ($tags);

+		$meta = $this->getPrototype ('ContentMetadata', array('content_id' => $this->id, 'key' => 'keywords'));

 

 		$meta->value = $tags;

-		return $meta->save();

+		return $meta->save ();

 	}

 

 	/**

@@ -203,47 +203,47 @@ 
 	 * @param string $tag	The tag to remove

 	 * @return bool			If the removal was successful

 	 */

-	public function removeTag($tag)

+	public function removeTag ($tag)

 	{

 		$tags = $this->tags;

-		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 = json_encode($tags);

+		$tags = json_encode ($tags);

 

-		$meta = $this->getPrototype('ContentMetadata', array('content_id' => $this->id, 'key' => 'keywords'));

+		$meta = $this->getPrototype ('ContentMetadata', array('content_id' => $this->id, 'key' => 'keywords'));

 		$meta->value = $tags;

-		return $meta->save();

+		return $meta->save ();

 	}

 

 	/**

 	 * Provides a base criteria for status, uniqueness, and published states

 	 * @return CDBCriteria

 	 */

-	public function getBaseCriteria()

+	public function getBaseCriteria ()

 	{

-		$criteria = new CDbCriteria();

-		return $criteria->addCondition("vid=(SELECT MAX(vid) FROM content WHERE id=t.id)")

-					    ->addCondition('status = 1')

-					    ->addCondition('UNIX_TIMESTAMP() >= published');

+		$criteria = new CDbCriteria ();

+		return $criteria->addCondition ("vid=(SELECT MAX(vid) FROM content WHERE id=t.id)")

+					    ->addCondition ('status = 1')

+					    ->addCondition ('UNIX_TIMESTAMP() >= published');

 	}	

 

 	/**

 	 * Returns the appropriate status' depending up the user's role

 	 * @return string[]

 	 */

-	public function getStatuses()

+	public function getStatuses ()

 	{

 

-		if (Yii::app()->user->role == 5 || Yii::app()->user->role == 7)

-			return array(0 => Yii::t('ciims.models.Content', 'Draft'));

+		if (Yii::app ()->user->role == 5 || Yii::app ()->user->role == 7)

+			return array(0 => Yii::t ('ciims.models.Content', 'Draft'));

 

 		return array(

-			1 => Yii::t('ciims.models.Content', 'Published'),

-			2 => Yii::t('ciims.models.Content', 'Ready for Review'),

-			0 => Yii::t('ciims.models.Content', 'Draft')

+			1 => Yii::t ('ciims.models.Content', 'Published'),

+			2 => Yii::t ('ciims.models.Content', 'Ready for Review'),

+			0 => Yii::t ('ciims.models.Content', 'Draft')

 		);

 	}

 

@@ -251,36 +251,36 @@ 
 	 * Determines if an article is published or not

 	 * @return boolean

 	 */

-	public function isPublished()

+	public function isPublished ()

 	{

-		return ($this->status == 1 && ($this->published <= time())) ? true : false;

+		return ($this->status == 1 && ($this->published <= time ())) ? true : false;

 	}

 

 	/**

 	 * Determines if a given articled is scheduled or not

 	 * @return boolean

 	 */

-	public function isScheduled()

+	public function isScheduled ()

 	{

-		return ($this->status == 1 && ($this->published > time())) ? true : false;

+		return ($this->status == 1 && ($this->published > time ())) ? true : false;

 	}

 

 	/**

 	 * Gets a flattened list of keyword tags for jQuery.tag.js

 	 * @return string

 	 */

-	public function getTagsFlat()

+	public function getTagsFlat ()

 	{

-		return implode(',', $this->tags);

+		return implode (',', $this->tags);

 	}

 

 	/**

 	 * Retrieves the layout used from Metadata

 	 * We cache this to speed up the viewfile

 	 */

-	public function getLayout()

+	public function getLayout ()

 	{

-		$model  = ContentMetadata::model()->findByAttributes(array('content_id' => $this->id, 'key' => 'layout'));

+		$model = ContentMetadata::model ()->findByAttributes (array('content_id' => $this->id, 'key' => 'layout'));

 		return $model === NULL ? 'blog' : $model->value;

 	}

 

@@ -289,11 +289,11 @@ 
 	 * @param string $data  the layout file

 	 * @return boolean

 	 */

-	public function setLayout($data)

+	public function setLayout ($data)

 	{

-		$meta = $this->getPrototype('ContentMetadata', array('content_id' => $this->id, 'key' => 'layout'));

+		$meta = $this->getPrototype ('ContentMetadata', array('content_id' => $this->id, 'key' => 'layout'));

 		$meta->value = $data;

-		return $meta->save();

+		return $meta->save ();

 	}

 

 	/**

@@ -301,65 +301,65 @@ 
 	 * @param string $data  The view file

 	 * @return boolean

 	 */

-	public function setView($data)

+	public function setView ($data)

 	{

-		$meta = $this->getPrototype('ContentMetadata', array('content_id' => $this->id, 'key' => 'view'));

+		$meta = $this->getPrototype ('ContentMetadata', array('content_id' => $this->id, 'key' => 'view'));

 		$meta->value = $data;

-		return $meta->save();

+		return $meta->save ();

 	}

 

 	/**

 	 * Retrieves the viewfile used from Metadata

 	 * We cache this to speed up the viewfile

 	 */

-	public function getView()

+	public function getView ()

 	{

-		$model  = ContentMetadata::model()->findByAttributes(array('content_id' => $this->id, 'key' => 'view'));

+		$model = ContentMetadata::model ()->findByAttributes (array('content_id' => $this->id, 'key' => 'view'));

 		return $model === NULL ? 'blog' : $model->value;

 	}

 

 	/**

 	 * Updates the like_count after finding new data

 	 */

-	protected function afterFind()

+	protected function afterFind ()

 	{

-		parent::afterFind();

-		$this->like_count = $this->getLikeCount();

+		parent::afterFind ();

+		$this->like_count = $this->getLikeCount ();

 	}

 

 	/**

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

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

 	 */

-	public function search()

+	public function search ()

 	{

-		$criteria=new CDbCriteria;

+		$criteria = new CDbCriteria;

 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 

 		// Handle publishing with a true/false value simply to do this calculation. Otherwise default to compare

-		if (is_bool($this->published))

+		if (is_bool ($this->published))

 		{

 			if ($this->published)

-				$criteria->addCondition('published <= UNIX_TIMESTAMP()');

+				$criteria->addCondition ('published <= UNIX_TIMESTAMP()');

 			else

-				$criteria->addCondition('published > UNIX_TIMESTAMP()');

+				$criteria->addCondition ('published > UNIX_TIMESTAMP()');

 		}

 		else

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

-		$criteria->addCondition("vid=(SELECT MAX(vid) FROM content WHERE id=t.id)");

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

+		$criteria->addCondition ("vid=(SELECT MAX(vid) FROM content WHERE id=t.id)");

 

 		// TODO: Figure out how to restore CActiveDataProvidor by getCommentCount

-		return new CActiveDataProvider($this, array(

+		return new CActiveDataProvider ($this, array(

 			'criteria' => $criteria,

 			'sort' => array(

 				'defaultOrder' => 'published DESC'

@@ -379,24 +379,24 @@ 
 	 * @param array $params parameters to be bound to an SQL statement.

 	 * @return array the records found. An empty array is returned if none is found.

 	 */

-	public function findByPk($pk, $condition='', $params=array())

+	public function findByPk ($pk, $condition = '', $params = array())

 	{

 		// If we do not supply a condition or parameters, use our overwritten method

 		if ($condition == '' && empty($params) && $pk != null)

 		{

-			if (!is_numeric($pk))

-				throw new CHttpException(400, Yii::t('ciims.models.Content', 'The content ID provided was invalid.'));

+			if (!is_numeric ($pk))

+				throw new CHttpException (400, Yii::t ('ciims.models.Content', 'The content ID provided was invalid.'));

 				

 			$criteria = new CDbCriteria;

-			$criteria->addCondition("t.id=:pk");

-			$criteria->addCondition("vid=(SELECT MAX(vid) FROM content WHERE id=:pk)");

+			$criteria->addCondition ("t.id=:pk");

+			$criteria->addCondition ("vid=(SELECT MAX(vid) FROM content WHERE id=:pk)");

 			$criteria->params = array(

 				':pk' => $pk

 			);

-			return $this->query($criteria);

+			return $this->query ($criteria);

 		}

 

-		return parent::findByPk($pk, $condition, $params);

+		return parent::findByPk ($pk, $condition, $params);

 	}

 

 	/**

@@ -404,42 +404,42 @@ 
 	 * @param  int $id [description]

 	 * @return array

 	 */

-	public function findRevisions($id)

+	public function findRevisions ($id)

 	{

-		if (!is_numeric($id))

-			throw new CHttpException(400, Yii::t('ciims.models.Content', 'The content ID provided was invalid.'));

+		if (!is_numeric ($id))

+			throw new CHttpException (400, Yii::t ('ciims.models.Content', 'The content ID provided was invalid.'));

 				

 		$criteria = new CDbCriteria;

-		$criteria->addCondition("id=:id");

+		$criteria->addCondition ("id=:id");

 		$criteria->params = array(

 			':id' => $id

 		);

 		$criteria->order = 'vid DESC';

 

-		return $this->query($criteria, true);

+		return $this->query ($criteria, true);

 	}

 

 	/**

 	 * BeforeValidate

 	 * @see CActiveRecord::beforeValidate

 	 */

-	public function beforeValidate()

+	public function beforeValidate ()

 	{

 		// Allow publication times to be set automatically

 		if (empty($this->published))

-			$this->published = time();

+			$this->published = time ();

 

-		if (strlen($this->excerpt) == 0)

-			$this->excerpt = $this->myTruncate($this->content, 250, '.', '');

+		if (strlen ($this->excerpt) == 0)

+			$this->excerpt = $this->myTruncate ($this->content, 250, '.', '');

 

-		return parent::beforeValidate();

+		return parent::beforeValidate ();

 	}

 

 	/**

 	 * Saves a prototype copy of the model so that we can get an id back to work with

 	 * @return boolean 	$model->save(false) without any validation rules

 	 */

-	public function savePrototype($author_id)

+	public function savePrototype ($author_id)

 	{

 		$this->title = '';

 		$this->content = '';

@@ -449,17 +449,17 @@ 
 		$this->category_id = 1;

 		$this->type_id = 2;

 		$this->password = null;

-		$this->created = time();

-		$this->updated = time();

-		$this->published = time();

+		$this->created = time ();

+		$this->updated = time ();

+		$this->published = time ();

 		$this->vid = 1;

 		$this->slug = "";

 		$this->author_id = $author_id;

 

 		// TODO: Why doesn't Yii return the PK id field? But it does return VID? AutoIncriment bug?

-		if ($this->save(false))

+		if ($this->save (false))

 		{

-			$data = Content::model()->findByAttributes(array('created' => $this->created));

+			$data = Content::model ()->findByAttributes (array('created' => $this->created));

 			$this->id = $data->id;

 			return true;

 		}

@@ -472,16 +472,16 @@ 
 	 * Clears caches for rebuilding, creates the end slug that we are going to use

 	 * @see CActiveRecord::beforeSave();

 	 */

-	public function beforeSave()

+	public function beforeSave ()

 	{

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

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

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

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

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

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

 

-		Yii::app()->cache->set('content-' . $this->id . '-layout', $this->layoutFile);

-		Yii::app()->cache->set('content-' . $this->id . '-view', $this->viewFile);

+		Yii::app ()->cache->set ('content-'.$this->id.'-layout', $this->layoutFile);

+		Yii::app ()->cache->set ('content-'.$this->id.'-view', $this->viewFile);

 

-		return parent::beforeSave();

+		return parent::beforeSave ();

 	}

 

 	/**

@@ -489,17 +489,17 @@ 
 	 * Updates the layout and view if necessary

 	 * @see CActiveRecord::afterSave()

 	 */

-	public function afterSave()

+	public function afterSave ()

 	{

 		// Delete the AutoSave document on update

-		if ($this->isPublished())

+		if ($this->isPublished ())

 		{

-			$autosaveModel = ContentMetadata::model()->findByAttributes(array('content_id' => $this->id, 'key' => 'autosave'));

+			$autosaveModel = ContentMetadata::model ()->findByAttributes (array('content_id' => $this->id, 'key' => 'autosave'));

 			if ($autosaveModel != NULL)

-				$autosaveModel->delete();

+				$autosaveModel->delete ();

 		}

 

-		return parent::afterSave();

+		return parent::afterSave ();

 	}

 

 	/**

@@ -507,14 +507,14 @@ 
 	 * Clears caches for rebuilding

 	 * @see CActiveRecord::beforeDelete

 	 */

-	public function beforeDelete()

+	public function beforeDelete ()

 	{

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

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

-		Yii::app()->cache->delete('content-' . $this->id . '-layout');

-		Yii::app()->cache->delete('content-' . $this->id . '-view');

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

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

+		Yii::app ()->cache->delete ('content-'.$this->id.'-layout');

+		Yii::app ()->cache->delete ('content-'.$this->id.'-view');

 

-		return parent::beforeDelete();

+		return parent::beforeDelete ();

 	}

 

 

@@ -522,18 +522,18 @@ 
 	 * Retrieves the available view files under the current theme

 	 * @return array    A list of files by name

 	 */

-	public function getViewFiles($theme=null)

+	public function getViewFiles ($theme = null)

 	{

-		return $this->getFiles($theme, 'views.content');

+		return $this->getFiles ($theme, 'views.content');

 	}

 

 	/**

 	 * Retrieves the available layouts under the current theme

 	 * @return array    A list of files by name

 	 */

-	public function getLayoutFiles($theme=null)

+	public function getLayoutFiles ($theme = null)

 	{

-		return $this->getFiles($theme, 'views.layouts');

+		return $this->getFiles ($theme, 'views.layouts');

 	}

 

 	/**

@@ -542,10 +542,10 @@ 
 	 * @param  string $type   The view type to lookup

 	 * @return array $files   An array of files

 	 */

-	private function getFiles($theme=null, $type='views')

+	private function getFiles ($theme = null, $type = 'views')

 	{

 		if ($theme === null)

-			$theme = Cii::getConfig('theme', 'default');

+			$theme = Cii::getConfig ('theme', 'default');

 

 		$folder = $type;

 

@@ -554,26 +554,26 @@ 
 

 		$returnFiles = array();

 

-		if (!file_exists(YiiBase::getPathOfAlias('base.themes.' . $theme)))

+		if (!file_exists (YiiBase::getPathOfAlias ('base.themes.'.$theme)))

 			$theme = 'default';

 

-		$files = Yii::app()->cache->get($theme.'-available-' . $type);

+		$files = Yii::app ()->cache->get ($theme.'-available-'.$type);

 

 		if ($files === false)

 		{

 			$fileHelper = new CFileHelper;

-			$files = $fileHelper->findFiles(Yii::getPathOfAlias('base.themes.' . $theme .'.' . $folder), array('fileTypes'=>array('php'), 'level'=>0));

-			Yii::app()->cache->set($theme.'-available-' . $type, $files);

+			$files = $fileHelper->findFiles (Yii::getPathOfAlias ('base.themes.'.$theme.'.'.$folder), array('fileTypes'=>array('php'), 'level'=>0));

+			Yii::app ()->cache->set ($theme.'-available-'.$type, $files);

 		}

 

 		foreach ($files as $file)

 		{

-			$f = str_replace('content', '', str_replace('/', '', str_replace('.php', '', substr( $file, strrpos( $file, '/' ) + 1 ))));

+			$f = str_replace ('content', '', str_replace ('/', '', str_replace ('.php', '', substr ($file, strrpos ($file, '/') + 1))));

 

-			if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')

-				$f = trim(substr($f, strrpos($f, '\\') + 1));

+			if (strtoupper (substr (PHP_OS, 0, 3)) === 'WIN')

+				$f = trim (substr ($f, strrpos ($f, '\\') + 1));

 

-			if (!in_array($f, array('all', 'password', '_post')))

+			if (!in_array ($f, array('all', 'password', '_post')))

 				$returnFiles[$f] = $f;

 		}

 

@@ -588,18 +588,18 @@ 
 	 * @param string $pad       The padding we want to apply

 	 * @return string           Truncated string

 	 */

-	private function myTruncate($string, $limit, $break=".", $pad="...")

+	private function myTruncate ($string, $limit, $break = ".", $pad = "...")

 	{

 		// return with no change if string is shorter than $limit

-		if(strlen($string) <= $limit)

+		if (strlen ($string) <= $limit)

 			return $string;

 

 		// is $break present between $limit and the end of the string?

-		if(false !== ($breakpoint = strpos($string, $break, $limit)))

+		if (false !== ($breakpoint = strpos ($string, $break, $limit)))

 		{

-			if($breakpoint < strlen($string) - 1)

+			if ($breakpoint < strlen ($string) - 1)

 			{

-				$string = substr($string, 0, $breakpoint) . $pad;

+				$string = substr ($string, 0, $breakpoint).$pad;

 			}

 		}

 

@@ -613,18 +613,18 @@ 
 	 * @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)

 	{

 		$category = 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));

 

 		// Make sure we don't have a collision with a Category

 		if ($count == 0)

 		{

 			$category = true;

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

+			$count = Categories::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)

@@ -633,19 +633,19 @@ 
 		{

 			// Ensures we don't have a collision on category

 			if ($category)

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

+			$data = $this->findByPk ($this->id);

 

 			// Check the pulled data id to the current item

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

 				return $slug;

 		}

 

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

-			return $slug . $id;

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

 	}

 }

protected/models/ContentMetadata.php

Indentation +71 added lines, -71 removed lines

@@ -16,82 +16,82 @@
  */

 class ContentMetadata extends CiiModel

 {

-	/**

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

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

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

-	}

+    /**

+     * @return string the associated database table name

+     */

+    public function tableName()

+    {

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

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

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

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

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

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

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

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

+            array('id, content_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(

-			'content' => array(self::BELONGS_TO, 'Content', 'content_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(

+            'content' => array(self::BELONGS_TO, 'Content', 'content_id'),

+        );

+    }

 

-	/**

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

-	 */

-	public function attributeLabels()

-	{

-		return array(

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

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

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

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

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

-		);

-	}

+    /**

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

+     */

+    public function attributeLabels()

+    {

+        return array(

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

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

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

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

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

+        );

+    }

 

-	/**

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

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

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

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

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

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

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

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

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

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

 

-		return new CActiveDataProvider($this, array(

-			'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 ContentMetadata the static model class

 	 */

-	public static function model($className=__CLASS__)

+	public static function model ($className = __CLASS__)

 	{

-		return parent::model($className);

+		return parent::model ($className);

 	}

 

 	/**

 	 * @return string the associated database table name

 	 */

-	public function tableName()

+	public function tableName ()

 	{

 		return 'content_metadata';

 	}

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

 	 * @return array validation rules for model attributes.

 	 */

-	public function rules()

+	public function rules ()

 	{

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

 		// will receive user inputs.

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

 	 * @return array relational rules.

 	 */

-	public function relations()

+	public function relations ()

 	{

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

 		// class name for the relations automatically generated below.

@@ -65,14 +65,14 @@ 
 	/**

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

 	 */

-	public function attributeLabels()

+	public function attributeLabels ()

 	{

 		return array(

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

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

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

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

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

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

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

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

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

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

 		);

 	}

 

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

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

 	 */

-	public function search()

+	public function search ()

 	{

-		$criteria=new CDbCriteria;

+		$criteria = new CDbCriteria;

 

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

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

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

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

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

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

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

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

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

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

 

-		return new CActiveDataProvider($this, array(

+		return new CActiveDataProvider ($this, array(

 			'criteria'=>$criteria,

 		));

 	}

Braces +14 added lines, -14 removed lines

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

  * @property Content $content

  */

-class ContentMetadata extends CiiModel

-{

+class ContentMetadata extends CiiModel
+{
 	/**

 	 * Returns the static model of the specified AR class.

 	 * @param string $className active record class name.

 	 * @return ContentMetadata the static model class

 	 */

-	public static function model($className=__CLASS__)

-	{

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

 	}

 

 	/**

 	 * @return string the associated database table name

 	 */

-	public function tableName()

-	{

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

 	}

 

 	/**

 	 * @return array validation rules for model attributes.

 	 */

-	public function rules()

-	{

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

 		// will receive user inputs.

 		return array(

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

 	 * @return array relational rules.

 	 */

-	public function relations()

-	{

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

 		// class name for the relations automatically generated below.

 		return array(

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

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

 	 */

-	public function attributeLabels()

-	{

+	public function attributeLabels()
+	{
 		return array(

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

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

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