newicon / neon

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/form/fields/ImageMultiple.php

Braces +9 added lines, -6 removed lines

@@ -24,10 +24,12 @@ 
 
 	public function setValue($value)
 	{
-		if (is_array($value))
-			$this->_value = $value;
-		if (is_string($value))
-			$this->_value = json_decode($value);
+		if (is_array($value)) {
+					$this->_value = $value;
+		}
+		if (is_string($value)) {
+					$this->_value = json_decode($value);
+		}
 	}
 
 	/**
@@ -62,8 +64,9 @@ 
 	public function getValueDisplay($context='')
 	{
 		$json = $this->getValue();
-		if (empty($json))
-			return neon()->formatter->asJson($this->getValue());
+		if (empty($json)) {
+					return neon()->formatter->asJson($this->getValue());
+		}
 		if ($context==='grid') {
 			$out = '';
 			foreach($json as $image) {

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

neon/cms/components/Editor.php

Spacing +13 added lines, -13 removed lines

@@ -40,7 +40,7 @@ 
 
 	public static function render($vdom)
 	{
-		foreach($vdom as $element) {
+		foreach ($vdom as $element) {
 			$element[1]($element[2], $element['children']);
 		}
 	}
@@ -68,14 +68,14 @@ 
 			// dd($domArray);
 			// Editor::vdom($domArray);
 
-			$ele=dom_import_simplexml($x);
+			$ele = dom_import_simplexml($x);
 			$dom = new DOMDocument('1.0', 'utf-8');
-			$element=$dom->importNode($ele,true);
+			$element = $dom->importNode($ele, true);
 			$element->normalize();
 
 
 			$vdom = [];
-			foreach($x as $n) {
+			foreach ($x as $n) {
 				Editor::node($vdom, $n);
 			}
 			
@@ -95,7 +95,7 @@ 
 		$props = '{"components":null, "contentKey": "'.$id.'"}';
 		if ($content !== null) {
 			// read the json data serialised inside the <!-- ni:editor {json data} --> tag
-			$pattern  = '/<!--\s+(?P<closer>\/)?ni:editor\s+(?P<attrs>{(?:(?:[^}]+|}+(?=})|(?!}\s+\/?-->).)*+)?}\s+)?(?P<void>\/)?-->/s';
+			$pattern = '/<!--\s+(?P<closer>\/)?ni:editor\s+(?P<attrs>{(?:(?:[^}]+|}+(?=})|(?!}\s+\/?-->).)*+)?}\s+)?(?P<void>\/)?-->/s';
 			preg_match($pattern, $content, $matches);
 			if ($matches) {
 				$props = $matches['attrs'];
@@ -182,18 +182,18 @@ 
 	 * [children] => Array
 	 * [props] => Array
 	 */
