jenskooij / cloudcontrol

src/templates/documents/brick.php

Indentation +13 added lines, -13 removed lines

@@ -12,11 +12,11 @@ 
 			<div class="form-element">
 				<label for="<?=$field->slug?>"><?=$field->title?></label>
 				<? if (isset($dynamicBrick)) :
-					$fieldSlug = $field->slug;
-					$value = isset($dynamicBrick->fields->$fieldSlug) ? current($dynamicBrick->fields->$fieldSlug) : '';
-				else :
-					$value = '';
-				endif ?>
+                    $fieldSlug = $field->slug;
+                    $value = isset($dynamicBrick->fields->$fieldSlug) ? current($dynamicBrick->fields->$fieldSlug) : '';
+                else :
+                    $value = '';
+                endif ?>
 				<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 				<ul class="grid-wrapper sortable">
 					<li class="grid-container">
@@ -44,10 +44,10 @@ 
 						</div>
 					</li>
 					<? if (isset($dynamicBrick)) :
-						$fieldSlug = $field->slug;
-						$iterable = isset($dynamicBrick->fields->$fieldSlug) ? $dynamicBrick->fields->$fieldSlug : array();
-						array_shift($iterable);
-						?>
+                        $fieldSlug = $field->slug;
+                        $iterable = isset($dynamicBrick->fields->$fieldSlug) ? $dynamicBrick->fields->$fieldSlug : array();
+                        array_shift($iterable);
+                        ?>
 						<? foreach ($iterable as $value) : ?>
 
 						<li class="grid-container">
@@ -70,10 +70,10 @@ 
 				<a class="btn js-addmultiple">+</a>
 				<? elseif ($field->multiple == true) : ?>
 					<? if (isset($dynamicBrick)) :
-						$fieldSlug = $field->slug;
-						$iterable = isset($dynamicBrick->fields->$fieldSlug) ? $dynamicBrick->fields->$fieldSlug : array();
-						array_shift($iterable);
-						?>
+                        $fieldSlug = $field->slug;
+                        $iterable = isset($dynamicBrick->fields->$fieldSlug) ? $dynamicBrick->fields->$fieldSlug : array();
+                        array_shift($iterable);
+                        ?>
 						<? foreach ($iterable as $value) : ?>
 
 						<li>

Braces +3 added lines, -1 removed lines

@@ -14,8 +14,10 @@
 				<? if (isset($dynamicBrick)) :
 					$fieldSlug = $field->slug;
 					$value = isset($dynamicBrick->fields->$fieldSlug) ? current($dynamicBrick->fields->$fieldSlug) : '';
-				else :
+				else {
+				    :
 					$value = '';
+				}
 				endif ?>
 				<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 				<ul class="grid-wrapper sortable">

Spacing +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
 								</div>
 							</div>
 						</li>
-						<?$value='';?>
+						<?$value = ''; ?>
 						<? endforeach ?>
 					<? endif ?>
 				</ul>
@@ -83,7 +83,7 @@ 
 							<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
 							</div>
 						</li>
-						<?$value='';?>
+						<?$value = ''; ?>
 					<? endforeach ?>
 					<? endif ?>
 					</div>
@@ -92,5 +92,5 @@ 
 				<a class="btn js-addrtemultiple">+</a>
 				<? endif ?>
 			</div>
-			<?$value='';?>
+			<?$value = ''; ?>
 		<? endforeach ?>

src/templates/documents/document-form-form.php

Indentation +37 added lines, -37 removed lines

@@ -22,11 +22,11 @@ 
 				<div class="form-element">
 					<label for="<?=$field->slug?>"><?=$field->title?></label>
 					<? if (isset($document)) :
-						$fieldSlug = $field->slug;
-						$value = isset($document->fields->$fieldSlug) ? current($document->fields->$fieldSlug) : '';
-					else :
-						$value = '';
-					endif ?>
+                        $fieldSlug = $field->slug;
+                        $value = isset($document->fields->$fieldSlug) ? current($document->fields->$fieldSlug) : '';
+                    else :
+                        $value = '';
+                    endif ?>
 					<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 					<ul class="grid-wrapper sortable">
 						<li class="grid-container">
