jenskooij / cloudcontrol

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

Spacing +20 added lines, -20 removed lines

@@ -1,4 +1,4 @@ 
-<form method="<?= isset($documentType) ? 'post' : 'get' ?>" onsubmit="return processRtes();" action="<?= isset($formId) ? '#' . $formId : '' ?>">
+<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 : ?>
@@ -17,7 +17,7 @@ 
                     <input required="required" value="<?=isset($document) ? $document->title : '' ?>" 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>
@@ -41,7 +41,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>
@@ -63,7 +63,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">
@@ -73,7 +73,7 @@ 
 									</div>
 								</div>
 							</li>
-							<?$value='';?>
+							<?$value = ''; ?>
 							<? endforeach ?>
 						<? endif ?>
 					</ul>
@@ -90,10 +90,10 @@ 
 								<a class="btn error js-deletemultiple"><i class="fa fa-trash"></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>
@@ -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) : ?>
@@ -126,7 +126,7 @@ 
 									<li class="brick form-element">
 
 										<?$static = true; ?>
-										<?include(__DIR__ . '/brick.php')?>
+										<?include(__DIR__.'/brick.php')?>
 									</li>
 									<? endif ?>
 								<? endforeach ?>
@@ -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">
@@ -162,7 +162,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>
@@ -185,7 +185,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">
@@ -195,7 +195,7 @@ 
 										</div>
 									</div>
 								</li>
-								<?$value='';?>
+								<?$value = ''; ?>
 								<? endforeach ?>
 							<? endif ?>
 						</ul>
@@ -213,10 +213,10 @@ 
 									<a class="btn error js-deletemultiple"><i class="fa fa-trash"></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>
@@ -225,12 +225,12 @@ 
 						<a class="btn js-addrtemultiple">+</a>
 						<? endif ?>
 					</div>
-					<?$value='';?>
+					<?$value = ''; ?>
 				<? endforeach ?>
 				<? endif ?>
 				</div>
 				<hr />
-			<? endforeach;?>
+			<? endforeach; ?>
 
 
 
@@ -253,7 +253,7 @@ 
 						<li class="brick form-element">
 							<label><?=$brick->title?></label>
 							<?$static = false; ?>
-							<?include(__DIR__ . '/brick.php')?>
+							<?include(__DIR__.'/brick.php')?>
 						</li>
 					<? endforeach ?>
 				<? endif ?>

src/templates/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">

src/templates/documents/fieldTypes/Rich-Text.php

Spacing +3 added lines, -3 removed lines

@@ -6,12 +6,12 @@ 
 }
 ?>
 <div class="rte">
