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;

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

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;

     }

Spacing +20 added lines, -20 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";

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

Indentation +332 added lines, -332 removed lines

@@ -6,336 +6,336 @@ 
 class CiiMessageCommand extends CiiConsoleCommand
 {
 
-	/**
-	 * The configuration object
-	 * @var array _$config
-	 */
-	private $_config = array();
-
-	/**
-	 * The messages that should be translated
-	 * @var array $_messages
-	 */
-	private $_messages = array();
-
-	/**
-	 * The stirng that should be used for translations
-	 * @var string $_translator
-	 */
-	private $_translator = 'Yii::t';
-
-	/**
-	 * Default args
-	 * @return array
-	 */
-	private function getArgs()
-	{
-		return array(
-			'type'			=> 'core',
-			'sourcePath'	=> Yii::getPathOfAlias('application').DS,
-			'messagePath'	=> Yii::getPathOfAlias('application.messages').DS,
-			'languages'		=> array('en_us'),
-			'fileTypes'		=> array('php'),
-			'overwrite'		=> true,
-			'sort'			=> true,
-			'removeOld'		=> false,
-			'exclude'		=> array(
-				'assets',
-				'css',
-				'js',
-				'images',
-				'.svn',
-				'.gitignore',
-				'.git',
-				'yiilite.php',
-				'yiit.php',
-				'i18n/data',
-				'messages',
-				'vendor',
-				'tests',
-				'runtime'
-			)
-		);
-	}
-
-	/**
-	 * Init method
-	 */
-	public function init()
-	{
-		$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)
-	{
-		if ($name === NULL)
-			$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();
-	}
-
-	/**
- 	 * Generates translation files for a given module
-	 * @param string $name 	The name of the module to generate translations for
-	 */
-	public function actionModules($name=NULL)
-	{
-		if ($name === NULL)
-			$this->usageError('A module was not specified for translations');
-
-		$this->_config['type'] = 'module';
-		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);
-	}
-
-	/**
- 	 * Defualt action
-	 */
-	public function actionIndex()
-	{
-		array_push($this->_config['exclude'], 'modules');
-		array_push($this->_config['exclude'], 'themes');
-		return $this->execute();
-	}
-
-	/**
-	 * Execute the action.
-	 */
-	private function execute()
-	{
-		// Validate the configuration
-		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($languages as $language)
-		{
-			$dir = $messagePath.DS.$language;
-
-			$this->createDirectory($dir);
-
-			foreach ($this->_messages as $category=>$msgs)
-			{
-				$msgs = array_values(array_unique($msgs));
-
-				$dir = $this->_config['messagePath'].DS.$language;
-
-				if ($this->_config['type']  == 'theme')
-				{
-					$data = explode('.', $category);
-					unset($data[0]);
-					$dirPath = implode(DS, $data);
-				}
-				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));
-
-				if (empty($dirPath))
-					continue;
-
-				$this->createDirectory($dir . DS . $dirPath);
-				$this->createDirectory($dir . DS . $language);
-
-				$this->generateMessageFile($msgs,$dir.DS.$dirPath.'.php',$overwrite,$removeOld,$sort);
-			}
-		}
-	}
-
-	/**
-	 * Creates a directory at the given path
-	 * @param string $directory
-	 * @return boolean
-	 */
-	private function createDirectory($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.');
-		}
-
-		return true;
-	}
-
-	/**
-	 * Retrieves the files that should be translated
-	 * @return array $files
-	 */
-	private function getFiles()
-	{
-		extract($this->_config);
-		$files = CFileHelper::findFiles(realpath($sourcePath),array(
-					'fileTypes' => $fileTypes,
-					'exclude'	=> $exclude
-				 ));
-
-		// Strip out all extensions
-		foreach ($files as $k=>$file)
-		{
-			if (strpos($file, 'extensions') !== false)
-				unset($files[$k]);
-		}
-
-		reset($files);
-
-		return $files;
-	}
-
-	/**
-	 * Does basic validation on the configuration options
-	 */
-	private function validateConfig()
-	{
-		extract($this->_config);
-
-		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($messagePath))
-			$this->usageError("The message path $messagePath is not a valid directory.");
-
-		if(empty($languages))
-			$this->usageError("Languages cannot be empty.");
-	}
-
-	/**
-	 * @param string $translator
-	 */
-	protected function extractMessages($fileName,$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);
-
-			for($i=0; $i<$n; ++$i)
-			{
-				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);
-				}
-				else
-					$category=substr($matches[$i][1],1,-1);
-
-
-				$message=$matches[$i][2];
-
-				$category = str_replace("'", '', $category);
-
-				// This is how Yii does it
-				$messages[$category][]=eval("return $message;");  // use eval to eliminate quote escape
-			}
-		}
-
-		return $messages;
-	}
-
-	/**
-	 * @param string $fileName
-	 * @param boolean $overwrite
-	 * @param boolean $removeOld
-	 * @param boolean $sort
-	 */
-	protected function generateMessageFile($messages,$fileName,$overwrite,$removeOld,$sort)
-	{
-		echo "Saving messages to $fileName...";
-		if(is_file($fileName))
-		{
-			$translated=require($fileName);
-			sort($messages);
-			ksort($translated);
-			if(array_keys($translated)==$messages)
-			{
-				echo "nothing new...skipped.\n";
-				return;
-			}
-
-			$merged=array();
-			$untranslated=array();
-
-			foreach($messages as $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]='';
-
-			ksort($translated);
-
-			foreach($translated as $message=>$translation)
-			{
-				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.'@@';
-				}
-			}
-
-			$merged=array_merge($todo,$merged);
-
-			if($sort)
-				ksort($merged);
-
-			if($overwrite === false)
-				$fileName.='.merged';
-
-			echo "translation merged.\n";
-		}
-		else
-		{
-			$merged=array();
-			foreach($messages as $message)
-				$merged[$message]='';
-
-			ksort($merged);
-			echo "saved.\n";
-		}
-		$array=str_replace("\r",'',var_export($merged,true));
-		$content=<<<EOD
+    /**
+     * The configuration object
+     * @var array _$config
+     */
+    private $_config = array();
+
+    /**
+     * The messages that should be translated
+     * @var array $_messages
+     */
+    private $_messages = array();
+
+    /**
+     * The stirng that should be used for translations
+     * @var string $_translator
+     */
+    private $_translator = 'Yii::t';
+
+    /**
+     * Default args
+     * @return array
+     */
+    private function getArgs()
+    {
+        return array(
+            'type'			=> 'core',
+            'sourcePath'	=> Yii::getPathOfAlias('application').DS,
+            'messagePath'	=> Yii::getPathOfAlias('application.messages').DS,
+            'languages'		=> array('en_us'),
+            'fileTypes'		=> array('php'),
+            'overwrite'		=> true,
+            'sort'			=> true,
+            'removeOld'		=> false,
+            'exclude'		=> array(
+                'assets',
+                'css',
+                'js',
+                'images',
+                '.svn',
+                '.gitignore',
+                '.git',
+                'yiilite.php',
+                'yiit.php',
+                'i18n/data',
+                'messages',
+                'vendor',
+                'tests',
+                'runtime'
+            )
+        );
+    }
+
+    /**
+     * Init method
+     */
+    public function init()
+    {
+        $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)
+    {
+        if ($name === NULL)
+            $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();
+    }
+
+    /**
+     * Generates translation files for a given module
+     * @param string $name 	The name of the module to generate translations for
+     */
+    public function actionModules($name=NULL)
+    {
+        if ($name === NULL)
+            $this->usageError('A module was not specified for translations');
+
+        $this->_config['type'] = 'module';
+        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);
+    }
+
+    /**
+     * Defualt action
+     */
+    public function actionIndex()
+    {
+        array_push($this->_config['exclude'], 'modules');
+        array_push($this->_config['exclude'], 'themes');
+        return $this->execute();
+    }
+
+    /**
+     * Execute the action.
+     */
+    private function execute()
+    {
+        // Validate the configuration
+        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($languages as $language)
+        {
+            $dir = $messagePath.DS.$language;
+
+            $this->createDirectory($dir);
+
+            foreach ($this->_messages as $category=>$msgs)
+            {
+                $msgs = array_values(array_unique($msgs));
+
+                $dir = $this->_config['messagePath'].DS.$language;
+
+                if ($this->_config['type']  == 'theme')
+                {
+                    $data = explode('.', $category);
+                    unset($data[0]);
+                    $dirPath = implode(DS, $data);
+                }
+                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));
+
+                if (empty($dirPath))
+                    continue;
+
+                $this->createDirectory($dir . DS . $dirPath);
+                $this->createDirectory($dir . DS . $language);
+
+                $this->generateMessageFile($msgs,$dir.DS.$dirPath.'.php',$overwrite,$removeOld,$sort);
+            }
+        }
+    }
+
+    /**
+     * Creates a directory at the given path
+     * @param string $directory
+     * @return boolean
+     */
+    private function createDirectory($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.');
+        }
+
+        return true;
+    }
+
+    /**
+     * Retrieves the files that should be translated
+     * @return array $files
+     */
+    private function getFiles()
+    {
+        extract($this->_config);
+        $files = CFileHelper::findFiles(realpath($sourcePath),array(
+                    'fileTypes' => $fileTypes,
+                    'exclude'	=> $exclude
+                    ));
+
+        // Strip out all extensions
+        foreach ($files as $k=>$file)
+        {
+            if (strpos($file, 'extensions') !== false)
+                unset($files[$k]);
+        }
+
+        reset($files);
+
+        return $files;
+    }
+
+    /**
+     * Does basic validation on the configuration options
+     */
+    private function validateConfig()
+    {
+        extract($this->_config);
+
+        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($messagePath))
+            $this->usageError("The message path $messagePath is not a valid directory.");
+
+        if(empty($languages))
+            $this->usageError("Languages cannot be empty.");
+    }
+
+    /**
+     * @param string $translator
+     */
+    protected function extractMessages($fileName,$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);
+
+            for($i=0; $i<$n; ++$i)
+            {
+                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);
+                }
+                else
+                    $category=substr($matches[$i][1],1,-1);
+
+
+                $message=$matches[$i][2];
+
+                $category = str_replace("'", '', $category);
+
+                // This is how Yii does it
+                $messages[$category][]=eval("return $message;");  // use eval to eliminate quote escape
+            }
+        }
+
+        return $messages;
+    }
+
+    /**
+     * @param string $fileName
+     * @param boolean $overwrite
+     * @param boolean $removeOld
+     * @param boolean $sort
+     */
+    protected function generateMessageFile($messages,$fileName,$overwrite,$removeOld,$sort)
+    {
+        echo "Saving messages to $fileName...";
+        if(is_file($fileName))
+        {
+            $translated=require($fileName);
+            sort($messages);
+            ksort($translated);
+            if(array_keys($translated)==$messages)
+            {
+                echo "nothing new...skipped.\n";
+                return;
+            }
+
+            $merged=array();
+            $untranslated=array();
+
+            foreach($messages as $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]='';
+
+            ksort($translated);
+
+            foreach($translated as $message=>$translation)
+            {
+                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.'@@';
+                }
+            }
+
+            $merged=array_merge($todo,$merged);
+
+            if($sort)
+                ksort($merged);
+
+            if($overwrite === false)
+                $fileName.='.merged';
+
+            echo "translation merged.\n";
+        }
+        else
+        {
+            $merged=array();
+            foreach($messages as $message)
+                $merged[$message]='';
+
+            ksort($merged);
+            echo "saved.\n";
+        }
+        $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);
+    }
 }

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