@@ -54,10 +54,10 @@ 
 							</div>
 						</li>
 						<? if (isset($document)) :
-							$fieldSlug = $field->slug;
-							$iterable = isset($document->fields->$fieldSlug) ? $document->fields->$fieldSlug : array();
-							array_shift($iterable);
-							?>
+                            $fieldSlug = $field->slug;
+                            $iterable = isset($document->fields->$fieldSlug) ? $document->fields->$fieldSlug : array();
+                            array_shift($iterable);
+                            ?>
 							<? foreach ($iterable as $value) : ?>
 
 							<li class="grid-container">
@@ -80,10 +80,10 @@ 
 					<a class="btn js-addmultiple">+</a>
 					<? elseif ($field->multiple == true) : ?>
 						<? if (isset($document)) :
-							$fieldSlug = $field->slug;
-							$iterable = isset($document->fields->$fieldSlug) ? $document->fields->$fieldSlug : array();
-							array_shift($iterable);
-							?>
+                            $fieldSlug = $field->slug;
+                            $iterable = isset($document->fields->$fieldSlug) ? $document->fields->$fieldSlug : array();
+                            array_shift($iterable);
+                            ?>
 							<? foreach ($iterable as $value) : ?>
 
 							<li>
@@ -118,10 +118,10 @@ 
 							<? foreach ($document->bricks as $currentBrickSlug => $brickArray) : ?>
 								<? foreach ($brickArray as $dynamicBrick) : ?>
 									<? foreach ($bricks as $brick) :
-										if (is_object($dynamicBrick) && isset($dynamicBrick->type) && $brick->slug === $dynamicBrick->type && $currentBrickSlug === $myBrickSlug) {
-											break;
-										}
-									endforeach ?>
+                                        if (is_object($dynamicBrick) && isset($dynamicBrick->type) && $brick->slug === $dynamicBrick->type && $currentBrickSlug === $myBrickSlug) {
+                                            break;
+                                        }
+                                    endforeach ?>
 									<? if (is_object($dynamicBrick) && isset($dynamicBrick->type) && $brick->slug === $dynamicBrick->type && $currentBrickSlug === $myBrickSlug) : ?>
 									<li class="brick form-element">
 
@@ -142,12 +142,12 @@ 
 						<div class="form-element">
 						<label for="<?=$field->slug?>"><?=$field->title?></label>
 						<? if (isset($document)) :
-							$brickSlug = $brick->slug;
-							$fieldSlug = $field->slug;
-							$value = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? current($document->bricks->$brickSlug->fields->$fieldSlug) : '';
-						else :
-							$value = '';
-						endif ?>
+                            $brickSlug = $brick->slug;
+                            $fieldSlug = $field->slug;
+                            $value = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? current($document->bricks->$brickSlug->fields->$fieldSlug) : '';
+                        else :
+                            $value = '';
+                        endif ?>
 						<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 						<ul class="grid-wrapper sortable">
 							<li class="grid-container">
@@ -175,11 +175,11 @@ 
 								</div>
 							</li>
 							<? if (isset($document)) :
-								$brickSlug = $brick->slug;
-								$fieldSlug = $field->slug;
-								$iterable = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? $document->bricks->$brickSlug->fields->$fieldSlug : array();
-								array_shift($iterable);
-								?>
+                                $brickSlug = $brick->slug;
+                                $fieldSlug = $field->slug;
+                                $iterable = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? $document->bricks->$brickSlug->fields->$fieldSlug : array();
+                                array_shift($iterable);
+                                ?>
 								<? foreach ($iterable as $value) : ?>
 
 								<li class="grid-container">
@@ -202,11 +202,11 @@ 
 						<a class="btn js-addmultiple">+</a>
 						<? elseif ($field->multiple == true) : ?>
 							<? if (isset($document)) :
