newicon / neon

neon/cms/components/Daedalus.php

Spacing +13 added lines, -13 removed lines

@@ -175,7 +175,7 @@ 
 	 * @param array $params  any paramters from @see dds and dds_choice
 	 * @param object $renderer  the render object
 	 */
-	public function __construct($params, $renderer=null)
+	public function __construct($params, $renderer = null)
 	{
 		$this->params = $params;
 		$this->renderer = $renderer;
@@ -200,7 +200,7 @@ 
 			$request = self::convertDataRequestToJson($this->params['data']);
 			$responded = neon()->cms->getPage()->requestWidgetData($request, $data, $id, false, $meta);
 			if ($responded) {
-				$result['hasData'] = count($data)>0;
+				$result['hasData'] = count($data) > 0;
 				$result['hasResponse'] = true;
 				$result['data'] = $data;
 				$result['meta'] = $meta;
@@ -225,21 +225,21 @@ 
 	 * @return null|errors|array  returns errors if not valid, null if called
 	 *   from within a template and the data if from within a plugin
 	 */
-	protected function queryChoice($template=true)
+	protected function queryChoice($template = true)
 	{
 		// check usage
 		if (!isset($this->params['member']))
-			return "Usage: you must provide a 'member' parameter. You provided ".print_r($this->params,true);
+			return "Usage: you must provide a 'member' parameter. You provided ".print_r($this->params, true);
 		if ($this->renderer && !isset($this->params['assign']))
-			return "Usage: you must provide an 'assign' parameter. You provided ".print_r($this->params,true);
-		if (strpos($this->params['member'],':') === false && !isset($this->params['class']))
+			return "Usage: you must provide an 'assign' parameter. You provided ".print_r($this->params, true);
+		if (strpos($this->params['member'], ':') === false && !isset($this->params['class']))
 			return "Usage: if you do not scope the member as class::member then you must provide the class parameter";
 
 		// extract out class and member
 		$class = null;
 		$member = null;
-		if (strpos($this->params['member'],':') !== false)
-			list ($class, $member) = explode(':', str_replace('::',':',$this->params['member']));
+		if (strpos($this->params['member'], ':') !== false)
+			list ($class, $member) = explode(':', str_replace('::', ':', $this->params['member']));
 		else {
 			$class = $this->params['class'];
 			$member = $this->params['member'];
@@ -287,10 +287,10 @@ 
 	{
 		// check usage
 		if (!isset($this->params['class']))
-			return "Usage: you must provide a 'class' parameter. You provided ".print_r($this->params,true);
+			return "Usage: you must provide a 'class' parameter. You provided ".print_r($this->params, true);
 
 		if ($this->renderer && !isset($this->params['assign']))
-			return "Usage: you must provide an 'assign' parameter. You provided ".print_r($this->params,true);
+			return "Usage: you must provide an 'assign' parameter. You provided ".print_r($this->params, true);
 
 		$fields = isset($this->params['fields']) ? $this->params['fields'] : [];
 
@@ -388,7 +388,7 @@ 
 				if (is_array($dps['dds_filter']))
 					$filters[] = json_encode($dps['dds_filter']);
 				// else deprecated json approach
-				else if (strpos(trim($dps['dds_filter']), '[')!==0)
+				else if (strpos(trim($dps['dds_filter']), '[') !== 0)
 					$filters[] = "[$dps[dds_filter]]";
 				else
 					$filters[] = $dps['dds_filter'];
@@ -396,7 +396,7 @@ 
 
 			// create the filters clause
 			if (count($filters))
-				$data[] = "'filters':".implode(',',$filters);
+				$data[] = "'filters':".implode(',', $filters);
 
 			// sort out the order
 			if (isset($dps['dds_order'])) {
@@ -463,7 +463,7 @@ 
 				$classType = $d['_class_type'];
 				foreach ($d as $field=>$value) {
 					// ignore all bookkeeping fields
-					if (strpos($field, '_')===0)
+					if (strpos($field, '_') === 0)
 						continue;
 					$edit[$i][$field] = self::createFieldEditable($classType, $field, $d['_uuid'], $value);
 				}

Braces +91 added lines, -66 removed lines

@@ -207,10 +207,11 @@ 
 				$result['edit'] = $this->createEditable($data);
 			}
 		}
-		if ($this->renderer)
-			$this->renderer->assign($this->params['assign'], $result);
-		else
-			return $result;
+		if ($this->renderer) {
+					$this->renderer->assign($this->params['assign'], $result);
+		} else {
+					return $result;
+		}
 	}
 
 	/**
@@ -228,19 +229,22 @@ 
 	protected function queryChoice($template=true)
 	{
 		// check usage
-		if (!isset($this->params['member']))
-			return "Usage: you must provide a 'member' parameter. You provided ".print_r($this->params,true);
-		if ($this->renderer && !isset($this->params['assign']))
-			return "Usage: you must provide an 'assign' parameter. You provided ".print_r($this->params,true);
-		if (strpos($this->params['member'],':') === false && !isset($this->params['class']))
-			return "Usage: if you do not scope the member as class::member then you must provide the class parameter";
+		if (!isset($this->params['member'])) {
+					return "Usage: you must provide a 'member' parameter. You provided ".print_r($this->params,true);
+		}
+		if ($this->renderer && !isset($this->params['assign'])) {
+					return "Usage: you must provide an 'assign' parameter. You provided ".print_r($this->params,true);
+		}
+		if (strpos($this->params['member'],':') === false && !isset($this->params['class'])) {
+					return "Usage: if you do not scope the member as class::member then you must provide the class parameter";
+		}
 
 		// extract out class and member
 		$class = null;
 		$member = null;
-		if (strpos($this->params['member'],':') !== false)
-			list ($class, $member) = explode(':', str_replace('::',':',$this->params['member']));
-		else {
+		if (strpos($this->params['member'],':') !== false) {
+					list ($class, $member) = explode(':', str_replace('::',':',$this->params['member']));
+		} else {
 			$class = $this->params['class'];
 			$member = $this->params['member'];
 		}
@@ -252,10 +256,11 @@ 
 		if (!isset(self::$_choices[$key])) {
 			$dds = neon('dds')->iDdsClassManagement;
 			$result = $dds->getMember($class, $member, ['choices']);
-			if (!empty($result) && isset($result['choices']))
-				self::$_choices[$key] = $result['choices'];
-			else
-				self::$_choices[$key] = [];
+			if (!empty($result) && isset($result['choices'])) {
+							self::$_choices[$key] = $result['choices'];
+			} else {
+							self::$_choices[$key] = [];
+			}
 		}
 		$choices = self::$_choices[$key];
 		if (isset($this->params['order'])) {
@@ -265,10 +270,11 @@ 
 				asort($choices);
 			}
 		}
-		if ($this->renderer)
-			$this->renderer->assign($this->params['assign'], $choices);
-		else
-			return $choices;
+		if ($this->renderer) {
+					$this->renderer->assign($this->params['assign'], $choices);
+		} else {
+					return $choices;
+		}
 	}
 
 	/**
@@ -286,11 +292,13 @@ 
 	protected function queryMap()
 	{
 		// check usage
-		if (!isset($this->params['class']))
-			return "Usage: you must provide a 'class' parameter. You provided ".print_r($this->params,true);
+		if (!isset($this->params['class'])) {
+					return "Usage: you must provide a 'class' parameter. You provided ".print_r($this->params,true);
+		}
 
-		if ($this->renderer && !isset($this->params['assign']))
-			return "Usage: you must provide an 'assign' parameter. You provided ".print_r($this->params,true);
+		if ($this->renderer && !isset($this->params['assign'])) {
+					return "Usage: you must provide an 'assign' parameter. You provided ".print_r($this->params,true);
+		}
 
 		$fields = isset($this->params['fields']) ? $this->params['fields'] : [];
 
@@ -309,11 +317,13 @@ 
 			self::$_maps[$class] = $result;
 		}
 		$map = self::$_maps[$class];
-		if (isset($this->params['flip']))
-			$map = array_flip($map);
+		if (isset($this->params['flip'])) {
+					$map = array_flip($map);
+		}
 
-		if ($this->renderer)
-			$this->renderer->assign($this->params['assign'], $map);
+		if ($this->renderer) {
+					$this->renderer->assign($this->params['assign'], $map);
+		}
 		return $map;
 	}
 
@@ -329,11 +339,13 @@ 
 		$json = trim(str_replace("'", '"', $data));
 		if (strlen($json) > 0) {
 			// for convenience the beginning and ending brackets are optional so add if not supplied
-			if (strpos($json, '{') !== 0)
-				$json = '{'.$json.'}';
+			if (strpos($json, '{') !== 0) {
+							$json = '{'.$json.'}';
+			}
 			$request = json_decode($json, true);
-			if ($request === null)
-				throw new \Exception("Failing to json decode the data request: $json converted from $data. ");
+			if ($request === null) {
+							throw new \Exception("Failing to json decode the data request: $json converted from $data. ");
+			}
 		}
 		return $request;
 	}
@@ -358,10 +370,12 @@ 
 		$dps = array_intersect_key($params, array_flip($dpa));
 		if (count($dps)) {
 			$data = [];
-			if ((isset($dps['dds']) || isset($dps['dds_page'])) && empty($dps['dds_class']))
-				$dps['dds_class'] = $params['type'];
-			if (isset($dps['dds_class']))
-				$data[] = "'class':'$dps[dds_class]'";
+			if ((isset($dps['dds']) || isset($dps['dds_page'])) && empty($dps['dds_class'])) {
+							$dps['dds_class'] = $params['type'];
+			}
+			if (isset($dps['dds_class'])) {
+							$data[] = "'class':'$dps[dds_class]'";
+			}
 
 			// create the filters
 			$filters = [];
@@ -369,9 +383,9 @@ 
 			// create the page specific filter
 			if (!empty($dps['dds_page'])) {
 				$pageId = null;
-				if ($dps['dds_page'] === true || $dps['dds_page'] === 'true')
-					$pageId = neon()->cms->getPage()->getId();
-				else {
+				if ($dps['dds_page'] === true || $dps['dds_page'] === 'true') {
+									$pageId = neon()->cms->getPage()->getId();
+				} else {
 					// either a nice id or a page id
 					// $pageId = self::$page->niceId2PageId($dps['dds_page']);
 					// if (!$pageId)
@@ -379,43 +393,51 @@ 
 					// object therefore has not worked for a while!
 					$pageId = $dps['dds_page'];
 				}
-				if ($pageId)
-					$filters[] = "['page_id','=','$pageId']";
+				if ($pageId) {
+									$filters[] = "['page_id','=','$pageId']";
+				}
 			}
 
 			// add other filters
 			if (isset($dps['dds_filter']) && !empty($dps['dds_filter'])) {
-				if (is_array($dps['dds_filter']))
-					$filters[] = json_encode($dps['dds_filter']);
+				if (is_array($dps['dds_filter'])) {
+									$filters[] = json_encode($dps['dds_filter']);
+				}
 				// else deprecated json approach
-				else if (strpos(trim($dps['dds_filter']), '[')!==0)
-					$filters[] = "[$dps[dds_filter]]";
-				else
-					$filters[] = $dps['dds_filter'];
+				else if (strpos(trim($dps['dds_filter']), '[')!==0) {
+									$filters[] = "[$dps[dds_filter]]";
+				} else {
+									$filters[] = $dps['dds_filter'];
+				}
 			}
 
 			// create the filters clause
-			if (count($filters))
-				$data[] = "'filters':".implode(',',$filters);
+			if (count($filters)) {
+							$data[] = "'filters':".implode(',',$filters);
+			}
 
 			// sort out the order
 			if (isset($dps['dds_order'])) {
-				if (is_array($dps['dds_order']))
-					$data[] = "'order':".json_encode($dps['dds_order']);
+				if (is_array($dps['dds_order'])) {
+									$data[] = "'order':".json_encode($dps['dds_order']);
+				}
 				// else deprecated json approach
-				else
-					$data[] = "'order':{".$dps['dds_order']."}";
+				else {
+									$data[] = "'order':{".$dps['dds_order']."}";
+				}
 			}
 
 			// sort out the limit
 			if (isset($dps['dds_limit'])) {
-				if (is_numeric($dps['dds_limit']))
-					$data[] = "'limit':{'length':$dps[dds_limit]}";
-				else if (is_array($dps['dds_limit']))
-					$data[] = "'limit':".json_encode($dps['dds_limit']);
+				if (is_numeric($dps['dds_limit'])) {
+									$data[] = "'limit':{'length':$dps[dds_limit]}";
+				} else if (is_array($dps['dds_limit'])) {
+									$data[] = "'limit':".json_encode($dps['dds_limit']);
+				}
 				// else deprecated json approach
-				else
-					$data[] = "'limit':{".$dps['dds_limit']."}";
+				else {
+									$data[] = "'limit':{".$dps['dds_limit']."}";
+				}
 			}
 			$params['data'] = '{'.implode(', ', $data).'}';
 		}
@@ -432,8 +454,9 @@ 
 	protected function canonicalise($params)
 	{
 		$canon = [];
-		if (empty($params['assign']) && $this->renderer !== null)
-			throw new \InvalidArgumentException("You must set an 'assign' parameter when using the 'dds' tag");
+		if (empty($params['assign']) && $this->renderer !== null) {
+					throw new \InvalidArgumentException("You must set an 'assign' parameter when using the 'dds' tag");
+		}
 		foreach ($params as $k => $v) {
 			if ($k == 'assign') {
 				$canon[$k] = $v;
@@ -463,8 +486,9 @@ 
 				$classType = $d['_class_type'];
 				foreach ($d as $field=>$value) {
 					// ignore all bookkeeping fields
-					if (strpos($field, '_')===0)
-						continue;
+					if (strpos($field, '_')===0) {
+											continue;
+					}
 					$edit[$i][$field] = self::createFieldEditable($classType, $field, $d['_uuid'], $value);
 				}
 			}
@@ -486,8 +510,9 @@ 
 	 */
 	public static function createFieldEditable($classType, $field, $key, $value)
 	{
-		if (is_array($value))
-			return $value;
+		if (is_array($value)) {
+					return $value;
+		}
 
 		/**
 		 * This needs to be changed to generate an appropriate form to edit the