charlesportwoodii / CiiMS

protected/commands/CiiCacheCommand.php

Spacing +4 added lines, -4 removed lines

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

 

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

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

 class CiiCacheCommand extends CiiConsoleCommand

 {

-    public function actionFlush()

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

+        $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

Spacing +18 added lines, -18 removed lines

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

 

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

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

 class CiiClassMapCommand extends CiiConsoleCommand

 {

-    public function actionIndex()

+    public function actionIndex ()

     {

         $data = "<?php\n";

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

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

 

-        $this->updateDataPath(Yii::getPathOfAlias('ext'), $data);

-        $this->updateDataPath( Yii::getPathOfAlias('application.models'), $data);

-        $this->updateDataPath(Yii::getPathOfAlias('application.controllers'), $data);

+        $this->updateDataPath (Yii::getPathOfAlias ('ext'), $data);

+        $this->updateDataPath (Yii::getPathOfAlias ('application.models'), $data);

+        $this->updateDataPath (Yii::getPathOfAlias ('application.controllers'), $data);

 

-        $data .=  ");\n";

+        $data .= ");\n";

 

-        $handle = fopen(Yii::getPathOfAlias('application.config') . DIRECTORY_SEPARATOR . 'classmap.php', 'w+');

-        fwrite($handle, $data);

-        fclose($handle);

+        $handle = fopen (Yii::getPathOfAlias ('application.config') . DIRECTORY_SEPARATOR . 'classmap.php', 'w+');

+        fwrite ($handle, $data);

+        fclose ($handle);

         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)

+        $objects = new RecursiveIteratorIterator (new RecursiveDirectoryIterator ($path), RecursiveIteratorIterator::SELF_FIRST);

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

         {

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

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

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

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

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

             }

         }

 

@@ -40,10 +40,10 @@ 
     /**

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

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

     }

 }

 

protected/commands/CiiMessageCommand.php

Spacing +112 added lines, -112 removed lines

@@ -2,7 +2,7 @@ 
 /**
  * This is an alternative implementation of the MessageCommand class, designed to work with CiiMS' modules and themes
  */
-Yii::import('cii.commands.CiiConsoleCommand');
+Yii::import ('cii.commands.CiiConsoleCommand');
 class CiiMessageCommand extends CiiConsoleCommand
 {
 
@@ -28,12 +28,12 @@ 
 	 * Default args
 	 * @return array
 	 */
-	private function getArgs()
+	private function getArgs ()
 	{
 		return array(
 			'type'			=> 'core',
-			'sourcePath'	=> Yii::getPathOfAlias('application').DS,
-			'messagePath'	=> Yii::getPathOfAlias('application.messages').DS,
+			'sourcePath'	=> Yii::getPathOfAlias ('application') . DS,
+			'messagePath'	=> Yii::getPathOfAlias ('application.messages') . DS,
 			'languages'		=> array('en_us'),
 			'fileTypes'		=> array('php'),
 			'overwrite'		=> true,
@@ -61,102 +61,102 @@ 
 	/**
 	 * Init method
 	 */
-	public function init()
+	public function init ()
 	{
-		$this->_config = $this->getArgs();
+		$this->_config = $this->getArgs ();
 	}
 
 	/**
  	 * Generates translation files for a given mtheme
 	 * @param string $name 	The name of the theme to generate translations for
 	 */
-	public function actionThemes($name=NULL)
+	public function actionThemes ($name = NULL)
 	{
 		if ($name === NULL)
-			$this->usageError('A theme was not specified for translations');
+			$this->usageError ('A theme was not specified for translations');
 
 		$this->_config['type'] = 'theme';
-		array_push($this->_config['exclude'], 'modules');
-		$this->_config['sourcePath'] .= '..'.DS.'themes' . DS . $name . DS;
-		$this->_config['messagePath'] = $this->_config['sourcePath'].'messages';
-		$this->execute();
+		array_push ($this->_config['exclude'], 'modules');
+		$this->_config['sourcePath'] .= '..' . DS . 'themes' . DS . $name . DS;
+		$this->_config['messagePath'] = $this->_config['sourcePath'] . 'messages';
+		$this->execute ();
 	}
 
 	/**
  	 * Generates translation files for a given module
 	 * @param string $name 	The name of the module to generate translations for
 	 */
-	public function actionModules($name=NULL)
+	public function actionModules ($name = NULL)
 	{
 		if ($name === NULL)
-			$this->usageError('A module was not specified for translations');
+			$this->usageError ('A module was not specified for translations');
 
 		$this->_config['type'] = 'module';
-		array_push($this->_config['exclude'], 'themes');
+		array_push ($this->_config['exclude'], 'themes');
 		unset($this->_config['exclude']['modules']);
-		$this->_config['sourcePath'] = Yii::getPathOfAlias('application.modules') . DS . $name . DS;
-		$this->_config['messagePath'] = $this->_config['sourcePath'].'messages';
-		$this->execute($this->_config);
+		$this->_config['sourcePath'] = Yii::getPathOfAlias ('application.modules') . DS . $name . DS;
+		$this->_config['messagePath'] = $this->_config['sourcePath'] . 'messages';
+		$this->execute ($this->_config);
 	}
 
 	/**
  	 * Defualt action
 	 */
-	public function actionIndex()
+	public function actionIndex ()
 	{
-		array_push($this->_config['exclude'], 'modules');
-		array_push($this->_config['exclude'], 'themes');
-		return $this->execute();
+		array_push ($this->_config['exclude'], 'modules');
+		array_push ($this->_config['exclude'], 'themes');
+		return $this->execute ();
 	}
 
 	/**
 	 * Execute the action.
 	 */
-	private function execute()
+	private function execute ()
 	{
 		// Validate the configuration
-		extract($this->_config);
-		$this->validateConfig();
+		extract ($this->_config);
+		$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)
+		foreach ($languages as $language)
 		{
-			$dir = $messagePath.DS.$language;
+			$dir = $messagePath . DS . $language;
 
-			$this->createDirectory($dir);
+			$this->createDirectory ($dir);
 
 			foreach ($this->_messages as $category=>$msgs)
 			{
-				$msgs = array_values(array_unique($msgs));
+				$msgs = array_values (array_unique ($msgs));
 
-				$dir = $this->_config['messagePath'].DS.$language;
+				$dir = $this->_config['messagePath'] . DS . $language;
 
-				if ($this->_config['type']  == 'theme')
+				if ($this->_config['type'] == 'theme')
 				{
-					$data = explode('.', $category);
+					$data = explode ('.', $category);
 					unset($data[0]);
-					$dirPath = implode(DS, $data);
+					$dirPath = implode (DS, $data);
 				}
 				else if ($this->_config['type'] == 'module')
 				{
-					$data = explode('.', $category);
+					$data = explode ('.', $category);
 					unset($data[0]);
 					unset($data[1]);
-					$dirPath = implode(DS, $data);
+					$dirPath = implode (DS, $data);
 				}
 				else
-					$dirPath = implode(DS, explode('.', $category));
+					$dirPath = implode (DS, explode ('.', $category));
 
 				if (empty($dirPath))
 					continue;
 
-				$this->createDirectory($dir . DS . $dirPath);
-				$this->createDirectory($dir . DS . $language);
+				$this->createDirectory ($dir . DS . $dirPath);
+				$this->createDirectory ($dir . DS . $language);
 
-				$this->generateMessageFile($msgs,$dir.DS.$dirPath.'.php',$overwrite,$removeOld,$sort);
+				$this->generateMessageFile ($msgs, $dir . DS . $dirPath . '.php', $overwrite, $removeOld, $sort);
 			}
 		}
 	}
@@ -166,12 +166,12 @@ 
 	 * @param string $directory
 	 * @return boolean
 	 */
-	private function createDirectory($directory)
+	private function createDirectory ($directory)
 	{
-		if (!is_dir($directory)) 
+		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;
@@ -181,10 +181,10 @@ 
 	 * Retrieves the files that should be translated
 	 * @return array $files
 	 */
-	private function getFiles()
+	private function getFiles ()
 	{
-		extract($this->_config);
-		$files = CFileHelper::findFiles(realpath($sourcePath),array(
+		extract ($this->_config);
+		$files = CFileHelper::findFiles (realpath ($sourcePath), array(
 					'fileTypes' => $fileTypes,
 					'exclude'	=> $exclude
 				 ));
@@ -192,11 +192,11 @@ 
 		// Strip out all extensions
 		foreach ($files as $k=>$file)
 		{
-			if (strpos($file, 'extensions') !== false)
+			if (strpos ($file, 'extensions') !== false)
 				unset($files[$k]);
 		}
 
-		reset($files);
+		reset ($files);
 
 		return $files;
 	}
@@ -204,58 +204,58 @@ 
 	/**
 	 * Does basic validation on the configuration options
 	 */
-	private function validateConfig()
+	private function validateConfig ()
 	{
-		extract($this->_config);
+		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.");
 	}
 
 	/**
 	 * @param string $translator
 	 */
-	protected function extractMessages($fileName,$translator)
+	protected function extractMessages ($fileName, $translator)
 	{
-		$subject=file_get_contents($fileName);
-		$messages=array();
-		if(!is_array($translator))
-			$translator=array($translator);
+		$subject = file_get_contents ($fileName);
+		$messages = array();
+		if (!is_array ($translator))
+			$translator = array($translator);
 
 		foreach ($translator as $currentTranslator)
 		{
-			$n=preg_match_all('/\b'.$currentTranslator.'\s*\(\s*(\'[\w.\/]*?(?<!\.)\'|"[\w.]*?(?<!\.)")\s*,\s*(\'.*?(?<!\\\\)\'|".*?(?<!\\\\)")\s*[,\)]/s',$subject,$matches,PREG_SET_ORDER);
+			$n = preg_match_all ('/\b' . $currentTranslator . '\s*\(\s*(\'[\w.\/]*?(?<!\.)\'|"[\w.]*?(?<!\.)")\s*,\s*(\'.*?(?<!\\\\)\'|".*?(?<!\\\\)")\s*[,\)]/s', $subject, $matches, PREG_SET_ORDER);
 
-			for($i=0; $i<$n; ++$i)
+			for ($i = 0; $i < $n; ++$i)
 			{
-				if(($pos=strpos($matches[$i][1],'.'))!==false)
+				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];
+					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);
+						$category = substr ($matches[$i][1], $pos + 1, -1);
 				}
 				else
-					$category=substr($matches[$i][1],1,-1);
+					$category = substr ($matches[$i][1], 1, -1);
 
 
-				$message=$matches[$i][2];
+				$message = $matches[$i][2];
 
-				$category = str_replace("'", '', $category);
+				$category = str_replace ("'", '', $category);
 
 				// This is how Yii does it
-				$messages[$category][]=eval("return $message;");  // use eval to eliminate quote escape
+				$messages[$category][] = eval("return $message;"); // use eval to eliminate quote escape
 			}
 		}
 
@@ -268,74 +268,74 @@ 
 	 * @param boolean $removeOld
 	 * @param boolean $sort
 	 */
-	protected function generateMessageFile($messages,$fileName,$overwrite,$removeOld,$sort)
+	protected function generateMessageFile ($messages, $fileName, $overwrite, $removeOld, $sort)
 	{
 		echo "Saving messages to $fileName...";
-		if(is_file($fileName))
+		if (is_file ($fileName))
 		{
-			$translated=require($fileName);
-			sort($messages);
-			ksort($translated);
-			if(array_keys($translated)==$messages)
+			$translated = require($fileName);
+			sort ($messages);
+			ksort ($translated);
+			if (array_keys ($translated) == $messages)
 			{
 				echo "nothing new...skipped.\n";
 				return;
 			}
 
-			$merged=array();
-			$untranslated=array();
+			$merged = array();
+			$untranslated = array();
 
-			foreach($messages as $message)
+			foreach ($messages as $message)
 			{
-				if(array_key_exists($message,$translated) && strlen($translated[$message])>0)
-					$merged[$message]=$translated[$message];
+				if (array_key_exists ($message, $translated) && strlen ($translated[$message]) > 0)
+					$merged[$message] = $translated[$message];
 				else
-					$untranslated[]=$message;
+					$untranslated[] = $message;
 			}
 
-			ksort($merged);
-			sort($untranslated);
-			$todo=array();
+			ksort ($merged);
+			sort ($untranslated);
+			$todo = array();
 
-			foreach($untranslated as $message)
-				$todo[$message]='';
+			foreach ($untranslated as $message)
+				$todo[$message] = '';
 
-			ksort($translated);
+			ksort ($translated);
 
-			foreach($translated as $message=>$translation)
+			foreach ($translated as $message=>$translation)
 			{
-				if(!isset($merged[$message]) && !isset($todo[$message]) && !$removeOld)
+				if (!isset($merged[$message]) && !isset($todo[$message]) && !$removeOld)
 				{
-					if(substr($translation,0,2)==='@@' && substr($translation,-2)==='@@')
-						$todo[$message]=$translation;
+					if (substr ($translation, 0, 2) === '@@' && substr ($translation, -2) === '@@')
+						$todo[$message] = $translation;
 					else if ($translation == '')
 						$todo[$message] = '';
 					else
-						$todo[$message]='@@'.$translation.'@@';
+						$todo[$message] = '@@' . $translation . '@@';
 				}
 			}
 
-			$merged=array_merge($todo,$merged);
+			$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
 		{
-			$merged=array();
-			foreach($messages as $message)
-				$merged[$message]='';
+			$merged = array();
+			foreach ($messages as $message)
+				$merged[$message] = '';
 
-			ksort($merged);
+			ksort ($merged);
 			echo "saved.\n";
 		}
-		$array=str_replace("\r",'',var_export($merged,true));
-		$content=<<<EOD
+		$array = str_replace ("\r", '', var_export ($merged, true));
+		$content = <<<EOD
 <?php
 /**
  * Message translations.
@@ -357,6 +357,6 @@ 
 return $array;
 
 EOD;
-		file_put_contents($fileName, $content);
+		file_put_contents ($fileName, $content);
 	}
 }

protected/commands/CiiMigrateCommand.php

Spacing +4 added lines, -4 removed lines

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

protected/config/classmap.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-$basePath = dirname(__FILE__) . '/..';
+$basePath = dirname (__FILE__) . '/..';
 Yii::$classMap = array(
     'YiinfiniteScroller' => $basePath . '/extensions/yiinfinite-scroll/YiinfiniteScroller.php',
     'ContentMetadata' => $basePath . '/models/ContentMetadata.php',

protected/config/install.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php return array(
-	'basePath' => dirname(__FILE__).DIRECTORY_SEPARATOR.'..',
+	'basePath' => dirname (__FILE__) . DIRECTORY_SEPARATOR . '..',
 	'name' => 'CiiMS Installer',
 	'preload' => array(
 		'cii'

protected/config/main.default.php

Spacing +7 added lines, -7 removed lines

@@ -18,7 +18,7 @@ 
 * @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');
 
@@ -32,22 +32,22 @@ 
 	);
 
 	foreach ($modules as $k=>$v) {
-		$m[] = 'application.modules.'.$v.'.*';
+		$m[] = 'application.modules.' . $v . '.*';
 	}
 
 	return $m;
 };
 
 $ciimsCoreConfig = array(
-	'basePath' => __DIR__.DS.'..',
+	'basePath' => __DIR__ . DS . '..',
 	'name' => NULL,
 	'sourceLanguage' => 'en_US',
 	'preload' => array(
 		'cii',
 		'analytics'
 	),
-	'import' => $import(),
-	'modules' => $import(true),
+	'import' => $import (),
+	'modules' => $import (true),
 	'behaviors' => array(
 		'onBeginRequest' => array(
 			'class' => 'vendor.charlesportwoodii.yii-newrelic.behaviors.YiiNewRelicWebAppBehavior',
@@ -139,7 +139,7 @@ 
 );
 
 // CLI specific data
-if (php_sapi_name() == "cli")
+if (php_sapi_name () == "cli")
 {
 	$ciimsCoreConfig['behaviors'] = array(
 		'onBeginRequest' => array(
@@ -151,7 +151,7 @@ 
 	);
 }
 
-if (php_sapi_name() != "cli" && YII_DEBUG)
+if (php_sapi_name () != "cli" && YII_DEBUG)
 {
 	$ciimsCoreConfig['preload'][] = 'debug';
 	$ciimsCoreConfig['components']['debug'] = array(

protected/config/modules.php

Spacing +10 added lines, -10 removed lines

@@ -2,10 +2,10 @@ 
 
 // Set the scan directory
 $directory = __DIR__ . DS . '..' . DS . 'modules';
-$cachedConfig = __DIR__.DS.'..'.DS.'runtime'.DS.'modules.config.php';
+$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
 {
@@ -13,22 +13,22 @@ 
 	$response = array();
 
 	// Find all the modules currently installed, and preload them
-	foreach (new IteratorIterator(new DirectoryIterator($directory)) as $filename)
+	foreach (new IteratorIterator (new DirectoryIterator ($directory)) as $filename)
 	{
 		// Don't import dot files
-		if (!$filename->isDot() && strpos($filename->getFileName(), ".") === false)
+		if (!$filename->isDot () && strpos ($filename->getFileName (), ".") === false)
 		{
-			$path = $filename->getPathname();
+			$path = $filename->getPathname ();
 
-			if (file_exists($path.DS.'config'.DS.'main.php'))
-				$response[$filename->getFilename()] = require($path.DS.'config'.DS.'main.php');
+			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());
+				array_push ($response, $filename->getFilename ());
 		}
 	}
 
-	$encoded = serialize($response);
-	file_put_contents($cachedConfig, '<?php return unserialize(\''.$encoded.'\');');
+	$encoded = serialize ($response);
+	file_put_contents ($cachedConfig, '<?php return unserialize(\'' . $encoded . '\');');
 
 	// return the response
 	return $response;

protected/controllers/CategoriesController.php

Spacing +38 added lines, -38 removed lines

@@ -5,17 +5,17 @@ 
 	/**

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

+		$id = Yii::app ()->getRequest ()->getQuery ('id');

 

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

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

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

 

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

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

 			array(

 				'CHttpCacheFilter + index',

-				'cacheControl'=>Cii::get(Yii::app()->user->id) == NULL ? 'public' : 'private' .', no-cache, must-revalidate',

+				'cacheControl'=>Cii::get (Yii::app ()->user->id) == NULL ? 'public' : 'private' . ', no-cache, must-revalidate',

 				'etagSeed'=>$id

 			),

 			array(

@@ -47,51 +47,51 @@ 
 	 * 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);

+		$this->beforeCiiAction ($id);

 

 		// Retrieve the data

-		$category = Categories::model()->findByPk($id);

+		$category = Categories::model ()->findByPk ($id);

 

 		// Set the layout

-		$this->setLayout('default');

+		$this->setLayout ('default');

 

-		$this->setPageTitle(Yii::t('ciims.controllers.Categories', '{{app_name}} | {{label}}', array(

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

+		$this->setPageTitle (Yii::t ('ciims.controllers.Categories', '{{app_name}} | {{label}}', array(

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

 			'{{label}}'    => $category->name

 		)));

 

-		$pageSize = Cii::getConfig('categoryPaginationSize', 10);

+		$pageSize = Cii::getConfig ('categoryPaginationSize', 10);

 

-		$criteria = Content::model()

-					->getBaseCriteria()

-					->addCondition('type_id >= 2')

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

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

+		$criteria = Content::model ()

+					->getBaseCriteria ()

+					->addCondition ('type_id >= 2')

+					->addCondition ("category_id = " . $id)

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

 

 		$criteria->limit = $pageSize;

 		$criteria->order = 'created 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);

+		$criteria->offset = $criteria->limit * ($pages->getCurrentPage ());

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

 

-		$pages->applyLimit($criteria);

+		$pages->applyLimit ($criteria);

 

-		$this->render('index', array(

+		$this->render ('index', array(

 			'id'		=> $id,

 			'category' 	=> $category,

 			'data' 		=> $data,

 			'itemCount' => $itemCount,

 			'pages' 	=> $pages,

 			'meta' 		=> array(

-				'description' => $category->getDescription()

+				'description' => $category->getDescription ()

 		)));

 	}

 

@@ -100,25 +100,25 @@ 
 	 * 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');

-		$url = 'http://'.Yii::app()->request->serverName . Yii::app()->baseUrl;

-		$this->setLayout(null);

-		$criteria = Content::model()

-					->getBaseCriteria()

-					->addCondition('type_id >= 2')

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

+		Yii::app ()->log->routes[0]->enabled = false;

+		ob_end_clean ();

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

+		$url = 'http://' . Yii::app ()->request->serverName . Yii::app ()->baseUrl;

+		$this->setLayout (null);

+		$criteria = Content::model ()

+					->getBaseCriteria ()

+					->addCondition ('type_id >= 2')

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

 

 		if ($id !== NULL)

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

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

 

 		$criteria->order = 'created DESC';

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

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

 

-		$this->renderPartial('application.views.site/rss', array(

+		$this->renderPartial ('application.views.site/rss', array(

 			'data' 	=> $data, 

 			'url'	=> $url

 		));