newicon / neon

neon/firefly/services/driveManager/Drive.php

Braces +3 added lines, -1 removed lines

@@ -158,7 +158,9 @@
 
 		$result = $this->put($path = trim($path), $stream, $visibility);
 
-		if (is_resource($stream)) fclose($stream);
+		if (is_resource($stream)) {
+			fclose($stream);
+		}
 
 		return $result ? (bool) $path : false;
 	}

neon/firefly/services/driveManager/drivers/Db.php

Braces +1 added lines, -2 removed lines

@@ -203,8 +203,7 @@
 		$file = DbFile::findOne($dirname);
 		if ($file === null) {
 			$file = new DbFile(['path' => $dirname]);
-		}
-		else if ($file->type == DbFile::TYPE_FILE) {
+		} else if ($file->type == DbFile::TYPE_FILE) {
 			throw new FileExistsException('Can not create a directory as a file already exists.');
 		}
 		if ($visibility = $config->get('visibility')) {

neon/firefly/services/MediaManager.php

Braces +32 added lines, -21 removed lines

@@ -46,8 +46,9 @@ 
 		}, $paths);
 
 		if (empty($created)) {
-			if ($directory == '')
-				throw new DirectoryExistsException("The root directory already exists");
+			if ($directory == '') {
+							throw new DirectoryExistsException("The root directory already exists");
+			}
 			throw new DirectoryExistsException("The directory '$directory' already exists");
 		}
 		return $created;
@@ -76,7 +77,9 @@ 
 		$parts = [];
 		foreach($bits as $i => $bit) {
 			$bitsCurrent[] = $bit;
-			if ($i == 0) continue;
+			if ($i == 0) {
+				continue;
+			}
 			$parts[] = implode('/', $bitsCurrent);
 		}
 		return $parts;
