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

Spacing +1 added lines, -1 removed lines

@@ -16,6 +16,6 @@
  *
  * NOTE, this file must be saved in UTF-8 encoding.
  */
-return array (
+return array(
   'Unable to save change key' => '',
 );

Indentation +1 added lines, -1 removed lines

@@ -17,5 +17,5 @@
  * NOTE, this file must be saved in UTF-8 encoding.
  */
 return array (
-  'Unable to save change key' => '',
+    'Unable to save change key' => '',
 );

protected/messages/en_us/controllers/Categories.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(
   'Invalid routing' => '',
   '{{app_name}} | {{label}}' => '',
 );

Indentation +2 added lines, -2 removed lines

@@ -17,6 +17,6 @@
  * NOTE, this file must be saved in UTF-8 encoding.
  */
 return array (
-  'Invalid routing' => '',
-  '{{app_name}} | {{label}}' => '',
+    'Invalid routing' => '',
+    '{{app_name}} | {{label}}' => '',
 );

protected/messages/en_us/controllers/Cii.php

Spacing +1 added lines, -1 removed lines

@@ -16,6 +16,6 @@
  *
  * NOTE, this file must be saved in UTF-8 encoding.
  */
-return array (
+return array(
   'This site is currently disabled. Please check back later.' => '',
 );

Indentation +1 added lines, -1 removed lines

@@ -17,5 +17,5 @@
  * NOTE, this file must be saved in UTF-8 encoding.
  */
 return array (
-  'This site is currently disabled. Please check back later.' => '',
+    'This site is currently disabled. Please check back later.' => '',
 );

protected/messages/en_us/controllers/Content.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(
   'All Content' => '',
   'Incorrect password' => '',
   'Password Required' => '',

Indentation +6 added lines, -6 removed lines

@@ -17,10 +17,10 @@
  * NOTE, this file must be saved in UTF-8 encoding.
  */
 return array (
-  'All Content' => '',
-  'Incorrect password' => '',
-  'Password Required' => '',
-  'The article you specified does not exist. If you bookmarked this page, please delete it.' => '',
-  'Too many password attempts. Please try again in 5 minutes' => '',
-  '{{app_name}} | {{label}}' => '',
+    'All Content' => '',
+    'Incorrect password' => '',
+    'Password Required' => '',
+    'The article you specified does not exist. If you bookmarked this page, please delete it.' => '',
+    'Too many password attempts. Please try again in 5 minutes' => '',
+    '{{app_name}} | {{label}}' => '',
 );

protected/messages/en_us/controllers/Profile.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(
   'A new verification email has been resent to {{user}}. Please check your email address.' => '',
   'Oops! That user doesn\'t exist on our network!' => '',
   'There was an error resending the verification email. Please try again later.' => '',

Indentation +6 added lines, -6 removed lines

@@ -17,10 +17,10 @@
  * NOTE, this file must be saved in UTF-8 encoding.
  */
 return array (
-  'A new verification email has been resent to {{user}}. Please check your email address.' => '',
-  'Oops! That user doesn\'t exist on our network!' => '',
-  'There was an error resending the verification email. Please try again later.' => '',
-  'There were errors saving your profile. Please correct them before trying to save again.' => '',
-  'User {{user}} - CiiMS | {{sitename}}' => '',
-  'Your profile has been updated!' => '',
+    'A new verification email has been resent to {{user}}. Please check your email address.' => '',
+    'Oops! That user doesn\'t exist on our network!' => '',
+    'There was an error resending the verification email. Please try again later.' => '',
+    'There were errors saving your profile. Please correct them before trying to save again.' => '',
+    'User {{user}} - CiiMS | {{sitename}}' => '',
+    'Your profile has been updated!' => '',
 );

protected/messages/en_us/controllers/Site.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(
   'A password reset link has been sent to your email address' => '',
   'Accept Invitation' => '',
   'Activate Your Account' => '',

Indentation +23 added lines, -23 removed lines

@@ -17,27 +17,27 @@
  * NOTE, this file must be saved in UTF-8 encoding.
  */
 return array (
-  'A password reset link has been sent to your email address' => '',
-  'Accept Invitation' => '',
-  'Activate Your Account' => '',
-  'An email has been sent to {{email}} with further instructions on how to reset your password' => '',
-  'Change Your Email Address' => '',
-  'Error' => '',
-  'Error {{code}}' => '',
-  'Forgot Your Password?' => '',
-  'Login to your account' => '',
-  'Reset Your password' => '',
-  'Search' => '',
-  'Sign Up' => '',
-  'The password reset key provided is invalid' => '',
-  'The verification key provided is invalid.' => '',
-  'There was an error fulfilling your request.' => '',
-  'Unable to re-authenticated user' => '',
-  'Unable to re-authenticated user.' => '',
-  'You have successfully registered an account. Before you can login, please check your email for activation instructions' => '',
-  'Your account has successfully been activated. You may now login' => '',
-  'Your new email address has been verified.' => '',
-  'Your password has been reset, and you may now login with your new password' => '',
-  '{{app_name}} | {{label}}' => '',
-  '{{app_name}} | {{label}} {{code}}' => '',
+    'A password reset link has been sent to your email address' => '',
+    'Accept Invitation' => '',
+    'Activate Your Account' => '',
+    'An email has been sent to {{email}} with further instructions on how to reset your password' => '',
+    'Change Your Email Address' => '',
+    'Error' => '',
+    'Error {{code}}' => '',
+    'Forgot Your Password?' => '',
+    'Login to your account' => '',
+    'Reset Your password' => '',
+    'Search' => '',
+    'Sign Up' => '',
+    'The password reset key provided is invalid' => '',
+    'The verification key provided is invalid.' => '',
+    'There was an error fulfilling your request.' => '',
+    'Unable to re-authenticated user' => '',
+    'Unable to re-authenticated user.' => '',
+    'You have successfully registered an account. Before you can login, please check your email for activation instructions' => '',
+    'Your account has successfully been activated. You may now login' => '',
+    'Your new email address has been verified.' => '',
+    'Your password has been reset, and you may now login with your new password' => '',
+    '{{app_name}} | {{label}}' => '',
+    '{{app_name}} | {{label}} {{code}}' => '',
 );

protected/messages/en_us/core.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(
   'The requested post cannot be found.' => '',
   'The specified post cannot be found.' => '',
   'Use of CiiController::sendEmail is deprecated, and will be dropped in a future version. Use EmailSettings::send instead' => '',

Indentation +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@
  * NOTE, this file must be saved in UTF-8 encoding.
  */
 return array (
-  'The requested post cannot be found.' => '',
-  'The specified post cannot be found.' => '',
-  'Use of CiiController::sendEmail is deprecated, and will be dropped in a future version. Use EmailSettings::send instead' => '',
+    'The requested post cannot be found.' => '',
+    'The specified post cannot be found.' => '',
+    'Use of CiiController::sendEmail is deprecated, and will be dropped in a future version. Use EmailSettings::send instead' => '',
 );

protected/messages/en_us/email.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(
   'Activate Your Account' => '',
   'Your Password Reset Information' => '',
 );

Indentation +2 added lines, -2 removed lines

@@ -17,6 +17,6 @@
  * NOTE, this file must be saved in UTF-8 encoding.
  */
 return array (
-  'Activate Your Account' => '',
-  'Your Password Reset Information' => '',
+    'Activate Your Account' => '',
+    'Your Password Reset Information' => '',
 );