charlesportwoodii / CiiMS

protected/models/settings/SocialSettings.php

Indentation +68 added lines, -68 removed lines

@@ -2,85 +2,85 @@
 
 class SocialSettings extends CiiSettingsModel
 {
-	protected $ha_twitter_enabled = false;
-	protected $ha_twitter_key = NULL;
-	protected $ha_twitter_secret = NULL;
-	protected $ha_twitter_accessToken = NULL;
-	protected $ha_twitter_accessTokenSecret = NULL;
+    protected $ha_twitter_enabled = false;
+    protected $ha_twitter_key = NULL;
+    protected $ha_twitter_secret = NULL;
+    protected $ha_twitter_accessToken = NULL;
+    protected $ha_twitter_accessTokenSecret = NULL;
 
-	protected $ha_facebook_enabled = false;
-	protected $ha_facebook_id = NULL;
-	protected $ha_facebook_secret = NULL;
-	protected $ha_facebook_scope =  NULL;
+    protected $ha_facebook_enabled = false;
+    protected $ha_facebook_id = NULL;
+    protected $ha_facebook_secret = NULL;
+    protected $ha_facebook_scope =  NULL;
 
-	protected $ha_google_enabled = false;
-	protected $ha_google_id = NULL;
-	protected $ha_google_secret = NULL;
-	protected $ha_google_scope = NULL;
-	protected $google_plus_public_server_key = NULL;
+    protected $ha_google_enabled = false;
+    protected $ha_google_id = NULL;
+    protected $ha_google_secret = NULL;
+    protected $ha_google_scope = NULL;
+    protected $google_plus_public_server_key = NULL;
 
-	protected $ha_linkedin_enabled = false;
-	protected $ha_linkedin_key = NULL;
-	protected $ha_linkedin_secret = NULL;
+    protected $ha_linkedin_enabled = false;
+    protected $ha_linkedin_key = NULL;
+    protected $ha_linkedin_secret = NULL;
 
-	protected $addThisPublisherID = null;
+    protected $addThisPublisherID = null;
 
-	public function groups()
-	{
-		return array(
-			Yii::t('ciims.models.social', 'Twitter')  => array('ha_twitter_enabled', 'ha_twitter_key', 'ha_twitter_secret', 'ha_twitter_accessToken', 'ha_twitter_accessTokenSecret'),
-			Yii::t('ciims.models.social', 'Facebook') => array('ha_facebook_enabled', 'ha_facebook_id', 'ha_facebook_secret', 'ha_facebook_scope'),
-			Yii::t('ciims.models.social', 'Google+')  => array('ha_google_enabled', 'ha_google_id', 'ha_google_secret', 'ha_google_scope', 'google_plus_public_server_key'),
-			Yii::t('ciims.models.social', 'LinkedIn') => array('ha_linkedin_enabled', 'ha_linkedin_key', 'ha_linkedin_secret'),
-			Yii::t('ciims.models.social', 'AddThis') => array('addThisPublisherID')
-		);
-	}
+    public function groups()
+    {
+        return array(
+            Yii::t('ciims.models.social', 'Twitter')  => array('ha_twitter_enabled', 'ha_twitter_key', 'ha_twitter_secret', 'ha_twitter_accessToken', 'ha_twitter_accessTokenSecret'),
+            Yii::t('ciims.models.social', 'Facebook') => array('ha_facebook_enabled', 'ha_facebook_id', 'ha_facebook_secret', 'ha_facebook_scope'),
+            Yii::t('ciims.models.social', 'Google+')  => array('ha_google_enabled', 'ha_google_id', 'ha_google_secret', 'ha_google_scope', 'google_plus_public_server_key'),
+            Yii::t('ciims.models.social', 'LinkedIn') => array('ha_linkedin_enabled', 'ha_linkedin_key', 'ha_linkedin_secret'),
+            Yii::t('ciims.models.social', 'AddThis') => array('addThisPublisherID')
+        );
+    }
 
-	public function rules()
-	{
-		return array(
-			array('ha_twitter_key, ha_twitter_secret, ha_twitter_accessToken, ha_twitter_accessToken, ha_twitter_accessTokenSecret', 'length', 'max' => 255),
-			array('ha_facebook_id, ha_facebook_secret', 'length', 'max' => 255),
-			array('ha_google_id, ha_google_secret, google_plus_public_server_key', 'length', 'max' => 255),
-			array('ha_linkedin_key, ha_linkedin_secret', 'length', 'max' => 255),
-			array('ha_twitter_enabled, ha_facebook_enabled, ha_google_enabled, ha_linkedin_enabled', 'boolean'),
-			array('addThisPublisherID', 'length', 'max' => 255)
-		);
-	}
+    public function rules()
+    {
+        return array(
+            array('ha_twitter_key, ha_twitter_secret, ha_twitter_accessToken, ha_twitter_accessToken, ha_twitter_accessTokenSecret', 'length', 'max' => 255),
+            array('ha_facebook_id, ha_facebook_secret', 'length', 'max' => 255),
+            array('ha_google_id, ha_google_secret, google_plus_public_server_key', 'length', 'max' => 255),
+            array('ha_linkedin_key, ha_linkedin_secret', 'length', 'max' => 255),
+            array('ha_twitter_enabled, ha_facebook_enabled, ha_google_enabled, ha_linkedin_enabled', 'boolean'),
+            array('addThisPublisherID', 'length', 'max' => 255)
+        );
+    }
 
-	public function attributeLabels()
-	{
-		return array(
-			'ha_twitter_enabled' => Yii::t('ciims.models.social', 'Social Auth'),
-			'ha_twitter_key' => Yii::t('ciims.models.social', 'Consumer Key'),
-			'ha_twitter_secret' => Yii::t('ciims.models.social', 'Consumer Secret'),
-			'ha_twitter_accessToken' => Yii::t('ciims.models.social', 'Access Token'),
-			'ha_twitter_accessTokenSecret' => Yii::t('ciims.models.social', 'Access Token Secret'),
+    public function attributeLabels()
+    {
+        return array(
+            'ha_twitter_enabled' => Yii::t('ciims.models.social', 'Social Auth'),
+            'ha_twitter_key' => Yii::t('ciims.models.social', 'Consumer Key'),
+            'ha_twitter_secret' => Yii::t('ciims.models.social', 'Consumer Secret'),
+            'ha_twitter_accessToken' => Yii::t('ciims.models.social', 'Access Token'),
+            'ha_twitter_accessTokenSecret' => Yii::t('ciims.models.social', 'Access Token Secret'),
 
-			'ha_facebook_enabled' => Yii::t('ciims.models.social', 'Social Auth'),
-			'ha_facebook_id' => Yii::t('ciims.models.social', 'App ID'),
-			'ha_facebook_secret' => Yii::t('ciims.models.social', 'App Secret'),
-			'ha_facebook_scope' => Yii::t('ciims.models.social', 'Scope'),
+            'ha_facebook_enabled' => Yii::t('ciims.models.social', 'Social Auth'),
+            'ha_facebook_id' => Yii::t('ciims.models.social', 'App ID'),
+            'ha_facebook_secret' => Yii::t('ciims.models.social', 'App Secret'),
+            'ha_facebook_scope' => Yii::t('ciims.models.social', 'Scope'),
 
-			'ha_google_enabled' => Yii::t('ciims.models.social', 'Social Auth'),
-			'ha_google_id' => Yii::t('ciims.models.social', 'Client ID'),
-			'ha_google_secret' => Yii::t('ciims.models.social', 'Client Secret'),
-			'ha_google_scope' => Yii::t('ciims.models.social', 'Scope'),
-			'google_plus_public_server_key' => Yii::t('ciims.models.social', 'Public Server API Key'),
+            'ha_google_enabled' => Yii::t('ciims.models.social', 'Social Auth'),
+            'ha_google_id' => Yii::t('ciims.models.social', 'Client ID'),
+            'ha_google_secret' => Yii::t('ciims.models.social', 'Client Secret'),
+            'ha_google_scope' => Yii::t('ciims.models.social', 'Scope'),
+            'google_plus_public_server_key' => Yii::t('ciims.models.social', 'Public Server API Key'),
 
-			'ha_linkedin_enabled' => Yii::t('ciims.models.social', 'Social Auth'),
-			'ha_linkedin_key' => Yii::t('ciims.models.social', 'Consumer Key'),
-			'ha_linkedin_secret' => Yii::t('ciims.models.social', 'Consumer Secret'),
+            'ha_linkedin_enabled' => Yii::t('ciims.models.social', 'Social Auth'),
+            'ha_linkedin_key' => Yii::t('ciims.models.social', 'Consumer Key'),
+            'ha_linkedin_secret' => Yii::t('ciims.models.social', 'Consumer Secret'),
 
-			'addThisPublisherID' => Yii::t('ciims.models.social', 'AddThis Publisher ID')
-		);
-	}
+            'addThisPublisherID' => Yii::t('ciims.models.social', 'AddThis Publisher ID')
+        );
+    }
 
-	public function afterSave()
-	{
-		Yii::app()->cache->set('hybridauth_providers', false);
-		Cii::getHybridAuthProviders();
+    public function afterSave()
+    {
+        Yii::app()->cache->set('hybridauth_providers', false);
+        Cii::getHybridAuthProviders();
 
-		return parent::afterSave();
-	}
+        return parent::afterSave();
+    }
 }