@@ -90,11 +93,13 @@ 
 	public function validateAbsoluteDirectoryPath($directory)
 	{
 		// must be absolute and start with /
-		if ($directory[0] !== '/')
-			throw new InvalidDirectoryException("Invalid directory parameter '$directory'. The directory must be absolute path and start with '/'.");
+		if ($directory[0] !== '/') {
+					throw new InvalidDirectoryException("Invalid directory parameter '$directory'. The directory must be absolute path and start with '/'.");
+		}
 		// prevent folders with no names being created
-		if (strpos($directory, '//') !== false)
-			throw new InvalidDirectoryException("Invalid directory parameter '$directory'. You can not have empty path sections containing '//' each directory needs a name.");
+		if (strpos($directory, '//') !== false) {
+					throw new InvalidDirectoryException("Invalid directory parameter '$directory'. You can not have empty path sections containing '//' each directory needs a name.");
+		}
 	}
 
 	/**
@@ -170,10 +175,11 @@ 
 			throw new BadRequestHttpException('A name cannot contain a "/" character');
 		}
 
-		if ($node->isDir())
-			$this->_updateDirectoryName($node, $name);
-		else
-			$this->_updateFileName($node, $name);
+		if ($node->isDir()) {
+					$this->_updateDirectoryName($node, $name);
+		} else {
+					$this->_updateFileName($node, $name);
+		}
 		return true;
 	}
 
@@ -249,8 +255,9 @@ 
 	public function getDirectoryMeta($path)
 	{
 		$dir = Media::findDirectoryByPath($path);
-		if ($dir === null)
-			return null;
+		if ($dir === null) {
+					return null;
+		}
 		return $dir->toArray();
 	}
 
@@ -260,8 +267,9 @@ 
 	public function delete($id)
 	{
 		$item = Media::findOne($id);
-		if ($item === null)
-			throw new NotFoundHttpException("No item with id '$id' could be found'");
+		if ($item === null) {
+					throw new NotFoundHttpException("No item with id '$id' could be found'");
+		}
 		$result = $item->delete();
 		if ($result === false) {
 			return $item->getErrors();
@@ -275,8 +283,9 @@ 
 	public function destroy($id)
 	{
 		$item = Media::findWithDeleted()->where(['id' => $id])->one();
-		if ($item === null)
-			throw new NotFoundHttpException("No item with id '$id' could be found'");
+		if ($item === null) {
+					throw new NotFoundHttpException("No item with id '$id' could be found'");
+		}
 		return $item->destroy();
 	}
 
@@ -288,11 +297,13 @@ 
 		// get the "into" folder
 		$into = Media::findOne($intoId);
 		// throw error if it doesn't exist
-		if ($into === null)
-			throw new NotFoundHttpException("No item with id '$intoId' could be found'");
+		if ($into === null) {
+					throw new NotFoundHttpException("No item with id '$intoId' could be found'");
+		}
 		// throw error if its not a directory
-		if (!$into->isDir())
-			throw new BadRequestHttpException("This is not a directory - you can only move items into directories");
+		if (!$into->isDir()) {
+					throw new BadRequestHttpException("This is not a directory - you can only move items into directories");
+		}
 
 		// find all items to move
 		$items = Media::findAll(['id' => $items]);

neon/firefly/services/FileManager.php

Braces +6 added lines, -3 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;
 	}
 
@@ -336,8 +338,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/controllers/FileController.php

Braces +3 added lines, -2 removed lines

@@ -82,8 +82,9 @@
 		// check this is an image before continuing - type image and not svg
 		// Handle SVG images correctly (we do not need to process vector images)
 		$meta = $firefly->fileManager->getMeta($id);
-		if (strpos($meta['mime_type'], 'image') === false || strpos($meta['mime_type'], 'svg') !== false)
-			return $this->actionGet();
+		if (strpos($meta['mime_type'], 'image') === false || strpos($meta['mime_type'], 'svg') !== false) {
+					return $this->actionGet();
+		}
 
 		// 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

neon/firefly/controllers/api/MediaController.php

Braces +9 added lines, -6 removed lines

@@ -203,16 +203,19 @@
 	{
 		$items = neon()->request->getBodyParam('items');
 		$into = neon()->request->getBodyParam('into');
-		if ($items === null)
-			throw new BadRequestHttpException('You must specify an "items" parameter - containing an array of item ids to move');
-		if ($into === null)
-			throw new BadRequestHttpException('You must specify an "into" parameter - specifying the directory to move the items into');
+		if ($items === null) {
+					throw new BadRequestHttpException('You must specify an "items" parameter - containing an array of item ids to move');
+		}
+		if ($into === null) {
+					throw new BadRequestHttpException('You must specify an "into" parameter - specifying the directory to move the items into');
+		}
 		if (strpos($into, '/') !== false) {
 			// into has been specified as a path
 			// should this be part of the move interface?
 			$dir = neon()->firefly->mediaManager->getDirectoryMeta($into);
-			if ($dir === null)
-				throw new BadRequestHttpException("No directory exists with the specified path of '$into' ");
+			if ($dir === null) {
+							throw new BadRequestHttpException("No directory exists with the specified path of '$into' ");
+			}
 			$into = $dir['id'];
 		}
 

neon/firefly/migrations/m190204_134239_firefly_interface_change_db_fix.php

Braces +15 added lines, -10 removed lines

@@ -33,22 +33,26 @@ 
 	private function convertFireflyGetsToFiles($search, $replace)
 	{
 		$potentiallyAffected = $this->db->createCommand("SELECT `class_type`, `member_ref` FROM `dds_member` WHERE `data_type_ref`='textlong'")->queryAll();
-		if (count($potentiallyAffected)==0)
-			return;
+		if (count($potentiallyAffected)==0) {
+					return;
+		}
 		$classes = [];
-		foreach ($potentiallyAffected as $pa)
-			$classes[$pa['class_type']][] = $pa['member_ref'];
+		foreach ($potentiallyAffected as $pa) {
+					$classes[$pa['class_type']][] = $pa['member_ref'];
+		}
 		$phoebeClasses = array_keys($classes);
 		$phoebe = neon('phoebe')->getIPhoebeType('daedalus');
 
 		$phoebeDefinition = [];
-		foreach ($phoebeClasses as $pc)
-			$phoebeDefinition[$pc] = $phoebe->getClass($pc, null, false);
+		foreach ($phoebeClasses as $pc) {
+					$phoebeDefinition[$pc] = $phoebe->getClass($pc, null, false);
+		}
 
 		$potentiallyAffectedLookup = [];
 		foreach ($potentiallyAffected as $pa) {
-			if (empty($potentiallyAffectedLookup[$pa['class_type']]))
-				$potentiallyAffectedLookup[$pa['class_type']] = [];
+			if (empty($potentiallyAffectedLookup[$pa['class_type']])) {
+							$potentiallyAffectedLookup[$pa['class_type']] = [];
+			}
 			$potentiallyAffectedLookup[$pa['class_type']][] = $pa['member_ref'];
 		}
 
@@ -77,8 +81,9 @@ 
 				foreach ($found as $objectData) {
 					$changes = [];
 					foreach ($fields as $field) {
-						if (!empty($objectData[$field]) && strpos($objectData[$field],$search)!==false)
-							$changes[$field] = str_replace($search, $replace, $objectData[$field]);
+						if (!empty($objectData[$field]) && strpos($objectData[$field],$search)!==false) {
+													$changes[$field] = str_replace($search, $replace, $objectData[$field]);
+						}
 					}
 					if (count($changes)) {
 						$dds->editObject($objectData['_uuid'], $changes);

neon/firefly/App.php

Braces +3 added lines, -2 removed lines

@@ -366,8 +366,9 @@
 	 */
 	public function isFileObjectValid($file, $throwExceptions=true)
 	{
-		if ($file instanceof IFile)
-			return true;
+		if ($file instanceof IFile) {
+					return true;
+		}
 		// not all objects have the privilege of implementing the IFile interface like \SplFileObject
 		// Firefly only cares about these two functions 'getRealPath' and 'getFilename'
 		$objectIsValid = is_object($file)

neon/cms/components/Renderer.php

Braces +21 added lines, -12 removed lines

@@ -34,12 +34,14 @@ 
 		// set up the theme directories
 		foreach ($themeHierarchy as $theme) {
 			if (isset($theme['templates'])) {
-				foreach ($theme['templates'] as $tplDir)
-					$this->addTemplateDir($tplDir);
+				foreach ($theme['templates'] as $tplDir) {
+									$this->addTemplateDir($tplDir);
+				}
 			}
 			if (isset($theme['plugins'])) {
-				foreach ($theme['plugins'] as $pluginDir)
-					$this->addPluginsDir($pluginDir);
+				foreach ($theme['plugins'] as $pluginDir) {
+									$this->addPluginsDir($pluginDir);
+				}
 			}
 		}
 
@@ -153,8 +155,9 @@ 
 		$this->assign('site', $this->_page->getSiteData());
 
 		// an expensive-ish call so reduce need for it in repeated renders
-		if (!isset($templates[$template]))
-			$templates[$template] = $this->createTemplate($template);
+		if (!isset($templates[$template])) {
+					$templates[$template] = $this->createTemplate($template);
+		}
 		$tpl = $templates[$template];
 
 		// reset any parameters for the new render
@@ -233,7 +236,9 @@ 
 	public function page_url($params, $smarty=null)
 	{
 		$id = Arr::get($params, 'id', Arr::get($params, 'nice', false));
-		if ($id === '#') return '#';
+		if ($id === '#') {
+			return '#';
+		}
 		if ($id) {
 			$url = $this->getPage()->getUrlOfPageByNiceId($id);
 		} else if (!$id && $this->getPage()->hasPage()) {
@@ -241,11 +246,13 @@ 
 		} else {
 			throw new \InvalidArgumentException('There is no current page - and no id or nice parameter was specified');
 		}
-		if (!empty($params['prefix']))
-			$url = $params['prefix'].$url;
+		if (!empty($params['prefix'])) {
+					$url = $params['prefix'].$url;
+		}
 
-		if (isset($params['full']))
-			return url_base()."$url";
+		if (isset($params['full'])) {
+					return url_base()."$url";
+		}
 		return $url;
 	}
 
@@ -265,7 +272,9 @@ 
 	{
 		$pages = Arr::getRequired($params, 'id');
 		$allPages = is_array($pages) ? $pages : [$pages];
-		$urls = []; foreach ($allPages as $page) $urls[] =  $this->page_url(['id' => $page]);
+		$urls = []; foreach ($allPages as $page) {
+			$urls[] =  $this->page_url(['id' => $page]);
+		}
 		return Url::isUrl($urls);
 	}