Spacing +108 added lines, -108 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;
+		array_push ($this->_config['exclude'], 'modules');
+		$this->_config['sourcePath'] .= '..'.DS.'themes'.DS.$name.DS;
 		$this->_config['messagePath'] = $this->_config['sourcePath'].'messages';
-		$this->execute();
+		$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['sourcePath'] = Yii::getPathOfAlias ('application.modules').DS.$name.DS;
 		$this->_config['messagePath'] = $this->_config['sourcePath'].'messages';
-		$this->execute($this->_config);
+		$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;
 
-			$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;
 
-				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/install.php

Indentation +59 added lines, -59 removed lines

@@ -1,62 +1,62 @@
 <?php return array(
-	'basePath' => dirname(__FILE__).DIRECTORY_SEPARATOR.'..',
-	'name' => 'CiiMS Installer',
-	'preload' => array(
-		'cii'
-	),
-	'import' => array(
-		'application.components.*',
-		'application.modules.install.*'
-	),
-	'modules' => array(
-		'install'
-	),
-	'components' => array(
-		'cii' => array(
-			'class' => 'vendor.charlesportwoodii.cii.components.CiiBase'
-		),
-		'errorHandler' => array(
-			'errorAction' => '/install/default/error',
-		),
-		'session' => array(
-			'autoStart' => true,
-			'sessionName'   => 'CiiMS_Installer',
-			'cookieMode'    => 'only',
-		),
-		'cache' => array(
-			'class' => 'CFileCache'
-		),
-		'urlManager' => array(
-			'urlFormat' => 'path',
-			'showScriptName' => false,
-			'rules' => array(
-				'' => '/install/default/index',
-				'/migrate' => '/install/default/migrate',
-				'/runmigrations' => '/install/default/runmigrations',
-				'/createadmin' => '/install/default/createadmin',
-				'/admin' => '/install/default/admin'
-			),
-		),
-		'log' => array(
-			'class' => 'CLogRouter',
-			'routes' => array(
-				array(
-					'class' => 'CWebLogRoute',
-					'levels' => 'error, warning, trace, info',
-					'enabled' => true
-				),
-				array(
-					'class'=>'CProfileLogRoute',
-					'report'=>'summary',
-					'enabled' => true
-				)
-			)
-		),
-	),
-	'params' => array(
-		'stage' => 0,
-		'debug' => true,
-		'trace' => 3
-	),
+    'basePath' => dirname(__FILE__).DIRECTORY_SEPARATOR.'..',
+    'name' => 'CiiMS Installer',
+    'preload' => array(
+        'cii'
+    ),
+    'import' => array(
+        'application.components.*',
+        'application.modules.install.*'
+    ),
+    'modules' => array(
+        'install'
+    ),
+    'components' => array(
+        'cii' => array(
+            'class' => 'vendor.charlesportwoodii.cii.components.CiiBase'
+        ),
+        'errorHandler' => array(
+            'errorAction' => '/install/default/error',
+        ),
+        'session' => array(
+            'autoStart' => true,
+            'sessionName'   => 'CiiMS_Installer',
+            'cookieMode'    => 'only',
+        ),
+        'cache' => array(
+            'class' => 'CFileCache'
+        ),
+        'urlManager' => array(
+            'urlFormat' => 'path',
+            'showScriptName' => false,
+            'rules' => array(
+                '' => '/install/default/index',
+                '/migrate' => '/install/default/migrate',
+                '/runmigrations' => '/install/default/runmigrations',
+                '/createadmin' => '/install/default/createadmin',
+                '/admin' => '/install/default/admin'
+            ),
+        ),
+        'log' => array(
+            'class' => 'CLogRouter',
+            'routes' => array(
+                array(
+                    'class' => 'CWebLogRoute',
+                    'levels' => 'error, warning, trace, info',
+                    'enabled' => true
+                ),
+                array(
+                    'class'=>'CProfileLogRoute',
+                    'report'=>'summary',
+                    'enabled' => true
+                )
+            )
+        ),
+    ),
+    'params' => array(
+        'stage' => 0,
+        'debug' => true,
+        'trace' => 3
+    ),
 );
 

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

