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/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/migrations/m141001_145619_init.php

Indentation +282 added lines, -282 removed lines

@@ -3,286 +3,286 @@
 class m141001_145619_init extends CDbMigration
 {
 
-	/**
-	 * For data insertions, this is the current time.
-	 * @var integer
-	 */
-	private $_moment = 0;
-
-	public function safeUp()
-	{
-		$this->_moment = time();
-
-		// Try to get the table names, if we get something back, do not run this migration
-		try
-		{
-			$test = Yii::app()->db->schema->getTables();
-			if (count($test) <= 1)
-				throw new Exception('CiiMS doesn\'t exist. Applying base migration');
-			return true;
-		}
-		catch (Exception $e)
-		{
-			// Yii will throw an exception if Yii::app()->db->schema is undefined (which is should be if we're doing this for the first time)
-			// This SHOULD throw an error if we're running this for the first time - it's the only way to check if we have a valid db or not.
-		}
-
-		// Otherwise, run the install migration
-		$this->createUserTables();
-
-		$this->createCategories();
-
-		$this->createContent();
-
-		$this->createConfiguration();
-	}
-
-	public function safeDown()
-	{
-		echo "m141001_145619_init does not support migration down.\n";
-		return false;
-	}
-
-	/**
-	 * Creates the tables, indexes, and relations for users
-	 */
-	private function createUserTables()
-	{
-		$this->createTable('users', array(
-			'id' 		=> 'pk',
-			'email' 	=> 'string NOT NULL',
-			'password' 	=> 'string NOT NULL',
-			'username'  => 'string NOT NULL',
-			'user_role' => 'integer DEFAULT 1',
-			'status' 	=> 'integer DEFAULT 1',
-			'created' 	=> 'integer',
-			'updated' 	=> 'integer'
-		));
-
-		$this->createTable('user_roles', array(
-			'id' 		=> 'pk',
-			'name' 		=> 'string NOT NULL',
-			'created' 	=> 'integer',
-			'updated' 	=> 'integer'
-		));
-
-		$this->createTable('user_metadata', array(
-			'user_id' 	  => 'integer',
-			'key'		  => 'string NOT NULL',
-			'value' 	  => 'text NOT NULL',
-			'entity_type' => 'integer',
-			'created' 	  => 'integer',
-			'updated' 	  => 'integer'
-		));
-
-		// Create the necessary indexes on the columns
-		$this->createIndex('user_email', 'users', 'email', true);
-		$this->createIndex('user_username', 'users', 'username', true);
-		$this->createIndex('user_metadata', 'user_metadata', 'user_id, key', false);
-
-		$this->addPrimaryKey('user_metadata_composite', 'user_metadata', 'user_id,key');
-
-		// Setup the foreign key constraints
-		$this->addForeignKey('user_roles_relation_fk', 'user_metadata', 'user_id', 'users', 'id', 'CASCADE', 'NO ACTION');
-
-		// Insert data into the tables
-		$this->insert('user_roles', array(
-			'id'      => 1,
-			'name' 	  => 'User',
-			'created' => $this->_moment,
-			'updated' => $this->_moment
-		));
-
-		$this->insert('user_roles', array(
-			'id'      => 2,
-			'name'    => 'Pending',
-			'created' => $this->_moment,
-			'updated' => $this->_moment
-		));
-
-		$this->insert('user_roles', array(
-			'id'      => 3,
-			'name'    => 'Suspended',
-			'created' => $this->_moment,
-			'updated' => $this->_moment
-		));
-
-		$this->insert('user_roles', array(
-			'id'      => 5,
-			'name'    => 'Collaborator',
-			'created' => $this->_moment,
-			'updated' => $this->_moment
-		));
-
-		$this->insert('user_roles', array(
-			'id'      => 6,
-			'name'    => 'Author',
-			'created' => $this->_moment,
-			'updated' => $this->_moment
-		));
-
-		$this->insert('user_roles', array(
-			'id'      => 7,
-			'name'    => 'User',
-			'created' => $this->_moment,
-			'updated' => $this->_moment
-		));
-
-		$this->insert('user_roles', array(
-			'id'      => 8,
-			'name'    => 'Publisher',
-			'created' => $this->_moment,
-			'updated' => $this->_moment
-		));
-
-		$this->insert('user_roles', array(
-			'id'      => 9,
-			'name'    => 'Administrator',
-			'created' => $this->_moment,
-			'updated' => $this->_moment
-		));
-	}
-
-	/**
-	 * Create the categories and relations
-	 */
-	private function createCategories()
-	{
-		// Categories
-		$this->createTable('categories', array(
-			'id' 		=> 'pk',
-			'parent_id' => 'integer DEFAULT 1',
-			'name' 		=> 'string NOT NULL',
-			'slug' 	    => 'string NOT NULL',
-			'created' 	=> 'integer',
-			'updated' 	=> 'integer'
-		));
-
-		$this->createTable('categories_metadata', array(
-			'category_id' => 'integer',
-			'key'		  => 'string NOT NULL',
-			'value' 	  => 'text NOT NULL',
-			'created' 	  => 'integer',
-			'updated' 	  => 'integer'
-		));
-
-		// Insert the first record into the categories table
-		$this->insert('categories', array(
-			'id'      => 1,
-			'name'    => 'Uncategorized',
-			'slug'    => 'uncategorized',
-			'created' => $this->_moment,
-			'updated' => $this->_moment
-		));
-
-		$this->addPrimaryKey('categories_metadata_composite', 'categories_metadata', 'category_id,key');
-		$this->addForeignKey('categories_parents_fk', 'categories', 'parent_id', 'categories', 'id', 'CASCADE', 'NO ACTION');
-		$this->addForeignKey('categories_metadata_fk', 'categories_metadata', 'category_id', 'categories', 'id', 'CASCADE', 'NO ACTION');
-	}
-
-	/**
-	 * Creates the content, comemnts, and necessary relations
-	 */
-	private function createContent()
-	{
-		$this->createTable('content', array(
-			'id'		  => 'integer NOT NULL',
-			'vid' 		  => 'integer NOT NULL DEFAULT 1',
-			'title'		  => 'string  NOT NULL',
-			'content'     => 'text NOT NULL',
-			'excerpt'     => 'text NOT NULL',
-			'slug'        => 'string NOT NULL',
-			'category_id' => 'integer DEFAULT 1',
-			'author_id'   => 'integer DEFAULT 1',
-			'type_id'     => 'integer DEFAULT 2',
-			'commentable' => 'integer DEFAULT 1',
-			'password' 	  => 'string DEFAULT NULL',
-			'status'      => 'integer DEFAULT 0',
-			'like_count'  => 'integer DEFAULT 0',
-			'published'	  => 'integer',
-			'created'     => 'integer',
-			'updated' 	  => 'integer'
-		));
-
-		$this->createTable('content_types', array(
-			'id'          => 'pk',
-			'name'		  => 'string NOT NULL',
-			'created'     => 'integer',
-			'updated' 	  => 'integer'
-		));
-
-		$this->createTable('content_metadata', array(
-			'content_id'  => 'integer',
-			'key'		  => 'string NOT NULL',
-			'value' 	  => 'text NOT NULL',
-			'created' 	  => 'integer',
-			'updated' 	  => 'integer'
-		));
-
-		$this->createTable('comments', array(
-			'id'		  => 'pk',
-			'content_id'  => 'integer',
-			'author_id'   => 'integer',
-			'comment'     => 'integer',
-			'created'     => 'integer',
-			'updated' 	  => 'integer'
-		));
-
-		$this->insert('content_types', array(
-			'id'          => 1,
-			'name'        => 'Static Page',
-			'created'     => $this->_moment,
-			'updated'     => $this->_moment
-		));
-
-		$this->insert('content_types', array(
-			'id'          => 2,
-			'name'    	  => 'Blog Post',
-			'created'     => $this->_moment,
-			'updated'     => $this->_moment
-		));
-
-		$this->addPrimaryKey('content_composite', 'content', 'id, vid');
-
-		$this->execute('ALTER TABLE `content` CHANGE id id INT( 11 ) NOT NULL AUTO_INCREMENT');
-
-		$this->addPrimaryKey('content_metadata_composite', 'content_metadata', 'content_id,key');
-
-		$this->createIndex('content_author', 'content', 'author_id', false);
-		$this->createIndex('content_category', 'content', 'category_id', false);
-		$this->createIndex('content_type', 'content', 'type_id', false);
-		$this->createIndex('comment_content', 'comments', 'content_id', false);
-		$this->createIndex('comment_author', 'comments', 'author_id', false);
-
-		$this->addForeignKey('content_category_fk', 'content', 'category_id', 'categories', 'id', 'CASCADE', 'NO ACTION');
-		$this->addForeignKey('content_author_fk', 'content', 'author_id', 'users', 'id', 'CASCADE', 'NO ACTION');
-		$this->addForeignKey('content_type_fk', 'content', 'type_id', 'content_types', 'id', 'CASCADE', 'NO ACTION');
-
-		$this->addForeignKey('comments_content_id_fk', 'comments', 'content_id', 'content', 'id', 'CASCADE', 'NO ACTION');
-		$this->addForeignKey('comments_author_fk', 'comments', 'author_id', 'users', 'id', 'CASCADE', 'NO ACTION');
-	}
-
-	/**
-	 * Creates the configuration and events tables
-	 */
-	private function createConfiguration()
-	{
-		$this->createTable('configuration', array(
-			'key'		  => 'string',
-			'value' 	  => 'text NOT NULL',
-			'created' 	  => 'integer',
-			'updated' 	  => 'integer'
-		));
-
-		$this->createTable('events', array(
-			'id'		  => 'pk',
-			'event'       => 'string NOT NULL',
-			'event_data'  => 'text DEFAULT NULL',
-			'uri'         => 'string DEFAULT NULL',
-			'content_id'  => 'integer DEFAULT NULL',
-			'created' 	  => 'integer'
-		));
-
-		$this->addPrimaryKey('configuration_pk', 'configuration', 'key');
-	}
+    /**
+     * For data insertions, this is the current time.
+     * @var integer
+     */
+    private $_moment = 0;
+
+    public function safeUp()
+    {
+        $this->_moment = time();
+
+        // Try to get the table names, if we get something back, do not run this migration
+        try
+        {
+            $test = Yii::app()->db->schema->getTables();
+            if (count($test) <= 1)
+                throw new Exception('CiiMS doesn\'t exist. Applying base migration');
+            return true;
+        }
+        catch (Exception $e)
+        {
+            // Yii will throw an exception if Yii::app()->db->schema is undefined (which is should be if we're doing this for the first time)
+            // This SHOULD throw an error if we're running this for the first time - it's the only way to check if we have a valid db or not.
+        }
+
+        // Otherwise, run the install migration
+        $this->createUserTables();
+
+        $this->createCategories();
+
+        $this->createContent();
+
+        $this->createConfiguration();
+    }
+
+    public function safeDown()
+    {
+        echo "m141001_145619_init does not support migration down.\n";
+        return false;
+    }
+
+    /**
+     * Creates the tables, indexes, and relations for users
+     */
+    private function createUserTables()
+    {
+        $this->createTable('users', array(
+            'id' 		=> 'pk',
+            'email' 	=> 'string NOT NULL',
+            'password' 	=> 'string NOT NULL',
+            'username'  => 'string NOT NULL',
+            'user_role' => 'integer DEFAULT 1',
+            'status' 	=> 'integer DEFAULT 1',
+            'created' 	=> 'integer',
+            'updated' 	=> 'integer'
+        ));
+
+        $this->createTable('user_roles', array(
+            'id' 		=> 'pk',
+            'name' 		=> 'string NOT NULL',
+            'created' 	=> 'integer',
+            'updated' 	=> 'integer'
+        ));
+
+        $this->createTable('user_metadata', array(
+            'user_id' 	  => 'integer',
+            'key'		  => 'string NOT NULL',
+            'value' 	  => 'text NOT NULL',
+            'entity_type' => 'integer',
+            'created' 	  => 'integer',
+            'updated' 	  => 'integer'
+        ));
+
+        // Create the necessary indexes on the columns
+        $this->createIndex('user_email', 'users', 'email', true);
+        $this->createIndex('user_username', 'users', 'username', true);
+        $this->createIndex('user_metadata', 'user_metadata', 'user_id, key', false);
+
+        $this->addPrimaryKey('user_metadata_composite', 'user_metadata', 'user_id,key');
+
+        // Setup the foreign key constraints
+        $this->addForeignKey('user_roles_relation_fk', 'user_metadata', 'user_id', 'users', 'id', 'CASCADE', 'NO ACTION');
+
+        // Insert data into the tables
+        $this->insert('user_roles', array(
+            'id'      => 1,
+            'name' 	  => 'User',
+            'created' => $this->_moment,
+            'updated' => $this->_moment
+        ));
+
+        $this->insert('user_roles', array(
+            'id'      => 2,
+            'name'    => 'Pending',
+            'created' => $this->_moment,
+            'updated' => $this->_moment
+        ));
+
+        $this->insert('user_roles', array(
+            'id'      => 3,
+            'name'    => 'Suspended',
+            'created' => $this->_moment,
+            'updated' => $this->_moment
+        ));
+
+        $this->insert('user_roles', array(
+            'id'      => 5,
+            'name'    => 'Collaborator',
+            'created' => $this->_moment,
+            'updated' => $this->_moment
+        ));
+
+        $this->insert('user_roles', array(
+            'id'      => 6,
+            'name'    => 'Author',
+            'created' => $this->_moment,
+            'updated' => $this->_moment
+        ));
+
+        $this->insert('user_roles', array(
+            'id'      => 7,
+            'name'    => 'User',
+            'created' => $this->_moment,
+            'updated' => $this->_moment
+        ));
+
+        $this->insert('user_roles', array(
+            'id'      => 8,
+            'name'    => 'Publisher',
+            'created' => $this->_moment,
+            'updated' => $this->_moment
+        ));
+
+        $this->insert('user_roles', array(
+            'id'      => 9,
+            'name'    => 'Administrator',
+            'created' => $this->_moment,
+            'updated' => $this->_moment
+        ));
+    }
+
+    /**
+     * Create the categories and relations
+     */
+    private function createCategories()
+    {
+        // Categories
+        $this->createTable('categories', array(
+            'id' 		=> 'pk',
+            'parent_id' => 'integer DEFAULT 1',
+            'name' 		=> 'string NOT NULL',
+            'slug' 	    => 'string NOT NULL',
+            'created' 	=> 'integer',
+            'updated' 	=> 'integer'
+        ));
+
+        $this->createTable('categories_metadata', array(
+            'category_id' => 'integer',
+            'key'		  => 'string NOT NULL',
+            'value' 	  => 'text NOT NULL',
+            'created' 	  => 'integer',
+            'updated' 	  => 'integer'
+        ));
+
+        // Insert the first record into the categories table
+        $this->insert('categories', array(
+            'id'      => 1,
+            'name'    => 'Uncategorized',
+            'slug'    => 'uncategorized',
+            'created' => $this->_moment,
+            'updated' => $this->_moment
+        ));
+
+        $this->addPrimaryKey('categories_metadata_composite', 'categories_metadata', 'category_id,key');
+        $this->addForeignKey('categories_parents_fk', 'categories', 'parent_id', 'categories', 'id', 'CASCADE', 'NO ACTION');
+        $this->addForeignKey('categories_metadata_fk', 'categories_metadata', 'category_id', 'categories', 'id', 'CASCADE', 'NO ACTION');
+    }
+
+    /**
+     * Creates the content, comemnts, and necessary relations
+     */
+    private function createContent()
+    {
+        $this->createTable('content', array(
+            'id'		  => 'integer NOT NULL',
+            'vid' 		  => 'integer NOT NULL DEFAULT 1',
+            'title'		  => 'string  NOT NULL',
+            'content'     => 'text NOT NULL',
+            'excerpt'     => 'text NOT NULL',
+            'slug'        => 'string NOT NULL',
+            'category_id' => 'integer DEFAULT 1',
+            'author_id'   => 'integer DEFAULT 1',
+            'type_id'     => 'integer DEFAULT 2',
+            'commentable' => 'integer DEFAULT 1',
+            'password' 	  => 'string DEFAULT NULL',
+            'status'      => 'integer DEFAULT 0',
+            'like_count'  => 'integer DEFAULT 0',
+            'published'	  => 'integer',
+            'created'     => 'integer',
+            'updated' 	  => 'integer'
+        ));
+
+        $this->createTable('content_types', array(
+            'id'          => 'pk',
+            'name'		  => 'string NOT NULL',
+            'created'     => 'integer',
+            'updated' 	  => 'integer'
+        ));
+
+        $this->createTable('content_metadata', array(
+            'content_id'  => 'integer',
+            'key'		  => 'string NOT NULL',
+            'value' 	  => 'text NOT NULL',
+            'created' 	  => 'integer',
+            'updated' 	  => 'integer'
+        ));
+
+        $this->createTable('comments', array(
+            'id'		  => 'pk',
+            'content_id'  => 'integer',
+            'author_id'   => 'integer',
+            'comment'     => 'integer',
+            'created'     => 'integer',
+            'updated' 	  => 'integer'
+        ));
+
+        $this->insert('content_types', array(
+            'id'          => 1,
+            'name'        => 'Static Page',
+            'created'     => $this->_moment,
+            'updated'     => $this->_moment
+        ));
+
+        $this->insert('content_types', array(
+            'id'          => 2,
+            'name'    	  => 'Blog Post',
+            'created'     => $this->_moment,
+            'updated'     => $this->_moment
+        ));
+
+        $this->addPrimaryKey('content_composite', 'content', 'id, vid');
+
+        $this->execute('ALTER TABLE `content` CHANGE id id INT( 11 ) NOT NULL AUTO_INCREMENT');
+
+        $this->addPrimaryKey('content_metadata_composite', 'content_metadata', 'content_id,key');
+
+        $this->createIndex('content_author', 'content', 'author_id', false);
+        $this->createIndex('content_category', 'content', 'category_id', false);
+        $this->createIndex('content_type', 'content', 'type_id', false);
+        $this->createIndex('comment_content', 'comments', 'content_id', false);
+        $this->createIndex('comment_author', 'comments', 'author_id', false);
+
+        $this->addForeignKey('content_category_fk', 'content', 'category_id', 'categories', 'id', 'CASCADE', 'NO ACTION');
+        $this->addForeignKey('content_author_fk', 'content', 'author_id', 'users', 'id', 'CASCADE', 'NO ACTION');
+        $this->addForeignKey('content_type_fk', 'content', 'type_id', 'content_types', 'id', 'CASCADE', 'NO ACTION');
+
+        $this->addForeignKey('comments_content_id_fk', 'comments', 'content_id', 'content', 'id', 'CASCADE', 'NO ACTION');
+        $this->addForeignKey('comments_author_fk', 'comments', 'author_id', 'users', 'id', 'CASCADE', 'NO ACTION');
+    }
+
+    /**
+     * Creates the configuration and events tables
+     */
+    private function createConfiguration()
+    {
+        $this->createTable('configuration', array(
+            'key'		  => 'string',
+            'value' 	  => 'text NOT NULL',
+            'created' 	  => 'integer',
+            'updated' 	  => 'integer'
+        ));
+
+        $this->createTable('events', array(
+            'id'		  => 'pk',
+            'event'       => 'string NOT NULL',
+            'event_data'  => 'text DEFAULT NULL',
+            'uri'         => 'string DEFAULT NULL',
+            'content_id'  => 'integer DEFAULT NULL',
+            'created' 	  => 'integer'
+        ));
+
+        $this->addPrimaryKey('configuration_pk', 'configuration', 'key');
+    }
 }
