jenskooij / cloudcontrol

cloudcontrol/templates/cms/documents/brick.php

Braces +3 added lines, -1 removed lines

@@ -9,8 +9,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 +8 added lines, -8 removed lines

@@ -3,9 +3,9 @@ 
 	<a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a>
 </div>
 <?if ($static == true) {
-	$fieldPrefix = 'bricks[' . $myBrickSlug . '][' . str_replace('.', '', str_replace(' ', '', microtime())) . '][fields]';
+	$fieldPrefix = 'bricks['.$myBrickSlug.']['.str_replace('.', '', str_replace(' ', '', microtime())).'][fields]';
 } else {
-	$fieldPrefix = 'dynamicBricks[' . $brick->slug . '][' . str_replace('.', '', str_replace(' ', '', microtime())) . ']';
+	$fieldPrefix = 'dynamicBricks['.$brick->slug.']['.str_replace('.', '', str_replace(' ', '', microtime())).']';
 }?>
 <? foreach ($brick->fields as $field) : ?>
 			<div class="form-element">
@@ -30,7 +30,7 @@ 
 							<a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a>
 							<div class="form-element">
 				<? endif ?>
-					<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
+					<? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
 				<? if ($field->multiple == true && $field->type != 'Rich Text') : ?>
 
 							</div>
@@ -52,7 +52,7 @@ 
 						<li class="grid-container">
 							<div class="grid-box-10">
 								<div class="grid-inner form-element">
-									<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
+									<? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
 								</div>
 							</div>
 							<div class="grid-box-2">
@@ -62,7 +62,7 @@ 
 								</div>
 							</div>
 						</li>
-						<?$value='';?>
+						<?$value = ''; ?>
 						<? endforeach ?>
 					<? endif ?>
 				</ul>
@@ -79,10 +79,10 @@ 
 							<a class="btn error js-deletemultiple"><i class="fa fa-times"></i></a>
 							<a class="btn move ui-sortable-handle"><i class="fa fa-arrows-v"></i></a>
 							<div class="form-element">
-							<? include(__DIR__ . '/fieldTypes/' . str_replace(' ', '-', $field->type) . '.php') ?>
+							<? include(__DIR__.'/fieldTypes/'.str_replace(' ', '-', $field->type).'.php') ?>
 							</div>
 						</li>
-						<?$value='';?>
+						<?$value = ''; ?>
 					<? endforeach ?>
 					<? endif ?>
 					</div>
@@ -91,5 +91,5 @@ 
 				<a class="btn js-addrtemultiple">+</a>
 				<? endif ?>
 			</div>
-			<?$value='';?>
+			<?$value = ''; ?>
 		<? endforeach ?>

cloudcontrol/templates/cms/documents/fieldTypes/Image.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 	<div class="grid-container">
 		<div class="grid-box-2">
 			<div class="grid-inner">
-				<div<?=isset($value) ? ' style="background-image:url(\'' . $request::$subfolders . 'images/' . $value . '\');"' : '' ?> class="selected-image" id="<?=$field->slug?>_selectedImage"></div>
+				<div<?=isset($value) ? ' style="background-image:url(\''.$request::$subfolders.'images/'.$value.'\');"' : '' ?> class="selected-image" id="<?=$field->slug?>_selectedImage"></div>
 			</div>
 		</div>
 		<div class="grid-box-10">

cloudcontrol/templates/cms/images/show.php

Spacing +4 added lines, -4 removed lines

@@ -10,22 +10,22 @@
 	<div class="show-image">
 		<label>File</label>
 		<div class="value">
-			<?=isset($image)? $image->file : '' ?>
+			<?=isset($image) ? $image->file : '' ?>
 		</div>
 		<label>Type</label>
 		<div class="value">
-			<?=isset($image)? $image->type : '' ?>
+			<?=isset($image) ? $image->type : '' ?>
 		</div>
 		<label>Size</label>
 		<div class="value">
-			<?=isset($image)? humanFileSize($image->size) : '' ?>
+			<?=isset($image) ? humanFileSize($image->size) : '' ?>
 		</div>
 		<label>Set</label>
 		<? if (isset($image)) : ?>
 			<? foreach ($image->set as $key => $set) : ?>
 				<div class="sets">
 					<label><?=$key?></label>
