charlesportwoodii / CiiMS

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

protected/commands/CiiMigrateCommand.php

Indentation +7 added lines, -7 removed lines

@@ -2,13 +2,13 @@
 // 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
- * access to CLI or knowing before hand what our DSN is.
- *
- * Under no circumstances, should this be called directly from command line.
- *
- */
+     * This class is an injection container for CDbMigration which permits us to
+     * directly access CDbMigrations from our web application without having
+     * access to CLI or knowing before hand what our DSN is.
+     *
+     * Under no circumstances, should this be called directly from command line.
+     *
+     */
 class CiiMigrateCommand extends MigrateCommand
 {
     /**

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

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;

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

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;

+    }

 }

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

+    }

 }

protected/controllers/ProfileController.php

Indentation +122 added lines, -122 removed lines

@@ -3,126 +3,126 @@
 class ProfileController extends CiiController
 {
 
-	/**
-	 * The layout to use for this controller
-	 * @var string
-	 */
-	public $layout = '//layouts/main';
-
-	/**
-	 * @return array action filters
-	 */
-	public function filters()
-	{
-		return CMap::mergeArray(parent::filters(), array('accessControl'));
-	}
-
-	/**
-	 * 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'),
-				'users'=>array('*'),
-			),
-			array('allow',  // deny all users
-				'actions' => array('edit', 'resend'),
-				'users'=>array('@'),
-			),
-			array('deny',  // deny all users
-				'users'=>array('*'),
-			),
-		);
-	}
-
-	/**
-	 * Provides functionality to view a given profile
-	 * @param  int 	  $id          The ID belonging to the user
-	 * @param  string $username    The user's display name. This isn't super necessary, it just is better for SEO
-	 */
-	public function actionIndex($id=NULL, $username=NULL)
-	{
-		// If an ID isn't provided, throw an error
-		if ($id === NULL)
-			throw new CHttpException(404, Yii::t('ciims.controllers.Profile', "Oops! That user doesn't exist on our network!"));
-
-		// For SEO, if the display name isn't in the url, reroute it
-		if ($id !== NULL && $username === NULL)
-		{
-			$model = Users::model()->findByPk($id);
-			if ($model === NULL || $model->status == 0)
-				throw new CHttpException(404, Yii::t('ciims.controllers.Profile', "Oops! That user doesn't exist on our network!"));
-			else
-				$this->redirect('/profile/' . $model->id . '/' . preg_replace('/[^\da-z]/i', '', $model->username));
-		}
-
-		$model = Users::model()->findByPk($id);
-
-		// Don't allow null signings or invalidated users to pollute our site
-		if($model->status == 0)
-			throw new CHttpException(404, Yii::t('ciims.controllers.Profile', "Oops! That user doesn't exist on our network!"));
-
-		$this->pageTitle = Yii::t('ciims.controllers.Profile', 'User {{user}} - CiiMS | {{sitename}}', array('{{user}}' => $model->name, '{{sitename}}' => Cii::getConfig('name', Yii::app()->name)));
-		$this->render('index', array(
-			'model' => $model,
-			'md' => new CMarkdownParser
-		));
-	}
-
-	/**
-	 * Provides functionality for a user to edit their profile
-	 */
-	public function actionEdit()
-	{
-		$model = new ProfileForm;
-		$model->load(Yii::app()->user->id);
-
-		if (Cii::get($_POST, 'ProfileForm', NULL) !== NULL)
-		{
-			$model->attributes = $_POST['ProfileForm'];
-			$model->password_repeat = $_POST['ProfileForm']['password_repeat'];
-
-			if ($model->save())
-			{
-				Yii::app()->user->setFlash('success', Yii::t('ciims.controllers.Profile', 'Your profile has been updated!'));
-				$this->redirect($this->createUrl('profile/index', array(
-					'id' => $model->id,
-					'username' => $model->username
-				)));
-			}
-			else
-				Yii::app()->user->setFlash('error', Yii::t('ciims.controllers.Profile', 'There were errors saving your profile. Please correct them before trying to save again.'));
-		}
-
-		$this->render('edit', array(
-			'model' => $model
-		));
-	}
-
-	/**
-	 * Send a new verification email to the user
-	 */
-	public function actionResend()
-	{
-		$model = new ProfileForm;
-		$model->load(Yii::app()->user->id);
-
-		// If we don't have one on file, then someone the user got to a page they shouldn't have gotten to
-		// Seamlessly redirect them back
-		if ($model->getNewEmail() == NULL)
-			$this->redirect(Yii::app()->user->returnUrl);
-
-		if ($model->sendVerificationEmail())
-			Yii::app()->user->setFlash('success', Yii::t('ciims.controllers.Profile', 'A new verification email has been resent to {{user}}. Please check your email address.', array(
-				'{{user}}' => $model->getNewEmail()
-			)));
-		else
-			Yii::app()->user->setFlash('error', Yii::t('ciims.controllers.Profile', 'There was an error resending the verification email. Please try again later.'));
-
-		$this->redirect($this->createUrl('profile/edit'));
-	}
+    /**
+     * The layout to use for this controller
+     * @var string
+     */
+    public $layout = '//layouts/main';
+
+    /**
+     * @return array action filters
+     */
+    public function filters()
+    {
+        return CMap::mergeArray(parent::filters(), array('accessControl'));
+    }
+
+    /**
+     * 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'),
+                'users'=>array('*'),
+            ),
+            array('allow',  // deny all users
+                'actions' => array('edit', 'resend'),
+                'users'=>array('@'),
+            ),
+            array('deny',  // deny all users
+                'users'=>array('*'),
+            ),
+        );
+    }
+
+    /**
+     * Provides functionality to view a given profile
+     * @param  int 	  $id          The ID belonging to the user
+     * @param  string $username    The user's display name. This isn't super necessary, it just is better for SEO
+     */
+    public function actionIndex($id=NULL, $username=NULL)
+    {
+        // If an ID isn't provided, throw an error
+        if ($id === NULL)
+            throw new CHttpException(404, Yii::t('ciims.controllers.Profile', "Oops! That user doesn't exist on our network!"));
+
+        // For SEO, if the display name isn't in the url, reroute it
+        if ($id !== NULL && $username === NULL)
+        {
+            $model = Users::model()->findByPk($id);
+            if ($model === NULL || $model->status == 0)
+                throw new CHttpException(404, Yii::t('ciims.controllers.Profile', "Oops! That user doesn't exist on our network!"));
+            else
+                $this->redirect('/profile/' . $model->id . '/' . preg_replace('/[^\da-z]/i', '', $model->username));
+        }
+
+        $model = Users::model()->findByPk($id);
+
+        // Don't allow null signings or invalidated users to pollute our site
+        if($model->status == 0)
+            throw new CHttpException(404, Yii::t('ciims.controllers.Profile', "Oops! That user doesn't exist on our network!"));
+
+        $this->pageTitle = Yii::t('ciims.controllers.Profile', 'User {{user}} - CiiMS | {{sitename}}', array('{{user}}' => $model->name, '{{sitename}}' => Cii::getConfig('name', Yii::app()->name)));
+        $this->render('index', array(
+            'model' => $model,
+            'md' => new CMarkdownParser
+        ));
+    }
+
+    /**
+     * Provides functionality for a user to edit their profile
+     */
+    public function actionEdit()
+    {
+        $model = new ProfileForm;
+        $model->load(Yii::app()->user->id);
+
+        if (Cii::get($_POST, 'ProfileForm', NULL) !== NULL)
+        {
+            $model->attributes = $_POST['ProfileForm'];
+            $model->password_repeat = $_POST['ProfileForm']['password_repeat'];
+
+            if ($model->save())
+            {
+                Yii::app()->user->setFlash('success', Yii::t('ciims.controllers.Profile', 'Your profile has been updated!'));
+                $this->redirect($this->createUrl('profile/index', array(
+                    'id' => $model->id,
+                    'username' => $model->username
+                )));
+            }
+            else
+                Yii::app()->user->setFlash('error', Yii::t('ciims.controllers.Profile', 'There were errors saving your profile. Please correct them before trying to save again.'));
+        }
+
+        $this->render('edit', array(
+            'model' => $model
+        ));
+    }
+
+    /**
+     * Send a new verification email to the user
+     */
+    public function actionResend()
+    {
+        $model = new ProfileForm;
+        $model->load(Yii::app()->user->id);
+
+        // If we don't have one on file, then someone the user got to a page they shouldn't have gotten to
+        // Seamlessly redirect them back
+        if ($model->getNewEmail() == NULL)
+            $this->redirect(Yii::app()->user->returnUrl);
+
+        if ($model->sendVerificationEmail())
+            Yii::app()->user->setFlash('success', Yii::t('ciims.controllers.Profile', 'A new verification email has been resent to {{user}}. Please check your email address.', array(
+                '{{user}}' => $model->getNewEmail()
+            )));
+        else
+            Yii::app()->user->setFlash('error', Yii::t('ciims.controllers.Profile', 'There was an error resending the verification email. Please try again later.'));
+
+        $this->redirect($this->createUrl('profile/edit'));
+    }
 }

protected/controllers/SiteController.php

Indentation +425 added lines, -425 removed lines

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