newicon / neon

neon/cms/components/Page.php

Spacing +9 added lines, -9 removed lines

@@ -79,7 +79,7 @@ 
 	 */
 	public function isInEditMode()
 	{
-		if (neon()->session===null) return false;
+		if (neon()->session === null) return false;
 		return neon()->session->get(self::COBE_EDITING, false);
 	}
 
@@ -217,7 +217,7 @@ 
 		$params = array_merge($data['page_params'], neon()->request->get(), neon()->request->post());
 		unset($data['page_params']);
 		$data['params'] = Html::encodeEntities($params);
-		$data['url'] = '/' . neon()->request->pathInfo;
+		$data['url'] = '/'.neon()->request->pathInfo;
 		$data['uri'] = $_SERVER['REQUEST_URI'];
 		$data['host'] = Url::base(true);
 		$data['editing'] = $this->isInEditMode();
@@ -359,7 +359,7 @@ 
 
 		// If the number of renders are excessive (4+), issue a warning.
 		if ($numberOfRenders >= 4)
-			\Neon::debug('Excessive number of renders (>=4): ' . $numberOfRenders);
+			\Neon::debug('Excessive number of renders (>=4): '.$numberOfRenders);
 
 		// inject assets into template
 		$html = neon()->view->injectHtml($html);
@@ -433,7 +433,7 @@ 
 	 * @param
 	 * @return string
 	 */
-	protected function canonicaliseRequest(&$dataRequest, $isStatic=false)
+	protected function canonicaliseRequest(&$dataRequest, $isStatic = false)
 	{
 		if ($isStatic) {
 			$id = $this->createStaticContentId($dataRequest);
@@ -441,7 +441,7 @@ 
 		} else {
 			$request = array('class'=>null, 'filters'=>[], 'order'=>[], 'limit'=>[]);
 			$dataRequest = array_merge($request, $dataRequest);
-			$id = md5(str_replace([' '],'', json_encode($dataRequest)));
+			$id = md5(str_replace([' '], '', json_encode($dataRequest)));
 		}
 		return $id;
 	}
@@ -466,7 +466,7 @@ 
 	 */
 	protected function makeDynamicDataRequests()
 	{
-		if (count($this->dynamicDataRequests)>0) {
+		if (count($this->dynamicDataRequests) > 0) {
 			$dds = $this->getIDdsObjectManagement();
 			foreach ($this->dynamicDataRequests as $id=>$dr) {
 				$dds->addObjectRequest($dr['class'], $dr['filters'], $dr['order'], $dr['limit'], $id);
@@ -492,11 +492,11 @@ 
 	 */
 	protected function makeStaticDataRequests()
 	{
-		if (count($this->staticDataRequests)>0) {
+		if (count($this->staticDataRequests) > 0) {
 			$cms = $this->getICmsStaticData();
 			$data = $cms->bulkStaticContentRequest($this->staticDataRequests);
 			foreach ($data as $i=>$d)
-				$this->requestedData[$i] = ($d===null ? 'not found' : $d);
+				$this->requestedData[$i] = ($d === null ? 'not found' : $d);
 			$this->staticDataRequests = [];
 		}
 	}
@@ -507,7 +507,7 @@ 
 	 */
 	protected function hasDataRequests()
 	{
-		return (count($this->staticDataRequests)+count($this->dynamicDataRequests) > 0);
+		return (count($this->staticDataRequests) + count($this->dynamicDataRequests) > 0);
 	}
 
 	/**

Braces +29 added lines, -18 removed lines

@@ -79,7 +79,9 @@ 
 	 */
 	public function isInEditMode()
 	{
-		if (neon()->session===null) return false;
+		if (neon()->session===null) {
+			return false;
+		}
 		return neon()->session->get(self::COBE_EDITING, false);
 	}
 
@@ -211,8 +213,9 @@ 
 			$data = $this->_page;
 			// add the nice_id as CmnUrRoute will add this on first parse through Cobe without gets but
 			// not on requests with get parameters which has led to hard-to-debug runtime coding errors
-			if (!isset($data['page_params']['nice_id']) && isset($data['nice_id']))
-				$data['page_params']['nice_id'] = $data['nice_id'];
+			if (!isset($data['page_params']['nice_id']) && isset($data['nice_id'])) {
+							$data['page_params']['nice_id'] = $data['nice_id'];
+			}
 		}
 		$params = array_merge($data['page_params'], neon()->request->get(), neon()->request->post());
 		unset($data['page_params']);
@@ -255,7 +258,9 @@ 
 	 */
 	public function getUrlOfPage($id)
 	{
-		if (!$id) return '';
+		if (!$id) {
+			return '';
+		}
 		return $url = url(['/cms/render/page', 'nice_id'=>$id]);
 	}
 
@@ -353,13 +358,15 @@ 
 		do {
 			$numberOfRenders++;
 			$html = $renderer->renderTemplate($template);
-			if (($hasDataRequests = $this->hasDataRequests()))
-				$this->makeDataRequests();
+			if (($hasDataRequests = $this->hasDataRequests())) {
+							$this->makeDataRequests();
+			}
 		} while ($hasDataRequests == true);
 
 		// If the number of renders are excessive (4+), issue a warning.
-		if ($numberOfRenders >= 4)
-			\Neon::debug('Excessive number of renders (>=4): ' . $numberOfRenders);
+		if ($numberOfRenders >= 4) {
+					\Neon::debug('Excessive number of renders (>=4): ' . $numberOfRenders);
+		}
 
 		// inject assets into template
 		$html = neon()->view->injectHtml($html);
@@ -390,15 +397,17 @@ 
 		// see if we have the data
 		if (isset($this->requestedData[$id])) {
 			$data = $this->requestedData[$id];
-			if (!$isStatic && isset($this->requestedDataMeta[$id]))
-				$meta = $this->requestedDataMeta[$id];
+			if (!$isStatic && isset($this->requestedDataMeta[$id])) {
+							$meta = $this->requestedDataMeta[$id];
+			}
 			return true;
 		}
 		// if not then add it to the list of requested data
-		if ($isStatic)
-			$this->staticDataRequests[$id] = $dataRequest;
-		else
-			$this->dynamicDataRequests[$id] = $dataRequest;
+		if ($isStatic) {
+					$this->staticDataRequests[$id] = $dataRequest;
+		} else {
+					$this->dynamicDataRequests[$id] = $dataRequest;
+		}
 		return false;
 	}
 
@@ -495,8 +504,9 @@ 
 		if (count($this->staticDataRequests)>0) {
 			$cms = $this->getICmsStaticData();
 			$data = $cms->bulkStaticContentRequest($this->staticDataRequests);
-			foreach ($data as $i=>$d)
-				$this->requestedData[$i] = ($d===null ? 'not found' : $d);
+			foreach ($data as $i=>$d) {
+							$this->requestedData[$i] = ($d===null ? 'not found' : $d);
+			}
 			$this->staticDataRequests = [];
 		}
 	}
@@ -539,8 +549,9 @@ 
 	private $cmsStaticData = null;
 	private function getICmsStaticData()
 	{
-		if ($this->cmsStaticData === null)
-			$this->cmsStaticData = neon('cms')->ICmsStaticData;
+		if ($this->cmsStaticData === null) {
+					$this->cmsStaticData = neon('cms')->ICmsStaticData;
+		}
 		return $this->cmsStaticData;
 	}