-					<img src="<?=\library\cc\Request::$subfolders . 'images/' . $set?>" />
+					<img src="<?=\library\cc\Request::$subfolders.'images/'.$set?>" />
 				</div>
 			<? endforeach ?>
 		<? endif ?>

cloudcontrol/templates/cms/documents.php

Spacing +12 added lines, -12 removed lines

@@ -1,4 +1,4 @@ 
-<script>window.onload=function(){History.init();History.replaceState(null, 'Cloud Control CMS', '/<?=$request::$subfolders . $cmsPrefix?>/documents?path=/');};</script>
+<script>window.onload=function(){History.init();History.replaceState(null, 'Cloud Control CMS', '/<?=$request::$subfolders.$cmsPrefix?>/documents?path=/');};</script>
 <section class="documents">
 	<h2><i class="fa fa-file-text-o"></i> Documents</h2>
 	<nav class="actions">
@@ -24,9 +24,9 @@ 
 			<? foreach ($documents as $document) : ?>
 				<li class="grid-container">
 					<? if ($document->type == 'document') : ?>
-						<?renderDocument($document, $cmsPrefix);?>
+						<?renderDocument($document, $cmsPrefix); ?>
 					<? elseif ($document->type == 'folder') : ?>
-						<?renderFolder($document, $cmsPrefix, '', true);?>
+						<?renderFolder($document, $cmsPrefix, '', true); ?>
 					<? endif ?>
 				</li>
 
@@ -37,7 +37,7 @@ 
 <? function renderDocument($document, $cmsPrefix, $slugPrefix = '') {?>
 <div class="grid-box-10">
 	<h3>
-		<a class="btn documentTitle" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/edit-document?slug=<?=$slugPrefix . $document->slug?>" title="Edit">
+		<a class="btn documentTitle" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/edit-document?slug=<?=$slugPrefix.$document->slug?>" title="Edit">
 			<i class="fa fa-file-text-o"></i> <?=$document->title?>
 		</a>
 		<small class="small state <?=strtolower($document->state)?>"><?=ucfirst($document->state)?></small>
@@ -53,29 +53,29 @@ 
 	</h3>
 </div>
 <div class="documentActions grid-box-2">
-	<a class="btn" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/edit-document?slug=<?=$slugPrefix . $document->slug?>" title="Edit"><i class="fa fa-pencil"></i></a>
-	<a onclick="return confirm('Are you sure you want to delete this item?');" class="btn error" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/delete-document?slug=<?=$slugPrefix . $document->slug?>" title="Delete"><i class="fa fa-times"></i></a>
+	<a class="btn" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/edit-document?slug=<?=$slugPrefix.$document->slug?>" title="Edit"><i class="fa fa-pencil"></i></a>
+	<a onclick="return confirm('Are you sure you want to delete this item?');" class="btn error" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/delete-document?slug=<?=$slugPrefix.$document->slug?>" title="Delete"><i class="fa fa-times"></i></a>
 </div>
 <?}?>