Indentation +123 added lines, -123 removed lines

@@ -20,145 +20,145 @@
 */
 $import = function($default=false) {
 
-	$modules = (require __DIR__ . DS . 'modules.php');
+    $modules = (require __DIR__ . DS . 'modules.php');
 
-	if ($default === true)
-		return $modules;
+    if ($default === true)
+        return $modules;
 
-	$m = array(
-		'application.models.*',
-		'application.models.forms.*',
-		'application.models.settings.*'
-	);
+    $m = array(
+        'application.models.*',
+        'application.models.forms.*',
+        'application.models.settings.*'
+    );
 
-	foreach ($modules as $k=>$v) {
-		$m[] = 'application.modules.'.$v.'.*';
-	}
+    foreach ($modules as $k=>$v) {
+        $m[] = 'application.modules.'.$v.'.*';
+    }
 
-	return $m;
+    return $m;
 };
 
 $ciimsCoreConfig = array(
-	'basePath' => __DIR__.DS.'..',
-	'name' => NULL,
-	'sourceLanguage' => 'en_US',
-	'preload' => array(
-		'cii',
-		'analytics'
-	),
-	'import' => $import(),
-	'modules' => $import(true),
-	'behaviors' => array(
-		'onBeginRequest' => array(
-			'class' => 'vendor.charlesportwoodii.yii-newrelic.behaviors.YiiNewRelicWebAppBehavior',
-		),
-	),
-	'components' => array(
-		'themeManager' => array(
-			'basePath' => (__DIR__ . DS . '..' . DS . '..' . DS . 'themes')
-		),
-		'messages' => array(
-			'class' => 'vendor.charlesportwoodii.cii.components.CiiPHPMessageSource'
-		),
-			'newRelic' => array(
-			'class' => 'vendor.charlesportwoodii.yii-newrelic.YiiNewRelic',
-			'setAppNameToYiiName' => false
-		),
-		'cii' => array(
-			'class' => 'vendor.charlesportwoodii.cii.components.CiiBase'
-		),
-		'analytics' => array(
-			'class' => 'vendor.charlesportwoodii.cii.components.CiiAnalytics',
-			'lowerBounceRate' => true,
-			'options' => array(),
-		),
-		'assetManager' => array(
-			'class' => 'vendor.charlesportwoodii.cii.components.CiiAssetManager',
-		),
-		'clientScript' => array(
-			'class' => 'vendor.charlesportwoodii.cii.components.CiiClientScript',
-		),
-		'errorHandler' => array(
-			'errorAction' => 'site/error',
-		),
-		'session' => array(
-			'autoStart'     => true,
-			'sessionName'   => '_ciims',
-			'cookieMode'    => 'only',
-			'cookieParams'  => array(
-				'httponly' => true,
-				'secure' => (
-					(!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') || 
-					(!empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == 443) || 
-					(!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https')
-				)
-			)
-		),
-		'urlManager' => array(
-			'class'          => 'vendor.charlesportwoodii.cii.components.CiiURLManager',
-			'urlFormat'      => 'path',
-			'showScriptName' => false
-		),
-		'user' => array(
-			'authTimeout'    		=> 900,
-			'absoluteAuthTimeout' 	=> 1900,
-			'autoRenewCookie' 		=> true
-		),
-		'db' => array(
-			'class'                 => 'CDbConnection',
-			'connectionString'      => NULL,
-			'emulatePrepare'        => true,
-			'username'              => NULL,
-			'password'              => NULL,
-			'charset'               => 'utf8',
-			'schemaCachingDuration' => 3600,
-			'enableProfiling'       => false,
-			'enableParamLogging'    => false
-		),
-		'log' => array(
-			'class' => 'CLogRouter',
-			'routes' => array(
-				array(
-					'class'=>'CFileLogRoute',
-					'levels'=>'error, warning',
-				)
-			)
-		),
-		'cache' => array(
-			'class' => 'CFileCache',
-		)
-	),
-	'params' => array(
-		'encryptionKey'       => NULL,
-		'debug'               => false,
-		'trace'               => 0,
-		'NewRelicAppName'     => null,
-		'max_fileupload_size' => (10 * 1024 * 1024),
-		'cards' => 'https://cards.ciims.io/1.0.0',
-	)
+    'basePath' => __DIR__.DS.'..',
+    'name' => NULL,
+    'sourceLanguage' => 'en_US',
+    'preload' => array(
+        'cii',
+        'analytics'
+    ),
+    'import' => $import(),
+    'modules' => $import(true),
+    'behaviors' => array(
+        'onBeginRequest' => array(
+            'class' => 'vendor.charlesportwoodii.yii-newrelic.behaviors.YiiNewRelicWebAppBehavior',
+        ),
+    ),
+    'components' => array(
+        'themeManager' => array(
+            'basePath' => (__DIR__ . DS . '..' . DS . '..' . DS . 'themes')
+        ),
+        'messages' => array(
+            'class' => 'vendor.charlesportwoodii.cii.components.CiiPHPMessageSource'
+        ),
+            'newRelic' => array(
+            'class' => 'vendor.charlesportwoodii.yii-newrelic.YiiNewRelic',
+            'setAppNameToYiiName' => false
+        ),
+        'cii' => array(
+            'class' => 'vendor.charlesportwoodii.cii.components.CiiBase'
+        ),
+        'analytics' => array(
+            'class' => 'vendor.charlesportwoodii.cii.components.CiiAnalytics',
+            'lowerBounceRate' => true,
+            'options' => array(),
+        ),
+        'assetManager' => array(
+            'class' => 'vendor.charlesportwoodii.cii.components.CiiAssetManager',
+        ),
+        'clientScript' => array(
+            'class' => 'vendor.charlesportwoodii.cii.components.CiiClientScript',
+        ),
+        'errorHandler' => array(
+            'errorAction' => 'site/error',
+        ),
+        'session' => array(
+            'autoStart'     => true,
+            'sessionName'   => '_ciims',
+            'cookieMode'    => 'only',
+            'cookieParams'  => array(
+                'httponly' => true,
+                'secure' => (
+                    (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') || 
+                    (!empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == 443) || 
+                    (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https')
+                )
+            )
+        ),
+        'urlManager' => array(
+            'class'          => 'vendor.charlesportwoodii.cii.components.CiiURLManager',
+            'urlFormat'      => 'path',
+            'showScriptName' => false
+        ),
+        'user' => array(
+            'authTimeout'    		=> 900,
+            'absoluteAuthTimeout' 	=> 1900,
+            'autoRenewCookie' 		=> true
+        ),
+        'db' => array(
+            'class'                 => 'CDbConnection',
+            'connectionString'      => NULL,
+            'emulatePrepare'        => true,
+            'username'              => NULL,
+            'password'              => NULL,
+            'charset'               => 'utf8',
+            'schemaCachingDuration' => 3600,
+            'enableProfiling'       => false,
+            'enableParamLogging'    => false
+        ),
+        'log' => array(
+            'class' => 'CLogRouter',
+            'routes' => array(
+                array(
+                    'class'=>'CFileLogRoute',
+                    'levels'=>'error, warning',
+                )
+            )
+        ),
+        'cache' => array(
+            'class' => 'CFileCache',
+        )
+    ),
+    'params' => array(
+        'encryptionKey'       => NULL,
+        'debug'               => false,
+        'trace'               => 0,
+        'NewRelicAppName'     => null,
+        'max_fileupload_size' => (10 * 1024 * 1024),
+        'cards' => 'https://cards.ciims.io/1.0.0',
+    )
 );
 
 // CLI specific data
 if (php_sapi_name() == "cli")
 {
-	$ciimsCoreConfig['behaviors'] = array(
-		'onBeginRequest' => array(
-			'class' => 'vendor.charlesportwoodii.yii-newrelic.behaviors.YiiNewRelicConsoleAppBehavior',
-		),
-		'onEndRequest' => array(
-			'class' => 'vendor.charlesportwoodii.yii-newrelic.behaviors.YiiNewRelicConsoleAppBehavior',
-		)
-	);
+    $ciimsCoreConfig['behaviors'] = array(
+        'onBeginRequest' => array(
+            'class' => 'vendor.charlesportwoodii.yii-newrelic.behaviors.YiiNewRelicConsoleAppBehavior',
+        ),
+        'onEndRequest' => array(
+            'class' => 'vendor.charlesportwoodii.yii-newrelic.behaviors.YiiNewRelicConsoleAppBehavior',
+        )
+    );
 }
 
 if (php_sapi_name() != "cli" && YII_DEBUG)
 {
-	$ciimsCoreConfig['preload'][] = 'debug';
-	$ciimsCoreConfig['components']['debug'] = array(
-		'class' => 'vendor.zhuravljov.yii2-debug.Yii2Debug',
-		'enabled' => YII_DEBUG,
-		'allowedIPs' => array('*')
-	);
+    $ciimsCoreConfig['preload'][] = 'debug';
+    $ciimsCoreConfig['components']['debug'] = array(
+        'class' => 'vendor.zhuravljov.yii2-debug.Yii2Debug',
+        'enabled' => YII_DEBUG,
+        'allowedIPs' => array('*')
+    );
 }
 
 return $ciimsCoreConfig;

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.*',

Spacing +7 added lines, -7 removed lines

@@ -18,9 +18,9 @@ 
 * @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');
+	$modules = (require __DIR__.DS.'modules.php');
 
 	if ($default === true)
 		return $modules;
@@ -46,8 +46,8 @@ 
 		'cii',
 		'analytics'
 	),
-	'import' => $import(),
-	'modules' => $import(true),
+	'import' => $import (),
+	'modules' => $import (true),
 	'behaviors' => array(
 		'onBeginRequest' => array(
 			'class' => 'vendor.charlesportwoodii.yii-newrelic.behaviors.YiiNewRelicWebAppBehavior',
@@ -55,7 +55,7 @@ 
 	),
 	'components' => array(
 		'themeManager' => array(
-			'basePath' => (__DIR__ . DS . '..' . DS . '..' . DS . 'themes')
+			'basePath' => (__DIR__.DS.'..'.DS.'..'.DS.'themes')
 		),
 		'messages' => array(
 			'class' => 'vendor.charlesportwoodii.cii.components.CiiPHPMessageSource'
@@ -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

Indentation +20 added lines, -20 removed lines

@@ -6,30 +6,30 @@
 
 // Attempt to load the cached file if it exists
 if (file_exists($cachedConfig))
-	return require($cachedConfig);
+    return require($cachedConfig);
 else
 {
-	// Otherwise generate one, and return it
-	$response = array();
+    // Otherwise generate one, and return it
+    $response = array();
 
-	// Find all the modules currently installed, and preload them
-	foreach (new IteratorIterator(new DirectoryIterator($directory)) as $filename)
-	{
-		// Don't import dot files
-		if (!$filename->isDot() && strpos($filename->getFileName(), ".") === false)
-		{
-			$path = $filename->getPathname();
+    // Find all the modules currently installed, and preload them
+    foreach (new IteratorIterator(new DirectoryIterator($directory)) as $filename)
+    {
+        // Don't import dot files
+        if (!$filename->isDot() && strpos($filename->getFileName(), ".") === false)
+        {
+            $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());
+        }
+    }
 
-	$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;
+    // return the response
+    return $response;
 }

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

Spacing +10 added lines, -10 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
 // Set the scan directory
-$directory = __DIR__ . DS . '..' . DS . 'modules';
+$directory = __DIR__.DS.'..'.DS.'modules';
 $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

Indentation +122 added lines, -122 removed lines

@@ -2,126 +2,126 @@
 

 class CategoriesController extends CiiController

 {

-	/**

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

-	 */

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

-

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

-			array(

-				'CHttpCacheFilter + index',

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

-				'etagSeed'=>$id

-			),

-			array(

-				'COutputCache + list',

-				'duration' => YII_DEBUG ? 1 : 86400,

-				'varyByParam' => array('page'),

-				'varyByLanguage' => true,

-				'dependency' => array(

-					'class'=>'CDbCacheDependency',

-					'sql'=>'SELECT MAX(updated) FROM content WHERE category_id = :id',

-					'params' => array(':id' => $id)

-				)

-			),

-			array(

-				'COutputCache + rss',

-				'duration' => YII_DEBUG ? 1 : 86400,

-				'dependency' => array(

-					'class'=>'CDbCacheDependency',

-					'sql'=>'SELECT MAX(updated) FROM content WHERE category_id = :id',

-					'params' => array(':id' => $id)

-				)

-			)

-		));

-	}

-

-	/**

-	 * Handles all incoming requests for the entire site that are not previous defined in CUrlManager

-	 * Requests come in, are verified, and then pulled from the database dynamically

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

-	{

-		// Run a pre check of our data

-		$this->beforeCiiAction($id);

-

-		// Retrieve the data

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

-

-		// Set the layout

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

-

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

-

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

-

-

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

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

-

-		$pages->applyLimit($criteria);

-

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

-			'id'		=> $id,

-			'category' 	=> $category,

-			'data' 		=> $data,

-			'itemCount' => $itemCount,

-			'pages' 	=> $pages,

-			'meta' 		=> array(

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

-		)));

-	}

-

-	/**

-	 * Displays either all posts or all posts for a particular category_id if an $id is set in RSS Format

-	 * So that RSS Readers can access the website

-	 * @param  int $id

-	 */

-	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 = ""');

-

-		if ($id !== NULL)

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

-

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

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

-

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

-			'data' 	=> $data, 

-			'url'	=> $url

-		));

-		return;

-	}

+    /**

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

+     */

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

+

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

+            array(

+                'CHttpCacheFilter + index',

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

+                'etagSeed'=>$id

+            ),

+            array(

+                'COutputCache + list',

+                'duration' => YII_DEBUG ? 1 : 86400,

+                'varyByParam' => array('page'),

+                'varyByLanguage' => true,

+                'dependency' => array(

+                    'class'=>'CDbCacheDependency',

+                    'sql'=>'SELECT MAX(updated) FROM content WHERE category_id = :id',

+                    'params' => array(':id' => $id)

+                )

+            ),

+            array(

+                'COutputCache + rss',

+                'duration' => YII_DEBUG ? 1 : 86400,

+                'dependency' => array(

+                    'class'=>'CDbCacheDependency',

+                    'sql'=>'SELECT MAX(updated) FROM content WHERE category_id = :id',

+                    'params' => array(':id' => $id)

+                )

+            )

+        ));

