newicon / neon

neon/cms/controllers/RenderController.php

Spacing +5 added lines, -5 removed lines

@@ -82,13 +82,13 @@ 
 	 * slug it uses - without this property the canonical function will return the url of the first blog-post
 	 * (collection page) it finds.
 	 */
-	public function actionPage($nice_id, $slug='')
+	public function actionPage($nice_id, $slug = '')
 	{
 		\Neon::beginProfile('COBE::RENDER_ACTION', 'cobe');
 		$cms = $this->getCms();
 		$page = $cms->getPage();
 		// check the page with the nice_id exists
-		if (! $page->setById($nice_id)) {
+		if (!$page->setById($nice_id)) {
 			$this->pageNotFound();
 		}
 		//return neon()->view->injectHtml('');
@@ -103,7 +103,7 @@ 
 		}
 
 		// Don't display draft pages unless in edit mode.
-		if ($page->isStatusDraft() && ! $page->isInEditMode()) {
+		if ($page->isStatusDraft() && !$page->isInEditMode()) {
 			$this->pageNotFound();
 		}
 
@@ -135,8 +135,8 @@ 
 			->innerJoin(CmsPage::tableName(), 'cms_page.nice_id = cms_url.nice_id')
 			->where("status='PUBLISHED'")
 			->all()
-		)->reduce(function($carry, $url){
-			return $carry . "\t<url>\n\t\t<loc>" . url($url['url'], true) . "</loc>\n\t</url>" . "\n";
+		)->reduce(function($carry, $url) {
+			return $carry."\t<url>\n\t\t<loc>".url($url['url'], true)."</loc>\n\t</url>"."\n";
 		});
 		header('Content-Type:application/rss+xml');
 		echo '<?xml version="1.0" encoding="UTF-8"?>'."\n";

Braces +9 added lines, -6 removed lines

@@ -108,8 +108,9 @@ 
 		}
 
 		$render = $page->render();
-		if ($render === false)
-			throw new \yii\web\HttpException(404, 'No template found');
+		if ($render === false) {
+					throw new \yii\web\HttpException(404, 'No template found');
+		}
 
 		\Neon::endProfile('COBE::RENDER_ACTION', 'cobe');
 
@@ -153,10 +154,12 @@ 
 	{
 		$request = neon()->request;
 		$url = $request->get('page');
-		if (!$url)
-			$this->pageNotFound();
-		if (($urlEntry = CmsUrl::findByUrl($url)))
-			return $this->actionPage($urlEntry['nice_id']);
+		if (!$url) {
+					$this->pageNotFound();
+		}
+		if (($urlEntry = CmsUrl::findByUrl($url))) {
+					return $this->actionPage($urlEntry['nice_id']);
+		}
 		$this->pageNotFound();
 	}
 

neon/core/web/UrlManager.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	public function getCanonical()
 	{
 		$params = neon()->controller->actionParams;
-        $params[0] = neon()->controller->getRoute();
+		$params[0] = neon()->controller->getRoute();
 		$urlManager = neon()->getUrlManager();
 		$url = $urlManager->createUrl($params);
 		if (strpos($url, '://') === false) {

Spacing +2 added lines, -2 removed lines

@@ -28,9 +28,9 @@
 		if (strpos($url, '://') === false) {
 			$hostInfo = setting('cms', 'canonical', $urlManager->getHostInfo());
 			if (strncmp($url, '//', 2) === 0) {
-				$url = substr($hostInfo, 0, strpos($hostInfo, '://')) . ':' . $url;
+				$url = substr($hostInfo, 0, strpos($hostInfo, '://')).':'.$url;
 			} else {
-				$url = $hostInfo . $url;
+				$url = $hostInfo.$url;
 			}
 		}
 		return Url::ensureScheme($url, null);

neon/core/view/SmartySharedPlugins.php

Indentation +1 added lines, -4 removed lines

@@ -923,7 +923,4 @@
 		if (!empty($params['assign'])) {
 			$smarty->assign($params['assign'], $output);
 		} else {
-			return $output;
-		}
-	}
-}
+			return $output
\ No newline at end of file

Switch Indentation +1 added lines, -4 removed lines

@@ -923,7 +923,4 @@
 		if (!empty($params['assign'])) {
 			$smarty->assign($params['assign'], $output);
 		} else {
-			return $output;
-		}
-	}
-}
+			return $output
\ No newline at end of file