-<? function renderFolder($document, $cmsPrefix, $slugPrefix ='', $root = false) {?>
+<? function renderFolder($document, $cmsPrefix, $slugPrefix = '', $root = false) {?>
 <div class="grid-box-8">
 	<h3>
-		<a class="btn documentTitle openFolder" data-slug="<?=$slugPrefix . $document->slug?>" title="Open">
+		<a class="btn documentTitle openFolder" data-slug="<?=$slugPrefix.$document->slug?>" title="Open">
 			<i class="fa fa-folder-o "></i> <?=$document->title?>
 		</a>
 	</h3>
 </div>
 <div class="documentActions grid-box-4">
-	<a class="btn" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/edit-folder?slug=<?=$slugPrefix . $document->slug?>" title="Edit"><i class="fa fa-pencil"></i></a>
-	<a onclick="return confirm('Are you sure you want to delete this item?');" class="btn error" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/delete-folder?slug=<?=$slugPrefix . $document->slug?>" title="Delete"><i class="fa fa-times"></i></a>
+	<a class="btn" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/edit-folder?slug=<?=$slugPrefix.$document->slug?>" title="Edit"><i class="fa fa-pencil"></i></a>
+	<a onclick="return confirm('Are you sure you want to delete this item?');" class="btn error" href="<?=\library\cc\Request::$subfolders?><?=$cmsPrefix?>/documents/delete-folder?slug=<?=$slugPrefix.$document->slug?>" title="Delete"><i class="fa fa-times"></i></a>
 </div>
 <ul class="documents grid-wrapper nested<?=$root ? ' root' : '' ?>">
 	<? foreach ($document->content as $subDocument) : ?>
 		<li class="grid-container">
 			<? if ($subDocument->type == 'document') : ?>
-				<?renderDocument($subDocument, $cmsPrefix, $slugPrefix . $document->slug . '/');?>
+				<?renderDocument($subDocument, $cmsPrefix, $slugPrefix.$document->slug.'/'); ?>
 			<? elseif ($subDocument->type == 'folder') : ?>
-				<?renderFolder($subDocument, $cmsPrefix, $slugPrefix . $document->slug . '/');?>
+				<?renderFolder($subDocument, $cmsPrefix, $slugPrefix.$document->slug.'/'); ?>
 			<? endif ?>
 		</li>
 	<? endforeach ?>

cloudcontrol/templates/cms.php

Spacing +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
 				</li>
 				<? $nrOfMenuItems += 1 ?>
 				<? endif ?>
-				<li class="grid-box-<?=6 + (5-$nrOfMenuItems)?> log-off-box">
+				<li class="grid-box-<?=6 + (5 - $nrOfMenuItems)?> log-off-box">
 					<a class="btn log-off grid-inner" href="<?=$request::$subfolders?><?=$cmsPrefix?>/log-off">
 						<i class="fa fa-power-off"></i>
 						<span>Log off</span>
@@ -86,7 +86,7 @@ 
 	</main>
 <script>
 var subfolders = '<?=$request::$subfolders?>',
-	cmsSubfolders = '<?=$request::$subfolders . $cmsPrefix?>';
+	cmsSubfolders = '<?=$request::$subfolders.$cmsPrefix?>';
 </script>
 <script src="<?=$request::$subfolders?>js/cms.js"></script>
 </body>

cloudcontrol/library/images/methods/Watermark.php

Braces +9 added lines, -3 removed lines

@@ -61,7 +61,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);
 			
@@ -86,7 +88,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);
 			
@@ -123,7 +127,9 @@ 
 		 */
 		public function GetWatermark()
 		{
-			if ($this->_watermark == null) throw new \Exception('A watermark is not set. Please supply a \library\image\Image using $this->SetWatermark');
+			if ($this->_watermark == null) {
+				throw new \Exception('A watermark is not set. Please supply a \library\image\Image using $this->SetWatermark');
+			}
 			return $this->_watermark;
 		}
 		

cloudcontrol/library/images/methods/Resize.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 			
 			// Define the ratio and adjust the width and height
 			if ($this->_preserveAspectRatio) {
-				$ratio = min($this->_width/$originalWidth, $this->_height/$originalHeight);
+				$ratio = min($this->_width / $originalWidth, $this->_height / $originalHeight);
 				$this->_width = $originalWidth * $ratio;
 				$this->_height = $originalHeight * $ratio;
 			}

cloudcontrol/library/images/methods/Crop.php

Indentation +2 added lines, -2 removed lines

@@ -109,8 +109,8 @@
 
 			// Preserve transparency
 			imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
-            imagealphablending($new, false);
-            imagesavealpha($new, true);
+			imagealphablending($new, false);
+			imagesavealpha($new, true);
 			
 			imagecopyresampled($new, $imageResource, $this->_destX, $this->_destY, $this->_x, $this->_y, $this->_destWidth, $this->_destHeight, $this->_destWidth, $this->_destHeight);
 			

cloudcontrol/library/images/methods/BoxCrop.php

Spacing +2 added lines, -2 removed lines

@@ -26,14 +26,14 @@
 			
 			// 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);
 			$this->_destHeight = floor($originalHeight * $ratio);
 			
 			// Define margins
-			$this->_destX = floor(($this->_width  - $this->_destWidth) / 2);
+			$this->_destX = floor(($this->_width - $this->_destWidth) / 2);
 			$this->_destY = floor(($this->_height - $this->_destHeight) / 2);
 			
 			// Execute the Crop method with the given parameters

Braces +3 added lines, -1 removed lines

@@ -26,7 +26,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);

Indentation +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 		/**
 		 * @param resource $imageResource
 		 * @return resource
-         */
+		 */
 		public function Execute($imageResource)
 		{
 			// Define the origial width and height