+    }

+

+    /**

+     * Handles all incoming requests for the entire site that are not previous defined in CUrlManager

+     * Requests come in, are verified, and then pulled from the database dynamically

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

+    {

+        // Run a pre check of our data

+        $this->beforeCiiAction($id);

+

+        // Retrieve the data

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

+

+        // Set the layout

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

+

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

+

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

+

+

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

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

+

+        $pages->applyLimit($criteria);

+

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

+            'id'		=> $id,

+            'category' 	=> $category,

+            'data' 		=> $data,

+            'itemCount' => $itemCount,

+            'pages' 	=> $pages,

+            'meta' 		=> array(

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

+        )));

+    }

+

+    /**

+     * Displays either all posts or all posts for a particular category_id if an $id is set in RSS Format

+     * So that RSS Readers can access the website

+     * @param  int $id

+     */

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

+

+        if ($id !== NULL)

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

+

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

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

+

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

+            'data' 	=> $data, 

+            'url'	=> $url

+        ));

+        return;

+    }

 }

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

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

 		));

protected/controllers/ContentController.php

Indentation +203 added lines, -203 removed lines

@@ -2,212 +2,212 @@ 
 

 class ContentController extends CiiController

 {

-	/**

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

-	 */

-	public function filters()

-	{

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

-

-		if ($id != NULL)

-		{

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

-			return array(

-				'accessControl',

-				array(

-					'CHttpCacheFilter + index',

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

-					'etagSeed' => $id.$vid

-				),

-				array(

-					'COutputCache + index',

-					'duration' => YII_DEBUG ? 1 : 86400, // 24 hour cache duration

-					'varyByParam' => array('id', 'vid'),

-					'varyByLanguage' => true,

-					'varyByExpression' => 'Yii::app()->user->isGuest'

-				)

-			);

-		}

-

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

-			'COutputCache + list',

-			'duration' => YII_DEBUG ? 1 : 86400,

-			'varyByParam' => array('page'),

-			'varyByLanguage' => true,

-			'dependency' => array(

-				'class'=>'CDbCacheDependency',

-				'sql'=>'SELECT MAX(updated) FROM content',

-			)

-		)));