-								$brickSlug = $brick->slug;
-								$fieldSlug = $field->slug;
-								$iterable = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? $document->bricks->$brickSlug->fields->$fieldSlug : array();
-								array_shift($iterable);
-								?>
+                                $brickSlug = $brick->slug;
+                                $fieldSlug = $field->slug;
+                                $iterable = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? $document->bricks->$brickSlug->fields->$fieldSlug : array();
+                                array_shift($iterable);
+                                ?>
 								<? foreach ($iterable as $value) : ?>
 
 								<li>
@@ -246,10 +246,10 @@ 
 				<? if (isset($document)) : ?>
 					<? foreach ($document->dynamicBricks as $dynamicBrick) : ?>
 						<? foreach ($bricks as $brick) :
-						if ($brick->slug == $dynamicBrick->type) {
-							break;
-						}
-						endforeach ?>
+                        if ($brick->slug == $dynamicBrick->type) {
+                            break;
+                        }
+                        endforeach ?>
 						<li class="brick form-element">
 							<label><?=$brick->title?></label>
 							<?$static = false; ?>

Spacing +11 added lines, -11 removed lines

@@ -17,7 +17,7 @@ 
                     <input required="required" value="<?=isset($document) ? $document->title : '' ?>"<?= isset($document, $document->title) && !empty($document->title) ? ' readonly="readonly"' : '' ?> type="text" id="title" name="title" placeholder="Title" />
                 </div>
 			<? endif ?>
-			<?$fieldPrefix='fields';?>
+			<?$fieldPrefix = 'fields'; ?>
 			<? foreach ($documentType->fields as $field) : ?>
 				<div class="form-element">
 					<label for="<?=$field->slug?>"><?=$field->title?></label>
@@ -73,7 +73,7 @@ 
 									</div>
 								</div>
 							</li>
-							<?$value='';?>
+							<?$value = ''; ?>
 							<? endforeach ?>
 						<? endif ?>
 					</ul>
@@ -93,7 +93,7 @@ 
 								<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
 								</div>
 							</li>
-							<?$value='';?>
+							<?$value = ''; ?>
 						<? endforeach ?>
 						<? endif ?>
 						</div>
@@ -102,17 +102,17 @@ 
 					<a class="btn js-addrtemultiple">+</a>
 					<? endif ?>
 				</div>
-				<?$value='';?>
+				<?$value = ''; ?>
 			<? endforeach ?>
 			<hr />
-			<? $static_brick_nr = 0;?>
+			<? $static_brick_nr = 0; ?>
 			<? foreach ($documentType->bricks as $brick) : ?>
 			<div class="brick">
 				<label><?=$brick->title?></label>
 				<? if ($brick->multiple == 'true') : ?>
 					<input type="hidden" value="<?=$brick->brickSlug?>"/>
 					<input type="hidden" value="<?=$brick->slug?>"/>
-					<?$myBrickSlug=$brick->slug;?>
+					<?$myBrickSlug = $brick->slug; ?>
 					<ul id="newBrickDropzone_<?=$static_brick_nr?>" class="dynamicBricks sortable">
 						<? if (isset($document)) : ?>
 							<? foreach ($document->bricks as $currentBrickSlug => $brickArray) : ?>
@@ -136,7 +136,7 @@ 
 					<a class="btn" onclick="addDynamicBrick(this, 'true', 'newBrickDropzone_<?=$static_brick_nr?>');">+</a>
 					<?$static_brick_nr += 1?>
 				<? else : ?>
-					<?$fieldPrefix='bricks[' . $brick->slug . '][fields]';?>
+					<?$fieldPrefix = 'bricks[' . $brick->slug . '][fields]'; ?>
 					<input type="hidden" name="bricks[<?=$brick->slug?>][type]" value="<?=$brick->brickSlug?>" />
 					<? foreach ($brick->structure->fields as $field) : ?>
 						<div class="form-element">
@@ -195,7 +195,7 @@ 
 										</div>
 									</div>
 								</li>
