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

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

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

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/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

neon/cms/components/CmsUrlRule.php

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

Braces +50 added lines, -32 removed lines

@@ -205,11 +205,13 @@ 
 	{
 		$view = ($view === null) ? $this->getView() : $view;
 		FormAsset::register($view);
-		foreach ($this->getFields() as $field)
-			$field->registerScripts($view);
+		foreach ($this->getFields() as $field) {
+					$field->registerScripts($view);
+		}
 		if ($this->isRootForm()) {
-			if ($mount)
-				$view->registerJs('(new Vue()).$mount("#' . $this->id . '");', $view::POS_END, $this->id . 'vue');
+			if ($mount) {
+							$view->registerJs('(new Vue()).$mount("#' . $this->id . '");', $view::POS_END, $this->id . 'vue');
+			}
 		}
 	}
 
@@ -333,8 +335,9 @@ 
 	{
 		$errors = [];
 		foreach($this->getFields() as $name => $field) {
-			if ($field->hasError())
-				$errors[$name] = $field->getErrors();
+			if ($field->hasError()) {
+							$errors[$name] = $field->getErrors();
+			}
 		}
 		return array_merge($this->_errors, $errors);
 	}
@@ -363,10 +366,11 @@ 
 	 */
 	public function addError($fieldNameOrError='', $error=null)
 	{
-		if ($error === null)
-			$this->_errors[] = $fieldNameOrError;
-		else
-			$this->getField($fieldNameOrError)->addError($error);
+		if ($error === null) {
+					$this->_errors[] = $fieldNameOrError;
+		} else {
+					$this->getField($fieldNameOrError)->addError($error);
+		}
 	}
 
 // ============================================================================
@@ -460,8 +464,9 @@ 
 		// multiple versions of the same form can exist on a page
 		// in these scenarios the forms each can have different root form ids.
 		$bits = explode('.', $path);
-		if (!($bits[0] === $this->name || ($this->isRootForm() && $bits[0] === $this->id)))
-			throw new \Exception("The first part of the path should be the form name or the id if this is a root form. The forms name and id is: name={$this->name}, id={$this->id}. The path you used was: path=$path.");
+		if (!($bits[0] === $this->name || ($this->isRootForm() && $bits[0] === $this->id))) {
+					throw new \Exception("The first part of the path should be the form name or the id if this is a root form. The forms name and id is: name={$this->name}, id={$this->id}. The path you used was: path=$path.");
+		}
 		// remove first item and reindex array : note unset does not update array indexes
 		array_splice($bits, 0, 1);
 		$field = $this->getField($bits[0]);
@@ -495,8 +500,9 @@ 
 	public function getFields($names=null)
 	{
 		$this->orderFields();
-		if ($names === null)
-			return $this->_fields;
+		if ($names === null) {
+					return $this->_fields;
+		}
 
 		return Arr::only($this->_fields, $names);
 	}
@@ -818,9 +824,12 @@ 
 	{
 		$data = [];
 		foreach ($this->getFields() as $field) {
-			if ($field->deleted) continue;
-			if ($field->getIsInput())
-				$data[$field->getDataKey()] = $field->getData();
+			if ($field->deleted) {
+				continue;
+			}
+			if ($field->getIsInput()) {
+							$data[$field->getDataKey()] = $field->getData();
+			}
 		}
 		return $data;
 	}
@@ -834,8 +843,9 @@ 
 	{
 		$data = [];
 		foreach ($this->getFields() as $field) {
-			if ($field->getIsInput())
-				$data[$field->getName()] = $field->getValueDisplay();
+			if ($field->getIsInput()) {
+							$data[$field->getName()] = $field->getValueDisplay();
+			}
 		}
 		return $data;
 	}
@@ -848,8 +858,9 @@ 
 	 */
 	public function getDataKey()
 	{
-		if ($this->_dataKey !== null)
-			return $this->_dataKey;
+		if ($this->_dataKey !== null) {
+					return $this->_dataKey;
+		}
 		return $this->getName();
 	}
 
@@ -880,8 +891,9 @@ 
 	 */
 	public function getId($autoGenerate=false)
 	{
-		if ($this->_id)
-			return $this->_id;
+		if ($this->_id) {
+					return $this->_id;
+		}
 		return $this->getName();
 	}
 
@@ -915,8 +927,9 @@ 
 		$value = [];
 		foreach ($this->getFields() as $field) {
 			if (!$field->deleted) {
-				if ($field->getIsInput())
-					$value[$field->getDataKey()] = $field->getValue();
+				if ($field->getIsInput()) {
+									$value[$field->getDataKey()] = $field->getValue();
+				}
 			}
 		}
 		return $value;
@@ -1145,8 +1158,9 @@ 
 		foreach ($this->getFields() as $key => $field) {
 			$fieldDefinition = $field->exportDefinition();
 
-			if (! is_null($field->ddsDataType) && ! is_null($fieldDefinition) )
-				$fields[$key] = $fieldDefinition;
+			if (! is_null($field->ddsDataType) && ! is_null($fieldDefinition) ) {
+							$fields[$key] = $fieldDefinition;
+			}
 		}
 		$formDefinition['definition']['fields'] = $fields;
 		return $formDefinition;
@@ -1257,8 +1271,9 @@ 
 	 */
 	public function getRequest()
 	{
-		if ($this->_request === null)
-			$this->_request = neon()->request;
+		if ($this->_request === null) {
+					$this->_request = neon()->request;
+		}
 		return $this->_request;
 	}
 
@@ -1277,8 +1292,9 @@ 
 	 */
 	public function reset()
 	{
-		foreach($this->getFields() as $field)
-			$field->reset();
+		foreach($this->getFields() as $field) {
+					$field->reset();
+		}
 	}
 
 	/**
@@ -1298,7 +1314,9 @@ 
 		$fake = [];
 		foreach($this->getFields() as $key => $field) {
 			$val = $field->fake();
-			if (empty($val)) continue;
+			if (empty($val)) {
+				continue;
+			}
 			$fake[$key] = $val;
 		}
 		return $fake;