-	}

-

-

-	/**

-	 * Specifies the access control rules.

-	 * This method is used by the 'accessControl' filter.

-	 * @return array access control rules

-	 */

-	public function accessRules()

-	{

-		return array(

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

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

-				'users'=>array('*'),

-			),

-			array('deny',  // deny all users

-				'users'=>array('*'),

-			),

-		);

-	}

-

-	/**

-	 * Handles all incoming requests for the entire site that are not previous defined in CUrlManager

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

-	{

-		// 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.'));

-

-		// Check for a password

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

-		{

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

-		}

-

-		// Parse Metadata

-		$this->setLayout($content->layout);

-

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

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

-			'{{label}}'    => $content->title

-		)));

-

-		$this->params['meta']['description'] = $content->extract;

-		$this->render($content->view, array(

-			'id' 	=> $content->id,

-			'data' 	=> $content,

-			'meta' 	=> $content->parseMeta($content->id)

-		));

-	}

-

-	/**

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

-	{

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

-

-		// 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 the number of attempts is >= 3

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

-		{

-			// If the expires time has already passed, unlock the account

-			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

-			{

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

-				unset($_POST['password']);

-				$_SESSION['password'][$id]['expires'] 	= time() + 300;

-			}

-		}

-

-		if (Cii::get($_POST, 'password', NULL) !== NULL)

-		{

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

-

-			$encrypted = Cii::encrypt(Cii::get($_POST, 'password'));

-

-			if ($encrypted == $content->attributes['password'])

-			{

-				$_SESSION['password'][$id]['password'] = $encrypted;

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

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

-			}

-			else

-			{

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

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

-				$_SESSION['password'][$id]['expires'] 	= time() + 300;

-			}

-

-		}

-

-		$this->layout = 'password';

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

-			'id' => $id

-		));

-	}

-

-	/*

-	 * Displays a listing of all blog posts for all time in all categories

-	 * Is used as a generic catch all behavior

-	 */

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