Spacing +31 added lines, -31 removed lines

@@ -11,7 +11,7 @@ 
 	protected $ha_facebook_enabled = false;
 	protected $ha_facebook_id = NULL;
 	protected $ha_facebook_secret = NULL;
-	protected $ha_facebook_scope =  NULL;
+	protected $ha_facebook_scope = NULL;
 
 	protected $ha_google_enabled = false;
 	protected $ha_google_id = NULL;
@@ -25,18 +25,18 @@ 
 
 	protected $addThisPublisherID = null;
 
-	public function groups()
+	public function groups ()
 	{
 		return array(
-			Yii::t('ciims.models.social', 'Twitter')  => array('ha_twitter_enabled', 'ha_twitter_key', 'ha_twitter_secret', 'ha_twitter_accessToken', 'ha_twitter_accessTokenSecret'),
-			Yii::t('ciims.models.social', 'Facebook') => array('ha_facebook_enabled', 'ha_facebook_id', 'ha_facebook_secret', 'ha_facebook_scope'),
-			Yii::t('ciims.models.social', 'Google+')  => array('ha_google_enabled', 'ha_google_id', 'ha_google_secret', 'ha_google_scope', 'google_plus_public_server_key'),
-			Yii::t('ciims.models.social', 'LinkedIn') => array('ha_linkedin_enabled', 'ha_linkedin_key', 'ha_linkedin_secret'),
-			Yii::t('ciims.models.social', 'AddThis') => array('addThisPublisherID')
+			Yii::t ('ciims.models.social', 'Twitter')  => array('ha_twitter_enabled', 'ha_twitter_key', 'ha_twitter_secret', 'ha_twitter_accessToken', 'ha_twitter_accessTokenSecret'),
+			Yii::t ('ciims.models.social', 'Facebook') => array('ha_facebook_enabled', 'ha_facebook_id', 'ha_facebook_secret', 'ha_facebook_scope'),
+			Yii::t ('ciims.models.social', 'Google+')  => array('ha_google_enabled', 'ha_google_id', 'ha_google_secret', 'ha_google_scope', 'google_plus_public_server_key'),
+			Yii::t ('ciims.models.social', 'LinkedIn') => array('ha_linkedin_enabled', 'ha_linkedin_key', 'ha_linkedin_secret'),
+			Yii::t ('ciims.models.social', 'AddThis') => array('addThisPublisherID')
 		);
 	}
 
-	public function rules()
+	public function rules ()
 	{
 		return array(
 			array('ha_twitter_key, ha_twitter_secret, ha_twitter_accessToken, ha_twitter_accessToken, ha_twitter_accessTokenSecret', 'length', 'max' => 255),
@@ -48,39 +48,39 @@ 
 		);
 	}
 
-	public function attributeLabels()
+	public function attributeLabels ()
 	{
 		return array(
-			'ha_twitter_enabled' => Yii::t('ciims.models.social', 'Social Auth'),
-			'ha_twitter_key' => Yii::t('ciims.models.social', 'Consumer Key'),
-			'ha_twitter_secret' => Yii::t('ciims.models.social', 'Consumer Secret'),
-			'ha_twitter_accessToken' => Yii::t('ciims.models.social', 'Access Token'),
-			'ha_twitter_accessTokenSecret' => Yii::t('ciims.models.social', 'Access Token Secret'),
+			'ha_twitter_enabled' => Yii::t ('ciims.models.social', 'Social Auth'),
+			'ha_twitter_key' => Yii::t ('ciims.models.social', 'Consumer Key'),
+			'ha_twitter_secret' => Yii::t ('ciims.models.social', 'Consumer Secret'),
+			'ha_twitter_accessToken' => Yii::t ('ciims.models.social', 'Access Token'),
+			'ha_twitter_accessTokenSecret' => Yii::t ('ciims.models.social', 'Access Token Secret'),
 
-			'ha_facebook_enabled' => Yii::t('ciims.models.social', 'Social Auth'),
-			'ha_facebook_id' => Yii::t('ciims.models.social', 'App ID'),
-			'ha_facebook_secret' => Yii::t('ciims.models.social', 'App Secret'),
-			'ha_facebook_scope' => Yii::t('ciims.models.social', 'Scope'),
+			'ha_facebook_enabled' => Yii::t ('ciims.models.social', 'Social Auth'),
+			'ha_facebook_id' => Yii::t ('ciims.models.social', 'App ID'),
+			'ha_facebook_secret' => Yii::t ('ciims.models.social', 'App Secret'),
+			'ha_facebook_scope' => Yii::t ('ciims.models.social', 'Scope'),
 
-			'ha_google_enabled' => Yii::t('ciims.models.social', 'Social Auth'),
-			'ha_google_id' => Yii::t('ciims.models.social', 'Client ID'),
-			'ha_google_secret' => Yii::t('ciims.models.social', 'Client Secret'),
-			'ha_google_scope' => Yii::t('ciims.models.social', 'Scope'),
-			'google_plus_public_server_key' => Yii::t('ciims.models.social', 'Public Server API Key'),
+			'ha_google_enabled' => Yii::t ('ciims.models.social', 'Social Auth'),
+			'ha_google_id' => Yii::t ('ciims.models.social', 'Client ID'),
+			'ha_google_secret' => Yii::t ('ciims.models.social', 'Client Secret'),
+			'ha_google_scope' => Yii::t ('ciims.models.social', 'Scope'),
+			'google_plus_public_server_key' => Yii::t ('ciims.models.social', 'Public Server API Key'),
 
-			'ha_linkedin_enabled' => Yii::t('ciims.models.social', 'Social Auth'),
-			'ha_linkedin_key' => Yii::t('ciims.models.social', 'Consumer Key'),
-			'ha_linkedin_secret' => Yii::t('ciims.models.social', 'Consumer Secret'),
+			'ha_linkedin_enabled' => Yii::t ('ciims.models.social', 'Social Auth'),
+			'ha_linkedin_key' => Yii::t ('ciims.models.social', 'Consumer Key'),
+			'ha_linkedin_secret' => Yii::t ('ciims.models.social', 'Consumer Secret'),
 
-			'addThisPublisherID' => Yii::t('ciims.models.social', 'AddThis Publisher ID')
+			'addThisPublisherID' => Yii::t ('ciims.models.social', 'AddThis Publisher ID')
 		);
 	}
 