Braces +4 added lines, -5 removed lines

@@ -126,7 +126,9 @@ 
 	public function googleCode($params)
 	{
 		$id = setting('cms', 'google_code');
-		if (empty($id)) return '';
+		if (empty($id)) {
+			return '';
+		}
 		// if using google tag manager
 		if (substr($id, 0, 3) === 'GTM') {
 			$head = <<<HEADJS
@@ -923,7 +925,4 @@ 
 		if (!empty($params['assign'])) {
 			$smarty->assign($params['assign'], $output);
 		} else {
-			return $output;
-		}
-	}
-}
+			return $output
\ No newline at end of file

Upper-Lower-Casing +1 added lines, -4 removed lines

@@ -923,7 +923,4 @@
 		if (!empty($params['assign'])) {
 			$smarty->assign($params['assign'], $output);
 		} else {
-			return $output;
-		}
-	}
-}
+			return $output
\ No newline at end of file

Spacing +3 added lines, -6 removed lines

@@ -538,8 +538,8 @@ 
 
 		$html = [];
 		$params['loading'] = Arr::get($params, 'loading', 'lazy');
-		$params[Arr::get($params, 'srcset-name', 'srcset')] = Arr::get($params, 'srcset', $this->image_srcset(['src' => $id, 'quality'=> $quality, 'widths'=>$widths]));
-		$params[Arr::get($params, 'src-name', 'src')] = $this->firefly_image(['id' => $id, 'w' => (int)$srcWidth, 'q' => $quality]);
+		$params[Arr::get($params,  'srcset-name', 'srcset')] = Arr::get($params, 'srcset', $this->image_srcset(['src' => $id, 'quality'=> $quality, 'widths'=>$widths]));
+		$params[Arr::get($params,  'src-name', 'src')] = $this->firefly_image(['id' => $id, 'w' => (int)$srcWidth, 'q' => $quality]);
 
 		// alt
 		$params['alt'] = Arr::get($params, 'alt', $this->image_alt(['src' => $id]));
@@ -897,7 +897,4 @@ 
 		if (!empty($params['assign'])) {
 			$smarty->assign($params['assign'], $output);
 		} else {
-			return $output;
-		}
-	}
-}
+			return $output
\ No newline at end of file

neon/cms/components/CmsUrlRule.php

Spacing +2 added lines, -2 removed lines