-		)));

-

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

-

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

+    /**

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

+     */

+    public function filters()

+    {

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

+

+        if ($id != NULL)

+        {

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

+            return array(

+                'accessControl',

+                array(

+                    'CHttpCacheFilter + index',

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

+                    'etagSeed' => $id.$vid

+                ),

+                array(

+                    'COutputCache + index',

+                    'duration' => YII_DEBUG ? 1 : 86400, // 24 hour cache duration

+                    'varyByParam' => array('id', 'vid'),

+                    'varyByLanguage' => true,

+                    'varyByExpression' => 'Yii::app()->user->isGuest'

+                )

+            );

+        }

 

-		$criteria = Content::model()

-					->getBaseCriteria()

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

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

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

+            'COutputCache + list',

+            'duration' => YII_DEBUG ? 1 : 86400,

+            'varyByParam' => array('page'),

+            'varyByLanguage' => true,

+            'dependency' => array(

+                'class'=>'CDbCacheDependency',

+                'sql'=>'SELECT MAX(updated) FROM content',

+            )

+        )));

+    }

+

+

+    /**

+     * Specifies the access control rules.

+     * This method is used by the 'accessControl' filter.

+     * @return array access control rules

+     */

+    public function accessRules()

+    {

+        return array(

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

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

+                'users'=>array('*'),

+            ),

+            array('deny',  // deny all users

+                'users'=>array('*'),

+            ),

+        );