-								<?$value='';?>
+								<?$value = ''; ?>
 								<? endforeach ?>
 							<? endif ?>
 						</ul>
@@ -216,7 +216,7 @@ 
 									<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
 									</div>
 								</li>
-								<?$value='';?>
+								<?$value = ''; ?>
 							<? endforeach ?>
 							<? endif ?>
 							</div>
@@ -225,12 +225,12 @@ 
 						<a class="btn js-addrtemultiple">+</a>
 						<? endif ?>
 					</div>
-					<?$value='';?>
+					<?$value = ''; ?>
 				<? endforeach ?>
 				<? endif ?>
 				</div>
 				<hr />
-			<? endforeach;?>
+			<? endforeach; ?>
 
 
 

Braces +16 added lines, -6 removed lines

@@ -1,7 +1,8 @@ 
 <form method="<?= isset($documentType) ? 'post' : 'get' ?>" onsubmit="return processRtes();" action="<?= isset($formId) ? '#' . $formId : '' ?>">
     <? if (!isset($hideTitleAndState)) : ?>
       <input type="hidden" name="path" value="<?= $request::$get['path'] ?>"/>
-    <? else : ?>
+    <? else {
+    : ?>
       <input type="hidden" name="formId" value="<?= $formId ?>"/>
       <a name="<?= $formId ?>"></a>
     <? endif ?>
@@ -17,15 +18,19 @@ 
                     <input required="required" value="<?=isset($document) ? $document->title : '' ?>"<?= isset($document, $document->title) && !empty($document->title) ? ' readonly="readonly"' : '' ?> type="text" id="title" name="title" placeholder="Title" />
                 </div>
 			<? endif ?>
-			<?$fieldPrefix='fields';?>
+			<?$fieldPrefix='fields';
+}
+?>
 			<? foreach ($documentType->fields as $field) : ?>
 				<div class="form-element">
 					<label for="<?=$field->slug?>"><?=$field->title?></label>
 					<? if (isset($document)) :
 						$fieldSlug = $field->slug;
 						$value = isset($document->fields->$fieldSlug) ? current($document->fields->$fieldSlug) : '';
-					else :
+					else {
+					    :
 						$value = '';
+					}
 					endif ?>
 					<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 					<ul class="grid-wrapper sortable">
@@ -135,8 +140,11 @@ 
 					</ul>
 					<a class="btn" onclick="addDynamicBrick(this, 'true', 'newBrickDropzone_<?=$static_brick_nr?>');">+</a>
 					<?$static_brick_nr += 1?>
-				<? else : ?>
-					<?$fieldPrefix='bricks[' . $brick->slug . '][fields]';?>
+				<? else {
+    : ?>
+					<?$fieldPrefix='bricks[' . $brick->slug . '][fields]';
+}
+?>
 					<input type="hidden" name="bricks[<?=$brick->slug?>][type]" value="<?=$brick->brickSlug?>" />
 					<? foreach ($brick->structure->fields as $field) : ?>
 						<div class="form-element">
@@ -145,8 +153,10 @@ 
 							$brickSlug = $brick->slug;
 							$fieldSlug = $field->slug;
 							$value = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? current($document->bricks->$brickSlug->fields->$fieldSlug) : '';
-						else :
+						else {
+						    :
 							$value = '';
+						}
 						endif ?>
 						<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 						<ul class="grid-wrapper sortable">

src/components/BaseComponent.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         {
             $this->template = $template;
             $this->request = $request;
-            $this->parameters = (array)$parameters;
+            $this->parameters = (array) $parameters;
             $this->matchedSitemapItem = $matchedSitemapItem;
         }
 

Doc Comments +4 added lines, -3 removed lines

@@ -140,8 +140,9 @@ 
         }
 
         /**
-         * @param $template
+         * @param string $template
          * @param null | Application $application
+         * @param Application $application
          * @return string
          */
         protected function getTemplateDir($template, $application = null)
