charlesportwoodii / CiiMS

protected/commands/CiiCacheCommand.php

Braces +4 added lines, -4 removed lines

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

 

 Yii::import('cii.commands.CiiConsoleCommand');

-class CiiCacheCommand extends CiiConsoleCommand

-{

-    public function actionFlush()

-    {

+class CiiCacheCommand extends CiiConsoleCommand
+{
+    public function actionFlush()
+    {
         $this->log(Yii::app()->cache->flush() ? "Cache flushed" : "Unable to flush cache. Are we connected?");

         unlink(__DIR__.DS.'..'.DS.'runtime'.DS.'modules.config.php');

         return;

protected/commands/CiiClassMapCommand.php

Braces +11 added lines, -10 removed lines

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

 

 Yii::import('cii.commands.CiiConsoleCommand');

-class CiiClassMapCommand extends CiiConsoleCommand

-{

-    public function actionIndex()

-    {

+class CiiClassMapCommand extends CiiConsoleCommand
+{
+    public function actionIndex()
+    {
         $data = "<?php\n";

         $data .= '$basePath = dirname(__FILE__) . \'/..\';' . "\n";

         $data .= 'Yii::$classMap = ' . "array(\n";

@@ -21,16 +21,17 @@ 
         return;

     }

 

-    private function updateDataPath($path, &$data)

-    {

+    private function updateDataPath($path, &$data)
+    {
         $objects = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path), RecursiveIteratorIterator::SELF_FIRST);

         foreach($objects as $name => $object)

         {

             if (strpos($name, '.php') !== false && strpos($name, 'gii') === false)

             {

                 $id = str_replace('.php', '', substr( $name, strrpos( $name, '/' )+1 ));

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

-                    $data .=  "    '" . $id . "' => " . '$basePath . \'' . str_replace('/var/www/ciims/protected', '', $name) . "',\n";

+                if ($this->startsWithUpper($id)) {
+                                    $data .=  "    '" . $id . "' => " . '$basePath . \'' . str_replace('/var/www/ciims/protected', '', $name) . "',\n";
+                }
             }

         }

 

@@ -40,8 +41,8 @@ 
     /**

      * @param string $str

      */

-    private function startsWithUpper($str)

-    {

+    private function startsWithUpper($str)
+    {
         $chr = mb_substr ($str, 0, 1, "UTF-8");

         return mb_strtolower($chr, "UTF-8") != $chr;

     }

protected/commands/CiiMessageCommand.php

Braces +70 added lines, -54 removed lines

@@ -72,8 +72,9 @@ 
 	 */
 	public function actionThemes($name=NULL)
 	{
-		if ($name === NULL)
-			$this->usageError('A theme was not specified for translations');
+		if ($name === NULL) {
+					$this->usageError('A theme was not specified for translations');
+		}
 
 		$this->_config['type'] = 'theme';
 		array_push($this->_config['exclude'], 'modules');
@@ -88,8 +89,9 @@ 
 	 */
 	public function actionModules($name=NULL)
 	{
-		if ($name === NULL)
-			$this->usageError('A module was not specified for translations');
+		if ($name === NULL) {
+					$this->usageError('A module was not specified for translations');
+		}
 
 		$this->_config['type'] = 'module';
 		array_push($this->_config['exclude'], 'themes');
@@ -119,8 +121,9 @@ 
 		$this->validateConfig();
 
 		// Determine the messages
-		foreach($this->getFiles() as $file)
-			$this->_messages = array_merge_recursive($this->_messages,$this->extractMessages($file,$this->_translator));
+		foreach($this->getFiles() as $file) {
+					$this->_messages = array_merge_recursive($this->_messages,$this->extractMessages($file,$this->_translator));
+		}
 
 		foreach($languages as $language)
 		{
@@ -139,19 +142,19 @@ 
 					$data = explode('.', $category);
 					unset($data[0]);
 					$dirPath = implode(DS, $data);
-				}
-				else if ($this->_config['type'] == 'module')
+				} else if ($this->_config['type'] == 'module')
 				{
 					$data = explode('.', $category);
 					unset($data[0]);
 					unset($data[1]);
 					$dirPath = implode(DS, $data);
+				} else {
+									$dirPath = implode(DS, explode('.', $category));
 				}
-				else
-					$dirPath = implode(DS, explode('.', $category));
 
-				if (empty($dirPath))
-					continue;
+				if (empty($dirPath)) {
+									continue;
+				}
 
 				$this->createDirectory($dir . DS . $dirPath);
 				$this->createDirectory($dir . DS . $language);
@@ -170,8 +173,9 @@ 
 	{
 		if (!is_dir($directory)) 
 		{
-			if (!mkdir($directory, 0777, true))
-				$this->usageError('The directory ' . $directory .' could not be created. Please make sure this process has write access to this directory.');
+			if (!mkdir($directory, 0777, true)) {
+							$this->usageError('The directory ' . $directory .' could not be created. Please make sure this process has write access to this directory.');
+			}
 		}
 
 		return true;
@@ -192,8 +196,9 @@ 
 		// Strip out all extensions
 		foreach ($files as $k=>$file)
 		{
-			if (strpos($file, 'extensions') !== false)
-				unset($files[$k]);
+			if (strpos($file, 'extensions') !== false) {
+							unset($files[$k]);
+			}
 		}
 
 		reset($files);
@@ -208,17 +213,21 @@ 
 	{
 		extract($this->_config);
 
-		if(!isset($sourcePath,$messagePath,$languages))
-			$this->usageError('The configuration file must specify "sourcePath", "messagePath" and "languages".');
+		if(!isset($sourcePath,$messagePath,$languages)) {
+					$this->usageError('The configuration file must specify "sourcePath", "messagePath" and "languages".');
+		}
 
-		if(!is_dir($sourcePath))
-			$this->usageError("The source path $sourcePath is not a valid directory.");
+		if(!is_dir($sourcePath)) {
+					$this->usageError("The source path $sourcePath is not a valid directory.");
+		}
 
-		if(!is_dir($messagePath))
-			$this->usageError("The message path $messagePath is not a valid directory.");
+		if(!is_dir($messagePath)) {
+					$this->usageError("The message path $messagePath is not a valid directory.");
+		}
 
-		if(empty($languages))
-			$this->usageError("Languages cannot be empty.");
+		if(empty($languages)) {
+					$this->usageError("Languages cannot be empty.");
+		}
 	}
 
 	/**
@@ -228,8 +237,9 @@ 
 	{
 		$subject=file_get_contents($fileName);
 		$messages=array();
-		if(!is_array($translator))
-			$translator=array($translator);
+		if(!is_array($translator)) {
+					$translator=array($translator);
+		}
 
 		foreach ($translator as $currentTranslator)
 		{
@@ -239,15 +249,16 @@ 
 			{
 				if(($pos=strpos($matches[$i][1],'.'))!==false)
 				{
-					if (strpos($matches[$i][1],'Dashboard')!==false || strpos($matches[$i][1],'Hybridauth')!==false || strpos($matches[$i][1],'Install')!==false)
-						$category='module.'.substr($matches[$i][1],1,-1);
-					else if (strpos($matches[$i][1],'Theme')!==false)
-						$category=$matches[$i][1];
-					else
-						$category=substr($matches[$i][1],$pos+1,-1);
+					if (strpos($matches[$i][1],'Dashboard')!==false || strpos($matches[$i][1],'Hybridauth')!==false || strpos($matches[$i][1],'Install')!==false) {
+											$category='module.'.substr($matches[$i][1],1,-1);
+					} else if (strpos($matches[$i][1],'Theme')!==false) {
+											$category=$matches[$i][1];
+					} else {
+											$category=substr($matches[$i][1],$pos+1,-1);
+					}
+				} else {
+									$category=substr($matches[$i][1],1,-1);
 				}
-				else
-					$category=substr($matches[$i][1],1,-1);
 
 
 				$message=$matches[$i][2];
@@ -287,18 +298,20 @@ 
 
 			foreach($messages as $message)
 			{
-				if(array_key_exists($message,$translated) && strlen($translated[$message])>0)
-					$merged[$message]=$translated[$message];
-				else
-					$untranslated[]=$message;
+				if(array_key_exists($message,$translated) && strlen($translated[$message])>0) {
+									$merged[$message]=$translated[$message];
+				} else {
+									$untranslated[]=$message;
+				}
 			}
 
 			ksort($merged);
 			sort($untranslated);
 			$todo=array();
 
-			foreach($untranslated as $message)
-				$todo[$message]='';
+			foreach($untranslated as $message) {
+							$todo[$message]='';
+			}
 
 			ksort($translated);
 
@@ -306,30 +319,33 @@ 
 			{
 				if(!isset($merged[$message]) && !isset($todo[$message]) && !$removeOld)
 				{
-					if(substr($translation,0,2)==='@@' && substr($translation,-2)==='@@')
-						$todo[$message]=$translation;
-					else if ($translation == '')
-						$todo[$message] = '';
-					else
-						$todo[$message]='@@'.$translation.'@@';
+					if(substr($translation,0,2)==='@@' && substr($translation,-2)==='@@') {
+											$todo[$message]=$translation;
+					} else if ($translation == '') {
+											$todo[$message] = '';
+					} else {
+											$todo[$message]='@@'.$translation.'@@';
+					}
 				}
 			}
 
 			$merged=array_merge($todo,$merged);
 
-			if($sort)
-				ksort($merged);
+			if($sort) {
+							ksort($merged);
+			}
 
-			if($overwrite === false)
-				$fileName.='.merged';
+			if($overwrite === false) {
+							$fileName.='.merged';
+			}
 
 			echo "translation merged.\n";
-		}
-		else
+		} else
 		{
 			$merged=array();
-			foreach($messages as $message)
-				$merged[$message]='';
+			foreach($messages as $message) {
+							$merged[$message]='';
+			}
 
 			ksort($merged);
 			echo "saved.\n";

protected/config/main.default.php

Braces +5 added lines, -3 removed lines

@@ -18,12 +18,14 @@
 * @license    http://opensource.org/licenses/MIT  MIT LICENSE
 * @link       https://github.com/charlesportwoodii/CiiMS
 */
-$import = function($default=false) {
+$import = function($default=false)
+{
 
 	$modules = (require __DIR__ . DS . 'modules.php');
 
-	if ($default === true)
-		return $modules;
+	if ($default === true) {
+			return $modules;
+	}
 
 	$m = array(
 		'application.models.*',

protected/config/modules.php

Braces +7 added lines, -6 removed lines

@@ -5,9 +5,9 @@ 
 $cachedConfig = __DIR__.DS.'..'.DS.'runtime'.DS.'modules.config.php';
 
 // Attempt to load the cached file if it exists
-if (file_exists($cachedConfig))
+if (file_exists($cachedConfig)) {
 	return require($cachedConfig);
-else
+} else
 {
 	// Otherwise generate one, and return it
 	$response = array();
@@ -20,10 +20,11 @@ 
 		{
 			$path = $filename->getPathname();
 
-			if (file_exists($path.DS.'config'.DS.'main.php'))
-				$response[$filename->getFilename()] = require($path.DS.'config'.DS.'main.php');
-			else
-				array_push($response, $filename->getFilename());
+			if (file_exists($path.DS.'config'.DS.'main.php')) {
+							$response[$filename->getFilename()] = require($path.DS.'config'.DS.'main.php');
+			} else {
+							array_push($response, $filename->getFilename());
+			}
 		}
 	}
 

protected/controllers/CategoriesController.php

Braces +14 added lines, -12 removed lines

@@ -1,16 +1,17 @@ 
 <?php

 

-class CategoriesController extends CiiController

-{

+class CategoriesController extends CiiController
+{
 	/**

 	 * Base filter, allows logged in and non-logged in users to cache the page

 	 */

-	public function filters()

-	{

+	public function filters()
+	{
 		$id = Yii::app()->getRequest()->getQuery('id');

 

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

-			throw new CHttpException(400, Yii::t('ciims.controllers.Categories', 'Invalid routing'));

+		if ($id == NULL || $id === false) {
+					throw new CHttpException(400, Yii::t('ciims.controllers.Categories', 'Invalid routing'));
+		}
 

 		return CMap::mergeArray(parent::filters(), array(

 			array(

@@ -47,8 +48,8 @@ 
 	 * Shows all blog posts for a particular category_id

 	 * @param $id	- The content ID that we want to pull from the database

 	 **/

-	public function actionIndex($id=NULL)

-	{

+	public function actionIndex($id=NULL)
+	{
 		// Run a pre check of our data

 		$this->beforeCiiAction($id);

 

@@ -100,8 +101,8 @@ 
 	 * So that RSS Readers can access the website

 	 * @param  int $id

 	 */

-	public function actionRss($id=NULL)

-	{

+	public function actionRss($id=NULL)
+	{
 		Yii::app()->log->routes[0]->enabled = false;

 		ob_end_clean();

 		header('Content-type: text/xml; charset=utf-8');

@@ -112,8 +113,9 @@ 
 					->addCondition('type_id >= 2')

 					->addCondition('password = ""');

 

-		if ($id !== NULL)

-			$criteria->addCondition("category_id = " . $id);

+		if ($id !== NULL) {
+					$criteria->addCondition("category_id = " . $id);
+		}
 

 		$criteria->order = 'created DESC';

 		$data = Content::model()->findAll($criteria);

protected/controllers/ContentController.php

Braces +33 added lines, -30 removed lines

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

 

-class ContentController extends CiiController

-{

+class ContentController extends CiiController
+{
 	/**

 	 * Base filter, allows logged in and non-logged in users to cache the page

 	 */

-	public function filters()

-	{

+	public function filters()
+	{
 		$id = Yii::app()->getRequest()->getQuery('id');

 

 		if ($id != NULL)

@@ -47,8 +47,8 @@ 
 	 * This method is used by the 'accessControl' filter.

 	 * @return array access control rules

 	 */

-	public function accessRules()

-	{

+	public function accessRules()
+	{
 		return array(

 			array('allow',  // Allow all users to any section

 				'actions' => array('index', 'password', 'list'),

@@ -65,16 +65,17 @@ 
 	 * Requests come in, are verified, and then pulled from the database dynamically

 	 * @param $id	- The content ID that we want to pull from the database

 	 **/

-	public function actionIndex($id=NULL, $vid=NULL)

-	{

+	public function actionIndex($id=NULL, $vid=NULL)
+	{
 		// Set the ReturnURL to this page so that the user can be redirected back to here after login

 		Yii::app()->user->setReturnUrl($this->beforeCiiAction($id));

 

 		// Retrieve the data

 		$content = Content::model()->findByPk($id);

 

-		if ($content->status != 1 || !$content->isPublished())

-			throw new CHttpException(404, Yii::t('ciims.controllers.Content', 'The article you specified does not exist. If you bookmarked this page, please delete it.'));

+		if ($content->status != 1 || !$content->isPublished()) {
+					throw new CHttpException(404, Yii::t('ciims.controllers.Content', 'The article you specified does not exist. If you bookmarked this page, please delete it.'));
+		}
 

 		// Check for a password

 		if (!empty($content->password))

@@ -82,8 +83,9 @@ 
 			// Check SESSION to see if a password is set

 			$tmpPassword = Cii::get(Cii::get(Cii::get($_SESSION, 'password', array()), $id, array()), 'password', NULL);

 

-			if ($tmpPassword != $content->password)

-				$this->redirect(Yii::app()->createUrl('/content/password/' . $id));

+			if ($tmpPassword != $content->password) {
+							$this->redirect(Yii::app()->createUrl('/content/password/' . $id));
+			}
 		}

 

 		// Parse Metadata

@@ -106,19 +108,21 @@ 
 	 * Forces a password to be assigned before the user can proceed to the previous page

 	 * @param $id - ID of the content we want to investigate

 	 **/

-	public function actionPassword($id=NULL)

-	{

+	public function actionPassword($id=NULL)
+	{
 		$this->setPageTitle(Yii::t('ciims.controllers.Content', '{{app_name}} | {{label}}', array(

 			'{{app_name}}' => Cii::getConfig('name', Yii::app()->name),

 			'{{label}}'    => Yii::t('ciims.controllers.Content', 'Password Required')

 		)));

 

-		if ($id == NULL)

-			$this->redirect(Yii::app()->user->returnUrl);

+		if ($id == NULL) {
+					$this->redirect(Yii::app()->user->returnUrl);
+		}
 

 		// Set some default data

-		if (Cii::get(Cii::get($_SESSION, 'password', array()), $id, NULL) == NULL)

-			$_SESSION['password'][$id] = array('tries'=>0, 'expires' => time() + 300);

+		if (Cii::get(Cii::get($_SESSION, 'password', array()), $id, NULL) == NULL) {
+					$_SESSION['password'][$id] = array('tries'=>0, 'expires' => time() + 300);
+		}
 

 		// If the number of attempts is >= 3

 		if (Cii::get(Cii::get(Cii::get($_SESSION, 'password', array()), $id, array()), 'tries', 0) >= 3)

@@ -127,8 +131,7 @@ 
 			if (Cii::get(Cii::get(Cii::get($_SESSION, 'password', array()), $id, array()), 'expires', 0) <= time())

 			{

 				$_SESSION['password'][$id] = array('tries'=>0, 'expires' => time() + 300);

-			}

-			else

+			} else

 			{

 				// Otherwise prevent access to it

 				Yii::app()->user->setFlash('error', Yii::t('ciims.controllers.Content', 'Too many password attempts. Please try again in 5 minutes'));

@@ -148,8 +151,7 @@ 
 				$_SESSION['password'][$id]['password'] = $encrypted;

 				$_SESSION['password'][$id]['tries'] = 0;

 				$this->redirect(Yii::app()->createUrl($content->attributes['slug']));

-			}

-			else

+			} else

 			{

 				Yii::app()->user->setFlash('error', Yii::t('ciims.controllers.Content', 'Incorrect password'));

 				$_SESSION['password'][$id]['tries'] 	= $_SESSION['password'][$id]['tries'] + 1;

@@ -168,8 +170,8 @@ 
 	 * Displays a listing of all blog posts for all time in all categories

 	 * Is used as a generic catch all behavior

 	 */

-	public function actionList()

-	{

+	public function actionList()
+	{
 		$this->setPageTitle(Yii::t('ciims.controllers.Content', '{{app_name}} | {{label}}', array(

 			'{{app_name}}' => Cii::getConfig('name', Yii::app()->name),

 			'{{label}}'    => Yii::t('ciims.controllers.Content', 'All Content')

@@ -206,8 +208,8 @@ 
 	/**

 	 * No routing action

 	 */

-	public function actionNR()

-	{

+	public function actionNR()
+	{
         $themeName = Cii::getConfig('theme', 'default');

         if (file_exists(Yii::getPathOfAlias('webroot.themes.') . DS . $themeName .  DS . 'Theme.php'))

         {

@@ -215,9 +217,10 @@ 
             $theme = new Theme;

         }

 

-		if ($theme->noRouting !== false)

-			$this->render('index');

-		else

-			throw new CHttpException(404);

+		if ($theme->noRouting !== false) {
+					$this->render('index');
+		} else {
+					throw new CHttpException(404);
+		}
 	}

 }

protected/controllers/ProfileController.php

Braces +21 added lines, -16 removed lines

@@ -47,24 +47,27 @@ 
 	public function actionIndex($id=NULL, $username=NULL)
 	{
 		// If an ID isn't provided, throw an error
-		if ($id === NULL)
-			throw new CHttpException(404, Yii::t('ciims.controllers.Profile', "Oops! That user doesn't exist on our network!"));
+		if ($id === NULL) {
+					throw new CHttpException(404, Yii::t('ciims.controllers.Profile', "Oops! That user doesn't exist on our network!"));
+		}
 
 		// For SEO, if the display name isn't in the url, reroute it
 		if ($id !== NULL && $username === NULL)
 		{
 			$model = Users::model()->findByPk($id);
-			if ($model === NULL || $model->status == 0)
-				throw new CHttpException(404, Yii::t('ciims.controllers.Profile', "Oops! That user doesn't exist on our network!"));
-			else
-				$this->redirect('/profile/' . $model->id . '/' . preg_replace('/[^\da-z]/i', '', $model->username));
+			if ($model === NULL || $model->status == 0) {
+							throw new CHttpException(404, Yii::t('ciims.controllers.Profile', "Oops! That user doesn't exist on our network!"));
+			} else {
+							$this->redirect('/profile/' . $model->id . '/' . preg_replace('/[^\da-z]/i', '', $model->username));
+			}
 		}
 
 		$model = Users::model()->findByPk($id);
 
 		// Don't allow null signings or invalidated users to pollute our site
-		if($model->status == 0)
-			throw new CHttpException(404, Yii::t('ciims.controllers.Profile', "Oops! That user doesn't exist on our network!"));
+		if($model->status == 0) {
+					throw new CHttpException(404, Yii::t('ciims.controllers.Profile', "Oops! That user doesn't exist on our network!"));
+		}
 
 		$this->pageTitle = Yii::t('ciims.controllers.Profile', 'User {{user}} - CiiMS | {{sitename}}', array('{{user}}' => $model->name, '{{sitename}}' => Cii::getConfig('name', Yii::app()->name)));
 		$this->render('index', array(
@@ -93,9 +96,9 @@ 
 					'id' => $model->id,
 					'username' => $model->username
 				)));
+			} else {
+							Yii::app()->user->setFlash('error', Yii::t('ciims.controllers.Profile', 'There were errors saving your profile. Please correct them before trying to save again.'));
 			}
-			else
-				Yii::app()->user->setFlash('error', Yii::t('ciims.controllers.Profile', 'There were errors saving your profile. Please correct them before trying to save again.'));
 		}
 
 		$this->render('edit', array(
@@ -113,15 +116,17 @@ 
 
 		// If we don't have one on file, then someone the user got to a page they shouldn't have gotten to
 		// Seamlessly redirect them back
-		if ($model->getNewEmail() == NULL)
-			$this->redirect(Yii::app()->user->returnUrl);
+		if ($model->getNewEmail() == NULL) {
+					$this->redirect(Yii::app()->user->returnUrl);
+		}
 
-		if ($model->sendVerificationEmail())
-			Yii::app()->user->setFlash('success', Yii::t('ciims.controllers.Profile', 'A new verification email has been resent to {{user}}. Please check your email address.', array(
+		if ($model->sendVerificationEmail()) {
+					Yii::app()->user->setFlash('success', Yii::t('ciims.controllers.Profile', 'A new verification email has been resent to {{user}}. Please check your email address.', array(
 				'{{user}}' => $model->getNewEmail()
 			)));
-		else
-			Yii::app()->user->setFlash('error', Yii::t('ciims.controllers.Profile', 'There was an error resending the verification email. Please try again later.'));
+		} else {
+					Yii::app()->user->setFlash('error', Yii::t('ciims.controllers.Profile', 'There was an error resending the verification email. Please try again later.'));
+		}
 
 		$this->redirect($this->createUrl('profile/edit'));
 	}

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;