jenskooij / cloudcontrol

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/components/LanguageComponent.php

Spacing +2 added lines, -2 removed lines

@@ -99,9 +99,9 @@
         $this->sessionValues = $_SESSION['LanguageComponent'];
 
         if ($this->forceRedirect === true) {
-            if (substr($request::$relativeUri, 0, 2) !== $lang ) {
+            if (substr($request::$relativeUri, 0, 2) !== $lang) {
                 if ($lang !== $this->defaultLanguage) {
-                    header('Location: ' . $request::$subfolders . $lang . '/' . $request::$relativeUri);
+                    header('Location: '.$request::$subfolders.$lang.'/'.$request::$relativeUri);
                     exit;
                 }
             }

src/components/cms/SearchRouting.php

Spacing +3 added lines, -3 removed lines

@@ -72,7 +72,7 @@ 
 	}
 
 	private function showJson($obj, $httpHeader = 'HTTP/1.0 200 OK') {
-		header($_SERVER['SERVER_PROTOCOL'] . $httpHeader, true);
+		header($_SERVER['SERVER_PROTOCOL'].$httpHeader, true);
 		header('Content-type: application/json');
 		die(json_encode($obj));
 	}
@@ -84,7 +84,7 @@ 
 	 */
 	private function stepRouting($step, $cmsComponent, $indexer)
 	{
-		switch($step) {
+		switch ($step) {
 			case 'resetIndex': $indexer->resetIndex(); break;
 			case 'cleanPublishedDeletedDocuments': $cmsComponent->storage->getDocuments()->cleanPublishedDeletedDocuments(); break;
 			case 'createDocumentTermCount':
@@ -95,7 +95,7 @@ 
 			case 'createTermFieldLengthNorm': $indexer->createTermFieldLengthNorm(); break;
 			case 'createInverseDocumentFrequency': $indexer->createInverseDocumentFrequency(); break;
 			case 'replaceOldIndex': $indexer->replaceOldIndex(); break;
-			default : $this->showJson('Invalid step: ' . $step . '.', 'HTTP/1.0 500 Internal Server Error'); break;
+			default : $this->showJson('Invalid step: '.$step.'.', 'HTTP/1.0 500 Internal Server Error'); break;
 		}
 		$this->showJson('done');
 	}

src/components/cms/DocumentRouting.php

Spacing +14 added lines, -14 removed lines

@@ -41,7 +41,7 @@ 
     {
 		if ($relativeCmsUri == '/documents/new-document' && isset($request::$get[CmsComponent::GET_PARAMETER_PATH])) {
 			$this->documentNewRoute($request, $cmsComponent);
-		} elseif (isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])){
+		} elseif (isset($request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			switch ($relativeCmsUri) {
 				case '/documents/edit-document': $this->editDocumentRoute($request, $cmsComponent); break;
 				case '/documents/get-brick': $this->getBrickRoute($request, $cmsComponent); break;
@@ -95,7 +95,7 @@ 
 		if (isset($request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE])) {
 			if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE], $request::$get[CmsComponent::GET_PARAMETER_PATH])) {
 				$cmsComponent->storage->getDocuments()->addDocument($request::$post);
-				header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+				header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
 				exit;
 			}
 			$cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPE, $cmsComponent->storage->getDocumentTypes()->getDocumentTypeBySlug($request::$get[CmsComponent::PARAMETER_DOCUMENT_TYPE], true));
@@ -103,7 +103,7 @@ 
 		} else {
 			$documentTypes = $cmsComponent->storage->getDocumentTypes()->getDocumentTypes();
 			if (count($documentTypes) < 1) {
-				throw new \Exception('No Document Types defined yet. <a href="' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/configuration/document-types/new">Please do so first.</a>');
+				throw new \Exception('No Document Types defined yet. <a href="'.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/configuration/document-types/new">Please do so first.</a>');
 			}
 			$cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT_TYPES, $documentTypes);
 		}
@@ -120,7 +120,7 @@ 
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_SMALLEST_IMAGE, $cmsComponent->storage->getImageSet()->getSmallestImageSet()->slug);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$cmsComponent->storage->getDocuments()->saveDocument($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
 			exit;
 		}
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_DOCUMENT, $cmsComponent->storage->getDocuments()->getDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG], 'unpublished'));
@@ -157,7 +157,7 @@ 
 	private function deleteDocumentRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->getDocuments()->deleteDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
 		exit;
 	}
 
@@ -171,7 +171,7 @@ 
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post[CmsComponent::GET_PARAMETER_PATH])) {
 			$cmsComponent->storage->addDocumentFolder($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
 			exit;
 		}
 	}
@@ -190,11 +190,11 @@ 
 		array_pop($path);
 		$path = implode('/', $path);
 
-		$request::$get[CmsComponent::GET_PARAMETER_PATH] = '/' . $path;
+		$request::$get[CmsComponent::GET_PARAMETER_PATH] = '/'.$path;
 
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$post['content'])) {
 			$cmsComponent->storage->saveDocumentFolder($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
 			exit;
 		}
 
@@ -209,7 +209,7 @@ 
 	private function deleteFolderRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->deleteDocumentFolderBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
 		exit;
 	}
 
@@ -220,7 +220,7 @@ 
 	private function publishDocumentRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->publishDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
 		exit;
 	}
 
@@ -231,7 +231,7 @@ 
 	private function unpublishDocumentRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->unpublishDocumentBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents');
 		exit;
 	}
 
@@ -248,7 +248,7 @@ 
 		$cmsComponent->setParameter(CmsComponent::PARAMETER_MAIN_NAV_CLASS, CmsComponent::PARAMETER_DOCUMENTS);
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE])) {
 			$cmsComponent->storage->getValuelists()->addValuelist($request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents/valuelists');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents/valuelists');
 			exit;
 		}
 	}
@@ -260,7 +260,7 @@ 
 
 		if (isset($request::$post[CmsComponent::POST_PARAMETER_TITLE], $request::$get[CmsComponent::GET_PARAMETER_SLUG])) {
 			$cmsComponent->storage->getValuelists()->saveValuelist($request::$get[CmsComponent::GET_PARAMETER_SLUG], $request::$post);
-			header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents/valuelists');
+			header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents/valuelists');
 			exit;
 		}
 
@@ -271,7 +271,7 @@ 
 	private function deleteValuelistRoute($request, $cmsComponent)
 	{
 		$cmsComponent->storage->getValuelists()->deleteValuelistBySlug($request::$get[CmsComponent::GET_PARAMETER_SLUG]);
-		header('Location: ' . $request::$subfolders . $cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX) . '/documents/valuelists');
+		header('Location: '.$request::$subfolders.$cmsComponent->getParameter(CmsComponent::PARAMETER_CMS_PREFIX).'/documents/valuelists');
 		exit;
 	}
 }
\ No newline at end of file