@@ -190,8 +191,8 @@ 
         }
 
         /**
-         * @param $templatePath
-         * @param $obClean
+         * @param string $templatePath
+         * @param boolean $obClean
          * @return mixed|string
          */
         private function includeTemplateFile($templatePath, $obClean)

src/components/FormComponent.php

Spacing +1 added lines, -1 removed lines

@@ -163,7 +163,7 @@
         if (isset($_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID])) {
             $this->formId = $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID];
         } else {
-            $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID] = (string)microtime(true);
+            $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID] = (string) microtime(true);
             $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName]['submitted'] = false;
             $this->formId = $_SESSION[self::SESSION_PARAMETER_FORM_COMPONENT][$this->formParameterName][self::PARAMETER_FORM_ID];
         }

src/components/LanguageComponent.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
      */
     public function __construct($template, Request $request, $parameters, $matchedSitemapItem)
     {
-        $this->parameters = (array)$parameters;
+        $this->parameters = (array) $parameters;
         $this->checkParameters();
 
         $lang = substr(isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : $this->defaultLanguage, 0, 2);
@@ -63,7 +63,7 @@ 
             unset($this->parameters['languageParameterName']);
         }
         if (isset($this->parameters['forceRedirect'])) {
-            $this->forceRedirect = (bool)$this->parameters['forceRedirect'];
+            $this->forceRedirect = (bool) $this->parameters['forceRedirect'];
             unset($this->parameters['forceRedirect']);
         }
     }

Doc Comments +2 added lines, -2 removed lines

@@ -124,8 +124,8 @@
     }
 
     /**
-     * @param $lang
-     * @param $request
+     * @param string $lang
+     * @param Request $request
      */
     private function checkForceRedirect($lang, $request)
     {

src/images/methods/BoxCrop.php

Braces +3 added lines, -1 removed lines

@@ -27,7 +27,9 @@
 
             // Define which ratio will be used, depending on which is the smallest side
             $ratio = min($hRatio, $wRatio);
-            if ($ratio > 1) $ratio = 1;
+            if ($ratio > 1) {
+                $ratio = 1;
+            }
 
             // Define sizes
             $this->_destWidth = floor($originalWidth * $ratio);

src/images/methods/SmartCrop.php

Braces +3 added lines, -1 removed lines

@@ -37,7 +37,9 @@
 
             // Define which ratio will be used, depending on which is the biggest side
             $ratio = $wRatio < $hRatio ? $wRatio : $hRatio;
-            if ($ratio < 1) $ratio = 1;
+            if ($ratio < 1) {
+                $ratio = 1;
+            }
 
             // Calculate the destination width, height, x and y
             $this->_destWidth = $originalWidth / $ratio;

src/images/methods/Watermark.php

Braces +9 added lines, -3 removed lines

@@ -63,7 +63,9 @@ 
          */
         protected function calculateX($imageResource)
         {
-            if (intval($this->_x) === $this->_x) return $this->_x;
+            if (intval($this->_x) === $this->_x) {
+                return $this->_x;
+            }
 
             $x = strtolower($this->_x);
 
@@ -88,7 +90,9 @@ 
          */
         public function calculateY($imageResource)
         {
-            if (intval($this->_y) === $this->_y) return $this->_y;
+            if (intval($this->_y) === $this->_y) {
+                return $this->_y;
+            }
 
             $y = strtolower($this->_y);
 
@@ -125,7 +129,9 @@ 
          */
         public function GetWatermark()
         {
-            if ($this->_watermark == null) throw new \Exception('A watermark is not set. Please supply a \CloudControl\Cms\image\Image using $this->SetWatermark');
+            if ($this->_watermark == null) {
+                throw new \Exception('A watermark is not set. Please supply a \CloudControl\Cms\image\Image using $this->SetWatermark');
+            }
             return $this->_watermark;
         }
 

src/images/methods/Resize.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
          */
         public function SetPreserveAspectRatio($bool)
         {
-            $this->_preserveAspectRatio = (bool)$bool;
+            $this->_preserveAspectRatio = (bool) $bool;
             return $this;
         }