-  <div id="summernote_<?= str_replace(']', '-', str_replace('[', '-', $fieldPrefix)) . $field->slug ?>_rte_<?= $summernoteInstances ?>" class="summernote"><?= isset($value) ? $value : '' ?></div>
+  <div id="summernote_<?= str_replace(']', '-', str_replace('[', '-', $fieldPrefix)).$field->slug ?>_rte_<?= $summernoteInstances ?>" class="summernote"><?= isset($value) ? $value : '' ?></div>
 </div>
 <textarea style="display:none;" id="summernote_<?= $field->slug ?>_container_<?= $summernoteInstances ?>" name="<?= $fieldPrefix ?>[<?= $field->slug ?>][]"></textarea>
 <script>
   $(document).ready(function () {
-    $('#summernote_<?=str_replace(']', '-', str_replace('[', '-', $fieldPrefix)) . $field->slug?>_rte_<?=$summernoteInstances?>').summernote({
+    $('#summernote_<?=str_replace(']', '-', str_replace('[', '-', $fieldPrefix)).$field->slug?>_rte_<?=$summernoteInstances?>').summernote({
       height: 300,
       toolbar: [
         /*[groupname, [button list]]*/
@@ -28,4 +28,4 @@ 
 if (!isset($GLOBALS['rteList'])) {
     $GLOBALS['rteList'] = array();
 }
-$GLOBALS['rteList'][] = 'summernote_' . str_replace(']', '-', str_replace('[', '-', $fieldPrefix)) . $field->slug . '_rte_' . $summernoteInstances ?>
+$GLOBALS['rteList'][] = 'summernote_'.str_replace(']', '-', str_replace('[', '-', $fieldPrefix)).$field->slug.'_rte_'.$summernoteInstances ?>

src/templates/documents/function.renderFolder.php

Spacing +5 added lines, -5 removed lines

@@ -10,7 +10,7 @@ 
 { ?>
   <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>
@@ -18,11 +18,11 @@ 
   <div class="documentActions grid-box-4">
       <? renderAction('Edit',
           '',
-          $request::$subfolders . $cmsPrefix . '/documents/edit-folder?slug=' . $slugPrefix . $document->slug,
+          $request::$subfolders.$cmsPrefix.'/documents/edit-folder?slug='.$slugPrefix.$document->slug,
           'pencil'); ?>
       <? renderAction('Delete',
           'error',
-          $request::$subfolders . $cmsPrefix . '/documents/delete-folder?slug=' . $slugPrefix . $document->slug,
+          $request::$subfolders.$cmsPrefix.'/documents/delete-folder?slug='.$slugPrefix.$document->slug,
           'trash',
           'return confirm(\'Are you sure you want to delete this document?\');'); ?>
   </div>
@@ -30,9 +30,9 @@ 
       <? foreach ($document->getContent() as $subDocument) : ?>
         <li class="grid-container">
             <? if ($subDocument->type == 'document') : ?>
-                <? renderDocument($subDocument, $cmsPrefix, $slugPrefix . $document->slug . '/', $request); ?>
+                <? renderDocument($subDocument, $cmsPrefix, $slugPrefix.$document->slug.'/', $request); ?>
             <? elseif ($subDocument->type == 'folder') : ?>
-                <? renderFolder($subDocument, $cmsPrefix, $slugPrefix . $document->slug . '/', false, $request); ?>
+                <? renderFolder($subDocument, $cmsPrefix, $slugPrefix.$document->slug.'/', false, $request); ?>
             <? endif ?>
         </li>
       <? endforeach ?>

src/templates/images/show.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
           <? foreach ($image->set as $key => $set) : ?>
           <div class="sets">
             <label><?= $key ?></label>
-            <img src="<?= $request::$subfolders . 'images/' . $set ?>"/>
+            <img src="<?= $request::$subfolders.'images/'.$set ?>"/>
           </div>
           <? endforeach ?>
       <? endif ?>

src/templates/cms.php

Spacing +1 added lines, -1 removed lines

@@ -97,7 +97,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>

src/templates/documents.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 <? include('documents/function.renderFolder.php'); ?>
 <script>window.onload = function () {
     History.init();
-    History.replaceState(null, 'Cloud Control CMS', '/<?=$request::$subfolders . $cmsPrefix?>/documents?path=/');
+    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>

src/CloudControl.php

Spacing +13 added lines, -13 removed lines

@@ -36,9 +36,9 @@ 
         $event->getIO()->write("*** Checking installation of Cloud Control framework ***");
 
         $vendorDir = $event->getComposer()->getConfig()->get('vendor-dir');
-        $rootDir = realpath($vendorDir . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR);
+        $rootDir = realpath($vendorDir.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR);
 
-        $baseConfigTargetPath = $rootDir . DIRECTORY_SEPARATOR . 'config.json';
+        $baseConfigTargetPath = $rootDir.DIRECTORY_SEPARATOR.'config.json';
         $configObject = self::getConfig($baseConfigTargetPath);
 
         $configObject->{'vendorDir'} = realpath($vendorDir);
@@ -53,8 +53,8 @@ 
 
         // TODO Fie FilesStorage to use filesDir from config, similar to ImagesStorage
 
-        $baseStorageDefaultPath = __DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_storage.json';
-        $baseStorageSqlPath = __DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_storage.sql';
+        $baseStorageDefaultPath = __DIR__.DIRECTORY_SEPARATOR.'install'.DIRECTORY_SEPARATOR.'_storage.json';
+        $baseStorageSqlPath = __DIR__.DIRECTORY_SEPARATOR.'install'.DIRECTORY_SEPARATOR.'_storage.sql';
 
         self::createStorage($configObject->{'storageDir'}, $baseStorageDefaultPath, $baseStorageSqlPath);
         self::saveConfig($event, $baseConfigTargetPath, $configObject);
@@ -81,23 +81,23 @@ 
     private static function saveConfig(Event $event, $baseConfigTargetPath, $configObject)
     {
         file_put_contents($baseConfigTargetPath, json_encode($configObject));
-        $event->getIO()->write("Saved config to: " . $baseConfigTargetPath);
+        $event->getIO()->write("Saved config to: ".$baseConfigTargetPath);
     }
 
     private static function copyInstallFile(Event $event, $sourceFileName, $destinationPath, $destinationFileName = null)
     {
-        $sourceFilePath = realpath(__DIR__ . DIRECTORY_SEPARATOR . 'install/_' . $sourceFileName);
+        $sourceFilePath = realpath(__DIR__.DIRECTORY_SEPARATOR.'install/_'.$sourceFileName);
 
         if (file_exists($sourceFilePath) && realpath($destinationPath) !== false) {
             if ($destinationFileName !== null) {
-                copy($sourceFilePath, realpath($destinationPath) . DIRECTORY_SEPARATOR . $destinationFileName);
+                copy($sourceFilePath, realpath($destinationPath).DIRECTORY_SEPARATOR.$destinationFileName);
             } else {
-                copy($sourceFilePath, realpath($destinationPath) . DIRECTORY_SEPARATOR . $sourceFileName);
+                copy($sourceFilePath, realpath($destinationPath).DIRECTORY_SEPARATOR.$sourceFileName);
             }
 
-            $event->getIO()->write("Copied file: " . $sourceFileName . ' to ' . $destinationPath);
+            $event->getIO()->write("Copied file: ".$sourceFileName.' to '.$destinationPath);
         } else {
-            $event->getIO()->write("[ERROR] Couldnt copy file: " . $sourceFileName . ' to ' . $destinationPath);
+            $event->getIO()->write("[ERROR] Couldnt copy file: ".$sourceFileName.' to '.$destinationPath);
         }
     }
 
@@ -114,10 +114,10 @@ 
 
     private static function createDir(Event $event, $rootDir, $dirName)
     {
-        $dir = $rootDir . DIRECTORY_SEPARATOR . $dirName . DIRECTORY_SEPARATOR;
+        $dir = $rootDir.DIRECTORY_SEPARATOR.$dirName.DIRECTORY_SEPARATOR;
         if (!is_dir($dir)) {
             mkdir($dir);
-            $event->getIO()->write("Created dir: " . $dir);
+            $event->getIO()->write("Created dir: ".$dir);
         }
         return realpath($dir);
     }
@@ -128,7 +128,7 @@ 
      */
     private static function getConfig($configTargetPath)
     {
-        $baseConfigDefaultPath = realpath(__DIR__ . DIRECTORY_SEPARATOR . 'install/_config.json');
+        $baseConfigDefaultPath = realpath(__DIR__.DIRECTORY_SEPARATOR.'install/_config.json');
 
         if (file_exists($configTargetPath)) {
             $config = json_decode(file_get_contents($configTargetPath));

src/util/functions.php

Spacing +4 added lines, -4 removed lines

@@ -11,7 +11,7 @@ 
 {
 	$debug_backtrace = current(debug_backtrace());
 	if (PHP_SAPI == 'cli') {
-		echo 'Dump: ' . $debug_backtrace['file'] . ':' . $debug_backtrace['line'] . "\n";
+		echo 'Dump: '.$debug_backtrace['file'].':'.$debug_backtrace['line']."\n";
 		foreach (func_get_args() as $data) {
 			var_dump($data);
 		}
@@ -29,7 +29,7 @@ 
 <body>
 END;
 
-		echo '<div>Dump: ' . $debug_backtrace['file'] . ':<b>' . $debug_backtrace['line'] . "</b></div>";
+		echo '<div>Dump: '.$debug_backtrace['file'].':<b>'.$debug_backtrace['line']."</b></div>";
 		echo '<pre>';
 		foreach (func_get_args() as $data) {
 			echo "<code>";
@@ -53,8 +53,8 @@ 
  */
 function utf8Convert($array)
 {
-	array_walk_recursive($array, function(&$item){
-		if(!mb_detect_encoding($item, 'utf-8', true)){
+	array_walk_recursive($array, function(&$item) {
+		if (!mb_detect_encoding($item, 'utf-8', true)) {
 			$item = utf8_encode($item);
 		}
 	});