-	public static function renderAsSmarty($node, &$depth=0)
+	public static function renderAsSmarty($node, &$depth = 0)
 	{
 		$depth++;
 		$cmp = $node['cmp'];
 		$uuid = $node['uuid'];
 		$children = $node['children'];
 		$props = $node['props'];
-		$out = '{'."$cmp " . static::formatProps($props) . " uuid=\"$uuid\" }\n";
-		foreach($children as $child) {
-			$out .= str_repeat('    ', $depth) . static::renderAsSmarty($child, $depth);
+		$out = '{'."$cmp ".static::formatProps($props)." uuid=\"$uuid\" }\n";
+		foreach ($children as $child) {
+			$out .= str_repeat('    ', $depth).static::renderAsSmarty($child, $depth);
 		}
-		$out .= str_repeat('    ', $depth-1) . '{/'.$cmp."}\n";
+		$out .= str_repeat('    ', $depth - 1).'{/'.$cmp."}\n";
 		$depth--;
 		return $out;
 	}
@@ -202,9 +202,9 @@ 
 	{
 		unset($props['children']);
 		$formatParams = '';
-		foreach($props as $key => $value) {
+		foreach ($props as $key => $value) {
 			if (is_array($value)) $value = var_export($value, true);
-			$formatParams .= $key.'="'. $value .'" ';
+			$formatParams .= $key.'="'.$value.'" ';
 		}
 		return $formatParams;
 	}
@@ -218,7 +218,7 @@ 
 	 */
 	public static function createFromTree($cmpIndex, $root) {
 		$out = $root;
-		foreach($root['children'] as $key => $childId) {
+		foreach ($root['children'] as $key => $childId) {
 			if (!empty($out['children'])) {
 				$out['children'][$key] = static::createFromTree($cmpIndex, $cmpIndex[$childId]);
 			}

Braces +6 added lines, -2 removed lines

@@ -55,7 +55,9 @@ 
 	 */
 	public static function editor($params, $content, \Smarty_Internal_Template $template, &$repeat)
 	{
-		if ($repeat) return;
+		if ($repeat) {
+			return;
+		}
 		$id = Arr::get($params, 'id', neon()->cms->getPage()->getId());
 		$dbContent = neon()->getCms()->getICmsStaticData()->getStaticContent($id, null);
 		if (!$dbContent) {
@@ -203,7 +205,9 @@ 
 		unset($props['children']);
 		$formatParams = '';
 		foreach($props as $key => $value) {
-			if (is_array($value)) $value = var_export($value, true);
+			if (is_array($value)) {
+				$value = var_export($value, true);
+			}
 			$formatParams .= $key.'="'. $value .'" ';
 		}
 		return $formatParams;

neon/cms/components/Page.php

Spacing +9 added lines, -9 removed lines

@@ -79,7 +79,7 @@ 
 	 */
 	public function isInEditMode()
 	{
-		if (neon()->session===null) return false;
+		if (neon()->session === null) return false;
 		return neon()->session->get(self::COBE_EDITING, false);
 	}
 
@@ -217,7 +217,7 @@ 
 		$params = array_merge($data['page_params'], neon()->request->get(), neon()->request->post());
 		unset($data['page_params']);
 		$data['params'] = Html::encodeEntities($params);
-		$data['url'] = '/' . neon()->request->pathInfo;
+		$data['url'] = '/'.neon()->request->pathInfo;
 		$data['uri'] = $_SERVER['REQUEST_URI'];
 		$data['host'] = Url::base(true);
 		$data['editing'] = $this->isInEditMode();
@@ -359,7 +359,7 @@ 
 
 		// If the number of renders are excessive (4+), issue a warning.
 		if ($numberOfRenders >= 4)
-			\Neon::debug('Excessive number of renders (>=4): ' . $numberOfRenders);
+			\Neon::debug('Excessive number of renders (>=4): '.$numberOfRenders);
 
 		// inject assets into template
 		$html = neon()->view->injectHtml($html);
@@ -433,7 +433,7 @@ 
 	 * @param
 	 * @return string
 	 */
-	protected function canonicaliseRequest(&$dataRequest, $isStatic=false)
+	protected function canonicaliseRequest(&$dataRequest, $isStatic = false)
 	{
 		if ($isStatic) {
 			$id = $this->createStaticContentId($dataRequest);
@@ -441,7 +441,7 @@ 
 		} else {
 			$request = array('class'=>null, 'filters'=>[], 'order'=>[], 'limit'=>[]);
 			$dataRequest = array_merge($request, $dataRequest);
-			$id = md5(str_replace([' '],'', json_encode($dataRequest)));
+			$id = md5(str_replace([' '], '', json_encode($dataRequest)));
 		}
 		return $id;
 	}
@@ -466,7 +466,7 @@ 
 	 */
 	protected function makeDynamicDataRequests()
 	{
-		if (count($this->dynamicDataRequests)>0) {
+		if (count($this->dynamicDataRequests) > 0) {
 			$dds = $this->getIDdsObjectManagement();
 			foreach ($this->dynamicDataRequests as $id=>$dr) {
 				$dds->addObjectRequest($dr['class'], $dr['filters'], $dr['order'], $dr['limit'], $id);
@@ -492,11 +492,11 @@ 
 	 */
 	protected function makeStaticDataRequests()
 	{
-		if (count($this->staticDataRequests)>0) {
+		if (count($this->staticDataRequests) > 0) {
 			$cms = $this->getICmsStaticData();
 			$data = $cms->bulkStaticContentRequest($this->staticDataRequests);
 			foreach ($data as $i=>$d)
-				$this->requestedData[$i] = ($d===null ? 'not found' : $d);
+				$this->requestedData[$i] = ($d === null ? 'not found' : $d);
 			$this->staticDataRequests = [];
 		}
 	}
@@ -507,7 +507,7 @@ 
 	 */
 	protected function hasDataRequests()
 	{
-		return (count($this->staticDataRequests)+count($this->dynamicDataRequests) > 0);
+		return (count($this->staticDataRequests) + count($this->dynamicDataRequests) > 0);
 	}
 
 	/**

Braces +29 added lines, -18 removed lines

@@ -79,7 +79,9 @@ 
 	 */
 	public function isInEditMode()
 	{
-		if (neon()->session===null) return false;
+		if (neon()->session===null) {
+			return false;
+		}
 		return neon()->session->get(self::COBE_EDITING, false);
 	}
 
@@ -211,8 +213,9 @@ 
 			$data = $this->_page;
 			// add the nice_id as CmnUrRoute will add this on first parse through Cobe without gets but
 			// not on requests with get parameters which has led to hard-to-debug runtime coding errors
-			if (!isset($data['page_params']['nice_id']) && isset($data['nice_id']))
-				$data['page_params']['nice_id'] = $data['nice_id'];
+			if (!isset($data['page_params']['nice_id']) && isset($data['nice_id'])) {
+							$data['page_params']['nice_id'] = $data['nice_id'];
+			}
 		}
 		$params = array_merge($data['page_params'], neon()->request->get(), neon()->request->post());
 		unset($data['page_params']);
@@ -255,7 +258,9 @@ 
 	 */
 	public function getUrlOfPage($id)
 	{
-		if (!$id) return '';
+		if (!$id) {
+			return '';
+		}
 		return $url = url(['/cms/render/page', 'nice_id'=>$id]);
 	}
 
@@ -353,13 +358,15 @@ 
 		do {
 			$numberOfRenders++;
 			$html = $renderer->renderTemplate($template);
-			if (($hasDataRequests = $this->hasDataRequests()))
-				$this->makeDataRequests();
+			if (($hasDataRequests = $this->hasDataRequests())) {
+							$this->makeDataRequests();
+			}
 		} while ($hasDataRequests == true);
 
 		// If the number of renders are excessive (4+), issue a warning.
-		if ($numberOfRenders >= 4)
-			\Neon::debug('Excessive number of renders (>=4): ' . $numberOfRenders);
+		if ($numberOfRenders >= 4) {
+					\Neon::debug('Excessive number of renders (>=4): ' . $numberOfRenders);
+		}
 
 		// inject assets into template
 		$html = neon()->view->injectHtml($html);
@@ -390,15 +397,17 @@ 
 		// see if we have the data
 		if (isset($this->requestedData[$id])) {
 			$data = $this->requestedData[$id];
-			if (!$isStatic && isset($this->requestedDataMeta[$id]))
-				$meta = $this->requestedDataMeta[$id];
+			if (!$isStatic && isset($this->requestedDataMeta[$id])) {
+							$meta = $this->requestedDataMeta[$id];
+			}
 			return true;
 		}
 		// if not then add it to the list of requested data
-		if ($isStatic)
-			$this->staticDataRequests[$id] = $dataRequest;
-		else
-			$this->dynamicDataRequests[$id] = $dataRequest;
+		if ($isStatic) {
+					$this->staticDataRequests[$id] = $dataRequest;
+		} else {
+					$this->dynamicDataRequests[$id] = $dataRequest;
+		}
 		return false;
 	}
 
@@ -495,8 +504,9 @@ 
 		if (count($this->staticDataRequests)>0) {
 			$cms = $this->getICmsStaticData();
 			$data = $cms->bulkStaticContentRequest($this->staticDataRequests);
-			foreach ($data as $i=>$d)
-				$this->requestedData[$i] = ($d===null ? 'not found' : $d);
+			foreach ($data as $i=>$d) {
+							$this->requestedData[$i] = ($d===null ? 'not found' : $d);
+			}
 			$this->staticDataRequests = [];
 		}
 	}
@@ -539,8 +549,9 @@ 
 	private $cmsStaticData = null;
 	private function getICmsStaticData()
 	{
-		if ($this->cmsStaticData === null)
-			$this->cmsStaticData = neon('cms')->ICmsStaticData;
+		if ($this->cmsStaticData === null) {
+					$this->cmsStaticData = neon('cms')->ICmsStaticData;
+		}
 		return $this->cmsStaticData;
 	}