newicon / neon

neon/cms/components/Widget.php

Spacing +4 added lines, -4 removed lines

@@ -116,7 +116,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);
  		}
@@ -231,7 +231,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();
@@ -297,7 +297,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;
 	}
@@ -339,7 +339,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 +29 added lines, -20 removed lines

@@ -118,11 +118,13 @@ 
 			$defaults['type'] = $params['type'];
 			// path to the file is determined by the theme hierarchy
 			$defaults['file'] = $params['type'] . '.tpl';
-			if (isset($params['key']))
-				self::buildDataFromCmsKeyAttributes($params);
+			if (isset($params['key'])) {
+							self::buildDataFromCmsKeyAttributes($params);
+			}
  		}
-		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);
 	}
@@ -169,8 +171,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);
@@ -206,8 +209,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);
 		}
@@ -244,8 +248,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 = [];
 
@@ -263,8 +268,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;
 	}
 
@@ -320,15 +326,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;
 	}
 
@@ -344,10 +352,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/firefly/controllers/FileController.php

Spacing +6 added lines, -6 removed lines

@@ -38,7 +38,7 @@ 
 		$id = $request->get('id');
 		if (!$firefly->fileManager->exists($id)) {
 			// show placeholder image - should be handled by image manager - controllers should not know
-			return neon()->response->sendFile(dirname(__DIR__) . '/assets/placeholder.jpg', 'No File', ['inline' => true]);
+			return neon()->response->sendFile(dirname(__DIR__).'/assets/placeholder.jpg', 'No File', ['inline' => true]);
 		}
 
 		// as the url is unique for a file we can be aggressive about caching
@@ -54,7 +54,7 @@ 
 			return $firefly->fileManager->sendFile($id, (bool) $download);
 		} catch (\Exception $e) {
 			// if path unknown respond with a blank placeholder
-			return neon()->response->sendFile(dirname(__DIR__) . '/assets/placeholder.jpg', 'No File', ['inline' => true]);
+			return neon()->response->sendFile(dirname(__DIR__).'/assets/placeholder.jpg', 'No File', ['inline' => true]);
 		}
 	}
 
@@ -80,7 +80,7 @@ 
 		$id = neon()->request->getRequired('id');
 
 		// create a unique request key - add v2 to force use of new cached version
-		$requestKey = neon()->request->absoluteUrl . 'v6';
+		$requestKey = neon()->request->absoluteUrl.'v6';
 
 		// see if we already have this in cache and the browser already has it too
 		// We want to remove the need to process images when ever possible
@@ -146,7 +146,7 @@ 
 	 */
 	public function generatePublicFile($id, $imageContent)
 	{
-		$dir = substr($id,0, 3);
+		$dir = substr($id, 0, 3);
 		$publicDir = neon()->getAlias("@webroot/assets/firefly/$dir");
 		if (!file_exists($publicDir)) {
 			FileHelper::createDirectory($publicDir);
@@ -181,7 +181,7 @@ 
 	 * Handle a request that can return a 304 not modified header
 	 * @param bool|string $cacheKey - default false - if cache key is specified
 	 */
-	public function handleNotModified($cacheKey=false)
+	public function handleNotModified($cacheKey = false)
 	{
 		$requestHeaders = neon()->request->headers;
 		$browserHasCache = (isset($requestHeaders['If-Modified-Since']) || isset($requestHeaders['If-None-Match']));
@@ -197,7 +197,7 @@ 
 	{
 		header($_SERVER['SERVER_PROTOCOL'].' 304 Not modified');
 		header('Cache-Control: private, max-age=30000000, immutable, only-if-cached');
-		header('Expires: ' . Carbon::now()->addYear(10)->toRfc1123String());
+		header('Expires: '.Carbon::now()->addYear(10)->toRfc1123String());
 		exit;
 	}
 

Braces +3 added lines, -1 removed lines

@@ -129,7 +129,9 @@
 	public function getName($idOrUrl)
 	{
 		if (Hash::isUuid64($idOrUrl)) {
-			if (!neon()->firefly->fileManager->exists($idOrUrl)) throw new HttpException(404);
+			if (!neon()->firefly->fileManager->exists($idOrUrl)) {
+				throw new HttpException(404);
+			}
 			$meta = neon()->firefly->fileManager->getMeta($idOrUrl);
 			return $meta['name'];
 		}