-	public function afterSave()
+	public function afterSave ()
 	{
-		Yii::app()->cache->set('hybridauth_providers', false);
-		Cii::getHybridAuthProviders();
+		Yii::app ()->cache->set ('hybridauth_providers', false);
+		Cii::getHybridAuthProviders ();
 
-		return parent::afterSave();
+		return parent::afterSave ();
 	}
 }

protected/models/settings/ThemeSettings.php

Indentation +77 added lines, -77 removed lines

@@ -2,92 +2,92 @@
 

 class ThemeSettings extends CiiSettingsModel

 {

-	/**

-	 * The active theme

-	 * @var string

-	 */

-	public $theme = 'default';

+    /**

+     * The active theme

+     * @var string

+     */

+    public $theme = 'default';

 

-	/**

-	 * Validation rules for the theme

-	 * @return array

-	 */

-	public function rules()

-	{

-		return array(

-			array('theme', 'required'),

-			array('theme', 'length', 'max' => 255)

-		);

-	}

+    /**

+     * Validation rules for the theme

+     * @return array

+     */

+    public function rules()

+    {

+        return array(

+            array('theme', 'required'),

+            array('theme', 'length', 'max' => 255)

+        );

+    }

 

-	/**

-	 * Attribute labels for themes

-	 * @return array

-	 */

-	public function attributeLabels()

-	{

-		return array(

-			'theme' => Yii::t('ciims.models.theme', 'Theme'),

-		);

-	}

+    /**

+     * Attribute labels for themes

+     * @return array

+     */

+    public function attributeLabels()

+    {

+        return array(

+            'theme' => Yii::t('ciims.models.theme', 'Theme'),

+        );

+    }

 

-	/**

-	 * Returns the active theme name

-	 * @return string

-	 */

-	public function getTheme()

-	{

-		return $this->theme;

-	}

+    /**

+     * Returns the active theme name

+     * @return string

+     */

+    public function getTheme()

+    {

+        return $this->theme;

+    }

 

-	/**

-	 * Retrieves all of the themes from webroot.themes and returns them in an array group by type, each containing

-	 * the contents of theme.json.

-	 *

-	 * The themes are then cached for easy retrieval later. (I really hate unecessary DiskIO if something isn't changing...)

-	 *

-	 * @return array

-	 */

-	public function getThemes()

-	{

-		$themes = Yii::app()->cache->get('settings_themes');

+    /**

+     * Retrieves all of the themes from webroot.themes and returns them in an array group by type, each containing

+     * the contents of theme.json.

+     *

+     * The themes are then cached for easy retrieval later. (I really hate unecessary DiskIO if something isn't changing...)

+     *

+     * @return array

+     */

+    public function getThemes()

+    {

+        $themes = Yii::app()->cache->get('settings_themes');

 

-		if ($themes == false)

-		{

-			$themes = array();

-			$currentTheme = Cii::getConfig('theme');

-			$themePath = Yii::getPathOfAlias('base.themes') . DS;

-			$directories = glob($themePath . "*", GLOB_ONLYDIR);

+        if ($themes == false)

+        {

+            $themes = array();

+            $currentTheme = Cii::getConfig('theme');

+            $themePath = Yii::getPathOfAlias('base.themes') . DS;

+            $directories = glob($themePath . "*", GLOB_ONLYDIR);

 

-			// Pushes the current theme onto the top of the list

-			foreach ($directories as $k=>$dir)

-			{

-				if ($dir == Yii::getPathOfAlias('base.themes').DS.$currentTheme)

-				{

-					unset($directories[$k]);

-					break;

-				}

-			}

+            // Pushes the current theme onto the top of the list

+            foreach ($directories as $k=>$dir)

+            {

+                if ($dir == Yii::getPathOfAlias('base.themes').DS.$currentTheme)

+                {

+                    unset($directories[$k]);

+                    break;

+                }

+            }

 

-			array_unshift($directories, $themePath.$currentTheme);

+            array_unshift($directories, $themePath.$currentTheme);

 

-			foreach($directories as $dir)

-			{

-				$json = CJSON::decode(file_get_contents($dir . DIRECTORY_SEPARATOR . 'composer.json'));

-				$name = $json['name'];

-				$key = str_replace('ciims-themes/', '', $name);

+            foreach($directories as $dir)

+            {

+                $json = CJSON::decode(file_get_contents($dir . DIRECTORY_SEPARATOR . 'composer.json'));

+                $name = $json['name'];

+                $key = str_replace('ciims-themes/', '', $name);

 

-				$themes[$key] = array(

-					'path' 		=> $dir,

-					'name' 		=> $name,

-					'hidden' 	=> isset($json['hidden']) ? $json['hidden'] : false

-				);

-			}

+                $themes[$key] = array(

+                    'path' 		=> $dir,

+                    'name' 		=> $name,

+                    'hidden' 	=> isset($json['hidden']) ? $json['hidden'] : false

+                );

+            }

 

-			Yii::app()->cache->set('settings_themes', $themes);

-			return $themes;

-		}

+            Yii::app()->cache->set('settings_themes', $themes);

+            return $themes;

+        }

 

-		return $themes;

-	}

+        return $themes;

+    }

 }
\ No newline at end of file

Spacing +15 added lines, -15 removed lines

@@ -12,7 +12,7 @@ 
 	 * Validation rules for the theme

 	 * @return array

 	 */

-	public function rules()

