newicon / neon

neon/phoebe/controllers/database/IndexController.php

Braces +12 added lines, -6 removed lines

@@ -54,8 +54,9 @@ 
 	 */
 	public function actionEdit($type = null)
 	{
-		if (!$this->canDevelop())
-			throw new HttpException(403, 'This operation is not permitted here');
+		if (!$this->canDevelop()) {
+					throw new HttpException(403, 'This operation is not permitted here');
+		}
 
 		$form = $this->getPhoebeForm($type, $isNewForm, false, true);
 		return $this->render('edit-fields', [
@@ -95,9 +96,13 @@ 
 				// register all form field js scripts
 				$f->registerScripts(neon()->view);
 				$class = substr($class, 1);
-				if (in_array($class, $exclude)) continue;
+				if (in_array($class, $exclude)) {
+					continue;
+				}
 				$details = $f->getComponentDetails();
-				if ($details === false) continue;
+				if ($details === false) {
+					continue;
+				}
 				$defaultField = Arr::except($f->toArray(), ['dataKey']);
 				$cmp = Arr::merge($defaultField, [
 					'class' => $class,
@@ -162,8 +167,9 @@ 
 			]
 		];
 		$form = new \neon\core\form\Form($formDefinition);
-		if (neon()->request->isAjax)
-			return $form->ajaxValidation();
+		if (neon()->request->isAjax) {
+					return $form->ajaxValidation();
+		}
 		if ($form->processRequest()) {
 			$data = $form->getData();
 			$definition = $this->canonicaliseDefinition($data);

neon/cms/form/fields/ImageCompare.php

Spacing +3 added lines, -3 removed lines

@@ -48,14 +48,14 @@
 		];
     }
     
-    public function getValueDisplay($context='')
+    public function getValueDisplay($context = '')
 	{
 		$json = $this->getValue();
 		if (empty($json))
 			return neon()->formatter->asJson($this->getValue());
-		if ($context==='grid') {
+		if ($context === 'grid') {
 			$out = '';
-			foreach($json as $image) {
+			foreach ($json as $image) {
 				$url = neon()->firefly->getImage($image);
 				$out .= "<img src='$url' />";
 			}

Braces +3 added lines, -2 removed lines

@@ -51,8 +51,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/firefly/services/FileManager.php

Braces +18 added lines, -9 removed lines

@@ -66,7 +66,9 @@ 
 		neon()->firefly->isFileObjectValid($file);
 		$stream = fopen($file->getRealPath(), 'r+');
 		$uuid = $this->save($stream, $file->getFilename(), $meta);
-		if (is_resource($stream)) fclose($stream);
+		if (is_resource($stream)) {
+			fclose($stream);
+		}
 		return $uuid;
 	}
 
@@ -105,8 +107,9 @@ 
 			->orWhere(['data_type_ref' => 'file_ref_multi'])
 			->all();
 			
-		if (empty($all))
-			return [];
+		if (empty($all)) {
+					return [];
+		}
 
 		$q = new Query();
 		foreach ($all as $i => $field) {
@@ -249,7 +252,9 @@ 
 	public function destroy($uuid)
 	{
 		$file = Model::findWithDeleted()->where(['uuid' => $uuid])->one();
-		if ($file === null) return false;
+		if ($file === null) {
+			return false;
+		}
 		return $file->destroy();
 	}
 
@@ -332,7 +337,9 @@ 
 			$driver = $this->getDriveFor($uuid, $file);
 			$hash = $driver->hash($file['path']);
 			$model = $this->_get($uuid);
-			if (!$hash) return false;
+			if (!$hash) {
+				return false;
+			}
 			$model->file_hash = $hash;
 			$model->save();
 		}
@@ -396,8 +403,9 @@ 
 	{
 		$model = $this->_get($uuid);
 		$model->attributes = $updates;
-		if (!$model->save())
-			throw new HttpException(400, $model->getErrors());
+		if (!$model->save()) {
+					throw new HttpException(400, $model->getErrors());
+		}
 		return $model->toArray();
 	}
 
@@ -411,8 +419,9 @@ 
 	public function findFile($drive, $path)
 	{
 		$model = Model::find()->where(['drive' => $drive, 'path' => $path])->one();
-		if ($model === null)
-			return null;
+		if ($model === null) {
+					return null;
+		}
 		return $model->toArray();
 	}
 

neon/firefly/services/ImageManager.php

Spacing +4 added lines, -4 removed lines

@@ -81,14 +81,14 @@ 
 
 		if (Arr::get($params, 'fit', false)) {
 			// add callback functionality to retain maximal original image size
-			$image->fit($width, $height, function ($constraint) {
+			$image->fit($width, $height, function($constraint) {
 				$constraint->aspectRatio();
 				$constraint->upsize();
 			}, $params['fit']);
 		} elseif ($width || $height) {
 			$width = $width * $pd;
 			$height = $height * $pd;
-			$image->resize($width, $height, function ($constraint) {
+			$image->resize($width, $height, function($constraint) {
 				$constraint->aspectRatio();
 				$constraint->upsize();
 			});
@@ -134,7 +134,7 @@ 
 	{
 		$filter = Arr::get($params, 'filter', false);
 		if ($filter) {
-			$filters = explode(',',$filter);
+			$filters = explode(',', $filter);
 			if (in_array('greyscale', $filters, true)) {
 				$image->greyscale();
 			}
@@ -169,7 +169,7 @@ 
 				$x = Arr::get($crop, 'x', null);
 				$y = Arr::get($crop, 'y', null);
 			}
-			if ($w == 0 && $h == 0 && $x == 0 && $y ==0) {
+			if ($w == 0 && $h == 0 && $x == 0 && $y == 0) {
 				return $image;
 			}
 			$image->crop($w, $h, $x, $y);

Braces +9 added lines, -5 removed lines

@@ -38,11 +38,13 @@ 
 	{
 		// get firefly image if the source is a firefly id
 		if (Hash::isUuid64($source)) {
-			if (!neon()->firefly->fileManager->exists($source))
-				throw new HttpException(404);
+			if (!neon()->firefly->fileManager->exists($source)) {
+							throw new HttpException(404);
+			}
 			$meta = neon()->firefly->fileManager->getMeta($source);
-			if ($meta['mime_type'] == 'image/svg')
-				return neon()->firefly->fileManager->read($source);
+			if ($meta['mime_type'] == 'image/svg') {
+							return neon()->firefly->fileManager->read($source);
+			}
 			$source = neon()->firefly->fileManager->readStream($source);
 		}
 		$manager = new InterventionImageManager();
@@ -103,7 +105,9 @@ 
 	public function imageRotate(Image & $image, $params)
 	{
 		$rotate = Arr::get($params, 'rotate', false);
-		if ($rotate) $image->rotate($rotate);
+		if ($rotate) {
+			$image->rotate($rotate);
+		}
 	}
 
 	/**

neon/firefly/controllers/FileController.php

Spacing +6 added lines, -6 removed lines

@@ -37,7 +37,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
@@ -55,7 +55,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]);
 		}
 	}
 
@@ -81,7 +81,7 @@ 
 		$id = neon()->request->getRequired('id');
 
 		// create a unique request key - add v2 to force use of new cached version
-		$requestKey = neon()->request->absoluteUrl . 'v10';
+		$requestKey = neon()->request->absoluteUrl.'v10';
 
 		// 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
@@ -132,7 +132,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);
@@ -167,7 +167,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']));
@@ -183,7 +183,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 +6 added lines, -3 removed lines

@@ -46,8 +46,9 @@ 
 
 		// set expiry information on the file
 		$meta = $firefly->fileManager->getMeta($id);
-		if ($meta['mime_type'] == 'image/svg')
-			$meta['mime_type'] = 'image/svg+xml';
+		if ($meta['mime_type'] == 'image/svg') {
+					$meta['mime_type'] = 'image/svg+xml';
+		}
 		$this->sendCacheHeaders($meta['mime_type'], $meta['size'], $meta['updated_at'], md5($request->absoluteUrl), $meta['name']);
 		$download = $request->get('download', $request->get('dl', false));
 		try {
@@ -110,7 +111,9 @@ 
 			$processedImage = neon()->firefly->imageManager->process($idOrUrl, neon()->request->get());
 			$mimeType = finfo_buffer(finfo_open(FILEINFO_MIME_TYPE), $processedImage);
 			// svgs don't seem display in browsers without specifically the svg+xml mime type
-			if ($mimeType === 'image/svg') $mimeType = 'image/svg+xml';
+			if ($mimeType === 'image/svg') {
+				$mimeType = 'image/svg+xml';
+			}
 			return [
 				// recalculate the mime type in case was spoofed
 				'size' => strlen($processedImage),

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

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

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

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();