@@ -30,11 +30,11 @@
 	 */
 	public function parseRequest($manager, $request)
 	{
-		$pathInfo = '/' . $request->getPathInfo();
+		$pathInfo = '/'.$request->getPathInfo();
 		$url = CmsUrl::find()->where(['url' => $pathInfo])->limit(1)->one();
 		// if the url is not in the url table then return false to continue processing other route rules
 		// typically in a neon setup the module/controller/action rule
-		if (! $url) return false;
+		if (!$url) return false;
 		// check if the url found represents a redirect
 		if ($url['redirect'] !== null) {
 			neon()->response->redirect($url['redirect'], 301)->send();

Braces +3 added lines, -1 removed lines

@@ -34,7 +34,9 @@
 		$url = CmsUrl::find()->where(['url' => $pathInfo])->limit(1)->one();
 		// if the url is not in the url table then return false to continue processing other route rules
 		// typically in a neon setup the module/controller/action rule
-		if (! $url) return false;
+		if (! $url) {
+			return false;
+		}
 		// check if the url found represents a redirect
 		if ($url['redirect'] !== null) {
 			neon()->response->redirect($url['redirect'], 301)->send();

neon/core/form/fields/el/SwitchInput.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 	public function getComponentDetails()
 	{
 		return [
-			'name' => 'switch',  'icon' => 'fa fa-toggle-on', 'group' => 'element ui',
+			'name' => 'switch', 'icon' => 'fa fa-toggle-on', 'group' => 'element ui',
 		];
 	}
 

neon/core/helpers/Html.php

Spacing +18 added lines, -18 removed lines

@@ -19,7 +19,7 @@ 
 	public static function displayAsTags($tagsArray, $class = 'label label-info')
 	{
 		$out = '';
-		foreach($tagsArray as $tag) {
+		foreach ($tagsArray as $tag) {
 			$out .= "<span class=\"$class\">$tag</span>";
 		}
 		return $out;
@@ -36,9 +36,9 @@ 
 	 *  - specify $options['icon']
 	 * @return string Html for the custom button
 	 */
-	public static function buttonCustom($url, $text, array $options=[])
+	public static function buttonCustom($url, $text, array $options = [])
 	{
-		$options['class'] = 'btn '. Arr::get($options, 'class', '');
+		$options['class'] = 'btn '.Arr::get($options, 'class', '');
 		$icon = Arr::remove($options, 'icon', '');
 		return self::a("<i class=\"$icon\"></i> ".$text, $url, $options);
 	}
@@ -50,10 +50,10 @@ 
 	 * @param string $text - button text
 	 * @return string Html for an edit button
 	 */
-	public static function buttonEdit($url, $text='Edit', $options=[])
+	public static function buttonEdit($url, $text = 'Edit', $options = [])
 	{
 		$options['icon'] = 'fa fa-pencil';
-		$options['class'] = 'btn-default ' . Arr::get($options, 'class', '');
+		$options['class'] = 'btn-default '.Arr::get($options, 'class', '');
 		return self::buttonCustom($url, $text, $options);
 	}
 
@@ -65,10 +65,10 @@ 
 	 * @see \yii\helpers\Url::to
 	 * @return string Html
 	 */
-	public static function buttonDelete($url, $text='Delete', $options=[])
+	public static function buttonDelete($url, $text = 'Delete', $options = [])
 	{
 		$options['icon'] = 'fa fa-trash';
-		$options['class'] =  'btn-danger ' . Arr::get($options, 'class', '');
+		$options['class'] = 'btn-danger '.Arr::get($options, 'class', '');
 		return self::buttonCustom($url, $text, $options);
 	}
 
@@ -80,7 +80,7 @@ 
 	 * @see \yii\helpers\Url::to
 	 * @return string Html
 	 */
-	public static function buttonAdd($url, $text='Add', $options=[])
+	public static function buttonAdd($url, $text = 'Add', $options = [])
 	{
 		$options['icon'] = 'fa fa-plus';
 		$options['class'] = 'btn-primary btn-add';
@@ -94,7 +94,7 @@ 
 	 * @param string $text button text
 	 * @return string Html
 	 */
-	public static function buttonCancel($url='', $text='Cancel', $options=[])
+	public static function buttonCancel($url = '', $text = 'Cancel', $options = [])
 	{
 		$options['icon'] = 'fa fa-arrow-left';
 		$options['class'] = 'btn-default btn-cancel';
@@ -130,7 +130,7 @@ 
 	public static function checkbox($name, $checked = false, $options = [])
 	{
 		$checkbox = parent::checkbox($name, $checked, $options);
-		return '<div class="checkbox">' . $checkbox . '</div>';
+		return '<div class="checkbox">'.$checkbox.'</div>';
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 	public static function radio($name, $checked = false, $options = [])
 	{
 		$radio = parent::radio($name, $checked, $options);
-		return '<div class="radio">' . $radio . '</div>';
+		return '<div class="radio">'.$radio.'</div>';
 	}
 
 	/**
@@ -239,13 +239,13 @@ 
 	protected static function processTags($openingTags, &$tagsProcessed)
 	{
 		// append the closing tags to the list and add a comma for splitting later
-		$tagsStr = str_replace('>','>,',($openingTags.str_replace('<','</',$openingTags)));
+		$tagsStr = str_replace('>', '>,', ($openingTags.str_replace('<', '</', $openingTags)));
 		// create the replacement code with a highly unlikely set of strings
 		$replaceStr = str_replace(['</', '<', '/>', '>'], ['__NEWICON_CLOSELT__', '__NEWICON_LT__', '__NEWICON_CLOSERT__', '__NEWICON_RT__'], $tagsStr);
 
 		// now create the replacement and returned tags
-		$replaceTags = explode(',', substr($replaceStr,0,-1)); // ignore trailing comma
-		$returnTags = explode(',', substr($tagsStr,0,-1)); // ignore trailing comma
+		$replaceTags = explode(',', substr($replaceStr, 0, -1)); // ignore trailing comma
+		$returnTags = explode(',', substr($tagsStr, 0, -1)); // ignore trailing comma
 		$tagsProcessed[$openingTags] = ['replace'=>$replaceTags, 'return'=>$returnTags];
 	}
 
@@ -258,7 +258,7 @@ 
 	 * @param string $empty - what to show if the field is empty
 	 * @return string html
 	 */
-	public static function highlight($search, $html, $empty='')
+	public static function highlight($search, $html, $empty = '')
 	{
 		if ($html === null)
 			return neon()->formatter->nullDisplay;
@@ -280,7 +280,7 @@ 
 				// loadHtml seems to ignore the LIBXML_ERR_NONE setting
 				// we don;t care if we are not given perfectly formed html
 				// Even if we have serious issues in the html `$dom->saveHtml` makes a good expected effort
-				@$dom->loadHTML('<?xml encoding="utf-8" ?>' . $html, LIBXML_HTML_NOIMPLIED + LIBXML_HTML_NODEFDTD + LIBXML_NONET + LIBXML_ERR_NONE);
+				@$dom->loadHTML('<?xml encoding="utf-8" ?>'.$html, LIBXML_HTML_NOIMPLIED + LIBXML_HTML_NODEFDTD + LIBXML_NONET + LIBXML_ERR_NONE);
 				$xpath = new DOMXPath($dom);
 				$s = htmlentities($s);
 				$findStack = [];
@@ -290,8 +290,8 @@ 
 					// appendXml is useless and will break easily when exposed to characters
 					// preg_replace is a million times more robust....
 					// So keep the dom parser happy by replacing its internal text with an md5 key
-					$replace = preg_replace('/(' . preg_quote($s) . ')/i', '<span class="neonSearchHighlight">$1</span>', htmlentities($node->nodeValue));
-					$key = '{[' . md5($replace) . ']}';
+					$replace = preg_replace('/('.preg_quote($s).')/i', '<span class="neonSearchHighlight">$1</span>', htmlentities($node->nodeValue));
+					$key = '{['.md5($replace).']}';
 					$findStack[$key] = $replace;
 					$f->appendXML($key);
 					$node->parentNode->replaceChild($f, $node);

Braces +21 added lines, -14 removed lines

@@ -157,8 +157,9 @@ 
 			self::processTags($allowableTags, $tagsProcessed);
 		}
 		if (is_array($value)) {
-			foreach ($value as $k => $v)
-				$value[$k] = static::sanitise($v, $allowableTags);
+			foreach ($value as $k => $v) {
+							$value[$k] = static::sanitise($v, $allowableTags);
+			}
 		} else {
 			if (!is_null($value)) {
 				if (isset($tagsProcessed[$allowableTags])) {
@@ -192,8 +193,9 @@ 
 	{
 		profile_begin('Html::purify', 'html');
 		if (is_array($value)) {
-			foreach ($value as $k => $v)
-				$value[$k] = static::purify($v, $allowedTags);
+			foreach ($value as $k => $v) {
+							$value[$k] = static::purify($v, $allowedTags);
+			}
 		} else {
 			if (!is_null($value)) {
 				if ($allowedTags === false) {
@@ -223,8 +225,9 @@ 
 	public static function encodeEntities($value, $entities = ENT_QUOTES)
 	{
 		if (is_array($value)) {
-			foreach ($value as $k => $v)
-				$value[$k] = static::encodeEntities($v, $entities);
+			foreach ($value as $k => $v) {
+							$value[$k] = static::encodeEntities($v, $entities);
+			}
 		} else {
 			$value = htmlentities($value, $entities);
 		}
@@ -260,18 +263,22 @@ 
 	 */
 	public static function highlight($search, $html, $empty='')
 	{
-		if ($html === null)
-			return neon()->formatter->nullDisplay;
-		if ($html === '')
-			return $empty;
-		if (empty($search))
-			return $html;
+		if ($html === null) {
+					return neon()->formatter->nullDisplay;
+		}
+		if ($html === '') {
+					return $empty;
+		}
+		if (empty($search)) {
+					return $html;
+		}
 
 		profile_begin('Html::Highlight');
 		// escape search and html entities as otherwise the loadHTML or appendXML
 		// can blow up if there are < & > in the data
-		if (!is_array($search))
-			$search = [$search];
+		if (!is_array($search)) {
+					$search = [$search];
+		}
 		try {
 			foreach ($search as $s) {
 				// now search and rebuild the data

neon/core/grid/column/Column.php

Spacing +22 added lines, -22 removed lines

@@ -173,7 +173,7 @@ 
 		return $this->_width;
 	}
 
-	public function __construct($config=[])
+	public function __construct($config = [])
 	{
 		parent::__construct($config);
 		if (!isset($config['key'])) {
@@ -273,7 +273,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function setIsSortable($sortable=true)
+	public function setIsSortable($sortable = true)
 	{
 		$this->_sortable = $sortable;
 		return $this;
@@ -287,7 +287,7 @@ 
 		return $this->_sortable;
 	}
 
-	public function setAsIndex($bool=true)
+	public function setAsIndex($bool = true)
 	{
 		$this->grid->setIndexedByColumn($this->key);
 		// thi is a bit gnarly but tests for yii Active record data providers specifically
@@ -355,7 +355,7 @@ 
 			return $this->_dataCellContentFunction;
 		}
 		// check for convention
-		$functionName = 'render' . $this->key;
+		$functionName = 'render'.$this->key;
 		if (method_exists($this->grid, $functionName) && $functionName !== 'renderfile') {
 			return $functionName;
 		}
@@ -426,7 +426,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function setDbField($field){
+	public function setDbField($field) {
 		$this->_dbField = $field;
 		return $this;
 	}
@@ -434,8 +434,8 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function getDbField(){
-		if ($this->_dbField === null){
+	public function getDbField() {
+		if ($this->_dbField === null) {
 			// set to be the key
 			$this->_dbField = $this->key;
 		}
@@ -452,7 +452,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function setDbSortField($field){
+	public function setDbSortField($field) {
 		$this->_dbSortField = $field;
 		return $this;
 	}
@@ -460,8 +460,8 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function getDbSortField(){
-		if ($this->_dbSortField === null){
+	public function getDbSortField() {
+		if ($this->_dbSortField === null) {
 			// set to be the key
 			$this->_dbSortField = $this->dbField;
 		}
@@ -510,9 +510,9 @@ 
 		if ($this->grid->hasSort($this->key)) {
 			$sort = $this->grid->hasSortDescending() ? ' - ' : ' + ';
 		}
-		$sortParam = $this->grid->hasSortDescending() ? $this->key : '-' . $this->key;
+		$sortParam = $this->grid->hasSortDescending() ? $this->key : '-'.$this->key;
 		$url = neon()->getUrlManager()->createUrl([\Yii::$app->controller->getRoute(), $this->grid->id => ['sort' => $sortParam]]);
-		return Html::a($this->getTitle() . $sort, $url, ['data-sort'=>$sortParam]);
+		return Html::a($this->getTitle().$sort, $url, ['data-sort'=>$sortParam]);
 	}
 
 	/**
@@ -566,7 +566,7 @@ 
 	public function getFilterField()
 	{
 		$field = $this->getBaseFilterField();
-		foreach($this->filterFieldConfig as $key => $value)
+		foreach ($this->filterFieldConfig as $key => $value)
 			$field[$key] = $value;
 		return $field;
 	}
@@ -582,7 +582,7 @@ 
 
 	public function setMemberConfig($config)
 	{
-		foreach($config as $key => $value) {
+		foreach ($config as $key => $value) {
 			if (isset($this->member->$key))
 				$this->member->$key = $value;
 		}
@@ -592,7 +592,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function getCellData($row, $noValue='-')
+	public function getCellData($row, $noValue = '-')
 	{
 		$data = null;
 		$key = $this->getKey();
@@ -643,7 +643,7 @@ 
 			if (is_array($display)) {
 				$display = implode(',', $display);
 			}
-			return "<span title=\"".str_replace('"',"'", html_entity_decode(strip_tags($display)))."\">$out</span>";
+			return "<span title=\"".str_replace('"', "'", html_entity_decode(strip_tags($display)))."\">$out</span>";
 		}
 		return $this->getCellData($model);
 	}
@@ -653,7 +653,7 @@ 
 	 */
 	public function getFieldName()
 	{
-		return $this->getGrid()->getId() . '[' . $this->key . '][search]';
+		return $this->getGrid()->getId().'['.$this->key.'][search]';
 	}
 
 	/**
@@ -727,12 +727,12 @@ 
 		throw new \Exception('Unable to call a valid search function');
 	}
 
-	protected $_actions =[];
+	protected $_actions = [];
 
 	/**
 	 * @inheritDoc
 	 */
-	public function addRowAction($key, $text, $linkOptions=[])
+	public function addRowAction($key, $text, $linkOptions = [])
 	{
 		$linkOptions['text'] = $text;
 		$linkOptions['data-action'] = $key;
@@ -758,7 +758,7 @@ 
 		}
 		$out = '<div class="neonGrid_rowActions">';
 		$i = 0;
-		foreach($this->_actions as $actionKey => $linkOptions) {
+		foreach ($this->_actions as $actionKey => $linkOptions) {
 			if ($i > 0) $out .= ' | ';
 			if (isset($linkOptions['function'])) {
 				$func = $linkOptions['function'];
@@ -785,7 +785,7 @@ 
 	 * @param array $arguments of arguments
 	 * @return mixed
 	 */
-	public function callFunction($function, $arguments=[])
+	public function callFunction($function, $arguments = [])
 	{
 		if (is_string($function)) {
 			return call_user_func_array([$this->grid, $function], $arguments);
@@ -810,7 +810,7 @@ 
 			if (count($columnData)) {
 				$this->member->dataMapFilters = ['uuid' => $columnData];
 			}
-			foreach($models as $model) {
+			foreach ($models as $model) {
 				$this->member->makeMapRequest($this->getCellData($model, null));
 			}
 		}

Braces +27 added lines, -17 removed lines

@@ -105,8 +105,9 @@ 
 	 */
 	public function getEmptyCellDisplay()
 	{
-		if ($this->_emptyCellDisplay !== null)
-			return $this->_emptyCellDisplay;
+		if ($this->_emptyCellDisplay !== null) {
+					return $this->_emptyCellDisplay;
+		}
 		return $this->getGrid()->emptyCellDisplay;
 	}
 
@@ -490,10 +491,12 @@ 
 	public function renderHeaderCell()
 	{
 		$options = $this->getHeaderCellAttributes();
-		if ($this->grid->hasSort($this->key))
-			Html::addCssClass($options, ($this->grid->hasSortDescending() ? 'desc' : 'asc'));
-		if (trim($this->width) != '')
-			Html::addCssStyle($options, ["width" => $this->width]);
+		if ($this->grid->hasSort($this->key)) {
+					Html::addCssClass($options, ($this->grid->hasSortDescending() ? 'desc' : 'asc'));
+		}
+		if (trim($this->width) != '') {
+					Html::addCssStyle($options, ["width" => $this->width]);
+		}
 		Html::addCssStyle($options, $this->_style);
 
 		return Html::tag('th', $this->renderHeaderCellContent(), $options);
@@ -504,8 +507,9 @@ 
 	 */
 	public function renderHeaderCellContent()
 	{
-		if (!$this->isSortable)
-			return $this->getTitle();
+		if (!$this->isSortable) {
+					return $this->getTitle();
+		}
 		$sort = '';
 		if ($this->grid->hasSort($this->key)) {
 			$sort = $this->grid->hasSortDescending() ? ' - ' : ' + ';
@@ -535,10 +539,12 @@ 
 	 */
 	public function renderFilterCellContent()
 	{
-		if ($this->filter === false)
-			return '';
-		if (!$this->getGrid()->getFilterForm()->hasField($this->getKey()))
-			return '';
+		if ($this->filter === false) {
+					return '';
+		}
+		if (!$this->getGrid()->getFilterForm()->hasField($this->getKey())) {
+					return '';
+		}
 		$field = $this->getGrid()->getFilterForm()->getField($this->getKey());
 		// remove any automatic validators
 		$field->setValidators([], true);
@@ -566,8 +572,9 @@ 
 	public function getFilterField()
 	{
 		$field = $this->getBaseFilterField();
-		foreach($this->filterFieldConfig as $key => $value)
-			$field[$key] = $value;
+		foreach($this->filterFieldConfig as $key => $value) {
+					$field[$key] = $value;
+		}
 		return $field;
 	}
 
@@ -583,8 +590,9 @@ 
 	public function setMemberConfig($config)
 	{
 		foreach($config as $key => $value) {
-			if (isset($this->member->$key))
-				$this->member->$key = $value;
+			if (isset($this->member->$key)) {
+							$this->member->$key = $value;
+			}
 		}
 		return $this;
 	}
@@ -759,7 +767,9 @@ 
 		$out = '<div class="neonGrid_rowActions">';
 		$i = 0;
 		foreach($this->_actions as $actionKey => $linkOptions) {
-			if ($i > 0) $out .= ' | ';
+			if ($i > 0) {
+				$out .= ' | ';
+			}
 			if (isset($linkOptions['function'])) {
 				$func = $linkOptions['function'];
 				$out .= $this->callFunction($func, [$model, $key, $index]);

neon/core/grid/column/IColumn.php

Spacing +6 added lines, -6 removed lines

@@ -14,9 +14,9 @@ 
 
 interface IColumn
 {
-	public function __construct($config=[]);
+	public function __construct($config = []);
 
-	public function renderDataCell($model, $key, $index);  // GRID: called by grid
+	public function renderDataCell($model, $key, $index); // GRID: called by grid
 
 	/**
 	 * Renders the contents of the cell (can be overriden by setting self::setDataCellContentFunction)
@@ -153,7 +153,7 @@ 
 	 * @param bool $sortable
 	 * @return $this
 	 */
-	public function setIsSortable($sortable=true);
+	public function setIsSortable($sortable = true);
 
 	/**
 	 * Is the column sortable
@@ -254,7 +254,7 @@ 
 	 *
 	 * @param boolean $bool
 	 */
-	public function setAsIndex($bool=true);
+	public function setAsIndex($bool = true);
 
 	/**
 	 * Set the title of the column
@@ -303,7 +303,7 @@ 
 	 *
 	 * @return null|callable
 	 */
-	public function getSearchFunction();  // GRID: called by grid
+	public function getSearchFunction(); // GRID: called by grid
 
 	/**
 	 * Set the database field name. This is used to lookup the row data, and in filters and ordering
@@ -366,7 +366,7 @@ 
 	 * @param array $linkOptions
 	 * @return mixed
 	 */
-	public function addRowAction($key, $text, $linkOptions=[]);
+	public function addRowAction($key, $text, $linkOptions = []);
 
 	public function renderRowActions($model, $key, $index);
 

neon/cms/components/Widget.php

Spacing +4 added lines, -4 removed lines

@@ -117,7 +117,7 @@ 
 		if (isset($params['type'])) {
 			$defaults['type'] = $params['type'];
 			// path to the file is determined by the theme hierarchy
-			$defaults['file'] = $params['type'] . '.tpl';
+			$defaults['file'] = $params['type'].'.tpl';
 			if (isset($params['key'])) {
 				self::buildDataFromCmsKeyAttributes($params);
 			}
@@ -232,7 +232,7 @@ 
 			return $this->createStaticEditable($content);
 		} else {
 			$file = $this->params['file'];
-			$this->params['hasData'] = count($this->data)>0;
+			$this->params['hasData'] = count($this->data) > 0;
 			$this->params['hasResponse'] = true;
 			$this->params['data'] = $this->data;
 			$this->params['edit'] = $this->createDynamicEditable();
@@ -298,7 +298,7 @@ 
 	public function getId()
 	{
 		if ($this->_id === null) {
-			$this->_id = $this->getPage()->getId() . '_' . static::$autoIdPrefix . static::$counter++;
+			$this->_id = $this->getPage()->getId().'_'.static::$autoIdPrefix.static::$counter++;
 		}
 		return $this->_id;
 	}
@@ -340,7 +340,7 @@ 
 			$dataKey = $this->params['data-key'];
 			$dataPageId = $this->params['data-page-id'];
 			if ((isset($this->params['wys']) || isset($this->params['wysiwyg'])) || (isset($this->params['editor']) && strpos('wys', $this->params['editor'] === 0)))
-				return '<div id="'.$this->getId().'" data-id="'.$this->getId().'" data-key="'.$dataKey.'" data-page-id="'.$dataPageId.'" class="cobe-editable cobe-static-block" contenteditable="true">' . $value . '</div>';
+				return '<div id="'.$this->getId().'" data-id="'.$this->getId().'" data-key="'.$dataKey.'" data-page-id="'.$dataPageId.'" class="cobe-editable cobe-static-block" contenteditable="true">'.$value.'</div>';
 			else
 				return "<div style='display:inline-block;' class='cobe-editable cobe-static'  data-key='$dataKey' data-page-id='$dataPageId' contenteditable='true' />$value</div>";
 		} else {

Braces +26 added lines, -18 removed lines

@@ -123,8 +123,9 @@ 
 			}
  		}
 		 
-		if (isset($params['dds']) || isset($params['dds_page']) || isset($params['dds_class']))
-			Daedalus::buildDataFromDdsAttributes($params);
+		if (isset($params['dds']) || isset($params['dds_page']) || isset($params['dds_class'])) {
+					Daedalus::buildDataFromDdsAttributes($params);
+		}
 		$resolvedParams = Arr::merge($defaults, $params);
 		return $widget->render($resolvedParams, $template);
 	}
@@ -171,8 +172,9 @@ 
 		}
 		// scb = static content block
 		$params['type'] = '_scb';
-		if (isset($params['key']))
-			self::buildDataFromCmsKeyAttributes($params);
+		if (isset($params['key'])) {
+					self::buildDataFromCmsKeyAttributes($params);
+		}
 		$params['content'] = $content;
 		$params['wys'] = (isset($params['wys']) ? $params['wys'] : true);
 		return $widget->render($params, $template);
@@ -208,8 +210,9 @@ 
 		$data = [];
 		if (($dataRequest = $this->getDataRequest()) !== null) {
 			$id = $meta = null;
-			if (!$this->getPage()->requestWidgetData($dataRequest, $data, $id, $this->isStatic, $meta))
-				return $id;
+			if (!$this->getPage()->requestWidgetData($dataRequest, $data, $id, $this->isStatic, $meta)) {
+							return $id;
+			}
 			$this->saveData($data);
 			$this->saveDataMetaInformation($meta);
 		}
@@ -239,8 +242,9 @@ 
 			$this->params['meta'] = $this->meta;
 
 			// createTemplate is an expensive call so only call it once per file and reset all variables on the stored template.
-			if (!isset($templates[$file]))
-				$templates[$file] = $this->renderer->createTemplate($file);
+			if (!isset($templates[$file])) {
+							$templates[$file] = $this->renderer->createTemplate($file);
+			}
 			$tpl = $templates[$file];
 			$tpl->tpl_vars = $tpl->config_vars = [];
 
@@ -258,8 +262,9 @@ 
 	 */
 	protected function getDataRequest()
 	{
-		if (isset($this->params['data']))
-			return Daedalus::convertDataRequestToJson($this->params['data']);
+		if (isset($this->params['data'])) {
+					return Daedalus::convertDataRequestToJson($this->params['data']);
+		}
 		return null;
 	}
 
@@ -315,15 +320,17 @@ 
 	 */
 	protected static function buildDataFromCmsKeyAttributes(&$params)
 	{
-		if (!isset($params['type'], $params['key']))
-			return;
+		if (!isset($params['type'], $params['key'])) {
+					return;
+		}
 		$key = "$params[type]_$params[key]";
 		$pageId = isset($params['page']) ? self::$page->getId() : null;
 		$params['data-key'] = $key;
 		$params['data-page-id'] = $pageId;
 		$params['data'] = "'key':'$key','pageId':'$pageId'";
-		if (!isset($params['content']))
-			$params['content'] = "Add Content for $params[key] here";
+		if (!isset($params['content'])) {
+					$params['content'] = "Add Content for $params[key] here";
+		}
 		$params['is_static'] = true;
 	}
 
@@ -339,10 +346,11 @@ 
 		if ($this->getPage()->isInEditMode()) {
 			$dataKey = $this->params['data-key'];
 			$dataPageId = $this->params['data-page-id'];
-			if ((isset($this->params['wys']) || isset($this->params['wysiwyg'])) || (isset($this->params['editor']) && strpos('wys', $this->params['editor'] === 0)))
-				return '<div id="'.$this->getId().'" data-id="'.$this->getId().'" data-key="'.$dataKey.'" data-page-id="'.$dataPageId.'" class="cobe-editable cobe-static-block" contenteditable="true">' . $value . '</div>';
-			else
-				return "<div style='display:inline-block;' class='cobe-editable cobe-static'  data-key='$dataKey' data-page-id='$dataPageId' contenteditable='true' />$value</div>";
+			if ((isset($this->params['wys']) || isset($this->params['wysiwyg'])) || (isset($this->params['editor']) && strpos('wys', $this->params['editor'] === 0))) {
+							return '<div id="'.$this->getId().'" data-id="'.$this->getId().'" data-key="'.$dataKey.'" data-page-id="'.$dataPageId.'" class="cobe-editable cobe-static-block" contenteditable="true">' . $value . '</div>';
+			} else {
+							return "<div style='display:inline-block;' class='cobe-editable cobe-static'  data-key='$dataKey' data-page-id='$dataPageId' contenteditable='true' />$value</div>";
+			}
 		} else {
 			return $value;
 		}