+	public function rules ()

 	{

 		return array(

 			array('theme', 'required'),

@@ -24,10 +24,10 @@ 
 	 * Attribute labels for themes

 	 * @return array

 	 */

-	public function attributeLabels()

+	public function attributeLabels ()

 	{

 		return array(

-			'theme' => Yii::t('ciims.models.theme', 'Theme'),

+			'theme' => Yii::t ('ciims.models.theme', 'Theme'),

 		);

 	}

 

@@ -35,7 +35,7 @@ 
 	 * Returns the active theme name

 	 * @return string

 	 */

-	public function getTheme()

+	public function getTheme ()

 	{

 		return $this->theme;

 	}

@@ -48,34 +48,34 @@ 
 	 *

 	 * @return array

 	 */

-	public function getThemes()

+	public function getThemes ()

 	{

-		$themes = Yii::app()->cache->get('settings_themes');

+		$themes = Yii::app ()->cache->get ('settings_themes');

 

 		if ($themes == false)

 		{

 			$themes = array();

-			$currentTheme = Cii::getConfig('theme');

-			$themePath = Yii::getPathOfAlias('base.themes') . DS;

-			$directories = glob($themePath . "*", GLOB_ONLYDIR);

+			$currentTheme = Cii::getConfig ('theme');

+			$themePath = Yii::getPathOfAlias ('base.themes') . DS;

+			$directories = glob ($themePath . "*", GLOB_ONLYDIR);

 

 			// Pushes the current theme onto the top of the list

 			foreach ($directories as $k=>$dir)

 			{

-				if ($dir == Yii::getPathOfAlias('base.themes').DS.$currentTheme)

+				if ($dir == Yii::getPathOfAlias ('base.themes') . DS . $currentTheme)

 				{

 					unset($directories[$k]);

 					break;

 				}

 			}

 

-			array_unshift($directories, $themePath.$currentTheme);

+			array_unshift ($directories, $themePath . $currentTheme);

 

-			foreach($directories as $dir)

+			foreach ($directories as $dir)

 			{

-				$json = CJSON::decode(file_get_contents($dir . DIRECTORY_SEPARATOR . 'composer.json'));

+				$json = CJSON::decode (file_get_contents ($dir . DIRECTORY_SEPARATOR . 'composer.json'));

 				$name = $json['name'];

-				$key = str_replace('ciims-themes/', '', $name);

+				$key = str_replace ('ciims-themes/', '', $name);

 

 				$themes[$key] = array(

 					'path' 		=> $dir,

@@ -84,7 +84,7 @@ 
 				);

 			}

 

-			Yii::app()->cache->set('settings_themes', $themes);

+			Yii::app ()->cache->set ('settings_themes', $themes);

 			return $themes;

 		}

 

Braces +10 added lines, -10 removed lines

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

 

-class ThemeSettings extends CiiSettingsModel

-{

+class ThemeSettings extends CiiSettingsModel
+{
 	/**

 	 * The active theme

 	 * @var string

@@ -12,8 +12,8 @@ 
 	 * Validation rules for the theme

 	 * @return array

 	 */

-	public function rules()

-	{

+	public function rules()
+	{
 		return array(

 			array('theme', 'required'),

 			array('theme', 'length', 'max' => 255)

@@ -24,8 +24,8 @@ 
 	 * Attribute labels for themes

 	 * @return array

 	 */

-	public function attributeLabels()

-	{

+	public function attributeLabels()
+	{
 		return array(

 			'theme' => Yii::t('ciims.models.theme', 'Theme'),

 		);

@@ -35,8 +35,8 @@ 
 	 * Returns the active theme name

 	 * @return string

 	 */

-	public function getTheme()

-	{

+	public function getTheme()
+	{
 		return $this->theme;

 	}

 

@@ -48,8 +48,8 @@ 
 	 *

 	 * @return array

 	 */

-	public function getThemes()

-	{

+	public function getThemes()
+	{
 		$themes = Yii::app()->cache->get('settings_themes');

 

 		if ($themes == false)

protected/views/site/attached-content.php

Spacing +2 added lines, -2 removed lines

@@ -1,3 +1,3 @@
-<?php if (Cii::get($meta, 'blog-image', "") != ""): ?>

-	<p style="text-align:center;"><?php echo CHtml::image(Yii::app()->baseUrl . $meta['blog-image'], NULL, array('class'=>'image')); ?></p>

+<?php if (Cii::get ($meta, 'blog-image', "") != ""): ?>

+	<p style="text-align:center;"><?php echo CHtml::image (Yii::app ()->baseUrl . $meta['blog-image'], NULL, array('class'=>'image')); ?></p>

 <?php endif; ?>
\ No newline at end of file

protected/views/site/error.php

Spacing +1 added lines, -1 removed lines

@@ -1,2 +1,2 @@
-<h1><?php echo Yii::t('ciims.controllers.Site', 'Error {{code}}', array('{{code}}' => $error['code'])); ?></h1>
+<h1><?php echo Yii::t ('ciims.controllers.Site', 'Error {{code}}', array('{{code}}' => $error['code'])); ?></h1>
 <p><?php echo $error['message']; ?></p>

protected/views/site/rss.php

Indentation +3 added lines, -3 removed lines

@@ -17,9 +17,9 @@
 				<link><?php echo $url.'/'.htmlspecialchars(str_replace('/', '', $v['slug']), ENT_QUOTES, "utf-8"); ?></link>
 				<description>
 					<?php 
-						$md = new CMarkdownParser; 
-						echo htmlspecialchars(strip_tags($md->transform($v['extract'])), ENT_QUOTES, "utf-8"); 
-					?>
+                        $md = new CMarkdownParser; 
+                        echo htmlspecialchars(strip_tags($md->transform($v['extract'])), ENT_QUOTES, "utf-8"); 
+                    ?>
 				</description>
 				<category><?php echo htmlspecialchars(Categories::model()->findByPk($v['category_id'])->name,  ENT_QUOTES, "utf-8"); ?></category>
 				<author><?php echo Users::model()->findByPk($v['author_id'])->email; ?> (<?php echo Users::model()->findByPk($v['author_id'])->username; ?>)</author>

Spacing +13 added lines, -13 removed lines

@@ -1,32 +1,32 @@
 <?php echo '<?xml version="1.0" encoding="UTF-8" ?>'; ?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
 	<channel>
-		<atom:link href="<?php echo $url.Yii::app()->request->requestUri; ?>" rel="self" type="application/rss+xml" />
-		<title><?php echo Cii::getConfig('name', Yii::app()->name); ?></title>
+		<atom:link href="<?php echo $url . Yii::app ()->request->requestUri; ?>" rel="self" type="application/rss+xml" />
+		<title><?php echo Cii::getConfig ('name', Yii::app ()->name); ?></title>
 		<link><?php echo $url; ?></link>
-		<description><?php echo Cii::getConfig('name', Yii::app()->name); ?> Blog</description>
+		<description><?php echo Cii::getConfig ('name', Yii::app ()->name); ?> Blog</description>
 		<language>en-us</language>
-		<pubDate><?php echo date('D, d M Y H:i:s T'); ?></pubDate>
-		<lastBuildDate><?php echo date('D, d M Y H:i:s T'); ?></lastBuildDate>
+		<pubDate><?php echo date ('D, d M Y H:i:s T'); ?></pubDate>
+		<lastBuildDate><?php echo date ('D, d M Y H:i:s T'); ?></lastBuildDate>
 		<docs>http://blogs.law.harvard.edu/tech/rss</docs>
 	
 		<?php foreach ($data as $k=>$v): ?>
 			<?php if ($v->password != '') { continue; } ?>
 			<item>
-				<title><?php echo htmlspecialchars(str_replace('/', '', $v['title']), ENT_QUOTES, "utf-8"); ?></title>
-				<link><?php echo $url.'/'.htmlspecialchars(str_replace('/', '', $v['slug']), ENT_QUOTES, "utf-8"); ?></link>
+				<title><?php echo htmlspecialchars (str_replace ('/', '', $v['title']), ENT_QUOTES, "utf-8"); ?></title>
+				<link><?php echo $url . '/' . htmlspecialchars (str_replace ('/', '', $v['slug']), ENT_QUOTES, "utf-8"); ?></link>
 				<description>
 					<?php 
 						$md = new CMarkdownParser; 
-						echo htmlspecialchars(strip_tags($md->transform($v['extract'])), ENT_QUOTES, "utf-8"); 
+						echo htmlspecialchars (strip_tags ($md->transform ($v['extract'])), ENT_QUOTES, "utf-8"); 
 					?>
 				</description>
-				<category><?php echo htmlspecialchars(Categories::model()->findByPk($v['category_id'])->name,  ENT_QUOTES, "utf-8"); ?></category>
-				<author><?php echo Users::model()->findByPk($v['author_id'])->email; ?> (<?php echo Users::model()->findByPk($v['author_id'])->username; ?>)</author>
-				<pubDate><?php echo date('D, d M Y H:i:s T', strtotime($v['created'])); ?></pubDate>
-				<guid><?php echo $url.'/'.htmlspecialchars(str_replace('/', '', $v['slug']), ENT_QUOTES, "utf-8"); ?></guid>
+				<category><?php echo htmlspecialchars (Categories::model ()->findByPk ($v['category_id'])->name, ENT_QUOTES, "utf-8"); ?></category>
+				<author><?php echo Users::model ()->findByPk ($v['author_id'])->email; ?> (<?php echo Users::model ()->findByPk ($v['author_id'])->username; ?>)</author>
+				<pubDate><?php echo date ('D, d M Y H:i:s T', strtotime ($v['created'])); ?></pubDate>
+				<guid><?php echo $url . '/' . htmlspecialchars (str_replace ('/', '', $v['slug']), ENT_QUOTES, "utf-8"); ?></guid>
 				<?php if ($v['commentable']): ?>
-					<comments><?php echo $url.'/'.htmlspecialchars(str_replace('/', '', $v['slug']), ENT_QUOTES, "utf-8");; ?>#comments</comments>
+					<comments><?php echo $url . '/' . htmlspecialchars (str_replace ('/', '', $v['slug']), ENT_QUOTES, "utf-8"); ; ?>#comments</comments>
 				<?php endif; ?>
 			</item>
 		<?php endforeach; ?>	

protected/yiic.php

Indentation +12 added lines, -12 removed lines

@@ -2,18 +2,18 @@ 
 
 if ($_SERVER['SCRIPT_FILENAME'] == 'protected/yiic.php')
 {
-	echo "Use of `yiic.php` has been deprecated for CiiMS. Uses `index.php` instead\n";
-	die();
+    echo "Use of `yiic.php` has been deprecated for CiiMS. Uses `index.php` instead\n";
+    die();
 }
 
 if (getenv('CIIMS_INSTALL') == "true")
 {
-	if (!defined('CIIMS_INSTALL'))
-		define('CIIMS_INSTALL', true);
+    if (!defined('CIIMS_INSTALL'))
+        define('CIIMS_INSTALL', true);
 }
 
 if (!defined('CIIMS_INSTALL'))
-	define('CIIMS_INSTALL', false);
+    define('CIIMS_INSTALL', false);
 
 error_reporting(-1);
 ini_set('display_errors', 'true');
@@ -29,18 +29,18 @@ 
 Yii::setPathOfAlias('vendor', __DIR__.DS.'..'.DS.'vendor'.DS);
 
 if (!isset($_SERVER['CIIMS_ENV']))
-	$_SERVER['CIIMS_ENV'] = 'main';
+    $_SERVER['CIIMS_ENV'] = 'main';
 
 $config = __DIR__.DS.'config'.DS.$_SERVER['CIIMS_ENV'].'.php';
 $defaultConfig=__DIR__.DS.'config'.DS.'main.default.php';
 
 if (file_exists(__DIR__.DS.'/config/main.php'))
-	$config = require $config;
+    $config = require $config;
 else
-	$config = array();
+    $config = array();
 
 if (CIIMS_INSTALL)
-	$config = array();
+    $config = array();
 
 $defaultConfig = require $defaultConfig;
 
@@ -53,14 +53,14 @@ 
 $env=@getenv('YII_CONSOLE_COMMANDS');
 
 if(!empty($env))
-	$app->commandRunner->addCommands($env);
+    $app->commandRunner->addCommands($env);
 
 $modules = array_filter(glob(__DIR__.'/modules/*', GLOB_ONLYDIR));
 
 foreach ($modules as $module)
 {
-	if (file_exists($module.'/commands'))
-		$app->commandRunner->addCommands($module.'/commands');
+    if (file_exists($module.'/commands'))
+        $app->commandRunner->addCommands($module.'/commands');
 }
 
 return $app->run();

Spacing +25 added lines, -25 removed lines

@@ -6,35 +6,35 @@ 
 	die();
 }
 
-if (getenv('CIIMS_INSTALL') == "true")
+if (getenv ('CIIMS_INSTALL') == "true")
 {
-	if (!defined('CIIMS_INSTALL'))
-		define('CIIMS_INSTALL', true);
+	if (!defined ('CIIMS_INSTALL'))
+		define ('CIIMS_INSTALL', true);
 }
 
-if (!defined('CIIMS_INSTALL'))
-	define('CIIMS_INSTALL', false);
+if (!defined ('CIIMS_INSTALL'))
+	define ('CIIMS_INSTALL', false);
 
-error_reporting(-1);
-ini_set('display_errors', 'true');
+error_reporting (-1);
+ini_set ('display_errors', 'true');
 date_default_timezone_set ('UTC');
-defined('DS') or define('DS', DIRECTORY_SEPARATOR);
+defined ('DS') or define ('DS', DIRECTORY_SEPARATOR);
 
-defined('YII_DEBUG') or define('YII_DEBUG', true);
+defined ('YII_DEBUG') or define ('YII_DEBUG', true);
 
 // Include the composer dependencies
-require(__DIR__.DS.'..'.DS.'vendor'.DS.'autoload.php');
-require(__DIR__.DS.'..'.DS.'vendor'.DS.'yiisoft'.DS.'yii'.DS.'framework'.DS.'yii.php');
+require(__DIR__ . DS . '..' . DS . 'vendor' . DS . 'autoload.php');
+require(__DIR__ . DS . '..' . DS . 'vendor' . DS . 'yiisoft' . DS . 'yii' . DS . 'framework' . DS . 'yii.php');
 
-Yii::setPathOfAlias('vendor', __DIR__.DS.'..'.DS.'vendor'.DS);
+Yii::setPathOfAlias ('vendor', __DIR__ . DS . '..' . DS . 'vendor' . DS);
 
 if (!isset($_SERVER['CIIMS_ENV']))
 	$_SERVER['CIIMS_ENV'] = 'main';
 
-$config = __DIR__.DS.'config'.DS.$_SERVER['CIIMS_ENV'].'.php';
-$defaultConfig=__DIR__.DS.'config'.DS.'main.default.php';
+$config = __DIR__ . DS . 'config' . DS . $_SERVER['CIIMS_ENV'] . '.php';
+$defaultConfig = __DIR__ . DS . 'config' . DS . 'main.default.php';
 
-if (file_exists(__DIR__.DS.'/config/main.php'))
+if (file_exists (__DIR__ . DS . '/config/main.php'))
 	$config = require $config;
 else
 	$config = array();
@@ -44,23 +44,23 @@ 
 
 $defaultConfig = require $defaultConfig;
 
-$config = CMap::mergeArray($defaultConfig, $config);
+$config = CMap::mergeArray ($defaultConfig, $config);
 
 unset($config['components']['user']);
 
-$app=Yii::createConsoleApplication($config);
-$app->commandRunner->addCommands(YII_PATH.'/cli/commands');
-$env=@getenv('YII_CONSOLE_COMMANDS');
+$app = Yii::createConsoleApplication ($config);
+$app->commandRunner->addCommands (YII_PATH . '/cli/commands');
+$env = @getenv ('YII_CONSOLE_COMMANDS');
 
-if(!empty($env))
-	$app->commandRunner->addCommands($env);
+if (!empty($env))
+	$app->commandRunner->addCommands ($env);
 
-$modules = array_filter(glob(__DIR__.'/modules/*', GLOB_ONLYDIR));
+$modules = array_filter (glob (__DIR__ . '/modules/*', GLOB_ONLYDIR));
 
 foreach ($modules as $module)
 {
-	if (file_exists($module.'/commands'))
-		$app->commandRunner->addCommands($module.'/commands');
+	if (file_exists ($module . '/commands'))
+		$app->commandRunner->addCommands ($module . '/commands');
 }
 
-return $app->run();
+return $app->run ();

Braces +19 added lines, -12 removed lines

@@ -8,12 +8,14 @@ 
 
 if (getenv('CIIMS_INSTALL') == "true")
 {
-	if (!defined('CIIMS_INSTALL'))
-		define('CIIMS_INSTALL', true);
-}
+	if (!defined('CIIMS_INSTALL')) {
+			define('CIIMS_INSTALL', true);
+	}
+	}
 
-if (!defined('CIIMS_INSTALL'))
+if (!defined('CIIMS_INSTALL')) {
 	define('CIIMS_INSTALL', false);
+}
 
 error_reporting(-1);
 ini_set('display_errors', 'true');
@@ -28,19 +30,22 @@ 
 
 Yii::setPathOfAlias('vendor', __DIR__.DS.'..'.DS.'vendor'.DS);
 
-if (!isset($_SERVER['CIIMS_ENV']))
+if (!isset($_SERVER['CIIMS_ENV'])) {
 	$_SERVER['CIIMS_ENV'] = 'main';
+}
 
 $config = __DIR__.DS.'config'.DS.$_SERVER['CIIMS_ENV'].'.php';
 $defaultConfig=__DIR__.DS.'config'.DS.'main.default.php';
 
-if (file_exists(__DIR__.DS.'/config/main.php'))
+if (file_exists(__DIR__.DS.'/config/main.php')) {
 	$config = require $config;
-else
+} else {
 	$config = array();
+}
 
-if (CIIMS_INSTALL)
+if (CIIMS_INSTALL) {
 	$config = array();
+}
 
 $defaultConfig = require $defaultConfig;
 
@@ -52,15 +57,17 @@ 
 $app->commandRunner->addCommands(YII_PATH.'/cli/commands');
 $env=@getenv('YII_CONSOLE_COMMANDS');
 
-if(!empty($env))
+if(!empty($env)) {
 	$app->commandRunner->addCommands($env);
+}
 
 $modules = array_filter(glob(__DIR__.'/modules/*', GLOB_ONLYDIR));
 
 foreach ($modules as $module)
 {
-	if (file_exists($module.'/commands'))
-		$app->commandRunner->addCommands($module.'/commands');
-}
+	if (file_exists($module.'/commands')) {
+			$app->commandRunner->addCommands($module.'/commands');
+	}
+	}
 
 return $app->run();

web/index.php

Spacing +22 added lines, -22 removed lines

@@ -7,54 +7,54 @@ 
  * You should _never_ have to change _anything_ in this file _ever_
  */
 
-defined('DS') or define('DS', DIRECTORY_SEPARATOR);
-defined('BASEDIR') or define('BASEDIR', __DIR__ . DS . '..' . DS);
+defined ('DS') or define ('DS', DIRECTORY_SEPARATOR);
+defined ('BASEDIR') or define ('BASEDIR', __DIR__ . DS . '..' . DS);
 
 // Bypass Yiic entirely and use this instead as the cli bootstrapper
-if (php_sapi_name() === 'cli')
-	return require BASEDIR.'protected'.DS.'yiic.php';
+if (php_sapi_name () === 'cli')
+	return require BASEDIR . 'protected' . DS . 'yiic.php';
 
 // Disable Error Reporting and set some constants
-error_reporting(0);
-ini_set('display_errors', 'false');
-date_default_timezone_set('UTC');
+error_reporting (0);
+ini_set ('display_errors', 'false');
+date_default_timezone_set ('UTC');
 
 
 // This is the configuration file
 if (!isset($_SERVER['CIIMS_ENV']))
 	$_SERVER['CIIMS_ENV'] = 'main';
 
-$config = BASEDIR.'protected'.DS.'config'.DS.$_SERVER['CIIMS_ENV'].'.php';
-$defaultConfig = BASEDIR.'protected'.DS.'config'.DS.'main.default.php';
+$config = BASEDIR . 'protected' . DS . 'config' . DS . $_SERVER['CIIMS_ENV'] . '.php';
+$defaultConfig = BASEDIR . 'protected' . DS . 'config' . DS . 'main.default.php';
 
 // If we don't have a configuration file, run the installer.
-if (!file_exists($config) && file_exists('install.php'))
+if (!file_exists ($config) && file_exists ('install.php'))
 {
 	require('install.php');
 	exit();
 }
 
 $config = require($config);
-defined('YII_DEBUG') or define('YII_DEBUG',isset($config['params']['debug']) ? $config['params']['debug'] : false);
-defined('YII_TRACE_LEVEL') or define('YII_TRACE_LEVEL',isset($config['params']['trace']) ? $config['params']['trace'] : 0);
+defined ('YII_DEBUG') or define ('YII_DEBUG', isset($config['params']['debug']) ? $config['params']['debug'] : false);
+defined ('YII_TRACE_LEVEL') or define ('YII_TRACE_LEVEL', isset($config['params']['trace']) ? $config['params']['trace'] : 0);
 
 // Load the config file
 $defaultConfig = require($defaultConfig);
 
 // Include the composer dependencies
-require_once BASEDIR.'vendor'.DS.'autoload.php';
-require_once BASEDIR.'vendor'.DS.'yiisoft'.DS.'yii'.DS.'framework'.DS.(YII_DEBUG ? 'yii.php' : 'yiilite.php');
+require_once BASEDIR . 'vendor' . DS . 'autoload.php';
+require_once BASEDIR . 'vendor' . DS . 'yiisoft' . DS . 'yii' . DS . 'framework' . DS . (YII_DEBUG ? 'yii.php' : 'yiilite.php');
 
-Yii::setPathOfAlias('vendor', BASEDIR.'vendor');
-Yii::setPathOfAlias('base', BASEDIR);
-Yii::setPathOfAlias('ext.yiinfinite-scroll.YiinfiniteScroller', Yii::getPathOfAlias('vendor.charlesportwoodii.ciinfinite-scroll.YiinfiniteScroller'));
+Yii::setPathOfAlias ('vendor', BASEDIR . 'vendor');
+Yii::setPathOfAlias ('base', BASEDIR);
+Yii::setPathOfAlias ('ext.yiinfinite-scroll.YiinfiniteScroller', Yii::getPathOfAlias ('vendor.charlesportwoodii.ciinfinite-scroll.YiinfiniteScroller'));
 
 // Merge it with our default config file
-$config = CMap::mergeArray($defaultConfig, $config);
+$config = CMap::mergeArray ($defaultConfig, $config);
 
 // Include the ClassMap for enhanced performance if we're not in debug mode
 if (!YII_DEBUG)
-	require_once BASEDIR.'protected'.DS.'config'.DS.'classmap.php';
+	require_once BASEDIR . 'protected' . DS . 'config' . DS . 'classmap.php';
 
 $config['components']['db']['enableProfiling'] = YII_DEBUG;
 $config['components']['db']['enableParamLogging'] = YII_DEBUG;
@@ -62,8 +62,8 @@ 
 // If debug mode is enabled, show us every possible error anywhere.
 if (YII_DEBUG && YII_TRACE_LEVEL == 3)
 {
-	error_reporting(-1);
-	ini_set('display_errors', 'true');
+	error_reporting (-1);
+	ini_set ('display_errors', 'true');
 
 	// Enable WebLogRouteLogging
 	$config['preload'][] = 'log';
@@ -74,4 +74,4 @@ 
 }
 
 // Run the Yii application instance
-Yii::createWebApplication($config)->run();
+Yii::createWebApplication ($config)->run ();

Braces +10 added lines, -6 removed lines

@@ -11,8 +11,9 @@ 
 defined('BASEDIR') or define('BASEDIR', __DIR__ . DS . '..' . DS);
 
 // Bypass Yiic entirely and use this instead as the cli bootstrapper
-if (php_sapi_name() === 'cli')
+if (php_sapi_name() === 'cli') {
 	return require BASEDIR.'protected'.DS.'yiic.php';
+}
 
 // Disable Error Reporting and set some constants
 error_reporting(0);
@@ -21,8 +22,9 @@ 
 
 
 // This is the configuration file
-if (!isset($_SERVER['CIIMS_ENV']))
+if (!isset($_SERVER['CIIMS_ENV'])) {
 	$_SERVER['CIIMS_ENV'] = 'main';
+}
 
 $config = BASEDIR.'protected'.DS.'config'.DS.$_SERVER['CIIMS_ENV'].'.php';
 $defaultConfig = BASEDIR.'protected'.DS.'config'.DS.'main.default.php';
@@ -53,8 +55,9 @@ 
 $config = CMap::mergeArray($defaultConfig, $config);
 
 // Include the ClassMap for enhanced performance if we're not in debug mode
-if (!YII_DEBUG)
+if (!YII_DEBUG) {
 	require_once BASEDIR.'protected'.DS.'config'.DS.'classmap.php';
+}
 
 $config['components']['db']['enableProfiling'] = YII_DEBUG;
 $config['components']['db']['enableParamLogging'] = YII_DEBUG;
@@ -69,9 +72,10 @@ 
 	$config['preload'][] = 'log';
 
 	// Enable all the logging routes
-	foreach ($config['components']['log']['routes'] as $k=>$v)
-	$config['components']['log']['routes'][$k]['enabled'] = YII_DEBUG;
-}
+	foreach ($config['components']['log']['routes'] as $k=>$v) {
+		$config['components']['log']['routes'][$k]['enabled'] = YII_DEBUG;
+	}
+	}
 
 // Run the Yii application instance
 Yii::createWebApplication($config)->run();

Indentation +18 added lines, -18 removed lines

@@ -1,18 +1,18 @@ 
 <?php
 /**
- * This is the primary bootstrapper for CiiMS. Almost every option is derived from the
- * configuration file or the default configuration file. This bootstrapper also disables error
- * reporting so that E_NOTICES and non-fatal errors don't crash it.
- *
- * You should _never_ have to change _anything_ in this file _ever_
- */
+     * This is the primary bootstrapper for CiiMS. Almost every option is derived from the
+     * configuration file or the default configuration file. This bootstrapper also disables error
+     * reporting so that E_NOTICES and non-fatal errors don't crash it.
+     *
+     * You should _never_ have to change _anything_ in this file _ever_
+     */
 
 defined('DS') or define('DS', DIRECTORY_SEPARATOR);
 defined('BASEDIR') or define('BASEDIR', __DIR__ . DS . '..' . DS);
 
 // Bypass Yiic entirely and use this instead as the cli bootstrapper
 if (php_sapi_name() === 'cli')
-	return require BASEDIR.'protected'.DS.'yiic.php';
+    return require BASEDIR.'protected'.DS.'yiic.php';
 
 // Disable Error Reporting and set some constants
 error_reporting(0);
@@ -22,7 +22,7 @@ 
 
 // This is the configuration file
 if (!isset($_SERVER['CIIMS_ENV']))
-	$_SERVER['CIIMS_ENV'] = 'main';
+    $_SERVER['CIIMS_ENV'] = 'main';
 
 $config = BASEDIR.'protected'.DS.'config'.DS.$_SERVER['CIIMS_ENV'].'.php';
 $defaultConfig = BASEDIR.'protected'.DS.'config'.DS.'main.default.php';
@@ -30,8 +30,8 @@ 
 // If we don't have a configuration file, run the installer.
 if (!file_exists($config) && file_exists('install.php'))
 {
-	require('install.php');
-	exit();
+    require('install.php');
+    exit();
 }
 
 $config = require($config);
@@ -54,7 +54,7 @@ 
 
 // Include the ClassMap for enhanced performance if we're not in debug mode
 if (!YII_DEBUG)
-	require_once BASEDIR.'protected'.DS.'config'.DS.'classmap.php';
+    require_once BASEDIR.'protected'.DS.'config'.DS.'classmap.php';
 
 $config['components']['db']['enableProfiling'] = YII_DEBUG;
 $config['components']['db']['enableParamLogging'] = YII_DEBUG;
@@ -62,15 +62,15 @@ 
 // If debug mode is enabled, show us every possible error anywhere.
 if (YII_DEBUG && YII_TRACE_LEVEL == 3)
 {
-	error_reporting(-1);
-	ini_set('display_errors', 'true');
+    error_reporting(-1);
+    ini_set('display_errors', 'true');
 
-	// Enable WebLogRouteLogging
-	$config['preload'][] = 'log';
+    // Enable WebLogRouteLogging
+    $config['preload'][] = 'log';
 
-	// Enable all the logging routes
-	foreach ($config['components']['log']['routes'] as $k=>$v)
-	$config['components']['log']['routes'][$k]['enabled'] = YII_DEBUG;
+    // Enable all the logging routes
+    foreach ($config['components']['log']['routes'] as $k=>$v)
+    $config['components']['log']['routes'][$k]['enabled'] = YII_DEBUG;
 }
 
 // Run the Yii application instance

web/install.php

Indentation +2 added lines, -2 removed lines

@@ -26,8 +26,8 @@
 defined('CIIMS_INSTALL') or define('CIIMS_INSTALL', true);
 if (!file_exists($mainConfig) && !file_exists($yiiPath))
 {
-	require(dirname(__FILE__).'/protected/modules/install/init.php');
-	exit();
+    require(dirname(__FILE__).'/protected/modules/install/init.php');
+    exit();
 }
 
 require_once($yiiPath);

Spacing +17 added lines, -17 removed lines

@@ -9,30 +9,30 @@
  * Otherwise, this is a basic Yii App running only the install module
  */
 
-defined('DS') or define('DS', DIRECTORY_SEPARATOR);
-defined('BASEDIR') or define('BASEDIR', __DIR__ . DS . '..' . DS);
-error_reporting(-1);
-ini_set('display_errors', 'true');
+defined ('DS') or define ('DS', DIRECTORY_SEPARATOR);
+defined ('BASEDIR') or define ('BASEDIR', __DIR__ . DS . '..' . DS);
+error_reporting (-1);
+ini_set ('display_errors', 'true');
 
-$yiiPath = BASEDIR.'vendor'.DS.'yiisoft'.DS.'yii'.DS.'framework'.DS.'yiilite.php';
-require_once BASEDIR.'vendor'.DS.'autoload.php';
+$yiiPath = BASEDIR . 'vendor' . DS . 'yiisoft' . DS . 'yii' . DS . 'framework' . DS . 'yiilite.php';
+require_once BASEDIR . 'vendor' . DS . 'autoload.php';
 
-$config = BASEDIR.'protected'.DS.'config'.DS.'install.php';
-$mainConfig = BASEDIR.'protected'.DS.'config'.DS.'main.php';
+$config = BASEDIR . 'protected' . DS . 'config' . DS . 'install.php';
+$mainConfig = BASEDIR . 'protected' . DS . 'config' . DS . 'main.php';
 $ciimsConfig = require($config);
 
-defined('YII_DEBUG') or define('YII_DEBUG',true);
-defined('YII_TRACE_LEVEL') or define('YII_TRACE_LEVEL',3);
-defined('CIIMS_INSTALL') or define('CIIMS_INSTALL', true);
-if (!file_exists($mainConfig) && !file_exists($yiiPath))
+defined ('YII_DEBUG') or define ('YII_DEBUG', true);
+defined ('YII_TRACE_LEVEL') or define ('YII_TRACE_LEVEL', 3);
+defined ('CIIMS_INSTALL') or define ('CIIMS_INSTALL', true);
+if (!file_exists ($mainConfig) && !file_exists ($yiiPath))
 {
-	require(dirname(__FILE__).'/protected/modules/install/init.php');
+	require(dirname (__FILE__) . '/protected/modules/install/init.php');
 	exit();
 }
 
 require_once($yiiPath);
-Yii::setPathOfAlias('vendor', BASEDIR.'vendor');
-Yii::setPathOfAlias('base', BASEDIR);
+Yii::setPathOfAlias ('vendor', BASEDIR . 'vendor');
+Yii::setPathOfAlias ('base', BASEDIR);
 
-$app = Yii::createWebApplication($config);
-$app->run();
+$app = Yii::createWebApplication ($config);
+$app->run ();

web/test.php

Indentation +4 added lines, -4 removed lines

@@ -12,7 +12,7 @@ 
 defined('YII_TRACE_LEVEL') or define('YII_TRACE_LEVEL',3);
 
 if (!isset($_SERVER['CIIMS_ENV']))
-	$_SERVER['CIIMS_ENV'] = 'main';
+    $_SERVER['CIIMS_ENV'] = 'main';
 
 $config = require BASEDIR.'protected'.DS.'config'.DS.$_SERVER['CIIMS_ENV'].'.php';
 $defaultConfig = require BASEDIR.'protected'.DS.'config'.DS.'main.default.php';
@@ -31,11 +31,11 @@ 
 
 // Set the request component in the test script
 $config['components']['request'] = array(
-	'class' => 'vendor.codeception.YiiBridge.web.CodeceptionHttpRequest'
+    'class' => 'vendor.codeception.YiiBridge.web.CodeceptionHttpRequest'
 );
 
 // Return for Codeception
 return array(
-	'class' => 'CWebApplication',
-	'config' => $config
+    'class' => 'CWebApplication',
+    'config' => $config
 );

Spacing +15 added lines, -15 removed lines

@@ -1,31 +1,31 @@
 <?php
 
 // Set Error Reporting Levels
-error_reporting(-1);
-ini_set('display_errors', 'true');
-date_default_timezone_set('UTC');
+error_reporting (-1);
+ini_set ('display_errors', 'true');
+date_default_timezone_set ('UTC');
 
 // Definitions
-defined('DS') or define('DS', DIRECTORY_SEPARATOR);
-defined('BASEDIR') or define('BASEDIR', __DIR__ . DS . '..' . DS);
-defined('YII_DEBUG') or define('YII_DEBUG',true);
-defined('YII_TRACE_LEVEL') or define('YII_TRACE_LEVEL',3);
+defined ('DS') or define ('DS', DIRECTORY_SEPARATOR);
+defined ('BASEDIR') or define ('BASEDIR', __DIR__ . DS . '..' . DS);
+defined ('YII_DEBUG') or define ('YII_DEBUG', true);
+defined ('YII_TRACE_LEVEL') or define ('YII_TRACE_LEVEL', 3);
 
 if (!isset($_SERVER['CIIMS_ENV']))
 	$_SERVER['CIIMS_ENV'] = 'main';
 
-$config = require BASEDIR.'protected'.DS.'config'.DS.$_SERVER['CIIMS_ENV'].'.php';
-$defaultConfig = require BASEDIR.'protected'.DS.'config'.DS.'main.default.php';
+$config = require BASEDIR . 'protected' . DS . 'config' . DS . $_SERVER['CIIMS_ENV'] . '.php';
+$defaultConfig = require BASEDIR . 'protected' . DS . 'config' . DS . 'main.default.php';
 
 // Load Yii and Composer extensions
-require_once BASEDIR.'vendor'.DS.'yiisoft'.DS.'yii'.DS.'framework'.DS.'yii.php';
-require_once BASEDIR.'vendor'.DS.'autoload.php';
+require_once BASEDIR . 'vendor' . DS . 'yiisoft' . DS . 'yii' . DS . 'framework' . DS . 'yii.php';
+require_once BASEDIR . 'vendor' . DS . 'autoload.php';
 
-Yii::setPathOfAlias('vendor', BASEDIR.'vendor');
-Yii::setPathOfAlias('base', BASEDIR);
-Yii::setPathOfAlias('ext.yiinfinite-scroll.YiinfiniteScroller', Yii::getPathOfAlias('vendor.charlesportwoodii.ciinfinite-scroll.YiinfiniteScroller'));
+Yii::setPathOfAlias ('vendor', BASEDIR . 'vendor');
+Yii::setPathOfAlias ('base', BASEDIR);
+Yii::setPathOfAlias ('ext.yiinfinite-scroll.YiinfiniteScroller', Yii::getPathOfAlias ('vendor.charlesportwoodii.ciinfinite-scroll.YiinfiniteScroller'));
 
-$config = CMap::mergeArray($defaultConfig, $config);
+$config = CMap::mergeArray ($defaultConfig, $config);
 
 $_SERVER['SERVER_NAME'] = 'localhost';
 

Braces +2 added lines, -1 removed lines

@@ -11,8 +11,9 @@
 defined('YII_DEBUG') or define('YII_DEBUG',true);
 defined('YII_TRACE_LEVEL') or define('YII_TRACE_LEVEL',3);
 
-if (!isset($_SERVER['CIIMS_ENV']))
+if (!isset($_SERVER['CIIMS_ENV'])) {
 	$_SERVER['CIIMS_ENV'] = 'main';
+}
 
 $config = require BASEDIR.'protected'.DS.'config'.DS.$_SERVER['CIIMS_ENV'].'.php';
 $defaultConfig = require BASEDIR.'protected'.DS.'config'.DS.'main.default.php';