\ No newline at end of file

protected/models/Categories.php

Indentation +315 added lines, -315 removed lines

@@ -19,319 +19,319 @@
  */

 class Categories extends CiiModel

 {

-	public $pageSize = 15;

-

-	public $description = NULL;

-

-	public $keywords = array();

-

-	/**

-	 * Returns the static model of the specified AR class.

-	 * @param string $className active record class name.

-	 * @return Categories the static model class

-	 */

-	public static function model($className=__CLASS__)

-	{

-		return parent::model($className);

-	}

-

-	/**

-	 * @return string the associated database table name

-	 */

-	public function tableName()

-	{

-		return 'categories';

-	}

-

-	/**

-	 * @return array validation rules for model attributes.

-	 */

-	public function rules()

-	{

-		// NOTE: you should only define rules for those attributes that

-		// will receive user inputs.

-		return array(

-			array('parent_id, name', 'required'),

-			array('parent_id', 'numerical', 'integerOnly'=>true),

-			array('name, slug', 'length', 'max'=>150),

-			// The following rule is used by search().

-			// Please remove those attributes that should not be searched.

-			array('id, parent_id, name, slug', 'safe', 'on'=>'search'),

-		);

-	}

-

-	/**

-	 * @return array relational rules.

-	 */

-	public function relations()

-	{

-		// NOTE: you may need to adjust the relation name and the related

-		// class name for the relations automatically generated below.

-		return array(

-			'parent' => array(self::BELONGS_TO, 'Categories', 'parent_id'),

-			'metadata' => array(self::HAS_MANY, 'CategoriesMetadata', 'category_id'),

-			'content' => array(self::HAS_MANY, 'Content', 'category_id'),

-		);

-	}

-

-	/**

-	 * @return array customized attribute labels (name=>label)

-	 */

-	public function attributeLabels()

-	{

-		return array(

-			'id' 		=> Yii::t('ciims.models.Categories', 'ID'),

-			'parent_id' => Yii::t('ciims.models.Categories', 'Parent'),

-			'name'      => Yii::t('ciims.models.Categories', 'Name'),

-			'slug'      => Yii::t('ciims.models.Categories', 'Slug'),

-			'description' => Yii::t('ciims.models.Categories', 'Description'),

-			'created'   => Yii::t('ciims.models.Categories', 'Created'),

-			'updated'   => Yii::t('ciims.models.Categories', 'Updated'),

-		);

-	}

-

-	public function getDescription()

-	{

-		$this->description = CategoriesMetadata::model()->findByAttributes(array('category_id' => $this->id, 'key' => 'description'));

-		if ($this->description == null || $this->description == false)

-			return NULL;

-

-		$this->description = $this->description->value;

-		return $this->description;

-	}

-

-	/**

-	 * Retrieves a list of models based on the current search/filter conditions.

-	 * @return CActiveDataProvider the data provider that can return the models based on the search/filter conditions.

-	 */

-	public function search()

-	{

-		$criteria=new CDbCriteria;

-

-		$criteria->compare('id',$this->id);

-		$criteria->compare('parent_id',$this->parent_id);

-		$criteria->compare('name',$this->name,true);

-		$criteria->compare('slug',$this->slug,true);

-		$criteria->compare('created',$this->created,true);

-		$criteria->compare('updated',$this->updated,true);

-		$criteria->order = "id DESC";

-

-		return new CActiveDataProvider($this, array(

-			'criteria' => $criteria,

-			'pagination' => array(

-				'pageSize' => $this->pageSize

-			)

-		));

-	}

-

-	/**

-	 * Gets keyword tags for this entry

-	 * @return array

-	 */

-	public function getKeywords()

-	{

-		$tags = CategoriesMetadata::model()->findByAttributes(array('category_id' => $this->id, 'key' => 'keywords'));

-		return $tags === NULL ? array() : CJSON::decode($tags->value);

-	}

-

-	/**

-	 * Adds a tag to the model

-	 * @param string $tag	The tag to add

-	 * @return bool			If the insert was successful or not

-	 */

-	public function addKeyword($tag)

-	{

-		$tags = $this->keywords;

-		if (in_array($tag, $tags)  || $tag == "")

-			return false;

-

-		$tags[] = $tag;

-		$tags = CJSON::encode($tags);

-		$metaTag = CategoriesMetadata::model()->findByAttributes(array('category_id' => $this->id, 'key' => 'keywords'));

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

-		{

-			$metaTag = new CategoriestMetadata;

-			$metaTag->content_id = $this->id;

-			$metaTag->key = 'keywords';

-		}

-

-		$metaTag->value = $tags;

-		return $metaTag->save();

-	}

-

-	/**

-	 * Removes a tag from the model

-	 * @param string $tag	The tag to remove

-	 * @return bool			If the removal was successful

-	 */

-	public function removeKeyword($tag)

-	{

-		$tags = $this->keywords;

-		if (!in_array($tag, $tags) || $tag == "")

-			return false;

-

-		$key = array_search($tag, $tags);

-		unset($tags[$key]);

-		$tags = CJSON::encode($tags);

-

-		$metaTag = CategoryMetadata::model()->findByAttributes(array('category_id' => $this->id, 'key' => 'keywords'));

-		$metaTag->value = $tags;

-		return $metaTag->save();

-	}

-

-	/**

-	 * Verifies the slug before validating the model

-	 */

-	public function beforeValidate()

-	{

-		$this->slug = $this->verifySlug($this->slug, $this->name);

-

-		return parent::beforeValidate();

-	}

-

-	/**

-	 * Flushes URL data from the cache before the model is updated

-	 */

-	public function afterSave()

-	{

-		$meta = CategoriesMetadata::model()->findByAttributes(array('category_id' => $this->id, 'key' => 'description'));

-		if ($meta == NULL)

-			$meta = new CategoriesMetadata;

-

-		$meta->category_id = $this->id;

-		$meta->key = 'description';

-		$meta->value  = $this->description;

-

-		$meta->save();

-

-		Yii::app()->cache->delete('CiiMS::Content::list');

-		Yii::app()->cache->delete('CiiMS::Routes');

-		Yii::app()->cache->delete('categories-pid');

-

-		return parent::afterSave();

-	}

-

-	/**

-	 * Automatically corrects parent tree issues that arise when a parent category node

-	 * is deleted.

-	 * @return boolean

-	 */

-	public function beforeDelete()

-	{

-		// Prevents the main "uncategorized category from being deleted"

-		if ($this->id == 1)

-		{

-			Yii::app()->user->setFlash('error', Yii::t('ciims.models.Categories', 'This category cannot be deleted'));

-			return false;

-		}

-

-		Yii::app()->cache->delete('CiiMS::Content::list');

-		Yii::app()->cache->delete('CiiMS::Routes');

-		Yii::app()->cache->delete('categories-pid');

-

-		$parent = $this->parent_id;

-		$id = $this->id;

-

-		// Reassign all posts to the parent category

-		Yii::app()->db

-				->createCommand('UPDATE content SET category_id = :parent_id WHERE category_id = :id')

-				->bindParam(':parent_id', $parent)

-				->bindParam(':id', $id)

-				->execute();

-

-		// Reassign all child categories to the parent category

-		$data = $this->findAllByAttributes(array('parent_id' => $id));

-

-		foreach ($data as $row)

-		{

-			$id = $row->id;

-			Yii::app()->db

-					->createCommand('UPDATE categories SET parent_id = :parent_id WHERE id = :id')

-					->bindParam(':parent_id', $parent)

-					->bindParam(':id', $id)

-					->execute();

-		}

-

-		return parent::beforeDelete();

-	}

-

-	/**

-	 * Retrieves the parent categories for a given category_id

-	 * @param  int $id

-	 * @return array

-	 */

-	public function getParentCategories($id)

-	{

-		// Retrieve the data from cache if necessary

-		$response = Yii::app()->cache->get('categories-pid');

-		if ($response == NULL)

-		{

-			$response = Yii::app()->db->createCommand('SELECT id, parent_id, name, slug FROM categories')->queryAll();

-			Yii::app()->cache->set('categories-pid', $response);

-		}

-

-		return $this->_getParentCategories($response, $id);

-	}

-

-	/**

-	 * Recursive callback for retrieving parent categories

-	 * @param  int  $id      The category we're seeking

-	 * @param  array  $stack A stack to hold the entire tree

-	 * @return array

-	 */

-	private function _getParentCategories($all_categories, $id, array $stack = array())

-	{

-		if ($id == 1)

-			return array_reverse($stack);

-

-		foreach ($all_categories as $k=>$v)

-		{

-			if ($v['id'] == $id)

-			{

-				$stack[$v['name']] = array(str_replace(Yii::app()->baseUrl, NULL, Yii::app()->createUrl($v['slug'])));

-				return $this->_getParentCategories($all_categories, $v['parent_id'], $stack);

-			}

-		}

-	}

-

-	/**

-	 * checkSlug - Recursive method to verify that the slug can be used

-	 * This method is purposfuly declared here to so that Content::findByPk is used instead of CiiModel::findByPk

-	 * @param string $slug - the slug to be checked

-	 * @param int $id - the numeric id to be appended to the slug if a conflict exists

-	 * @return string $slug - the final slug to be used

-	 */

-	public function checkSlug($slug, $id=NULL)

-	{

-		$content = false;

-

-		// Find the number of items that have the same slug as this one

-		$count = $this->countByAttributes(array('slug'=>$slug . $id));

-

-		if ($count == 0)

-		{

-			$content = true;

-			$count = Content::model()->countByAttributes(array('slug'=>$slug . $id));

-		}

-

-		// If we found an item that matched, it's possible that it is the current item (or a previous version of it)

-		// in which case we don't need to alter the slug

-		if ($count >= 1)

-		{

-			if ($content)

-				return $this->checkSlug($slug, ($id === NULL ? 1 : ($id+1)));

-

-			// Pull the data that matches

-			$data = $this->findByPk($this->id === NULL ? -1 : $this->id);

-

-			// Check the pulled data id to the current item

-			if ($data !== NULL && $data->id == $this->id)

-				return $slug;

-		}

-

-		if ($count == 0 && !in_array($slug, $this->forbiddenRoutes))

-			return $slug . $id;

-		else

-			return $this->checkSlug($slug, ($id === NULL ? 1 : ($id+1)));

-	}

+    public $pageSize = 15;

+

+    public $description = NULL;

+

+    public $keywords = array();

+

+    /**

+     * Returns the static model of the specified AR class.

+     * @param string $className active record class name.

+     * @return Categories the static model class

+     */

+    public static function model($className=__CLASS__)

+    {

+        return parent::model($className);

+    }

+

+    /**

+     * @return string the associated database table name

+     */

+    public function tableName()

+    {

+        return 'categories';

+    }

+

+    /**

+     * @return array validation rules for model attributes.

+     */

+    public function rules()

+    {

+        // NOTE: you should only define rules for those attributes that

+        // will receive user inputs.

+        return array(

+            array('parent_id, name', 'required'),

+            array('parent_id', 'numerical', 'integerOnly'=>true),

+            array('name, slug', 'length', 'max'=>150),

+            // The following rule is used by search().

+            // Please remove those attributes that should not be searched.

+            array('id, parent_id, name, slug', 'safe', 'on'=>'search'),

+        );

+    }

+

+    /**

+     * @return array relational rules.

+     */

+    public function relations()

+    {

+        // NOTE: you may need to adjust the relation name and the related

+        // class name for the relations automatically generated below.

+        return array(

+            'parent' => array(self::BELONGS_TO, 'Categories', 'parent_id'),

+            'metadata' => array(self::HAS_MANY, 'CategoriesMetadata', 'category_id'),

+            'content' => array(self::HAS_MANY, 'Content', 'category_id'),

+        );

+    }

+

+    /**

+     * @return array customized attribute labels (name=>label)

+     */

+    public function attributeLabels()

+    {

+        return array(

+            'id' 		=> Yii::t('ciims.models.Categories', 'ID'),

+            'parent_id' => Yii::t('ciims.models.Categories', 'Parent'),

+            'name'      => Yii::t('ciims.models.Categories', 'Name'),

+            'slug'      => Yii::t('ciims.models.Categories', 'Slug'),

+            'description' => Yii::t('ciims.models.Categories', 'Description'),

+            'created'   => Yii::t('ciims.models.Categories', 'Created'),

+            'updated'   => Yii::t('ciims.models.Categories', 'Updated'),

+        );

+    }

+

+    public function getDescription()

+    {

+        $this->description = CategoriesMetadata::model()->findByAttributes(array('category_id' => $this->id, 'key' => 'description'));

+        if ($this->description == null || $this->description == false)

+            return NULL;

+

+        $this->description = $this->description->value;

+        return $this->description;

+    }

+

+    /**

+     * Retrieves a list of models based on the current search/filter conditions.

+     * @return CActiveDataProvider the data provider that can return the models based on the search/filter conditions.

+     */

+    public function search()

+    {

+        $criteria=new CDbCriteria;

+

+        $criteria->compare('id',$this->id);

+        $criteria->compare('parent_id',$this->parent_id);

+        $criteria->compare('name',$this->name,true);

+        $criteria->compare('slug',$this->slug,true);

+        $criteria->compare('created',$this->created,true);

+        $criteria->compare('updated',$this->updated,true);

+        $criteria->order = "id DESC";

+

+        return new CActiveDataProvider($this, array(

+            'criteria' => $criteria,

+            'pagination' => array(

+                'pageSize' => $this->pageSize

+            )

+        ));

+    }

+

+    /**

+     * Gets keyword tags for this entry

+     * @return array

+     */

+    public function getKeywords()

+    {

+        $tags = CategoriesMetadata::model()->findByAttributes(array('category_id' => $this->id, 'key' => 'keywords'));

+        return $tags === NULL ? array() : CJSON::decode($tags->value);

+    }

+

+    /**

+     * Adds a tag to the model

+     * @param string $tag	The tag to add

+     * @return bool			If the insert was successful or not

+     */

+    public function addKeyword($tag)

+    {

+        $tags = $this->keywords;

+        if (in_array($tag, $tags)  || $tag == "")

+            return false;

+

+        $tags[] = $tag;

+        $tags = CJSON::encode($tags);

+        $metaTag = CategoriesMetadata::model()->findByAttributes(array('category_id' => $this->id, 'key' => 'keywords'));

+        if ($metaTag == false || $metaTag == NULL)

+        {

+            $metaTag = new CategoriestMetadata;

+            $metaTag->content_id = $this->id;

+            $metaTag->key = 'keywords';

+        }

+

+        $metaTag->value = $tags;

+        return $metaTag->save();

+    }

+

+    /**

+     * Removes a tag from the model

+     * @param string $tag	The tag to remove

+     * @return bool			If the removal was successful

+     */

+    public function removeKeyword($tag)

+    {

+        $tags = $this->keywords;

+        if (!in_array($tag, $tags) || $tag == "")

+            return false;

+

+        $key = array_search($tag, $tags);

+        unset($tags[$key]);

+        $tags = CJSON::encode($tags);

+

+        $metaTag = CategoryMetadata::model()->findByAttributes(array('category_id' => $this->id, 'key' => 'keywords'));

+        $metaTag->value = $tags;

+        return $metaTag->save();

+    }

+

+    /**

+     * Verifies the slug before validating the model

+     */

+    public function beforeValidate()

+    {

+        $this->slug = $this->verifySlug($this->slug, $this->name);

+

+        return parent::beforeValidate();

+    }

+

+    /**

+     * Flushes URL data from the cache before the model is updated

+     */

+    public function afterSave()

+    {

+        $meta = CategoriesMetadata::model()->findByAttributes(array('category_id' => $this->id, 'key' => 'description'));

+        if ($meta == NULL)

+            $meta = new CategoriesMetadata;

+

+        $meta->category_id = $this->id;

+        $meta->key = 'description';

+        $meta->value  = $this->description;

+

+        $meta->save();

+

+        Yii::app()->cache->delete('CiiMS::Content::list');

+        Yii::app()->cache->delete('CiiMS::Routes');

+        Yii::app()->cache->delete('categories-pid');

+

+        return parent::afterSave();

+    }

+

+    /**

+     * Automatically corrects parent tree issues that arise when a parent category node

+     * is deleted.

+     * @return boolean

+     */

+    public function beforeDelete()

+    {

+        // Prevents the main "uncategorized category from being deleted"

+        if ($this->id == 1)

+        {

+            Yii::app()->user->setFlash('error', Yii::t('ciims.models.Categories', 'This category cannot be deleted'));

+            return false;

+        }

+

+        Yii::app()->cache->delete('CiiMS::Content::list');

+        Yii::app()->cache->delete('CiiMS::Routes');

+        Yii::app()->cache->delete('categories-pid');

+

+        $parent = $this->parent_id;

+        $id = $this->id;

+

+        // Reassign all posts to the parent category

+        Yii::app()->db

+                ->createCommand('UPDATE content SET category_id = :parent_id WHERE category_id = :id')

+                ->bindParam(':parent_id', $parent)

+                ->bindParam(':id', $id)

+                ->execute();

+

+        // Reassign all child categories to the parent category

+        $data = $this->findAllByAttributes(array('parent_id' => $id));

+

+        foreach ($data as $row)

+        {

+            $id = $row->id;

+            Yii::app()->db

+                    ->createCommand('UPDATE categories SET parent_id = :parent_id WHERE id = :id')

+                    ->bindParam(':parent_id', $parent)

+                    ->bindParam(':id', $id)

+                    ->execute();

+        }

+

+        return parent::beforeDelete();

+    }

+

+    /**

+     * Retrieves the parent categories for a given category_id

+     * @param  int $id

+     * @return array

+     */

+    public function getParentCategories($id)

+    {

+        // Retrieve the data from cache if necessary

+        $response = Yii::app()->cache->get('categories-pid');

+        if ($response == NULL)

+        {

+            $response = Yii::app()->db->createCommand('SELECT id, parent_id, name, slug FROM categories')->queryAll();

+            Yii::app()->cache->set('categories-pid', $response);

+        }

+

+        return $this->_getParentCategories($response, $id);

+    }

+

+    /**

+     * Recursive callback for retrieving parent categories

+     * @param  int  $id      The category we're seeking

+     * @param  array  $stack A stack to hold the entire tree

+     * @return array

+     */

+    private function _getParentCategories($all_categories, $id, array $stack = array())

+    {

+        if ($id == 1)

+            return array_reverse($stack);

+

+        foreach ($all_categories as $k=>$v)

+        {

+            if ($v['id'] == $id)

+            {

+                $stack[$v['name']] = array(str_replace(Yii::app()->baseUrl, NULL, Yii::app()->createUrl($v['slug'])));

+                return $this->_getParentCategories($all_categories, $v['parent_id'], $stack);

+            }

+        }

+    }

+

+    /**

+     * checkSlug - Recursive method to verify that the slug can be used

+     * This method is purposfuly declared here to so that Content::findByPk is used instead of CiiModel::findByPk

+     * @param string $slug - the slug to be checked

+     * @param int $id - the numeric id to be appended to the slug if a conflict exists

+     * @return string $slug - the final slug to be used

+     */

+    public function checkSlug($slug, $id=NULL)

+    {

+        $content = false;

+

+        // Find the number of items that have the same slug as this one

+        $count = $this->countByAttributes(array('slug'=>$slug . $id));

+

+        if ($count == 0)

+        {

+            $content = true;

+            $count = Content::model()->countByAttributes(array('slug'=>$slug . $id));

+        }

+

+        // If we found an item that matched, it's possible that it is the current item (or a previous version of it)

+        // in which case we don't need to alter the slug

+        if ($count >= 1)

+        {

+            if ($content)

+                return $this->checkSlug($slug, ($id === NULL ? 1 : ($id+1)));

+

+            // Pull the data that matches

+            $data = $this->findByPk($this->id === NULL ? -1 : $this->id);

+

+            // Check the pulled data id to the current item

+            if ($data !== NULL && $data->id == $this->id)

+                return $slug;

+        }

+

+        if ($count == 0 && !in_array($slug, $this->forbiddenRoutes))

+            return $slug . $id;

+        else

+            return $this->checkSlug($slug, ($id === NULL ? 1 : ($id+1)));

+    }

 }