newicon / neon

neon/settings/interfaces/ISettingsManager.php

Spacing +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@ 
 	 * @param boolean $refresh whther to refresh the cache before fetching this setting defaults to false
 	 * @return string
 	 */
-	public function get($app, $key, $default=null, $refresh=false);
+	public function get($app, $key, $default = null, $refresh = false);
 
 	/**
 	 * Set a setting value
@@ -44,7 +44,7 @@ 
 	 * @param boolean $refresh if true forces reftech fo the the settings
 	 * @return array in the format @see self::$_settings
 	 */
-	public function getSettings($refresh=false);
+	public function getSettings($refresh = false);
 
 	/**
 	 * Load the settings from the database and cache for the session
@@ -52,6 +52,6 @@ 
 	 * @param boolean $refresh if true forces refresh values from the database
 	 * @return array in the format @see self::$_settings
 	 */
-	public function getAll($refresh=false);
+	public function getAll($refresh = false);
 
 }

neon/settings/controllers/IndexController.php

Braces +3 added lines, -2 removed lines

@@ -15,8 +15,9 @@
 	{
 		$form = new \neon\settings\forms\AppSettings('setting');
 		$form->registerScripts($this->getView());
-		if (neon()->request->isAjax)
-			return $form->ajaxValidation();
+		if (neon()->request->isAjax) {
+					return $form->ajaxValidation();
+		}
 		$form->process();
 		return $this->render('index', [
 			'form' => $form,

neon/settings/forms/AppSettings.php

Spacing +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
 	public function loadFields()
 	{
 		$settings = neon()->settings->getAppSettings();
-		foreach($settings as $app => $config) {
+		foreach ($settings as $app => $config) {
 			if (is_array($config)) {
 				$this->addSubForm($app)->setFields($config)->setLabel(neon($app)->name);
 			}

Indentation +11 added lines, -11 removed lines

@@ -35,16 +35,16 @@ 
 	/**
 	 *
 	 */
-    public function process()
-    {
-	    if ($this->shouldProcess()) {
-		    $this->load();
-		    $this->validate();
-		    if ($this->hasError()) {
-			    neon()->session->setFlash('error', 'The form has errors.');
-		    } else {
-			    $this->saveToSettings();
-			    neon()->session->setFlash('success', 'Settings have been successfully saved.');
+	public function process()
+	{
+		if ($this->shouldProcess()) {
+			$this->load();
+			$this->validate();
+			if ($this->hasError()) {
+				neon()->session->setFlash('error', 'The form has errors.');
+			} else {
+				$this->saveToSettings();
+				neon()->session->setFlash('success', 'Settings have been successfully saved.');
 			}
 		} else {
 			$this->loadFieldValuesFromSettings();
@@ -66,7 +66,7 @@ 
 			foreach ($appSettings as $key => $value) {
 				// if the fields value is valid then save it
 				if ($appForm->getField($key)->validate()) {
-				    $saved = $this->getSettingsManager()->set($appKey, $key, $value);
+					$saved = $this->getSettingsManager()->set($appKey, $key, $value);
 				}
 			}   
 		}

neon/settings/migrations/m181127_165817_settings_update_settings_to_json.php

Braces +3 added lines, -2 removed lines

@@ -15,8 +15,9 @@
 		$success = true;
 		foreach ($settings as $setting) {
 			try {
-				if ($setting->value != null)
-					$setting->value = $this->_decode($setting->value);
+				if ($setting->value != null) {
+									$setting->value = $this->_decode($setting->value);
+				}
 			} catch (\Exception $e) {
 				dp("Error while decoding setting from json: {$setting->app} {$setting->key} {$setting->value}. Error is ".$e->getMessage());
 				dp('Trying to save it back as Json');

neon/settings/App.php

Indentation +2 added lines, -2 removed lines

@@ -22,8 +22,8 @@
 
 	/**
 	 * Get all registered settings for each neon app
-     * ??? This should be in the settings manager ???
-     *
+	 * ??? This should be in the settings manager ???
+	 *
 	 * @return array
 	 */
 	public function getAppSettings()

Spacing +4 added lines, -4 removed lines

@@ -29,7 +29,7 @@ 
 	public function getAppSettings()
 	{
 		$ret = [];
-		foreach(neon()->getActiveApps() as $key => $app) {
+		foreach (neon()->getActiveApps() as $key => $app) {
 			if (!empty($app->getSettings())) {
 				$ret[$key] = $app->getSettings();
 			}
@@ -185,16 +185,16 @@ 
 
 	private function _itemLineDatetime($dateFormat, $exampleDate)
 	{
-		return neon()->formatter->asDatetime($exampleDate, $dateFormat) . "  -  $dateFormat";
+		return neon()->formatter->asDatetime($exampleDate, $dateFormat)."  -  $dateFormat";
 	}
 
 	private function _itemLine($dateFormat, $exampleDate)
 	{
-		return neon()->formatter->asDate($exampleDate, $dateFormat) . "  -  $dateFormat";
+		return neon()->formatter->asDate($exampleDate, $dateFormat)."  -  $dateFormat";
 	}
 
 	private function _itemLineTime($dateFormat, $exampleDate)
 	{
-		return neon()->formatter->asTime($exampleDate, $dateFormat) . "  -  $dateFormat";
+		return neon()->formatter->asTime($exampleDate, $dateFormat)."  -  $dateFormat";
 	}
 }

neon/install/forms/InstallDatabase.php

Spacing +9 added lines, -9 removed lines

@@ -6,7 +6,7 @@ 
 
 class InstallDatabase extends \yii\base\Model
 {
-	public $name='';
+	public $name = '';
 	public $username;
 	public $password;
 	public $host = 'localhost';
@@ -54,21 +54,21 @@ 
 		} else {
 			if ($result == InstallHelper::ERROR_DB_UNKNOWN_DATABASE) {
 				// Attempt to create the database (if asked to do so)
-				if ($this->create_database == 1 ) {
-					if (! $this->createDatabase($exception)) {
+				if ($this->create_database == 1) {
+					if (!$this->createDatabase($exception)) {
 						$this->error_message = 'cant_create_database';
-						$this->addError('name', 'Failed to create database "' . $this->name . '" Database error: ' . $exception);
+						$this->addError('name', 'Failed to create database "'.$this->name.'" Database error: '.$exception);
 					}
-				}  else {
+				} else {
 					// This is useful information - but not an error therefore in
-					if (! $this->isAjaxValidating) {
+					if (!$this->isAjaxValidating) {
 						$this->error_message = 'unknown_database';
-						$this->addError('name', 'Unknown database name "' . $this->name . '"');
+						$this->addError('name', 'Unknown database name "'.$this->name.'"');
 					}
 				}
 			} else if ($result == InstallHelper::ERROR_DB_UNKNOWN_HOST) {
 				$this->error_message = 'unknown_host';
-				$this->addError('host', 'Unknown host name "' . $this->host . '"');
+				$this->addError('host', 'Unknown host name "'.$this->host.'"');
 			} else if ($result == InstallHelper::ERROR_DB_ACCESS_DENIED) {
 				$this->error_message = 'access_denied';
 				$this->addError('username', 'The username either does not exist or does not work with the given password');
@@ -92,7 +92,7 @@ 
 			$config['dsn'] = 'mysql:host='.$this->host.';';
 			$connection = new \neon\core\db\Connection($config);
 			try {
-				$connection->createCommand('CREATE DATABASE ' . $this->name)->execute();
+				$connection->createCommand('CREATE DATABASE '.$this->name)->execute();
 			} catch (\yii\db\Exception $e) {
 				// could not create the database
 				$exception = $e->getMessage();

Braces +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 						$this->error_message = 'cant_create_database';
 						$this->addError('name', 'Failed to create database "' . $this->name . '" Database error: ' . $exception);
 					}
-				}  else {
+				} else {
 					// This is useful information - but not an error therefore in
 					if (! $this->isAjaxValidating) {
 						$this->error_message = 'unknown_database';

neon/core/mail/transport/MailgunTransport.php

Spacing +1 added lines, -1 removed lines

@@ -137,7 +137,7 @@
 	 */
 	protected function getTo(Swift_Mime_SimpleMessage $message)
 	{
-		return collect($this->allContacts($message))->map(function ($display, $address) {
+		return collect($this->allContacts($message))->map(function($display, $address) {
 			return $display ? $display." <{$address}>" : $address;
 		})->values()->implode(',');
 	}

Braces +3 added lines, -2 removed lines

@@ -56,8 +56,9 @@
 	 */
 	public function getClient()
 	{
-		if ($this->_client === null)
-			$this->_client = new Client();
+		if ($this->_client === null) {
+					$this->_client = new Client();
+		}
 		return $this->_client;
 	}
 

neon/core/themes/ni/Assets.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
 //		'theme.css',
 		'https://fonts.googleapis.com/css?family=Nunito+Sans:200,200i,300,300i,400,400i,600,600i,700,700i,800,900',
 	];
-	public $sourcePath = __DIR__ . '/assets';
+	public $sourcePath = __DIR__.'/assets';
 	public $depends = [
 //		'\neon\core\assets\CoreAsset',
 //		'\yii\bootstrap\BootstrapAsset',
@@ -29,6 +29,6 @@ 
 	public function init()
 	{
 		$info = neon()->assetManager->publish($this->sourcePath, $this->publishOptions);
-		neon()->view->registerJs('var NEON_THEME_URL = "' . $info[1] . '";', View::POS_HEAD, 'neonThemeData');
+		neon()->view->registerJs('var NEON_THEME_URL = "'.$info[1].'";', View::POS_HEAD, 'neonThemeData');
 	}
 }

neon/core/Env.php

Spacing +8 added lines, -8 removed lines

@@ -56,12 +56,12 @@ 
 	 * @param  string  $file  - the path to the config file
 	 * @throws \Exception - if the environment variable value is an array
 	 */
-	public static function setEnvironmentFromFile($file, $overwrite=false)
+	public static function setEnvironmentFromFile($file, $overwrite = false)
 	{
 		if (file_exists($file)) {
 			// we need to load in the locally set environment ini file
 			$iniSettings = parse_ini_file($file, false, INI_SCANNER_TYPED);
-			foreach($iniSettings as $name => $value) {
+			foreach ($iniSettings as $name => $value) {
 				Env::setEnvironmentVariable($name, $value, $overwrite);
 			}
 		}
@@ -75,7 +75,7 @@ 
 	 * @param  bool  $overwrite  Whether to force overwriting the environment variable if it already exists defaults to false
 	 * @throws \Exception - if the environment variable value is an array
 	 */
-	public static function setEnvironmentVariable($key, $value, $overwrite=false)
+	public static function setEnvironmentVariable($key, $value, $overwrite = false)
 	{
 		if (is_array($value)) {
 			throw new \Exception('Environment variables do not support nesting. The variable "'.print_r($key, true).'" is poop.');
@@ -109,10 +109,10 @@ 
 			throw new \Exception('DIR_ROOT constant must be defined as the path to the root of your neon application');
 		}
 
-		defined('DIR_CONFIG') || define('DIR_CONFIG', DIR_ROOT . '/config');
-		defined('DIR_VAR') || define('DIR_VAR', DIR_ROOT . '/var');
-		defined('DIR_SYSTEM') || define('DIR_SYSTEM', DIR_ROOT . '/system');
-		defined('DIR_PUBLIC') || define('DIR_PUBLIC', DIR_ROOT . '/public');
+		defined('DIR_CONFIG') || define('DIR_CONFIG', DIR_ROOT.'/config');
+		defined('DIR_VAR') || define('DIR_VAR', DIR_ROOT.'/var');
+		defined('DIR_SYSTEM') || define('DIR_SYSTEM', DIR_ROOT.'/system');
+		defined('DIR_PUBLIC') || define('DIR_PUBLIC', DIR_ROOT.'/public');
 
 		Env::environment();
 		if (!class_exists('Neon'))
@@ -159,7 +159,7 @@ 
 	 * @param string $name
 	 * @param boolean $saveToEnvFile
 	 */
-	private static function createEnvironmentVariable($name, $saveToEnvFile=true)
+	private static function createEnvironmentVariable($name, $saveToEnvFile = true)
 	{
 		$value = Hash::uuid64().Hash::uuid64().Hash::uuid64().Hash::uuid64();
 		if ($saveToEnvFile && file_exists(DIR_CONFIG.'/env.ini'))

Braces +12 added lines, -8 removed lines

@@ -34,8 +34,9 @@ 
 	 */
 	public static function getNeonSecret()
 	{
-		if (empty(env('NEON_SECRET')))
-			Env::createEnvironmentVariable('NEON_SECRET');
+		if (empty(env('NEON_SECRET'))) {
+					Env::createEnvironmentVariable('NEON_SECRET');
+		}
 		return env('NEON_SECRET');
 	}
 
@@ -45,8 +46,9 @@ 
 	 */
 	public static function getNeonEncryptionKey()
 	{
-		if (empty(env('NEON_ENCRYPTION_KEY')))
-			Env::createEnvironmentVariable('NEON_ENCRYPTION_KEY');
+		if (empty(env('NEON_ENCRYPTION_KEY'))) {
+					Env::createEnvironmentVariable('NEON_ENCRYPTION_KEY');
+		}
 		return env('NEON_ENCRYPTION_KEY');
 	}
 
@@ -115,8 +117,9 @@ 
 		defined('DIR_PUBLIC') || define('DIR_PUBLIC', DIR_ROOT . '/public');
 
 		Env::environment();
-		if (!class_exists('Neon'))
-			require DIR_NEON.'/core/Yii.php';
+		if (!class_exists('Neon')) {
+					require DIR_NEON.'/core/Yii.php';
+		}
 
 		\Neon::setAlias('neon', DIR_NEON);
 		\Neon::setAlias('root', DIR_ROOT);
@@ -162,8 +165,9 @@ 
 	private static function createEnvironmentVariable($name, $saveToEnvFile=true)
 	{
 		$value = Hash::uuid64().Hash::uuid64().Hash::uuid64().Hash::uuid64();
-		if ($saveToEnvFile && file_exists(DIR_CONFIG.'/env.ini'))
-			file_put_contents(DIR_CONFIG.'/env.ini', PHP_EOL."$name = '$value'", FILE_APPEND | LOCK_EX);
+		if ($saveToEnvFile && file_exists(DIR_CONFIG.'/env.ini')) {
+					file_put_contents(DIR_CONFIG.'/env.ini', PHP_EOL."$name = '$value'", FILE_APPEND | LOCK_EX);
+		}
 		static::setEnvironmentVariable($name, $value, true);
 	}