+    }

+

+    /**

+     * Handles all incoming requests for the entire site that are not previous defined in CUrlManager

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

+    {

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

+

+        // Check for a password

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

+        {

+            // Check SESSION to see if a password is set

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

 

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

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

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

+        }

 

-		$criteria->limit = $pageSize;

+        // Parse Metadata

+        $this->setLayout($content->layout);

+

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

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

+            '{{label}}'    => $content->title

+        )));

+

+        $this->params['meta']['description'] = $content->extract;

+        $this->render($content->view, array(

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

+            'data' 	=> $content,

+            'meta' 	=> $content->parseMeta($content->id)

+        ));

+    }

+

+    /**

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

+    {

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

+

+        // 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 the number of attempts is >= 3

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

+        {

+            // If the expires time has already passed, unlock the account

+            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

+            {

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

+                unset($_POST['password']);

+                $_SESSION['password'][$id]['expires'] 	= time() + 300;

+            }

+        }

 

-		$itemCount = Content::model()->count($criteria);

-		$pages = new CPagination($itemCount);

-		$pages->pageSize=$pageSize;

+        if (Cii::get($_POST, 'password', NULL) !== NULL)

+        {

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

+

+            $encrypted = Cii::encrypt(Cii::get($_POST, 'password'));

+

+            if ($encrypted == $content->attributes['password'])

+            {

+                $_SESSION['password'][$id]['password'] = $encrypted;

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

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

+            }

+            else

+            {

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

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

+                $_SESSION['password'][$id]['expires'] 	= time() + 300;

+            }

 

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

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

-		$pages->applyLimit($criteria);

+        }

 

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

-			'data'		=> $data,

-			'itemCount' => $itemCount,

-			'pages' 	=> $pages

-		));

-	}

+        $this->layout = 'password';

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

+            'id' => $id

+        ));

+    }

 

-	/**

-	 * No routing action

+    /*

+	 * Displays a listing of all blog posts for all time in all categories

+	 * Is used as a generic catch all behavior

 	 */

-	public function actionNR()

-	{

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

+        )));

+

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

+

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

+

+        $criteria = Content::model()

+                    ->getBaseCriteria()

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

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

+

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

+

+        $criteria->limit = $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);

+

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

+            'data'		=> $data,

+            'itemCount' => $itemCount,

+            'pages' 	=> $pages

+        ));

+    }

+

+    /**

+     * No routing action

+     */

+    public function actionNR()

+    {

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

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

         {

@@ -215,9 +215,9 @@ 
             $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);

+    }

 }

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

 }

Spacing +63 added lines, -63 removed lines

@@ -5,18 +5,18 @@ 
 	/**

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

 		{

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

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

 			return array(

 				'accessControl',

 				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.$vid

 				),

 				array(

@@ -29,7 +29,7 @@ 
 			);

 		}

 

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

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

 			'COutputCache + list',

 			'duration' => YII_DEBUG ? 1 : 86400,

 			'varyByParam' => array('page'),

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

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

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

 				'users'=>array('*'),

 			),

-			array('deny',  // deny all users

+			array('deny', // deny all users

 				'users'=>array('*'),

 			),

 		);

@@ -65,40 +65,40 @@ 
 	 * 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));

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

 

 		// Retrieve the data

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

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

 		{

 			// Check SESSION to see if a password is set

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

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

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

 		}

 

 		// Parse Metadata

-		$this->setLayout($content->layout);

+		$this->setLayout ($content->layout);

 

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

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

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

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

 			'{{label}}'    => $content->title

 		)));

 

 		$this->params['meta']['description'] = $content->extract;

-		$this->render($content->view, array(

+		$this->render ($content->view, array(

 			'id' 	=> $content->id,

 			'data' 	=> $content,

-			'meta' 	=> $content->parseMeta($content->id)

+			'meta' 	=> $content->parseMeta ($content->id)

 		));

 	}

 

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

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

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

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

 		{

 			// If the expires time has already passed, unlock the account

-			if (Cii::get(Cii::get(Cii::get($_SESSION, 'password', array()), $id, array()), 'expires', 0) <= time())

+			if (Cii::get (Cii::get (Cii::get ($_SESSION, 'password', array()), $id, array()), 'expires', 0) <= time ())

 			{

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

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

 			}

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

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

 				unset($_POST['password']);

-				$_SESSION['password'][$id]['expires'] 	= time() + 300;

+				$_SESSION['password'][$id]['expires'] = time () + 300;

 			}

 		}

 

-		if (Cii::get($_POST, 'password', NULL) !== NULL)

+		if (Cii::get ($_POST, 'password', NULL) !== NULL)

 		{

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

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

 

-			$encrypted = Cii::encrypt(Cii::get($_POST, 'password'));

+			$encrypted = Cii::encrypt (Cii::get ($_POST, 'password'));

 

 			if ($encrypted == $content->attributes['password'])

 			{

 				$_SESSION['password'][$id]['password'] = $encrypted;

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

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

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

 			}

 			else

 			{

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

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

-				$_SESSION['password'][$id]['expires'] 	= time() + 300;

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

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

+				$_SESSION['password'][$id]['expires'] = time () + 300;

 			}

 

 		}

 

 		$this->layout = 'password';

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

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

 			'id' => $id

 		));

 	}

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

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

 		)));

 

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

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

 

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

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

 

-		$criteria = Content::model()

-					->getBaseCriteria()

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

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

+		$criteria = Content::model ()

+					->getBaseCriteria ()

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

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

 

 		$criteria->order = 'published DESC';

 

 		$criteria->limit = $pageSize;

 

-		$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('all', array(

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

 			'data'		=> $data,

 			'itemCount' => $itemCount,

 			'pages' 	=> $pages

@@ -206,18 +206,18 @@ 
 	/**

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

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

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

         {

-            Yii::import('webroot.themes.' . $themeName . '.Theme');

+            Yii::import ('webroot.themes.'.$themeName.'.Theme');

             $theme = new Theme;

         }

 

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

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

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

 		else

-			throw new CHttpException(404);

+			throw new CHttpException (404);

 	}

 }